@loompad/cli 1.2.1 → 1.2.3

package/dist/cli/index.js

@@ -27,7 +27,7 @@ import qrcode from "qrcode-terminal";
     }
 }
 import { exitCodeFor, turnOutcome } from "../core/turn-wait.js";
-import { DaemonClient, DaemonError, daemonRunning, ensureDaemon, stopDaemon, } from "../daemon/client.js";
+import { DaemonClient, DaemonError, daemonRunning, desktopOwnsDaemon, ensureDaemon, stopDaemon, } from "../daemon/client.js";
 import { installCrashGuards } from "../daemon/guards.js";
 import { LoomDaemon, DEFAULT_PORT } from "../daemon/server.js";
 import { ensureLoomHome, findProject, loomHome, readDaemonConfig } from "../core/registry.js";
@@ -200,8 +200,14 @@ program
     .description("start the loom daemon in the background")
     .option("--tailnet", "bind to this machine's Tailscale IP", false)
     .option("--restart", "restart even if a daemon is already running", false)
+    .option("--force", "with --restart: replace even Loom Desktop's daemon with this CLI's")
     .action(async (opts) => {
     const running = await daemonRunning();
+    if (running && !opts.force && (await desktopOwnsDaemon(running))) {
+        // replacing it swapped Desktop onto the CLI's build without a word (#306)
+        console.log(pc.yellow("Loom Desktop runs this daemon — quit and reopen Loom Desktop to restart it (or loom up --restart --force to replace it with this CLI's)"));
+        return;
+    }
     if (running) {
         const { BUILD_REV } = await import("../daemon/server.js");
         const health = (await fetch(`http://${running.host}:${running.port}/api/health`)
@@ -251,15 +257,21 @@ program
 program
     .command("status")
     .description("daemon health and project board")
-    .action(async () => {
+    .option("--json", "print the projects as JSON")
+    .action(async (opts) => {
     const cfg = await daemonRunning();
     if (!cfg) {
+        if (opts.json)
+            return void console.log(JSON.stringify({ daemon: null, projects: [] }));
         console.log(pc.dim("daemon: not running (loom up)"));
         return;
     }
-    console.log(pc.green(`daemon: http://${cfg.host}:${cfg.port}`));
+    if (!opts.json)
+        console.log(pc.green(`daemon: http://${cfg.host}:${cfg.port}`));
     const client = new DaemonClient(cfg);
     const { projects } = await client.listProjects();
+    if (opts.json)
+        return void console.log(JSON.stringify(projects)); // #315
     if (!projects.length)
         console.log(pc.dim("no projects yet — loom init"));
     for (const p of projects)
@@ -290,6 +302,7 @@ program
     .command("projects")
     .description("board of all projects")
     .option("--forget <idOrName>", "stop tracking a project (its .loom/ stays on disk)")
+    .option("--json", "print the projects as JSON")
     .action(async (opts) => {
     const client = await ensureDaemon();
     if (opts.forget) {
@@ -309,6 +322,8 @@ program
         return;
     }
     const { projects } = await client.listProjects();
+    if (opts.json)
+        return void console.log(JSON.stringify(projects)); // #315
     if (!projects.length)
         console.log(pc.dim("no projects yet — loom init"));
     for (const p of projects)
@@ -1114,7 +1129,8 @@ program
                 return pc.dim(`${t} ${e.kind}`);
         }
     };
-    console.log(pc.dim(project
+    // the banner is for people: stderr, so --json's stdout is events and nothing else (#314)
+    console.error(pc.dim(project
         ? `watching ${project.name} — ^C to stop`
         : "watching every project — ^C to stop"));
     const close = client.subscribe((pid, e) => {
@@ -1203,6 +1219,9 @@ program
         }
         return fail(err instanceof Error ? err.message : String(err));
     }
+    const shaky = review.unreliable ?? [];
+    if (!opts.json && shaky.length)
+        console.error(pc.yellow(`⚠ ${shaky.join(", ")} hasn't finished a review in this project yet (left out each time) — it may wait out review.timeoutMin`));
     if (!opts.json)
         console.error(pc.cyan(`🔍 ${agents.join(", ")} reviewing ${review.target.kind === "file" ? review.target.file : review.target.kind === "diff" ? "the uncommitted changes" : `“${review.target.label ?? "your request"}”`} · read-only, nobody takes the baton`));
     if (!opts.wait)
@@ -1257,8 +1276,10 @@ program
         await new Promise((r) => setTimeout(r, 1500));
     }
     console.log((council.status === "done" ? pc.green : council.status === "stopped" ? pc.yellow : pc.red)(`\n${council.summary ?? council.status}`));
-    if (council.status === "failed")
+    if (council.status === "failed") {
         process.exitCode = 1;
+        console.log(pc.dim(`carry on from where it stopped: loom council:resume ${council.councilId}`));
+    }
 });
 program
     .command("council:status [councilId]")
@@ -1275,6 +1296,21 @@ program
     if (council.summary)
         console.log(pc.dim(`\n${council.summary}`));
 });
+program
+    .command("council:resume <councilId>")
+    .description("carry on a council that a restart, a failed turn or Stop ended — from the first stage that didn't finish")
+    .action(async (councilId) => {
+    const client = await ensureDaemon();
+    const project = await currentProject(client);
+    try {
+        const { council } = await client.resumeCouncil(project.id, councilId);
+        const next = council.stages.find((st) => !["done", "skipped", "unverified"].includes(st.status) && !(st.key === "prove" && st.status === "failed"));
+        console.log(pc.cyan(`🏛 resuming council ${council.councilId} from ${next?.name ?? "the end"} — loom council:status ${council.councilId}`));
+    }
+    catch (err) {
+        fail(err instanceof Error ? err.message : String(err));
+    }
+});
 program
     .command("council:stop")
     .description("stop the running council after its current stage")
@@ -1389,6 +1425,8 @@ program
 });
 // ── orchestra: one orchestrator, many parallel workers (core/orchestra.ts) ──
 const RUN_DONE = new Set(["completed", "failed", "aborted", "waiting_human"]);
+/** A run a restart cut off is "aborted" on disk but resumable: say so, and how (#305). */
+const runStatus = (r) => r.status === "aborted" && r.interrupted ? "interrupted (resumable)" : r.status;
 const TASK_COLOR = {
     done: pc.green,
     running: pc.cyan,
@@ -1401,8 +1439,8 @@ const TASK_COLOR = {
 function printRun(run) {
     const done = run.tasks.filter((t) => t.status === "done").length;
     console.log(run.race
-        ? `${pc.magenta("🏁")} ${pc.bold(run.id)} ${pc.dim(run.status)}  race · ${done}/${run.tasks.length} finished · ${fmtUsd(run.costUsd)}`
-        : `${pc.magenta("🎼")} ${pc.bold(run.id)} ${pc.dim(run.status)}  ${done}/${run.tasks.length} tasks · ` +
+        ? `${pc.magenta("🏁")} ${pc.bold(run.id)} ${pc.dim(runStatus(run))}  race · ${done}/${run.tasks.length} finished · ${fmtUsd(run.costUsd)}`
+        : `${pc.magenta("🎼")} ${pc.bold(run.id)} ${pc.dim(runStatus(run))}  ${done}/${run.tasks.length} tasks · ` +
             `round ${run.round}/${run.maxRounds} · ${fmtUsd(run.costUsd)} · ${pc.dim(run.branch)}`);
     console.log(`   ${pc.dim("goal")} ${run.goal}`);
     if (run.race)
@@ -1468,6 +1506,7 @@ program
     .option("--plan", "plan mode: write the plan as markdown specs under plans/<run>/ that any agent can pick up")
     .option("--max-usd <n>", "stop this goal when it has spent this much, and say so")
     .option("--race", "race: every worker takes the whole goal in its own worktree; pick one with orchestra:apply <run> --task race-<agent>")
+    .option("--solo", "keep every task on this machine, even when teammates' runners could take some")
     .option("--no-watch", "start it and return instead of following it to the end")
     .action(async (goal, opts) => {
     const client = await ensureDaemon();
@@ -1482,7 +1521,11 @@ program
             ...(opts.plan ? { plan: true } : {}),
             ...(opts.maxUsd ? { maxUsd: Number(opts.maxUsd) } : {}),
             ...(opts.race ? { race: true } : {}),
+            ...(opts.solo ? { team: false } : {}),
         });
+        const mates = run.workers.filter((w) => w.startsWith("team:"));
+        if (mates.length)
+            console.log(pc.dim(`  teammates' machines can take tasks too: ${mates.join(", ")}`));
         console.log(run.race
             ? `${pc.magenta("🏁")} ${pc.bold(run.id)} started — ${run.workers.join(", ")} racing on the same goal`
             : `${pc.magenta("🎼")} ${pc.bold(run.id)} started — ${pc.bold(run.orchestrator.agent)} orchestrating ` +
@@ -1515,7 +1558,7 @@ program
             return void console.log(pc.dim('no orchestra runs yet — loom orchestrate "<goal>"'));
         for (const r of runs.slice(0, 15)) {
             const done = r.tasks.filter((t) => t.status === "done").length;
-            console.log(`${pc.bold(r.id)}  ${r.status.padEnd(13)} ${String(done).padStart(2)}/${String(r.tasks.length).padEnd(2)} ` +
+            console.log(`${pc.bold(r.id)}  ${runStatus(r).padEnd(13)} ${String(done).padStart(2)}/${String(r.tasks.length).padEnd(2)} ` +
                 `${pc.dim(new Date(r.createdAt).toLocaleString())}  ${r.goal.slice(0, 70)}`);
         }
     }
@@ -1803,7 +1846,7 @@ program
 });
 program
     .command("crew [action] [args...]")
-    .description("Agent Teams: status | create | goal | say | approve | pause | stop | resume | pick | refresh | budget | overlap | deliver | apply | diff | remove")
+    .description("Agent Teams: status | create | goal | say | approve | pause | stop | resume | accept | pick | refresh | budget | overlap | deliver | apply | diff | remove")
     .option("--crew <id>", "which crew, when the project has several")
     .option("--to <teammate>", "say: to one teammate")
     .option("--no-approval", "create: the Lead's plan starts without your OK")
@@ -1814,15 +1857,26 @@ program
     .option("--reviewer <agent>", "create: who reviews")
     .option("--tester <agent>", "create: who tests")
     .option("--amount <usd>", "budget: new goal budget in USD")
-    .option("--card <id>", "overlap: held card id")
+    .option("--card <id>", "overlap: held card id; accept: the failed card to take as it stands")
     .option("--decision <decision>", "overlap: narrow, wait:<goal>, or proceed:<reason>")
     .option("--touches <globs>", "overlap: comma-separated revised paths")
+    .option("--json", "status: machine-readable")
     .action(async (action, args, opts) => {
     const client = await ensureDaemon();
     const project = await currentProject(client);
     const a = (action ?? "status").toLowerCase();
     const words = (args ?? []).join(" ").trim();
     const { crews, templates } = await client.crews(project.id);
+    if (a === "status" && opts.json) {
+        // every crew, its goal and each card with its id — what accept/overlap take (#329)
+        const pick = opts.crew ? crews.filter((c) => c.id === opts.crew || c.name === opts.crew) : crews;
+        console.log(JSON.stringify({ crews: pick.map((c) => ({ id: c.id, name: c.name, busy: Boolean(c.busy), teammates: c.teammates,
+                goal: c.state?.goal ? { id: c.state.goal.id, status: c.state.goal.status, text: c.state.goal.text, branch: c.state.goal.branch,
+                    question: c.state.goal.question ?? null, costUsd: c.state.goal.costUsd ?? null,
+                    cards: (c.state.goal.cards ?? []).map((k) => ({ id: k.id, title: k.title, stage: k.stage, builder: k.builder ?? null,
+                        touches: k.touches ?? [], blockedBy: k.blockedBy ?? [], error: k.error ?? null, hold: k.teamHold ?? k.hold ?? null })) } : null })) }, null, 2));
+        return;
+    }
     if (a === "create") {
         const [first, ...rest] = args ?? [];
         const template = first && templates.includes(first.toLowerCase()) ? first.toLowerCase() : "ship";
@@ -1882,10 +1936,16 @@ function printCrew(c) {
     console.log(`  ${color(g.status)} ${g.text.split("\n")[0].slice(0, 80)} ${pc.dim(g.branch)}`);
     for (const card of g.cards ?? []) {
         const m = card.stage === "done" ? pc.green("✓") : card.stage === "failed" ? pc.red("✗") : card.stage === "planned" ? pc.dim("·") : pc.cyan("→");
-        console.log(`   ${m} ${card.title}${card.builder ? pc.dim(` ${card.builder}`) : ""}${card.stage !== "done" && card.stage !== "planned" ? pc.dim(` [${card.stage}]`) : ""}${card.error ? pc.red(` ${card.error.slice(0, 80)}`) : ""}`);
+        console.log(`   ${m} ${pc.dim(card.id)} ${card.title}${card.builder ? pc.dim(` ${card.builder}`) : ""}${card.stage !== "done" && card.stage !== "planned" ? pc.dim(` [${card.stage}]`) : ""}${card.error ? pc.red(` ${card.error.slice(0, 80)}`) : ""}`);
     }
+    // a lease hold is settled with overlap (widen or narrow the card's paths), not by answering it
+    const leaseHold = (g.cards ?? []).find((k) => k.teamHold?.kind === "decide");
     if (g.question)
-        console.log(pc.yellow(`  ${g.question.teammate} asks: ${g.question.text}`) + pc.dim("  (loom crew say \"…\")"));
+        console.log(pc.yellow(`  ${g.question.teammate} asks: ${g.question.text}`) + pc.dim(leaseHold
+            ? `  (loom crew overlap --card ${leaseHold.id} --decision "proceed: <why>" --touches "<paths>")`
+            : "  (loom crew say \"…\")"));
+    for (const k of (g.cards ?? []).filter((x) => x.stage === "failed"))
+        console.log(pc.dim(`  take ${k.id} as it stands: loom crew accept --card ${k.id}`));
     if (g.status === "awaiting_approval")
         console.log(pc.dim("  loom crew approve — or loom crew say \"…\" to change the plan"));
     if (g.status === "completed" && !g.applied)
@@ -2577,7 +2637,8 @@ program
             const ago = weight.ageMs >= 3_600_000 ? `${Math.round(weight.ageMs / 3_600_000)}h` : `${Math.round(weight.ageMs / 60_000)}m`;
             console.error(pc.yellow(`⚠ ${target}'s session here is ${Math.round(weight.tokens / 1000)}k tokens, last used ${ago} ago — its cache has likely expired, so this turn re-reads all of it` +
                 `${weight.estUsd !== undefined ? ` (~${fmtUsd(weight.estUsd)} est.)` : ""}. --fresh starts a new session instead.`));
-            if (process.stdin.isTTY && !opts.wait) {
+            // a person at a terminal is asked, --wait or not; a script only gets the warning (#300)
+            if (process.stdin.isTTY && process.stdout.isTTY) {
                 const go = await confirm(pc.yellow("send it to the existing session anyway?"));
                 if (!go)
                     return void console.log(pc.dim(`not sent — loom send --fresh${opts.agent ? ` -a ${opts.agent}` : ""} "…"`));
@@ -3124,6 +3185,22 @@ program
         console.log(pc.dim("  no turns recorded yet"));
     console.log(pc.dim("\n(costs come from agents that report them — claude-code and opencode do)"));
 });
+program
+    .command("memory:repair")
+    .description("mend decisions recorded before 1.2.1 whose underscores and paths were stripped, from the planner's own words")
+    .option("--dry-run", "show what would change, and change nothing")
+    .action(async (opts) => {
+    const client = await ensureDaemon();
+    const project = await currentProject(client);
+    const { repaired, checked, changes } = await client.repairDecisions(project.id, { dryRun: opts.dryRun });
+    if (opts.dryRun) {
+        for (const c of changes ?? [])
+            console.log(`${pc.dim(c.id)}\n  ${pc.red("- " + c.before)}\n  ${pc.green("+ " + c.after)}`);
+        console.log(repaired ? pc.yellow(`would mend ${repaired} of ${checked} review decisions — nothing written (run without --dry-run to apply)`) : pc.dim(`nothing to mend among ${checked} review decisions`));
+        return;
+    }
+    console.log(repaired ? pc.green(`✓ mended ${repaired} of ${checked} review decisions`) : pc.dim(`nothing to mend among ${checked} review decisions`));
+});
 program
     .command("decision <text...>")
     .description("record a decision into shared memory (projected on every handoff)")
@@ -3272,8 +3349,9 @@ program
     }
     const checks = await envChecks();
     checks.push(...(await (await import("./doctor.js")).diskChecks()));
+    const signedOut = checks.filter((c) => c.status === "fail" && /signed out/.test(c.detail)).map((c) => c.name);
     if (dir)
-        checks.push(...projectChecks(dir));
+        checks.push(...projectChecks(dir, signedOut));
     else
         checks.push({ name: "project", status: "warn", detail: "not inside a Loom project (loom init)" });
     // The daemon is often the desktop app's, started without this shell's PATH or keys:
@@ -3339,8 +3417,24 @@ program
     .description("list paired devices, revoke one, or ping them with a test push")
     .option("--revoke <id>", "revoke a paired device's access")
     .option("--ping", "send a test push notification to all registered devices", false)
+    .option("--prune", "revoke devices not seen for --days (never one registered for push, nor Loom Desktop)")
+    .option("--days <n>", "with --prune: how long unseen counts as gone", "30")
+    .option("--dry-run", "with --prune: only list what would go")
     .action(async (opts) => {
     const client = await ensureDaemon();
+    if (opts.prune) {
+        // every pairing made a device and nothing retired them: 86 piled up in a day of testing (#320)
+        const { clients } = await client.pairedClients();
+        const cutoff = Date.now() - Math.max(1, Number(opts.days) || 30) * 86_400_000;
+        const gone = clients.filter((c) => !c.push && !c.owner && (c.lastSeen ?? c.createdAt) < cutoff);
+        for (const c of gone) {
+            if (!opts.dryRun)
+                await client.revokeClient(c.id);
+            console.log(`${opts.dryRun ? pc.dim("would revoke") : pc.green("✓ revoked")} ${c.name} ${pc.dim(`(${c.id}) last seen ${new Date(c.lastSeen ?? c.createdAt).toLocaleDateString()}`)}`);
+        }
+        console.log(pc.dim(gone.length ? `${gone.length} of ${clients.length} devices${opts.dryRun ? " would go" : " revoked"}` : `nothing unseen for ${opts.days} days among ${clients.length} devices`));
+        return;
+    }
     if (opts.revoke) {
         await client.revokeClient(opts.revoke);
         console.log(pc.green(`✓ revoked ${opts.revoke}`));
@@ -3358,9 +3452,11 @@ program
         return void console.log(pc.dim("no paired devices — loom pair"));
     for (const c of clients) {
         console.log(` ${pc.bold(c.name)} ${pc.dim(`(${c.id})`)} paired ${new Date(c.createdAt).toLocaleString()}` +
+            pc.dim(`  ·seen ${c.lastSeen ? new Date(c.lastSeen).toLocaleDateString() : "never"}`) +
+            (c.owner ? pc.cyan("  ·owner") : "") +
             (c.push ? pc.green("  ·push✓") : pc.dim("  ·no push")));
     }
-    console.log(pc.dim("\nrevoke: loom clients --revoke <id> · test push: loom clients --ping"));
+    console.log(pc.dim("\nrevoke: loom clients --revoke <id> · tidy up: loom clients --prune [--days 30] [--dry-run] · test push: loom clients --ping"));
 });
 program
     .command("pair")