@promptctl/cc-candybar 1.15.0 → 1.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promptctl/cc-candybar",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "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.15.0",
-    "@promptctl/cc-candybar-darwin-x64": "1.15.0",
-    "@promptctl/cc-candybar-linux-x64": "1.15.0",
-    "@promptctl/cc-candybar-linux-arm64": "1.15.0"
+    "@promptctl/cc-candybar-darwin-arm64": "1.17.0",
+    "@promptctl/cc-candybar-darwin-x64": "1.17.0",
+    "@promptctl/cc-candybar-linux-x64": "1.17.0",
+    "@promptctl/cc-candybar-linux-arm64": "1.17.0"
   },
   "pnpm": {
     "supportedArchitectures": {

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

@@ -185,6 +185,18 @@ export const DEFAULT_DSL_CONFIG = {
     },
     "session.id": { kind: "input", path: "session_id", default: "" },
     version: { kind: "input", path: "version", default: "" },
+    // [LAW:one-source-of-truth] The daemon-resolved effective theme name —
+    // effectiveThemeName(sessionState.theme, globals.palette), the SAME name the
+    // rendered basePalette is built from. A theme-picker config's trigger reads
+    // `{{ .theme.effective }}` to show the active theme, so the label and the
+    // colors trace to one resolution and cannot drift — no per-config restating
+    // of the initial theme (which JSON5, being inert data, cannot derive). The
+    // daemon always provides it; the "" default is the unreachable-absence floor.
+    "theme.effective": {
+      kind: "input",
+      path: "theme.effective",
+      default: "",
+    },
 
     // [LAW:one-source-of-truth] The usable terminal width for THIS render —
     // the exact post-reserve cell count FlexStrip wraps to. renderDsl injects

package/src/daemon/render-payload.ts

@@ -33,7 +33,6 @@ import type { ContextProvider } from "../segments/context.js";
 import type { MetricsProvider } from "../segments/metrics.js";
 import type { TmuxService } from "../segments/tmux.js";
 import type { GitDataProvider } from "./cache/git.js";
-import type { SessionStateRW } from "./session-state.js";
 
 // ─── Augmented payload shape ─────────────────────────────────────────────────
 
@@ -54,7 +53,16 @@ export interface RenderPayload extends ClaudeHookData {
 
   readonly git?: GitPayload;
   readonly tmux?: { readonly session: string };
-  readonly theme?: string;
+  // [LAW:one-source-of-truth] The daemon-resolved effective theme name —
+  // effectiveThemeName(sessionState.theme, globals.palette). The SAME value the
+  // rendered basePalette is built from, surfaced so a trigger label can display
+  // the active theme WITHOUT the config restating it (the label and the colors
+  // trace to one resolution and cannot drift).
+  // [LAW:types-are-the-program] REQUIRED, not optional: the daemon resolves it
+  // every render and buildRenderPayload includes it unconditionally, so the
+  // domain truth is "always present". A `?` here would let a callsite believe it
+  // could be undefined and guard defensively against an impossibility.
+  readonly theme: { readonly effective: string };
 
   // Usage-family. Each provider returns null when it has no data (no
   // transcript yet, no rate-limit window active, etc.); we drop the field
@@ -206,7 +214,6 @@ export interface RenderPayloadDeps {
   readonly contextProvider: ContextProvider;
   readonly metricsProvider: MetricsProvider;
   readonly tmuxService: TmuxService;
-  readonly sessionState: SessionStateRW;
   // [LAW:single-enforcer] The log capability for every provider lane:
   // buildRenderPayload is the ONE place lane failures are logged, so the
   // providers' interiors never log and never double-log.
@@ -568,6 +575,13 @@ export async function buildRenderPayload(
   // registration; passing it in (rather than recomputing per render) keeps
   // the hot path free of the BFS + extractTemplateRefs cost.
   neededInputPaths: ReadonlySet<string>,
+  // [LAW:one-source-of-truth] The effective theme name, resolved ONCE by the
+  // daemon (effectiveThemeName(sessionState.theme, globals.palette)) and used
+  // for BOTH the rendered basePalette and this payload field — so a trigger
+  // label reading `.theme.effective` can never disagree with the colors. Passed
+  // in (not re-resolved here) because the daemon already computes it for the
+  // palette; this is that same value, threaded to the sole payload assembler.
+  effectiveTheme: string,
 ): Promise<RenderPayload> {
   const wants = (prefix: string): boolean =>
     anyPathStartsWith(neededInputPaths, prefix);
@@ -718,15 +732,6 @@ export async function buildRenderPayload(
         }
       : undefined;
 
-  // [LAW:one-source-of-truth] The theme variable surfaces the session's
-  // resolved theme so the toolbar/tray DSL templates can encode it into
-  // cc-candybar:// URLs without re-resolving. SessionState owns the value;
-  // we mirror it onto the payload, not redeclare it.
-  const themeRaw = wants("theme")
-    ? deps.sessionState.get(hookData.session_id, "theme")
-    : undefined;
-  const theme = typeof themeRaw === "string" ? themeRaw : undefined;
-
   // home is always available — it's a single env-var read, no I/O cost.
   // Letting the gate skip it would add a branch with no win.
   // [LAW:single-enforcer] All path-shaped payload fields are normalized
@@ -778,7 +783,11 @@ export async function buildRenderPayload(
     ...(home !== undefined && { home }),
     ...(gitProjection.git !== undefined && { git: gitProjection.git }),
     ...(tmuxValue !== undefined && { tmux: { session: tmuxValue } }),
-    ...(theme !== undefined && { theme }),
+    // [LAW:one-source-of-truth] Always present — the daemon resolves the
+    // effective theme every render (for basePalette), and this is that value.
+    // No `wants` gate: it costs nothing (a string already in hand) and a
+    // config that reads `.theme.effective` must always find it.
+    theme: { effective: effectiveTheme },
     ...(sessionPayload !== undefined && { session: sessionPayload }),
     ...(todayPayload !== undefined && { today: todayPayload }),
     ...(costPerHour !== undefined && { burn: { costPerHour } }),

package/src/daemon/server.ts

@@ -745,24 +745,30 @@ async function handleRequest(req: Request): Promise<HandledRequest> {
       // No special-case branches — same composition every render.
       let body = "";
       if (entry.state !== null) {
+        // [LAW:one-source-of-truth] Resolve the effective theme ONCE — the
+        // session's chosen theme (SessionState) over the config default. This
+        // single name drives BOTH the payload's `theme.effective` field (the
+        // trigger label reads it) AND the rendered basePalette below, so a label
+        // and the colors can never disagree. Resolved here, before the payload
+        // build, so it can be threaded into the sole payload assembler.
+        const effectiveTheme = effectiveThemeName(
+          sessionState.get(req.hookData.session_id, "theme"),
+          entry.state.config.globals.palette,
+        );
         const payload = await buildRenderPayload(
           req.hookData,
           payloadDeps,
           req.cwd,
           entry.state.neededInputPaths,
+          effectiveTheme,
         );
         // [LAW:one-source-of-truth][LAW:dataflow-not-control-flow] basePalette
-        // is derived per render from the effective theme — the session's chosen
-        // theme (SessionState) over the config default — so a theme click
-        // recolors the whole bar on the next render. Not frozen on the cache
-        // entry (one entry serves many sessions). resolverForThemeName memoizes,
-        // so the per-render cost is one Map lookup once the theme is warm.
-        const basePalette = resolverForThemeName(
-          effectiveThemeName(
-            sessionState.get(req.hookData.session_id, "theme"),
-            entry.state.config.globals.palette,
-          ),
-        );
+        // is derived from the same effective theme resolved above — so a theme
+        // click recolors the whole bar on the next render. Not frozen on the
+        // cache entry (one entry serves many sessions). resolverForThemeName
+        // memoizes, so the per-render cost is one Map lookup once the theme is
+        // warm.
+        const basePalette = resolverForThemeName(effectiveTheme);
         // [LAW:one-type-per-behavior][LAW:dataflow-not-control-flow] The powerline
         // cap/separator SHAPE, resolved per render the exact way the theme is: the
         // session's clicked style (SessionState) over the config default over the
@@ -1139,7 +1145,6 @@ const payloadDeps = {
   contextProvider,
   metricsProvider,
   tmuxService,
-  sessionState,
   // [LAW:single-enforcer] buildRenderPayload is the one log site for the
   // outcome-carrying provider lanes (git, cache).
   log: dlog,