Git Worktree

Git Worktree Management

Manage git worktrees stored in ~/.git-worktrees/<repo>/<branch>, keeping them out of the user's project directories.

Determining Context

Before any operation, determine the repository name:

repo=$(basename "$(git rev-parse --show-toplevel)")

The worktree base directory is always ~/.git-worktrees/$repo/.

Commands

Create (default)

If the user provides just a branch name, treat it as a create operation.

repo=$(basename "$(git rev-parse --show-toplevel)")
branch="<branch>"
dir="$HOME/.git-worktrees/$repo/$branch"
mkdir -p "$HOME/.git-worktrees/$repo"
git worktree add "$dir" "$branch"

If the branch doesn't exist yet, use -b to create it from HEAD:

git worktree add -b "$branch" "$dir" HEAD

After creation, always prominently display the worktree path so the user can open a new session pointing to it:

Worktree created at: ~/.git-worktrees/<repo>/<branch>

Remove

repo=$(basename "$(git rev-parse --show-toplevel)")
git worktree remove "$HOME/.git-worktrees/$repo/<branch>"

If the worktree has uncommitted changes, warn the user before using --force.

List

git worktree list

Prune

Clean up stale worktree references (e.g., after manually deleting a worktree directory):

git worktree prune

Guidelines

• Always default to create if the user's intent is ambiguous
• Never use --force without explicit user confirmation
• After creating a worktree, remind the user they can open a new Craft Agent session with that path as the working directory
• When listing, note which worktree is the main working tree vs. linked worktrees