set-core: Skill for Claude Code

Worktree Management Skill

Manage git worktrees for parallel AI agent development.

Context Detection

First, detect which mode you're operating in:

# Check if we're in a worktree (not the main repo)
if git rev-parse --is-inside-work-tree &>/dev/null; then
  BRANCH=$(git branch --show-current)
  if [[ "$BRANCH" == change/* ]]; then
    CHANGE_ID="${BRANCH#change/}"
    echo "Running in worktree: $CHANGE_ID"
    MODE="worktree"
  else
    echo "Running in main repository"
    MODE="main"
  fi
fi

Central Control Commands

Use these from the main repository to manage worktrees.

List Worktrees

set-list

List all active worktrees with their change IDs and paths.

To see remote branches available for checkout:

set-list --remote

Create New Worktree

set-new <change-id>

Creates a new worktree at ../<project>-<change-id>/ with branch change/<change-id>.

If the branch exists on remote, it will be checked out and tracked automatically.

To force create a new branch even if remote exists:

set-new <change-id> --new

Open Worktree for Work

set-work <change-id>

Opens the worktree in Zed editor with Claude Code. This launches a new agent session in that worktree context.

To open in terminal instead:

set-work <change-id> --terminal

Close Worktree

set-close <change-id>

Removes the worktree. Interactive mode asks what to do with the branch:

1. Keep branch (can reopen later)
2. Delete local branch only
3. Delete local and remote branch

Non-interactive options:

set-close <change-id> --keep-branch      # Keep the branch
set-close <change-id> --delete-remote    # Delete both local and remote

Merge Worktree

set-merge <change-id>

Merges the worktree branch into the target branch (default: main).

Options:

set-merge <change-id> --target develop   # Merge to specific branch
set-merge <change-id> --no-delete        # Keep branch after merge