cc-workspace 4.7.0 → 4.7.1

package/global-skills/agents/implementer.md

@@ -20,8 +20,8 @@ hooks:
             [ -z "$CMD" ] && exit 0
             # Block git checkout/switch in sibling repos (would disrupt main working tree)
             if echo "$CMD" | grep -qE 'git\s+(-C\s+\.\./\S+\s+)?(checkout|switch)\s'; then
-              # Allow checkout inside /tmp/ worktrees (that's the intended workflow)
-              if echo "$CMD" | grep -qE '^\s*cd\s+/tmp/' || echo "$CMD" | grep -qE 'git\s+-C\s+/tmp/'; then
+              # Allow checkout inside /tmp/ worktrees (macOS: /tmp -> /private/tmp)
+              if echo "$CMD" | grep -qE '^\s*cd\s+(/private)?/tmp/' || echo "$CMD" | grep -qE 'git\s+-C\s+(/private)?/tmp/'; then
                 exit 0
               fi
               printf '{"hookSpecificOutput":{"hookEventName":"PreToolUse","permissionDecision":"deny","permissionDecisionReason":"BLOCKED: git checkout/switch targets a main repo. Use your /tmp/ worktree instead. See Git workflow instructions."}}'
@@ -51,23 +51,32 @@ Previous commits are already on the session branch — you'll see them in your w
 
 ## Git workflow (do this FIRST)
 
-You work in a **temporary worktree**. If you don't commit, YOUR WORK IS LOST.
+You work in a **worktree**. If you don't commit, YOUR WORK IS LOST.
 
-### Setup
+### Setup — ALWAYS check for existing worktree first
 ```bash
-# 1. Create worktree (or reuse if previous attempt left one)
-git -C ../[repo] worktree add /tmp/[repo]-[session] session/[branch]
-# If fails with "already checked out": previous crash left a worktree
-#   → cd /tmp/[repo]-[session] && git status to assess state
-
-# 2. Move into worktree — ALL work happens here
-cd /tmp/[repo]-[session]
-
-# 3. Verify branch
+# 1. FIRST: check if a worktree already exists for the session branch
+WORKTREE_PATH=$(git -C ../[repo] worktree list --porcelain | grep -B1 'branch.*session/[branch]' | head -1 | sed 's/worktree //')
+
+if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
+  # Worktree exists — REUSE IT (do NOT create a new one)
+  cd "$WORKTREE_PATH"
+  echo "Reusing existing worktree at $WORKTREE_PATH"
+else
+  # No worktree — create one
+  git -C ../[repo] worktree add /tmp/[repo]-[session] session/[branch]
+  cd /tmp/[repo]-[session]
+fi
+
+# 2. Verify branch
 git branch --show-current  # must show session/[branch]
 
-# 4. Check existing commits from previous implementers
+# 3. Check existing commits from previous implementers
 git log --oneline -5
+
+# 4. Check for leftover uncommitted changes from a crashed previous implementer
+git status --short
+# If dirty: assess changes — commit useful ones, discard junk with git checkout -- .
 ```
 
 If session branch doesn't exist:
@@ -76,13 +85,8 @@ git -C ../[repo] branch session/[branch] [source-branch]
 git -C ../[repo] worktree add /tmp/[repo]-[session] session/[branch]
 ```
 
-### Recovering from a previous failed attempt
-If `git worktree add` fails because the worktree already exists:
-1. `cd /tmp/[repo]-[session]` — enter the existing worktree
-2. `git status` — check for uncommitted changes from the previous implementer
-3. `git log --oneline -3` — check if the previous attempt committed anything
-4. If changes exist but aren't committed: assess if they're useful, commit or discard
-5. If clean: proceed normally with your commit unit
+**IMPORTANT — macOS paths**: `/tmp` is a symlink to `/private/tmp`.
+Git worktree list shows `/private/tmp/...`. Both paths are valid. Use whichever `worktree list` reports.
 
 ## Workflow
 
@@ -116,9 +120,11 @@ Report:
 - Dead code found
 - Blockers or escalations
 
-Cleanup:
+Cleanup — **do NOT remove the worktree** (next implementer will reuse it):
 ```bash
-git -C ../[repo] worktree remove /tmp/[repo]-[session]
+# Only verify the tree is clean after commit
+git status  # must show "nothing to commit, working tree clean"
+# The orchestrator or session close skill handles worktree cleanup
 ```
 
 ## Memory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-workspace",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Claude Code multi-workspace orchestrator — skills, hooks, agents, and templates for multi-service projects",
   "bin": {
     "cc-workspace": "./bin/cli.js"