codebyplan 1.13.22 → 1.13.24

package/templates/hooks/cbp-test-hooks.sh

@@ -255,77 +255,6 @@ fi
 
 echo ""
 
-# ===== HOOK SMOKE TESTS — cbp-cmux-workspace-sync + cbp-cmux-branch-watch =====
-echo "## Hook Smoke Tests — cbp-cmux-workspace-sync + cbp-cmux-branch-watch (CHK-162)"
-
-# --- cbp-cmux-workspace-sync.sh ---
-
-if [ ! -f "$HOOKS_DIR/cbp-cmux-workspace-sync.sh" ]; then
-  test_result "cbp-cmux-workspace-sync.sh present" "passed" "missing"
-else
-  test_result "cbp-cmux-workspace-sync.sh present" "passed" "passed"
-
-  FIRST_LINE=$(head -1 "$HOOKS_DIR/cbp-cmux-workspace-sync.sh")
-  if echo "$FIRST_LINE" | grep -q '^#!/'; then
-    test_result "cbp-cmux-workspace-sync.sh has shebang" "passed" "passed"
-  else
-    test_result "cbp-cmux-workspace-sync.sh has shebang" "passed" "missing"
-  fi
-
-  if grep -q '@scope: org-shared' "$HOOKS_DIR/cbp-cmux-workspace-sync.sh"; then
-    test_result "cbp-cmux-workspace-sync.sh has @scope: org-shared" "passed" "passed"
-  else
-    test_result "cbp-cmux-workspace-sync.sh has @scope: org-shared" "passed" "missing"
-  fi
-
-  # Graceful-degrade: CMUX_WORKSPACE_ID unset → fast-path exit 0, no output
-  ACTUAL_EXIT=$(env -u CMUX_WORKSPACE_ID bash "$HOOKS_DIR/cbp-cmux-workspace-sync.sh" <<< '{}' >/dev/null 2>&1; echo $?)
-  if [ "$ACTUAL_EXIT" = "0" ]; then
-    test_result "cbp-cmux-workspace-sync.sh graceful-degrade (no CMUX_WORKSPACE_ID) exits 0" "passed" "passed"
-  else
-    test_result "cbp-cmux-workspace-sync.sh graceful-degrade (no CMUX_WORKSPACE_ID) exits 0" "passed" "failed"
-  fi
-fi
-
-# --- cbp-cmux-branch-watch.sh ---
-
-if [ ! -f "$HOOKS_DIR/cbp-cmux-branch-watch.sh" ]; then
-  test_result "cbp-cmux-branch-watch.sh present" "passed" "missing"
-else
-  test_result "cbp-cmux-branch-watch.sh present" "passed" "passed"
-
-  FIRST_LINE=$(head -1 "$HOOKS_DIR/cbp-cmux-branch-watch.sh")
-  if echo "$FIRST_LINE" | grep -q '^#!/'; then
-    test_result "cbp-cmux-branch-watch.sh has shebang" "passed" "passed"
-  else
-    test_result "cbp-cmux-branch-watch.sh has shebang" "passed" "missing"
-  fi
-
-  if grep -q '@scope: org-shared' "$HOOKS_DIR/cbp-cmux-branch-watch.sh"; then
-    test_result "cbp-cmux-branch-watch.sh has @scope: org-shared" "passed" "passed"
-  else
-    test_result "cbp-cmux-branch-watch.sh has @scope: org-shared" "passed" "missing"
-  fi
-
-  # Graceful-degrade: CMUX_WORKSPACE_ID unset → fast-path exit 0
-  ACTUAL_EXIT=$(env -u CMUX_WORKSPACE_ID bash "$HOOKS_DIR/cbp-cmux-branch-watch.sh" <<< '{"tool_input":{"command":"git checkout main"}}' >/dev/null 2>&1; echo $?)
-  if [ "$ACTUAL_EXIT" = "0" ]; then
-    test_result "cbp-cmux-branch-watch.sh graceful-degrade (no CMUX_WORKSPACE_ID) exits 0" "passed" "passed"
-  else
-    test_result "cbp-cmux-branch-watch.sh graceful-degrade (no CMUX_WORKSPACE_ID) exits 0" "passed" "failed"
-  fi
-
-  # Non-checkout command → no-op exit 0 (even with CMUX_WORKSPACE_ID set, non-checkout should skip sync)
-  ACTUAL_EXIT=$(CMUX_WORKSPACE_ID=test-ws bash "$HOOKS_DIR/cbp-cmux-branch-watch.sh" <<< '{"tool_input":{"command":"git status"}}' >/dev/null 2>&1; echo $?)
-  if [ "$ACTUAL_EXIT" = "0" ]; then
-    test_result "cbp-cmux-branch-watch.sh non-checkout command exits 0" "passed" "passed"
-  else
-    test_result "cbp-cmux-branch-watch.sh non-checkout command exits 0" "passed" "failed"
-  fi
-fi
-
-echo ""
-
 # ===== SUMMARY =====
 echo "=== TEST SUMMARY ==="
 echo -e "Passed: ${GREEN}$PASSED${NC}"

