claude-code-mastery-project-starter-kit: Command for Claude Code

Git Worktree — Isolated Task Branch

Create a new git worktree so this task runs on its own branch in its own directory. Main stays untouched. If anything goes wrong, delete the branch — zero risk.

Arguments: $ARGUMENTS

Step 0 — Parse Arguments

• First argument: branch name (required). If not provided, ASK the user.
• Second argument: base branch to branch from (optional, defaults to main or master)

Branch naming convention: task/<descriptive-name>

• If the user provides just a name like auth-fix, prefix it: task/auth-fix
• If they already include a prefix like feat/login, use as-is

Step 1 — Verify Git State

Before creating anything, verify:

# Must be in a git repo
git rev-parse --git-dir

# Check for uncommitted changes on current branch
git status --porcelain

If there are uncommitted changes: WARN the user. Ask if they want to:

• Stash changes first (git stash)
• Commit changes first
• Abort

NEVER create a worktree with dirty state — changes could bleed between worktrees.

Step 2 — Determine Base Branch

# Find the default branch (main or master)
git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@'

If no remote, fall back to checking if main or master exists locally.

Use the second argument if provided, otherwise use the detected default branch.

Step 3 — Create Branch + Worktree

The worktree directory goes next to the current repo as ../<repo-name>--<branch-name>:

# Example: if repo is at ~/projects/my-app and branch is task/auth-fix
# Worktree goes to ~/projects/my-app--task-auth-fix

REPO_NAME=$(basename "$(git rev-parse --show-toplevel)")
BRANCH_NAME="$1"
WORKTREE_DIR="../${REPO_NAME}--${BRANCH_NAME//\//-}"

# Create the branch and worktree in one step
git worktree add -b "$BRANCH_NAME" "$WORKTREE_DIR" "$BASE_BRANCH"

Step 4 — Verify

# List all worktrees to confirm
git worktree list

Step 5 — Report

Output a summary: