huddle-cli 0.1.1 → 0.1.3

package/dist/ui/dashboard.js

@@ -11,7 +11,7 @@
 // It only reads: the Room's board and memory, the run's live stats, and the
 // activity feed. Pressing q hands the terminal back to the prompt. Every row
 // is cut to the screen's width — a row that wraps scrolls the whole frame.
-import { C, dot, pad, truncate, width, AGENT_COLOR } from "./term.js";
+import { BARS, C, bar, dot, pad, truncate, width, AGENT_COLOR } from "./term.js";
 import { fmtDuration, fmtTokens } from "../adapters/usage.js";
 import { taskViews } from "../room/progress.js";
 import { getContract } from "../room/contract.js";
@@ -53,6 +53,76 @@ export function runPhase(db, busy) {
         return "DONE";
     return phase;
 }
+/** QA's own "QA round 2: check the build" rows: checks, not work to merge. */
+export const isQaCheck = (t) => /^QA round \d+:/.test(t.title) && /"qa"/.test(t.prefers ?? "");
+/** Merged / failed / all of the board's work tasks. */
+export function taskCounts(tasks) {
+    const work = tasks.filter((t) => !isQaCheck(t));
+    return { done: work.filter((t) => t.status === "merged").length, total: work.length, failed: work.filter((t) => t.status === "failed").length };
+}
+const COUNCIL_STEP = { "council.proposal": 1, "council.critique": 2, "council.adopt": 2, "council.flaw": 2, "council.ratify": 4 };
+/** The run's progress from the Room alone (huddle view, the ctrl-t view). */
+export function runProgress(db, busy) {
+    const phase = runPhase(db, busy);
+    if (!db || phase === "WAITING")
+        return { phase, done: 0, total: 0, failed: 0 };
+    try {
+        const since = (db.currentSession()?.created_at ?? 1) - 1;
+        const p = { phase, ...taskCounts(db.listTasks()) };
+        if (phase === "COUNCIL")
+            p.step = COUNCIL_STEP[db.eventsOfType(Object.keys(COUNCIL_STEP), since, 1).at(-1)?.type ?? ""] ?? 1;
+        const rounds = db.eventsOfType(["qa.round"], since, 50).length;
+        if (rounds)
+            p.round = rounds;
+        return p;
+    }
+    catch {
+        return { phase, done: 0, total: 0, failed: 0 }; // a closed db
+    }
+}
+/**
+ * The overall run bar, one line of at most `W` cells:
+ *   BUILD ███████░░░░░ 6/9 tasks · 12m03s
+ *   COUNCIL ██████░░░░ step 3/4 · 2m10s
+ *   QA ████████████░ round 2 · 9/10 tasks · 1 failed · 31m
+ *   ✓ DONE █████████████ 10/10 tasks · 41m
+ * The bar gives way first, then the word "tasks"; with bars off (NO_COLOR,
+ * piped) it's the words alone: "BUILD 6/9 tasks · 12m03s". "" while waiting.
+ */
+export function progressLine(p, ms, W, o = {}) {
+    if (p.phase === "WAITING")
+        return "";
+    const done = p.phase === "DONE";
+    const head = done ? (p.failed ? C.yellow("◎ DONE") : C.green("✓ DONE")) : C.bold(C.violet(p.phase));
+    const frac = p.phase === "COUNCIL" ? (p.step ?? 1) / 4 : p.total ? p.done / p.total : done ? 1 : null;
+    const tasks = (word) => (p.total ? `${p.done}/${p.total}${word ? " tasks" : ""}` : p.phase === "PLAN" ? "planning" : "");
+    const label = (word) => p.phase === "COUNCIL" ? `step ${p.step ?? 1}/4` : [p.phase === "QA" && p.round ? `round ${p.round}` : "", tasks(word)].filter(Boolean).join(" · ");
+    const text = (word) => [label(word), p.failed ? C.red(`${p.failed} failed`) : "", ms === null ? "" : C.faint(fmtDuration(ms))].filter(Boolean).join(C.faint(" · "));
+    const tone = done ? (p.failed ? "failed" : "done") : "run";
+    for (const word of [true, false]) {
+        const w = Math.min(o.barMax ?? 24, W - width(head) - width(text(word)) - 2);
+        if (w >= 4 && (o.on ?? BARS.on))
+            return `${head} ${bar(frac, w, { tone, on: o.on })} ${text(word)}`;
+    }
+    return truncate(`${head} ${text(W >= 40)}`, W);
+}
+/**
+ * A task's mini bar and its number, the same everywhere: "████░░░░  60%";
+ * never reported "········   —"; merged a full green bar and ✓; failed red.
+ * With bars off it's the number alone ("60%", "—", "✓").
+ */
+export function taskMeter(pct, w, status) {
+    const tone = status === "merged" ? "done" : status === "failed" ? "failed" : "run";
+    const num = status === "merged" ? C.green("   ✓") : pct === null ? C.faint("   —") : (status === "failed" ? C.red : C.violet)(`${String(Math.round(pct)).padStart(3)}%`);
+    const b = bar(pct === null ? null : pct / 100, w, { tone });
+    return b ? `${b} ${num}` : num;
+}
+/** "est 5m" for a task with an estimate, yellow "over est 5m" once it runs past it; "" with none. */
+export function estHint(estS, ranMs) {
+    if (!estS || estS <= 0)
+        return "";
+    return ranMs > estS * 1000 ? C.yellow(`over est ${fmtDuration(estS * 1000)}`) : C.faint(`est ${fmtDuration(estS * 1000)}`);
+}
 const hexColor = (id) => C.hex(AGENT_COLOR[id.split("/").pop().split("#")[0]] ?? "#8A857C");
 /** The shared screen's 📎/📌 rows in the view's glyphs (emoji are two cells wide and vary by font). */
 const screenGlyphs = (l) => l.replace(/^📎/u, C.violet("+")).replace(/^📌/u, C.violet("◆"));
