@promptctl/cc-candybar 1.8.4 → 1.10.0

package/src/template-engine/layout.ts

@@ -30,6 +30,15 @@ export interface SegmentLayoutOptions {
   justify: JustifyMode;
   /** Overflow strategy when content exceeds a fixed width. Ignored when "auto". */
   truncate: TruncateMode;
+  /**
+   * Spaces synthesized inside the collapsed cell on each side (the resolved
+   * globals.padding). [LAW:types-are-the-program] Required so every layout
+   * site states the value — the walk threads the one render-wide resolution;
+   * there is no per-site re-default. Applied BEFORE width sizing, so padding
+   * sits inside a fixed `width` (the legacy intra-cell semantics: the joiners
+   * sit between cells; padding sits inside the bg fill).
+   */
+  padding: number;
   /** Glyph inserted at the overflow cut point. Default "…". */
   truncateMarker?: string;
   /**
@@ -95,11 +104,23 @@ export function applySegmentLayout(
   cells: readonly RichText[],
   options: SegmentLayoutOptions,
 ): RichText[] {
-  const { width, justify, truncate, truncateMarker = "…", baseStyle } = options;
+  const {
+    width,
+    justify,
+    truncate,
+    truncateMarker = "…",
+    baseStyle,
+    padding,
+  } = options;
 
   if (cells.length === 0) return [];
 
-  const cell = collapseToCell(cells, baseStyle);
+  // [LAW:one-source-of-truth] The DSL path's ONE intra-cell padding
+  // application — the same rich-js pad primitive toCell (render/strip.ts)
+  // uses on the legacy shape, threading the same resolved globals.padding.
+  // pad() shifts spans, so OSC-8 link regions survive; the spaces inherit
+  // the cell's wrapping style, so the segment bg is continuous.
+  const cell = collapseToCell(cells, baseStyle).pad(padding);
   if (width === "auto") return [cell];
 
   if (cell.cellLength > width) {

package/src/themes/index.ts

@@ -9,11 +9,7 @@ export {
   effectiveStripStyle,
   isStripStyle,
   listResolvablePaletteNames,
-  listAvailableThemes,
-  pickRandomTheme,
   STRIP_STYLES,
-  STYLE_ORDER,
-  DISPLAY_STYLES,
 } from "./policy.js";
 export type { StripStyle } from "./policy.js";
 

package/src/themes/policy.ts

@@ -47,14 +47,6 @@ export function listResolvablePaletteNames(): readonly string[] {
   return [...listThemePalettes(), ...listThemeAliases()];
 }
 
-// Selectable theme names for the random pool + picker: registry names plus the
-// "custom" sentinel. Aliases are excluded — they duplicate registry entries.
-export function listAvailableThemes(): string[] {
-  const allNames = new Set<string>(listThemePalettes() as readonly string[]);
-  allNames.add("custom");
-  return [...allNames].sort();
-}
-
 // --- Powerline strip-style identifiers ---
 
 // [LAW:one-source-of-truth][LAW:types-are-the-program] The single canonical set
@@ -87,28 +79,3 @@ export function effectiveStripStyle(
   const chosen = sessionStyle ?? globalsStyle ?? "powerline";
   return isStripStyle(chosen) ? chosen : "powerline";
 }
-
-// --- Legacy palette-preset identifiers (per-session random feature only) ---
-// [LAW:no-silent-failure] NOT the picker's style domain — these were the
-// pre-DSL bg/fg derivation presets, surviving only as the random pool for
-// session-random.ts. The interactive style picker resolves over STRIP_STYLES.
-export const STYLE_ORDER: readonly string[] = [
-  "surface",
-  "muted",
-  "button",
-  "hue",
-];
-
-export const DISPLAY_STYLES: ReadonlyArray<
-  "minimal" | "powerline" | "capsule"
-> = ["minimal", "powerline", "capsule"];
-
-// --- Session-random pick ---
-
-// [LAW:one-source-of-truth] The random pool derives from the same registry the
-// rest of the system uses. "custom" is excluded because it requires inline
-// colors.custom to be defined.
-export function pickRandomTheme(): string {
-  const themes = listAvailableThemes().filter((t) => t !== "custom");
-  return themes[Math.floor(Math.random() * themes.length)]!;
-}

package/src/themes/session-random.ts

@@ -1,88 +0,0 @@
-// [LAW:single-enforcer] One place resolves the "random" sentinel into a
-// concrete value, keyed by sessionId so the random pick is *stable for the
-// life of that session* (pick once; clicks like set-state overwrite it).
-// Each setting (theme / style / endpoints) flows through the same pattern:
-// read sessionState → if cached return it → if config says "random" pick
-// + cache → otherwise return config value as-is.
-//
-// The cache is sessionState itself: that means a) the set-state click
-// verb continues to work (it overwrites the same key), and b) the
-// dataflow is uniform — no parallel "random cache" to keep in sync with
-// sessionState.
-
-import { pickRandomTheme, DISPLAY_STYLES, STYLE_ORDER } from "./policy.js";
-
-interface SessionStateRW {
-  get(sessionId: string, key: string): string | null;
-  set(sessionId: string, key: string, value: string): void;
-}
-
-const SENTINEL = "random";
-
-// [LAW:dataflow-not-control-flow] Same shape every call — the only branch is
-// "is this random?" and that's a value-driven question, not a control-flow
-// special case. No early returns hide the cache write from later readers.
-function resolve(
-  sessionId: string,
-  key: string,
-  configValue: string | undefined,
-  sessionState: SessionStateRW | undefined,
-  pick: () => string,
-  fallback: string,
-): string {
-  if (!sessionState) {
-    return configValue === SENTINEL ? pick() : (configValue ?? fallback);
-  }
-  const cached = sessionState.get(sessionId, key);
-  if (cached) return cached;
-  if (configValue !== SENTINEL) return configValue ?? fallback;
-  const chosen = pick();
-  sessionState.set(sessionId, key, chosen);
-  return chosen;
-}
-
-export function resolveSessionTheme(
-  sessionId: string,
-  configTheme: string | undefined,
-  sessionState: SessionStateRW | undefined,
-): string {
-  return resolve(
-    sessionId,
-    "theme",
-    configTheme,
-    sessionState,
-    pickRandomTheme,
-    "dark",
-  );
-}
-
-export function resolveSessionStyle(
-  sessionId: string,
-  configStyle: string | undefined,
-  sessionState: SessionStateRW | undefined,
-): string {
-  return resolve(
-    sessionId,
-    "style",
-    configStyle,
-    sessionState,
-    () => STYLE_ORDER[Math.floor(Math.random() * STYLE_ORDER.length)]!,
-    "surface",
-  );
-}
-
-export function resolveSessionDisplayStyle(
-  sessionId: string,
-  configDisplayStyle: string | undefined,
-  sessionState: SessionStateRW | undefined,
-): "minimal" | "powerline" | "capsule" {
-  const value = resolve(
-    sessionId,
-    "displayStyle",
-    configDisplayStyle,
-    sessionState,
-    () => DISPLAY_STYLES[Math.floor(Math.random() * DISPLAY_STYLES.length)]!,
-    "minimal",
-  );
-  return value === "powerline" || value === "capsule" ? value : "minimal";
-}