huddle-cli 0.1.0 → 0.1.3

package/dist/ui/dashboard.js

@@ -1,18 +1,131 @@
 // The live view — the full-screen dashboard from the launch film.
 //
-//   ⬢ huddle   1 agents  2 plan  3 board        room: <goal>  ● live  ⏱ 1m12s
-//   ┌ ● claude  anthropic ─ working 40s · 31k ┐┌ ● codex  openai ─ idle ───────┐
-//   │ ▸ Add greet(name) with tests            ││ ✓ merged Add farewell…         │
-//   │   plans: CommonJS greet.js …            ││                                │
-//   └─────────────────────────────────────────┘└────────────────────────────────┘
-//   ◆ harsh/codex → room  what shape is the Order type?
+//   ⬢ huddle  1 agents  2 plan  3 board       BUILD · ● live · ⏱ 1m12s
+//   ╭─ ● claude  working 40s · 31k tok ──────╮╭─ ● codex  idle · 1 merged ───╮
+//   │ ▸ Add greet(name) with tests   60%     ││ ✓ merged Add farewell…        │
+//   │   plans: CommonJS greet.js …           ││                               │
+//   ╰────────────────────────────────────────╯╰───────────────────────────────╯
+//   ◆ codex → claude: what shape is the Order type?
 //   1 2 3 switch · q back to the prompt · ctrl-c stop agents
 //
 // 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.
-import { C, dot, pad, truncate, width, AGENT_COLOR } from "./term.js";
+// 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 { 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";
+import { screenPanel } from "../room/context.js";
+const PHASE_OF = {
+    "council.proposal": "COUNCIL",
+    "council.critique": "COUNCIL",
+    "council.adopt": "COUNCIL",
+    "council.flaw": "COUNCIL",
+    "council.ratify": "COUNCIL",
+    "council.plan": "PLAN",
+    "plan.made": "PLAN",
+    "contract.set": "PLAN",
+    "run.start": "BUILD",
+    "qa.round": "QA",
+};
+/**
+ * The run's phase: the latest phase-marking event since the session began,
+ * and DONE once every task on the board is merged or failed and no agent is busy.
+ */
+export function runPhase(db, busy) {
+    if (!db)
+        return "WAITING";
+    let tasks = [];
+    let since = 0;
+    try {
+        tasks = db.listTasks();
+        since = (db.currentSession()?.created_at ?? 1) - 1;
+    }
+    catch {
+        return "WAITING"; // a closed db
+    }
+    const last = db.eventsOfType(Object.keys(PHASE_OF), since, 1).at(-1);
+    let phase = last ? PHASE_OF[last.type] : "WAITING";
+    // A QA round's fix tasks are BUILD work, but the run is still in QA.
+    if (phase !== "QA" && phase !== "WAITING" && db.eventsOfType(["qa.round"], since, 1).length)
+        phase = "QA";
+    if (!busy && tasks.length && tasks.every((t) => t.status === "merged" || t.status === "failed"))
+        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("◆"));
 export class Dashboard {
     src;
     tab = "agents";
@@ -82,105 +195,206 @@ export class Dashboard {
     render() {
         if (!this.open)
             return;
-        const W = process.stdout.columns || 100;
-        const H = process.stdout.rows || 30;
+        const lines = this.frame(process.stdout.columns || 100, process.stdout.rows || 30);
+        process.stdout.write("\x1b[H" + lines.map((l) => "\x1b[2K" + l).join("\n"));
+    }
+    /** One full screen, `H` rows each at most `W` cells (also how tests and samples render it). */
+    frame(W, H, tab = this.tab, now = Date.now()) {
         const db = this.src.db();
         const stats = this.src.stats();
-        const goal = db?.currentSession()?.goal ?? "no goal yet — press q and type one";
+        const busy = !!stats && [...stats.agents.values()].some((a) => a.busySince);
+        let goal = "";
+        try {
+            goal = db?.currentSession()?.goal ?? "";
+        }
+        catch {
+            /* a closed db */
+        }
         const tabs = ["agents", "plan", "board"]
-            .map((t, i) => (t === this.tab ? C.bold(C.violet(` ${i + 1} ${t} `)) : C.faint(` ${i + 1} ${t} `)))
+            .map((t, i) => (t === tab ? C.bold(C.violet(`[${i + 1} ${t}]`)) : C.faint(` ${i + 1} ${t} `)))
             .join(" ");
-        const right = `${C.faint("room:")} ${truncate(goal, Math.max(10, W - 70))}  ` +
-            (stats ? `${C.green("● live")}  ${C.faint("⏱")} ${fmtDuration(Date.now() - stats.startedAt)}` : C.faint("○ idle"));
-        const bar = ` ${C.violet("⬢")} ${C.bold("huddle")}  ${tabs}`;
-        const top = bar + " ".repeat(Math.max(1, W - width(bar) - width(right) - 1)) + right;
+        // 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(head) - width(right) - 4;
+        const goalS = goal && room >= 12 ? C.faint(truncate(goal.replace(/\s+/g, " "), room)) : "";
+        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 = this.tab === "agents" ? this.agents(W, bodyH, stats) : this.tab === "plan" ? this.plan(W, bodyH, db) : this.board(W, bodyH, db);
+        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);
-        const strip = lastRoom ? ` ${truncate(lastRoom.text, W - 2)}` : C.faint(" the room is quiet");
-        const hint = C.faint(` ${this.src.hint ?? "1 2 3 switch · q back to the prompt · ctrl-c stop agents"}   ${this.src.modeChip()}`);
-        const lines = [truncate(top, W), C.faint("─".repeat(W)), ...body.slice(0, bodyH), strip, hint];
-        while (lines.length < H)
-            lines.splice(lines.length - 2, 0, "");
-        process.stdout.write("\x1b[H" + lines.slice(0, H).map((l) => "\x1b[2K" + truncate(l, W)).join("\n"));
+        const strip = lastRoom ? ` ${lastRoom.text}` : C.faint(" the room is quiet");
+        const hint = C.faint(` ${this.src.hint ?? "1 2 3 switch · q back to the prompt · ctrl-c stop agents"}   `) + this.src.modeChip();
+        const lines = [top, C.faint("─".repeat(W)), ...body.slice(0, bodyH)];
+        while (lines.length < H - 2)
+            lines.push("");
+        lines.push(strip, hint);
+        return lines.slice(0, H).map((l) => truncate(l.replace(/[\r\n]+/g, " "), W));
     }
     /** Tab 1: a pane per agent — what each one is doing right now. */
-    agents(W, H, stats) {
+    agents(W, H, stats, db, now) {
         const ids = stats ? [...stats.agents.keys()] : [...new Set(this.feed.filter((a) => a.agent).map((a) => a.agent))];
         if (!ids.length)
-            return [C.faint("  no agents working — give Huddle a goal")];
+            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 */
+        }
         const cols = W >= 110 && ids.length > 1 ? 2 : 1;
         const rows = Math.ceil(ids.length / cols);
         const paneW = Math.floor(W / cols);
         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)));
