refactor: migrate worktree commands from wt/* to claude/* branch prefix

All worktree commands, skills, and guides now use claude/* as the default
branch prefix, matching Claude Code's actual worktree behavior. Updated
both .claude/commands/ and cli-tool/components/ versions.

Author: davila7

.claude/commands/worktree-check.md

@@ -25,7 +25,7 @@ Then list any existing worktrees and exit.
 ### Step 2: Show Branch Info
 
 1. Get current branch: `git branch --show-current`
-2. Verify it follows the `wt/*` naming convention
+2. Verify it follows the `claude/*`, `claude-daniel/*`, or `review/*` naming convention
 3. Show how many commits ahead of origin/main: `git rev-list --count origin/main..HEAD`
 
 ### Step 3: Read Task
@@ -47,7 +47,7 @@ Present a clean summary:
 ```
 Worktree Status
 ──────────────────────────────────
-Branch:    wt/<name>
+Branch:    claude/<name>
 Task:      <task description from .worktree-task.md>
 Commits:   <N> ahead of main
 Modified:  <N> files

.claude/commands/worktree-cleanup.md

@@ -1,6 +1,6 @@
 ---
 allowed-tools: Bash(git:*), Bash(rm:*), Bash(ls:*), Bash(pwd:*), Bash(grep:*)
-argument-hint: --all | --branch wt/name | --dry-run
+argument-hint: --all | --branch claude/name | --dry-run
 description: Clean up merged worktrees and their branches
 ---
 
@@ -12,6 +12,15 @@ Remove worktrees and branches that have been merged: $ARGUMENTS
 
 You are in the **main repository** (not a worktree). Clean up finished worktrees.
 
+### Branch Patterns
+
+This project uses the following branch prefixes for worktrees:
+- `claude/*` — Claude Code auto-created worktrees
+- `claude-daniel/*` — User-created worktrees
+- `review/*` — Component review worktrees
+
+All three prefixes must be checked in every step below.
+
 ### Step 1: Validate Environment
 
 1. Verify this is the main working tree (first entry in `git worktree list`)
@@ -23,33 +32,43 @@ You are in the **main repository** (not a worktree). Clean up finished worktrees
 
 Parse `$ARGUMENTS` for options:
 
-- `--all` — clean up ALL merged `wt/*` worktrees and branches
-- `--branch wt/<name>` — clean up a specific worktree/branch
+- `--all` — clean up ALL merged worktrees and branches
+- `--branch <prefix>/<name>` — clean up a specific worktree/branch
 - `--dry-run` — show what would be cleaned up without doing anything
+- `--force-all` — remove ALL worktrees regardless of merge status (asks confirmation per worktree)
 - No arguments — list worktrees and ask which to clean up
 
 ### Step 3: Identify Worktrees
 
 1. List all worktrees: `git worktree list`
-2. List all `wt/*` branches: `git branch --list 'wt/*'`
-3. For each `wt/*` branch, check if it's been merged into main:
+2. List all matching branches:
    ```bash
-   git branch --merged origin/<main-branch> | grep 'wt/'
+   git branch --list 'claude/*' 'claude-daniel/*' 'review/*'
+   ```
+3. For each matching branch, check if it's been merged into main:
+   ```bash
+   git branch --merged origin/<main-branch> | grep -E '^\s+(claude/|claude-daniel/|review/)'
    ```
 4. Also check remote branches:
    ```bash
-   git branch -r --merged origin/<main-branch> | grep 'origin/wt/'
+   git branch -r --merged origin/<main-branch> | grep -E 'origin/(claude/|claude-daniel/|review/)'
+   ```
+5. For squash-merged branches (not detected by `--merged`), check if the branch diff is empty against main:
+   ```bash
+   # A branch is effectively merged if its changes already exist in main
+   git diff origin/main...<branch> --stat
    ```
+   If the diff is empty or very small (only whitespace), consider it merged.
 
 ### Step 4: Display Status
 
-Show a table of all `wt/*` worktrees/branches:
+Show a table of all worktrees/branches:
 
 ```
-| Branch | Worktree Path | Merged? | Action |
-|--------|--------------|---------|--------|
-| wt/login-page | ../worktrees/repo/wt-login-page | Yes | Will remove |
-| wt/auth-bug | ../worktrees/repo/wt-auth-bug | No | Skipped (not merged) |
+| # | Worktree | Branch | Merged? | Dirty? | Action |
+|---|---------|--------|---------|--------|--------|
+| 1 | eager-mendeleev | claude/eager-mendeleev | Yes | Clean | Will remove |
+| 2 | agent-a7e312d0 | review/code-reviewer-2026-04-01 | No | Clean | Skipped |
 ```
 
 ### Step 5: Confirm and Execute
@@ -58,7 +77,7 @@ If `--dry-run` was specified, show the table and stop.
 
 Otherwise, use AskUserQuestion to confirm cleanup (unless `--all` was specified with only merged branches).
 
-For each **merged** worktree/branch to clean up:
+For each worktree/branch to clean up:
 
 1. Remove the worktree:
    ```bash
@@ -68,13 +87,13 @@ For each **merged** worktree/branch to clean up:
 
 2. Delete the local branch:
    ```bash
-   git branch -d wt/<name>
+   git branch -d <branch>
    ```
-   Use `-d` (not `-D`) — this is safe because it only deletes merged branches.
+   Use `-d` (not `-D`) for merged branches. For `--force-all` unmerged branches, use `-D` only after explicit user confirmation.
 
-3. Delete the remote branch:
+3. Delete the remote branch (if it exists):
    ```bash
-   git push origin --delete wt/<name>
+   git push origin --delete <branch>
    ```
    If the remote branch doesn't exist, ignore the error silently.
 
@@ -102,4 +121,4 @@ Skipped:  <N> unmerged branch(es)
 
 If any unmerged branches were skipped, list them and suggest:
 - Merge the PR first, then run cleanup again
-- Or use `git worktree remove <path>` and `git branch -D wt/<name>` manually if the work is truly abandoned
+- Or use `git worktree remove <path>` and `git branch -D <branch>` manually if the work is truly abandoned

.claude/commands/worktree-deliver.md

@@ -15,7 +15,7 @@ You are inside a worktree. Package up the work and deliver it as a PR.
 
 1. Verify this is a worktree (not the main working tree) using `git worktree list`
 2. Get current branch: `git branch --show-current`
-3. Verify branch follows `wt/*` pattern. If not, warn the user and ask if they want to continue.
+3. Verify branch follows `claude/*`, `claude-daniel/*`, or `review/*` pattern. If not, warn the user and ask if they want to continue.
 4. Read `.worktree-task.md` if it exists to get the original task description
 
 ### Step 2: Review Changes
@@ -112,7 +112,7 @@ gh pr create --base <main-branch> --title "<PR title>" --body "$(cat <<'EOF'
 <git diff --stat summary>
 
 ---
-Created from worktree `wt/<name>` using `/worktree-deliver`
+Created from worktree `claude/<name>` using `/worktree-deliver`
 EOF
 )"
 ```

.claude/commands/worktree-init.md

@@ -28,8 +28,8 @@ If `$ARGUMENTS` is empty, use AskUserQuestion to ask the user to describe their
 
 For each task description:
 - Trim whitespace
-- Generate a kebab-case branch name: `wt/<kebab-case-task>` (max 50 chars, alphanumeric and hyphens only)
-- Generate a worktree directory path: `../worktrees/<repo-name>/wt-<kebab-case-task>`
+- Generate a kebab-case branch name: `claude/<kebab-case-task>` (max 50 chars, alphanumeric and hyphens only)
+- Generate a worktree directory path: `../worktrees/<repo-name>/claude-<kebab-case-task>`
 
 ### Step 3: Create Worktrees
 
@@ -38,13 +38,13 @@ For each task:
 1. Create the parent directory if needed: `mkdir -p ../worktrees/<repo-name>`
 2. Create the worktree:
    ```bash
-   git worktree add -b wt/<name> ../worktrees/<repo-name>/wt-<name> origin/<main-branch>
+   git worktree add -b claude/<name> ../worktrees/<repo-name>/claude-<name> origin/<main-branch>
    ```
 3. Write a `.worktree-task.md` file inside the new worktree with this content:
    ```markdown
    # Worktree Task
 
-   **Branch:** wt/<name>
+   **Branch:** claude/<name>
    **Task:** <original task description>
    **Created:** <ISO date>
    **Source repo:** <path to main repo>
@@ -67,7 +67,7 @@ Display a clear summary table:
 ```
 | # | Task | Branch | Path |
 |---|------|--------|------|
-| 1 | ... | wt/... | ../worktrees/repo/wt-... |
+| 1 | ... | claude/... | ../worktrees/repo/claude-... |
 ```
 
 Then display ready-to-copy commands for Ghostty panels. For each worktree:

cli-tool/components/commands/git-workflow/worktree-check.md

@@ -25,7 +25,7 @@ Then list any existing worktrees and exit.
 ### Step 2: Show Branch Info
 
 1. Get current branch: `git branch --show-current`
-2. Verify it follows the `wt/*` naming convention
+2. Verify it follows the `claude/*`, `claude-daniel/*`, or `review/*` naming convention
 3. Show how many commits ahead of origin/main: `git rev-list --count origin/main..HEAD`
 
 ### Step 3: Read Task
@@ -47,7 +47,7 @@ Present a clean summary:
 ```
 Worktree Status
 ──────────────────────────────────
-Branch:    wt/<name>
+Branch:    claude/<name>
 Task:      <task description from .worktree-task.md>
 Commits:   <N> ahead of main
 Modified:  <N> files

cli-tool/components/commands/git-workflow/worktree-cleanup.md

@@ -1,6 +1,6 @@
 ---
 allowed-tools: Bash(git:*), Bash(rm:*), Bash(ls:*), Bash(pwd:*), Bash(grep:*)
-argument-hint: --all | --branch wt/name | --dry-run
+argument-hint: --all | --branch claude/name | --dry-run
 description: Clean up merged worktrees and their branches
 ---
 
@@ -12,6 +12,15 @@ Remove worktrees and branches that have been merged: $ARGUMENTS
 
 You are in the **main repository** (not a worktree). Clean up finished worktrees.
 
+### Branch Patterns
+
+This project uses the following branch prefixes for worktrees:
+- `claude/*` — Claude Code auto-created worktrees
+- `claude-daniel/*` — User-created worktrees
+- `review/*` — Component review worktrees
+
+All three prefixes must be checked in every step below.
+
 ### Step 1: Validate Environment
 
 1. Verify this is the main working tree (first entry in `git worktree list`)
@@ -23,33 +32,43 @@ You are in the **main repository** (not a worktree). Clean up finished worktrees
 
 Parse `$ARGUMENTS` for options:
 
-- `--all` — clean up ALL merged `wt/*` worktrees and branches
-- `--branch wt/<name>` — clean up a specific worktree/branch
+- `--all` — clean up ALL merged worktrees and branches
+- `--branch <prefix>/<name>` — clean up a specific worktree/branch
 - `--dry-run` — show what would be cleaned up without doing anything
+- `--force-all` — remove ALL worktrees regardless of merge status (asks confirmation per worktree)
 - No arguments — list worktrees and ask which to clean up
 
 ### Step 3: Identify Worktrees
 
 1. List all worktrees: `git worktree list`
-2. List all `wt/*` branches: `git branch --list 'wt/*'`
-3. For each `wt/*` branch, check if it's been merged into main:
+2. List all matching branches:
    ```bash
-   git branch --merged origin/<main-branch> | grep 'wt/'
+   git branch --list 'claude/*' 'claude-daniel/*' 'review/*'
+   ```
+3. For each matching branch, check if it's been merged into main:
+   ```bash
+   git branch --merged origin/<main-branch> | grep -E '^\s+(claude/|claude-daniel/|review/)'
    ```
 4. Also check remote branches:
    ```bash
-   git branch -r --merged origin/<main-branch> | grep 'origin/wt/'
+   git branch -r --merged origin/<main-branch> | grep -E 'origin/(claude/|claude-daniel/|review/)'
+   ```
+5. For squash-merged branches (not detected by `--merged`), check if the branch diff is empty against main:
+   ```bash
+   # A branch is effectively merged if its changes already exist in main
+   git diff origin/main...<branch> --stat
    ```
+   If the diff is empty or very small (only whitespace), consider it merged.
 
 ### Step 4: Display Status
 
-Show a table of all `wt/*` worktrees/branches:
+Show a table of all worktrees/branches:
 
 ```
-| Branch | Worktree Path | Merged? | Action |
-|--------|--------------|---------|--------|
-| wt/login-page | ../worktrees/repo/wt-login-page | Yes | Will remove |
-| wt/auth-bug | ../worktrees/repo/wt-auth-bug | No | Skipped (not merged) |
+| # | Worktree | Branch | Merged? | Dirty? | Action |
+|---|---------|--------|---------|--------|--------|
+| 1 | eager-mendeleev | claude/eager-mendeleev | Yes | Clean | Will remove |
+| 2 | agent-a7e312d0 | review/code-reviewer-2026-04-01 | No | Clean | Skipped |
 ```
 
 ### Step 5: Confirm and Execute
@@ -58,7 +77,7 @@ If `--dry-run` was specified, show the table and stop.
 
 Otherwise, use AskUserQuestion to confirm cleanup (unless `--all` was specified with only merged branches).
 
-For each **merged** worktree/branch to clean up:
+For each worktree/branch to clean up:
 
 1. Remove the worktree:
    ```bash
@@ -68,13 +87,13 @@ For each **merged** worktree/branch to clean up:
 
 2. Delete the local branch:
    ```bash
-   git branch -d wt/<name>
+   git branch -d <branch>
    ```
-   Use `-d` (not `-D`) — this is safe because it only deletes merged branches.
+   Use `-d` (not `-D`) for merged branches. For `--force-all` unmerged branches, use `-D` only after explicit user confirmation.
 
-3. Delete the remote branch:
+3. Delete the remote branch (if it exists):
    ```bash
-   git push origin --delete wt/<name>
+   git push origin --delete <branch>
    ```
    If the remote branch doesn't exist, ignore the error silently.
 
@@ -102,4 +121,4 @@ Skipped:  <N> unmerged branch(es)
 
 If any unmerged branches were skipped, list them and suggest:
 - Merge the PR first, then run cleanup again
-- Or use `git worktree remove <path>` and `git branch -D wt/<name>` manually if the work is truly abandoned
+- Or use `git worktree remove <path>` and `git branch -D <branch>` manually if the work is truly abandoned

cli-tool/components/commands/git-workflow/worktree-deliver.md

@@ -15,7 +15,7 @@ You are inside a worktree. Package up the work and deliver it as a PR.
 
 1. Verify this is a worktree (not the main working tree) using `git worktree list`
 2. Get current branch: `git branch --show-current`
-3. Verify branch follows `wt/*` pattern. If not, warn the user and ask if they want to continue.
+3. Verify branch follows `claude/*`, `claude-daniel/*`, or `review/*` pattern. If not, warn the user and ask if they want to continue.
 4. Read `.worktree-task.md` if it exists to get the original task description
 
 ### Step 2: Review Changes
@@ -112,7 +112,7 @@ gh pr create --base <main-branch> --title "<PR title>" --body "$(cat <<'EOF'
 <git diff --stat summary>
 
 ---
-Created from worktree `wt/<name>` using `/worktree-deliver`
+Created from worktree `claude/<name>` using `/worktree-deliver`
 EOF
 )"
 ```

cli-tool/components/commands/git-workflow/worktree-init.md

@@ -28,8 +28,8 @@ If `$ARGUMENTS` is empty, use AskUserQuestion to ask the user to describe their
 
 For each task description:
 - Trim whitespace
-- Generate a kebab-case branch name: `wt/<kebab-case-task>` (max 50 chars, alphanumeric and hyphens only)
-- Generate a worktree directory path: `../worktrees/<repo-name>/wt-<kebab-case-task>`
+- Generate a kebab-case branch name: `claude/<kebab-case-task>` (max 50 chars, alphanumeric and hyphens only)
+- Generate a worktree directory path: `../worktrees/<repo-name>/claude-<kebab-case-task>`
 
 ### Step 3: Create Worktrees
 
@@ -38,13 +38,13 @@ For each task:
 1. Create the parent directory if needed: `mkdir -p ../worktrees/<repo-name>`
 2. Create the worktree:
    ```bash
-   git worktree add -b wt/<name> ../worktrees/<repo-name>/wt-<name> origin/<main-branch>
+   git worktree add -b claude/<name> ../worktrees/<repo-name>/claude-<name> origin/<main-branch>
    ```
 3. Write a `.worktree-task.md` file inside the new worktree with this content:
    ```markdown
    # Worktree Task
 
-   **Branch:** wt/<name>
+   **Branch:** claude/<name>
    **Task:** <original task description>
    **Created:** <ISO date>
    **Source repo:** <path to main repo>
@@ -67,7 +67,7 @@ Display a clear summary table:
 ```
 | # | Task | Branch | Path |
 |---|------|--------|------|
-| 1 | ... | wt/... | ../worktrees/repo/wt-... |
+| 1 | ... | claude/... | ../worktrees/repo/claude-... |
 ```
 
 Then display ready-to-copy commands for Ghostty panels. For each worktree: