cc-workspace 4.1.3 → 4.1.4

package/README.md

@@ -27,7 +27,7 @@ cd ~/projects/my-workspace
 npx cc-workspace init . "My Project"
 ```
 
-This creates an `orchestrator/` directory and installs 9 skills, 3 agents, 11 hooks, and 3 rules into `~/.claude/`.
+This creates an `orchestrator/` directory and installs 9 skills, 3 agents, 9 hooks, and 3 rules into `~/.claude/`.
 
 ### Configure (one time)
 
@@ -200,13 +200,13 @@ next one starts. The plan on disk is the source of truth.
 
 ---
 
-## The 11 hooks
+## The 9 hooks + 1 agent-level hook
 
-All hooks are **non-blocking** (exit 0 + warning). No hook blocks the session.
+All hooks in settings.json are **non-blocking** (exit 0 + warning). No hook blocks the session.
 
 | Hook | Event | Effect |
 |------|-------|--------|
-| **block-orchestrator-writes** | `PreToolUse` Write\|Edit\|MultiEdit | Blocks writes in repos, allows orchestrator/ |
+| **block-orchestrator-writes** | `PreToolUse` Write\|Edit\|MultiEdit | Blocks writes in repos, allows orchestrator/. **Agent frontmatter only** (team-lead) — not in settings.json, so teammates can write freely. |
 | **validate-spawn-prompt** | `PreToolUse` Teammate | Warning if missing context (rules, UX, tasks) |
 | **session-start-context** | `SessionStart` | Injects active plans + first session detection |
 | **user-prompt-guard** | `UserPromptSubmit` | Warning if code requested in a repo |
@@ -215,7 +215,6 @@ All hooks are **non-blocking** (exit 0 + warning). No hook blocks the session.
 | **track-file-modifications** | `PostToolUse` (async) | Log of modified files |
 | **teammate-idle-check** | `TeammateIdle` | Warning if remaining tasks |
 | **task-completed-check** | `TaskCompleted` | Warning if tests failed |
-| **worktree-create-context** | `WorktreeCreate` | Reminder to read repo CLAUDE.md |
 | **notify-user** | `Notification` | Desktop notification |
 
 ---
@@ -340,12 +339,15 @@ Both `init` and `update` are safe to re-run:
 
 ---
 
-## Changelog v4.1.0 -> v4.1.2
+## Changelog v4.1.0 -> v4.1.4
 
 | # | Fix | Detail |
 |---|-----|--------|
-| 1 | **Hook paths use `$CLAUDE_PROJECT_DIR`** | All 11 hooks in settings.json now resolve via `${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/` instead of relative `.claude/hooks/`. Fixes `WorktreeCreate hook failed: No such file or directory` when subagents run from a different CWD (worktree in sibling repo). |
-| 2 | **stdout/stderr fix on 3 hooks** | `worktree-create-context.sh`: stdout was interpreted as worktree path — moved to stderr. `task-completed-check.sh` and `teammate-idle-check.sh`: stdout ignored by Claude Code for these events — moved to stderr. |
+| 1 | **Hook paths use `$CLAUDE_PROJECT_DIR`** | All hooks in settings.json resolve via `${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/`. Fixes failures when subagents run from a worktree CWD. |
+| 2 | **stdout/stderr fix** | `task-completed-check.sh` and `teammate-idle-check.sh`: moved messages to stderr (stdout ignored by Claude Code for these events). |
+| 3 | **Removed `WorktreeCreate` hook** | stdout was interpreted as worktree path, creating ghost directories. Removed. |
+| 4 | **`block-orchestrator-writes` moved to agent frontmatter** | Was in settings.json → inherited by teammates, blocking their writes in worktrees. Now only in team-lead frontmatter. |
+| 5 | **`track-file-modifications` scoped** | Skips when `CLAUDE_PROJECT_DIR` is unset (teammate worktree). No more parasitic log files in worktrees. |
 
 ---
 

package/bin/cli.js

@@ -222,7 +222,9 @@ function generateSettings(orchDir) {
     },
     hooks: {
       PreToolUse: [
-        withMatcher("Write|Edit|MultiEdit", "block-orchestrator-writes.sh", 5),
+        // block-orchestrator-writes.sh is NOT here — it's in team-lead agent
+        // frontmatter only. Putting it in settings.json would block teammates
+        // from writing in their worktrees.
         withMatcher("Teammate", "validate-spawn-prompt.sh", 5)
       ],
       SessionStart: [
@@ -246,9 +248,6 @@ function generateSettings(orchDir) {
       TaskCompleted: [
         withoutMatcher("task-completed-check.sh", 3)
       ],
-      WorktreeCreate: [
-        withoutMatcher("worktree-create-context.sh", 3)
-      ],
       Notification: [
         withoutMatcher("notify-user.sh", 5)
       ]
@@ -468,12 +467,16 @@ function updateLocal() {
   // ── Hooks (always overwrite — security critical) ──
   const hooksDir = path.join(orchDir, ".claude", "hooks");
   if (fs.existsSync(hooksDir)) {
-    generateBlockHook(hooksDir);
-    count++;
+    // Clean obsolete hooks before copying new ones
+    const obsoleteHooks = ["block-orchestrator-writes.sh", "worktree-create-context.sh", "verify-cycle-complete.sh"];
+    for (const f of obsoleteHooks) {
+      const fp = path.join(hooksDir, f);
+      if (fs.existsSync(fp)) fs.unlinkSync(fp);
+    }
     const hooksSrc = path.join(SKILLS_DIR, "hooks");
     if (fs.existsSync(hooksSrc)) {
       for (const f of fs.readdirSync(hooksSrc)) {
-        if (!f.endsWith(".sh") || f === "verify-cycle-complete.sh") continue;
+        if (!f.endsWith(".sh")) continue;
         copyFile(path.join(hooksSrc, f), path.join(hooksDir, f));
         fs.chmodSync(path.join(hooksDir, f), 0o755);
         count++;
@@ -575,12 +578,11 @@ function setupWorkspace(workspacePath, projectName) {
   // ── Hooks ──
   step("Installing hooks");
   const hooksDir = path.join(orchDir, ".claude", "hooks");
-  generateBlockHook(hooksDir);
   const hooksSrc = path.join(SKILLS_DIR, "hooks");
-  let hookCount = 1;
+  let hookCount = 0;
   if (fs.existsSync(hooksSrc)) {
     for (const f of fs.readdirSync(hooksSrc)) {
-      if (!f.endsWith(".sh") || f === "verify-cycle-complete.sh") continue;
+      if (!f.endsWith(".sh")) continue;
       copyFile(path.join(hooksSrc, f), path.join(hooksDir, f));
       fs.chmodSync(path.join(hooksDir, f), 0o755);
       hookCount++;

package/global-skills/hooks/track-file-modifications.sh

@@ -2,18 +2,24 @@
 # track-file-modifications.sh
 # PostToolUse hook (async): logs modified files for merge-prep.
 # Matcher: Write|Edit|MultiEdit
-# Appends to .claude/modified-files.log
+# Appends to .claude/modified-files.log in orchestrator/ only.
+# Skips silently if CLAUDE_PROJECT_DIR is unset (teammate worktree context).
 set -euo pipefail
 
 INPUT=$(cat)
-PROJECT_DIR="${CLAUDE_PROJECT_DIR:-.}"
+PROJECT_DIR="${CLAUDE_PROJECT_DIR:-}"
+
+# Skip if not in orchestrator context
+if [ -z "$PROJECT_DIR" ] || [ ! -d "$PROJECT_DIR/.claude" ]; then
+    exit 0
+fi
+
 LOG_FILE="$PROJECT_DIR/.claude/modified-files.log"
 
 # Extract file path from tool input
 FILE_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.filePath // empty' 2>/dev/null) || true
 
 if [ -n "$FILE_PATH" ]; then
-    mkdir -p "$(dirname "$LOG_FILE")"
     echo "$(date +%Y-%m-%dT%H:%M:%S) $FILE_PATH" >> "$LOG_FILE"
 fi
 

package/package.json

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

package/global-skills/hooks/worktree-create-context.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# worktree-create-context.sh
-# WorktreeCreate hook: reminds teammate to read repo CLAUDE.md.
-# Messages go to stderr so stdout doesn't pollute the worktree path.
-set -euo pipefail
-
-INPUT=$(cat)
-
-WORKTREE_PATH=$(echo "$INPUT" | jq -r '.worktree_path // empty' 2>/dev/null) || true
-
-if [ -n "$WORKTREE_PATH" ]; then
-    if [ -f "$WORKTREE_PATH/CLAUDE.md" ]; then
-        echo "Read $WORKTREE_PATH/CLAUDE.md first — follow its conventions." >&2
-    else
-        echo "WARNING: No CLAUDE.md found in $WORKTREE_PATH. Check repo root or run bootstrap-repo." >&2
-    fi
-else
-    echo "Read the CLAUDE.md in the repo root first." >&2
-fi
-
-exit 0