claude-doom-statusbar 0.4.0 → 0.6.0

package/README.md

@@ -38,7 +38,7 @@ npx claude-doom-statusbar install
 That writes the `statusLine`, the lifecycle hooks, and the preset into `~/.claude/settings.json` for you (merging into whatever's already there, with a one-level `.bak`). Restart Claude Code and the HUD is live.
 
 ```bash
-npx claude-doom-statusbar install --preset full   # full | default | minimal (default: full)
+npx claude-doom-statusbar install --preset full   # full | standard | minimal (default: full)
 npx claude-doom-statusbar install --project       # write ./.claude/settings.json instead of ~/.claude
 npx claude-doom-statusbar uninstall                # remove everything the installer added
 ```
@@ -65,14 +65,18 @@ $env:FORCE_HYPERLINK = "1"; claude
 
 ## Presets
 
-`DOOMBAR_PRESET` picks the layout (defaults to `presets/default.toml`):
+`DOOMBAR_PRESET` picks the layout (defaults to `presets/standard.toml`):
 
 - **`minimal`** — a couple of bars, blends into the terminal.
-- **`default`** — balanced HUD.
+- **`standard`** — balanced HUD.
 - **`full`** — every box, the look in the screenshot above.
 
 A preset is TOML: a `[bar]` style block, a `[mugshot]` block, and a list of `[[segment]]` boxes. Each box lists metrics with a render type — `bar`, `number`, `text`, `spark`, `ammo`, `list`, `scroll`, or a `group`. Copy one and rearrange the boxes, swap icons, or change which metrics show.
 
+### Responsive width
+
+As the terminal narrows, the HUD shrinks: bars contract and text columns shrink together, and whatever overflows scrolls (the marquee). When even the smallest layout no longer fits, the preset falls back to a smaller one via its `[bar].fallback` key — `full → standard → minimal`. Your chosen preset is the ceiling; widening the terminal recovers it. It's stateless — each refresh re-reads the terminal width (`COLUMNS`), so it follows live resizes.
+
 ## How it works
 
 - **`src/statusline.js`** is the statusLine command. Claude Code pipes session JSON on stdin; it maps that (plus git via shell, system metrics from Node built-ins, and the hook state file) to metric values, picks the mugshot sprite, and renders the preset.

package/bin/cli.js

@@ -3,7 +3,7 @@
 // Port of install.py.
 //
 //   claude-doom-statusbar install              # install into ~/.claude/settings.json
-//   claude-doom-statusbar install --preset full # pick a preset (full | default | minimal)
+//   claude-doom-statusbar install --preset full # pick a preset (full | standard | minimal)
 //   claude-doom-statusbar install --project     # install into ./.claude/settings.json instead
 //   claude-doom-statusbar uninstall             # remove everything this installer added
 //
@@ -124,7 +124,7 @@ function parseArgs(argv) {
     else if (a.startsWith("--preset=")) out.preset = a.slice("--preset=".length);
     else die(`! unknown argument: ${a}`);
   }
-  if (out.cmd === "install" && !out.preset) die("! --preset needs a value (full | default | minimal)");
+  if (out.cmd === "install" && !out.preset) die("! --preset needs a value (full | standard | minimal)");
   return out;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-doom-statusbar",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "DOOM-inspired status bar for the Claude Code CLI — a mugshot that tracks session health, plus usage, model, project, system, and a live subagent list.",
   "type": "module",
   "bin": {
@@ -15,7 +15,7 @@
   "scripts": {
     "statusline": "node src/statusline.js",
     "hook": "node src/hook.js",
-    "test": "node test/installer.test.mjs && node test/smoke.test.mjs && node test/hook-tasks.test.mjs && node test/statusline-tasks.test.mjs && node test/render-scroll.test.mjs && node test/statusline-savings.test.mjs && node test/e2e-tasks.test.mjs",
+    "test": "node test/installer.test.mjs && node test/smoke.test.mjs && node test/hook-tasks.test.mjs && node test/statusline-tasks.test.mjs && node test/render-scroll.test.mjs && node test/statusline-savings.test.mjs && node test/e2e-tasks.test.mjs && node test/marquee.test.mjs && node test/layout.test.mjs && node test/resolve-preset.test.mjs",
     "preversion": "npm test",
     "postversion": "git push --follow-tags",
     "prepublishOnly": "npm test"

package/presets/full.toml

@@ -4,6 +4,7 @@ border_style   = "vertical"
 border_color   = "term-bg"      # seamless cuts through the panel
 box_background = "#1c2036"
 headers        = true
+fallback       = "standard"     # degrade to this preset when the terminal is too narrow
 
 [mugshot]
 background = "#000000"
@@ -66,6 +67,7 @@ metric = [
 [[segment]]
 type  = "box"
 title = "AGENTS"
+max_width = 22                      # cap width so long agent labels marquee (scroll back and forth)
 metric = [
   { id = "act.subagents", render = "scroll", anchor = "top", icon = "👹" },
 ]
@@ -73,6 +75,7 @@ metric = [
 [[segment]]
 type  = "box"
 title = "TASKS"
+max_width = 22                      # cap width so long task titles marquee (scroll back and forth)
 metric = [
   { id = "act.tasklist", render = "scroll", anchor = "boundary" },
 ]

package/presets/minimal.toml

@@ -1,19 +1,56 @@
-# minimal — blends into the terminal, smallest footprint
+# minimal — MODEL, USAGE, mugshot, PROJECT, ACTIVITY
 [bar]
-border_style   = "none"
-box_background = "term-bg"
-headers        = false
+border_style   = "vertical"
+border_color   = "term-bg"      # seamless cuts through the panel
+box_background = "#1c2036"
+headers        = true
 
 [mugshot]
-background = "term-bg"
+background = "#000000"
 
 [[segment]]
-type = "box"
+type  = "box"
+title = "MODEL"
+metric = [
+  { id = "model.name",       render = "text", icon = "🤖", right = "model.effort" },
+  { id = "model.mode",       render = "text" },                 # 💭 thinking  🚀 fast
+  { id = "model.permission", render = "text" },                 # 📋 plan / ⏩ auto (hidden on default)
+  { id = "model.style",      render = "text", icon = "🎨" },
+  { id = "advisor.model",    render = "text", icon = "🧙" },
+]
+
+[[segment]]
+type  = "box"
+title = "USAGE"
 metric = [
   { id = "context.hp",   render = "bar",    icon = "🧠", color = "threshold" },
-  { id = "ratelimit.5h", render = "ammo",   icon = "🕔" },
+  { id = "ratelimit.5h", render = "bar",    icon = "🕔", color = "threshold", show_pct = false, suffix = "usage.reset5h" },
+  { id = "ratelimit.7d", render = "bar",    icon = "📅", color = "threshold", show_pct = false, suffix = "usage.reset7d" },
+  { id = "sys.ram",      render = "bar",    icon = "💾", color = "threshold" },
   { id = "cost.total",   render = "number", icon = "💰" },
 ]
 
 [[segment]]
 type = "mugshot"
+
+[[segment]]
+type  = "box"
+title = "PROJECT"
+metric = [
+  { id = "session.name", render = "text", icon = "🎮" },
+  { id = "loc.cwd",      render = "text", icon = "📁" },
+  { id = "git.branch",   render = "text", icon = "🌿" },
+  { id = "git.work",     render = "text" },                # ✎ files  ⇅ pull/push
+  { id = "loc.churn",    render = "text", icon = "📝" },
+  { id = "pr.state",     render = "text", icon = "⇧ " },
+]
+
+[[segment]]
+type  = "box"
+title = "ACTIVITY"
+metric = [
+  { id = "act.geiger", render = "spark",  icon = "📟", spark_style = "octant", spark_max = 1 },
+  { id = "act.agents", render = "number", icon = "👹" },
+  { id = "act.tasks",  render = "number", icon = "🎯" },
+  { id = "act.errors", render = "number", icon = "💢", color = "threshold" },
+]

package/presets/standard.toml

@@ -0,0 +1,73 @@
+# standard — full minus SAVE and SYS
+[bar]
+border_style   = "vertical"
+border_color   = "term-bg"      # seamless cuts through the panel
+box_background = "#1c2036"
+headers        = true
+fallback       = "minimal"      # degrade to this preset when the terminal is too narrow
+
+[mugshot]
+background = "#000000"
+
+[[segment]]
+type  = "box"
+title = "MODEL"
+metric = [
+  { id = "model.name",       render = "text", icon = "🤖", right = "model.effort" },
+  { id = "model.mode",       render = "text" },                 # 💭 thinking  🚀 fast
+  { id = "model.permission", render = "text" },                 # 📋 plan / ⏩ auto (hidden on default)
+  { id = "model.style",      render = "text", icon = "🎨" },
+  { id = "advisor.model",    render = "text", icon = "🧙" },
+]
+
+[[segment]]
+type  = "box"
+title = "USAGE"
+metric = [
+  { id = "context.hp",   render = "bar",    icon = "🧠", color = "threshold" },
+  { id = "ratelimit.5h", render = "bar",    icon = "🕔", color = "threshold", show_pct = false, suffix = "usage.reset5h" },
+  { id = "ratelimit.7d", render = "bar",    icon = "📅", color = "threshold", show_pct = false, suffix = "usage.reset7d" },
+  { id = "sys.ram",      render = "bar",    icon = "💾", color = "threshold" },
+  { id = "cost.total",   render = "number", icon = "💰" },
+]
+
+[[segment]]
+type  = "box"
+title = "PROJECT"
+metric = [
+  { id = "session.name", render = "text", icon = "🎮" },
+  { id = "loc.cwd",      render = "text", icon = "📁" },
+  { id = "git.branch",   render = "text", icon = "🌿" },
+  { id = "git.work",     render = "text" },                # ✎ files  ⇅ pull/push
+  { id = "loc.churn",    render = "text", icon = "📝" },
+  { id = "pr.state",     render = "text", icon = "⇧ " },
+]
+
+[[segment]]
+type = "mugshot"
+
+[[segment]]
+type  = "box"
+title = "ACTIVITY"
+metric = [
+  { id = "act.geiger", render = "spark",  icon = "📟", spark_style = "octant", spark_max = 1 },
+  { id = "act.agents", render = "number", icon = "👹" },
+  { id = "act.tasks",  render = "number", icon = "🎯" },
+  { id = "act.errors", render = "number", icon = "💢", color = "threshold" },
+]
+
+[[segment]]
+type  = "box"
+title = "AGENTS"
+max_width = 22                      # cap width so long agent labels marquee (scroll back and forth)
+metric = [
+  { id = "act.subagents", render = "scroll", anchor = "top", icon = "👹" },
+]
+
+[[segment]]
+type  = "box"
+title = "TASKS"
+max_width = 22                      # cap width so long task titles marquee (scroll back and forth)
+metric = [
+  { id = "act.tasklist", render = "scroll", anchor = "boundary" },
+]

package/src/render.js

@@ -203,7 +203,20 @@ function barMeta(entry) {
   return [lw, 0, entry.render || "text"];
 }
 
-export function metricFixedWidth(entry) {
+// Display width of a plain text run, capped at `textCap` columns — but only when
+// it is marquee-safe. Values carrying ANSI/OSC escapes (coloured text, hyperlinks)
+// can't be column-sliced without corrupting the escape, so they keep full width
+// (a hard floor): their box shrinks less, which is what trips the preset fallback.
+const TEXTCAP_MAX = 24; // upper bound — matches statusline's clip(…, 24)
+const TEXTCAP_MIN = 10; // lower bound — the readable floor before falling back
+const ESC_RE = /\x1b/;
+function capLen(s, textCap) {
+  const str = String(s);
+  const w = vlen(str);
+  return ESC_RE.test(str) ? w : Math.min(w, textCap);
+}
+
+export function metricFixedWidth(entry, textCap = TEXTCAP_MAX) {
   const icon = entry.icon || "";
   const lw = vlen(icon ? icon + " " : "");
   const r = entry.render || "text";
@@ -211,7 +224,7 @@ export function metricFixedWidth(entry) {
   const rextra = rid && rid in VALUES ? 1 + vlen(String(VALUES[rid])) : 0;
   if ("group" in entry) {
     const sep = entry.sep ?? " ";
-    return lw + vlen(entry.group.filter((i) => i in VALUES).map((i) => String(VALUES[i])).join(sep)) + rextra;
+    return lw + capLen(entry.group.filter((i) => i in VALUES).map((i) => String(VALUES[i])).join(sep), textCap) + rextra;
   }
   if (r === "spark") return lw + Math.floor(((VALUES[entry.id] || []).length + 1) / 2);
   if (r === "ammo") return lw + 5 + vlen(" " + (entry.id in VALUES ? VALUES[entry.id] : 0) + "%");
@@ -220,21 +233,27 @@ export function metricFixedWidth(entry) {
     if (items.length === 0) return lw;
     return Math.max(...items.map((it) =>
       Array.isArray(it) && it.length === 2
-        ? lw + vlen(String(it[0])) + 1 + vlen(String(it[1]))
-        : lw + vlen(String(it))));
+        ? lw + capLen(it[0], textCap) + 1 + vlen(String(it[1]))
+        : lw + capLen(it, textCap)));
   }
   if (r === "scroll") {
     const items = VALUES[entry.id] || [];
     if (items.length === 0) return lw;
     return Math.max(...items.map((it) => {
       if (Array.isArray(it) && it.length === 2)
-        return lw + vlen(String(it[0])) + 1 + vlen(String(it[1]));
+        return lw + capLen(it[0], textCap) + 1 + vlen(String(it[1]));
       // object {mark, text}
-      return lw + vlen(String(it.mark || "")) + 1 + vlen(String(it.text || ""));
+      return lw + vlen(String(it.mark || "")) + 1 + capLen(it.text || "", textCap);
     }));
   }
   if (r === "bar") return null;
-  return lw + vlen(String(entry.id in VALUES ? VALUES[entry.id] : "?")) + rextra;
+  return lw + capLen(entry.id in VALUES ? VALUES[entry.id] : "?", textCap) + rextra;
+}
+
+// The coupled text cap for a given bar-cell count: cells 14 -> cap 24, cells 4 ->
+// cap 10, linearly in between. One scale drives bars and text together (approach A).
+export function textCapFor(cells) {
+  return Math.round(TEXTCAP_MIN + (cells - 4) / (14 - 4) * (TEXTCAP_MAX - TEXTCAP_MIN));
 }
 
 export function scrollWindow(n, h, anchor, boundary) {
@@ -246,16 +265,63 @@ export function scrollWindow(n, h, anchor, boundary) {
   return { start, up: start, down: n - start - h };
 }
 
+// --- horizontal marquee (the "car radio" scroll) ----------------------------
+// Long text that won't fit its column budget glides left until its tail shows,
+// pauses, then glides back to the start and pauses again — ping-pong, driven by
+// the same per-refresh `tick` as the mugshot/geiger. Pure function of `tick`
+// (no Date in here) so renders stay deterministic and testable.
+const MARQUEE_STEP = 1;   // display columns advanced per tick
+const MARQUEE_DWELL = 3;  // ticks held at each end before reversing
+
+// Triangular offset wave 0..span..0 with a dwell at both extremes.
+function marqueeOffset(span, tick) {
+  if (span <= 0) return 0;
+  const sweep = Math.ceil(span / MARQUEE_STEP);
+  const cycle = 2 * (MARQUEE_DWELL + sweep);
+  let t = ((tick % cycle) + cycle) % cycle;
+  if (t < MARQUEE_DWELL) return 0;                            // hold at start
+  t -= MARQUEE_DWELL;
+  if (t < sweep) return Math.min(span, t * MARQUEE_STEP);     // glide forward 0->span
+  t -= sweep;
+  if (t < MARQUEE_DWELL) return span;                         // hold at end
+  t -= MARQUEE_DWELL;
+  return Math.max(0, span - t * MARQUEE_STEP);                // glide back span->0
+}
+
+// Take a `width`-wide display window starting `off` columns in, never splitting a
+// 2-col glyph; the result is always exactly `width` columns (padded with spaces).
+function sliceCols(text, off, width) {
+  let col = 0, taken = 0, out = "";
+  for (const ch of [...String(text)]) {
+    const cw = vlen(ch);
+    if (col < off) { col += cw; continue; }          // still left of the window
+    if (taken + cw > width) break;                   // glyph would overflow the window
+    out += ch; taken += cw; col += cw;
+  }
+  if (taken < width) out += " ".repeat(width - taken);
+  return out;
+}
+
+// Fit `text` into exactly `width` display columns. Fits -> left-aligned + padded.
+// Overflows -> ping-pong marquee window for the current `tick`.
+export function marquee(text, width, tick = 0) {
+  text = String(text);
+  if (width <= 0) return "";
+  const tw = vlen(text);
+  if (tw <= width) return text + " ".repeat(width - tw);
+  return sliceCols(text, marqueeOffset(tw - width, tick), width);
+}
+
 function available(entry) {
   if ("group" in entry) return entry.group.some((i) => i in VALUES);
   if (entry.render === "list") return true;
   return entry.id in VALUES;
 }
 
-function boxWidth(box, cells) {
+function boxWidth(box, cells, textCap = TEXTCAP_MAX) {
   const widths = [vlen(box.title || "")];
   for (const m of box.metric) {
-    let fw = metricFixedWidth(m);
+    let fw = metricFixedWidth(m, textCap);
     if (fw === null) {
       const [lw, sw] = barMeta(m);
       fw = lw + cells + sw;
@@ -280,17 +346,15 @@ function hpRow(thresholds = HP_THRESHOLDS) {
   return thresholds.filter((t) => headroom < t).length;
 }
 
-export function buildBar(cfg, target, spriteFor) {
+// Width-relevant layout context shared by buildBar (render) and planLayout (fit
+// test). Filters unavailable metrics, computes the row count, and loads the mugshot
+// art so its width counts toward the layout. spriteFor defaults to the idle face;
+// the exact sprite never changes the mugshot's column width.
+function layoutContext(cfg, spriteFor) {
   if (!spriteFor) spriteFor = (hp) => `STFST${hp}1`;
-
   const bar = cfg.bar || {};
   const style = bar.border_style ?? "vertical";
   const headers = (bar.headers ?? true) && style !== "frame";
-  const boxRgb = rgbOf(bar.box_background ?? "term-bg");
-  const bcol = bar.border_color ?? "term-fg";
-  const mugRgb = rgbOf((cfg.mugshot || {}).background ?? "#000000");
-
-  // availability: drop metrics whose value is absent; collapse empty boxes.
   const segs = [];
   for (const s of cfg.segment) {
     if (s.type === "mugshot") { segs.push(s); continue; }
@@ -301,35 +365,79 @@ export function buildBar(cfg, target, spriteFor) {
   const rowcount = (b) => b.metric.reduce((n, m) =>
     n + (m.render === "list" ? (VALUES[m.id] || []).length : (m.render === "scroll" ? 0 : 1)), 0);
   const dataRows = boxes.length ? Math.max(...boxes.map(rowcount)) : 0;
-  const headersExtra = headers ? 1 : 0;
-  const totalRows = Math.max(dataRows + headersExtra, 4); // 4 = mugshot floor
-
+  const totalRows = Math.max(dataRows + (headers ? 1 : 0), 4); // 4 = mugshot floor
   const hp = hpRow();
   const face = loadFace(spriteFor(hp), totalRows);
   const faceW = Math.max(...face.map((r) => r.length));
+  return { bar, style, headers, segs, totalRows, hp, face, faceW };
+}
 
-  const colWidths = (cells) => {
-    const ws = [];
-    let mug = null;
-    segs.forEach((s, i) => {
-      if (s.type === "mugshot") { ws.push(faceW + 2); mug = i; }
-      else ws.push(boxWidth(s, cells) + 2);
-    });
-    return [ws, mug];
-  };
-
-  const balancedWidth = (cells) => {
-    const [ws, mug] = colWidths(cells);
-    if (mug === null) return ws.reduce((a, b) => a + b, 0) + (ws.length - 1);
-    const left = ws.slice(0, mug).reduce((a, b) => a + b, 0) + mug;
-    const right = ws.slice(mug + 1).reduce((a, b) => a + b, 0) + (ws.length - 1 - mug);
-    return 2 * Math.max(left, right) + ws[mug];
-  };
-
-  let cells = 4;
+function colWidthsOf(segs, faceW, cells, textCap) {
+  const ws = [];
+  let mug = null;
+  segs.forEach((s, i) => {
+    if (s.type === "mugshot") { ws.push(faceW + 2); mug = i; }
+    else ws.push(boxWidth(s, cells, textCap) + 2);
+  });
+  return [ws, mug];
+}
+
+function balancedWidthOf(segs, faceW, cells, textCap) {
+  const [ws, mug] = colWidthsOf(segs, faceW, cells, textCap);
+  if (mug === null) return ws.reduce((a, b) => a + b, 0) + (ws.length - 1);
+  const left = ws.slice(0, mug).reduce((a, b) => a + b, 0) + mug;
+  const right = ws.slice(mug + 1).reduce((a, b) => a + b, 0) + (ws.length - 1 - mug);
+  return 2 * Math.max(left, right) + ws[mug];
+}
+
+// Largest lockstep scale (bars 14->4, text 24->10) whose balanced layout fits
+// `target`. Returns the minimum scale with fits=false when nothing fits — the
+// caller (statusline) reads `fits` to decide whether to fall back to a smaller
+// preset. Pure: no filesystem, deterministic for a given cfg + VALUES.
+export function planLayout(cfg, target, spriteFor) {
+  const { segs, faceW } = layoutContext(cfg, spriteFor);
   for (let c = 14; c >= 4; c--) {
-    if (balancedWidth(c) <= target) { cells = c; break; }
+    const textCap = textCapFor(c);
+    const width = balancedWidthOf(segs, faceW, c, textCap);
+    if (width <= target) return { cells: c, textCap, width, fits: true };
   }
+  const textCap = textCapFor(4);
+  return { cells: 4, textCap, width: balancedWidthOf(segs, faceW, 4, textCap), fits: false };
+}
+
+// Walk the per-preset fallback chain from `chosenCfg` (the ceiling) downward and
+// return the first preset whose layout fits `target`; if none fit, return the last
+// (smallest) one reached. `loadByName(name) -> cfg | null` loads a sibling preset;
+// returning null (missing/unreadable) ends the chain. Stateless: ceiling + recovery
+// fall out of re-deriving from `target` each call. Guards against fallback cycles.
+export function resolvePreset(chosenCfg, target, loadByName, spriteFor) {
+  let cfg = chosenCfg, last = chosenCfg;
+  const seen = new Set();
+  while (cfg) {
+    last = cfg;
+    // Fit-test with the SAME sprite buildBar will render, so the mugshot column
+    // width matches: plan.fits then implies the rendered layout actually fits.
+    if (planLayout(cfg, target, spriteFor).fits) return cfg;
+    const next = cfg.bar && cfg.bar.fallback;
+    if (!next || seen.has(next)) break;   // terminus or cycle
+    seen.add(next);
+    const loaded = loadByName(next);
+    if (!loaded) break;                    // missing/unreadable fallback
+    cfg = loaded;
+  }
+  return last;                             // nothing fit -> smallest reached
+}
+
+export function buildBar(cfg, target, spriteFor, tick = 0) {
+  if (!spriteFor) spriteFor = (hp) => `STFST${hp}1`;
+
+  const { style, headers, segs, totalRows, hp, face, faceW } = layoutContext(cfg, spriteFor);
+  const bar = cfg.bar || {};
+  const boxRgb = rgbOf(bar.box_background ?? "term-bg");
+  const bcol = bar.border_color ?? "term-fg";
+  const mugRgb = rgbOf((cfg.mugshot || {}).background ?? "#000000");
+
+  const { cells, textCap } = planLayout(cfg, target, spriteFor);
 
   const columns = [];
   let mugIdx = null;
@@ -339,7 +447,7 @@ export function buildBar(cfg, target, spriteFor) {
       columns.push(Array.from({ length: totalRows }, (_, r) => faceCell(face[r], faceW, mugRgb)));
       continue;
     }
-    const w = boxWidth(s, cells);
+    const w = boxWidth(s, cells, textCap);
     const col = [];
     if (headers) {
       const t = s.title || "";
@@ -354,12 +462,12 @@ export function buildBar(cfg, target, spriteFor) {
         for (const item of VALUES[m.id] || []) {
           let body;
           if (Array.isArray(item) && item.length === 2) {
-            const left = lbl + f(TEXT) + String(item[0]);
             const right = f(TEXT) + String(item[1]);
-            body = left + " ".repeat(Math.max(0, w - vlen(left) - vlen(right))) + right;
+            const budget = Math.max(0, w - vlen(lbl) - vlen(String(item[1])) - 1); // 1 = min gap
+            const left = lbl + f(TEXT) + marquee(String(item[0]), budget, tick);
+            body = left + " ".repeat(Math.max(0, w - vlen(left) - vlen(String(item[1])))) + right;
           } else {
-            body = lbl + f(TEXT) + String(item);
-            body += " ".repeat(Math.max(0, w - vlen(body)));
+            body = lbl + f(TEXT) + marquee(String(item), Math.max(0, w - vlen(lbl)), tick);
           }
           col.push(bgsgrBox(boxRgb) + " " + body + " " + RESET);
         }
@@ -384,20 +492,16 @@ export function buildBar(cfg, target, spriteFor) {
             const right = f(TEXT) + String(item[1]) + (marker ? f(TEXT) + tail : "");
             const rightW = vlen(String(item[1])) + tailW;
             const labelMax = Math.max(0, w - vlen(lbl) - rightW - 1); // 1 = min gap
-            let label = String(item[0]);
-            if (vlen(label) > labelMax) label = [...label].slice(0, Math.max(0, labelMax - 1)).join("") + "…";
-            const left = lbl + f(TEXT) + label;
+            const left = lbl + f(TEXT) + marquee(String(item[0]), labelMax, tick);
             const room = Math.max(0, w - vlen(left) - rightW);
             body = left + " ".repeat(room) + right;
           } else {                                         // {mark, markRgb, text} (tasks)
             const markCol = item.markRgb ? f(item.markRgb) : f(TEXT);
             const m = String(item.mark);
             const mPad = m + (vlen(m) < 2 ? " " : "");      // normalize mark to 2 cols so text aligns
-            let text = String(item.text);
             const head = markCol + mPad + " " + f(TEXT);
-            const max = w - vlen(mPad) - 1 - tailW;         // reserve gap + marker on the right
-            if (vlen(text) > max) text = [...text].slice(0, Math.max(0, max - 1)).join("") + "…";
-            body = head + text;
+            const max = Math.max(0, w - vlen(mPad) - 1 - tailW); // reserve gap + marker on the right
+            body = head + marquee(String(item.text), max, tick);
             body += " ".repeat(Math.max(0, w - tailW - vlen(body)));
             if (tail) body += f(TEXT) + tail;
           }
@@ -408,6 +512,21 @@ export function buildBar(cfg, target, spriteFor) {
       let body = renderValue(m, m.render === "bar" ? cells : 0, boxRgb);
       const rid = m.right;
       const rhs = rid && rid in VALUES ? f(TEXT) + String(VALUES[rid]) : "";
+      // Plain text/number that overflows its column budget -> marquee. Skipped when
+      // the value carries ANSI/OSC escapes (colours, hyperlinks): those can't be
+      // sliced by column without corrupting the escape sequence.
+      const r = m.render || "text";
+      if ((r === "text" || r === "number") && !("group" in m) && m.id in VALUES) {
+        const raw = String(VALUES[m.id]);
+        const lbl = m.icon ? m.icon + " " : "";
+        const budget = w - vlen(lbl) - vlen(rhs);
+        if (!/[\x1b]/.test(raw) && budget > 0 && vlen(raw) > budget) {
+          let col;
+          if (m.color === "threshold") col = threshold(parseInt(raw.replace(/\D/g, "") || "0", 10));
+          else col = m.color ? rgbOf(m.color) : TEXT;
+          body = lbl + f(col) + marquee(raw, budget, tick);
+        }
+      }
       body += " ".repeat(Math.max(0, w - vlen(body) - vlen(rhs))) + rhs;
       col.push(bgsgrBox(boxRgb) + " " + body + " " + RESET);
     }
@@ -456,11 +575,12 @@ function main() {
     p = path.isAbsolute(arg) ? arg : path.join(process.cwd(), arg);
     try { readFileSync(p); } catch { p = path.join(REPO, "presets", path.basename(arg)); }
   } else {
-    p = path.join(REPO, "presets", "default.toml");
+    p = path.join(REPO, "presets", "standard.toml");
   }
   const target = process.argv[3] ? parseInt(process.argv[3], 10) : 100;
+  const tick = process.argv[4] ? parseInt(process.argv[4], 10) : 0; // marquee phase for previews
   const cfg = parseToml(readFileSync(p, "utf8"));
-  const res = buildBar(cfg, target);
+  const res = buildBar(cfg, target, undefined, tick);
   const out = ["", `  preset: ${path.basename(p)}   style=${res.style}  headers=${res.headers}  bar=${res.cells}`, ""];
   out.push(...res.lines, "");
   process.stdout.write(out.join("\n") + "\n");

package/src/statusline.js

@@ -7,10 +7,10 @@
 // settings.json:
 //   "statusLine": { "type": "command",
 //       "command": "node /abs/path/src/statusline.js", "refreshInterval": 1 }
-// Config: $DOOMBAR_PRESET (default presets/default.toml)  State: $MUGSHOT_STATE
+// Config: $DOOMBAR_PRESET (default presets/standard.toml)  State: $MUGSHOT_STATE
 
 import {
-  readFileSync, writeFileSync, openSync, fstatSync, readSync, closeSync, statfsSync,
+  readFileSync, writeFileSync, openSync, fstatSync, readSync, closeSync, statfsSync, statSync,
 } from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -18,7 +18,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { spawnSync } from "node:child_process";
 import { parse as parseToml } from "smol-toml";
 import { pyround, sgrFg } from "./ansi.js";
-import { buildBar, setValues, OK, TEXT, CRIT } from "./render.js";
+import { buildBar, setValues, resolvePreset, OK, TEXT, CRIT } from "./render.js";
 
 const HERE = path.dirname(fileURLToPath(import.meta.url));
 const REPO = path.dirname(HERE);
@@ -232,10 +232,10 @@ function sysValues(cwd) {
   return v;
 }
 
-// Token-savings rows read from the small JSON files context-optimization tools already
-// persist. No plugin patching, no binary spawn — just a cheap read each refresh. Paths are
-// env-overridable (DOOMBAR_*) so tests can point at fixtures, mirroring statePath/MUGSHOT_STATE.
-const leanCtxPath = () => process.env.DOOMBAR_LEANCTX || path.join(os.homedir(), ".lean-ctx", "mcp-live.json");
+// --- Token-savings rows -----------------------------------------------------
+// Read from what context-optimization tools already persist on disk. No plugin
+// patching, no binary spawn. Paths are env-overridable (DOOMBAR_*) for tests.
+const eventsPath = () => process.env.DOOMBAR_EVENTS || path.join(os.homedir(), ".lean-ctx", "events.jsonl");
 const llmlinguaPath = () => process.env.DOOMBAR_LLMLINGUA || path.join(os.homedir(), ".llmlingua-stats.json");
 
 // Defensive read: missing file or malformed JSON -> null (the row simply never appears).
@@ -243,46 +243,95 @@ function readJson(p) {
   try { return JSON.parse(readFileSync(p, "utf8")); } catch { return null; }
 }
 
-// One entry per savings source; extract returns the display string or null (omit the row).
-// Adding a source later is one entry here plus one preset line — not an adapter framework.
-const SAVINGS_SOURCES = [
-  {
-    key: "save.leanctx",
-    path: leanCtxPath,
-    extract: (d) => {
-      if (!(d.tokens_saved > 0)) return null;
-      // compression_rate is a 0-100 percentage (verified against historical data).
-      // Round it — a fractional value would render "63.45%" and shift the box width.
-      return typeof d.compression_rate === "number"
-        ? `${k(d.tokens_saved)} ${Math.round(d.compression_rate)}%`
-        : k(d.tokens_saved);
-    },
-  },
-  {
-    key: "save.lingua",
-    path: llmlinguaPath,
-    extract: (d) => {
-      // Prefer the nested session schema (smart-read). The flat lifetime-only shape
-      // (llmlingua_logged.py: tokens_saved_total, no session) is absent for the session view.
-      const s = d.session;
-      if (!s || !(s.tokens_saved > 0)) return null;
-      // Round/clamp the secondary figure so a many-decimal value can't shift box width.
-      if (s.last_saved_pct != null) return `${k(s.tokens_saved)} ${Math.round(s.last_saved_pct)}%`;
-      // No original-token count in the session block, so a percent isn't derivable; show the ratio.
-      if (s.last_ratio != null) return `${k(s.tokens_saved)} ${Number(s.last_ratio).toFixed(1)}x`;
-      return k(s.tokens_saved);
-    },
-  },
-];
-
-export function statsValues() {
-  const v = {};
-  for (const src of SAVINGS_SOURCES) {
-    const data = readJson(src.path());
-    if (!data) continue;
-    const out = src.extract(data);
-    if (out) v[src.key] = out; // omit on null/zero -> render.js available() drops the row
+// Windows FS is case-insensitive, POSIX is not — only fold case on win32 to avoid
+// false path matches (e.g. /home/User vs /home/user) on the platforms the npm package also runs on.
+const normPath = (p) => {
+  const s = String(p).replace(/\\/g, "/");
+  return process.platform === "win32" ? s.toLowerCase() : s;
+};
+
+// "8.3k 63%" — saved + a per-session compression rate derived from accumulated totals.
+function fmtSaved(st) {
+  return st.original > 0 ? `${k(st.saved)} ${Math.round(100 * st.saved / st.original)}%` : k(st.saved);
+}
+
+const savingsStatePath = (sid) =>
+  process.env.DOOMBAR_SAVINGS_STATE || path.join(TMP, `savings_${sid}.json`);
+
+// Per-session lean-ctx savings. lean-ctx's mcp-live.json is a single global file clobbered
+// by every concurrent session, so it can't be per-session. events.jsonl is append-only and
+// each ToolCall carries the file path it compressed — so we sum tokens_saved over NEW events
+// (tracked by byte offset) whose path is under the current cwd, accumulated across refreshes
+// in a per-session state file keyed by session_id. The accumulator follows cwd changes (it
+// keeps adding wherever you currently work) and stays cheap — it reads only the bytes appended
+// since the last refresh, never the whole log. Residual: two sessions concurrently in the SAME
+// project share events and both count them — unsplittable from disk, accepted.
+function leanCtxSavings(cwd, sid) {
+  if (!cwd) return null;
+  const cwdN = normPath(cwd).replace(/\/+$/, "") + "/"; // match on a path boundary, not a prefix
+  const sp = savingsStatePath(sid);
+  let st = { offset: null, saved: 0, original: 0 };
+  try { st = { ...st, ...JSON.parse(readFileSync(sp, "utf8")) }; } catch { /* fresh session */ }
+
+  let size = -1;
+  try { size = statSync(eventsPath()).size; } catch { /* no log */ }
+  if (size < 0) return st.saved > 0 ? fmtSaved(st) : null; // log gone -> keep prior total
+
+  if (st.offset === null) st.offset = size; // first sight of this session: count from now on
+  // Log shrank -> lean-ctx rotated it (old events go to archives/, the restarted log holds only
+  // NEW events). Keep the running total and re-read from 0: prior total + new events = correct.
+  // (An in-place truncate-and-rewrite retaining old content would double-count, but an append-only
+  // log doesn't do that.)
+  if (st.offset > size) st.offset = 0;
+
+  if (size > st.offset) {
+    let chunk = "";
+    try {
+      const fd = openSync(eventsPath(), "r");
+      const buf = Buffer.alloc(size - st.offset);
+      readSync(fd, buf, 0, buf.length, st.offset);
+      closeSync(fd);
+      chunk = buf.toString("utf8");
+    } catch { chunk = ""; }
+    const lastNl = chunk.lastIndexOf("\n"); // consume complete lines only; keep any partial tail
+    if (lastNl >= 0) {
+      for (const ln of chunk.slice(0, lastNl).split("\n")) {
+        if (!ln) continue;
+        let o; try { o = JSON.parse(ln); } catch { continue; }
+        const ev = o.kind;
+        if (!ev || ev.type !== "ToolCall" || !ev.path) continue;
+        if (!normPath(ev.path).startsWith(cwdN)) continue; // cwdN ends in "/" -> boundary-safe
+        st.saved += ev.tokens_saved || 0;
+        st.original += ev.tokens_original || 0;
+      }
+      st.offset += Buffer.byteLength(chunk.slice(0, lastNl + 1), "utf8");
+    }
   }
+  try { writeFileSync(sp, JSON.stringify(st)); } catch { /* ignore */ }
+  return st.saved > 0 ? fmtSaved(st) : null;
+}
+
+// Per-session llmlingua. smart-read keys its sessions map by CLAUDE_CODE_SESSION_ID — the same
+// id the statusbar gets on stdin — so we read sessions[sid] (not a single global block).
+// Prefer last_saved_pct; else show the ratio. Flat lifetime-only writers expose no session -> absent.
+function linguaSavings(sid) {
+  const d = readJson(llmlinguaPath());
+  const s = d && d.sessions && d.sessions[sid];
+  if (!s || !(s.tokens_saved > 0)) return null;
+  if (s.last_saved_pct != null) return `${k(s.tokens_saved)} ${Math.round(s.last_saved_pct)}%`;
+  if (s.last_ratio != null) return `${k(s.tokens_saved)} ${Number(s.last_ratio).toFixed(1)}x`;
+  return k(s.tokens_saved);
+}
+
+export function statsValues(data, cwd) {
+  const v = {};
+  const rawSid = String((data && data.session_id) || "default");
+  const sid = rawSid.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 48); // filesystem-safe state-file key
+  const lean = leanCtxSavings(cwd, sid);
+  if (lean) v["save.leanctx"] = lean;
+  // smart-read keys sessions[] by the RAW CLAUDE_CODE_SESSION_ID -> look up with the unsanitized id.
+  const ling = linguaSavings(rawSid);
+  if (ling) v["save.lingua"] = ling;
   return v;
 }
 
@@ -317,7 +366,9 @@ export function activityValues(st, now) {
   const squad = st.squad || {};
   v["act.agents"] = String(Object.keys(squad).length);
   const agents = Object.values(squad).sort((a, b) => a.start - b.start);
-  v["act.subagents"] = agents.map((a) => [clip(a.desc || a.type || "agent", 24), _dur(now - a.start)]);
+  // Clip generously (not 24): the box caps width and the label marquees, so a long
+  // agent description should stay long enough to be worth scrolling through.
+  v["act.subagents"] = agents.map((a) => [clip(a.desc || a.type || "agent", 60), _dur(now - a.start)]);
 
   const tasks = st.tasks && typeof st.tasks === "object" ? Object.values(st.tasks) : [];
   const live = tasks.filter((t) => t.status !== "deleted");
@@ -328,7 +379,7 @@ export function activityValues(st, now) {
     .sort((a, b) => (TASK_ORDER[a.status] - TASK_ORDER[b.status]) || (a.ts - b.ts));
   v["act.tasklist"] = ordered.map((t) => {
     const [mark, markRgb] = TASK_MARK[t.status] || ["🎯", null];
-    return { mark, markRgb, text: clip(t.title, 24) };
+    return { mark, markRgb, text: clip(t.title, 60) }; // generous clip: box width caps it, title marquees
   });
 
   if ("errors" in st) v["act.errors"] = String(st.errors);
@@ -339,13 +390,13 @@ function main() {
   let data = {};
   try { data = JSON.parse(readFileSync(0, "utf8")); } catch { data = {}; }
 
-  const preset = process.env.DOOMBAR_PRESET || path.join(REPO, "presets", "default.toml");
+  const preset = process.env.DOOMBAR_PRESET || path.join(REPO, "presets", "standard.toml");
   const cfg = parseToml(readFileSync(preset, "utf8"));
 
   const now = Date.now() / 1000;
   const st = readState(data);
   const cwd = data.cwd || (data.workspace || {}).current_dir;
-  const values = { ...buildValues(data), ...activityValues(st, now), ...sysValues(cwd), ...statsValues() };
+  const values = { ...buildValues(data), ...activityValues(st, now), ...sysValues(cwd), ...statsValues(data, cwd) };
   const [advModel, advTs] = advisorInfo(data.transcript_path || "");
   if (advModel) values["advisor.model"] = advModel;
   const god_until = godFlash(data, advTs, now);
@@ -376,7 +427,17 @@ function main() {
   };
 
   const target = parseInt(process.env.COLUMNS || "100", 10);
-  const res = buildBar(cfg, target, spriteFor);
+  const tick = Math.floor(now); // one marquee step per refresh (~1s); pure fn of time
+  // Pick the preset that fits the terminal: the chosen preset is the ceiling; if it
+  // (at its minimum scale) overflows COLUMNS, fall back down its [bar].fallback chain.
+  // Sibling presets resolve relative to the chosen preset's directory.
+  const presetDir = path.dirname(preset);
+  const loadByName = (name) => {
+    try { return parseToml(readFileSync(path.join(presetDir, `${name}.toml`), "utf8")); }
+    catch { return null; }
+  };
+  const selected = resolvePreset(cfg, target, loadByName, spriteFor);
+  const res = buildBar(selected, target, spriteFor, tick);
   process.stdout.write(res.lines.join("\n") + "\n");
 }
 

package/presets/default.toml

@@ -1,38 +0,0 @@
-# default — balanced (the live-mockup look)
-[bar]
-border_style   = "vertical"
-border_color   = "term-fg"
-box_background = "term-bg"
-headers        = true
-
-[mugshot]
-background = "#000000"
-
-[[segment]]
-type  = "box"
-title = "USAGE"
-metric = [
-  { id = "context.hp",   render = "bar", icon = "🧠", color = "threshold" },
-  { id = "ratelimit.5h", render = "bar", icon = "🕔", color = "threshold" },
-  { id = "ratelimit.7d", render = "bar", icon = "📅", color = "threshold" },
-]
-
-[[segment]]
-type  = "box"
-title = "SAVE"
-metric = [
-  { id = "save.leanctx", render = "text", icon = "🪶" },
-  { id = "save.lingua",  render = "text", icon = "📜" },
-]
-
-[[segment]]
-type = "mugshot"
-
-[[segment]]
-type  = "box"
-title = "GIT"
-metric = [
-  { id = "git.branch", render = "text",   icon = "🌿" },
-  { group = ["git.behind", "git.ahead"], render = "number", sep = " ", icon = "⇅" },
-  { id = "cost.total", render = "number", icon = "💰" },
-]