codebyplan 1.13.33 → 1.13.35

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.33";
+    VERSION = "1.13.35";
     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,
@@ -1606,22 +1606,16 @@ function mergeEnabledPluginsIntoSettings(settings, plugins) {
   }
   return settings;
 }
-function stripOwnedHooksFromSettings(settings) {
+function collapseEmptyHookBlocks(settings) {
   if (!settings.hooks) {
-    return settings;
+    return;
   }
   for (const event of Object.keys(settings.hooks)) {
     const eventBlocks = settings.hooks[event];
     if (!eventBlocks) {
       continue;
     }
-    const survivingBlocks = [];
-    for (const block of eventBlocks) {
-      block.hooks = block.hooks.filter((e) => e._owner !== OWNER);
-      if (block.hooks.length > 0) {
-        survivingBlocks.push(block);
-      }
-    }
+    const survivingBlocks = eventBlocks.filter((b) => b.hooks.length > 0);
     if (survivingBlocks.length > 0) {
       settings.hooks[event] = survivingBlocks;
     } else {
@@ -1631,6 +1625,54 @@ function stripOwnedHooksFromSettings(settings) {
   if (Object.keys(settings.hooks).length === 0) {
     delete settings.hooks;
   }
+}
+function stripOwnedHooksFromSettings(settings) {
+  if (!settings.hooks) {
+    return settings;
+  }
+  for (const event of Object.keys(settings.hooks)) {
+    const eventBlocks = settings.hooks[event];
+    if (!eventBlocks) {
+      continue;
+    }
+    for (const block of eventBlocks) {
+      block.hooks = block.hooks.filter((e) => e._owner !== OWNER);
+    }
+  }
+  collapseEmptyHookBlocks(settings);
+  return settings;
+}
+function pruneMissingManagedHooks(settings, hooksJson, onPruned) {
+  if (!settings.hooks) {
+    return settings;
+  }
+  const liveIdsByEvent = /* @__PURE__ */ new Map();
+  for (const [event, matchers] of Object.entries(hooksJson.hooks)) {
+    const ids = /* @__PURE__ */ new Set();
+    for (const block of matchers) {
+      for (const cmd of block.hooks) {
+        ids.add(extractHookId(cmd.command));
+      }
+    }
+    liveIdsByEvent.set(event, ids);
+  }
+  for (const event of Object.keys(settings.hooks)) {
+    const eventBlocks = settings.hooks[event];
+    if (!eventBlocks) {
+      continue;
+    }
+    const liveIds = liveIdsByEvent.get(event) ?? /* @__PURE__ */ new Set();
+    for (const block of eventBlocks) {
+      block.hooks = block.hooks.filter((e) => {
+        const shouldPrune = e._owner === OWNER && e._hook_id !== void 0 && !liveIds.has(e._hook_id);
+        if (shouldPrune && onPruned) {
+          onPruned(e._hook_id);
+        }
+        return !shouldPrune;
+      });
+    }
+  }
+  collapseEmptyHookBlocks(settings);
   return settings;
 }
 var OWNER, PLACEHOLDER_RE, REPLACEMENT, SCALAR_BASE_KEYS, DEPRECATED_BASE_KEYS;
@@ -2558,9 +2600,9 @@ async function runLspFull(projectPath, opts = {}) {
     `  Detected LSP servers: ${servers.map((s) => s.plugin).join(", ")}
 `
   );
-  const settingsPath = join10(projectPath, ".claude", "settings.json");
+  const settingsLocalPath = join10(projectPath, ".claude", "settings.local.json");
   let settings = {};
-  const existingSettingsRaw = await readJsonFile(settingsPath);
+  const existingSettingsRaw = await readJsonFile(settingsLocalPath);
   if (existingSettingsRaw) {
     settings = existingSettingsRaw;
   }
@@ -2569,15 +2611,15 @@ async function runLspFull(projectPath, opts = {}) {
     servers.map((s) => s.plugin)
   );
   if (dryRun) {
-    console.log(`  [dry-run] would update ${settingsPath}`);
+    console.log(`  [dry-run] would update ${settingsLocalPath}`);
   } else {
     await mkdir4(join10(projectPath, ".claude"), { recursive: true });
     await writeFile6(
-      settingsPath,
+      settingsLocalPath,
       JSON.stringify(settings, null, 2) + "\n",
       "utf-8"
     );
-    console.log(`  Updated ${settingsPath}`);
+    console.log(`  Updated ${settingsLocalPath}`);
   }
   const lspJsonPath = join10(projectPath, ".codebyplan", "lsp.json");
   const lspJsonContent = {
@@ -2648,7 +2690,7 @@ async function runLspFull(projectPath, opts = {}) {
     `    Enabled plugins: ${pluginNames.length > 0 ? pluginNames.join(", ") : "none"}`
   );
   console.log(
-    `    (settings.json key format: <plugin>@claude-plugins-official)`
+    `    (settings.local.json key format: <plugin>@claude-plugins-official)`
   );
   if (autoInstalled.length > 0) {
     console.log(
@@ -2811,6 +2853,13 @@ async function runInstall(opts, deps = {}) {
         fs3.readFileSync(hooksJsonPath, "utf8")
       );
       mergeHooksIntoSettings(existingSettings, hooksJson);
+      pruneMissingManagedHooks(
+        existingSettings,
+        hooksJson,
+        opts.verbose ? (id) => console.log(
+          `${opts.dryRun ? "[dry-run] would prune" : "pruned"} removed managed hook: ${id}`
+        ) : void 0
+      );
     }
     if (!opts.dryRun) {
       fs3.mkdirSync(path4.dirname(settingsPath), { recursive: true });
@@ -8806,6 +8855,13 @@ async function runUpdate(opts, deps = {}) {
         fs7.readFileSync(hooksJsonPath, "utf8")
       );
       mergeHooksIntoSettings(existingSettings, hooksJson);
+      pruneMissingManagedHooks(
+        existingSettings,
+        hooksJson,
+        opts.verbose ? (id) => console.log(
+          `${opts.dryRun ? "[dry-run] would prune" : "pruned"} removed managed hook: ${id}`
+        ) : void 0
+      );
     }
     if (!opts.dryRun) {
       fs7.mkdirSync(path8.dirname(settingsPath), { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebyplan",
-  "version": "1.13.33",
+  "version": "1.13.35",
   "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