+            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) {
+    pane(id, w, h, a, views, now, ests) {
         const color = hexColor(id);
         const status = a?.busySince
-            ? `${C.violet("working")} ${fmtDuration(Date.now() - a.busySince)}${a.liveTokens > 0 ? " · " + fmtTokens(a.liveTokens) + " tok" : ""}`
-            : a && (a.tasks || a.reviews)
-                ? C.green(`done · ${a.tasks} task${a.tasks === 1 ? "" : "s"}${a.reviews ? ` + ${a.reviews} review` : ""}`)
+            ? `${C.violet("working")} ${fmtDuration(now - a.busySince)}${a.liveTokens > 0 ? " · " + fmtTokens(a.liveTokens) + " tok" : ""}`
+            : a && (a.tasks || a.reviews || a.qa)
+                ? C.green(`idle · ${a.tasks} merged${a.reviews ? ` · ${a.reviews} review${a.reviews === 1 ? "" : "s"}` : ""}${a.qa ? ` · ${a.qa} QA` : ""}`)
                 : C.faint("idle");
-        const title = ` ${dot(id)} ${C.bold(id)}  ${status} `;
         const inner = w - 2;
+        const title = truncate(` ${dot(id)} ${C.bold(id)}  ${status} `, inner - 1);
         const topLine = color("╭─") + title + color("─".repeat(Math.max(0, inner - 1 - width(title))) + "╮");
-        const lines = this.feed.filter((x) => x.agent === id).slice(-(h - 2));
+        // The task it's on stays pinned at the top: title, %, how long since it last said anything.
+        const on = a?.busySince ? views.find((v) => v.owner === id && (v.status === "claimed" || v.status === "in_progress")) : undefined;
+        const pinned = [];
+        if (on) {
+            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;
+        const lines = [...pinned, ...this.feed.filter((x) => x.agent === id).slice(-room).map((x) => x.text)];
         const body = Array.from({ length: h - 2 }, (_, i) => {
-            const l = lines[i] ? " " + truncate(lines[i].text, inner - 2) : "";
+            const l = lines[i] ? " " + truncate(lines[i], inner - 2) : "";
             return color("│") + pad(l, inner) + color("│");
         });
         return [topLine, ...body, color("╰" + "─".repeat(inner) + "╯")];
     }
-    /** Tab 2: the plan on the left, the room talking on the right. */
+    /** Tab 2: the plan, and the room talking (side by side when there's room, stacked when not). */
     plan(W, H, db) {
-        const leftW = Math.floor(W * 0.55);
         const left = [C.violet(" PLAN")];
-        const tasks = db?.listTasks() ?? [];
+        let tasks = [];
+        try {
+            tasks = db?.listTasks() ?? [];
+        }
+        catch {
+            /* a closed db */
+        }
         const idx = new Map(tasks.map((t, i) => [t.id, i + 1]));
         tasks.forEach((t, i) => {
             const deps = JSON.parse(t.depends_on || "[]");
             const after = deps.length ? C.faint(` after ${deps.map((d) => idx.get(d)).join(",")}`) : "";
             const who = t.claimed_by ? ` ${dot(t.claimed_by)} ${C.faint(t.claimed_by)}` : "";
-            left.push(` ${C.faint(String(i + 1) + ".")} ${t.title}${after}${who}`);
-            left.push(C.faint(`    ${t.status}`));
+            left.push(` ${mark(t.status, !!t.claimed_by)} ${C.faint(String(i + 1).padStart(2) + ".")} ${t.title}${after}${who}`);
         });
         if (!tasks.length)
             left.push(C.faint("  no plan yet"));
+        let contract = null;
+        try {
+            contract = db ? getContract(db) : null;
+        }
+        catch {
+            /* a closed db: no contract line */
+        }
+        if (contract && (contract.text || contract.amendments.length)) {
+            left.push("", `${C.violet(" CONTRACT")} ${C.faint(`v${contract.version} · ${contract.amendments.length} amendment(s)`)}`);
+            for (const a of contract.amendments.slice(-3))
+                left.push(C.faint(`   v${a.version} ${a.by}: ${a.section}: ${a.change}`));
+        }
         const right = [C.violet(" ROOM") + C.faint(" · agents & people talking")];
         for (const a of this.feed.filter((x) => !x.agent).slice(-(H - 1)))
             right.push(" " + a.text);
-        return columns(left, right, leftW, W, H);
+        if (right.length === 1)
+            right.push(C.faint("  nothing said yet"));
+        return columns(left, right, W, H, true);
     }
-    /** Tab 3: progress on the left, shared memory on the right. */
+    /** Tab 3: progress, and the shared screen + memory. */
     board(W, H, db) {
-        const leftW = Math.floor(W * 0.55);
         const left = [C.violet(" BOARD") + C.faint(" · live progress")];
-        for (const t of db?.listTasks() ?? []) {
-            const bw = 14;
-            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));
-            const st = t.status === "merged" ? C.green("✓") : t.status === "failed" ? C.red("✗") : t.status === "needs_you" ? C.yellow("!") : t.claimed_by ? C.violet("▸") : C.faint("○");
-            left.push(` ${st} ${barS} ${String(t.progress_pct).padStart(3)}%  ${t.title}`);
-            if (t.claimed_by)
-                left.push(C.faint(`                        ${t.claimed_by}`));
-        }
-        const right = [C.violet(" SHARED MEMORY") + C.faint(" · everyone reads & writes")];
-        for (const m of (db?.recall() ?? []).slice(0, H - 1)) {
-            right.push(` ${C.faint("•")} ${m.body}`);
+        let views = [];
+        try {
+            views = db ? taskViews(db) : [];
+        }
+        catch {
+            /* a closed db */
+        }
+        const bw = W >= 100 ? 14 : 8;
+        for (const t of views) {
+            // 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)} ${taskMeter(silent ? null : t.progress_pct, bw, t.status)}  ${t.title}${who}`);
+        }
+        if (!views.length)
+            left.push(C.faint("  no tasks yet"));
+        const right = [];
+        // The shared screen: what the user put up, and the notes pinned on it.
+        let screen = [];
+        let memory = [];
+        try {
+            screen = db ? screenPanel(db, Math.min(8, Math.floor(H / 2))) : [];
+            memory = db?.recall() ?? [];
+        }
+        catch {
+            /* a closed db */
+        }
+        if (screen.length)
+            right.push(C.violet(" SCREEN") + C.faint(" · pastes & files every agent reads"), ...screen.map((l) => " " + screenGlyphs(l)), "");
+        right.push(C.violet(" SHARED MEMORY") + C.faint(" · everyone reads & writes"));
+        for (const m of memory.slice(0, H - 1)) {
+            right.push(` ${C.violet("◆")} ${m.author ? C.faint(m.author + ": ") : ""}${m.body}`);
             if (m.why)
                 right.push(C.faint(`   why: ${m.why}`));
         }
-        return columns(left, right, leftW, W, H);
+        if (!memory.length)
+            right.push(C.faint("  nothing yet"));
+        return columns(left, right, W, H);
     }
 }
