claude-doom-statusbar 0.7.0 → 0.8.0

package/README.md

@@ -19,7 +19,7 @@ The HUD is a row of boxes centred on the mugshot. Each box is configurable; the
 - **ACTIVITY** — a tool-activity "geiger" sparkline (duty-cycle over the last 30 s), running-agent count, task progress, error count.
 - **AGENTS** — a live list of running subagents (type/description + ticking runtime), always visible. Long lists scroll within the box height, with ↑/↓ markers counting the rows hidden off-screen.
 - **TASKS** — the session's todo list: settled items (✅ done, ❌ removed) on top, open items (⏩ in-progress, 🎯 pending) below. Scrolls like AGENTS, anchored on the open/settled boundary.
-- **SYS** — CPU, disk, session length, wall clock.
+- **SYS** — CPU, a per-core CPU equalizer (one threshold-coloured column per core), disk, session length, wall clock.
 
 Anything the session can't supply is hidden automatically, so the same config degrades cleanly.
 
@@ -71,7 +71,7 @@ $env:FORCE_HYPERLINK = "1"; claude
 - **`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.
+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`, `equalizer`, `ammo`, `list`, `scroll`, or a `group`. (`equalizer` draws an array of `0..1` values as a one-row VU-meter: one block column per channel, each coloured by its own value — e.g. `sys.cores` for per-core CPU.) Copy one and rearrange the boxes, swap icons, or change which metrics show.
 
 ### Responsive width
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-doom-statusbar",
-  "version": "0.7.0",
+  "version": "0.8.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 && node test/marquee.test.mjs && node test/layout.test.mjs && node test/resolve-preset.test.mjs && node test/preset-bands.test.mjs && node test/journal.test.mjs && node test/git-event.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/render-equalizer.test.mjs && node test/statusline-savings.test.mjs && node test/statusline-cores.test.mjs && node test/e2e-tasks.test.mjs && node test/marquee.test.mjs && node test/layout.test.mjs && node test/resolve-preset.test.mjs && node test/preset-bands.test.mjs && node test/journal.test.mjs && node test/git-event.test.mjs",
     "preversion": "npm test",
     "postversion": "git push --follow-tags",
     "prepublishOnly": "npm test"

package/presets/full.toml

@@ -1,4 +1,7 @@
 # full — DOOM panel, everything on
+# text_overflow = "scroll"   # how labels longer than their box behave: "scroll" (ping-pong
+                             # marquee, default) or "clip" (static, truncated with …).
+                             # Env override: DOOMBAR_TEXT_OVERFLOW.
 [bar]
 border_style   = "vertical"
 border_color   = "term-bg"      # seamless cuts through the panel
@@ -84,7 +87,8 @@ metric = [
 type  = "box"
 title = "SYS"
 metric = [
-  { id = "sys.cpu",     render = "number", icon = "🔥" },
+  { id = "sys.cpu",     render = "number",    icon = "🔥" },
+  { id = "sys.cores",   render = "equalizer", icon = "🎚", color = "threshold" },
   { id = "sys.disk",    render = "bar",    icon = "💿", color = "threshold" },
   { id = "sys.session", render = "text",   icon = "🕙" },
   { id = "sys.clock",   render = "text",   icon = "🕓" },

package/src/render.js

@@ -47,6 +47,8 @@ export const SAMPLE = {
   "act.geiger": [0, .25, .5, 1, .75, 1, .5, .6, .3, .1, .4, 1, .8, .4],
   "act.tasks": "2/5", "act.errors": "0", "sys.ram": 47, "sys.cpu": "12%",
   "sys.disk": 63, "sys.clock": "14:23",
+  "sys.cores": [0.12, 0.30, 0.08, 0.95, 0.45, 0.18, 0.62, 0.22],
+
   "save.leanctx": "8.3k 63%", "save.lingua": "1.2k 1.3x",
 };
 
@@ -66,6 +68,28 @@ export function vlen(s) {
   return n;
 }
 
+// OSC8 hyperlink helpers — long hyperlinked labels (cwd, branch) can't be column-sliced
+// as-is (slicing corrupts the escape), so we operate on the visible text and re-wrap it
+// with the same URL. Matches the format emitted by statusline's _link().
+const OSC8_RE = /^\x1b\]8;;([^\x1b\x07]*)(?:\x1b\\|\x07)([\s\S]*?)\x1b\]8;;(?:\x1b\\|\x07)$/;
+function splitLink(s) {
+  const m = String(s).match(OSC8_RE);
+  return m ? { url: m[1], inner: m[2] } : null;
+}
+function wrapLink(text, url) {
+  return `\x1b]8;;${url}\x1b\\${text}\x1b]8;;\x1b\\`;
+}
+// First `width` visible columns of `text`, no padding, never splitting a 2-col glyph.
+function headCols(text, width) {
+  let col = 0, out = "";
+  for (const ch of [...String(text)]) {
+    const cw = vlen(ch);
+    if (col + cw > width) break;
+    out += ch; col += cw;
+  }
+  return out;
+}
+
 function threshold(pct) {
   return pct < 60 ? OK : pct < 85 ? WARN : CRIT;
 }
