worktree-cleanup
The worktree-cleanup command removes Git worktrees and their associated branches after they have been merged into the main branch. Use this command to maintain a clean repository by eliminating completed work branches matching the patterns claude/*, claude-daniel/*, and review/*, with options for selective cleanup, dry-run preview, or force removal of all worktrees regardless of merge status.
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/davila7/claude-code-templates/HEAD/.claude/commands/worktree-cleanup.md -o ~/.claude/commands/worktree-cleanup.mdworktree-cleanup.md
# Worktree Cleanup Remove worktrees and branches that have been merged: $ARGUMENTS ## Instructions You are in the **main repository** (not a worktree). Clean up finished worktrees. ### Branch Patterns This project uses the following branch prefixes for worktrees: - `claude/*` — Claude Code auto-created worktrees - `claude-daniel/*` — User-created worktrees - `review/*` — Component review worktrees All three prefixes must be checked in every step below. ### Step 1: Validate Environment 1. Verify this is the main working tree (first entry in `git worktree list`) 2. If inside a worktree, warn: "Run `/worktree-cleanup` from the main repo, not from a worktree." 3. Fetch latest from origin: `git fetch origin --prune` 4. Get the main branch name (main or master) ### Step 2: Parse Arguments Parse `$ARGUMENTS` for options: - `--all` — clean up ALL merged worktrees and branches - `--branch <prefix>/<name>` — clean up a specific worktree/branch - `--dry-run` — show what would be cleaned up without doing anything - `--force-all` — remove ALL worktrees regardless of merge status (asks confirmation per worktree) - No arguments — list worktrees and ask which to clean up ### Step 3: Identify Worktrees 1. List all worktrees: `git worktree list` 2. List all matching branches: ```bash git branch --list 'claude/*' 'claude-daniel/*' 'review/*' ``` 3. For each matching branch, check if it's been merged into main: ```bash git branch --merged origin/<main-branch> | grep -E '^\s+(claude/|claude-daniel/|review/)' ``` 4. Also check remote branches: ```bash git branch -r --merged origin/<main-branch> | grep -E 'origin/(claude/|claude-daniel/|review/)' ``` 5. For squash-merged branches (not detected by `--merged`), check if the branch diff is empty against main: ```bash # A branch is effectively merged if its changes already exist in main git diff origin/main...<branch> --stat ``` If the diff is empty or very small (only whitespace), consider it merged. ### Step 4: Display Status Show a table of all worktrees/branches: ``` | # | Worktree | Branch | Merged? | Dirty? | Action | |---|---------|--------|---------|--------|--------| | 1 | eager-mendeleev | claude/eager-mendeleev | Yes | Clean | Will remove | | 2 | agent-a7e312d0 | review/code-reviewer-2026-04-01 | No | Clean | Skipped | ``` ### Step 5: Confirm and Execute If `--dry-run` was specified, show the table and stop. Otherwise, use AskUserQuestion to confirm cleanup (unless `--all` was specified with only merged branches). For each worktree/branch to clean up: 1. Remove the worktree: ```bash git worktree remove <path> ``` If that fails (dirty worktree), warn and skip — **never force-remove**. 2. Delete the local branch: ```bash git branch -d <branch> ``` Use `-d` (not `-D`) for merged branches. For `--force-all` unmerged branches, use `-D` only after explicit user confirmation. 3. Delete the remote branch (if it exists): ```bash git push origin --delete <branch> ``` If the remote branch doesn't exist, ignore the error silently. ### Step 6: Prune After all removals: ```bash git worktree prune ``` ### Step 7: Summary Show what was cleaned up: ``` Cleanup Complete ────────────────────────────────── Removed: <N> worktree(s) Deleted: <N> local branch(es) Deleted: <N> remote branch(es) Skipped: <N> unmerged branch(es) ────────────────────────────────── ``` If any unmerged branches were skipped, list them and suggest: - Merge the PR first, then run cleanup again - Or use `git worktree remove <path>` and `git branch -D <branch>` manually if the work is truly abandoned
Use this agent when creating specialized Claude Code agents for the claude-code-templates components system. Specializes in agent design, prompt engineering, domain expertise modeling, and agent best practices. Examples: <example>Context: User wants to create a new specialized agent. user: 'I need to create an agent that specializes in React performance optimization' assistant: 'I'll use the agent-expert agent to create a comprehensive React performance agent with proper domain expertise and practical examples' <commentary>Since the user needs to create a specialized agent, use the agent-expert agent for proper agent structure and implementation.</commentary></example> <example>Context: User needs help with agent prompt design. user: 'How do I create an agent that can handle both frontend and backend security?' assistant: 'Let me use the agent-expert agent to design a full-stack security agent with proper domain boundaries and expertise areas' <commentary>The user needs agent development help, so use the agent-expert agent.</commentary></example>
Use this agent to create blog articles for aitmpl.com from Claude Code Templates components. Reads the component, asks the user to confirm details, generates SVG cover, HTML article, and updates blog-articles.json. Examples: <example>Context: User wants a blog for a component. user: 'Create a blog article for cli-tool/components/hooks/security/secret-scanner.json' assistant: 'I'll use the blog-writer agent to create the full blog article with cover image and proper structure' <commentary>The user wants a blog article from a component, use blog-writer for the full pipeline.</commentary></example>
Runs pre-deploy build checks on the dashboard. Validates Astro build, checks for common esbuild/JSX issues, verifies API endpoints compile, and reports errors with fixes. Use before merging PRs that touch dashboard/.
Regenerates the component catalog (docs/components.json) by running the Python script. Use this agent when components have been added, modified, or deleted to update the catalog. Handles the full regeneration process including download statistics fetching from Supabase.
CLI interface design specialist. Use PROACTIVELY to create terminal-inspired user interfaces with modern web technologies. Expert in CLI aesthetics, terminal themes, and command-line UX patterns.
Use this agent when creating CLI commands for the claude-code-templates components system. Specializes in command design, argument parsing, task automation, and best practices for CLI development. Examples: <example>Context: User wants to create a new CLI command. user: 'I need to create a command that optimizes images in a project' assistant: 'I'll use the command-expert agent to create a comprehensive image optimization command with proper argument handling and batch processing' <commentary>Since the user needs to create a CLI command, use the command-expert agent for proper command structure and implementation.</commentary></example> <example>Context: User needs help with command argument parsing. user: 'How do I create a command that accepts multiple file patterns?' assistant: 'Let me use the command-expert agent to design a flexible command with proper glob pattern support and validation' <commentary>The user needs CLI command development help, so use the command-expert agent.</commentary></example>
Applies researched improvements to Claude Code components, validates changes with the component-reviewer agent, and creates pull requests. The only agent that modifies files and creates PRs.
Migrates components (agents, commands, skills, hooks, settings, MCPs) from external GitHub repositories to claude-code-templates, validates them with component-reviewer, and regenerates the catalog