ccsidekick 1.0.0 → 1.2.0

package/README.md

@@ -9,20 +9,58 @@ path and disableable.
 npx ccsidekick
 ```
 
-Running `ccsidekick` in a terminal opens the setup TUI: it picks a Claude config dir, lets you choose
-a character, and wires the status line and the tool-call hooks into your `settings.json`. Remove it
-with `npx ccsidekick uninstall`.
+Running `ccsidekick` in a terminal opens the setup UI: a first run walks you through a short guided
+wizard (character, theme, comments), a later run opens the full dashboard. Either way it picks a
+Claude config dir and wires the status line and the tool-call hooks into your `settings.json`.
+Remove it with `npx ccsidekick uninstall`.
+
+## Non-interactive setup (for scripts and AI agents)
+
+No TTY required. `ccsidekick setup` configures and wires everything from flags, so an agent can
+install it in one command:
+
+```bash
+ccsidekick setup --character batman --theme houston --mode fixed
+```
+
+Only the flags you pass are applied (a partial patch onto the existing config, or the defaults on a
+fresh install), then it writes `config.toml` and wires `settings.json` exactly like the TUI.
+
+| Flag                     | Sets                                                            |
+| ------------------------ | --------------------------------------------------------------- |
+| `--character <name>`     | the fixed character                                             |
+| `--mode <fixed\|random>` | fixed one character, or rotate the roster                       |
+| `--roster <a,b,c>`       | the random-mode roster                                          |
+| `--theme <name>`         | a theme, or `character` (the default) to match the character    |
+| `--currency <code>`      | statusline currency, e.g. `USD`                                 |
+| `--budget <usd>`         | monthly budget                                                  |
+| `--comments <on\|off>`   | the character's comment line                                    |
+| `--helpful <on\|off>`    | the helpful-tip line                                            |
+| `--min-severity <sev>`   | `low\|medium\|high\|critical`                                   |
+| `--widgets <a,b,c>`      | statusline widgets to enable (others turn off)                  |
+| `--global` / `--local`   | save target (default global)                                    |
+| `--config-dir <path>`    | Claude config dir (default `$CLAUDE_CONFIG_DIR` or `~/.claude`) |
+
+Discover valid values for scripting, and see every flag:
+
+```bash
+ccsidekick list characters   # also: themes, widgets
+ccsidekick setup --help
+```
+
+An unknown value (e.g. a misspelled theme) exits non-zero and prints the valid set — it never
+silently falls back.
 
 ## The two binaries
 
 - **`ccsidekick-render`** is the hot path. Claude Code calls `ccsidekick-render render` on every
-  status-line tick and `ccsidekick-render classify` on every tool call. It loads no UI and runs under
-  plain Node.
-- **`ccsidekick`** is the setup TUI and `uninstall`. It is the only entry point that loads the Ink
-  interface.
+  status-line tick and `ccsidekick-render classify` on every tool call. It loads no UI and runs
+  under plain Node.
+- **`ccsidekick`** is the user-facing entry: the setup UI, plus `setup`, `list`, and `uninstall`.
+  Only the TUI loads the Ink interface; `setup`/`list`/`uninstall` run under plain Node.
 
-Characters ship as separate `@ccsidekick/pack-<name>` packages; `batman` is bundled as a runtime
-dependency so a fresh install always has a character.
+Every character ships bundled as a runtime dependency, so a fresh install has them all — there is no
+download or install step, and no network to pick a character.
 
 For the full feature tour, configuration reference, and contributor docs, see the
 [repository README](https://github.com/krayong/ccsidekick#readme).

package/dist/ccsidekick-render.js

@@ -1038,15 +1038,19 @@ function candidateSet(config, installed) {
   return ["batman"];
 }
 function derivePersona(config, state, session, installed) {
-  if (state.character !== undefined && state.character !== "")
-    return state.character;
+  const candidates = candidateSet(config, installed);
+  const sticky = state.character;
+  if (sticky !== undefined && sticky !== "" && stickyValid(config, candidates, sticky))
+    return sticky;
   if (config.character.mode === "fixed")
     return config.character.name;
-  const candidates = candidateSet(config, installed);
   const hash = createHash("sha1").update(session).digest("hex");
   const idx = parseInt(hash.slice(0, 8), 16) % candidates.length;
   return candidates[idx] ?? "batman";
 }
+function stickyValid(config, candidates, sticky) {
+  return config.character.mode === "fixed" ? sticky === config.character.name : candidates.includes(sticky);
+}
 // src/derived/project.ts
 function deriveProject(git, payload) {
   const repo = payload.workspace.repo;
@@ -1212,12 +1216,6 @@ var sessionDir = (root, id) => join(root, "sessions", id);
 var cacheDir = (root) => join(root, "cache");
 var analyticsDir = (root) => join(root, "analytics");
 
-// src/sources/storage/engineRoot.ts
-import { fileURLToPath } from "node:url";
-function engineRoot(moduleUrl) {
-  return fileURLToPath(new URL("../", moduleUrl));
-}
-
 // src/sources/storage/atomicWrite.ts
 import { mkdirSync, renameSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
@@ -2428,11 +2426,10 @@ var DEFAULT_WIDGETS = {
 var DEFAULT_CONFIG = {
   schema_version: 1,
   character: { enabled: true, mode: "random", name: "batman", roster: [] },
-  comments: { enabled: true },
-  helpful: { enabled: true, min_severity: "low" },
-  line: { currency: defaultCurrency(), widgets: DEFAULT_WIDGETS },
-  theme: { name: "houston", banding: "solid", mood_shift: false, icons: {} },
-  network: { fx_refresh: true, usage_fetch: true, balance_path: "" }
+  theme: { name: "character", banding: "solid", mood_shift: false, icons: {} },
+  comments: { character: true, helpful: true, min_severity: "low" },
+  network: { fx_refresh: true, usage_fetch: true, balance_path: "" },
+  statusline: { currency: defaultCurrency(), widgets: DEFAULT_WIDGETS }
 };
 var obj = (v) => v !== null && typeof v === "object" ? v : {};
 var bool = (v, d) => typeof v === "boolean" ? v : d;
@@ -2475,10 +2472,9 @@ function loadConfig(globalToml = "", projectToml = "") {
   const p = safeParse(projectToml);
   const character = section(g, p, "character");
   const comments = section(g, p, "comments");
-  const helpful = section(g, p, "helpful");
-  const line = section(g, p, "line");
   const theme = section(g, p, "theme");
   const network = section(g, p, "network");
+  const statusline = section(g, p, "statusline");
   const d = DEFAULT_CONFIG;
   return {
     schema_version: numv(p["schema_version"] ?? g["schema_version"], d.schema_version),
@@ -2488,21 +2484,6 @@ function loadConfig(globalToml = "", projectToml = "") {
       name: str(character["name"], d.character.name),
       roster: stringArray(character["roster"], d.character.roster)
     },
-    comments: {
-      enabled: bool(comments["enabled"], d.comments.enabled)
-    },
-    helpful: {
-      enabled: bool(helpful["enabled"], d.helpful.enabled),
-      min_severity: oneOf(helpful["min_severity"], ["low", "medium", "high", "critical"], d.helpful.min_severity)
-    },
-    line: {
-      currency: str(line["currency"], d.line.currency),
-      ...typeof line["budget"] === "number" ? { budget: line["budget"] } : {},
-      widgets: mergeWidgets({
-        ...obj(obj(g["line"])["widgets"]),
-        ...obj(obj(p["line"])["widgets"])
-      })
-    },
     theme: {
       name: str(theme["name"], d.theme.name),
       ...typeof theme["statusline"] === "string" ? { statusline: theme["statusline"] } : {},
@@ -2515,10 +2496,23 @@ function loadConfig(globalToml = "", projectToml = "") {
         ...obj(obj(p["theme"])["icons"])
       })
     },
+    comments: {
+      character: bool(comments["character"], d.comments.character),
+      helpful: bool(comments["helpful"], d.comments.helpful),
+      min_severity: oneOf(comments["min_severity"], ["low", "medium", "high", "critical"], d.comments.min_severity)
+    },
     network: {
       fx_refresh: bool(network["fx_refresh"], d.network.fx_refresh),
       usage_fetch: bool(network["usage_fetch"], d.network.usage_fetch),
       balance_path: str(network["balance_path"], d.network.balance_path)
+    },
+    statusline: {
+      currency: str(statusline["currency"], d.statusline.currency),
+      ...typeof statusline["budget"] === "number" ? { budget: statusline["budget"] } : {},
+      widgets: mergeWidgets({
+        ...obj(obj(g["statusline"])["widgets"]),
+        ...obj(obj(p["statusline"])["widgets"])
+      })
     }
   };
 }
@@ -3529,41 +3523,8 @@ function readHelpfulEnv(cwd) {
     ...opt3("tfWorkspace", readTfWorkspace(cwd))
   };
 }
-// src/sources/installed.ts
-import { readdirSync, statSync as statSync3 } from "node:fs";
-import { join as join10 } from "node:path";
-var PREFIX = "pack-";
-function listInstalledPacks(engineDir) {
-  const scope = join10(engineDir, "node_modules", "@ccsidekick");
-  let entries;
-  try {
-    entries = readdirSync(scope, { withFileTypes: true });
-  } catch {
-    return [];
-  }
-  const ids = [];
-  for (const entry of entries) {
-    if (!entry.name.startsWith(PREFIX) || entry.name.length <= PREFIX.length)
-      continue;
-    if (!isDir(entry, join10(scope, entry.name)))
-      continue;
-    ids.push(entry.name.slice(PREFIX.length));
-  }
-  return ids.sort();
-}
-function isDir(entry, path) {
-  if (entry.isDirectory())
-    return true;
-  if (!entry.isSymbolicLink())
-    return false;
-  try {
-    return statSync3(path).isDirectory();
-  } catch {
-    return false;
-  }
-}
 // src/sources/markers.ts
-import { readdirSync as readdirSync2 } from "node:fs";
+import { readdirSync } from "node:fs";
 import { dirname as dirname5, resolve as resolve2 } from "node:path";
 var FILE_MARKERS = {
   "package.json": "web",
@@ -3624,7 +3585,7 @@ function scanDir(dir, stacks) {
   let entries;
   let isRepoRoot = false;
   try {
-    entries = readdirSync2(dir);
+    entries = readdirSync(dir);
   } catch {
     return false;
   }
@@ -3658,8 +3619,8 @@ function readMarkers(cwd) {
   return { stacks };
 }
 // src/sources/modelNames.ts
-import { join as join11 } from "node:path";
-var cachePath = (root) => join11(cacheDir(root), "model-names.json");
+import { join as join10 } from "node:path";
+var cachePath = (root) => join10(cacheDir(root), "model-names.json");
 function readModelNames(root) {
   return readJson(cachePath(root), {});
 }
@@ -3776,7 +3737,7 @@ function parsePayload(raw) {
   };
 }
 // src/sources/state.ts
-import { join as join12 } from "node:path";
+import { join as join11 } from "node:path";
 var STATE_FILE = "state.json";
 var EMPTY2 = { pressureFired: [], milestones: [], helpful: {} };
 function isObject5(v) {
@@ -3801,7 +3762,7 @@ function asHelpful(v) {
   return out;
 }
 function readState(sessionDir2) {
-  const raw = readJson(join12(sessionDir2, STATE_FILE), undefined);
+  const raw = readJson(join11(sessionDir2, STATE_FILE), undefined);
   if (!isObject5(raw))
     return EMPTY2;
   const character = raw["character"];
@@ -3831,14 +3792,14 @@ function mergeState(disk, next) {
   };
 }
 function writeState(sessionDir2, s) {
-  const path = join12(sessionDir2, STATE_FILE);
+  const path = join11(sessionDir2, STATE_FILE);
   withLock(`${path}.lock`, () => {
     atomicWrite(path, JSON.stringify(mergeState(readState(sessionDir2), s)));
   }, () => {});
 }
 // src/sources/transcript.ts
-import { readFileSync as readFileSync8, readdirSync as readdirSync3, statSync as statSync4 } from "node:fs";
-import { basename, dirname as dirname6, join as join13 } from "node:path";
+import { readFileSync as readFileSync8, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
+import { basename, dirname as dirname6, join as join12 } from "node:path";
 var asObj = (v) => v !== null && typeof v === "object" ? v : undefined;
 var asStr = (v) => typeof v === "string" ? v : undefined;
 var asNum = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
@@ -4063,7 +4024,7 @@ function reconstructTodos(lines) {
 }
 function statSafe(p) {
   try {
-    const s = statSync4(p);
+    const s = statSync3(p);
     return { mtimeMs: s.mtimeMs, size: s.size };
   } catch {
     return null;
@@ -4153,15 +4114,15 @@ var repoRootCache = new Map;
 function* walkTree(dir, encodedDir) {
   let entries;
   try {
-    entries = readdirSync3(dir);
+    entries = readdirSync2(dir);
   } catch {
     return;
   }
   for (const name of entries) {
-    const full = join13(dir, name);
+    const full = join12(dir, name);
     let st;
     try {
-      st = statSync4(full);
+      st = statSync3(full);
     } catch {
       continue;
     }
@@ -4175,12 +4136,12 @@ function* walkTree(dir, encodedDir) {
 function* walkJsonl(root) {
   let dirs;
   try {
-    dirs = readdirSync3(root);
+    dirs = readdirSync2(root);
   } catch {
     return;
   }
   for (const encodedDir of dirs) {
-    yield* walkTree(join13(root, encodedDir), encodedDir);
+    yield* walkTree(join12(root, encodedDir), encodedDir);
   }
 }
 function scanBounds(lines) {
@@ -4391,7 +4352,7 @@ function runClassify(stdin, env, clock) {
 }
 // src/cli/render.ts
 import { readFileSync as readFileSync10 } from "node:fs";
-import { dirname as dirname7, join as join15 } from "node:path";
+import { dirname as dirname7, join as join14 } from "node:path";
 
 // src/compose/character.ts
 import { createHash as createHash5 } from "node:crypto";
@@ -5242,7 +5203,13 @@ var truncateField = (f, budget) => {
   if (f.id === "model" && f.segments.length >= 2 && tail !== undefined) {
     const tailText = sanitizePackText(tail.text);
     const headText = f.segments.slice(0, -1).map((s) => sanitizePackText(s.text)).filter((t) => t !== "").join(" ");
-    const headBudget = Math.max(1, budget - displayWidth(tailText) - 1);
+    const headBudget = budget - displayWidth(tailText) - 1;
+    if (headBudget < 1) {
+      return {
+        id: f.id,
+        segments: [{ role: "value", text: truncToWidth(fieldPlain(f), budget) }]
+      };
+    }
     return {
       id: f.id,
       segments: [
@@ -5253,6 +5220,21 @@ var truncateField = (f, budget) => {
   }
   return { id: f.id, segments: [{ role: "value", text: truncToWidth(fieldPlain(f), budget) }] };
 };
+var fitCells = (cells, avail, sepGlyph) => {
+  if (cells.length === 0 || rowPlainWidth(cells, sepGlyph) <= avail)
+    return [...cells];
+  const last = cells[cells.length - 1];
+  if (last === undefined)
+    return [...cells];
+  const head = cells.slice(0, -1);
+  const sepWidth = displayWidth(` ${sepGlyph} `);
+  const headWidth = head.length > 0 ? displayWidth(head.map(fieldPlain).join(` ${sepGlyph} `)) : 0;
+  const budget = avail - headWidth - (head.length > 0 ? sepWidth : 0);
+  if (budget >= 1)
+    return [...head, truncateField(last, budget)];
+  const headFitted = fitCells(head, Math.max(1, avail - sepWidth - 1), sepGlyph);
+  return [...headFitted, truncateField(last, 1)];
+};
 var fitRow = (row, cells, avail, sepGlyph) => {
   const present = [...cells];
   for (const id of dropOrder(row)) {
@@ -5264,15 +5246,7 @@ var fitRow = (row, cells, avail, sepGlyph) => {
     if (idx >= 0)
       present.splice(idx, 1);
   }
-  if (rowPlainWidth(present, sepGlyph) <= avail)
-    return present;
-  const last = present[present.length - 1];
-  if (last === undefined)
-    return present;
-  const head = present.slice(0, -1);
-  const headWidth = head.length > 0 ? displayWidth(head.map(fieldPlain).join(` ${sepGlyph} `)) + displayWidth(` ${sepGlyph} `) : 0;
-  const budget = Math.max(1, avail - headWidth);
-  return [...head, truncateField(last, budget)];
+  return fitCells(present, avail, sepGlyph);
 };
 var colorCell = (field, lineIdx, cellIdx, input, term) => {
   const { theme, moodShift, mood } = input;
@@ -6490,22 +6464,22 @@ var HELPFUL_CATALOG = [
     render: (i) => `Large diff: +${i.git?.insertions ?? 0}/-${i.git?.deletions ?? 0}. Review in chunks.`
   },
   {
-    id: "behind_upstream",
+    id: "diverged",
     severity: "medium",
     category: "git",
     momentary: false,
-    template: "{behind} behind upstream. Pull before your next commit knots the merge.",
-    test: (i) => behind(i.git) > 0,
-    render: (i) => `${behind(i.git)} behind upstream. Pull before your next commit knots the merge.`
+    template: "Diverged {ahead}↑ {behind}↓. `git pull --rebase` keeps history linear.",
+    test: (i) => ahead(i.git) > 0 && behind(i.git) > 0,
+    render: (i) => `Diverged ${ahead(i.git)}↑ ${behind(i.git)}↓. \`git pull --rebase\` keeps history linear.`
   },
   {
-    id: "diverged",
+    id: "behind_upstream",
     severity: "medium",
     category: "git",
     momentary: false,
-    template: "Diverged {ahead}↑ {behind}↓. `git pull --rebase` keeps history linear.",
-    test: (i) => ahead(i.git) > 0 && behind(i.git) > 0,
-    render: (i) => `Diverged ${ahead(i.git)}↑ ${behind(i.git)}↓. \`git pull --rebase\` keeps history linear.`
+    template: "{behind} behind upstream. Pull before your next commit knots the merge.",
+    test: (i) => behind(i.git) > 0,
+    render: (i) => `${behind(i.git)} behind upstream. Pull before your next commit knots the merge.`
   },
   {
     id: "dirty_default_branch",
@@ -6754,16 +6728,16 @@ function resolveHelpful(inputs, state, clock, minSeverity) {
 }
 // src/packs/load.ts
 import { readFileSync as readFileSync9 } from "node:fs";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath } from "node:url";
 
 // src/packs/allowlist.ts
