codebyplan 1.13.23 → 1.13.25

package/templates/hooks/cbp-statusline.sh

@@ -15,7 +15,7 @@
 #
 # DISPLAY OPTIONS (team-shared, committed)
 #   .codebyplan/statusline.json -> { "lines": {identity,context,cost,rate_limits,
-#                                    repo_pr,worktree,infra_drift}, "no_color": bool }
+#                                    repo_pr,worktree,infra_drift,package_freshness}, "no_color": bool }
 #
 # ENV-VAR OVERRIDES (env > config > default)
 #   CBP_STATUSLINE_HIDE_IDENTITY=1     suppress line 1 (folder, branch, model, effort, …)
@@ -24,7 +24,8 @@
 #   CBP_STATUSLINE_HIDE_RATE_LIMITS=1  suppress line 4 (5h / 7d rate limits)
 #   CBP_STATUSLINE_HIDE_REPO_PR=1      suppress line 5 (repo host/owner/name, PR)
 #   CBP_STATUSLINE_HIDE_WORKTREE=1     suppress line 6 (worktree name/branch/path)
-#   CBP_STATUSLINE_HIDE_INFRA_DRIFT=1  suppress line 7 (.claude infra commits behind main)
+#   CBP_STATUSLINE_HIDE_INFRA_DRIFT=1         suppress line 7 (.claude infra commits behind main)
+#   CBP_STATUSLINE_HIDE_PACKAGE_FRESHNESS=1   suppress line 8 (codebyplan package version)
 #   CBP_STATUSLINE_NO_COLOR=1          strip all ANSI colour codes (also honoured by $NO_COLOR)
 #
 # TEST SEAMS (no effect in normal use)
@@ -48,6 +49,17 @@ if [ -f "$CBP_LOCAL_CFG" ] && command -v jq >/dev/null 2>&1; then
   case "$_r" in bash|node|python) CBP_RENDERER="$_r" ;; esac
 fi
 
+# Background claude-status cache refresh (6h staleness gate).
+# `find -mmin -360` PRINTS the path only when the file exists AND is younger
+# than 6h; an EMPTY result means the cache is absent OR stale (>6h) — both
+# need a refresh. (find's exit code is 0 for a present-but-non-matching path,
+# so we must test its output, not its status.)
+# Fully detached — never blocks the render, never writes to this stdout.
+CBP_STATUS_CACHE="$CBP_ROOT/.codebyplan/claude-status.local.json"
+if [ -z "$(find "$CBP_STATUS_CACHE" -mmin -360 2>/dev/null)" ]; then
+  (npx codebyplan claude status --write-cache --quiet >/dev/null 2>&1 &)
+fi
+
 if [ "$CBP_RENDERER" = "node" ] && command -v node >/dev/null 2>&1 \
    && [ -f "$CBP_HOOK_DIR/cbp-statusline.mjs" ]; then
   CBP_STATUSLINE_ROOT="$CBP_ROOT" exec node "$CBP_HOOK_DIR/cbp-statusline.mjs"
@@ -83,7 +95,6 @@ eval "$(echo "$INPUT" | jq -r '
   @sh "CACHE_READ=\(.context_window.current_usage.cache_read_input_tokens // 0)",
   @sh "EXCEEDS_200K=\(.exceeds_200k_tokens // false)",
   @sh "EFFORT=\(.effort.level // "")",
-  @sh "THINKING=\(.thinking.enabled // false)",
   @sh "RATE_5H_PCT=\(.rate_limits.five_hour.used_percentage // "")",
   @sh "RATE_5H_RESETS=\(.rate_limits.five_hour.resets_at // 0)",
   @sh "RATE_7D_PCT=\(.rate_limits.seven_day.used_percentage // "")",
@@ -105,7 +116,7 @@ eval "$(echo "$INPUT" | jq -r '
 
 # ---- Config: line toggles + no_color from .codebyplan/statusline.json --------
 CFG_IDENTITY=true; CFG_CONTEXT=true; CFG_COST=true
-CFG_RATE_LIMITS=true; CFG_REPO_PR=true; CFG_WORKTREE=true; CFG_INFRA_DRIFT=true; CFG_NO_COLOR=false
+CFG_RATE_LIMITS=true; CFG_REPO_PR=true; CFG_WORKTREE=true; CFG_INFRA_DRIFT=true; CFG_PACKAGE_FRESHNESS=true; CFG_NO_COLOR=false
 CBP_CFG="$CBP_ROOT/.codebyplan/statusline.json"
 if [ -f "$CBP_CFG" ] && command -v jq >/dev/null 2>&1; then
   # Use `!= false` / `== true` (NOT jq `//`): the `//` operator treats an explicit
@@ -119,6 +130,7 @@ if [ -f "$CBP_CFG" ] && command -v jq >/dev/null 2>&1; then
     "CFG_REPO_PR=\(.lines.repo_pr != false)",
     "CFG_WORKTREE=\(.lines.worktree != false)",
     "CFG_INFRA_DRIFT=\(.lines.infra_drift != false)",
+    "CFG_PACKAGE_FRESHNESS=\(.lines.package_freshness != false)",
     "CFG_NO_COLOR=\(.no_color == true)"
   ' "$CBP_CFG" 2>/dev/null)"
 fi
@@ -150,6 +162,9 @@ fi
 # ---- Float-safe percentage comparison ----------------------------------------
 awk_gte() { awk -v v="$1" -v t="$2" 'BEGIN{exit !(v+0 >= t+0)}'; }
 
