@h-rig/cli 0.0.6-alpha.67 → 0.0.6-alpha.69

package/dist/src/commands.js

@@ -2740,6 +2740,15 @@ import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
 import { resolve as resolve10 } from "path";
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
 var scopedGitHubBearerTokens = new Map;
+var serverPhaseListener = null;
+function setServerPhaseListener(listener) {
+  const previous = serverPhaseListener;
+  serverPhaseListener = listener;
+  return previous;
+}
+function reportServerPhase(label) {
+  serverPhaseListener?.(label);
+}
 function cleanToken(value) {
   const trimmed = value?.trim();
   return trimmed ? trimmed : null;
@@ -2786,6 +2795,7 @@ async function ensureServerForCli(projectRoot) {
   try {
     const selected = resolveSelectedConnection(projectRoot);
     if (selected?.connection.kind === "remote") {
+      reportServerPhase(`Connecting to ${selected.alias}\u2026`);
       const authToken = readGitHubBearerTokenForRemote(projectRoot);
       const serverProjectRoot = selected.serverProjectRoot ?? await backfillRemoteServerProjectRoot(projectRoot, selected.connection.baseUrl, authToken);
       return {
@@ -2795,6 +2805,7 @@ async function ensureServerForCli(projectRoot) {
         serverProjectRoot
       };
     }
+    reportServerPhase("Starting local Rig server\u2026");
     const connection = await ensureLocalRigServerConnection(projectRoot);
     return {
       baseUrl: connection.baseUrl,
@@ -2911,6 +2922,7 @@ async function requestServerJson(context, pathname, init = {}) {
   const headers = mergeHeaders(init.headers, server.authToken);
   if (server.serverProjectRoot)
     headers.set("x-rig-project-root", server.serverProjectRoot);
+  reportServerPhase(`${(init.method ?? "GET").toUpperCase()} ${pathname.split("?")[0]}\u2026`);
   let response;
   try {
     response = await fetch(`${server.baseUrl}${pathname}`, {
@@ -3088,6 +3100,38 @@ async function updateWorkspaceTaskViaServer(context, input) {
   });
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
 }
+var RESUMABLE_RUN_STATUSES = new Set([
+  "created",
+  "preparing",
+  "running",
+  "validating",
+  "reviewing",
+  "stopped",
+  "failed",
+  "needs-attention",
+  "needs_attention"
+]);
+async function resumeRunViaServer(context, runId, options) {
+  let targetRunId = runId?.trim() || null;
+  if (!targetRunId) {
+    const candidates = (await listRunsViaServer(context)).filter((run) => RESUMABLE_RUN_STATUSES.has(String(run.status ?? ""))).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")));
+    targetRunId = typeof candidates[0]?.runId === "string" ? candidates[0].runId : null;
+  }
+  if (!targetRunId) {
+    throw new CliError(options.restart ? "No run is available to restart." : "No resumable run is available.", 2, { hint: "List runs with `rig run list`, then pass an explicit id: `rig run resume <run-id>`." });
+  }
+  const payload = await requestServerJson(context, "/api/runs/resume", {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ runId: targetRunId, createdAt: new Date().toISOString(), restart: options.restart })
+  });
+  const record = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
+  if (record.ok === false) {
+    const message = typeof record.error === "string" && record.error.trim() ? record.error : "run resume failed";
+    throw new CliError(`${options.restart ? "restart" : "resume"} failed for ${targetRunId}: ${message}`, 1);
+  }
+  return { ok: true, runId: targetRunId, ...record };
+}
 async function stopRunViaServer(context, runId) {
   const payload = await requestServerJson(context, "/api/runs/stop", {
     method: "POST",
@@ -4431,6 +4475,127 @@ function formatConnectionStatus(selected, connections) {
 `);
 }
 
+// packages/cli/src/commands/_async-ui.ts
+import pc4 from "picocolors";
+
+// packages/cli/src/commands/_spinner.ts
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function createTtySpinner(input) {
+  const output = input.output ?? process.stdout;
+  const isTty = output.isTTY === true;
+  const frames = input.frames && input.frames.length > 0 ? input.frames : SPINNER_FRAMES;
+  let label = input.label;
+  let frame = 0;
+  let paused = false;
+  let stopped = false;
+  let lastPrintedLabel = "";
+  const render = () => {
+    if (stopped || paused)
+      return;
+    if (!isTty) {
+      if (label !== lastPrintedLabel) {
+        output.write(`${label}
+`);
+        lastPrintedLabel = label;
+      }
+      return;
+    }
+    frame = (frame + 1) % frames.length;
+    const glyph = frames[frame] ?? frames[0] ?? "";
+    output.write(`\r\x1B[2K${input.styleFrame ? input.styleFrame(glyph) : glyph} ${label}`);
+  };
+  const clearLine = () => {
+    if (isTty)
+      output.write("\r\x1B[2K");
+  };
+  render();
+  const timer = isTty ? setInterval(render, input.intervalMs ?? 120) : null;
+  return {
+    setLabel(next) {
+      label = next;
+      render();
+    },
+    pause() {
+      paused = true;
+      clearLine();
+    },
+    resume() {
+      if (stopped)
+        return;
+      paused = false;
+      render();
+    },
+    stop(finalLine) {
+      if (stopped)
+        return;
+      stopped = true;
+      if (timer)
+        clearInterval(timer);
+      clearLine();
+      if (finalLine)
+        output.write(`${finalLine}
+`);
+    }
+  };
+}
+
+// packages/cli/src/commands/_async-ui.ts
+var CLACK_SPINNER_FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
+var DONE_SYMBOL = pc4.green("\u25C7");
+var FAIL_SYMBOL = pc4.red("\u25A0");
+var activeUpdate = null;
+async function withSpinner(label, work, options = {}) {
+  if (options.outputMode === "json") {
+    return work(() => {});
+  }
+  if (activeUpdate) {
+    const outer = activeUpdate;
+    outer(label);
+    return work(outer);
+  }
+  const output = options.output ?? process.stderr;
+  const isTty = output.isTTY === true;
+  let lastLabel = label;
+  if (!isTty) {
+    output.write(`${label}
+`);
+    const update2 = (next) => {
+      lastLabel = next;
+    };
+    activeUpdate = update2;
+    const previousListener2 = setServerPhaseListener(update2);
+    try {
+      return await work(update2);
+    } finally {
+      activeUpdate = null;
+      setServerPhaseListener(previousListener2);
+    }
+  }
+  const spinner2 = createTtySpinner({
+    label,
+    output,
+    frames: CLACK_SPINNER_FRAMES,
+    styleFrame: (frame) => pc4.magenta(frame)
+  });
+  const update = (next) => {
+    lastLabel = next;
+    spinner2.setLabel(next);
+  };
+  activeUpdate = update;
+  const previousListener = setServerPhaseListener(update);
+  try {
+    const result = await work(update);
+    spinner2.stop(options.doneLabel ? `${DONE_SYMBOL} ${options.doneLabel}` : undefined);
+    return result;
+  } catch (error) {
+    spinner2.stop(`${FAIL_SYMBOL} ${lastLabel}`);
+    throw error;
+  } finally {
+    activeUpdate = null;
+    setServerPhaseListener(previousListener);
+  }
+}
+
 // packages/cli/src/commands/inbox.ts
 async function listInboxRecords(context, kind, filters) {
   const params = new URLSearchParams;
@@ -4535,7 +4700,7 @@ async function executeInbox(context, args) {
       const task = takeOption(pending, "--task");
       pending = task.rest;
       requireNoExtraArgs(pending, "rig inbox approvals [--run <id>] [--task <id>]");
-      const approvals = await listInboxRecords(context, "approvals", { run: run.value, task: task.value });
+      const approvals = await withSpinner("Reading approvals from server\u2026", () => listInboxRecords(context, "approvals", { run: run.value, task: task.value }), { outputMode: context.outputMode });
       renderList(context, "approvals", approvals);
       return { ok: true, group: "inbox", command, details: { approvals } };
     }
@@ -4546,7 +4711,7 @@ async function executeInbox(context, args) {
       const task = takeOption(pending, "--task");
       pending = task.rest;
       requireNoExtraArgs(pending, "rig inbox inputs [--run <id>] [--task <id>]");
-      const requests = await listInboxRecords(context, "inputs", { run: run.value, task: task.value });
+      const requests = await withSpinner("Reading input requests from server\u2026", () => listInboxRecords(context, "inputs", { run: run.value, task: task.value }), { outputMode: context.outputMode });
       renderList(context, "inputs", requests);
       return { ok: true, group: "inbox", command, details: { requests } };
     }
@@ -4567,7 +4732,7 @@ async function executeInbox(context, args) {
       if (decision.value !== "approve" && decision.value !== "reject") {
         throw new CliError("decision must be approve or reject.", 1, { hint: "Re-run as `rig inbox approve --run <id> --request <id> --decision approve|reject`." });
       }
-      const result = await requestServerJson(context, "/api/inbox/approvals/resolve", {
+      const result = await withSpinner(`Resolving approval ${request.value}\u2026`, () => requestServerJson(context, "/api/inbox/approvals/resolve", {
         method: "POST",
         headers: { "content-type": "application/json" },
         body: JSON.stringify({
@@ -4576,7 +4741,7 @@ async function executeInbox(context, args) {
           decision: decision.value,
           note: note4.value ?? null
         })
-      });
+      }), { outputMode: context.outputMode });
       return { ok: true, group: "inbox", command, details: { result } };
     }
     case "respond": {
@@ -4610,7 +4775,7 @@ async function executeInbox(context, args) {
         const [key, ...restValue] = entry.split("=");
         return [key, restValue.join("=")];
       }));
-      const result = await requestServerJson(context, "/api/inbox/inputs/respond", {
+      const result = await withSpinner(`Sending response for ${request.value}\u2026`, () => requestServerJson(context, "/api/inbox/inputs/respond", {
         method: "POST",
         headers: { "content-type": "application/json" },
         body: JSON.stringify({
@@ -4618,7 +4783,7 @@ async function executeInbox(context, args) {
           requestId: request.value,
           answers: parsedAnswers
         })
-      });
+      }), { outputMode: context.outputMode });
       return { ok: true, group: "inbox", command, details: { result } };
     }
     case "watch": {
@@ -5035,7 +5200,10 @@ async function runRigDoctorChecks(options) {
   const bunVersion = options.bunVersion ?? Bun.version;
   const request = options.requestJson ?? ((pathname, init) => requestServerJson({ projectRoot }, pathname, init));
   const loadConfig = options.loadConfig ?? loadRigConfigOrNull;
+  const progress = options.onProgress ?? (() => {});
+  progress("Checking local toolchain\u2026");
   checks.push(check("bun", `bun >= ${MIN_SUPPORTED_BUN_VERSION}`, isSupportedBunVersion(bunVersion) ? "pass" : "fail", `found ${bunVersion}`, `Install Bun ${MIN_SUPPORTED_BUN_VERSION} or newer.`), check("git", "git", which("git") ? "pass" : "fail", which("git") ?? undefined, "Install git and ensure it is on PATH."), check("jq", "jq", which("jq") ? "pass" : "warn", which("jq") ?? undefined, "Install jq (for example `brew install jq`)."));
+  progress("Loading rig.config\u2026");
   const loadedConfig = await loadConfig(projectRoot).catch(() => null);
   const config = loadedConfig ?? loadFallbackConfig(projectRoot);
   const hasConfigFile = ["rig.config.ts", "rig.config.mts", "rig.config.json"].some((name) => existsSync10(resolve16(projectRoot, name)));
@@ -5054,6 +5222,7 @@ async function runRigDoctorChecks(options) {
   checks.push(selected ? check("connection", "selected server connection", "pass", selected.connection.kind === "remote" ? selected.connection.baseUrl : "local auto") : check("connection", "selected server", repo ? "fail" : "warn", repo ? "selected alias is missing" : "will auto-start local server", repo ? "Run `rig server list` and `rig server use <alias|local>`." : undefined));
   let server = null;
   try {
+    progress("Connecting to the selected Rig server\u2026");
     server = await (options.resolveServer ?? ensureServerForCli)(projectRoot);
     checks.push(check("server", "Rig server reachable", "pass", `${server.connectionKind} ${server.baseUrl}`));
   } catch (error) {
@@ -5061,18 +5230,21 @@ async function runRigDoctorChecks(options) {
   }
   if (server || options.requestJson) {
     try {
+      progress("Checking server status\u2026");
       const status = await request("/api/server/status");
       checks.push(check("server-status", "server project status", "pass", JSON.stringify(status).slice(0, 180)));
     } catch (error) {
       checks.push(check("server-status", "server project status", "fail", errorMessage(error), "Run `rig doctor` after the selected server is reachable."));
     }
     try {
+      progress("Checking GitHub auth\u2026");
       const auth = await request("/api/github/auth/status");
       checks.push(isAuthenticated2(auth) ? check("github-auth", "GitHub auth", "pass") : check("github-auth", "GitHub auth", "fail", "not authenticated", "Run `rig github auth import-gh` or `rig github auth token --token <token>`."));
     } catch (error) {
       checks.push(check("github-auth", "GitHub auth", "fail", errorMessage(error), "Authenticate GitHub through Rig and ensure the server exposes auth status."));
     }
     try {
+      progress("Checking GitHub repo permissions\u2026");
       const permissions = await request("/api/github/repo/permissions");
       const allowed = permissionAllowsPr2(permissions);
       checks.push(allowed === true ? check("github-repo-permissions", "GitHub repo PR permissions", "pass", JSON.stringify(permissions).slice(0, 180)) : allowed === false ? check("github-repo-permissions", "GitHub repo PR permissions", "fail", JSON.stringify(permissions).slice(0, 180), "Grant the selected GitHub token permission to push branches, open PRs, and merge according to repo rules.") : check("github-repo-permissions", "GitHub repo PR permissions", "warn", JSON.stringify(permissions).slice(0, 180), "Confirm the selected token can push branches and open PRs."));
@@ -5080,6 +5252,7 @@ async function runRigDoctorChecks(options) {
       checks.push(check("github-repo-permissions", "GitHub repo PR permissions", "warn", errorMessage(error), "Ensure the server exposes repo permission checks and the token can open PRs."));
     }
     try {
+      progress("Checking GitHub issue labels\u2026");
       const labels = await request("/api/workspace/task-labels");
       const ready = labelsReady(labels);
       checks.push(ready === false ? check("task-labels", "GitHub issue labels", "fail", JSON.stringify(labels).slice(0, 180), "Let Rig create required labels or create the configured lifecycle labels manually.") : check("task-labels", "GitHub issue labels", ready === true ? "pass" : "warn", JSON.stringify(labels).slice(0, 180), "Confirm required Rig lifecycle labels exist."));
@@ -5087,6 +5260,7 @@ async function runRigDoctorChecks(options) {
       checks.push(check("task-labels", "GitHub issue labels", "warn", errorMessage(error), "Run `rig init`/`rig doctor` after label setup is wired on the server."));
     }
     try {
+      progress("Checking task projection\u2026");
       const projection = await request("/api/workspace/task-projection");
       checks.push(check("task-projection", "task projection", "pass", JSON.stringify(projection).slice(0, 180)));
     } catch (error) {
@@ -5095,6 +5269,7 @@ async function runRigDoctorChecks(options) {
     const slug = projectStatusSlug(projectRoot, config);
     if (slug) {
       try {
+        progress("Checking server project checkout\u2026");
         const project = await request(`/api/projects/${encodeURIComponent(slug)}`);
         checks.push(check("remote-checkout", "server project checkout", "pass", JSON.stringify(project).slice(0, 180)));
       } catch (error) {
@@ -5109,6 +5284,7 @@ async function runRigDoctorChecks(options) {
   }
   checks.push(githubProjectsCheck(config));
   checks.push(prMergeCheck(config));
+  progress("Checking Pi installation\u2026");
   const piChecks = await (options.piChecks ?? (() => buildPiSetupChecks()))().catch((error) => [{
     ok: false,
     label: "pi/pi-rig checks",
@@ -6031,7 +6207,7 @@ async function executeGithub(context, args) {
     case "status": {
       if (rest.length > 0)
         throw new CliError("Usage: rig github auth status", 1);
-      const status = await getGitHubAuthStatusViaServer(context);
+      const status = await withSpinner("Checking GitHub auth on the server\u2026", () => getGitHubAuthStatusViaServer(context), { outputMode: context.outputMode });
       printPayload(context, status, `GitHub auth: ${status.authenticated ? "authenticated" : "unauthenticated"}`);
       return { ok: true, group: "github", command: "auth status", details: status };
     }
@@ -6042,14 +6218,15 @@ async function executeGithub(context, args) {
       const token = parsed.value?.trim();
       if (!token)
         throw new CliError("Missing --token value.", 1, { hint: "Re-run as `rig github auth token --token <token>`." });
-      const result = await postGitHubTokenViaServer(context, token);
+      const result = await withSpinner("Storing GitHub token on the server\u2026", () => postGitHubTokenViaServer(context, token), { outputMode: context.outputMode });
       printPayload(context, result, "GitHub token stored on the selected Rig server.");
       return { ok: true, group: "github", command: "auth token", details: result };
     }
     case "import-gh": {
       if (rest.length > 0)
         throw new CliError("Usage: rig github auth import-gh", 1);
-      const result = await postGitHubTokenViaServer(context, readGhToken());
+      const importedToken = readGhToken();
+      const result = await withSpinner("Storing GitHub token on the server\u2026", () => postGitHubTokenViaServer(context, importedToken), { outputMode: context.outputMode });
       printPayload(context, result, "GitHub token imported from gh and stored on the selected Rig server.");
       return { ok: true, group: "github", command: "auth import-gh", details: result };
     }
@@ -6062,7 +6239,7 @@ async function executeGithub(context, args) {
 init_runner();
 async function executeDoctor(context, args) {
   requireNoExtraArgs(args, "rig doctor");
-  const checks = await runRigDoctorChecks({ projectRoot: context.projectRoot });
+  const checks = await withSpinner("Running doctor checks\u2026", (update) => runRigDoctorChecks({ projectRoot: context.projectRoot, onProgress: update }), { outputMode: context.outputMode });
   if (context.outputMode === "text") {
     console.log(formatDoctorChecks(checks));
   }
@@ -6369,13 +6546,19 @@ async function executeInspect(context, args) {
       const requiredTask = requireTask(task, "rig inspect logs --task <task-id>");
       const latestRun = listAuthorityRuns(context.projectRoot).map((entry) => readAuthorityRun3(context.projectRoot, entry.runId)).filter((run) => Boolean(run)).filter((run) => run.taskId === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
       if (!latestRun) {
-        const serverRuns = await listRunsViaServer(context, { limit: 200 }).catch(() => []);
-        const serverRun = serverRuns.filter((run) => String(run.taskId ?? "") === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
-        if (!serverRun || typeof serverRun.runId !== "string") {
+        const fallback = await withSpinner(`Finding runs for ${requiredTask} on the server\u2026`, async (update) => {
+          const serverRuns = await listRunsViaServer(context, { limit: 200 }).catch(() => []);
+          const serverRun = serverRuns.filter((run) => String(run.taskId ?? "") === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
+          if (!serverRun || typeof serverRun.runId !== "string")
+            return null;
+          update(`Reading logs for run ${serverRun.runId}\u2026`);
+          const page = await getRunLogsViaServer(context, serverRun.runId, { limit: 500 });
+          return { runId: serverRun.runId, page };
+        }, { outputMode: context.outputMode });
+        if (!fallback) {
           throw new CliError(`No runs found for ${requiredTask} (local or on the selected server).`, 1, { hint: "Start one with `rig task run --task <id>`, or check `rig run list`." });
         }
-        const page = await getRunLogsViaServer(context, serverRun.runId, { limit: 500 });
-        const entries = Array.isArray(page.entries) ? page.entries : [];
+        const entries = Array.isArray(fallback.page.entries) ? fallback.page.entries : [];
         if (context.outputMode === "text") {
           for (const entry of entries) {
             const record = entry && typeof entry === "object" ? entry : {};
@@ -6384,9 +6567,9 @@ async function executeInspect(context, args) {
             console.log([title, detail].filter(Boolean).join(" \u2014 "));
           }
           if (entries.length === 0)
-            console.log(`(no log entries for run ${serverRun.runId})`);
+            console.log(`(no log entries for run ${fallback.runId})`);
         }
-        return { ok: true, group: "inspect", command, details: { task: requiredTask, runId: serverRun.runId, source: "server", entries } };
+        return { ok: true, group: "inspect", command, details: { task: requiredTask, runId: fallback.runId, source: "server", entries } };
       }
       const logsPath = resolve19(resolveAuthorityRunDir2(context.projectRoot, latestRun.runId), "logs.jsonl");
       if (!existsSync12(logsPath)) {
@@ -6444,7 +6627,7 @@ async function executeInspect(context, args) {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
       requireNoExtraArgs(remaining, "rig inspect diff [--task <task-id>]");
       if (task) {
-        const files = changedFilesForTask(context.projectRoot, task, false);
+        const files = await withSpinner(`Computing changed files for ${task}\u2026`, async () => changedFilesForTask(context.projectRoot, task, false), { outputMode: context.outputMode });
         for (const file of files) {
           console.log(file);
         }
@@ -7125,8 +7308,6 @@ import {
   deleteRunState,
   listOpenEpics,
   resolveDefaultEpic,
-  runResume,
-  runRestart,
   runStatus,
   runStop,
   startRun,
@@ -7532,7 +7713,12 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([], {
+    await runPiMain([
+      "--no-extensions",
+      "--no-skills",
+      "--no-prompt-templates",
+      "--no-context-files"
+    ], {
       extensionFactories: [piRigExtensionFactory]
     });
     detached = true;
@@ -7597,8 +7783,9 @@ async function readOperatorSnapshot(context, runId, options = {}) {
 }
 async function attachRunOperatorView(context, input) {
   let steered = false;
-  if (input.message?.trim()) {
-    await sendRunPiPromptViaServer(context, input.runId, input.message.trim(), "steer").catch(() => steerRunViaServer(context, input.runId, input.message.trim()));
+  const attachMessage = input.message?.trim();
+  if (attachMessage) {
+    await withSpinner("Queueing steering message\u2026", () => sendRunPiPromptViaServer(context, input.runId, attachMessage, "steer").catch(() => steerRunViaServer(context, input.runId, attachMessage)), { outputMode: context.outputMode });
     steered = true;
   }
   if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
@@ -7608,7 +7795,7 @@ async function attachRunOperatorView(context, input) {
     });
   }
   const surface = createOperatorSurface({ interactive: input.interactive !== false });
-  let snapshot = await readOperatorSnapshot(context, input.runId);
+  let snapshot = await withSpinner(`Connecting to run ${input.runId}\u2026`, () => readOperatorSnapshot(context, input.runId), { outputMode: context.outputMode });
   if (context.outputMode === "text") {
     surface.renderSnapshot(snapshot);
     surface.renderTimeline(snapshot.timeline);
@@ -7739,7 +7926,7 @@ async function executeRun(context, args) {
   switch (command) {
     case "list": {
       requireNoExtraArgs(rest, "rig run list");
-      const { runs, source } = await listRunsForSelectedConnection(context, { limit: 100 });
+      const { runs, source } = isRemoteConnectionSelected(context.projectRoot) ? await withSpinner("Reading runs from server\u2026", () => listRunsForSelectedConnection(context, { limit: 100 }), { outputMode: context.outputMode }) : await listRunsForSelectedConnection(context, { limit: 100 });
       if (context.outputMode === "text") {
         printFormattedOutput(formatRunList(runs, { source }));
         await printPendingInboxFooter(context);
@@ -7812,7 +7999,7 @@ async function executeRun(context, args) {
       if (!runId) {
         throw new CliError("run show requires a run id.", 1, { hint: "Run `rig run list` to find run ids, then `rig run show <run-id>`." });
       }
-      const record = readAuthorityRun5(context.projectRoot, runId) ?? normalizeRemoteRunDetails(await getRunDetailsViaServer(context, runId).catch(() => ({})));
+      const record = readAuthorityRun5(context.projectRoot, runId) ?? normalizeRemoteRunDetails(await withSpinner(`Reading run ${runId} from server\u2026`, () => getRunDetailsViaServer(context, runId).catch(() => ({})), { outputMode: context.outputMode }));
       if (!record) {
         throw new CliError(`Run not found: ${runId}`, 2, { hint: "Run `rig run list` to see recorded runs." });
       }
@@ -7833,7 +8020,8 @@ async function executeRun(context, args) {
       }
       const renderer = createPiRunStreamRenderer();
       let cursor = null;
-      const page = await getRunTimelineViaServer(context, run.value, { limit: 500 });
+      const timelineRunId = run.value;
+      const page = await withSpinner(`Reading timeline for ${timelineRunId}\u2026`, () => getRunTimelineViaServer(context, timelineRunId, { limit: 500 }), { outputMode: context.outputMode });
       const events = Array.isArray(page.entries) ? page.entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
       cursor = typeof page.nextCursor === "string" ? page.nextCursor : null;
       if (context.outputMode === "text") {
@@ -7910,8 +8098,9 @@ async function executeRun(context, args) {
         throw new CliError("run attach requires a run id.", 2, { hint: "Run `rig run list` to find run ids, then `rig run attach <run-id> --follow`." });
       }
       let steered = false;
-      if (messageOption.value?.trim()) {
-        await steerRunViaServer(context, runId, messageOption.value.trim());
+      const steerMessage = messageOption.value?.trim();
+      if (steerMessage) {
+        await withSpinner("Queueing steering message\u2026", () => steerRunViaServer(context, runId, steerMessage), { outputMode: context.outputMode });
         steered = true;
       }
       const attached = await attachRunOperatorView(context, {
@@ -7931,7 +8120,7 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command };
       }
-      const summary = isRemoteConnectionSelected(context.projectRoot) ? buildServerRunStatus(await listRunsViaServer(context, { limit: 100 })) : runStatus(context.projectRoot, runtimeContext);
+      const summary = isRemoteConnectionSelected(context.projectRoot) ? buildServerRunStatus(await withSpinner("Reading run status from server\u2026", () => listRunsViaServer(context, { limit: 100 }), { outputMode: context.outputMode })) : runStatus(context.projectRoot, runtimeContext);
       const activeRuns = Array.isArray(summary.activeRuns) ? summary.activeRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
       const recentRuns = Array.isArray(summary.recentRuns) ? summary.recentRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
       if (context.outputMode === "text") {
@@ -8020,7 +8209,7 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command };
       }
-      const resumed = await runResume(context.projectRoot, runtimeContext, targetRunId);
+      const resumed = await withSpinner(targetRunId ? `Resuming run ${targetRunId}\u2026` : "Resuming latest resumable run\u2026", () => resumeRunViaServer(context, targetRunId, { restart: false }), { outputMode: context.outputMode });
       if (context.outputMode === "text") {
         console.log(`Resumed run: ${resumed.runId}`);
       }
@@ -8039,7 +8228,7 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command };
       }
-      const restarted = await runRestart(context.projectRoot, runtimeContext, targetRunId);
+      const restarted = await withSpinner(targetRunId ? `Restarting run ${targetRunId}\u2026` : "Restarting latest run\u2026", () => resumeRunViaServer(context, targetRunId, { restart: true }), { outputMode: context.outputMode });
       if (context.outputMode === "text") {
         console.log(`Restarted run: ${restarted.runId}`);
       }
@@ -8066,7 +8255,8 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command, details: { runId, dryRun: true } };
       }
-      await steerRunViaServer(context, runId, message2.trim());
+      const trimmedMessage = message2.trim();
+      await withSpinner("Queueing steering message\u2026", () => steerRunViaServer(context, runId, trimmedMessage), { outputMode: context.outputMode });
       if (context.outputMode === "text") {
         console.log(`Steering message queued for ${runId}.`);
       }
@@ -8087,7 +8277,7 @@ async function executeRun(context, args) {
         };
       }
       if (runId) {
-        const stopped = await stopRunViaServer(context, runId);
+        const stopped = await withSpinner(`Requesting stop for ${runId}\u2026`, () => stopRunViaServer(context, runId), { outputMode: context.outputMode });
         if (context.outputMode === "text")
           console.log(`Stop requested: ${runId}`);
         return { ok: true, group: "run", command, details: stopped };
@@ -8333,12 +8523,12 @@ async function executeServer(context, args, options) {
 
 // packages/cli/src/commands/stats.ts
 init_runner();
-import pc5 from "picocolors";
+import pc6 from "picocolors";
 import { computeRigStats } from "@rig/runtime/control-plane/native/run-stats";
 
 // packages/cli/src/commands/_help-catalog.ts
 import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@clack/prompts";
-import pc4 from "picocolors";
+import pc5 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
     title: "Start here",
@@ -8626,13 +8816,13 @@ var ADVANCED_COMMANDS = [
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
-  return pc4.bold(pc4.cyan(title));
+  return pc5.bold(pc5.cyan(title));
 }
 function renderRigBanner(version) {
-  const m = (s) => pc4.bold(pc4.magenta(s));
-  const c = (s) => pc4.bold(pc4.cyan(s));
-  const y = (s) => pc4.yellow(s);
-  const d = (s) => pc4.dim(s);
+  const m = (s) => pc5.bold(pc5.magenta(s));
+  const c = (s) => pc5.bold(pc5.cyan(s));
+  const y = (s) => pc5.yellow(s);
+  const d = (s) => pc5.dim(s);
   const lines = [
     m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
     m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
@@ -8641,7 +8831,7 @@ function renderRigBanner(version) {
     y("    \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D") + d("   \u2592\u2591"),
     y("    \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D "),
     "",
-    `    ${c("\u25E2\u25E4")} ${pc4.bold("the control rig for autonomous coding agents")} ${m("//")} ${d("you are the operator")}`,
+    `    ${c("\u25E2\u25E4")} ${pc5.bold("the control rig for autonomous coding agents")} ${m("//")} ${d("you are the operator")}`,
     version ? `    ${d(`v${version} \xB7 jack in: rig task run --next`)}` : `    ${d("jack in: rig task run --next")}`
   ];
   return lines.join(`
@@ -8649,7 +8839,7 @@ function renderRigBanner(version) {
 }
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
-  return `${pc4.dim("\u2502")} ${pc4.bold(commandColumn)} ${description}`;
+  return `${pc5.dim("\u2502")} ${pc5.bold(commandColumn)} ${description}`;
 }
 function renderCommandBlock(commands) {
   return commands.map((entry) => commandLine(entry.command, entry.description)).join(`
@@ -8659,37 +8849,37 @@ function renderGroup(group) {
   const lines = [
     `${heading(`rig ${group.name}`)} \u2014 ${group.summary}`,
     "",
-    pc4.bold("Usage"),
+    pc5.bold("Usage"),
     ...group.usage.map((line) => `  ${line}`),
     "",
-    pc4.bold("Commands"),
+    pc5.bold("Commands"),
     ...group.commands.map((entry) => commandLine(entry.command, entry.description))
   ];
   if (group.examples?.length) {
-    lines.push("", pc4.bold("Examples"), ...group.examples.map((line) => `  ${pc4.dim("$")} ${line}`));
+    lines.push("", pc5.bold("Examples"), ...group.examples.map((line) => `  ${pc5.dim("$")} ${line}`));
   }
   if (group.next?.length) {
-    lines.push("", pc4.bold("Next steps"), ...group.next.map((line) => `  ${pc4.dim("\u203A")} ${line}`));
+    lines.push("", pc5.bold("Next steps"), ...group.next.map((line) => `  ${pc5.dim("\u203A")} ${line}`));
   }
   if (group.advanced?.length) {
-    lines.push("", pc4.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc4.dim("\u203A")} ${line}`));
+    lines.push("", pc5.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc5.dim("\u203A")} ${line}`));
   }
   return lines.join(`
 `);
 }
 function renderTopLevelHelp() {
   return [
-    `${heading("rig")} ${pc4.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
-    pc4.dim("Current path: select a server, choose a task, submit a run, attach with native Pi, clear inbox gates."),
+    `${heading("rig")} ${pc5.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
+    pc5.dim("Current path: select a server, choose a task, submit a run, attach with native Pi, clear inbox gates."),
     "",
     ...TOP_LEVEL_SECTIONS.flatMap((section) => [
-      `${pc4.bold(pc4.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc4.dim(section.subtitle)}`,
+      `${pc5.bold(pc5.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc5.dim(section.subtitle)}`,
       renderCommandBlock(section.commands),
       ""
     ]),
-    pc4.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
+    pc5.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
     "",
-    pc4.bold("Global options"),
+    pc5.bold("Global options"),
     commandLine("--project <path>", "Use a project root instead of auto-discovery."),
     commandLine("--json", "Emit structured output for scripts/agents."),
     commandLine("--dry-run", "Print the command plan without mutating state.")
@@ -8700,16 +8890,16 @@ function renderAdvancedHelp() {
   return [
     `${heading("rig advanced")} \u2014 compatibility, diagnostics, and internal surfaces`,
     "",
-    pc4.bold("Primary groups"),
+    pc5.bold("Primary groups"),
     "  init, server, task, run, inbox, repo, plugin, inspect, stats, doctor, github",
     "",
-    pc4.bold("Advanced commands"),
+    pc5.bold("Advanced commands"),
     ...ADVANCED_COMMANDS.map((entry) => commandLine(entry.command, entry.description)),
     "",
-    pc4.bold("Advanced groups"),
+    pc5.bold("Advanced groups"),
     ...ADVANCED_GROUPS.map((group) => commandLine(group.name, group.summary)),
     "",
-    pc4.dim("All groups remain callable. Prefer `rig server`, `rig task`, `rig run`, and `rig inbox` for day-to-day work.")
+    pc5.dim("All groups remain callable. Prefer `rig server`, `rig task`, `rig run`, and `rig inbox` for day-to-day work.")
   ].join(`
 `);
 }
@@ -8857,11 +9047,11 @@ function formatStatsReport(stats) {
   const keyWidth = Math.max(...rows.map(([key]) => key.length));
   const lines = [
     formatSection("Fleet stats", window),
-    ...rows.map(([key, value]) => `${pc5.dim("\u2502")} ${pc5.dim(key.padEnd(keyWidth + 2))} ${value}`)
+    ...rows.map(([key, value]) => `${pc6.dim("\u2502")} ${pc6.dim(key.padEnd(keyWidth + 2))} ${value}`)
   ];
   const otherStatuses = Object.entries(stats.statusCounts).filter(([status]) => !["completed", "failed", "needs-attention"].includes(status)).sort(([, left], [, right]) => right - left);
   if (otherStatuses.length > 0) {
-    lines.push(`${pc5.dim("\u2502")} ${pc5.dim("other".padEnd(keyWidth + 2))} ${otherStatuses.map(([status, count]) => `${status}:${count}`).join(" ")}`);
+    lines.push(`${pc6.dim("\u2502")} ${pc6.dim("other".padEnd(keyWidth + 2))} ${otherStatuses.map(([status, count]) => `${status}:${count}`).join(" ")}`);
   }
   lines.push("", ...formatNextSteps([
     "Inspect a run: `rig run list` then `rig run show <run-id>`",
@@ -8880,7 +9070,8 @@ async function executeStats(context, args) {
       const sinceResult = takeOption(pending, "--since");
       requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
       const since = parseSinceOption(sinceResult.value);
-      const stats = isRemoteConnectionSelected(context.projectRoot) ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since });
+      const remoteStats = isRemoteConnectionSelected(context.projectRoot);
+      const stats = await withSpinner(remoteStats ? "Computing fleet stats on the server\u2026" : "Scanning local run state\u2026", async () => remoteStats ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since }), { outputMode: context.outputMode });
       if (context.outputMode === "text") {
         printFormattedOutput(formatStatsReport(stats));
       }
@@ -9135,7 +9326,7 @@ async function executeTask(context, args, options) {
       pending = rawResult.rest;
       const { filters, rest: remaining } = parseTaskFilters(pending);
       requireNoExtraArgs(remaining, "rig task list [--raw] [--assignee <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
-      const tasks = await listWorkspaceTasksViaServer(context, filters);
+      const tasks = await withSpinner("Reading tasks from server\u2026", () => listWorkspaceTasksViaServer(context, filters), { outputMode: context.outputMode });
       if (context.outputMode === "text") {
         const renderedTasks = rawResult.value ? tasks.map((task) => summarizeTask(task, { raw: true })) : tasks.map((task) => summarizeTask(task));
         printFormattedOutput(formatTaskList(renderedTasks, { raw: rawResult.value }));
@@ -9159,7 +9350,7 @@ async function executeTask(context, args, options) {
       const taskId3 = normalizeTaskRunTaskId(taskOption.value ?? positional);
       if (!taskId3)
         throw new CliError("task show requires a task id.", 2, { hint: "Run `rig task list` to find ids, then `rig task show <id>`." });
-      const task = await getWorkspaceTaskViaServer(context, taskId3);
+      const task = await withSpinner(`Reading task ${taskId3} from server\u2026`, () => getWorkspaceTaskViaServer(context, taskId3), { outputMode: context.outputMode });
       if (!task)
         throw new CliError(`Task not found: ${taskId3}`, 3, { hint: "Run `rig task list` to see available tasks." });
       const summary = summarizeTask(task, { raw: true });
@@ -9171,7 +9362,7 @@ async function executeTask(context, args, options) {
     case "next": {
       const { filters, rest: remaining } = parseTaskFilters(rest);
       requireNoExtraArgs(remaining, "rig task next [--assignee <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
-      const selected = await selectNextWorkspaceTaskViaServer(context, filters);
+      const selected = await withSpinner("Selecting next ready task\u2026", () => selectNextWorkspaceTaskViaServer(context, filters), { outputMode: context.outputMode });
       if (context.outputMode === "text") {
         if (selected.task) {
           printFormattedOutput(formatTaskCard(summarizeTask(selected.task, { raw: true }), { title: "Selected task", selected: true }));
@@ -9321,7 +9512,7 @@ async function executeTask(context, args, options) {
       let selectedTask = null;
       let selectedTaskId = normalizeTaskRunTaskId(taskResult.value) ?? positionalTaskId;
       if (nextResult.value) {
-        const selected = await selectNextWorkspaceTaskViaServer(context, filterResult.filters);
+        const selected = await withSpinner("Selecting next ready task\u2026", () => selectNextWorkspaceTaskViaServer(context, filterResult.filters), { outputMode: context.outputMode });
         selectedTask = selected.task;
         selectedTaskId = selected.task ? readTaskId(selected.task) : null;
         if (!selectedTaskId) {
@@ -9332,7 +9523,7 @@ async function executeTask(context, args, options) {
         if (context.outputMode !== "text" || !process.stdin.isTTY || !process.stdout.isTTY) {
           throw new CliError("task run requires an interactive terminal to pick a task; pass --next, --task <id>, or --initial-prompt/--title for an ad hoc run.", 2);
         }
-        const tasks = await listWorkspaceTasksViaServer(context, filterResult.filters);
+        const tasks = await withSpinner("Reading tasks from server\u2026", () => listWorkspaceTasksViaServer(context, filterResult.filters), { outputMode: context.outputMode });
         selectedTask = await selectTaskWithTextPicker(tasks);
         selectedTaskId = selectedTask ? readTaskId(selectedTask) : null;
         if (!selectedTaskId) {
@@ -9342,13 +9533,13 @@ async function executeTask(context, args, options) {
       await runProjectMainSyncPreflight(context, { disabled: skipProjectSyncResult.value });
       const projectDefaults = await loadTaskRunProjectDefaults(context.projectRoot);
       const runtimeAdapter = normalizeRuntimeAdapter(runtimeAdapterResult.value ?? projectDefaults.runtimeAdapter);
-      await runFastTaskRunPreflight(context, {
+      await withSpinner("Running task-run preflight\u2026", () => runFastTaskRunPreflight(context, {
         taskId: selectedTaskId,
         runtimeAdapter
-      });
+      }), { outputMode: context.outputMode });
       const dirtyBaseline = await resolveDirtyBaselineForTaskRun(context, dirtyBaselineResult.value);
       const prMode = noPrResult.value ? "off" : normalizePrMode(prResult.value) ?? projectDefaults.prMode;
-      const submitted = await submitTaskRunViaServer(context, {
+      const submitted = await withSpinner("Dispatching run\u2026", () => submitTaskRunViaServer(context, {
         runId: context.runId,
         taskId: selectedTaskId ?? undefined,
         title: titleResult.value ?? undefined,
@@ -9359,7 +9550,7 @@ async function executeTask(context, args, options) {
         initialPrompt: initialPromptResult.value ?? undefined,
         baselineMode: dirtyBaseline.mode,
         prMode
-      });
+      }), { outputMode: context.outputMode });
       let attachDetails = null;
       if (!detachResult.value && context.outputMode === "text") {
         printFormattedOutput(formatSubmittedRun({
@@ -11537,7 +11728,7 @@ async function executeSetup(context, args) {
     case "check":
       requireNoExtraArgs(rest, `rig setup ${command}`);
       {
-        const checks = await withMutedConsole(context.outputMode === "json", () => runSetupCheck(context.projectRoot));
+        const checks = await withMutedConsole(context.outputMode === "json", () => runSetupCheck(context.projectRoot, context.outputMode));
         return { ok: true, group: "setup", command, details: { checks, failures: countDoctorFailures(checks) } };
       }
     case "setup":
@@ -11546,7 +11737,7 @@ async function executeSetup(context, args) {
       return { ok: true, group: "setup", command };
     case "preflight":
       requireNoExtraArgs(rest, "rig setup preflight");
-      await withMutedConsole(context.outputMode === "json", () => runSetupPreflight(context.projectRoot));
+      await withMutedConsole(context.outputMode === "json", () => runSetupPreflight(context.projectRoot, context.outputMode));
       return { ok: true, group: "setup", command };
     default:
       throw new CliError(`Unknown setup command: ${command}`, 1, { hint: "Run `rig setup --help` \u2014 commands are bootstrap|check|preflight." });
@@ -11567,8 +11758,8 @@ function runSetupInit(projectRoot) {
   }
   console.log("Harness directories ready.");
 }
-async function runSetupCheck(projectRoot) {
-  const doctorChecks = await runRigDoctorChecks({ projectRoot });
+async function runSetupCheck(projectRoot, outputMode = "text") {
+  const doctorChecks = await withSpinner("Running setup checks\u2026", (update) => runRigDoctorChecks({ projectRoot, onProgress: update }), { outputMode });
   console.log(formatDoctorChecks(doctorChecks));
   const failures = countDoctorFailures(doctorChecks);
   if (failures > 0) {
@@ -11576,8 +11767,8 @@ async function runSetupCheck(projectRoot) {
   }
   return doctorChecks;
 }
-async function runSetupPreflight(projectRoot) {
-  await runSetupCheck(projectRoot);
+async function runSetupPreflight(projectRoot, outputMode = "text") {
+  await runSetupCheck(projectRoot, outputMode);
   const validationRoot = resolve23(resolveControlPlaneDefinitionRoot(projectRoot), "validation");
   if (existsSync15(validationRoot)) {
     const validators = readdirSync3(validationRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());