-var PREFIX2 = "@ccsidekick/pack-";
+var PREFIX = "@ccsidekick/pack-";
 var NAME_SEGMENT = /^[a-z0-9-]+$/;
-var packPackageName = (name) => `${PREFIX2}${name}`;
+var packPackageName = (name) => `${PREFIX}${name}`;
 function isAllowedPackPackage(pkg) {
-  if (!pkg.startsWith(PREFIX2))
+  if (!pkg.startsWith(PREFIX))
     return false;
-  return NAME_SEGMENT.test(pkg.slice(PREFIX2.length));
+  return NAME_SEGMENT.test(pkg.slice(PREFIX.length));
 }
 
 // src/packs/validate.ts
@@ -6965,7 +6939,7 @@ var validatePack = (raw) => {
 };
 
 // src/packs/load.ts
-var defaultResolver = (spec) => fileURLToPath2(import.meta.resolve(spec));
+var defaultResolver = (spec) => fileURLToPath(import.meta.resolve(spec));
 var errMessage = (e) => e instanceof Error ? e.message : String(e);
 function loadPack(name, resolver = defaultResolver) {
   if (!isAllowedPackPackage(packPackageName(name))) {
@@ -6995,17 +6969,30 @@ function loadPack(name, resolver = defaultResolver) {
     return { ok: false, reason: "pack failed validation" };
   return { ok: true, pack };
 }
+// src/packs/registry.ts
+var PACKS = [
+  "barbie",
+  "batman",
+  "deadpool",
+  "harry-potter",
+  "hello-kitty",
+  "james-bond",
+  "joker",
+  "pikachu",
+  "sherlock-holmes",
+  "spiderman"
+];
 // src/cli/gc.ts
-import { existsSync as existsSync2, readdirSync as readdirSync4, rmSync, statSync as statSync5 } from "node:fs";
-import { join as join14 } from "node:path";
+import { existsSync as existsSync2, readdirSync as readdirSync3, rmSync, statSync as statSync4 } from "node:fs";
+import { join as join13 } from "node:path";
 var DAY_MS = 86400000;
 function newestMtime(dir) {
   let newest = 0;
   try {
-    newest = statSync5(dir).mtimeMs;
-    for (const name of readdirSync4(dir)) {
+    newest = statSync4(dir).mtimeMs;
+    for (const name of readdirSync3(dir)) {
       try {
-        const m = statSync5(join14(dir, name)).mtimeMs;
+        const m = statSync4(join13(dir, name)).mtimeMs;
         if (m > newest)
           newest = m;
       } catch {}
@@ -7014,18 +7001,18 @@ function newestMtime(dir) {
   return newest;
 }
 function pruneSessions(root, now) {
-  const sessions = join14(root, "sessions");
+  const sessions = join13(root, "sessions");
   let names;
   try {
-    names = readdirSync4(sessions);
+    names = readdirSync3(sessions);
   } catch {
     return;
   }
   const cutoff = now - SESSION_TTL_DAYS * DAY_MS;
   for (const name of names) {
-    const dir = join14(sessions, name);
+    const dir = join13(sessions, name);
     try {
-      if (!statSync5(dir).isDirectory())
+      if (!statSync4(dir).isDirectory())
         continue;
     } catch {
       continue;
@@ -7097,13 +7084,12 @@ function applyThemeIcons(fields, theme, config) {
     };
   });
 }
-function readGated(overrides, envInputs, config, root, dir, markers, sessionState, clock) {
+function readGated(overrides, envInputs, config, root, dir, markers, clock) {
   const creds = overrides?.creds !== undefined ? overrides.creds : envInputs.hasApiKey || config.network.usage_fetch ? readCreds() : null;
   const usage = overrides?.usage !== undefined ? overrides.usage : config.network.usage_fetch ? readUsageCached(root) : null;
   const balance = overrides?.balance !== undefined ? overrides.balance : config.network.balance_path !== "" ? readBalance(config.network.balance_path, clock) : null;
   const helpfulEnv = needsHelpfulEnv(markers) ? readHelpfulEnv(dir) : EMPTY_HELPFUL_ENV;
-  const installed = sessionState.character === undefined && config.character.mode === "random" && config.character.roster.length === 0 ? listInstalledPacks(engineRoot(import.meta.url)) : [];
-  return { creds, usage, balance, helpfulEnv, installed };
+  return { creds, usage, balance, helpfulEnv };
 }
 var DEFAULT_EMBLEM = "❝";
 function lookupPackTheme(name) {
@@ -7132,10 +7118,10 @@ function build(stdin, env, term, clock, overrides) {
     return { line: "", persist: NOOP };
   const root = ccsidekickRoot(env);
   const base = dirname7(root);
-  const projectsRoot = join15(base, "projects");
+  const projectsRoot = join14(base, "projects");
   const dir = payload.workspace.current_dir ?? payload.cwd ?? process.cwd();
-  const globalToml = readTextSafe(join15(root, "config.toml"));
-  const projectToml = readTextSafe(join15(dir, ".ccsidekick", "config.toml"));
+  const globalToml = readTextSafe(join14(root, "config.toml"));
+  const projectToml = readTextSafe(join14(dir, ".ccsidekick", "config.toml"));
   const config = loadConfig(globalToml, projectToml);
   const envInputs = readEnv(env);
   const aliases = readModelAliases(env);
@@ -7150,8 +7136,8 @@ function build(stdin, env, term, clock, overrides) {
   const attribution = readAttribution(root);
   const costCache = readCostCache(root);
   const fxTable = readFxCached(root);
-  const { creds, usage, balance, helpfulEnv, installed } = readGated(overrides, envInputs, config, root, dir, markers, sessionState, clock);
-  const persona = derivePersona(config, sessionState, session, installed);
+  const { creds, usage, balance, helpfulEnv } = readGated(overrides, envInputs, config, root, dir, markers, clock);
+  const persona = derivePersona(config, sessionState, session, PACKS);
   const loaded = loadPack(persona);
   const pack = loaded.ok ? loaded.pack : null;
   const project = deriveProject(git, payload);
@@ -7185,8 +7171,11 @@ function build(stdin, env, term, clock, overrides) {
     git,
     payload,
     scan,
-    widgets: config.line.widgets,
-    currency: { code: config.line.currency, rate: fxTable[config.line.currency] ?? 0 },
+    widgets: config.statusline.widgets,
+    currency: {
+      code: config.statusline.currency,
+      rate: fxTable[config.statusline.currency] ?? 0
+    },
     homeDir: env["HOME"] ?? ""
   };
   const composed = composeStatusline(composeInputs);
@@ -7204,7 +7193,7 @@ function build(stdin, env, term, clock, overrides) {
     creds,
     balance
   };
-  const helpfulResult = config.helpful.enabled ? resolveHelpful(helpfulInputs, sessionState, clock, config.helpful.min_severity) : { comment: null, nextHelpful: sessionState.helpful };
+  const helpfulResult = config.comments.helpful ? resolveHelpful(helpfulInputs, sessionState, clock, config.comments.min_severity) : { comment: null, nextHelpful: sessionState.helpful };
   const helpful = helpfulResult.comment;
   const pending = pendingMilestones(familiarity, clock);
   const charBase = {
@@ -7225,7 +7214,7 @@ function build(stdin, env, term, clock, overrides) {
         state: sessionState,
         clock,
         session,
-        config: { enabled: config.comments.enabled }
+        config: { enabled: config.comments.character }
       });
     } catch {
       charResult = { comment: null, nextState: charBase };