remove-worktree

Remove Worktree

This command interactively removes a single git worktree. Unlike /prune-worktree which auto-removes all safe worktrees, this command lets you select a specific worktree and handles cases where the issue isn't closed or branch isn't merged.

Usage: /remove-worktree (no arguments - interactive selection)

Clear Worktree State

Clear any active worktree state so the pre-tool-use hook doesn't block cleanup commands: !"${CLAUDE_PLUGIN_ROOT}/scripts/worktree-state.sh" clear 2>/dev/null || true

Context

• Repository name: !basename \git rev-parse --show-toplevel 2>/dev/null` 2>/dev/null || echo "unknown"`
• Default branch: !git remote show origin 2>/dev/null | grep 'HEAD branch' | sed 's/.*: //' || echo "main"
• All worktrees: !git worktree list 2>&1 || echo "No worktrees found"
• Issue worktrees: !git worktree list 2>/dev/null | grep -E "issue-[0-9]+" || echo "No issue worktrees found"

---

Steps

CRITICAL: When executing bash commands below, use backticks (`) for command substitution, NOT $(). Claude Code has a bug that mangles $() syntax into broken commands. Copy the commands exactly as written.

1. Get Repository Info

!REPO_NAME=basename \git rev-parse --show-toplevel`` !echo "Repository: $REPO_NAME"

2. List All Issue Worktrees

!echo "Scanning for issue worktrees..." !git worktree list

Filter for worktrees matching the {REPO_NAME}-issue-* pattern and display them as a numbered list.

!git worktree list | grep -E "/${REPO_NAME}-issue-[0-9]+" | cat -n

If no issue worktrees are found, inform the user and stop: "No issue worktrees found matching the pattern '{REPO_NAME}-issue-*'"

3. Ask User to Select Worktree

Use AskUserQuestion to ask: "Which worktree would you like to remove? Enter the number from the list above, or the full path."

Store the selected worktree path and extract:

• WORKTREE_PATH: The full path to the worktree
• BRANCH_NAME: The branch associated with the worktree
• ISSUE_NUM: The issue number extracted from the directory name