@promptctl/cc-candybar 1.23.0 → 1.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promptctl/cc-candybar",
-  "version": "1.23.0",
+  "version": "1.25.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,9 +91,9 @@
     "mobx": "^6.15.0"
   },
   "optionalDependencies": {
-    "@promptctl/cc-candybar-darwin-arm64": "1.23.0",
-    "@promptctl/cc-candybar-darwin-x64": "1.23.0",
-    "@promptctl/cc-candybar-linux-x64": "1.23.0",
-    "@promptctl/cc-candybar-linux-arm64": "1.23.0"
+    "@promptctl/cc-candybar-darwin-arm64": "1.25.0",
+    "@promptctl/cc-candybar-darwin-x64": "1.25.0",
+    "@promptctl/cc-candybar-linux-x64": "1.25.0",
+    "@promptctl/cc-candybar-linux-arm64": "1.25.0"
   }
 }

package/src/check.ts

@@ -25,6 +25,7 @@ import {
   ConfigError,
 } from "./config/dsl-loader.js";
 import { expandHome } from "./config/loader/discovery.js";
+import { DEFAULT_DSL_CONFIG } from "./config/default-dsl-config.js";
 import { VariableStore } from "./var-system/store.js";
 import { SourceRegistry } from "./var-system/sources.js";
 import { SessionState } from "./daemon/session-state.js";