+# ---- Percentage formatter (integer round-half-up; cross-runtime identical) ----
+fmt_pct() { awk -v v="$1" 'BEGIN{ printf "%d", int(v + 0.5) }'; }
+
 # ---- Token/size formatter (K / M) — integer round-half-up (cross-runtime) -----
 fmt_k() {
   local val=$1
@@ -164,9 +179,9 @@ fmt_k() {
   fi
 }
 
-# ---- Cost formatter ($X.XXXX) — integer round-half-up (cross-runtime) ---------
+# ---- Cost formatter ($X.XX) — integer round-half-up (cross-runtime) -----------
 fmt_cost() {
-  awk -v c="$1" 'BEGIN{ n=int(c*10000 + 0.5); printf "$%d.%04d", int(n/10000), n%10000 }'
+  awk -v c="$1" 'BEGIN{ n=int(c*100 + 0.5); printf "$%d.%02d", int(n/100), n%100 }'
 }
 
 # ---- Duration formatter (ms → Xh Xm Xs) --------------------------------------
@@ -245,11 +260,6 @@ if should_show IDENTITY "$CFG_IDENTITY"; then
     L1="${L1} ${DIM}effort:${RST}${EFFORT}"
   fi
 
-  # Thinking (only when explicitly true)
-  if [ "$THINKING" = "true" ]; then
-    L1="${L1} ${YELLOW}thinking:on${RST}"
-  fi
-
   # Output style (when present and not "default")
   if [ -n "$OUTPUT_STYLE" ] && [ "$OUTPUT_STYLE" != "default" ]; then
     L1="${L1} ${DIM}style:${RST}${OUTPUT_STYLE}"
@@ -324,27 +334,29 @@ if should_show RATE_LIMITS "$CFG_RATE_LIMITS"; then
     L4=""
 
     if [ -n "$RATE_5H_PCT" ] && [ "$RATE_5H_RESETS" != "0" ]; then
-      if awk_gte "$RATE_5H_PCT" 80; then
+      R5=$(fmt_pct "$RATE_5H_PCT")
+      if awk_gte "$R5" 80; then
         C5="$RED"
-      elif awk_gte "$RATE_5H_PCT" 60; then
+      elif awk_gte "$R5" 60; then
         C5="$YELLOW"
       else
         C5="$GREEN"
       fi
       REL5=$(fmt_rel_time "$RATE_5H_RESETS")
-      L4="${DIM}5h:${RST}${C5}${RATE_5H_PCT}%${RST} ${DIM}(resets in ${REL5})${RST}"
+      L4="${DIM}5h:${RST}${C5}${R5}%${RST} ${DIM}(resets in ${REL5})${RST}"
     fi
 
     if [ -n "$RATE_7D_PCT" ] && [ "$RATE_7D_RESETS" != "0" ]; then
-      if awk_gte "$RATE_7D_PCT" 80; then
+      R7=$(fmt_pct "$RATE_7D_PCT")
+      if awk_gte "$R7" 80; then
         C7="$RED"
-      elif awk_gte "$RATE_7D_PCT" 60; then
+      elif awk_gte "$R7" 60; then
         C7="$YELLOW"
       else
         C7="$GREEN"
       fi
       REL7=$(fmt_rel_time "$RATE_7D_RESETS")
-      SEG7="${DIM}7d:${RST}${C7}${RATE_7D_PCT}%${RST} ${DIM}(resets in ${REL7})${RST}"
+      SEG7="${DIM}7d:${RST}${C7}${R7}%${RST} ${DIM}(resets in ${REL7})${RST}"
       if [ -n "$L4" ]; then
         L4="${L4} ${DIM}|${RST} ${SEG7}"
       else
@@ -421,3 +433,71 @@ if should_show INFRA_DRIFT "$CFG_INFRA_DRIFT"; then
       ;;
   esac
 fi
+
+# ============================================================
+# LINE 8 — Package freshness (codebyplan version / sync state)
+# ============================================================
+# Source: .codebyplan/claude-status.local.json (written by background refresh).
+# Inline fallback (cache absent): read .claude/.cbp.manifest.json vs
+# node_modules/codebyplan/package.json. HIDE when guarded (canonical_source /
+# no_manifest / unknown) or when manifest absent (not a managed consumer).
+if should_show PACKAGE_FRESHNESS "$CFG_PACKAGE_FRESHNESS"; then
+  L8=""
+  _CBP_GUARDED=false
+  _CBP_INSTALLED=""
+  _CBP_NEWER=false
+  _CBP_LATEST=""
+  _CBP_IN_SYNC=true
+
+  if [ -f "$CBP_STATUS_CACHE" ] && command -v jq >/dev/null 2>&1; then
+    # Cache present — read fields.
+    _cbp_guard_reason="$(jq -r '.guard_reason // ""' "$CBP_STATUS_CACHE" 2>/dev/null)"
+    case "$_cbp_guard_reason" in
+      canonical_source|no_manifest|unknown)
+        _CBP_GUARDED=true
+        ;;
+    esac
+    if [ "$_CBP_GUARDED" = "false" ]; then
+      _CBP_INSTALLED="$(jq -r '.installed // ""' "$CBP_STATUS_CACHE" 2>/dev/null)"
+      _CBP_NEWER="$(jq -r '.newer == true' "$CBP_STATUS_CACHE" 2>/dev/null)"
+      _CBP_LATEST="$(jq -r '.latest // ""' "$CBP_STATUS_CACHE" 2>/dev/null)"
+      # NOTE: `!= false` (NOT jq `//`): the `//` operator treats an explicit
+      # `false` as absent, so `.in_sync // true` would yield "true" for an
+      # out-of-sync cache and silently drop the ⟳ indicator (CHK-175 TASK-3 R1
+      # finding #1). `!= false` mirrors node `in_sync !== false` / python.
+      _CBP_IN_SYNC="$(jq -r '.in_sync != false' "$CBP_STATUS_CACHE" 2>/dev/null)"
+    fi
+  else
+    # Inline fallback: no cache, no network — read-only file reads only.
+    _cbp_manifest="$CBP_ROOT/.claude/.cbp.manifest.json"
+    _cbp_pkg="$CBP_ROOT/node_modules/codebyplan/package.json"
+    if [ ! -f "$_cbp_manifest" ]; then
+      # No manifest → not a managed consumer → hide segment.
+      _CBP_GUARDED=true
+    elif [ -f "$_cbp_pkg" ] && command -v jq >/dev/null 2>&1; then
+      _cbp_mver="$(jq -r '.version // ""' "$_cbp_manifest" 2>/dev/null)"
+      _cbp_iver="$(jq -r '.version // ""' "$_cbp_pkg" 2>/dev/null)"
+      _CBP_INSTALLED="$_cbp_iver"
+      if [ -n "$_cbp_mver" ] && [ -n "$_cbp_iver" ] && [ "$_cbp_mver" != "$_cbp_iver" ]; then
+        # manifest ≠ installed → .claude is out of sync → ⟳ run claude update
+        # (mirrors the doctor's version_skip → in_sync:false). No npm info in the
+        # offline fallback, so never the ↑ newer-available marker.
+        _CBP_IN_SYNC=false
+      fi
+    else
+      # Can't read package.json or no jq → hide segment.
+      _CBP_GUARDED=true
+    fi
+  fi
+
+  if [ "$_CBP_GUARDED" = "false" ] && [ -n "$_CBP_INSTALLED" ]; then
+    L8="${DIM}cbp${RST} ${_CBP_INSTALLED}"
+    if [ "$_CBP_NEWER" = "true" ] && [ -n "$_CBP_LATEST" ]; then
+      L8="${L8} ${YELLOW}↑${_CBP_LATEST}${RST}"
+    fi
+    if [ "$_CBP_IN_SYNC" = "false" ]; then
+      L8="${L8} ${YELLOW}⟳ run claude update${RST}"
+    fi
+    printf "%b\n" "$L8"
+  fi
+fi

