@promptctl/cc-candybar 1.7.0 → 1.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promptctl/cc-candybar",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Statusline renderer for Claude Code — a JSON5-configurable DSL with daemon-cached data sources, byte-clean palette-aware composition, and OSC8 click verbs.",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -91,10 +91,10 @@
     "mobx": "^6.15.0"
   },
   "optionalDependencies": {
-    "@promptctl/cc-candybar-darwin-arm64": "1.7.0",
-    "@promptctl/cc-candybar-darwin-x64": "1.7.0",
-    "@promptctl/cc-candybar-linux-x64": "1.7.0",
-    "@promptctl/cc-candybar-linux-arm64": "1.7.0"
+    "@promptctl/cc-candybar-darwin-arm64": "1.7.2",
+    "@promptctl/cc-candybar-darwin-x64": "1.7.2",
+    "@promptctl/cc-candybar-linux-x64": "1.7.2",
+    "@promptctl/cc-candybar-linux-arm64": "1.7.2"
   },
   "pnpm": {
     "supportedArchitectures": {

package/src/config/default-dsl-config.ts

@@ -30,7 +30,7 @@ import type { DslConfig } from "./dsl-types.js";
 //
 // Factored out of the segments' `template` fields so:
 //   (1) the git working-tree counts and status icon can be shared by the two
-//       git-style segments (git, gitTaculous) without duplication, and
+//       git-style segments (git, gitaculous) without duplication, and
 //   (2) the block/weekly threshold cascade can be parameterized on the
 //       variable name without resorting to runtime string surgery.
 
@@ -543,7 +543,7 @@ export const DEFAULT_DSL_CONFIG = {
       fg: "foreground",
       when: '{{ ne .git.branch "" }}',
     },
-    gitTaculous: {
+    gitaculous: {
       template:
         " (git)" +
         '{{ if ne .git.repoName "" }} {{ .git.repoName }}{{ end }}' +
@@ -750,11 +750,12 @@ export const DEFAULT_DSL_CONFIG = {
       fg: "foreground",
     },
     // The expanded style picker: one full-width page (paged=false) over the
-    // `applyStyle` option domain — the 3 powerline shapes. closeOnPick folds a
-    // page-reset into the apply, so a pick reshapes the bar and closes the row
-    // in one click. The active shape is marked by the picker helper.
+    // `applyStyle` option domain — the 3 powerline shapes. closeOnPick defaults
+    // false (omitted here), so a pick reshapes the bar live and LEAVES THE ROW
+    // OPEN — shapes can be tried in a row; the ✕ affordance closes. The active
+    // shape is marked by the picker helper.
     stylePicker: {
-      template: '{{ picker "applyStyle" "stylePage" true false }}',
+      template: '{{ picker "applyStyle" "stylePage" }}',
       bg: "surface",
       fg: "foreground",
     },

package/src/config/loader/cross-ref.ts

@@ -22,6 +22,16 @@ import {
   refResolves,
 } from "./refs.js";
 
+// [LAW:one-source-of-truth] The renamed built-in segments: old name → current
+// name. A user config (which merges on top of the bundled default) that names a
+// renamed segment in `root` finds no matching declaration and would otherwise
+// get the generic "does not match any declared segment" error. This map turns
+// that into a migration pointer [LAW:no-silent-failure] — data, not a per-name
+// branch, so a future rename is one row here, not new control flow.
+export const RENAMED_SEGMENTS: Readonly<Record<string, string>> = {
+  gitTaculous: "gitaculous",
+};
+
 export function validateCrossReferences(
   ctx: ValidateCtx,
   cfg: DslConfig,
@@ -69,9 +79,14 @@ export function validateCrossReferences(
     }
     if (node.kind !== "segment") continue;
     if (!Object.prototype.hasOwnProperty.call(cfg.segments, node.name)) {
+      const renamed = RENAMED_SEGMENTS[node.name];
+      const hint =
+        renamed !== undefined
+          ? ` (the built-in segment "${node.name}" was renamed to "${renamed}" — update this reference)`
+          : "";
       ctx.issues.push({
         path: layoutKey,
-        message: `${layoutKey} entry "${node.name}" does not match any declared segment`,
+        message: `${layoutKey} entry "${node.name}" does not match any declared segment${hint}`,
         line: layoutLine,
       });
     }

package/src/render/picker.ts

@@ -208,6 +208,17 @@ function renderPicker(
 // (closeOnPick, paged). Returns T (RichText), the single fragment go-template-js
 // emits for `{{ picker … }}`.
 //
+// [LAW:no-mode-explosion] Both bools are OPTIONAL trailing values with a
+// documented default of `false`: `closeOnPick=false` is stay-open (a pick
+// recolors live and LEAVES THE MENU OPEN so themes can be tried in a row — the
+// baseline UX; the ✕ affordance closes), `closeOnPick=true` is the opt-in where a
+// pick ALSO writes the page key closed; `paged=false` is one wrapping page,
+// `paged=true` slices into ←/→ pages at the live width. `enforceArgTypes`
+// validates only the values actually passed (it loops over arity), so an omitted
+// trailing bool arrives `undefined` and resolves to the default here — no arity
+// error, and order is preserved so existing callers (which pass both) are
+// untouched. Authoring stay-open + paged is `{{ picker "a" "p" false true }}`.
+//
 // [LAW:one-way-deps] The caller injects this FuncMap into createCcCandybarEngine
 // (capabilities-over-context) so the generic engine never imports the picker.
 export function pickerFuncs(runtime: ActionRuntime): FuncMap {
@@ -216,9 +227,16 @@ export function pickerFuncs(runtime: ActionRuntime): FuncMap {
       fn: (
         applyName: string,
         pageName: string,
-        closeOnPick: boolean,
-        paged: boolean,
-      ) => renderPicker(applyName, pageName, closeOnPick, paged, runtime),
+        closeOnPick?: boolean,
+        paged?: boolean,
+      ) =>
+        renderPicker(
+          applyName,
+          pageName,
+          closeOnPick === true,
+          paged === true,
+          runtime,
+        ),
       argTypes: ["string", "string", "bool", "bool"],
       returnType: "T",
     },

package/src/utils/terminal-width.ts

@@ -11,13 +11,21 @@
 // Variability lives in the inputs (hint set or not, env set or not, stderr a
 // TTY or not), never in whether work runs.
 
-// @info Reserves characters for Claude Code's right-side UI messages
-// (e.g., "Current: 2.1.78 · latest: 2.1.78", "Thinking off")
-const RESERVED_CHARS = 45;
+// @info Reserves columns for Claude Code's statusline left gutter. Claude Code
+// prints each statusline row inset by a fixed left margin, so a row rendered at
+// the full raw column count would be shifted right past the terminal edge and
+// soft-wrap its trailing cells. The reserve is exactly that left margin — NOT a
+// right-side overlay budget. The version/autoupdate/"Remote Control" hints render
+// on their own right-aligned lines below the bar and never overlap a statusline
+// row, so they cost zero usable width here. Verified empirically against a live
+// Claude Code statusline (the older value of 45 was a guess for a right-side
+// overlay that does not sit on the statusline row); re-measure if Claude Code's
+// statusline gutter changes.
+const RESERVED_CHARS = 2;
 
 // [LAW:single-enforcer] The canonical raw-cols → usable-cols transform.
-// Every consumer that needs to honor Claude Code's overlay routes through
-// here; there is no parallel `cols - 45` math anywhere. Exposed so callers
+// Every consumer that needs to honor Claude Code's statusline gutter routes
+// through here; there is no parallel `cols - N` math anywhere. Exposed so callers
 // that already have a raw width (e.g. the daemon's wire-fallback path,
 // the demo reading process.stdout.columns) can apply the reserve without
 // re-entering the env/stderr resolution chain in getTerminalWidth.