worktree

Git Worktree Manager

When to Use This Skill

Activate when the user:

• Invokes /worktree directly
• Mentions "worktree(s)" in any context
• Wants to "work on this in parallel" or "work on multiple things"
• Asks for an "isolated workspace" or "separate workspace"
• Says "clean up worktrees" or "what am I working on"

Do NOT activate when:

• User is doing normal branch switching (git checkout, git switch)
• No indication they need parallel workspaces

Conventions

Branch naming:

• Ticket path → strip dir + .md, prefix feature/: thoughts/shared/tickets/add-auth.md → feature/add-auth
• Plain name → prefix feature/ unless already prefixed (fix/, chore/, etc.)

Worktree location: <repo-root>/../<repo-name>-worktrees/<branch-name> (sibling dir, outside main repo)

Default branch detection — never hardcode main:

DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's|refs/remotes/origin/||') || DEFAULT_BRANCH="main"

Subcommand Dispatch

Parse the first argument. If none provided or intent is unclear, print:

/worktree create <name|ticket-path>  — Create worktree + branch
/worktree list                       — All worktrees with dirty status
/worktree status                     — Detailed view (commits, ahead/behind)
/worktree remove <name>              — Remove with safety checks

Examples:
  /worktree create auth-refactor
  /worktree create thoughts/shared/tickets/add-auth.md

When auto-triggered (no explicit subcommand), infer intent from context. If ambiguous, ask one clarifying question.

---

create

1. Resolve branch name using naming conventions above. If argument is a ticket path, read the ticket for context.

2. Check conflicts — run in parallel:

   git branch --list "<branch-name>"
   git worktree list
   

   If branch exists but has no worktree → offer git worktree add <path> <existing-branch> (no -b). If worktree already exists at path → show its location, ask if user wants to cd there instead.