package/templates/hooks/hooks.json

@@ -1,16 +1,5 @@
 {
   "hooks": {
-    "SessionStart": [
-      {
-        "matcher": "*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/cbp-cmux-workspace-sync.sh"
-          }
-        ]
-      }
-    ],
     "PreToolUse": [
       {
         "matcher": "Edit|Write|MultiEdit",
@@ -70,15 +59,6 @@
             "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/cbp-mcp-round-sync.sh"
           }
         ]
-      },
-      {
-        "matcher": "Bash",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/cbp-cmux-branch-watch.sh"
-          }
-        ]
       }
     ]
   }

package/templates/settings.project.base.json

@@ -118,7 +118,6 @@
       "Skill(cbp-round-input)",
       "Skill(cbp-round-start)",
       "Skill(cbp-session-start)",
-      "Skill(cbp-setup-cmux)",
       "Skill(cbp-setup-e2e)",
       "Skill(cbp-setup-eslint)",
       "Skill(cbp-ship-configure)",
@@ -179,12 +178,6 @@
       "Bash(npx codebyplan whoami:*)",
       "Bash(codebyplan resolve-worktree:*)",
       "Bash(npx codebyplan resolve-worktree:*)",
-      "Bash(codebyplan cmux-sync:*)",
-      "Bash(npx codebyplan cmux-sync:*)",
-      "Bash(codebyplan cmux-status:*)",
-      "Bash(npx codebyplan cmux-status:*)",
-      "Bash(codebyplan cmux-serve:*)",
-      "Bash(npx codebyplan cmux-serve:*)",
       "Bash(codebyplan version-status:*)",
       "Bash(npx codebyplan version-status:*)",
       "Bash(codebyplan statusline:*)",

package/templates/skills/cbp-round-execute/SKILL.md

@@ -57,16 +57,6 @@ Read the plan from round context (`context.planner_output`). If no plan: `No app
 
 Read effective testing profile: `round.context.testing_profile_override` if set (user override for this round only), else `task.context.testing_profile` (set by planner Phase 4.8), else default `'web'`. Pass the effective profile to all per-wave `cbp-testing-qa-agent` spawns.
 
-### Step 2a: Auto-Dev-Server (cmux)
-
-Fire the dev-server hook at round-execution start. Self-no-ops outside cmux or when `auto_dev_server` is disabled in `.codebyplan/cmux.json`.
-
-```bash
-npx codebyplan cmux-serve --files "<comma-separated approved_plan.files_to_modify[].path>"
-```
-
-The subcommand reads `.codebyplan/server.json` `port_allocations[]`, resolves which apps' source dirs intersect the round's files, probes each allocated port, and starts a cmux terminal split + browser pane for any app not already serving. Idempotent — if the port is already listening it only opens the browser pane (mitigating the multi-worktree port collision).
-
 ### Step 3: Route Execution Path
 
 Inspect `approved_plan.files_to_modify[]` and `approved_plan.round_type`. Four execution paths exist; pick the one that matches BEFORE Step 3a/3b.
@@ -153,14 +143,6 @@ If the approved plan includes database schema changes, RLS policies, or type gen
 - `status: 'blocked'` → present blocker to user via AskUserQuestion, resolve, re-spawn executor with remaining work
 - Deliverables incomplete → re-spawn executor with remaining deliverables (max 3 re-triggers). After 3 re-triggers, save partial output and proceed.
 
-### Step 3d: Push cmux QA Status
-
-Push the round's QA outcome to the cmux workspace sidebar. Self-no-ops outside cmux or when `auto_status` is disabled. Status is one of: `completed`, `blocked`, or `re-triggering`.
-
-```bash
-npx codebyplan cmux-status --qa "R{round_number} {status}"
-```
-
 ### Step 4: Dev-Server Probe (rounds 2+, web/desktop profile)
 
 When `round_number >= 2` AND `testing_profile` is `'web'` or `'desktop'` AND `files_changed` contains any UI file, probe the dev server BEFORE cbp-testing-qa-agent spawns (saves a full agent spawn when the server is down).

package/templates/skills/cbp-session-start/SKILL.md

@@ -97,6 +97,8 @@ Check whether a newer `codebyplan` is published and safe to auto-install on this
 
 ```bash
 VERSION_JSON=$(npx codebyplan version-status 2>/dev/null)