package/templates/hooks/validate-structure-patterns.sh

@@ -38,7 +38,7 @@ if match_path '^/\.claude/docs/stack/' \
 fi
 
 # Notation consistency (warn-only): flag bare-colon command notation in .claude/ markdown
-# See: /.claude/rules/notation-consistency.md — all command refs must use /cbp-* form
+# See: cbp-round-start Step 0 "CHK / TASK / ROUND Identifier Notation Vocabulary" — all command refs must use /cbp-* form
 if match_path '^/\.claude/(rules|skills|agents)/' && match_path '\.md$'; then
   CONTENT=$(read_input_content)
   [ -z "$CONTENT" ] && [ -f "$FILE_PATH" ] && CONTENT=$(cat "$FILE_PATH" 2>/dev/null || true)

package/templates/skills/cbp-checkpoint-check/SKILL.md

@@ -120,11 +120,11 @@ Aggregate the files touched across all tasks (reusing Step 4's deduplicated tabl
    Continue to Step 6.
 
 5. **On fail** (any framework `f`: `e2e_outputs[f].status === 'failed'` OR `e2e_outputs[f].test_results.failed > 0`): build a failure summary from `e2e_outputs[*].test_results.failures[]` aggregated and grouped by `category`. Surface via `AskUserQuestion`:
-   - **(a) Create fix-task in CHK-{NNN} (recommended)** — invoke MCP `create_task` with `checkpoint_id=current_checkpoint_id`, `title="Fix checkpoint-level e2e failures (CHK-{NNN})"`, `requirements` containing the detailed failure breakdown (category counts, files involved, pages broken, screenshot paths from `e2e_outputs[*].screenshots[]`), AND `context: { source_checkpoint_id, e2e_failure_summary: { category_counts, pages_broken, screenshot_paths }, fix_type: "checkpoint_e2e" }` so downstream `cbp-task-planner` can verify failure premises. Per `infra-issue-absorption.md` "Resolve-in-Current-Scope by Default", checkpoint-level e2e failures absorb into the active checkpoint — not standalone.
+   - **(a) Create fix-task in CHK-{NNN} (recommended)** — invoke MCP `create_task` with `checkpoint_id=current_checkpoint_id`, `title="Fix checkpoint-level e2e failures (CHK-{NNN})"`, `requirements` containing the detailed failure breakdown (category counts, files involved, pages broken, screenshot paths from `e2e_outputs[*].screenshots[]`), AND `context: { source_checkpoint_id, e2e_failure_summary: { category_counts, pages_broken, screenshot_paths }, fix_type: "checkpoint_e2e" }` so downstream `cbp-task-planner` can verify failure premises. Per `cbp-round-end` reference `findings-presentation.md` "Infra Issue Absorption Contract — Resolve-in-Current-Scope by Default", checkpoint-level e2e failures absorb into the active checkpoint — not standalone.
    - **(b) Surface as warning only — proceed to checkpoint-end** — append `| Checkpoint E2E | warning | N failures (deferred) |` to Step 5 QA Summary; continue to Step 6.
    - **(c) Halt — review manually** — STOP and wait for the user.
 
-   See `infra-issue-absorption.md` Catalog row "Checkpoint-level e2e failure" for the routing rationale.
+   See `cbp-round-end` reference `findings-presentation.md` "Infra Issue Absorption Contract — Infra-Class Issue Catalog" row "Checkpoint-level e2e failure" for the routing rationale.
 
 ### Step 6: User Discussion
 

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

@@ -47,13 +47,13 @@ Given the parse from Step 0.5:
 
 ### Step 2: Verify Checkpoint End Has Run
 
-Check `checkpoint.context.shipment` — must exist with at least `feat_to_dev.merged: true`.
+Check `checkpoint.context.shipment` — must exist with at least `feat_to_base.merged: true`.
 
 If not:
 ```
 ## Cannot Complete Checkpoint
 
-Checkpoint has not been shipped yet. Run `/cbp-checkpoint-end` first to merge feat branch to development.
+Checkpoint has not been shipped yet. Run `/cbp-checkpoint-end` first to merge the feat branch to the base branch.
 ```
 Stop here.
 

package/templates/skills/cbp-merge-main/SKILL.md

@@ -96,7 +96,7 @@ Supabase migrations are version-keyed by their numeric filename prefix. Two file
 
    - **Rename HEAD-side (Recommended when a main migration is already applied to a shared remote)** — rename the local file to a fresh, sequential timestamp that respects existing apply-order dependencies (probe `supabase migration list --db-url <preview>` if a preview branch exists, or inspect FK references in surrounding migrations). The orchestrator runs `git mv <old> <new>` itself; the rename lands in the git index and is picked up by the re-probe at step 5.
    - **Rename main-side (manual, OUT-OF-SKILL)** — only when the main file definitely has not been applied anywhere yet AND the user has write access to `{BASE}`. This skill does NOT touch the main branch: it runs on a feat branch (Step 0 enforces this) and the Key Rules below forbid any push from this skill. The user must, in a separate terminal: `git checkout {BASE} && git mv <old> <new> && git commit -m "fix(migration): rename to resolve collision with feat/..." && git push origin {BASE}`. After that push is confirmed remote-side, re-invoke `/cbp-merge-main` — Step 1 will fetch the updated main tip and Step 1.5 will re-probe with the rename in place.
-   - **Defer to a new task in the active checkpoint** — `git merge --abort` is unnecessary because Step 2 has not started. Create a CHK-bound task per `infra-issue-absorption.md` "Resolve-in-Current-Scope by Default" and STOP `/cbp-merge-main`. Resume after the task completes.
+   - **Defer to a new task in the active checkpoint** — `git merge --abort` is unnecessary because Step 2 has not started. Create a CHK-bound task per `cbp-round-end` reference `findings-presentation.md` "Infra Issue Absorption Contract — Resolve-in-Current-Scope by Default" and STOP `/cbp-merge-main`. Resume after the task completes.
    - **Abort merge** — STOP the skill. User decides later.
 
 5. After any HEAD-side rename action, re-execute Step 1.5 (collisions may chain — fixing one can expose another). The HEAD-side probe at step 1 uses `git ls-files` rather than `git ls-tree HEAD`, so the freshly-staged `git mv` is visible without requiring a commit. Main-side renames require a fresh `/cbp-merge-main` invocation (the user manually fetched and re-ran per option 2 above), not an in-skill loop.

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

@@ -5,27 +5,6 @@ description: Summary wrap-up after testing phase completes
 effort: high
 ---
 
-## Kind Detection
-
-Inspect the resolved identifier from argument parsing to determine the task kind:
-
-| Identifier shape | KIND |
-|-----------------|------|
-| `{task}-{round}` (2-segment, e.g. `45-2`) | `standalone` |
-| `{chk}-{task}-{round}` (3-segment, e.g. `141-3-1`) | `checkpoint` |
-| _(empty / free-text)_ | Check `get_current_standalone_task` first; if found → `standalone`. Else → `checkpoint` via `get_current_task`. |
-
-Set `KIND` for the rest of this skill. MCP tool names vary by KIND:
-
-| Operation | `checkpoint` KIND | `standalone` KIND |
-|-----------|------------------|-------------------|
-| Get task | `get_current_task(repo_id)` | `get_current_standalone_task(repo_id)` |
-| Get rounds | `get_rounds(task_id)` | `get_standalone_rounds(standalone_task_id)` |
-| Add round | `add_round(task_id, ...)` | `add_standalone_round(standalone_task_id, ...)` |
-| Update round | `update_round(round_id, ...)` | `update_standalone_round(standalone_round_id, ...)` |
-| Complete round | `complete_round(round_id, duration_minutes?)` | `complete_standalone_round(standalone_round_id, duration_minutes?, caller_worktree_id)` ⚠️ `caller_worktree_id` is REQUIRED for standalone |
-| Update task | `update_task(task_id, ...)` | `update_standalone_task(standalone_task_id, ...)` |
-
 # Round End Command
 
 Summary phase — presents what was done, then runs code quality review to catch bugs and logic errors that automated checks miss.
@@ -42,16 +21,14 @@ See `reference/inline-fallback.md` for full trigger table, procedure, and covera
 
 ## Identifier Notation
 
-This skill operates on the **active** task/round resolved via MCP and does not accept a positional identifier argument. Canonical chk-task-round notation — used in prose, error messages, and cross-references — follows `.claude/rules/notation-consistency.md` "CHK / TASK / ROUND Identifier Notation": `108-1` (CHK-108 TASK-1), `45` (standalone TASK-45), `108-1-2` (round 2 of CHK-108 TASK-1), `45-2` (round 2 of standalone TASK-45).
+This skill operates on the **active** task/round resolved via MCP `get_current_task` / `get_rounds` and does not accept a positional identifier argument. Canonical chk-task-round notation is defined in `cbp-round-start` Step 0 "CHK / TASK / ROUND Identifier Notation Vocabulary".
 
 ## Instructions
 
 ### Step 1: Get Current Task and Round
 
-Use Kind Detection above to set KIND. Then:
-
-- **checkpoint KIND**: MCP `get_current_task(repo_id)` (pass `checkpoint_id` if known) to find the active task. MCP `get_rounds(task_id)` to find the in-progress round.
-- **standalone KIND**: MCP `get_current_standalone_task(repo_id)` to find the active task. MCP `get_standalone_rounds(standalone_task_id)` to find the in-progress round.
+Use MCP `get_current_task` with repo_id (pass `checkpoint_id` if known to avoid disambiguation) to find the active task.
+Use MCP `get_rounds` for the task to find the in-progress round.
 
 Load round context with all outputs (executor_output, testing_qa_output, reviewer_output).
 
@@ -93,11 +70,11 @@ Merge with previous rounds (supersede items for re-modified files, preserve veri
 
 ### Step 4: Update Task Files and QA
 
-Update via MCP using KIND-appropriate tools:
+Update via MCP:
 
-- `update_task(task_id, files_changed: [...])` / `update_standalone_task(standalone_task_id, files_changed: [...])` — merge with existing
-- `update_round(round_id, files_changed: [...], qa: {items: [auto_qa items + default_checklist items]})` / `update_standalone_round(standalone_round_id, ...)` — round-specific
-- `update_task(task_id, qa: {items: [auto_qa items + default_checklist items]})` / `update_standalone_task(standalone_task_id, qa: {items: [auto_qa items + default_checklist items]})` — aggregated
+- `update_task(task_id, files_changed: [...])` — merge with existing
+- `update_round(round_id, files_changed: [...], qa: {items: [auto_qa items + default_checklist items]})` — round-specific
+- `update_task(task_id, qa: {items: [auto_qa items + default_checklist items]})` — aggregated
 
 ### Step 5: Present Summary
 
@@ -160,8 +137,8 @@ Example tables and the `inline` option gating spec: see `reference/findings-pres
 - Auto-accept ALL findings into `improve_round_findings[]` regardless of severity (the user opted into the loop).
 - Skip the polish-spiral stop-gate (auto-loop has its own cap-exhausted termination).
 - Skip the user findings-decision prompt.
-- Save findings via `update_round` / `update_standalone_round` per KIND exactly as in manual mode.
-- Auto-trigger `/cbp-round-update` immediately. round-update Step 4 will decide whether to spawn another round or exit clean (see cbp-round-update SKILL.md Step 4).
+- Save findings via `update_round` exactly as in manual mode.
+- Auto-trigger `/cbp-round-update` immediately. round-update Step 6 will decide whether to spawn another round or exit clean (see cbp-round-update SKILL.md Step 6).
 
 **Else (manual mode — flag absent or false):**
 
@@ -169,7 +146,7 @@ Run the existing flow:
 
 1. After round 2+, surface the polish-spiral stop-gate per `polish-spiral-stop-gate.md` (defer-to-followups vs continue).
 2. Surface the findings-decision AskUserQuestion (with optional `inline` per the gating rules in `reference/findings-presentation.md`).
-3. Save accepted/rejected findings to round context via MCP `update_round` / `update_standalone_round` per KIND:
+3. Save accepted/rejected findings to round context via MCP `update_round`:
    ```json
    {
      "context": {
@@ -190,7 +167,7 @@ Run the existing flow:
 ## Integration
 
 - **Triggered by**: `/cbp-round-execute` (auto, after all waves + testing complete)
-- **Reads**: MCP `get_current_task` / `get_current_standalone_task`, `get_rounds` / `get_standalone_rounds` (per KIND), round context
-- **Writes**: MCP `update_round` / `update_standalone_round`, `update_task` / `update_standalone_task` (files_changed, qa, findings) — per KIND
+- **Reads**: MCP `get_current_task`, `get_rounds`, round context
+- **Writes**: MCP `update_round`, `update_task` (files_changed, qa, findings)
 - **Spawns**: `cbp-improve-round` (code quality review)
 - **Triggers**: `/cbp-round-update` (auto, after findings handled)

package/templates/skills/cbp-round-end/reference/findings-presentation.md

@@ -29,16 +29,89 @@ Which findings should be fixed?
 - "all" — fix all findings in a new round
 - "1,2" — fix specific findings by number
 - "none" — skip all, proceed to round-update
-- "inline" — fix in THIS round before proceeding (only offered when all findings qualify under `infra-issue-absorption.md` Trivial-Resolution Exception)
+- "inline" — fix in THIS round before proceeding (only offered when all findings qualify under the Trivial-Resolution Exception below)
 - Or explain why specific findings are not issues
 ```
 
 ## "inline" option gating
 
-Only present the "inline" option when ALL pending findings simultaneously satisfy:
+Only present the "inline" option when ALL pending findings simultaneously qualify under the **Trivial-Resolution Exception** (see subsection below):
 
 1. Diff is comment-only, annotation-only, banner-only, or single-value rename — no logic, no control flow
 2. Each fix is under ~5 minutes of executor time
 3. Verification is automatic — the existing test/lint/audit pipeline confirms the change
 
-If any finding fails these gates, omit the "inline" option entirely (revert to the 3-option prompt). When inline is chosen, apply the edits via direct `Edit`, re-run the verification commands (hook syntax check + `testing-qa-agent` scoped to modified files) and proceed to `/cbp-round-update` without spawning a new round. Document the decision in `round.context.inline_fix_log = { findings: [ids], rationale: "trivial-resolution exception", applied_at: <ISO> }` (mirrors the `bypass_log` shape from `infra-issue-absorption.md` "Pipeline Bypass for Trivial-Resolution Rounds").
+If any finding fails these gates, omit the "inline" option entirely (revert to the 3-option prompt). When inline is chosen, apply the edits via direct `Edit`, re-run the verification commands (hook syntax check + `cbp-testing-qa-agent` scoped to modified files) and proceed to `/cbp-round-update` without spawning a new round. Document the decision in `round.context.inline_fix_log = { findings: [ids], rationale: "trivial-resolution exception", applied_at: <ISO> }` (mirrors the `bypass_log` shape from the Pipeline Bypass subsection below).
+
+---
+
+## Infra Issue Absorption Contract
+
+### Resolve-in-Current-Scope by Default
+
+When `/cbp-round-execute` Step 5 (per-wave `cbp-testing-qa-agent`) or `/cbp-task-testing` surfaces a pre-existing infra-class issue (critical/high CVE, broken ESLint config-load, Playwright env-loading gap, dead CI pipeline, etc.), the default response is **absorb into current scope** — NOT create a standalone task.
+
+Order of preference for routing a finding:
+
+1. **Trivial-resolution inline** (no new round) — fix qualifies for the exception below
+2. **New round in the current task** — finding is related to the task's domain
+3. **New task in the current checkpoint** — finding belongs to the checkpoint goal but is a separate concern
+4. **Standalone task** — only when the finding is truly off-axis from the active checkpoint AND the user has explicitly confirmed standalone routing
+
+### Trivial-Resolution Exception
+
+Resolve inline in the CURRENT round (no new round, no new task) when ALL hold:
+
+1. The fix is **fully mechanical** — no design decision, no tradeoff, no naming question
+   - **1a. Unambiguous scope**: no decision about sweep extent required
+   - **1b. Pattern soundness verified** at each target site before propagating
+2. The fix takes **under ~5 minutes** of executor time
+3. The fix's diff stays **scoped to its own concern** and won't dilute the round's primary diff
+4. Verification is automatic (existing test/lint/audit pipeline confirms it)
+
+Examples that qualify:
+
+| Finding | Inline action |
+|---------|---------------|
+| Pre-existing prettier drift in N files | `prettier --write` on those files |
+| Single transitive CVE with a known-good `pnpm.overrides` line | Add the override, re-audit |
+| One-line hook tweak (add a filename to an exemption list) | Edit the hook |
+| Non-breaking patch bump on a build-tool | Update package.json, lockfile |
+| In-module sibling violations (≤2) with canonical 2-line fix | Apply inline, document in adoption row |
+| Homogeneous-pattern mass migration (single rule, single shape, fully mechanical, verifiable by grep) | Apply across all sites in one round |
+
+Examples that do NOT qualify — route to a new round in the current task:
+
+| Finding | Why |
+|---------|-----|
+| Diacritical fix in R1 i18n blocks with potentially 80+ unrelated sites elsewhere | Scope decision required |
+| `.update().single()` violations in 22 sites across 9 modules | Cross-module sweep requires coordinated audit |
+| Auth-guard sweep across multiple feature modules | Multi-module; needs dedicated round |
+
+### Pipeline Bypass for Trivial-Resolution Rounds
+
+When the trivial-resolution exception qualifies, the orchestrator MAY bypass these pipeline stages — document in `round.context.bypass_log`:
+
+| Stage | Bypass allowed when | Document as |
+|-------|--------------------|-------------|
+| `cbp-round-executor` | Single-file Edit fully specified by prior reviewer output | `bypass_log.executor: "single-file edit, used direct Edit"` |
+| `cbp-testing-qa-agent` | Edit is non-code (comment, doc, type-annotation) AND existing test coverage protects the area | `bypass_log.testing_qa: "non-code edit, existing tests cover area"` |
+| `cbp-improve-round` | Diff is ≤5 lines AND no logic changed | `bypass_log.improve_round: "≤5 lines non-logic, skipped"` |
+| `cbp-task-planner` | Path B (the planner's trivial-corrective bypass that keeps repeat fix-rounds cheap) already qualifies | `bypass_log.planner: "Path B trivial-corrective bypass"` |
+
+**ALL four bypasses simultaneously** is acceptable for ≤5-line non-logic corrective edits where every premise was verified by a prior reviewer.
+
+**Do NOT bypass** when: round modifies behaviour; round changes test assertions; round touches more than one file; round is the FIRST round of the task.
+
+### Infra-Class Issue Catalog
+
+These categories surface from per-wave `cbp-testing-qa-agent` or from `/cbp-task-testing`. Default routing for each is in-scope absorption unless genuinely off-axis from the active checkpoint.
+
+| Category | Examples |
+|----------|----------|
+| Vulnerability | `pnpm audit` critical/high advisories |
+| Dead build tooling | ESLint config fails to load, Prettier crashes, tsc OOM |
+| Test infra gaps | Playwright `.env.local` not loaded, CI env var missing |
+| Dependency drift | Major version behind on non-breaking peer dep |
+| Config registry drift | Port allocation missing, turbo pipeline missing entry |
+| Checkpoint-level e2e failure | Whole-checkpoint e2e run (`/cbp-checkpoint-check` Step 5b) reports failures — absorb into the active checkpoint as a fix-task, never standalone |

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

@@ -5,27 +5,6 @@ description: Execute the approved plan from /cbp-round-start — runs per-wave e
 effort: xhigh
 ---
 
-## Kind Detection
-
-Inspect the resolved identifier from argument parsing to determine the task kind:
-
-| Identifier shape | KIND |
-|-----------------|------|
-| `{task}-{round}` (2-segment, e.g. `45-2`) | `standalone` |
-| `{chk}-{task}-{round}` (3-segment, e.g. `141-3-1`) | `checkpoint` |
-| _(empty / free-text)_ | Check `get_current_standalone_task` first; if found → `standalone`. Else → `checkpoint` via `get_current_task`. |
-
-Set `KIND` for the rest of this skill. MCP tool names vary by KIND:
-
-| Operation | `checkpoint` KIND | `standalone` KIND |
-|-----------|------------------|-------------------|
-| Get task | `get_current_task(repo_id)` | `get_current_standalone_task(repo_id)` |
-| Get rounds | `get_rounds(task_id)` | `get_standalone_rounds(standalone_task_id)` |
-| Add round | `add_round(task_id, ...)` | `add_standalone_round(standalone_task_id, ...)` |
-| Update round | `update_round(round_id, ...)` | `update_standalone_round(standalone_round_id, ...)` |
-| Complete round | `complete_round(round_id, duration_minutes?)` | `complete_standalone_round(standalone_round_id, duration_minutes?, caller_worktree_id)` ⚠️ `caller_worktree_id` is REQUIRED for standalone |
-| Update task | `update_task(task_id, ...)` | `update_standalone_task(standalone_task_id, ...)` |
-
 # Round Execute Command
 
 Execution and validation phase. Receives the approved plan from `/cbp-round-start`, dispatches wave executors, runs per-wave `cbp-testing-qa-agent` in parallel, and routes to `/cbp-round-end`.
@@ -38,16 +17,14 @@ Execution and validation phase. Receives the approved plan from `/cbp-round-star
 
 ## Identifier Notation
 
-This skill operates on the **active** task/round resolved via MCP and does not accept a positional identifier argument. Canonical chk-task-round notation — used in prose, error messages, and cross-references — follows `.claude/rules/notation-consistency.md` "CHK / TASK / ROUND Identifier Notation": `108-1` (CHK-108 TASK-1), `45` (standalone TASK-45), `108-1-2` (round 2 of CHK-108 TASK-1), `45-2` (round 2 of standalone TASK-45).
+This skill operates on the **active** task/round resolved via MCP `get_current_task` / `get_rounds` and does not accept a positional identifier argument. Canonical chk-task-round notation is defined in `cbp-round-start` Step 0 "CHK / TASK / ROUND Identifier Notation Vocabulary".
 
 ## Instructions
 
 ### Step 1: Get Current Task and Round
 
-Use Kind Detection above to set KIND. Then:
-
-- **checkpoint KIND**: MCP `get_current_task(repo_id)` (pass checkpoint_id if known) to find the active task. MCP `get_rounds(task_id)` to find the in-progress round.
-- **standalone KIND**: MCP `get_current_standalone_task(repo_id)` to find the active task. MCP `get_standalone_rounds(standalone_task_id)` to find the in-progress round.
+Use MCP `get_current_task` with repo_id (pass checkpoint_id if known) to find the active task.
+Use MCP `get_rounds` for the task to find the in-progress round.
 
 If no in-progress round: `No active round. Run /cbp-round-start first.`
 
@@ -184,35 +161,11 @@ Input contracts: `cbp-testing-qa-agent` receives `executor_output`, `testing_pro
 
 ### Step 5b: Post-E2E Screenshot Review (cbp-frontend-ui Phase 6.5)
 
-Aggregate across ALL specialists that ran:
-
-```js
-screenshots = Object.values(round.context.e2e_outputs ?? {}).flatMap(o => o.screenshots ?? []);
-e2e_gallery  = Object.values(round.context.e2e_outputs ?? {}).flatMap(o => o.e2e_gallery  ?? []);
-```
-
-**Auto-new baseline handling**: for each entry in `e2e_gallery` where `is_new === true`, the
-specialist has already run `git add <committed_path>`. No additional user gate is needed.
-**Changed-baseline handling**: entries where `is_new === false` AND `baseline_diff_pct > threshold`
-are `visual_regression` — do NOT auto-accept; surface as blocking gate at Step 7.
-
-Persist `e2e_gallery` to `round.context.e2e_gallery` (additive alongside existing
-`round.context.e2e_outputs`). This field is consumed by TASK-3 / checkpoint-end for DB upload.
-Note: `e2e_gallery[]` is aggregated and persisted regardless of whether `cbp-frontend-ui` runs — the empty-gallery enforcement lives in `cbp-task-check` Phase 4, while the `screenshots[]` visual review (frontend-ui Phase 6.5) is a separate concern gated on `screenshots[]` being non-empty.
-
-When the aggregated `screenshots` list is non-empty, invoke the `cbp-frontend-ui` skill with
-`phase: 'screenshot_review'` (input: `files_changed`, `e2e_screenshots: <aggregated screenshots>`,
-`context: { checkpoint_goal, round_requirements }`). Under this phase the skill runs only
-Phase 6.5 (Rendered-Output Visual Review) + 7 + 8 — Phases 1-6 (style) already ran at Step 3.8.
+Aggregate screenshots across ALL specialists that ran: `screenshots = Object.values(round.context.e2e_outputs ?? {}).flatMap(o => o.screenshots ?? [])`. When the aggregated list is non-empty, invoke the `cbp-frontend-ui` skill with `phase: 'screenshot_review'` (input: `files_changed`, `e2e_screenshots: <aggregated screenshots>`, `context: { checkpoint_goal, round_requirements }`). Under this phase the skill runs only Phase 6.5 (Rendered-Output Visual Review) + 7 + 8 — Phases 1-6 (style) already ran inline at executor Step 3.8 with `phase: 'style_only'`.
 
-Persist findings to `round.context.frontend_ui_review` (merge with Step 3.8's style-only output
-if present). Baseline-regression findings surface as a BLOCKING gate at `/cbp-round-end` Step 7
-(an explicit accept-or-fix user decision; changed baselines are NEVER auto-accepted);
-rendered_visual critical findings are surfaced in the Step 7 findings presentation. Neither
-auto-fails the round. cbp-testing-qa-agent does NOT read these findings (full independence).
+Persist findings to `round.context.frontend_ui_review` (merge with Step 3.8's style-only output if present). Baseline-regression findings surface as a BLOCKING gate at `/cbp-round-end` Step 7 (an explicit accept-or-fix user decision; baselines are NEVER auto-accepted); rendered_visual critical findings are surfaced in the Step 7 findings presentation. Neither auto-fails the round. cbp-testing-qa-agent does NOT read these findings (full independence per Step 5).
 
-**Skip** when `round.context.e2e_outputs` is absent/empty, the aggregated `screenshots` list
-is empty, or `testing_profile === 'claude_only'`.
+**Skip** when `round.context.e2e_outputs` is absent/empty, the aggregated `screenshots` list is empty, or `testing_profile === 'claude_only'`.
 
 ### Step 6: Hard-Fail Routing
 
@@ -225,7 +178,7 @@ Per-wave hard-fail signal — true when ANY hold:
 **All waves hard_fail: false** → proceed to Step 7. **Any wave hard_fail: true**:
 
 - **Simple fixes** (type errors, lint, missing imports, test assertion fixes, e2e `real`-category with clear code-side root cause, no prior re-trigger this round) → save failure details to round context; retrigger the failing wave's executor; re-run testing-qa AND the eligible `cbp-e2e-*` specialists for that wave.
-- **Structural OR already re-triggered once OR e2e preflight aborts OR `e2e_eligible_skipped`** → save failure context via MCP `update_round` / `update_standalone_round` per KIND; auto-trigger `/cbp-round-input`. STOP.
+- **Structural OR already re-triggered once OR e2e preflight aborts OR `e2e_eligible_skipped`** → save failure context via MCP `update_round`; auto-trigger `/cbp-round-input`. STOP.
 
 ## Inline execution fallback
 
@@ -237,11 +190,11 @@ When `cbp-testing-qa-agent` spawn fails OR the resolved `testing_profile` is `cl
 
 ### Step 7: Save Executor Output
 
-Update round context via MCP `update_round` / `update_standalone_round` per KIND:
+Update round context via MCP `update_round`:
 
-- `context`: { ...existing, executor_output, testing_qa_output, e2e_eligible, e2e_outputs, e2e_gallery, frontend_ui_review }
+- `context`: { ...existing, executor_output, testing_qa_output, e2e_eligible, e2e_outputs, frontend_ui_review }
 
-`e2e_outputs` (a framework-keyed map of specialist outputs, e.g. `{ playwright: {...}, maestro: {...} }`), `e2e_gallery` (aggregated flat array of committed-PNG entries across all specialists — consumed by TASK-3 / checkpoint-end for DB upload), and `frontend_ui_review` are present only when the gates above admitted them (≥1 eligible framework ran AND Step 5b ran). `e2e_eligible[]` records which frameworks were eligible this round and drives the Step 6 `e2e_eligible_skipped` check.
+`e2e_outputs` (a framework-keyed map of specialist outputs, e.g. `{ playwright: {...}, maestro: {...} }`) and `frontend_ui_review` are present only when the gates above admitted them (≥1 eligible framework ran AND Step 5b ran). `e2e_eligible[]` records which frameworks were eligible this round and drives the Step 6 `e2e_eligible_skipped` check.
 
 ### Step 8: Auto-trigger Round End
 
@@ -258,13 +211,13 @@ Trigger `/cbp-round-end`.
 - `testing_profile` from `task.context` governs which checks run — read it once in Step 2; pass to every testing-qa + e2e specialist spawn
 - `claude_only` profile skips all agent spawns (testing-qa AND `cbp-e2e-*`); runs hook syntax and skill structure checks inline
 - E2E dispatch is **config-driven and opt-out** (`.codebyplan/e2e.json`), not gated on `has_ui_work`/`testing_profile` — an eligible framework that silently does not run is an `e2e_eligible_skipped` hard-fail (`rules/e2e-mandatory.md`)
-- Step 5b (cbp-frontend-ui Phase 6.5) runs only when e2e produced screenshots — gated on the aggregated `e2e_outputs[*].screenshots[]` being non-empty; `e2e_gallery[]` is always aggregated and persisted when any specialist ran
+- Step 5b (cbp-frontend-ui Phase 6.5) runs only when e2e produced screenshots — gated on the aggregated `e2e_outputs[*].screenshots[]` being non-empty
 - Claude NEVER git adds files in round commands
 
 ## Integration
 
-- **Reads**: MCP `get_current_task` / `get_current_standalone_task`, `get_rounds` / `get_standalone_rounds` (per KIND)
-- **Writes**: MCP `update_round` / `update_standalone_round` (context with executor_output + testing_qa_output + e2e_eligible + e2e_outputs + e2e_gallery + frontend_ui_review) — per KIND
+- **Reads**: MCP `get_current_task`, `get_rounds`
+- **Writes**: MCP `update_round` (context with executor_output + testing_qa_output + e2e_eligible + e2e_outputs + frontend_ui_review)
 - **Spawns**: `cbp-round-executor` (per wave or single), `cbp-testing-qa-agent` (per wave, parallel sibling of the `cbp-e2e-*` specialists), the `cbp-e2e-*` specialists (config-driven dispatch per `context/testing/e2e.md`, one per eligible framework in `.codebyplan/e2e.json`), `cbp-database-agent` (if DB work), `cbp-security-agent` (if security review needed)
 - **Skill invocations**: `cbp-frontend-ui` at Step 5b with `phase: 'screenshot_review'` (post-e2e)
 - **Triggers**: `/cbp-round-end` (auto)

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

@@ -58,7 +58,9 @@ Inline-fallback is NOT a quality downgrade trapdoor — Phase 1.5 row-by-row ver
 
 ### Step 0: Parse `$ARGUMENTS` shape
 
-Disambiguate the argument up front. Three input shapes (see `.claude/rules/notation-consistency.md` "CHK / TASK / ROUND Identifier Notation"):
+Disambiguate the argument up front. Three input shapes:
+
+### CHK / TASK / ROUND Identifier Notation Vocabulary
 
 | Shape | Regex | Meaning |
 |-------|-------|---------|

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

@@ -44,7 +44,7 @@ If this is false: DO NOT proceed to Step 3.
 
 ### Step 1: Parse `$ARGUMENTS`
 
-Parse the argument using the canonical chk-task-round notation (see `.claude/rules/notation-consistency.md`):
+Parse the argument using the canonical chk-task-round notation (see `cbp-round-start` Step 0 "CHK / TASK / ROUND Identifier Notation Vocabulary"):
 
 | Shape | Regex | Resolves to |
 |-------|-------|-------------|

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-ship-configure/SKILL.md

@@ -62,7 +62,7 @@ References:
 **Supabase — branching integration** (run AFTER Step 5 — Verify completes for the
 supabase surface; do NOT invoke during Steps 1–4): once Step 5 has finished and
 `shipment.surfaces.supabase` is persisted, run
-`jq '.shipment.surfaces.supabase.branching_configured // empty' .codebyplan.json`.
+`jq '.shipment.surfaces.supabase.branching_configured // empty' .codebyplan/shipment.json`.
 If empty, invoke `/cbp-supabase-setup` (GitHub integration, required-status-check,
 persistent branch). Delegate fully — do NOT duplicate steps inline. If already set,
 note as already-done in the Step 6 report.

package/templates/skills/cbp-ship-configure/reference/supabase.md

@@ -174,11 +174,11 @@ project_id = "xyzwabcd"   # 8-char ref from `supabase --experimental branches li
 ```
 
 Replace `development` and `xyzwabcd` with the actual integration branch name and project
-ref for this repo (confirmed in `.codebyplan.json` `branch_config.integration`).
+ref for this repo (confirmed in `.codebyplan/git.json` `branch_config.integration`).
 
 ### Idempotency marker
 
-Written to `.codebyplan.json` after setup completes:
+Written to `.codebyplan/shipment.json` after setup completes:
 
 ```json
 {