@h-rig/cli 0.0.6-alpha.66 → 0.0.6-alpha.68

package/dist/src/commands/task.js

@@ -213,6 +213,15 @@ import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } 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;
@@ -255,6 +264,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 {
@@ -264,6 +274,7 @@ async function ensureServerForCli(projectRoot) {
         serverProjectRoot
       };
     }
+    reportServerPhase("Starting local Rig server\u2026");
     const connection = await ensureLocalRigServerConnection(projectRoot);
     return {
       baseUrl: connection.baseUrl,
@@ -380,6 +391,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}`, {
@@ -1025,6 +1037,127 @@ async function selectTaskWithTextPicker(tasks, io = {}) {
   return Number.isFinite(index) ? tasks[index] ?? null : null;
 }
 
+// packages/cli/src/commands/_async-ui.ts
+import pc 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 = pc.green("\u25C7");
+var FAIL_SYMBOL = pc.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 spinner = createTtySpinner({
+    label,
+    output,
+    frames: CLACK_SPINNER_FRAMES,
+    styleFrame: (frame) => pc.magenta(frame)
+  });
+  const update = (next) => {
+    lastLabel = next;
+    spinner.setLabel(next);
+  };
+  activeUpdate = update;
+  const previousListener = setServerPhaseListener(update);
+  try {
+    const result = await work(update);
+    spinner.stop(options.doneLabel ? `${DONE_SYMBOL} ${options.doneLabel}` : undefined);
+    return result;
+  } catch (error) {
+    spinner.stop(`${FAIL_SYMBOL} ${lastLabel}`);
+    throw error;
+  } finally {
+    activeUpdate = null;
+    setServerPhaseListener(previousListener);
+  }
+}
+
 // packages/cli/src/commands/_pi-frontend.ts
 import { mkdtempSync, rmSync } from "fs";
 import { tmpdir } from "os";
@@ -1072,7 +1205,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;
@@ -1137,8 +1275,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)) {
@@ -1148,7 +1287,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);
@@ -1188,7 +1327,7 @@ async function attachRunOperatorView(context, input) {
 
 // packages/cli/src/commands/_cli-format.ts
 import { log, note } from "@clack/prompts";
-import pc from "picocolors";
+import pc2 from "picocolors";
 function stringField(record, key, fallback = "") {
   const value = record[key];
   return typeof value === "string" && value.trim() ? value.trim() : fallback;
@@ -1218,14 +1357,14 @@ function pad(value, width) {
 function statusColor(status) {
   const normalized = status.toLowerCase();
   if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved"].includes(normalized))
-    return pc.green;
+    return pc2.green;
   if (["failed", "needs_attention", "needs-attention", "blocked", "error", "rejected"].includes(normalized))
-    return pc.red;
+    return pc2.red;
   if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
-    return pc.cyan;
+    return pc2.cyan;
   if (["ready", "open", "queued", "created", "preparing", "local", "pending"].includes(normalized))
-    return pc.yellow;
-  return pc.dim;
+    return pc2.yellow;
+  return pc2.dim;
 }
 function compactValue(value) {
   if (value === null || value === undefined)
@@ -1256,17 +1395,17 @@ function formatStatusPill(status) {
   return statusColor(label)(`\u25CF ${label}`);
 }
 function formatSection(title, subtitle) {
-  return `${pc.bold(pc.cyan("\u25C6"))} ${pc.bold(title)}${subtitle ? pc.dim(` \u2014 ${subtitle}`) : ""}`;
+  return `${pc2.bold(pc2.cyan("\u25C6"))} ${pc2.bold(title)}${subtitle ? pc2.dim(` \u2014 ${subtitle}`) : ""}`;
 }
 function formatSuccessCard(title, rows = []) {
-  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc.dim("\u2502")} ${pc.dim(key.padEnd(12))} ${value}`);
+  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc2.dim("\u2502")} ${pc2.dim(key.padEnd(12))} ${value}`);
   return [formatSection(title), ...body].join(`
 `);
 }
 function formatNextSteps(steps) {
   if (steps.length === 0)
     return [];
-  return [pc.bold("Next"), ...steps.map((step) => `${pc.dim("\u203A")} ${step}`)];
+  return [pc2.bold("Next"), ...steps.map((step) => `${pc2.dim("\u203A")} ${step}`)];
 }
 function formatTaskList(tasks, options = {}) {
   if (options.raw)
@@ -1286,12 +1425,12 @@ function formatTaskList(tasks, options = {}) {
   });
   const idWidth = Math.min(18, Math.max(4, ...rows.map((row) => row.id.length)));
   const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
-  const header = `${pc.bold(pad("TASK", idWidth))}  ${pc.bold(pad("STATUS", statusWidth))}  ${pc.bold("TITLE")}`;
+  const header = `${pc2.bold(pad("TASK", idWidth))}  ${pc2.bold(pad("STATUS", statusWidth))}  ${pc2.bold("TITLE")}`;
   const body = rows.map((row) => {
-    const labels = row.labels.length > 0 ? pc.dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
-    const source = row.source ? pc.dim(`  ${row.source}`) : "";
+    const labels = row.labels.length > 0 ? pc2.dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
+    const source = row.source ? pc2.dim(`  ${row.source}`) : "";
     return [
-      pc.bold(pad(truncate(row.id, idWidth), idWidth)),
+      pc2.bold(pad(truncate(row.id, idWidth), idWidth)),
       statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
       `${row.title}${labels}${source}`
     ].join("  ");
@@ -1312,7 +1451,7 @@ function formatTaskCard(task, options = {}) {
   const readiness = compactValue(task.readiness ?? raw.readiness);
   const validators = compactValue(task.validators ?? raw.validators ?? task.validation ?? raw.validation);
   const rows = [
-    ["task", pc.bold(id)],
+    ["task", pc2.bold(id)],
     ["status", formatStatusPill(status)],
     ["title", title],
     ["source", source],
@@ -1334,12 +1473,12 @@ function formatTaskDetails(task) {
   return formatTaskCard(task, { title: "Task details" });
 }
 function formatSubmittedRun(input) {
-  const rows = [["run", pc.bold(input.runId)]];
+  const rows = [["run", pc2.bold(input.runId)]];
   if (input.task) {
     const id = stringField(input.task, "id", "<unknown>");
     const status = stringField(input.task, "status", "unknown");
     const title = stringField(input.task, "title", "Untitled task");
-    rows.push(["task", `${pc.bold(id)} ${formatStatusPill(status)} ${title}`]);
+    rows.push(["task", `${pc2.bold(id)} ${formatStatusPill(status)} ${title}`]);
   }
   const runtime = [input.runtimeAdapter || "pi", input.runtimeMode || "full-access", input.interactionMode || "default"].filter(Boolean).join(" \xB7 ");
   rows.push(["runtime", runtime]);
@@ -1395,7 +1534,7 @@ async function printPendingInboxFooter(context) {
 
 // packages/cli/src/commands/_help-catalog.ts
 import { intro, log as log2, note as note2, outro } from "@clack/prompts";
-import pc2 from "picocolors";
+import pc3 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
     title: "Start here",
@@ -1677,13 +1816,13 @@ var ADVANCED_GROUPS = [
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
-  return pc2.bold(pc2.cyan(title));
+  return pc3.bold(pc3.cyan(title));
 }
 function renderRigBanner(version) {
-  const m = (s) => pc2.bold(pc2.magenta(s));
-  const c = (s) => pc2.bold(pc2.cyan(s));
-  const y = (s) => pc2.yellow(s);
-  const d = (s) => pc2.dim(s);
+  const m = (s) => pc3.bold(pc3.magenta(s));
+  const c = (s) => pc3.bold(pc3.cyan(s));
+  const y = (s) => pc3.yellow(s);
+  const d = (s) => pc3.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"),
@@ -1692,7 +1831,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")} ${pc2.bold("the control rig for autonomous coding agents")} ${m("//")} ${d("you are the operator")}`,
+    `    ${c("\u25E2\u25E4")} ${pc3.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(`
@@ -1700,7 +1839,7 @@ function renderRigBanner(version) {
 }
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
-  return `${pc2.dim("\u2502")} ${pc2.bold(commandColumn)} ${description}`;
+  return `${pc3.dim("\u2502")} ${pc3.bold(commandColumn)} ${description}`;
 }
 function renderCommandBlock(commands) {
   return commands.map((entry) => commandLine(entry.command, entry.description)).join(`
@@ -1710,37 +1849,37 @@ function renderGroup(group) {
   const lines = [
     `${heading(`rig ${group.name}`)} \u2014 ${group.summary}`,
     "",
-    pc2.bold("Usage"),
+    pc3.bold("Usage"),
     ...group.usage.map((line) => `  ${line}`),
     "",
-    pc2.bold("Commands"),
+    pc3.bold("Commands"),
     ...group.commands.map((entry) => commandLine(entry.command, entry.description))
   ];
   if (group.examples?.length) {
-    lines.push("", pc2.bold("Examples"), ...group.examples.map((line) => `  ${pc2.dim("$")} ${line}`));
+    lines.push("", pc3.bold("Examples"), ...group.examples.map((line) => `  ${pc3.dim("$")} ${line}`));
   }
   if (group.next?.length) {
-    lines.push("", pc2.bold("Next steps"), ...group.next.map((line) => `  ${pc2.dim("\u203A")} ${line}`));
+    lines.push("", pc3.bold("Next steps"), ...group.next.map((line) => `  ${pc3.dim("\u203A")} ${line}`));
   }
   if (group.advanced?.length) {
-    lines.push("", pc2.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc2.dim("\u203A")} ${line}`));
+    lines.push("", pc3.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc3.dim("\u203A")} ${line}`));
   }
   return lines.join(`
 `);
 }
 function renderTopLevelHelp() {
   return [
-    `${heading("rig")} ${pc2.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
-    pc2.dim("Current path: select a server, choose a task, submit a run, attach with native Pi, clear inbox gates."),
+    `${heading("rig")} ${pc3.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
+    pc3.dim("Current path: select a server, choose a task, submit a run, attach with native Pi, clear inbox gates."),
     "",
     ...TOP_LEVEL_SECTIONS.flatMap((section) => [
-      `${pc2.bold(pc2.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc2.dim(section.subtitle)}`,
+      `${pc3.bold(pc3.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc3.dim(section.subtitle)}`,
       renderCommandBlock(section.commands),
       ""
     ]),
-    pc2.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
+    pc3.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
     "",
-    pc2.bold("Global options"),
+    pc3.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.")
@@ -1979,7 +2118,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 }));
@@ -2003,7 +2142,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 });
@@ -2015,7 +2154,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 }));
@@ -2165,7 +2304,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) {
@@ -2176,7 +2315,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) {
@@ -2186,13 +2325,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,
@@ -2203,7 +2342,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({