+# Populate the claude-status cache best-effort (pure cache population — never gates session-start).
+npx codebyplan claude status --write-cache --quiet 2>/dev/null || true
 ```
 
 Parse `$VERSION_JSON` as JSON and branch on the result:

package/templates/skills/cbp-task-complete/SKILL.md

@@ -138,20 +138,6 @@ Skip the push only when nothing was committed in Step 5 AND `/cbp-merge-main` re
 
 Call `complete_task(task_id)`. The server resolves the caller's worktree identity from the JWT/ctx and enforces the mutate-lock (CHK-140 TASK-3 — `caller_worktree_id` input field removed). The server auto-clears `assigned_user_id` + `assigned_worktree_id` on the task; if this was the last sibling task, it also clears the parent checkpoint's assignment. (Per CHK-104 hard-lock.)
 
-### Step 7.3: Push cmux Status (task done + progress)
-
-Push completion status and checkpoint progress to the cmux workspace sidebar. Self-no-ops outside cmux or when `auto_status` is disabled.
-
-Compute progress from the `get_tasks` data already loaded by the routing step: `completed = count of tasks with status 'completed'`, `total = total task count for the checkpoint`. For standalone tasks (no checkpoint), omit `--progress`.
-
-```bash
-# Checkpoint-bound task:
-npx codebyplan cmux-status --task "TASK-{N}: {task-title} done" --progress {completed}/{total}
-
-# Standalone task:
-npx codebyplan cmux-status --task "TASK-{N}: {task-title} done"
-```
-
 ### Step 8: Run Cleanup + Migration (inline)
 
 Apply the `cleanup` skill inline to remove orphan references to deleted/modified files. Then apply `migration` to propagate renames/moves to consumers. Both run without sub-agent spawns. Skip cleanup if no deletions/modifications; skip migration if cleanup handled everything.

package/templates/skills/cbp-task-start/SKILL.md

@@ -228,14 +228,6 @@ Display context summary:
 - **Previous rounds**: [count] completed
 ```
 
-### Step 4.5: Push cmux Status
-
-Push the active checkpoint and task context to the cmux workspace sidebar. Self-no-ops outside cmux or when `auto_status` is disabled in `.codebyplan/cmux.json`.
-
-```bash
-npx codebyplan cmux-status --checkpoint "CHK-{NNN}: {checkpoint-title}" --task "TASK-{N}: {task-title}"
-```
-
 ### Step 5: Set Task Status
 
 Use MCP `update_task(task_id, status: "in_progress")`.

package/templates/hooks/cbp-cmux-branch-watch.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-# @scope: org-shared
-# Hook: PostToolUse Bash
-# Purpose: After a Bash tool call that contains a git checkout or git switch command,
-#          sync the active cmux workspace title to the current git branch and the
-#          workspace description to the repo folder basename.
-#          Delegates entirely to `codebyplan cmux-sync` — no cmux or git logic here.
-#          Matching is broad: it also fires on file-restore forms such as
-#          `git checkout -- <file>`. That is intentional — `codebyplan cmux-sync` is
-#          idempotent, so a redundant sync on a non-branch-change is harmless, and the
-#          broad match guarantees a real branch change is never missed.
-#          No-ops silently when CMUX_WORKSPACE_ID is unset or the command contains no
-#          checkout/switch. Exit 0 on every path — never blocks tool execution.
-
-# Fast-path: skip npx spawn when clearly not in a cmux workspace.
-[ -n "$CMUX_WORKSPACE_ID" ] || exit 0
-
-# Parse stdin — PostToolUse hooks receive JSON on stdin.
-# Guard against jq absence: if jq is not available the whole block is skipped.
-if command -v jq >/dev/null 2>&1; then
-  INPUT=$(cat 2>/dev/null || true)
-  CMD=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
-
-  # Run the sync when the command contains git checkout/switch. Broad match by design:
-  # also catches file-restore forms (e.g. `git checkout -- <file>`); cmux-sync is
-  # idempotent so a redundant sync is harmless, and a real branch change is never missed.
-  if ! echo "$CMD" | grep -qE 'git[[:space:]]+(checkout|switch)' 2>/dev/null; then
-    exit 0
-  fi
-else
-  # jq not available — drain stdin and skip.
-  cat >/dev/null 2>&1 || true
-  exit 0
-fi
-
-# Delegate to the CLI subcommand (self-no-ops when cmux binary is absent).
-npx codebyplan cmux-sync >/dev/null 2>&1 || true
-
-exit 0