@@ -250,7 +251,7 @@ function loadRegisterRender(
   cwd: string,
   warnings: string[],
 ): string {
-  const { config: merged, source } = loadConfig(configPath);
+  const { config: merged, source } = loadConfig(configPath, DEFAULT_DSL_CONFIG);
   const config = validateConfig(merged, configPath ?? "<default>", source);
 
   const store = new VariableStore();

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

@@ -19,12 +19,16 @@
 // (add its name to the children), not new code. The same data flows through
 // the same render path whether the root has 1 leaf or 16.
 //
-// [LAW:types-are-the-program] `satisfies DslConfig` (not an annotation)
-// preserves the literal's narrow keys for downstream consumers — every
-// declared segment name shows up as a known key, every variable name shows
-// up in the input set the daemon must populate.
+// [LAW:types-are-the-program] The authored literal (RAW_DEFAULT_DSL_CONFIG)
+// uses `satisfies DslConfig` (not an annotation) so every declared segment
+// and variable name is checked against the real shape at the point of
+// authoring. The exported DEFAULT_DSL_CONFIG is that literal run through the
+// loader's own synthesis pass (see the bottom of this file) — a `DslConfig`,
+// the same effective shape every user config resolves to.
 
-import type { DslConfig } from "./dsl-types.js";
+import type { DslConfig, SegmentDecl } from "./dsl-types.js";
+import { parseDslConfig } from "./dsl-loader.js";
+import { mergeWithDefault } from "./loader/merge.js";
 
 // ─── Shared template fragments ───────────────────────────────────────────────
 //
@@ -144,12 +148,30 @@ function etaHeatFg(etaRef: string, warnRef: string): string {
 
 // ─── The default config ──────────────────────────────────────────────────────
 
-export const DEFAULT_DSL_CONFIG = {
+// [LAW:one-source-of-truth] The AUTHORED literal, pre-synthesis. Production
+// code wants the synthesized DEFAULT_DSL_CONFIG below; this is exported only
+// for tests that round-trip "what a user would get by copy-pasting the
+// bundled default into their own file" through the real per-file parse —
+// that round-trip must start from the AUTHORED declarations, never from
+// DEFAULT_DSL_CONFIG's own already-synthesized `menus.*` entries (reparsing
+// those would trip the reserved-namespace guard, which exists to catch a
+// user hand-declaring a name only synthesis may write).
+export const RAW_DEFAULT_DSL_CONFIG = {
   globals: {
     // Picked by the daemon's basePalette resolution; user overrides in their
-    // own config. catppuccin-latte ships every spec name the default
-    // segments reference (surface, panel, surface-active, foreground).
-    palette: "catppuccin-latte",
+    // own config. Every registry theme ships the same derived spec set
+    // (surface, panel, surface-active, foreground — see rich-js
+    // buildPalette), so this is a pure taste call, not a compatibility one.
+    // tokyo-night chosen (brandon-theming-8uj.2) over the prior
+    // catppuccin-latte — a light palette that landed as a drive-by in an
+    // unrelated formatting-cleanup commit and read poorly on the dark
+    // terminals most users run — after live-clicking every registry theme
+    // through the bundled themeControl picker: it stays legible as the
+    // per-row hue-step (see themeControl/lookControl below) shifts each
+    // row's hue, where warmer bases (gruvbox, dracula) drifted toward mud
+    // and the pastel ones (rose-pine, atom-one) washed out at this
+    // contrast.
+    palette: "tokyo-night",
   },
 
   // ─── Variables ─────────────────────────────────────────────────────────────
@@ -814,20 +836,56 @@ export const DEFAULT_DSL_CONFIG = {
       bg: "surface",
       fg: "foreground",
     },
+    // Theme control — the palette switcher, wired into the DEFAULT bar
+    // (brandon-theming-8uj.1) so theme selection is discoverable without
+    // reading docs/interaction-authoring.md or hand-authoring a config.
+    // [LAW:one-source-of-truth] The trigger reads `.theme.effective` — the
+    // SAME daemon-resolved name (effectiveThemeName) the rendered basePalette
+    // is built from — so the label and the colors can never drift; unlike
+    // styleControl (no "effective style" input exists), no extra `state`
+    // variable is needed here. Shares the "pickers" accordion key with
+    // lookControl so opening one closes the other, the docs' canonical
+    // two-menu pairing.
+    themeControl: {
+      template:
+        "🎨 {{ .theme.effective }} " +
+        '{{ menu "applyTheme" (dict "key" "pickers") }}',
+      bg: "surface",
+      fg: "foreground",
+    },
+    // Look control — the theme-ADAPTATION switcher (see the `looks` block
+    // below), the exact twin of themeControl one dimension over:
+    // `.look.effective` is the daemon-resolved name (effectiveLookName) the
+    // rendered ThemeKey composes from. closeOnPick collapses the drop after a
+    // pick — looks are tried one at a time against the chosen theme, not
+    // stacked open.
+    lookControl: {
+      template:
+        "◐ {{ .look.effective }} " +
+        '{{ menu "applyLook" (dict "key" "pickers" "closeOnPick" true) }}',
+      bg: "surface",
+      fg: "foreground",
+    },
   },
 
   // Default layout — the canonical LayoutNode tree (`satisfies DslConfig`
   // requires the lowered form here; the terse Option-A `{ h/v/seg }` grammar is
   // the loader's authoring surface for user JSON, not this typed literal).
   //
-  // Two rows stacked by the vertical container: an IDENTITY + ACTIONS row
+  // Three rows stacked by the vertical container: an IDENTITY + ACTIONS row
   // (where am I / what can I do here — the directory, the verbose `gitaculous`
   // line (repo, sha, working-tree, upstream, stash, time-since-commit), then the
   // quick-action tray: copy session id, open project / transcript in the editor)
   // over a STATUS row (what's happening now — model, context-window fill,
-  // prompt-cache warmth, and the 5h / 7d rate-limit quotas). The tray sits on
-  // the identity row because its actions are workspace-scoped (this session,
-  // this project), not usage metrics. Each row zips its segments through the
+  // prompt-cache warmth, and the 5h / 7d rate-limit quotas) over an APPEARANCE
+  // row (theme + look pickers, brandon-theming-8uj.1 — the bundled default's
+  // only on-bar affordance to discover and use the theme/look feature without
+  // reading docs or hand-authoring a config). The tray sits on the identity
+  // row because its actions are workspace-scoped (this session, this
+  // project), not usage metrics; the pickers get their own row rather than
+  // crowding the identity row because a `{{ menu }}` drops its picker body
+  // onto the line immediately below its row, and that drop must not land on
+  // top of an unrelated row's content. Each row zips its segments through the
   // powerline joiner; `\n` separates the rows.
   //
   // [LAW:dataflow-not-control-flow] Every status segment is when-gated on its
@@ -861,6 +919,14 @@ export const DEFAULT_DSL_CONFIG = {
           { kind: "segment", name: "weekly" },
         ],
       },
+      {
+        kind: "container",
+        direction: "horizontal",
+        children: [
+          { kind: "segment", name: "themeControl" },
+          { kind: "segment", name: "lookControl" },
+        ],
+      },
     ],
   },
 
@@ -895,6 +961,17 @@ export const DEFAULT_DSL_CONFIG = {
     // rendered click and the wire gate share that one source — a template cannot
     // smuggle an un-gated style write.
     applyStyle: { set: "style", from: "styles" },
+
+    // [LAW:locality-or-seam] The theme/look pickers' behaviors, decoupled by
+    // NAME from themeControl/lookControl {{ menu }}s above — same seam as
+    // applyStyle. "theme" is the baseline permanent state key (validateTheme,
+    // registered in state-validators.ts); dropBaselineAllowLists reuses that
+    // gate for an allow-list contribution instead of re-registering it, so
+    // this action derives nothing new. "look" has no baseline entry, so this
+    // action derives a fresh allow-list validator ranging the merged `looks`
+    // block's names — the same derivation test/dsl-looks.test.ts exercises.
+    applyTheme: { set: "theme", from: "themes" },
+    applyLook: { set: "look", from: "looks" },
   },
 
   // ─── Looks ───────────────────────────────────────────────────────────────