@@ -133,7 +203,6 @@ export class Dashboard {
         const db = this.src.db();
         const stats = this.src.stats();
         const busy = !!stats && [...stats.agents.values()].some((a) => a.busySince);
-        const phase = runPhase(db, busy);
         let goal = "";
         try {
             goal = db?.currentSession()?.goal ?? "";
@@ -144,19 +213,20 @@ export class Dashboard {
         const tabs = ["agents", "plan", "board"]
             .map((t, i) => (t === tab ? C.bold(C.violet(`[${i + 1} ${t}]`)) : C.faint(` ${i + 1} ${t} `)))
             .join(" ");
-        const clock = stats ? `${C.faint("⏱")} ${fmtDuration((stats.endedAt ?? now) - stats.startedAt)}` : "";
-        const state = phase === "DONE"
-            ? C.green("✓ done")
-            : phase === "WAITING"
-                ? C.faint("○ waiting for a run")
-                : `${C.bold(C.violet(phase))} ${C.faint("·")} ${busy ? C.green("● live") : C.faint("○ between steps")}`;
-        const right = [state, clock].filter(Boolean).join(C.faint(" · "));
-        const bar = ` ${C.violet("⬢")} ${C.bold("huddle")}  ${tabs}`;
+        // The overall bar: the run's own live numbers when it's this process's run, else the Room's.
+        const prog = stats?.run ?? runProgress(db, busy);
+        const ms = stats ? (stats.endedAt ?? now) - stats.startedAt : null;
+        // On a narrow screen the live chip is just its dot: the bar needs the room.
+        const chip = prog.phase === "DONE" || prog.phase === "WAITING" ? "" : busy ? C.green(W >= 100 ? "● live" : "●") : C.faint(W >= 100 ? "○ between steps" : "○");
+        const head = ` ${C.violet("⬢")} ${C.bold("huddle")}  ${tabs}`;
+        const right = prog.phase === "WAITING"
+            ? C.faint("○ waiting for a run")
+            : [progressLine(prog, ms, Math.max(12, W - width(head) - width(chip) - 5), { barMax: W >= 110 ? 12 : 10 }), chip].filter(Boolean).join(C.faint(" · "));
         // The goal takes whatever room is left between the tabs and the status.
-        const room = W - width(bar) - width(right) - 4;
+        const room = W - width(head) - width(right) - 4;
         const goalS = goal && room >= 12 ? C.faint(truncate(goal.replace(/\s+/g, " "), room)) : "";
-        const gap = Math.max(1, W - width(bar) - width(goalS) - width(right) - 3);
-        const top = goalS ? `${bar}  ${goalS}${" ".repeat(gap)}${right}` : `${bar}${" ".repeat(Math.max(1, W - width(bar) - width(right) - 1))}${right}`;
+        const gap = Math.max(1, W - width(head) - width(goalS) - width(right) - 3);
+        const top = goalS ? `${head}  ${goalS}${" ".repeat(gap)}${right}` : `${head}${" ".repeat(Math.max(1, W - width(head) - width(right) - 1))}${right}`;
         const bodyH = H - 4;
         const body = tab === "agents" ? this.agents(W, bodyH, stats, db, now) : tab === "plan" ? this.plan(W, bodyH, db) : this.board(W, bodyH, db);
         const lastRoom = [...this.feed].reverse().find((a) => !a.agent);
@@ -174,8 +244,10 @@ export class Dashboard {
         if (!ids.length)
             return ["", C.faint(`  ${this.src.empty ?? "no agents working — give Huddle a goal"}`)];
         let views = [];
+        let ests = new Map();
         try {
             views = db ? taskViews(db, now) : [];
+            ests = new Map((db?.listTasks() ?? []).map((t) => [t.id, t.est_seconds]));
         }
         catch {
             /* a closed db: no pinned task line */
@@ -186,13 +258,13 @@ export class Dashboard {
         const paneH = Math.max(4, Math.floor(H / rows));
         const out = [];
         for (let r = 0; r < rows; r++) {
-            const panes = ids.slice(r * cols, r * cols + cols).map((id) => this.pane(id, paneW, paneH, stats?.agents.get(id), views, now));
+            const panes = ids.slice(r * cols, r * cols + cols).map((id) => this.pane(id, paneW, paneH, stats?.agents.get(id), views, now, ests));
             for (let i = 0; i < paneH; i++)
                 out.push(panes.map((p) => p[i] ?? " ".repeat(paneW)).join(""));
         }
         return out;
     }
-    pane(id, w, h, a, views, now) {
+    pane(id, w, h, a, views, now, ests) {
         const color = hexColor(id);
         const status = a?.busySince
             ? `${C.violet("working")} ${fmtDuration(now - a.busySince)}${a.liveTokens > 0 ? " · " + fmtTokens(a.liveTokens) + " tok" : ""}`
@@ -206,9 +278,10 @@ export class Dashboard {
         const on = a?.busySince ? views.find((v) => v.owner === id && (v.status === "claimed" || v.status === "in_progress")) : undefined;
         const pinned = [];
         if (on) {
-            const pct = on.reported ? C.violet(`${on.progress_pct}%`) : C.faint("no report yet");
-            const said = on.last_note ? C.faint(` · note ${fmtDuration(on.last_update_s * 1000)} ago`) : "";
-            const tail = `  ${pct}${said}`;
+            const meter = taskMeter(on.reported ? on.progress_pct : null, inner >= 70 ? 10 : 6);
+            const said = on.reported ? (on.last_note ? C.faint(` · note ${fmtDuration(on.last_update_s * 1000)} ago`) : "") : C.faint(" · no report yet");
+            const est = estHint(ests.get(on.id), (on.age_s ?? 0) * 1000);
+            const tail = `  ${meter}${said}${est ? C.faint(" · ") + est : ""}`;
             pinned.push(`${C.violet("▸")} ${C.bold(truncate(on.title, Math.max(8, inner - 4 - width(tail))))}${tail}`);
         }
         const room = h - 2 - pinned.length;
@@ -269,12 +342,10 @@ export class Dashboard {
         }
         const bw = W >= 100 ? 14 : 8;
         for (const t of views) {
-            const filled = Math.round((t.progress_pct / 100) * bw);
-            const barS = t.status === "merged" ? C.green("█".repeat(bw)) : C.violet("█".repeat(filled)) + C.faint("░".repeat(bw - filled));
             // Never reported (no huddle_progress yet): say so instead of showing a made-up 0%.
             const silent = ["claimed", "in_progress"].includes(t.status) && !t.reported;
             const who = t.owner ? ` ${dot(t.owner)} ${C.faint(t.owner)}` : "";
-            left.push(` ${mark(t.status, !!t.owner)} ${barS} ${silent ? C.faint("  — ") : String(t.progress_pct).padStart(3) + "%"}  ${t.title}${who}`);
+            left.push(` ${mark(t.status, !!t.owner)} ${taskMeter(silent ? null : t.progress_pct, bw, t.status)}  ${t.title}${who}`);
         }
         if (!views.length)
             left.push(C.faint("  no tasks yet"));