claude-doom-statusbar 0.1.1 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-doom-statusbar",
-  "version": "0.1.1",
+  "version": "0.3.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": {

package/presets/full.toml

@@ -34,12 +34,12 @@ metric = [
 type  = "box"
 title = "PROJECT"
 metric = [
-  { id = "loc.cwd",    render = "text",   icon = "📁" },
-  { id = "git.branch", render = "text",   icon = "🌿" },
-  { group = ["git.behind", "git.ahead"], render = "number", sep = " ", icon = "⇅ " },
-  { id = "git.status", render = "number", icon = "✎ " },
-  { id = "loc.churn",  render = "text",   icon = "📝" },
-  { id = "pr.state",   render = "text",   icon = "⇧ " },
+  { 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]]

package/src/render.js

@@ -33,13 +33,14 @@ export const SAMPLE = {
   "usage.reset5h": "2h13m", "usage.reset7d": "3d4h", "sys.session": "5h55m", "loc.churn": "+185 / -62",
   "context.hp": 78, "ratelimit.5h": 64, "ratelimit.7d": 31, "cost.total": "$1.83",
   "git.branch": "main", "git.behind": "↓2", "git.ahead": "↑3", "git.status": "3",
-  "pr.state": "#1234",
+  "git.work": "✎ 3  ⇅ ↓2 ↑3", "session.name": "doom-hud-demo",
+  "pr.state": "#1234", "loc.cwd": "claude-doom-statusbar",
   "act.subagents": [["hook events", "2m13s"], ["find configs", "12s"]], "act.agents": "2",
   "act.tasklist": [
-    { mark:"✓", markRgb: OK, text:"scaffold project" },
-    { mark:"✓", markRgb: OK, text:"render engine" },
-    { mark:"✗", markRgb: CRIT, text:"port PIL alpha" },
-    { mark:"▶", markRgb: null, text:"statusline values" },
+    { mark:"✅", markRgb: OK, text:"scaffold project" },
+    { mark:"✅", markRgb: OK, text:"render engine" },
+    { mark:"❌", markRgb: CRIT, text:"port PIL alpha" },
+    { mark:"⏩", markRgb: null, text:"statusline values" },
     { mark:"🎯", markRgb: null, text:"hook bus" },
     { mark:"🎯", markRgb: null, text:"installer" },
   ],
@@ -58,7 +59,8 @@ export function vlen(s) {
   let n = 0;
   for (const ch of String(s).replace(ANSI_RE, "")) {
     const cp = ch.codePointAt(0);
-    n += (cp >= 0x1f300 && cp <= 0x1faff) || (cp >= 0x23e9 && cp <= 0x23ec) ? 2 : 1;
+    n += (cp >= 0x1f300 && cp <= 0x1faff) || (cp >= 0x23e9 && cp <= 0x23ec)
+      || cp === 0x2705 || cp === 0x274c ? 2 : 1; // ✅ ❌ are emoji-presentation (2 cols)
   }
   return n;
 }
@@ -368,30 +370,35 @@ export function buildBar(cfg, target, spriteFor) {
         const items = VALUES[m.id] || [];
         const H = totalRows - (headers ? 1 : 0);
         const boundary = items.filter((it) => !Array.isArray(it) &&
-          (it.mark === "✓" || it.mark === "✗")).length; // settled count (ignored for top anchor)
+          (it.mark === "✅" || it.mark === "❌")).length; // settled count (ignored for top anchor)
         const win = scrollWindow(items.length, H, m.anchor || "top", boundary);
         const shown = items.slice(win.start, win.start + H);
         shown.forEach((item, k) => {
           const first = k === 0, last = k === shown.length - 1;
-          const over = first && win.up > 0 ? `↑${win.up} ` : last && win.down > 0 ? `↓${win.down} ` : "";
+          const marker = first && win.up > 0 ? `↑${win.up}` : last && win.down > 0 ? `↓${win.down}` : "";
+          const tail = marker ? " " + marker : "";         // right-aligned scroll marker (gap + ↑k/↓k)
+          const tailW = vlen(tail);
           let body;
           if (Array.isArray(item)) {                       // [left, right] (agents)
-            const right = f(TEXT) + String(item[1]);
-            const prefix = over + lbl;                     // ↑k/↓k marker + icon
-            const labelMax = Math.max(0, w - vlen(prefix) - vlen(String(item[1])) - 1); // 1 = min gap
+            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 = prefix + f(TEXT) + label;
-            const room = Math.max(0, w - vlen(left) - vlen(right));
+            const left = lbl + f(TEXT) + label;
+            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 = over + markCol + String(item.mark) + " " + f(TEXT);
-            const max = w - vlen(over) - vlen(String(item.mark)) - 1;
+            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;
-            body += " ".repeat(Math.max(0, w - vlen(body)));
+            body += " ".repeat(Math.max(0, w - tailW - vlen(body)));
+            if (tail) body += f(TEXT) + tail;
           }
           col.push(bgsgrBox(boxRgb) + " " + body + " " + RESET);
         });

package/src/statusline.js

@@ -41,6 +41,10 @@ function git(cwd, ...args) {
   }
 }
 
+// Clip a display label to at most `n` code points, ending with … when truncated,
+// so an oversized repo or branch name can't blow up the PROJECT box width.
+const clip = (s, n) => ([...String(s)].length > n ? [...String(s)].slice(0, n - 1).join("") + "…" : String(s));
+
 function _dur(secsF) {
   let secs = Math.max(0, Math.trunc(secsF));
   const d = Math.floor(secs / 86400); secs %= 86400;
@@ -141,12 +145,15 @@ export function buildValues(data) {
   let repoUrl = "";
   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);
+
   const cwd = data.cwd || (data.workspace || {}).current_dir;
   if (cwd) {
-    const name = path.basename(cwd.replace(/[/\\]+$/, "")) || cwd;
+    const name = clip(path.basename(cwd.replace(/[/\\]+$/, "")) || cwd, 24);
     try { v["loc.cwd"] = _link(name, pathToFileURL(cwd).href); } catch { v["loc.cwd"] = name; }
     const br = git(cwd, "branch", "--show-current");
-    if (br) v["git.branch"] = repoUrl ? _link(br, `${repoUrl}/tree/${br}`) : br;
+    if (br) { const brLbl = clip(br, 24); v["git.branch"] = repoUrl ? _link(brLbl, `${repoUrl}/tree/${br}`) : brLbl; }
     const lr = git(cwd, "rev-list", "--count", "--left-right", "@{u}...HEAD");
     if (lr && lr.includes("\t")) {
       const [behind, ahead] = lr.split("\t");
@@ -154,6 +161,12 @@ export function buildValues(data) {
     }
     const st = git(cwd, "status", "--porcelain");
     if (st !== null) v["git.status"] = String(st.split("\n").filter((l) => l.trim()).length);
+    // Merge changed-file count + pull/push onto one line (icons baked in, like model.mode):
+    // "✎ <files>  ⇅ ↓<behind> ↑<ahead>" — files first, then pull/push.
+    const work = [];
+    if (v["git.status"] !== undefined) work.push(`✎ ${v["git.status"]}`);
+    if (v["git.behind"] !== undefined) work.push(`⇅ ${v["git.behind"]} ${v["git.ahead"]}`);
+    if (work.length) v["git.work"] = work.join("  ");
   }
 
   const pr = data.pr || {};
@@ -218,8 +231,8 @@ function sysValues(cwd) {
 const PERM = { plan: "📋 plan", auto: "⏩ auto", acceptEdits: "⏩ auto", bypassPermissions: "⏩ bypass" };
 const OK_RGB = [96, 200, 104];   // matches render.js OK (done, green)
 const CRIT_RGB = [224, 84, 64];  // matches render.js CRIT (deleted, red)
-const TASK_MARK = { completed: ["✓", OK_RGB], deleted: ["✗", CRIT_RGB], in_progress: ["▶", null], pending: ["🎯", null] };
-const TASK_ORDER = { completed: 0, deleted: 1, in_progress: 2, pending: 3 }; // settled first, then open
+const TASK_MARK = { completed: ["✅", OK_RGB], deleted: ["❌", CRIT_RGB], in_progress: ["⏩", null], pending: ["🎯", null] };
+const TASK_ORDER = { completed: 0, deleted: 0, in_progress: 1, pending: 2 }; // settled (done+deleted, by time) first, then open
 
 export function activityValues(st, now) {
   const v = {};