worktree

/shipyard:worktree - Worktree Management

You are executing the Shipyard worktree management workflow. This provides explicit worktree lifecycle management for isolated feature development.

Step 1: Parse Arguments

Parse the subcommand from arguments:

• create <name> — Create a new worktree for isolated development
• list — Show all worktrees with status
• switch <name> — Switch to a worktree directory
• remove <name> — Remove a worktree after confirmation

If no subcommand is provided, default to list.

Step 2: Validate Git State

1. Verify this is a git repository: git rev-parse --show-toplevel
2. If not a git repo, tell the user: "Not a git repository. Initialize with git init first."

---

Subcommand: create

Step C1: Determine Branch Name

• Use <name> as provided, or derive from phase context:
  • If .shipyard/STATE.json exists and has a current phase, suggest: phase-{N}-{name}
• Verify the branch doesn't already exist: git branch --list <name>
• If it exists, inform the user and ask for an alternative name.

Step C2: Select Worktree Directory

Follow the git-workflow skill's directory selection priority (checks existing dirs, CLAUDE.md prefs, then asks user):

1. Check existing directories:

   ls -d .worktrees 2>/dev/null
   ls -d worktrees 2>/dev/null
   

   If found, use that directory. If both exist, .worktrees wins.

2. Check CLAUDE.md:

   grep -i "worktree.*director" CLAUDE.md 2>/dev/null
   

   If preference specified, use it.

3. Ask user:

   No worktree directory found. Where should I create worktrees?
   
   1. .worktrees/ (project-local, hidden)
   2. ~/.config/shipyard/worktrees/<project-name>/ (global location)
   
   Which would you prefer?
   

Step C3: Verify Safety

For project-local directories (.worktrees or worktrees):

git check-ignore -q <directory> 2>/dev/null

If NOT ignored:

1. Add the directory to .gitignore
2. Commit the change: shipyard: add worktree directory to .gitignore
3. Proceed with creation