worktrees
Audits and optionally prunes git worktrees: current repo by default, cross-repo scan under ~/dev/ with --all. Use when the user says '/worktrees', 'audit worktrees', or 'prune worktrees'.
Install
npx skills add https://github.com/domengabrovsek/agent-config/tree/main/skills/worktrees
claude plugin marketplace add https://llmmart.ai/marketplace.json && claude plugin install domengabrovsek-claude@llmmart
git clone https://github.com/domengabrovsek/agent-config.git
The skills CLI installs just this skill, for any of its supported agents. Claude Code installs the whole domengabrovsek/claude collection as a plugin from our marketplace. Git is the plain clone.
Skill manifest
Run worktree cleanup: $ARGUMENTS
Modes
- No flags: single-repo dry-run against
$PWD. Reports SAFE / KEEP verdicts and exits without changes. --apply: actually remove the SAFE worktrees and delete their local branches.--all: switch to cross-repo audit. Walks~/dev/(or--root <path>) up to 4 levels deep, finds every git repo, runs the same SAFE / KEEP report per repo. Combine with--applyfor bulk removal.
Implementation
Strip the --all flag from $ARGUMENTS and dispatch:
- If
--allwas passed:~/.agents/scripts/worktree-prune.sh audit-all <remaining-args> - Otherwise:
~/.agents/scripts/worktree-prune.sh <args>
Safety rule
A worktree is "safe to remove" only if its branch is:
- upstream-gone (the remote branch was deleted, typically after PR merge), OR
- merged into the repo's default branch (
origin/HEADormain/master), OR - squash-merged: the branch tip is not an ancestor, but merging it into the default branch produces the default branch unchanged. This catches squash merges that never deleted the remote branch.
Locked worktrees are unlocked iff they pass the safety rule. Default-branch checkouts are never removed. Worktrees with unmerged commits or open PRs are kept.
Tips
- Run
git fetch --prune originfirst to refresh remote-tracking branches. The script does NOT fetch automatically (network cost across many repos in--allmode). Themerged-into-defaultcheck works offline. - The
SessionEndhook runs the equivalent of/worktrees --applyopportunistically on session close, so manual invocation is rare for actively-used repos. Reach for/worktrees --allmostly for periodic cross-repo hygiene.
Files (claude)
-
SKILL.md 1.9 KB
--- name: worktrees description: "Audits and optionally prunes git worktrees: current repo by default, cross-repo scan under ~/dev/ with --all. Use when the user says '/worktrees', 'audit worktrees', or 'prune worktrees'." --- Run worktree cleanup: $ARGUMENTS ## Modes - **No flags**: single-repo dry-run against `$PWD`. Reports SAFE / KEEP verdicts and exits without changes. - **`--apply`**: actually remove the SAFE worktrees and delete their local branches. - **`--all`**: switch to cross-repo audit. Walks `~/dev/` (or `--root <path>`) up to 4 levels deep, finds every git repo, runs the same SAFE / KEEP report per repo. Combine with `--apply` for bulk removal. ## Implementation Strip the `--all` flag from `$ARGUMENTS` and dispatch: - If `--all` was passed: `~/.agents/scripts/worktree-prune.sh audit-all <remaining-args>` - Otherwise: `~/.agents/scripts/worktree-prune.sh <args>` ## Safety rule A worktree is "safe to remove" only if its branch is: - **upstream-gone** (the remote branch was deleted, typically after PR merge), OR - **merged into the repo's default branch** (`origin/HEAD` or `main`/`master`), OR - **squash-merged**: the branch tip is not an ancestor, but merging it into the default branch produces the default branch unchanged. This catches squash merges that never deleted the remote branch. Locked worktrees are unlocked iff they pass the safety rule. Default-branch checkouts are never removed. Worktrees with unmerged commits or open PRs are kept. ## Tips - Run `git fetch --prune origin` first to refresh remote-tracking branches. The script does NOT fetch automatically (network cost across many repos in `--all` mode). The `merged-into-default` check works offline. - The `SessionEnd` hook runs the equivalent of `/worktrees --apply` opportunistically on session close, so manual invocation is rare for actively-used repos. Reach for `/worktrees --all` mostly for periodic cross-repo hygiene.
Comments (0)
Sign in to join the conversation.
Reviews (0)
No reviews yet.
No comments yet.