@@ -1058,3 +1135,46 @@ export const DEFAULT_DSL_CONFIG = {
       "{{ else }}{{ . }}m{{ end }}",
   },
 } satisfies DslConfig;
+
+// [LAW:locality-or-seam] The palette names this module-level parse is allowed
+// to accept — DERIVED from RAW_DEFAULT_DSL_CONFIG itself (globals.palette +
+// every per-segment palette: pin), never from the live theme registry
+// (listResolvablePaletteNames()). A real user file must validate against the
+// live registry (an author can type any name); this file validates against
+// ITSELF (every name here is a literal we wrote and every render test below
+// exercises against the real registry already). This is what keeps the
+// module-load parse below from ever depending on the registry being healthy
+// at import time — a registry-loading bug elsewhere would surface where it
+// actually matters (a real render failing), never as an uncatchable crash on
+// every importer of this file before any daemon/CLI error handling runs.
+const AUTHORED_PALETTE_NAMES = new Set(
+  [
+    RAW_DEFAULT_DSL_CONFIG.globals.palette,
+    ...(Object.values(RAW_DEFAULT_DSL_CONFIG.segments) as SegmentDecl[]).map(
+      (s) => s.palette,
+    ),
+  ].filter((name): name is string => name !== undefined),
+);
+
+// [LAW:single-enforcer] Run the authored literal through the SAME
+// parse → synthesize pipeline every user config goes through (JSON5 stage +
+// synthesizeMenuDecls' `menus.*` synthesis, and any future group/menu
+// synthesis pass) instead of hand-duplicating that logic here. Without this,
+// the zero-config daemon path (loadConfig: no config file found ⇒ raw={},
+// merged directly against this constant — see src/config/dsl-loader.ts and
+// src/config/loader/merge.ts) would ship an UNSYNTHESIZED default: a
+// `{{ menu (dict "key" …) }}` accordion pairing (themeControl/lookControl,
+// brandon-theming-8uj.1) would render its glyph, but clicking it would reject
+// with "unknown state key" — the synthesis that derives a menu's `menus.*`
+// state var + cycle action only ever ran over TEXT a user typed, never over
+// this TS literal. Round-tripping through JSON is exactly what
+// test/default-dsl-config.test.ts's SERIALIZED-based tests already exercise,
+// so this is the same well-tested path, run once here instead of skipped.
+export const DEFAULT_DSL_CONFIG: DslConfig = mergeWithDefault(
+  parseDslConfig(
+    "<default>",
+    JSON.stringify(RAW_DEFAULT_DSL_CONFIG),
+    AUTHORED_PALETTE_NAMES,
+  ),
+  RAW_DEFAULT_DSL_CONFIG,
+);

package/src/config/dsl-loader.ts

@@ -30,7 +30,6 @@ import {
   type RawDslConfig,
   type ValidatedConfig,
 } from "./dsl-types.js";