@@ -125,6 +149,12 @@ const SPARK_BRAILLE = [
   "⠀⢀⢠⢰⢸", "⡀⣀⣠⣰⣸", "⡄⣄⣤⣴⣼", "⡆⣆⣦⣶⣾", "⡇⣇⣧⣷⣿",
 ].map((r) => [...r]);
 const BLOCK_RAMP = [..."▁▂▃▄▅▆▇"];
+// The equalizer's OWN 9-level height ramp (empty 0/8 .. full 8/8), so an idle
+// channel reads as empty and a maxed one as a full block -- deliberately wider at
+// both ends than spark's BLOCK_RAMP, which never shows empty or full. Index via
+// pyround(clamp(v,0,1) * 8).
+const EQ_RAMP = [..." ▁▂▃▄▅▆▇█"];
+const EQ_MAX = 16; // column cap: more channels than this densify by averaging
 
 function rSpark(values, style = "block", boxRgb = TERM_RGB, vmax = null) {
   const empty = [0, 1, 2].map((i) => Math.floor((boxRgb[i] + TERM_RGB[i]) / 2));
@@ -156,6 +186,36 @@ function rSpark(values, style = "block", boxRgb = TERM_RGB, vmax = null) {
   return bg + f(SPARK) + body + bgsgrBox(boxRgb);
 }
 
+// Densify N channel values into exactly K = min(N, EQ_MAX) columns by averaging
+// each column's contiguous slice. K columns by construction, so the rendered width
+// always equals metricFixedWidth's min(N, EQ_MAX) -- the box-layout invariant.
+function eqColumns(values) {
+  const n = values.length;
+  const k = Math.min(n, EQ_MAX);
+  const cols = [];
+  for (let i = 0; i < k; i++) {
+    const lo = Math.floor((i * n) / k), hi = Math.floor(((i + 1) * n) / k);
+    let sum = 0;
+    for (let j = lo; j < hi; j++) sum += values[j];
+    cols.push(sum / (hi - lo));
+  }
+  return cols;
+}
+
+// One-row VU-meter: one block column per channel (densified past EQ_MAX), each
+// column coloured by its OWN value via threshold(). Absolute 0..1 scale (no
+// span-normalize), 9-level EQ_RAMP. Fixed-width: takes no `cells` budget.
+function rEqualizer(values, boxRgb) {
+  if (!values || values.length === 0) return f(SPARK);
+  const empty = [0, 1, 2].map((i) => Math.floor((boxRgb[i] + TERM_RGB[i]) / 2));
+  let body = sgrBg(empty);
+  for (const raw of eqColumns(values)) {
+    const v = Math.max(0, Math.min(1, raw));
+    body += f(threshold(v * 100)) + EQ_RAMP[pyround(v * 8)];
+  }
+  return body + bgsgrBox(boxRgb);
+}
+
 export function renderValue(entry, cells, boxRgb) {
   const icon = entry.icon || "";
   const label = icon ? icon + " " : "";
@@ -176,6 +236,7 @@ export function renderValue(entry, cells, boxRgb) {
   }
   if (render === "ammo") return label + rAmmo(val, color || "threshold");
   if (render === "spark") return label + rSpark(val, entry.spark_style || "block", boxRgb, entry.spark_max);
+  if (render === "equalizer") return label + rEqualizer(val, boxRgb);
   if (render === "list") {
     const items = VALUES[entry.id] || [];
     return label + f(TEXT) + items.map((x) => (Array.isArray(x) ? `${x[0]} ${x[1]}` : String(x))).join("  ");
@@ -213,7 +274,11 @@ 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);
+  // plain text and OSC8 hyperlinks are column-sliceable (marquee/clip operate on the
+  // visible text), so cap them to textCap. Other escapes (raw SGR we can't safely slice)
+  // keep their full width as a hard floor.
+  const sliceable = !ESC_RE.test(str) || OSC8_RE.test(str);
+  return sliceable ? Math.min(w, textCap) : w;
 }
 
 export function metricFixedWidth(entry, textCap = TEXTCAP_MAX) {
@@ -227,6 +292,7 @@ export function metricFixedWidth(entry, textCap = TEXTCAP_MAX) {
     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 === "equalizer") return lw + Math.min((VALUES[entry.id] || []).length, EQ_MAX);
   if (r === "ammo") return lw + 5 + vlen(" " + (entry.id in VALUES ? VALUES[entry.id] : 0) + "%");
   if (r === "list") {
     const items = VALUES[entry.id] || [];
@@ -304,11 +370,18 @@ function sliceCols(text, off, width) {
 
 // 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) {
+export function marquee(text, width, tick = 0, mode = "scroll") {
   text = String(text);
   if (width <= 0) return "";
+  const link = splitLink(text);                              // hyperlink: fit the visible text, re-wrap
+  if (link) return wrapLink(marquee(link.inner, width, tick, mode), link.url);
   const tw = vlen(text);
   if (tw <= width) return text + " ".repeat(width - tw);
+  if (mode === "clip") {                                     // static truncation with an ellipsis
+    if (width === 1) return "…";
+    const h = headCols(text, width - 1);
+    return h + "…" + " ".repeat(Math.max(0, width - vlen(h) - 1));
+  }
   return sliceCols(text, marqueeOffset(tw - width, tick), width);
 }
 
@@ -428,8 +501,10 @@ export function resolvePreset(chosenCfg, target, loadByName, spriteFor) {
   return last;                             // nothing fit -> smallest reached
 }
 
-export function buildBar(cfg, target, spriteFor, tick = 0) {
+export function buildBar(cfg, target, spriteFor, tick = 0, overflow) {
   if (!spriteFor) spriteFor = (hp) => `STFST${hp}1`;
+  // How overflowing text fits its box: "scroll" (ping-pong marquee) or "clip" (static …).
+  const ovf = overflow || cfg.text_overflow || "scroll";
 
   const { style, headers, segs, totalRows, hp, face, faceW } = layoutContext(cfg, spriteFor);
   const bar = cfg.bar || {};
@@ -464,10 +539,10 @@ export function buildBar(cfg, target, spriteFor, tick = 0) {
           if (Array.isArray(item) && item.length === 2) {
             const right = f(TEXT) + String(item[1]);
             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);
+            const left = lbl + f(TEXT) + marquee(String(item[0]), budget, tick, ovf);
             body = left + " ".repeat(Math.max(0, w - vlen(left) - vlen(String(item[1])))) + right;
           } else {
-            body = lbl + f(TEXT) + marquee(String(item), Math.max(0, w - vlen(lbl)), tick);
+            body = lbl + f(TEXT) + marquee(String(item), Math.max(0, w - vlen(lbl)), tick, ovf);
           }
           col.push(bgsgrBox(boxRgb) + " " + body + " " + RESET);
         }
@@ -492,7 +567,7 @@ export function buildBar(cfg, target, spriteFor, tick = 0) {
             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
-            const left = lbl + f(TEXT) + marquee(String(item[0]), labelMax, tick);
+            const left = lbl + f(TEXT) + marquee(String(item[0]), labelMax, tick, ovf);
             const room = Math.max(0, w - vlen(left) - rightW);
             body = left + " ".repeat(room) + right;
           } else {                                         // {mark, markRgb, text} (tasks)
@@ -501,7 +576,7 @@ export function buildBar(cfg, target, spriteFor, tick = 0) {
             const mPad = m + (vlen(m) < 2 ? " " : "");      // normalize mark to 2 cols so text aligns
             const head = markCol + mPad + " " + f(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 = head + marquee(String(item.text), max, tick, ovf);
             body += " ".repeat(Math.max(0, w - tailW - vlen(body)));
             if (tail) body += f(TEXT) + tail;
           }
@@ -520,11 +595,12 @@ export function buildBar(cfg, target, spriteFor, tick = 0) {
         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) {
+        const sliceable = !ESC_RE.test(raw) || OSC8_RE.test(raw); // plain or hyperlink
+        if (sliceable && 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 = lbl + f(col) + marquee(raw, budget, tick, ovf);
         }
       }
       body += " ".repeat(Math.max(0, w - vlen(body) - vlen(rhs))) + rhs;

package/src/statusline.js

@@ -145,15 +145,17 @@ export function buildValues(data, git) {
   if (repo.host && repo.owner && repo.name) repoUrl = `https://${repo.host}/${repo.owner}/${repo.name}`;
 
   const sname = data.session_name || data.session_id; // session_name only set via /rename or --name
-  if (sname) v["session.name"] = clip(sname, 24);
+  // Clip generously, not to box width: the renderer fits each field to its box (marquee or
+  // clip per text_overflow). A tight clip here would truncate before the renderer ever sees it.
+  if (sname) v["session.name"] = clip(sname, 60);
 
   const cwd = data.cwd || (data.workspace || {}).current_dir;
   if (cwd) {
-    const name = clip(path.basename(cwd.replace(/[/\\]+$/, "")) || cwd, 24);
+    const name = clip(path.basename(cwd.replace(/[/\\]+$/, "")) || cwd, 60);
     try { v["loc.cwd"] = _link(name, pathToFileURL(cwd).href); } catch { v["loc.cwd"] = name; }
     // git fields come from the folded snapshot the async hook wrote, not a live spawn.
     const { br = null, lr = null, st = null } = git || {};
-    if (br) { const brLbl = clip(br, 24); v["git.branch"] = repoUrl ? _link(brLbl, `${repoUrl}/tree/${br}`) : brLbl; }
+    if (br) { const brLbl = clip(br, 60); v["git.branch"] = repoUrl ? _link(brLbl, `${repoUrl}/tree/${br}`) : brLbl; }
     if (lr && lr.includes("\t")) {
       const [behind, ahead] = lr.split("\t");
       v["git.behind"] = `↓${behind}`; v["git.ahead"] = `↑${ahead}`;
@@ -237,26 +239,50 @@ function ramPercent() {
   try { return pyround((1 - os.freemem() / os.totalmem()) * 100); } catch { return null; }
 }
 
-function cpuPercent() {
-  let total = 0, idle = 0;
+// Per-core idle fraction over a cumulative-time delta; null when no time elapsed.
+const cpuUtil = (dt, di) => (dt > 0 ? Math.max(0, Math.min(1, 1 - di / dt)) : null);
+
+// Pure: turn two cumulative CPU snapshots into the aggregate percent (sys.cpu, 0..100)
+// and the per-core utilisation array (sys.cores, 0..1 each). Cold start (no prev) or a
+// core-count mismatch (e.g. an old cache without `cores`) yields null for that field, so
+// the metric simply doesn't render that refresh. A core with no elapsed time reads 0.
+export function cpuDeltas(prev, cur) {
+  if (!prev) return { cpu: null, cores: null };
+  const cpu = cpuUtil(cur.total - prev.total, cur.idle - prev.idle);
+  let cores = null;
+  if (Array.isArray(prev.cores) && Array.isArray(cur.cores) && prev.cores.length === cur.cores.length) {
+    cores = cur.cores.map((c, i) => {
+      const u = cpuUtil(c.total - prev.cores[i].total, c.idle - prev.cores[i].idle);
+      return u === null ? 0 : u;
+    });
+  }
+  return { cpu: cpu === null ? null : pyround(cpu * 100), cores };
+}
+
+function cpuMetrics() {
+  let cores;
   try {
-    for (const c of os.cpus()) { for (const k in c.times) total += c.times[k]; idle += c.times.idle; }
-  } catch { return null; }
+    cores = os.cpus().map((c) => {
+      let total = 0; for (const k in c.times) total += c.times[k];
+      return { total, idle: c.times.idle };
+    });
+  } catch { return { cpu: null, cores: null }; }
+  const agg = cores.reduce((a, c) => ({ total: a.total + c.total, idle: a.idle + c.idle }), { total: 0, idle: 0 });
+  const cur = { total: agg.total, idle: agg.idle, cores };
   const cache = path.join(TMP, "mugshot_cpu.json");
   let prev = null;
   try { prev = JSON.parse(readFileSync(cache, "utf8")); } catch { /* none */ }
-  try { writeFileSync(cache, JSON.stringify({ total, idle })); } catch { /* ignore */ }
-  if (!prev) return null;
-  const dt = total - prev.total, di = idle - prev.idle;
-  return dt > 0 ? pyround(Math.max(0, Math.min(100, 100 * (1 - di / dt)))) : null;
+  try { writeFileSync(cache, JSON.stringify(cur)); } catch { /* ignore */ }
+  return cpuDeltas(prev, cur);
 }
 
 function sysValues(cwd) {
   const v = {};
   const ram = ramPercent();
   if (ram !== null) v["sys.ram"] = ram;
-  const cpu = cpuPercent();
+  const { cpu, cores } = cpuMetrics();
   if (cpu !== null) v["sys.cpu"] = `${cpu}%`;
+  if (cores) v["sys.cores"] = cores;
   try {
     const stat = statfsSync(cwd || process.cwd());
     v["sys.disk"] = pyround(((stat.blocks - stat.bfree) / stat.blocks) * 100);
@@ -471,7 +497,9 @@ function main() {
     catch { return null; }
   };
   const selected = resolvePreset(cfg, target, loadByName, spriteFor);
-  const res = buildBar(selected, target, spriteFor, tick);
+  // Text overflow behavior: env wins, then the preset's text_overflow, default "scroll".
+  const overflow = process.env.DOOMBAR_TEXT_OVERFLOW || selected.text_overflow || cfg.text_overflow || "scroll";
+  const res = buildBar(selected, target, spriteFor, tick, overflow);
   process.stdout.write(res.lines.join("\n") + "\n");
 }