package/templates/hooks/cbp-cmux-workspace-sync.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-# @scope: org-shared
-# Hook: SessionStart
-# Purpose: On session start, sync the active cmux workspace title to the current git branch
-#          and the workspace description to the repo folder basename.
-#          Delegates entirely to `codebyplan cmux-sync` — no cmux or git logic here.
-#          No-ops silently when CMUX_WORKSPACE_ID is unset (not inside a cmux workspace).
-#          Exit 0 on every path — never blocks session start.
-
-# Fast-path: skip npx spawn when clearly not in a cmux workspace.
-[ -n "$CMUX_WORKSPACE_ID" ] || exit 0
-
-# Drain stdin — SessionStart hooks receive JSON on stdin; we don't use it.
-cat >/dev/null 2>&1
-
-# Delegate to the CLI subcommand (self-no-ops when cmux binary is absent).
-npx codebyplan cmux-sync >/dev/null 2>&1 || true
-
-exit 0

package/templates/skills/cbp-setup-cmux/SKILL.md

@@ -1,170 +0,0 @@
----
-scope: org-shared
-name: cbp-setup-cmux
-description: Configure .codebyplan/cmux.json — choose workspace color and toggle auto_status / auto_dev_server. Interactive, idempotent.
-argument-hint: "[--force]"
-model: sonnet
-effort: xhigh
-allowed-tools: Read, Write, Edit, Bash(cat *), Bash(jq *), Bash(test *), Bash(mv *), Bash(git check-ignore *), Bash(cmux *), AskUserQuestion
----
-
-# cmux Setup
-
-Configure `.codebyplan/cmux.json` so the cmux workspace integration knows which color to
-apply on session start and whether auto_status / auto_dev_server are enabled.
-
-Invoke at any time. Existing values are preserved unless `--force` is passed.
-Pass `--force` to re-ask all questions including already-configured fields.
-
-## Arguments
-
-Inspect `$ARGUMENTS` for `--force`. If present, set `force_mode = true`.
-Absent: use idempotent mode — preserve existing configured values, skip re-asking
-already-set fields.
-
-## Step 1 — Parse --force and read existing config
-
-```bash
-cat .codebyplan/cmux.json 2>/dev/null || echo '{}'
-```
-
-Capture the result as `EXISTING_JSON`. Extract existing values:
-
-```bash
-EXISTING_COLOR=$(echo "$EXISTING_JSON" | jq -r '.workspace_color // empty')
-EXISTING_AUTO_STATUS=$(echo "$EXISTING_JSON" | jq -r '.auto_status // empty')
-EXISTING_AUTO_DEV=$(echo "$EXISTING_JSON" | jq -r '.auto_dev_server // empty')
-```
-
-## Step 2 — Ask for workspace color
-
-**Idempotency gate**: skip this question if `force_mode = false` AND `EXISTING_COLOR`
-is a non-empty string. Print the preserved value and continue to Step 3.
-
-Otherwise, AskUserQuestion:
-
-```
-Workspace color for this cmux workspace
-
-Choose a named color or enter a custom hex value (#RRGGBB).
-
-Named colors:
-  A) Red        B) Crimson    C) Orange     D) Amber
-  E) Olive      F) Green      G) Teal       H) Aqua
-  I) Blue       J) Navy       K) Indigo     L) Purple
-  M) Magenta    N) Rose       O) Brown      P) Charcoal
-  Q) Custom hex — enter a value in the format #RRGGBB
-
-Enter a letter (A-Q) or type a custom hex value directly:
-```
-
-Validate the input:
-- If a letter A-P: map to the corresponding color name (e.g. "A" → "Red").
-- If "Q": prompt the user to type a custom hex value, then validate the typed value
-  against `^#[0-9A-Fa-f]{6}$`. If invalid, re-prompt once with an error. Never pass the
-  bare letter "Q" to set-color.
-- If the raw input itself already looks like a hex value: validate it against
-  `^#[0-9A-Fa-f]{6}$` and accept on match.
-- Empty input with no existing color: use no color (leave `workspace_color` as `null`).
-
-Set `NEW_COLOR` to the chosen color name / hex, or `null` if skipped.
-
-## Step 3 — Ask for auto_status and auto_dev_server toggles
-
-**Idempotency gate**: skip questions for fields that are already set (non-empty in
-existing config) when `force_mode = false`.
-
-For each unset field (or all fields when `force_mode = true`), AskUserQuestion:
-
-```
-cmux integration toggles
-
-auto_status: automatically run `cmux status` in this workspace on session start?
-  (default: on)
-  A) On
-  B) Off
-
-auto_dev_server: automatically start the dev server via cmux on session start?
-  (default: on)
-  A) On
-  B) Off
-```
-
-Ask both in a single question when both are unset. Set `NEW_AUTO_STATUS` and
-`NEW_AUTO_DEV` to `true` or `false` based on the answers.
-
-## Step 4 — Write .codebyplan/cmux.json
-
-Build the updated payload using jq deep-merge so sibling fields added by future
-schema versions are preserved. Assemble variables first.
-
-Backfill any field that the Step 2/3 idempotency gates skipped, so each `jq
---argjson` always receives valid JSON — an empty shell variable makes `jq` exit 1,
-which would leave `NEW_PAYLOAD` empty and silently no-op the write. Fall back to the
-existing value, then to the default (`true` for the toggles):
-
-```bash
-NEW_COLOR="${NEW_COLOR:-$EXISTING_COLOR}"
-NEW_AUTO_STATUS="${NEW_AUTO_STATUS:-${EXISTING_AUTO_STATUS:-true}}"
-NEW_AUTO_DEV="${NEW_AUTO_DEV:-${EXISTING_AUTO_DEV:-true}}"
-```
-
-```bash
-NEW_COLOR_JSON=$(echo "$NEW_COLOR" | jq -R 'if . == "null" or . == "" then null else . end')
-NEW_PAYLOAD=$(jq -n \
-  --argjson color "$NEW_COLOR_JSON" \
-  --argjson auto_status "$NEW_AUTO_STATUS" \
-  --argjson auto_dev_server "$NEW_AUTO_DEV" \
-  '{workspace_color: $color, auto_status: $auto_status, auto_dev_server: $auto_dev_server}')
-```
-
-Atomic write via jq tmp+mv deep-merge (`. * $new` deep-merges, preserving any
-sibling keys not in the new payload):
-
-```bash
-jq --argjson new "$NEW_PAYLOAD" '. * $new' \
-  .codebyplan/cmux.json > .codebyplan/cmux.json.tmp \
-  && mv .codebyplan/cmux.json.tmp .codebyplan/cmux.json
-```
-
-## Step 5 — Apply color immediately
-
-If `NEW_COLOR` is a non-empty, non-null string AND cmux is available in the current
-environment (`$CMUX_WORKSPACE_ID` is set), apply the color immediately so the change
-is visible without needing to restart the session:
-
-```bash
-if [ -n "$CMUX_WORKSPACE_ID" ] && [ -n "$NEW_COLOR" ] && [ "$NEW_COLOR" != "null" ]; then
-  CMUX_BIN="${CMUX_BUNDLED_CLI_PATH:-${CMUX_CLAUDE_HOOK_CMUX_BIN:-cmux}}"
-  "$CMUX_BIN" workspace-action --action set-color --color "$NEW_COLOR" 2>/dev/null || true
-fi
-```
-
-The guard (`2>/dev/null || true`) ensures a missing or non-zero cmux never blocks
-the skill — applying the color is best-effort.
-
-## Step 6 — Verify and report
-
-Re-read `.codebyplan/cmux.json` and emit a summary:
-
-```
-cmux Setup — Complete
-
-  workspace_color : <value or "(none)">
-  auto_status     : <true|false>
-  auto_dev_server : <true|false>
-
-Config written to .codebyplan/cmux.json
-
-Next: on the next SessionStart, codebyplan cmux-sync will apply the color
-automatically. Run `/cbp-setup-cmux --force` at any time to reconfigure.
-```
-
-## Key Rules
-
-- Atomic write (tmp + mv) — never leaves cmux.json in a partial state
-- Deep-merge with `. * $new` — sibling keys from future schema versions are preserved
-- Color apply is best-effort — a missing cmux binary never causes an error
-- `auto_status` and `auto_dev_server` default to `true` when absent (documented in
-  `packages/codebyplan-package/src/lib/types.ts` CmuxConfig)
-- cmux.json is COMMITTED (not gitignored) — workspace color is shared across team members