-import { DEFAULT_DSL_CONFIG } from "./default-dsl-config.js";
 import { listResolvablePaletteNames } from "../themes/policy.js";
 import {
   ConfigError,
@@ -78,14 +77,23 @@ export {
 // ─── Three-stage pipeline ────────────────────────────────────────────────────
 
 /**
- * Load a JSON5 DSL config file from disk and merge it with the bundled
+ * Load a JSON5 DSL config file from disk and merge it with the given
  * default. Returns the effective DslConfig AND the raw source text.
  *
- * `path = null` means "no user file exists" — returns the default unchanged
- * (uniform merge against an empty raw, which is deep-equal to the default) and
+ * `path = null` means "no user file exists" — returns `dflt` unchanged
+ * (uniform merge against an empty raw, which is deep-equal to `dflt`) and
  * an empty source. No consumer branches on file presence; that branch lives
  * inside loadConfig exactly once.
  *
+ * [LAW:one-way-deps] `dflt` is a required parameter, not a default pointing at
+ * DEFAULT_DSL_CONFIG: this module is generic merge/parse machinery, and
+ * DEFAULT_DSL_CONFIG is a specific, higher-level instance built ON TOP of it
+ * (default-dsl-config.ts imports parseDslConfig/mergeWithDefault to
+ * synthesize itself — see that file). A default param here pointing back at
+ * DEFAULT_DSL_CONFIG would make this generic module depend on its own
+ * specific consumer — a cycle every caller who wants "the bundled default"
+ * resolves explicitly by importing DEFAULT_DSL_CONFIG themselves.
+ *
  * [LAW:one-source-of-truth] The source is returned alongside the config so the
  * caller can hand it to validateConfig — cross-ref diagnostics (line numbers,
  * the authored-surface discriminator) are derived from it, and the file is read
@@ -99,7 +107,7 @@ export {
  */
 export function loadConfig(
   path: string | null,
-  dflt: DslConfig = DEFAULT_DSL_CONFIG,
+  dflt: DslConfig,
   allowedPalettes?: ReadonlySet<string>,
 ): { config: DslConfig; source: string } {
   const source = path === null ? "" : fs.readFileSync(path, "utf-8");

package/src/config/loader/merge.ts

@@ -1,11 +1,19 @@
-// [LAW:one-source-of-truth] The single point that consults DEFAULT_DSL_CONFIG to
-// fill missing keys. A user file declares only what differs; the cascade here
-// (shallow-merge globals, by-name merge variables/segments/actions, wholesale
-// root replacement) is the one place "absent means inherit" is decided.
-// This file changes when the merge semantics change.
+// [LAW:one-source-of-truth] The single point that merges a raw user config
+// onto a default DslConfig to fill missing keys. A user file declares only
+// what differs; the cascade here (shallow-merge globals, by-name merge
+// variables/segments/actions, wholesale root replacement) is the one place
+// "absent means inherit" is decided. This file changes when the merge
+// semantics change.
+//
+// [LAW:one-way-deps] `dflt` is a required parameter — this module is generic
+// merge machinery and does not know about DEFAULT_DSL_CONFIG, the specific
+// bundled instance built ON TOP of it (default-dsl-config.ts imports this
+// function to synthesize itself). A default param pointing back at
+// DEFAULT_DSL_CONFIG would make this generic module depend on its own
+// specific consumer, a cycle. Callers who want "the bundled default" import
+// DEFAULT_DSL_CONFIG from default-dsl-config.ts and pass it explicitly.
 
 import { type DslConfig, type RawDslConfig } from "../dsl-types.js";
-import { DEFAULT_DSL_CONFIG } from "../default-dsl-config.js";
 
 /**
  * Merge a RawDslConfig on top of a default DslConfig. Pure function.
@@ -21,7 +29,7 @@ import { DEFAULT_DSL_CONFIG } from "../default-dsl-config.js";
  */
 export function mergeWithDefault(
   raw: RawDslConfig,
-  dflt: DslConfig = DEFAULT_DSL_CONFIG,
+  dflt: DslConfig,
 ): DslConfig {
   return {
     globals: { ...dflt.globals, ...(raw.globals ?? {}) },

package/src/daemon/cache/render.ts

@@ -11,6 +11,7 @@ import {
   ConfigError,
 } from "../../config/dsl-loader.js";
 import type { ValidatedConfig } from "../../config/dsl-types.js";
+import { DEFAULT_DSL_CONFIG } from "../../config/default-dsl-config.js";
 import { registerDslConfig, type CompiledConfig } from "../../dsl/render.js";
 import {
   deriveActionValidators,
@@ -272,7 +273,10 @@ export class RenderCache {
     // cross-ref diagnostics on the daemon path carry real line numbers and the
     // authored-surface (root vs layout) discriminator works — the file is read
     // once inside loadConfig, not re-read here.
-    const { config: merged, source } = loadConfig(resolvedPath);
+    const { config: merged, source } = loadConfig(
+      resolvedPath,
+      DEFAULT_DSL_CONFIG,
+    );
     const config = validateConfig(merged, resolvedPath ?? "<default>", source);
 
     const store = new VariableStore();

package/src/demo/dsl.ts

@@ -25,6 +25,7 @@ import {
   mergeWithDefault,
   validateConfig,
 } from "../config/dsl-loader.js";
+import { DEFAULT_DSL_CONFIG } from "../config/default-dsl-config.js";
 import { VariableStore } from "../var-system/store.js";
 import { SourceRegistry } from "../var-system/sources.js";
 import { SessionState } from "../daemon/session-state.js";
@@ -60,7 +61,7 @@ const source = readFileSync(configPath, "utf-8");
 // only `ValidatedConfig`, so the chain is type-enforced.
 const ALLOWED = new Set(listResolvablePaletteNames());
 const raw = parseDslConfig(configPath, source, ALLOWED);
-const merged = mergeWithDefault(raw);
+const merged = mergeWithDefault(raw, DEFAULT_DSL_CONFIG);
 const config = validateConfig(merged, configPath, source, ALLOWED);
 
 // One Claude Code status-line hook event, faked. The `input` vars in the