@promptctl/cc-candybar 1.13.0 → 1.15.0

package/package.json

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

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

@@ -51,12 +51,24 @@ import type { DslConfig } from "./dsl-types.js";
 // (project_dir), so the project root renders as `<repo-name>` instead of the
 // full absolute path. Same logic handles equal home & current_dir → just "~".
 const DIR_REL = 'trimPrefix "/" (trimPrefix .project_dir .current_dir)';
+// [LAW:decomposition] Two separable concerns: (1) COLLAPSE the absolute cwd to a
+// short display form (`~`-relative, else project-relative, else absolute) and
+// (2) ABBREVIATE fish-style. Collapse stays in the template (its inputs are the
+// payload's home/project_dir/current_dir); abbreviation is a single helper
+// applied to the collapsed result. `$dir` carries the collapsed path between the
+// two — default is the absolute cwd, overridden only when it lives under home or
+// the project root. brandon-directory-781 makes fish-abbreviation the DEFAULT;
+// a user restores the full path by overriding `segments.directory.template`
+// (drop the `abbreviatePath` wrapper) — the existing merge-by-name seam.
 const DIR_TEMPLATE =
-  '{{ if and (ne .home "") (or (eq .home .current_dir) (hasPrefix (printf "%s/" .home) .current_dir)) }}~{{ trimPrefix .home .current_dir }}' +
+  "{{ $dir := .current_dir }}" +
+  '{{ if and (ne .home "") (or (eq .home .current_dir) (hasPrefix (printf "%s/" .home) .current_dir)) }}' +
+  `{{ $dir = printf "~%s" (trimPrefix .home .current_dir) }}` +
   "{{ else }}" +
   '{{ if or (eq .project_dir .current_dir) (hasPrefix (printf "%s/" .project_dir) .current_dir) }}' +
-  `{{ ternary (${DIR_REL}) (basename .project_dir) (ne (${DIR_REL}) "") }}` +
-  "{{ else }}{{ .current_dir }}{{ end }}{{ end }}";
+  `{{ $dir = ternary (${DIR_REL}) (basename .project_dir) (ne (${DIR_REL}) "") }}` +
+  "{{ end }}{{ end }}" +
+  "{{ abbreviatePath $dir }}";
 
 // Git working-tree counts — leading-space-then-trim idiom: each present count
 // contributes " +N", trim drops the leading space, survivors single-spaced.
@@ -318,6 +330,15 @@ export const DEFAULT_DSL_CONFIG = {
       type: "number",
       default: 0,
     },
+    // Budget knobs — pure config constants, user overrides in their file.
+    // [LAW:dataflow-not-control-flow] amount defaults 0, the budgetStatus
+    // helper's non-displayable value, so with no user override the session
+    // segment renders byte-identically to its pre-budget form through the
+    // same unconditional template — opt-in is a value, not a config mode.
+    // Matches the legacy shipped default (budget.session had a threshold but
+    // no amount ⇒ suffix off until the user sets an amount).
+    "session.budget.amount": { kind: "literal", value: 0 },
+    "session.budget.warningThreshold": { kind: "literal", value: 80 },
 
     // Today — daemon folds today's cross-session total from the SessionUsageStore.
     "today.cost": {
@@ -609,7 +630,8 @@ export const DEFAULT_DSL_CONFIG = {
     },
     session: {
       template:
-        '§ {{ template "formatCost" .session.cost }} ({{ template "formatTokens" .session.tokens }})',
+        '§ {{ template "formatCost" .session.cost }} ({{ template "formatTokens" .session.tokens }})' +
+        '{{ template "budgetStatus" (dict "cost" .session.cost "budget" .session.budget.amount "warn" .session.budget.warningThreshold) }}',
       bg: "surface",
       fg: "foreground",
     },

package/src/template-engine/funcs.ts

@@ -12,6 +12,7 @@ import {
   type VarValue,
 } from "../var-system/types.js";
 import {
+  abbreviatePath,
   formatInteger,
   formatModelName,
   shortenModelName,
@@ -63,6 +64,15 @@ export function ccCandybarFuncs(): FuncMap {
       argTypes: ["string"],
     },
 
+    // [LAW:decomposition] Fish-style path abbreviation — one thing: shorten
+    // every segment but the leaf. Composes over the directory template's
+    // already-collapsed output (`~`/project-relative), never duplicating that
+    // logic. Impl in utils/formatters.ts, mirroring formatModelName's split.
+    abbreviatePath: {
+      fn: (s: string) => abbreviatePath(s),
+      argTypes: ["string"],
+    },
+
     // [LAW:single-enforcer] Type casts delegate to var-system/types.ts.
     // "value" argType: these funcs enforce their own constraints and emit
     // a useful TypeError on ambiguous input — no need for the engine gate

package/src/utils/formatters.ts

@@ -63,6 +63,28 @@ export function shortenModelName(formatted: string): string {
   return `${initial}${version}`;
 }
 
+// [LAW:decomposition] Fish-shell `prompt_pwd` abbreviation: collapse every path
+// segment EXCEPT the leaf to its leading character, keeping any leading dots so
+// `.config` → `.c`. A pure string→string transform that knows nothing about
+// home-collapse or project-relative logic — those live in the directory
+// template and this abbreviates whatever collapsed display path they produce.
+// `~/code/cc-candybar` → `~/c/cc-candybar`; a leading "/" is preserved because
+// the empty pre-slash segment abbreviates to empty (`/usr/local/bin` → `/u/l/bin`).
+export function abbreviatePath(path: string): string {
+  const segments = path.split("/");
+  const lastIndex = segments.length - 1;
+  return segments
+    .map((seg, i) => {
+      if (i === lastIndex) return seg;
+      // Leading dot-run plus the first following char (fish keeps dotfiles
+      // legible: `.config` → `.c`, `..` → `..`). No following char (empty
+      // segment) means no match — return it unchanged.
+      const abbreviated = seg.match(/^\.*./);
+      return abbreviated ? abbreviated[0] : seg;
+    })
+    .join("/");
+}
+
 // [LAW:one-source-of-truth] Locale-grouped integer rendering. Callers that
 // want "50,000" instead of "50000" go through this rather than calling
 // toLocaleString() ad-hoc — the legacy context segment used the latter