codebyplan 1.13.15 → 1.13.17

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

@@ -0,0 +1,170 @@
+---
+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

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

@@ -138,6 +138,20 @@ 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,6 +228,14 @@ 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")`.