worktree-cleanup

worktree-cleanup is a skill for Claude Code, Codex from shousper/claude-kit. It costs 91 tokens per session (1,238 once invoked), scanned A, original, MIT.

A procedure for removing Git worktrees, which are separate working folders connected to one repository, along with their related branches. It also updates the main branch after cleanup.

In plain words
What is it for?
Use it after a branch is merged, a pull request is finished, or a worktree is abandoned. It checks the worktrees and changes before removal and pulls the latest mainline code afterward.
Why use it?
It helps prevent deleting work that has uncommitted changes and avoids leaving stale worktree or branch records behind.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/shousper/claude-kit/worktree-cleanup
Any agent
npx skills add shousper/claude-kit --skill worktree-cleanup
Clone the repo
git clone --depth 1 https://github.com/shousper/claude-kit

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for worktree-cleanup

README.md
[![agentmods](https://agentmods.dev/badge/skills/shousper/claude-kit/worktree-cleanup.svg)](https://agentmods.dev/skills/shousper/claude-kit/worktree-cleanup)
Your own site
<a href="https://agentmods.dev/skills/shousper/claude-kit/worktree-cleanup"><img src="https://agentmods.dev/badge/skills/shousper/claude-kit/worktree-cleanup.svg" alt="Measured on agentmods" height="20"></a>
Per session 91 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,238 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00091 $0.01238
Opus 5 $0.00046 $0.00619
Sonnet 5 $0.00018 $0.00248
Haiku 4.5 $0.00009 $0.00124

Measured 4d ago against content hash be2798626e26, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

worktree-cleanup scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 4d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

shared/skills/worktree-cleanup/SKILL.md · 148 lines

How it starts

The opening of the file, as written. The whole thing — 148 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Worktree Cleanup

Overview

Clean up a git worktree after work is complete (merged, PR created, or abandoned). Updates the mainline branch so local state is current.

Core principle: User-triggered only. Never automatic.

The Process

Step 1: List Worktrees

git worktree list

If multiple worktrees exist (beyond the main working tree), present the list and ask which to clean up.

If only one non-main worktree exists, confirm: "Remove worktree at <path>?"

Step 2: Check for Uncommitted Changes

git -C <worktree-path> status --porcelain

If dirty:

  • Show the uncommitted files
  • Ask: "This worktree has uncommitted changes. Proceed with removal? (Changes will be lost)"
  • Require explicit confirmation

Step 3: Remove Worktree

⚠️ CRITICAL — cd before removal: You MUST determine the main working tree path and cd to it BEFORE running any removal command. Always chain the cd and removal in the SAME shell call using &&. Never run them as separate shell calls — shell CWD persists between calls, but a deleted CWD will brick every subsequent command.

First, capture the main working tree path from Step 1's output (the first entry in git worktree list).

Then remove:

cd <main-working-tree> && git worktree remove <worktree-path>

If removal fails (e.g., locked or dirty), try with --force after informing your human partner:

cd <main-working-tree> && git worktree remove --force <worktree-path>

If the worktree directory was already manually deleted from disk, clean up stale metadata:

cd <main-working-tree> && git worktree prune

Recovery: Dead CWD

If any Bash command fails with Path "..." does not exist, your shell CWD has been deleted from disk. Do NOT retry the same command. You MUST prefix your next command with an absolute cd:

cd <main-working-tree> && git worktree prune && git worktree list

The main working tree path (first entry from Step 1) is always valid. Use that. Retrying without the cd prefix will fail infinitely.

Read the full file on GitHub · 148 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 4d ago First seen · 148 lines · 91 tokens per session scan A be2798626e26

Subscribe to this mod's changes

worktree-cleanup is a skill published in the GitHub repository shousper/claude-kit (4 stars, last pushed 7d ago), licensed MIT. It adds 91 tokens to every session and 1,238 once invoked, about $0.0005 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens