codebyplan 1.13.32 → 1.13.34

package/dist/cli.js

@@ -14,7 +14,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "1.13.32";
+    VERSION = "1.13.34";
     PACKAGE_NAME = "codebyplan";
   }
 });
@@ -394,7 +394,7 @@ var init_statusline_config = __esm({
       lines: {
         identity: true,
         context: true,
-        cost: true,
+        cost: false,
         rate_limits: true,
         repo_pr: true,
         worktree: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebyplan",
-  "version": "1.13.32",
+  "version": "1.13.34",
   "description": "CLI for CodeByPlan — AI-powered development planning and tracking",
   "type": "module",
   "bin": {

package/templates/hooks/cbp-statusline.mjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+// @scope: org-shared
 // @hook: NOT-A-HOOK (statusLine renderer, invoked via the cbp-statusline.sh dispatcher)
 // Claude Code Status Line — node renderer (ESM; .mjs forces ESM regardless of the
 // host repo's package.json "type", so the script is portable into any consumer).
@@ -42,7 +43,10 @@ function main() {
   };
 
   const MODEL_ID = get(data, ["model", "id"], "");
-  const MODEL_NAME = get(data, ["model", "display_name"], "");
+  const MODEL_NAME = get(data, ["model", "display_name"], "").replace(
+    /\s*\(1M context\)\s*$/,
+    ""
+  );
   const CWD = get(data, ["cwd"], "");
   const WS_CURRENT_DIR = get(data, ["workspace", "current_dir"], "");
   const WS_REPO_HOST = get(data, ["workspace", "repo", "host"], "");
@@ -55,26 +59,6 @@ function main() {
   const LINES_DEL = get(data, ["cost", "total_lines_removed"], 0);
   const CTX_SIZE = get(data, ["context_window", "context_window_size"], 200000);
   const CTX_PCT = get(data, ["context_window", "used_percentage"], 0);
-  const CUR_IN = get(
-    data,
-    ["context_window", "current_usage", "input_tokens"],
-    0
-  );
-  const CUR_OUT = get(
-    data,
-    ["context_window", "current_usage", "output_tokens"],
-    0
-  );
-  const CACHE_CREATE = get(
-    data,
-    ["context_window", "current_usage", "cache_creation_input_tokens"],
-    0
-  );
-  const CACHE_READ = get(
-    data,
-    ["context_window", "current_usage", "cache_read_input_tokens"],
-    0
-  );
   const EXCEEDS_200K = get(data, ["exceeds_200k_tokens"], false);
   const EFFORT = get(data, ["effort", "level"], "");
   const RATE_5H_PCT = get(
@@ -113,7 +97,7 @@ function main() {
   const cfg = {
     identity: true,
     context: true,
-    cost: true,
+    cost: false,
     rate_limits: true,
     repo_pr: true,
     worktree: true,
@@ -234,7 +218,8 @@ function main() {
     const delta = Math.trunc(Number(epoch)) - cbpNow();
     if (delta <= 0) return "now";
     if (delta >= 86400) return `${Math.floor(delta / 86400)}d`;
-    if (delta >= 3600) return `${Math.floor(delta / 3600)}h`;
+    if (delta >= 3600)
+      return `${Math.floor(delta / 3600)}h${Math.floor((delta % 3600) / 60)}m`;
     return `${Math.floor(delta / 60)}m`;
   };
 
@@ -266,10 +251,11 @@ function main() {
   // LINE 1 — Identity
   // ============================================================
   if (shouldShow("IDENTITY", cfg.identity)) {
+    // Line A — location: folder + branch + wt/session/agent prefix
     let L1 = "";
     if (FOLDER) {
-      L1 = `${C.BOLD}${C.BLUE}${FOLDER}${C.RST}`;
-      if (BRANCH) L1 += ` ${C.DIM}⎇${C.RST}${C.CYAN}${BRANCH}${C.RST}`;
+      L1 = `📂 ${C.BOLD}${C.BLUE}${FOLDER}${C.RST}`;
+      if (BRANCH) L1 += ` ${C.DIM}🔀${C.RST} ${C.CYAN}${BRANCH}${C.RST}`;
       L1 += " ";
     }
     if (WT_NAME) {
@@ -279,16 +265,19 @@ function main() {
     } else if (AGENT_NAME) {
       L1 += `${C.DIM}agent:${C.RST}${C.MAGENTA}${AGENT_NAME}${C.RST} `;
     }
+    // Line B — model: display name + effort + style + vim
+    let L1B = "";
     if (MODEL_NAME) {
-      L1 += `${C.BOLD}${C.CYAN}${MODEL_NAME}${C.RST}`;
+      L1B += `${C.BOLD}${C.CYAN}${MODEL_NAME}${C.RST}`;
     } else if (MODEL_ID) {
-      L1 += `${C.BOLD}${C.CYAN}${MODEL_ID}${C.RST}`;
+      L1B += `${C.BOLD}${C.CYAN}${MODEL_ID}${C.RST}`;
     }
-    if (EFFORT) L1 += ` ${C.DIM}effort:${C.RST}${EFFORT}`;
+    if (EFFORT) L1B += ` ${C.DIM}effort:${C.RST}${EFFORT}`;
     if (OUTPUT_STYLE && OUTPUT_STYLE !== "default")
-      L1 += ` ${C.DIM}style:${C.RST}${OUTPUT_STYLE}`;
-    if (VIM_MODE) L1 += ` ${C.DIM}[${VIM_MODE}]${C.RST}`;
+      L1B += ` ${C.DIM}style:${C.RST}${OUTPUT_STYLE}`;
+    if (VIM_MODE) L1B += ` ${C.DIM}[${VIM_MODE}]${C.RST}`;
     if (L1) out.push(L1);
+    if (L1B) out.push(L1B);
   }
 
   // ============================================================
@@ -306,7 +295,6 @@ function main() {
     const bar = "▓".repeat(filled) + "░".repeat(empty);
 
     let L2 = `${barColor}${bar}${C.RST} ${barColor}${numStr(CTX_PCT)}%${C.RST}${C.DIM}/${fmtK(CTX_SIZE)}${C.RST}`;
-    L2 += ` ${C.DIM}in:${C.RST}${C.BLUE}${fmtK(CUR_IN)}${C.RST} ${C.DIM}out:${C.RST}${C.MAGENTA}${fmtK(CUR_OUT)}${C.RST} ${C.DIM}cache_cr:${C.RST}${fmtK(CACHE_CREATE)} ${C.DIM}cache_rd:${C.RST}${fmtK(CACHE_READ)}`;
     if (EXCEEDS_200K === true) L2 += ` ${C.YELLOW}⚠ 200k+${C.RST}`;
     out.push(L2);
   }
@@ -333,7 +321,7 @@ function main() {
         if (gte(r5, 80)) c5 = C.RED;
         else if (gte(r5, 60)) c5 = C.YELLOW;
         else c5 = C.GREEN;
-        L4 = `${C.DIM}5h:${C.RST}${c5}${r5}%${C.RST} ${C.DIM}(resets in ${fmtRelTime(RATE_5H_RESETS)})${C.RST}`;
+        L4 = `${C.DIM}5h:${C.RST}${c5}${r5}%${C.RST} ${C.DIM}⏱${C.RST} ${fmtRelTime(RATE_5H_RESETS)}`;
       }
       if (has7d) {
         const r7 = fmtPct(RATE_7D_PCT);
@@ -341,7 +329,7 @@ function main() {
         if (gte(r7, 80)) c7 = C.RED;
         else if (gte(r7, 60)) c7 = C.YELLOW;
         else c7 = C.GREEN;
-        const seg7 = `${C.DIM}7d:${C.RST}${c7}${r7}%${C.RST} ${C.DIM}(resets in ${fmtRelTime(RATE_7D_RESETS)})${C.RST}`;
+        const seg7 = `${C.DIM}7d:${C.RST}${c7}${r7}%${C.RST} ${C.DIM}⏱${C.RST} ${fmtRelTime(RATE_7D_RESETS)}`;
         L4 = L4 ? `${L4} ${C.DIM}|${C.RST} ${seg7}` : seg7;
       }
       out.push(L4);
@@ -489,9 +477,9 @@ function main() {
             typeof pParsed?.version === "string" ? pParsed.version : "";
           installed = iVer;
           if (mVer && iVer && mVer !== iVer) {
-            // 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.
+            // manifest ≠ installed → .claude is out of sync. The ⟳ nag was removed
+            // (CHK-195); only the bare version renders. inSync is retained for the
+            // guard shape but no longer drives any output.
             inSync = false;
           }
         } catch {
@@ -502,13 +490,7 @@ function main() {
     }
 
     if (!guarded && installed) {
-      let L8 = `${C.DIM}cbp${C.RST} ${installed}`;
-      if (newer && latest) {
-        L8 += ` ${C.YELLOW}↑${latest}${C.RST}`;
-      }
-      if (!inSync) {
-        L8 += ` ${C.YELLOW}⟳ run claude update${C.RST}`;
-      }
+      const L8 = `${C.DIM}cbp${C.RST} ${installed}`;
       out.push(L8);
     }
   }

package/templates/hooks/cbp-statusline.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# @scope: org-shared
 # @hook: NOT-A-HOOK (statusLine renderer, invoked via the cbp-statusline.sh dispatcher)
 # Claude Code Status Line — python renderer.
 # Byte-identical output to the bash renderer in cbp-statusline.sh and the node
@@ -11,6 +12,7 @@
 import json
 import math
 import os
+import re
 import subprocess
 import sys
 import time
@@ -41,7 +43,7 @@ def main():
         root = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", ".."))
 
     MODEL_ID = _get(data, ["model", "id"], "")
-    MODEL_NAME = _get(data, ["model", "display_name"], "")
+    MODEL_NAME = re.sub(r"\s*\(1M context\)\s*$", "", _get(data, ["model", "display_name"], ""))
     CWD = _get(data, ["cwd"], "")
     WS_CURRENT_DIR = _get(data, ["workspace", "current_dir"], "")
     WS_REPO_HOST = _get(data, ["workspace", "repo", "host"], "")
@@ -54,10 +56,6 @@ def main():
     LINES_DEL = _get(data, ["cost", "total_lines_removed"], 0)
     CTX_SIZE = _get(data, ["context_window", "context_window_size"], 200000)
     CTX_PCT = _get(data, ["context_window", "used_percentage"], 0)
-    CUR_IN = _get(data, ["context_window", "current_usage", "input_tokens"], 0)
-    CUR_OUT = _get(data, ["context_window", "current_usage", "output_tokens"], 0)
-    CACHE_CREATE = _get(data, ["context_window", "current_usage", "cache_creation_input_tokens"], 0)
-    CACHE_READ = _get(data, ["context_window", "current_usage", "cache_read_input_tokens"], 0)
     EXCEEDS_200K = _get(data, ["exceeds_200k_tokens"], False)
     EFFORT = _get(data, ["effort", "level"], "")
     RATE_5H_PCT = _get(data, ["rate_limits", "five_hour", "used_percentage"], "")
@@ -78,7 +76,7 @@ def main():
 
     # ---- Config: line toggles + no_color -------------------------------------
     cfg = {
-        "identity": True, "context": True, "cost": True,
+        "identity": True, "context": True, "cost": False,
         "rate_limits": True, "repo_pr": True, "worktree": True,
         "infra_drift": True, "package_freshness": True, "no_color": False,
     }
@@ -172,7 +170,7 @@ def main():
         if delta >= 86400:
             return "%dd" % (delta // 86400)
         if delta >= 3600:
-            return "%dh" % (delta // 3600)
+            return "%dh%dm" % (delta // 3600, (delta % 3600) // 60)
         return "%dm" % (delta // 60)
 
     def gte(v, t):
@@ -202,11 +200,12 @@ def main():
 
     # ===== LINE 1 — Identity =====
     if should_show("IDENTITY", cfg["identity"]):
+        # Line A — location: folder + branch + wt/session/agent prefix
         l1 = ""
         if folder:
-            l1 = "%s%s%s%s" % (BOLD, BLUE, folder, RST)
+            l1 = "📂 %s%s%s%s" % (BOLD, BLUE, folder, RST)
             if branch:
-                l1 += " %s⎇%s%s%s%s" % (DIM, RST, CYAN, branch, RST)
+                l1 += " %s🔀%s %s%s%s" % (DIM, RST, CYAN, branch, RST)
             l1 += " "
         if WT_NAME:
             l1 += "%swt:%s%s%s%s " % (DIM, RST, MAGENTA, WT_NAME, RST)
@@ -214,18 +213,22 @@ def main():
             l1 += "%ssession:%s%s%s%s " % (DIM, RST, MAGENTA, SESSION_NAME, RST)
         elif AGENT_NAME:
             l1 += "%sagent:%s%s%s%s " % (DIM, RST, MAGENTA, AGENT_NAME, RST)
+        # Line B — model: display name + effort + style + vim
+        l1b = ""
         if MODEL_NAME:
-            l1 += "%s%s%s%s" % (BOLD, CYAN, MODEL_NAME, RST)
+            l1b += "%s%s%s%s" % (BOLD, CYAN, MODEL_NAME, RST)
         elif MODEL_ID:
-            l1 += "%s%s%s%s" % (BOLD, CYAN, MODEL_ID, RST)
+            l1b += "%s%s%s%s" % (BOLD, CYAN, MODEL_ID, RST)
         if EFFORT:
-            l1 += " %seffort:%s%s" % (DIM, RST, EFFORT)
+            l1b += " %seffort:%s%s" % (DIM, RST, EFFORT)
         if OUTPUT_STYLE and OUTPUT_STYLE != "default":
-            l1 += " %sstyle:%s%s" % (DIM, RST, OUTPUT_STYLE)
+            l1b += " %sstyle:%s%s" % (DIM, RST, OUTPUT_STYLE)
         if VIM_MODE:
-            l1 += " %s[%s]%s" % (DIM, VIM_MODE, RST)
+            l1b += " %s[%s]%s" % (DIM, VIM_MODE, RST)
         if l1:
             out.append(l1)
+        if l1b:
+            out.append(l1b)
 
     # ===== LINE 2 — Context window =====
     if should_show("CONTEXT", cfg["context"]):
@@ -245,12 +248,6 @@ def main():
         l2 = "%s%s%s %s%s%%%s%s/%s%s" % (
             bar_color, bar, RST, bar_color, num_str(CTX_PCT), RST, DIM, fmt_k(CTX_SIZE), RST,
         )
-        l2 += " %sin:%s%s%s%s %sout:%s%s%s%s %scache_cr:%s%s %scache_rd:%s%s" % (
-            DIM, RST, BLUE, fmt_k(CUR_IN), RST,
-            DIM, RST, MAGENTA, fmt_k(CUR_OUT), RST,
-            DIM, RST, fmt_k(CACHE_CREATE),
-            DIM, RST, fmt_k(CACHE_READ),
-        )
         if EXCEEDS_200K is True:
             l2 += " %s⚠ 200k+%s" % (YELLOW, RST)
         out.append(l2)
@@ -281,8 +278,8 @@ def main():
                     c5 = YELLOW
                 else:
                     c5 = GREEN
-                l4 = "%s5h:%s%s%s%%%s %s(resets in %s)%s" % (
-                    DIM, RST, c5, r5, RST, DIM, fmt_rel_time(RATE_5H_RESETS), RST,
+                l4 = "%s5h:%s%s%s%%%s %s⏱%s %s" % (
+                    DIM, RST, c5, r5, RST, DIM, RST, fmt_rel_time(RATE_5H_RESETS),
                 )
             if has_7d:
                 r7 = fmt_pct(RATE_7D_PCT)
@@ -292,8 +289,8 @@ def main():
                     c7 = YELLOW
                 else:
                     c7 = GREEN
-                seg7 = "%s7d:%s%s%s%%%s %s(resets in %s)%s" % (
-                    DIM, RST, c7, r7, RST, DIM, fmt_rel_time(RATE_7D_RESETS), RST,
+                seg7 = "%s7d:%s%s%s%%%s %s⏱%s %s" % (
+                    DIM, RST, c7, r7, RST, DIM, RST, fmt_rel_time(RATE_7D_RESETS),
                 )
                 l4 = ("%s %s|%s %s" % (l4, DIM, RST, seg7)) if l4 else seg7
             out.append(l4)
@@ -393,9 +390,9 @@ def main():
                     i_ver = i_ver if isinstance(i_ver, str) else ""
                     _installed = i_ver
                     if m_ver and i_ver and m_ver != i_ver:
-                        # 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 up-arrow newer marker.
+                        # manifest != installed -> .claude is out of sync. The nag was
+                        # removed (CHK-195); only the bare version renders. _in_sync is
+                        # retained for the guard shape but no longer drives any output.
                         _in_sync = False
                 except Exception:
                     # Can't read files → hide segment.
@@ -403,10 +400,6 @@ def main():
 
         if not _guarded and _installed:
             l8 = "%scbp%s %s" % (DIM, RST, _installed)
-            if _newer and _latest:
-                l8 += " %s↑%s%s" % (YELLOW, _latest, RST)
-            if not _in_sync:
-                l8 += " %s⟳ run claude update%s" % (YELLOW, RST)
             out.append(l8)
 
     sys.stdout.write(("\n".join(out) + "\n") if out else "")

package/templates/hooks/cbp-statusline.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# @scope: org-shared
 # @hook: NOT-A-HOOK (statusLine renderer, invoked by settings.json statusLine.command)
 # Claude Code Status Line — multi-runtime dispatcher + bash renderer
 # Purpose: Renders up to 6 structured lines of Claude Code status from stdin JSON.
@@ -89,10 +90,6 @@ eval "$(echo "$INPUT" | jq -r '
   @sh "LINES_DEL=\(.cost.total_lines_removed // 0)",
   @sh "CTX_SIZE=\(.context_window.context_window_size // 200000)",
   @sh "CTX_PCT=\(.context_window.used_percentage // 0)",
-  @sh "CUR_IN=\(.context_window.current_usage.input_tokens // 0)",
-  @sh "CUR_OUT=\(.context_window.current_usage.output_tokens // 0)",
-  @sh "CACHE_CREATE=\(.context_window.current_usage.cache_creation_input_tokens // 0)",
-  @sh "CACHE_READ=\(.context_window.current_usage.cache_read_input_tokens // 0)",
   @sh "EXCEEDS_200K=\(.exceeds_200k_tokens // false)",
   @sh "EFFORT=\(.effort.level // "")",
   @sh "RATE_5H_PCT=\(.rate_limits.five_hour.used_percentage // "")",
@@ -114,18 +111,23 @@ eval "$(echo "$INPUT" | jq -r '
 # Note: RATE_*_PCT use `// ""` (not `// 0`) so the absence gate below distinguishes
 # "API said 0% used" from "rate_limits object absent". Do not change to `// 0`.
 
+# Strip trailing ' (1M context)' suffix from model display name (whitespace-tolerant).
+MODEL_NAME="$(printf '%s' "$MODEL_NAME" | sed -E 's/[[:space:]]*\(1M context\)[[:space:]]*$//')"
+
 # ---- Config: line toggles + no_color from .codebyplan/statusline.json --------
-CFG_IDENTITY=true; CFG_CONTEXT=true; CFG_COST=true
+CFG_IDENTITY=true; CFG_CONTEXT=true; CFG_COST=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
   # `false` as absent and would coerce a hidden line back to visible. `!= false`
-  # yields true for missing/true and false only for an explicit false.
+  # yields true for missing/true and false only for an explicit false — correct for
+  # default-on lines. `cost` defaults OFF (CHK-195), so it uses `== true`: a missing
+  # key falls back to hidden, mirroring the node/python hardcoded `cost: false`.
   eval "$(jq -r '
     "CFG_IDENTITY=\(.lines.identity != false)",
     "CFG_CONTEXT=\(.lines.context != false)",
-    "CFG_COST=\(.lines.cost != false)",
+    "CFG_COST=\(.lines.cost == true)",
     "CFG_RATE_LIMITS=\(.lines.rate_limits != false)",
     "CFG_REPO_PR=\(.lines.repo_pr != false)",
     "CFG_WORKTREE=\(.lines.worktree != false)",
@@ -209,7 +211,7 @@ fmt_rel_time() {
   local delta=$(( epoch - now ))
   if [ "$delta" -le 0 ]; then printf "now"
   elif [ "$delta" -ge 86400 ]; then printf "%dd" $(( delta / 86400 ))
-  elif [ "$delta" -ge 3600 ]; then printf "%dh" $(( delta / 3600 ))
+  elif [ "$delta" -ge 3600 ]; then printf "%dh%dm" $(( delta / 3600 )) $(( (delta % 3600) / 60 ))
   else printf "%dm" $(( delta / 60 )); fi
 }
 
@@ -229,12 +231,13 @@ fi
 # ============================================================
 if should_show IDENTITY "$CFG_IDENTITY"; then
   L1=""
+  L1B=""
 
-  # Folder + branch — git-derived, visible even without a registered worktree
+  # Line A — location: folder + branch + wt/session/agent prefix
   if [ -n "$FOLDER" ]; then
-    L1="${BOLD}${BLUE}${FOLDER}${RST}"
+    L1="📂 ${BOLD}${BLUE}${FOLDER}${RST}"
     if [ -n "$BRANCH" ]; then
-      L1="${L1} ${DIM}⎇${RST}${CYAN}${BRANCH}${RST}"
+      L1="${L1} ${DIM}🔀${RST} ${CYAN}${BRANCH}${RST}"
     fi
     L1="${L1} "
   fi
@@ -248,31 +251,34 @@ if should_show IDENTITY "$CFG_IDENTITY"; then
     L1="${L1}${DIM}agent:${RST}${MAGENTA}${AGENT_NAME}${RST} "
   fi
 
-  # Model — display name only (no redundant id-in-parens)
+  # Line B — model: display name + effort + style + vim
   if [ -n "$MODEL_NAME" ]; then
-    L1="${L1}${BOLD}${CYAN}${MODEL_NAME}${RST}"
+    L1B="${L1B}${BOLD}${CYAN}${MODEL_NAME}${RST}"
   elif [ -n "$MODEL_ID" ]; then
-    L1="${L1}${BOLD}${CYAN}${MODEL_ID}${RST}"
+    L1B="${L1B}${BOLD}${CYAN}${MODEL_ID}${RST}"
   fi
 
   # Effort level (when present)
   if [ -n "$EFFORT" ]; then
-    L1="${L1} ${DIM}effort:${RST}${EFFORT}"
+    L1B="${L1B} ${DIM}effort:${RST}${EFFORT}"
   fi
 
   # Output style (when present and not "default")
   if [ -n "$OUTPUT_STYLE" ] && [ "$OUTPUT_STYLE" != "default" ]; then
-    L1="${L1} ${DIM}style:${RST}${OUTPUT_STYLE}"
+    L1B="${L1B} ${DIM}style:${RST}${OUTPUT_STYLE}"
   fi
 
   # Vim mode
   if [ -n "$VIM_MODE" ]; then
-    L1="${L1} ${DIM}[${VIM_MODE}]${RST}"
+    L1B="${L1B} ${DIM}[${VIM_MODE}]${RST}"
   fi
 
   if [ -n "$L1" ]; then
     printf "%b\n" "$L1"
   fi
+  if [ -n "$L1B" ]; then
+    printf "%b\n" "$L1B"
+  fi
 fi
 
 # ============================================================
@@ -295,13 +301,8 @@ if should_show CONTEXT "$CFG_CONTEXT"; then
   for ((i=0; i<EMPTY; i++)); do BAR+="░"; done
 
   CTX_SIZE_F=$(fmt_k "$CTX_SIZE")
-  CUR_IN_F=$(fmt_k "$CUR_IN")
-  CUR_OUT_F=$(fmt_k "$CUR_OUT")
-  CACHE_CR_F=$(fmt_k "$CACHE_CREATE")
-  CACHE_RD_F=$(fmt_k "$CACHE_READ")
 
   L2="${BAR_COLOR}${BAR}${RST} ${BAR_COLOR}${CTX_PCT}%${RST}${DIM}/${CTX_SIZE_F}${RST}"
-  L2="${L2} ${DIM}in:${RST}${BLUE}${CUR_IN_F}${RST} ${DIM}out:${RST}${MAGENTA}${CUR_OUT_F}${RST} ${DIM}cache_cr:${RST}${CACHE_CR_F} ${DIM}cache_rd:${RST}${CACHE_RD_F}"
 
   if [ "$EXCEEDS_200K" = "true" ]; then
     L2="${L2} ${YELLOW}⚠ 200k+${RST}"
@@ -343,7 +344,7 @@ if should_show RATE_LIMITS "$CFG_RATE_LIMITS"; then
         C5="$GREEN"
       fi
       REL5=$(fmt_rel_time "$RATE_5H_RESETS")
-      L4="${DIM}5h:${RST}${C5}${R5}%${RST} ${DIM}(resets in ${REL5})${RST}"
+      L4="${DIM}5h:${RST}${C5}${R5}%${RST} ${DIM}⏱${RST} ${REL5}"
     fi
 
     if [ -n "$RATE_7D_PCT" ] && [ "$RATE_7D_RESETS" != "0" ]; then
@@ -356,7 +357,7 @@ if should_show RATE_LIMITS "$CFG_RATE_LIMITS"; then
         C7="$GREEN"
       fi
       REL7=$(fmt_rel_time "$RATE_7D_RESETS")
-      SEG7="${DIM}7d:${RST}${C7}${R7}%${RST} ${DIM}(resets in ${REL7})${RST}"
+      SEG7="${DIM}7d:${RST}${C7}${R7}%${RST} ${DIM}⏱${RST} ${REL7}"
       if [ -n "$L4" ]; then
         L4="${L4} ${DIM}|${RST} ${SEG7}"
       else
@@ -479,9 +480,9 @@ if should_show PACKAGE_FRESHNESS "$CFG_PACKAGE_FRESHNESS"; then
       _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.
+        # manifest ≠ installed → .claude is out of sync. The ⟳ nag was removed
+        # (CHK-195); only the bare version renders. _CBP_IN_SYNC is retained for
+        # the guard shape but no longer drives any output.
         _CBP_IN_SYNC=false
       fi
     else
@@ -492,12 +493,6 @@ if should_show PACKAGE_FRESHNESS "$CFG_PACKAGE_FRESHNESS"; then
 
   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/cbp-subagent-statusline.mjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+// @scope: org-shared
 // @hook: NOT-A-HOOK (subagentStatusLine renderer, invoked via the cbp-subagent-statusline.sh dispatcher)
 // Claude Code Subagent Status Line — node renderer (ESM; .mjs forces ESM regardless
 // of the host repo's package.json "type"). Byte-identical output to the bash renderer

package/templates/hooks/cbp-subagent-statusline.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# @scope: org-shared
 # @hook: NOT-A-HOOK (subagentStatusLine renderer, invoked via the cbp-subagent-statusline.sh dispatcher)
 # Claude Code Subagent Status Line — python renderer. Byte-identical output to the
 # bash renderer in cbp-subagent-statusline.sh and the node renderer in

package/templates/hooks/cbp-subagent-statusline.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# @scope: org-shared
 # Portability: bash 3.2+ (macOS default /bin/bash). UTF-8 multibyte chars in
 # user-controlled fields are byte-iterated under 3.2 (over-counts visible width
 # for non-ASCII content); acceptable safe-direction approximation — and the node

package/templates/skills/cbp-build-cc-mode/SKILL.md

@@ -1,7 +1,7 @@
 ---
 scope: org-shared
 name: cbp-build-cc-mode
-description: Audit + apply the CHK-109 model/effort matrix across every authoring skill and agent under `packages/codebyplan-package/templates/`. Bare invocation walks all SKILL.md and agent .md files and reports frontmatter gaps; with a path argument, edits the target file's frontmatter to the matrix-decided values.
+description: Audit + apply the CHK-109 model/effort convention across every authoring skill and agent under `packages/codebyplan-package/templates/`. Skills set `effort:` only and inherit the session model; agents pin `model:` + `effort:`. Bare invocation audits and reports frontmatter gaps; with a path argument, edits the target file's frontmatter to the convention-decided values.
 argument-hint: "[path-to-agent-or-skill]"
 allowed-tools: Read, Write, Edit, Glob, Grep
 effort: xhigh
@@ -9,66 +9,47 @@ effort: xhigh
 
 # Build CC Mode
 
-Audit or apply the canonical `model:` + `effort:` frontmatter convention across every authoring-source skill (`packages/codebyplan-package/templates/skills/*/SKILL.md`) and agent (`packages/codebyplan-package/templates/agents/*.md`). Bare invocation = audit; path argument = apply.
+Audit or apply the canonical model/effort frontmatter convention across every authoring-source skill (`packages/codebyplan-package/templates/skills/*/SKILL.md`) and agent (`packages/codebyplan-package/templates/agents/*.md`). Bare invocation = audit; path argument = apply.
+
+The convention splits by surface:
+
+- **Skills do NOT pin `model:`.** A skill's inline turn runs inside the user's active session, so it must inherit the session model. Pinning a model (a) forces a model the user did not choose and (b) can carry the session's 1M `[1m]` context tier onto the skill, producing `API Error: Usage credits required for 1M context`. Skills set `effort:` only.
+- **Agents pin `model:` explicitly.** A spawned/forked subagent should not silently inherit the parent's model or context tier — every agent states its model so each subagent's cost/quality is auditable. Agents set both `model:` and `effort:`.
 
 ## When to Use
 
-- Authoring a new agent or skill — look up the matrix below to pick the right `model` + `effort` before writing the frontmatter.
+- Authoring a new agent or skill — look up the convention below before writing the frontmatter.
 - Sweeping `packages/codebyplan-package/templates/` for conformance after a refactor or version bump.
-- Onboarding a new exception (e.g., a fresh haiku-low skill) — record the rationale in the matrix here first, then apply.
+- Onboarding a new exception — record the rationale here first, then apply.
 
 ## Decision Matrix
 
-### Default (applies to all agents and most skills)
-
-`model: sonnet` + `effort: xhigh`
-
-Fifteen of the 16 authoring agents take the default (`cbp-cc-executor`, `cbp-database-agent`, `cbp-improve-claude`, `cbp-improve-round`, `cbp-research`, `cbp-round-executor`, `cbp-security-agent`, `cbp-task-check`, `cbp-task-planner`, `cbp-testing-qa-agent`, `cbp-e2e-playwright`, `cbp-e2e-maestro`, `cbp-e2e-tauri`, `cbp-e2e-vscode`, `cbp-e2e-xcuitest`). The 16th — `cbp-mechanical-edits` — is an explicit haiku-low exception (see below). 26 skills take the default: cbp-round-start, cbp-round-input, cbp-round-execute, cbp-task-create, cbp-task-start, cbp-task-complete, cbp-task-testing, cbp-checkpoint-create, cbp-checkpoint-check, cbp-checkpoint-end, cbp-build-cc-mode, cbp-build-cc-agent, cbp-build-cc-skill, cbp-build-cc-rule, cbp-build-cc-claude-file, cbp-build-cc-settings, cbp-frontend-a11y, cbp-frontend-design, cbp-frontend-ui, cbp-frontend-ux, cbp-session-end, cbp-ship, cbp-ship-configure, cbp-supabase-setup, cbp-supabase-migrate, cbp-supabase-branch-check.
-
-### Effort-lowered skills (5)
+### Skills — `effort:` only, never `model:`
 
-`model: sonnet` + `effort: high`. Opus reasoning retained; effort dropped from `xhigh` because the skill body is summary/dispatch rather than deep authoring.
+Omit `model:` entirely (inherit the session model). Set `effort:` per the skill's nature. Default `effort: xhigh`; tiers:
 
-| skill             | model  | effort | reason                                                                                                            |
-| ----------------- | ------ | ------ | ----------------------------------------------------------------------------------------------------------------- |
-| cbp-round-end         | sonnet | high   | Spawns cbp-improve-round agent; auto-applies in-scope findings + routes out-of-scope to round-update — lighter than xhigh suffices |
-| cbp-task-check        | sonnet | high   | Thin orchestrator over spawned cbp-task-check agent; inline-fallback path keeps Opus for safety                       |
-| cbp-checkpoint-update | sonnet | high   | Status updates + context patches mostly; lighter than xhigh                                                       |
-| cbp-ship-main         | sonnet | high   | Production-impacting PR creation; keep Opus reasoning but drop effort                                             |
-| cbp-merge-main        | sonnet | high   | Long-lived-branch integration merge — surgical conflict resolution, no authoring                                  |
+| effort   | use for                                                | examples                                                                                                                                                              |
+| -------- | ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `xhigh`  | deep authoring / planning / orchestration (most skills) | build-cc-*, checkpoint-check/end/plan, round-start/input/execute, task-create/start/complete/testing, standalone-task-*, frontend-*, ship, ship-configure, supabase-*, setup-e2e/eslint, session-end |
+| `high`   | summary / orchestration, lighter than xhigh            | checkpoint-create, checkpoint-start, checkpoint-update, round-end, task-check, standalone-task-check, ship-main, merge-main                                           |
+| `medium` | moderate, scoped sync work                             | refresh-infra                                                                                                                                                        |
+| `low`    | pure mechanical / dispatch / templated work            | checkpoint-complete, round-check, round-complete, round-update, todo, session-start, git-commit, git-branch-feat-create, git-worktree-create, git-worktree-remove    |
 
-### Haiku-low skills (10)
+A skill that carries a `model:` line is a **gap** — remove it unless a deliberate, documented exception is recorded here (currently none).
 
-`model: haiku` + `effort: low`. Pure mechanical / dispatch / templated work.
+### Agents — `model:` + `effort:`
 
-| skill                  | model | effort | reason                                                                                   |
-| ---------------------- | ----- | ------ | ---------------------------------------------------------------------------------------- |
-| cbp-round-update           | haiku | low    | Pure mechanical: triage round state (claude_approved/findings/hard_fail), route to round-complete or round-input |
-| cbp-round-complete         | haiku | low    | Pure mechanical: sync-approvals git-add reconcile, complete round, route per unapproved count |
-| cbp-round-check            | haiku | low    | Run build/lint/types commands, parse output, update QA                                   |
-| cbp-todo                   | haiku | low    | Dispatch: single MCP call + route to next command                                        |
-| cbp-checkpoint-complete    | haiku | low    | Pure finalization — mark completed, write summary; judgment happened in checkpoint-check |
-| cbp-git-commit             | haiku | low    | Conventional-commit message authoring is templated; never-git-add rule codified          |
-| cbp-git-branch-feat-create | haiku | low    | Mechanical: read config, checkout production branch (main), create branch, push          |
-| cbp-git-worktree-create    | haiku | low    | Mechanical: git worktree add + .claude/ copy + MCP register                              |
-| cbp-git-worktree-remove    | haiku | low    | Mechanical: git worktree remove + cleanup + MCP deregister                               |
-| cbp-session-start          | haiku | low    | Dispatch: MCP health check, activate session, fetch logs, auto-trigger /cbp-todo             |
-
-### Haiku-low agents (1)
-
-`model: haiku` + `effort: low`. The 16th authoring agent — pure I/O mechanical work, never authors logic.
+Default `model: sonnet` + `effort: xhigh`. Fifteen of the 16 authoring agents take the default (`cbp-cc-executor`, `cbp-database-agent`, `cbp-improve-claude`, `cbp-improve-round`, `cbp-research`, `cbp-round-executor`, `cbp-security-agent`, `cbp-task-check`, `cbp-task-planner`, `cbp-testing-qa-agent`, `cbp-e2e-playwright`, `cbp-e2e-maestro`, `cbp-e2e-tauri`, `cbp-e2e-vscode`, `cbp-e2e-xcuitest`). The 16th is the one exception:
 
 | agent                | model | effort | reason                                                                              |
 | -------------------- | ----- | ------ | ----------------------------------------------------------------------------------- |
 | cbp-mechanical-edits | haiku | low    | Mechanical rename/substitution/frontmatter-edit subagent; no judgment, pure dispatch |
 
-## Precedence Rule
+`model: inherit` is NOT permitted for agents — pin an explicit alias (`sonnet` / `haiku`) or a full ID.
 
-A skill's `model:` / `effort:` apply to the inline-running turn (the orchestrator turn that invokes the skill). An agent's `model:` / `effort:` apply to the spawned/forked subagent context. For `context: fork` skills, the agent specified in `agent:` governs the forked subagent (per the official Claude Code spec). The two surfaces scope to different execution contexts and do not conflict.
-
-## Model Alias vs Pinned
+## Precedence Rule
 
-Pinned (`sonnet`) is the default convention for explicit version-pinning of work that depends on a specific frontier model's reasoning quality. Alias (`haiku`) is acceptable only for explicit lowering exceptions where the alias-tracked latest of that family is desired (the 10 haiku-low entries above). `model: inherit` is NOT permitted in authoring — every file under `packages/codebyplan-package/templates/` states its model explicitly so the matrix is auditable.
+A skill's `effort:` applies to the inline-running turn (the orchestrator turn that invokes the skill); the skill runs on that turn's inherited model. An agent's `model:` / `effort:` apply to the spawned/forked subagent context. For `context: fork` skills, the agent named in `agent:` governs the forked subagent (per the official Claude Code spec) — so a forked skill's model comes from that agent, not from the skill.
 
 ## Audit Mode
 
@@ -76,25 +57,28 @@ Invoked with no arguments. Procedure:
 
 1. Glob `packages/codebyplan-package/templates/agents/*.md` and `packages/codebyplan-package/templates/skills/*/SKILL.md`.
 2. For each file, read the frontmatter and parse `model:` + `effort:`.
-3. Look up the expected values from the matrix above (file basename or `name:` frontmatter field is the lookup key).
-4. Emit a pipe-delimited table line per file: `path | current_model/current_effort | expected_model/expected_effort | status`.
+3. Apply the convention by surface:
+   - **Skill**: `model:` MUST be ABSENT; `effort:` MUST be present and one of `low`/`medium`/`high`/`xhigh`/`max` (default `xhigh`).
+   - **Agent**: `model:` MUST be present (per the agent table; default `sonnet`); `effort:` present (default `xhigh`).
+4. Emit one pipe-delimited line per file: `path | current_model/current_effort | expected | status`.
 5. Status values:
-   - `ok` — current matches expected
-   - `gap` — missing field, or current value differs from expected
-   - `deprecated` — uses `model: sonnet` (legacy alias; migrate to `sonnet`)
-6. Print a summary line at the end: total files audited, count `ok`, count `gap`, count `deprecated`.
+   - `ok` — matches the convention.
+   - `gap` — a skill that carries a `model:` line, a skill missing `effort:`, an agent missing/incorrect `model:`, or any missing/invalid `effort:`.
+6. Print a summary: total audited, count `ok`, count `gap`.
 
-The audit is read-only — no edits performed.
+The audit is read-only.
 
 ## Apply Mode
 
 Invoked with a path argument (the target `SKILL.md` or agent `.md`). Procedure:
 
-1. Read the file. Identify the skill or agent name from the `name:` frontmatter field (or from the path basename if `name:` is absent).
-2. Look up target `model` + `effort` from the matrix above.
-3. Use Edit to set the frontmatter `model:` and `effort:` lines to the target values. Preserve every other frontmatter field and the entire file body. Files whose current status is `deprecated` (legacy `model: sonnet`) follow the same path — the deprecated label is informational; the remediation action is identical to `gap`.
-4. If the name is NOT in the matrix, surface to the user via AskUserQuestion: current state, propose the default (`sonnet` / `xhigh`), ask whether to (a) add an exception entry to this skill's matrix first, or (b) apply the default.
+1. Read the file. Identify the name from the `name:` frontmatter (or the path basename).
+2. Look up the target from the convention above.
+3. Use Edit to set the frontmatter to the target, preserving every other field and the entire body:
+   - **Skill**: REMOVE any `model:` line; set/keep a valid `effort:` (default `xhigh`).
+   - **Agent**: set `model:` and `effort:` to the table values.
+4. If the name is NOT covered, surface via AskUserQuestion: current state, propose the default (skill → no `model:` + `xhigh`; agent → `sonnet` + `xhigh`), and ask whether to (a) record an exception entry here first, or (b) apply the default.
 
 ## Self-Conformance
 
-This skill's own frontmatter sits at the default (`sonnet` / `xhigh`). The first audit run after this skill is authored MUST emit `ok` for `packages/codebyplan-package/templates/skills/cbp-build-cc-mode/SKILL.md` — if it doesn't, the matrix is out of sync with reality and must be reconciled before any further apply.
+This skill is itself a skill: its frontmatter sets `effort: xhigh` and NO `model:`. The first audit run after editing this file MUST emit `ok` for `packages/codebyplan-package/templates/skills/cbp-build-cc-mode/SKILL.md` — if it doesn't, the convention is out of sync with reality and must be reconciled before any further apply.

package/templates/skills/cbp-build-cc-skill/SKILL.md

@@ -90,7 +90,7 @@ Key fields by use case:
 | Hide from `/` menu                                   | `user-invocable: false`                                                                                                                                                                                                          |
 | Pre-approve tools                                    | `allowed-tools: Bash(git add *) Bash(git commit *)`                                                                                                                                                                              |
 | Accept arguments                                     | `argument-hint: [file] [mode]`, optionally `arguments: [file mode]` for named `$file`/`$mode`                                                                                                                                    |
-| Set model/effort (always required for plugin skills) | `model: sonnet`, `effort: xhigh` — defaults for plugin skills. Lower (`haiku`/`low` or Opus/`high`) only as a documented exception per [/cbp-build-cc-mode](../build-cc-mode/SKILL.md). `model: inherit` is NOT permitted |
+| Set effort (do NOT set model)                        | `effort: xhigh` — default for plugin skills; lower (`high`/`low`) per [/cbp-build-cc-mode](../build-cc-mode/SKILL.md). **Omit `model:`** so the skill inherits the active session model — pinning one forces a model the user didn't choose and can carry the session's 1M `[1m]` tier onto the skill (→ "usage credits required for 1M context"). Pin `model:` only as a deliberate, documented exception |
 | Path-scoped auto-load                                | `paths: ["src/api/**/*.ts"]`                                                                                                                                                                                                     |
 | Fork to subagent                                     | `context: fork`, `agent: Explore`                                                                                                                                                                                                |
 

package/templates/skills/cbp-build-cc-skill/reference/frontmatter-fields.md

@@ -12,7 +12,7 @@ Source: official Claude Code skills spec. All fields are optional; `description`
 | `disable-model-invocation` | `true` → only user can invoke (via `/name`) |
 | `user-invocable` | `false` → hidden from `/` menu, Claude-only |
 | `allowed-tools` | Pre-approve tools while the skill is active |
-| `model` | Override model for this skill's turn. **Plugin skills authored in CBP MUST set this explicitly** — `inherit` is not permitted; defaults to `sonnet`. See [/cbp-build-cc-mode](../../build-cc-mode/SKILL.md) for the canonical matrix |
+| `model` | Override model for this skill's turn. **CBP skills normally OMIT this** so the skill inherits the active session model. Pinning a model (e.g. `sonnet`) forces that model and can carry the session's 1M `[1m]` context tier onto the skill, triggering "usage credits required for 1M context". Set it only as a deliberate, documented exception — see [/cbp-build-cc-mode](../../build-cc-mode/SKILL.md) |
 | `effort` | Override effort level (`low`/`medium`/`high`/`xhigh`/`max`). **Plugin skills authored in CBP MUST set this explicitly** (no commented-out placeholder); defaults to `xhigh`. See [/cbp-build-cc-mode](../../build-cc-mode/SKILL.md) for the matrix |
 | `context` | `fork` → run in a subagent |
 | `agent` | Subagent type when `context: fork` — built-in or custom |

package/templates/skills/cbp-build-cc-skill/scripts/validate-skill.sh

@@ -49,10 +49,14 @@ grep -qE '^description:\s*' <<< "$fm" || echo "  WARN: no description — Claude
 # CBP scope required
 grep -qE '^scope:\s*' <<< "$fm" || err "missing CBP required field: scope (org-shared|project-shared|repo-only:<repo-name>)"
 
-# Model (if present)
-model=$(grep -E '^model:' <<< "$fm" | head -1 | sed -E 's/^model:[[:space:]]*//; s/[[:space:]]*$//; s/^"(.*)"$/\1/' || true)
-if [ -n "$model" ] && [[ ! "$model" =~ ^(sonnet|opus|haiku|inherit|claude-.+)$ ]]; then
-  err "model invalid: '$model'"
+# Model — skills MUST NOT pin a model. A skill's inline turn runs in the user's
+# active session, so it inherits the session model. Pinning one forces a model the
+# user didn't choose and can carry the session's 1M [1m] context tier onto the skill
+# ("API Error: Usage credits required for 1M context"). Agents pin model explicitly
+# (validate-agent.sh) — skills never do.
+if grep -qE '^model:' <<< "$fm"; then
+  model=$(grep -E '^model:' <<< "$fm" | head -1 | sed -E 's/^model:[[:space:]]*//; s/[[:space:]]*$//')
+  err "skills must NOT set 'model:' (found '$model') — skills inherit the session model; remove the line (see /cbp-build-cc-mode)"
 fi
 
 # Effort (if present)

package/templates/skills/cbp-build-cc-skill/templates/skill.md

@@ -8,8 +8,8 @@ description: What this skill does and when to use it. Front-load the key use cas
 # disable-model-invocation: false  # true = only user can invoke via /name
 # user-invocable: true  # false = only Claude can invoke (hidden from / menu)
 # allowed-tools: Read, Grep, Glob, Bash(git status *)
-# review with /cbp-build-cc-mode if defaults don't fit this skill's purpose
-model: sonnet
+# model:  # OMIT to inherit the session model (recommended). A pinned model can carry the session's 1M [1m] tier and require usage credits — pin only as a documented exception (see /cbp-build-cc-mode)
+# review effort with /cbp-build-cc-mode if the default doesn't fit this skill's purpose
 effort: xhigh
 # context: fork  # runs in a forked subagent
 # agent: Explore  # subagent type: Explore | Plan | general-purpose | <custom>

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

@@ -2,7 +2,6 @@
 scope: org-shared
 name: cbp-merge-main
 description: Merge main into the current feat branch with interactive per-conflict resolution and inline QA re-run
-model: sonnet
 effort: high
 ---
 

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

@@ -3,7 +3,6 @@ scope: org-shared
 name: cbp-setup-e2e
 description: Detect installed E2E frameworks, ask which to enable, record credentials source (gitignored env-file path + var names only, never secrets), and write/refresh .codebyplan/e2e.json. Interactive, idempotent.
 argument-hint: "[--force]"
-model: sonnet
 effort: xhigh
 allowed-tools: Read, Write, Edit, Bash(cat *), Bash(jq *), Bash(which *), Bash(test *), Bash(mkdir *), Bash(cp *), Bash(echo *), Bash(date *), Bash(mv *), Bash(git check-ignore *), AskUserQuestion, mcp__codebyplan__get_repos
 ---

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

@@ -3,7 +3,6 @@ scope: org-shared
 name: cbp-setup-eslint
 description: Detect each app's tech stack, resolve matching DB ESLint presets, confirm which to enable per app, run `codebyplan eslint init` to generate eslint.config.mjs, and write/refresh .codebyplan/eslint.json. Interactive, idempotent.
 argument-hint: "[--force]"
-model: sonnet
 effort: xhigh
 allowed-tools: Read, Write, Edit, Bash(cat *), Bash(jq *), Bash(test *), Bash(ls *), Bash(mkdir *), Bash(cp *), Bash(echo *), Bash(mv *), Bash(npx codebyplan eslint *), AskUserQuestion, mcp__codebyplan__get_repos, mcp__codebyplan__get_eslint_presets
 ---

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

@@ -2,7 +2,6 @@
 scope: org-shared
 name: cbp-ship-main
 description: Ship feat branch to production branch via PR — thin wrapper around `codebyplan ship`
-model: sonnet
 effort: high
 ---
 

package/templates/skills/cbp-supabase-branch-check/SKILL.md

@@ -4,7 +4,6 @@ name: cbp-supabase-branch-check
 description: Gate skill called by /cbp-ship-main (pre-merge) to verify the Supabase preview branch health check is green before allowing a PR to be merged; skips when no DB-path changes are detected.
 argument-hint: "[--mode pre_pr_create|pre_merge] [--target integration|production]"
 allowed-tools: Bash(git *), Bash(gh *), Bash(jq *), Bash(supabase *), Bash(sleep *), Bash(echo *), Read, mcp__supabase__list_branches, mcp__supabase__get_logs
-model: sonnet
 effort: xhigh
 ---
 

package/templates/skills/cbp-supabase-migrate/SKILL.md

@@ -4,7 +4,6 @@ name: cbp-supabase-migrate
 description: Scaffold or adopt a Supabase migration for the current PR branch, apply to the branch's preview DB, run advisor checks, regenerate TypeScript types. Includes a fresh-branch dry-run pre-flight that uses one persistent dry-run ephemeral branch per feature branch.
 argument-hint: "[--new <name> | <path-to-sql>]"
 allowed-tools: Read, Edit, Write, Bash(git *), Bash(supabase *), Bash(jq *), Bash(date *), Bash(which *), Bash(cp *), Bash(mv *), Bash(test *), Bash(ls *), mcp__supabase__apply_migration, mcp__supabase__list_migrations, mcp__supabase__get_advisors, mcp__supabase__generate_typescript_types, mcp__supabase__reset_branch, mcp__supabase__list_branches, mcp__supabase__create_branch, mcp__supabase__get_cost, mcp__supabase__confirm_cost, mcp__codebyplan__update_checkpoint, mcp__codebyplan__update_task
-model: sonnet
 effort: xhigh
 ---