-function columns(left, right, leftW, W, H) {
+/** A task's state as one glyph, the same ones the run's output uses. */
+function mark(status, claimed) {
+    if (status === "merged")
+        return C.green("✓");
+    if (status === "failed")
+        return C.red("✗");
+    if (status === "needs_you")
+        return C.yellow("!");
+    if (status === "review")
+        return C.violet("◎");
+    return claimed ? C.violet("▸") : C.faint("○");
+}
+/** Two columns side by side on a wide screen; on a narrow one, the left on top of the right. */
+function columns(left, right, W, H, latest = false) {
+    if (W < 100) {
+        const top = left.slice(0, Math.max(3, Math.min(left.length, H - Math.min(right.length, Math.floor(H / 2)) - 1)));
+        const n = Math.max(0, H - top.length - 1);
+        // A feed keeps its newest lines (its header stays).
+        const rest = latest && right.length > n ? [right[0], ...right.slice(1).slice(-(n - 1))].slice(0, n) : right.slice(0, n);
+        return [...top, C.faint("─".repeat(W)), ...rest].map((l) => truncate(l, W));
+    }
+    const leftW = Math.floor(W * 0.55);
     const out = [];
     for (let i = 0; i < H; i++) {
         const l = truncate(left[i] ?? "", leftW - 1);

package/dist/ui/doctor.js

@@ -6,7 +6,8 @@ import { spawnSync } from "node:child_process";
 import { LEGACY } from "../adapters/index.js";
 import { packageInfo } from "../preflight.js";
 import { sqliteStatus } from "../room/sqlite.js";
-import { connectAgents } from "./app.js";
+import { connectAgents, installLine } from "./app.js";
+import { gitFix } from "../platform.js";
 import { C, dot } from "./term.js";
 export async function runDoctor() {
     let blocked = false;
@@ -23,7 +24,7 @@ export async function runDoctor() {
     if (gitNum === null) {
         blocked = true;
         console.log(C.red("\n✗ git isn't installed.") + " Huddle gives every agent its own git worktree.");
-        console.log(C.faint("  macOS: xcode-select --install  ·  Debian/Ubuntu: sudo apt install git  ·  https://git-scm.com"));
+        console.log(C.faint("  " + gitFix()));
     }
     if (!db.ok) {
         blocked = true;
@@ -35,20 +36,23 @@ export async function runDoctor() {
     return blocked ? 1 : 0;
 }
 /** What to do when agents are missing or signed out. Returns true if at least one is ready. */
-function nextSteps(results) {
+export function nextSteps(results, print = console.log) {
     const ready = results.filter((r) => r.state === "ready");
+    const pending = results.filter((r) => r.state === "not_authed" || (r.state === "not_installed" && !LEGACY.has(r.adapter.id)));
     if (ready.length) {
-        console.log(C.faint(`\n  ${ready.length} agent(s) ready — cd into a repo and run: huddle`));
+        print(C.faint(`\n  ${ready.length} agent(s) ready — cd into a repo and run: huddle`));
+        if (pending.length)
+            print(C.faint(`  set up the rest (${pending.map((r) => r.adapter.id).join(", ")}): huddle setup`));
         return true;
     }
     const missing = results.filter((r) => r.state === "not_installed" && !LEGACY.has(r.adapter.id));
-    console.log(`\n${C.yellow("No agents ready yet.")} Huddle runs the coding agents you already use, each signed in to its own account.`);
-    if (missing.length) {
-        console.log(C.faint("  Install one or more (or run `huddle` — it offers to, and asks first):"));
-        for (const r of missing)
-            console.log(`    ${dot(r.adapter.id)} ${C.bold(r.adapter.id.padEnd(12))} ${C.faint("$")} ${r.adapter.install.cmd}`);
-    }
-    console.log(C.faint("  Then sign in with the agent itself — Huddle never sees your credentials — and run `huddle doctor` again."));
+    print(`\n${C.yellow("No agents ready yet.")} Huddle runs the coding agents you already use,`);
+    print("each signed in to its own account.");
+    print(`  ${C.bold("huddle setup")} ${C.faint("installs and signs in the ones you pick (asks first). Or by hand:")}`);
+    for (const r of missing)
+        print(`    ${dot(r.adapter.id)} ${C.bold(r.adapter.id.padEnd(12))} ${C.faint("$")} ${installLine(r.adapter)}`);
+    print(C.faint("  Then sign in with the agent itself — Huddle never sees your credentials —"));
+    print(C.faint("  and run `huddle doctor` again."));
     return false;
 }
 //# sourceMappingURL=doctor.js.map