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

package/dist/src/commands/run.js

@@ -194,6 +194,15 @@ function isRemoteConnectionSelected(projectRoot) {
 
 // packages/cli/src/commands/_server-client.ts
 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;
@@ -236,6 +245,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 {
@@ -245,6 +255,7 @@ async function ensureServerForCli(projectRoot) {
         serverProjectRoot
       };
     }
+    reportServerPhase("Starting local Rig server\u2026");
     const connection = await ensureLocalRigServerConnection(projectRoot);
     return {
       baseUrl: connection.baseUrl,
@@ -351,6 +362,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}`, {
@@ -811,7 +823,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;
@@ -834,6 +851,127 @@ async function attachRunBundledPiFrontend(context, input) {
   };
 }
 
+// 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/_operator-view.ts
 var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
 function runStatusFromPayload(payload) {
@@ -876,8 +1014,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)) {
@@ -887,7 +1026,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);
@@ -927,7 +1066,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;
@@ -949,14 +1088,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 compactDate(value) {
   if (!value.trim())
@@ -1001,23 +1140,23 @@ 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 formatRunList(runs, options = {}) {
   if (runs.length === 0) {
     return [
       formatSection("Runs", "none recorded"),
-      options.source === "server" ? pc.dim("No runs recorded on the selected Rig server.") : pc.dim("No runs recorded in .rig/runs."),
+      options.source === "server" ? pc2.dim("No runs recorded on the selected Rig server.") : pc2.dim("No runs recorded in .rig/runs."),
       "",
       ...formatNextSteps(["Start one: `rig task run --next`", "Check server: `rig server status`"])
     ].join(`
@@ -1033,11 +1172,11 @@ function formatRunList(runs, options = {}) {
   });
   const idWidth = Math.min(36, Math.max(6, ...rows.map((row) => row.runId.length)));
   const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
-  const header = `${pc.bold(pad("RUN", idWidth))}  ${pc.bold(pad("STATUS", statusWidth))}  ${pc.bold("TITLE")}`;
+  const header = `${pc2.bold(pad("RUN", idWidth))}  ${pc2.bold(pad("STATUS", statusWidth))}  ${pc2.bold("TITLE")}`;
   const body = rows.map((row) => [
-    pc.bold(pad(truncate(row.runId, idWidth), idWidth)),
+    pc2.bold(pad(truncate(row.runId, idWidth), idWidth)),
     statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-    `${row.title}${row.runtime ? pc.dim(`  ${row.runtime}`) : ""}`
+    `${row.title}${row.runtime ? pc2.dim(`  ${row.runtime}`) : ""}`
   ].join("  "));
   return [formatSection("Runs", options.source === "server" ? "selected server" : "local state"), header, ...body, "", ...formatNextSteps(["Follow live: `rig run attach <run-id> --follow`", "Details: `rig run show <run-id>`"])].join(`
 `);
@@ -1062,7 +1201,7 @@ function formatRunCard(run, options = {}) {
   const approvals = Array.isArray(merged.approvals) ? merged.approvals.length : null;
   const inputs = Array.isArray(merged.userInputs) ? merged.userInputs.length : null;
   const rows = [
-    ["run", pc.bold(runId)],
+    ["run", pc2.bold(runId)],
     ["status", formatStatusPill(status)],
     ["task", taskId],
     ["title", title],
@@ -1088,17 +1227,17 @@ function formatRunStatus(summary, options = {}) {
   const activeRuns = summary.activeRuns ?? [];
   const recentRuns = summary.recentRuns ?? [];
   const lines = [formatSection("Run status", options.source === "server" ? "selected server" : "local state")];
-  lines.push("", pc.bold(`Active runs (${activeRuns.length})`));
+  lines.push("", pc2.bold(`Active runs (${activeRuns.length})`));
   if (activeRuns.length === 0) {
-    lines.push(pc.dim("No active runs."));
+    lines.push(pc2.dim("No active runs."));
   } else {
     for (const run of activeRuns) {
       lines.push(formatRunSummaryLine(run));
     }
   }
-  lines.push("", pc.bold(`Recent runs (${recentRuns.length})`));
+  lines.push("", pc2.bold(`Recent runs (${recentRuns.length})`));
   if (recentRuns.length === 0) {
-    lines.push(pc.dim("No recent terminal runs."));
+    lines.push(pc2.dim("No recent terminal runs."));
   } else {
     for (const run of recentRuns.slice(0, 10)) {
       lines.push(formatRunSummaryLine(run));
@@ -1116,7 +1255,7 @@ function formatRunSummaryLine(run) {
   const title = runTitleOf(record);
   const runtime = firstString(record, ["runtimeAdapter", "runtime", "adapter"]);
   const descriptor = [taskId, title].filter(Boolean).join(" \xB7 ");
-  return `${pc.dim("\u2502")} ${pc.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? pc.dim(`  ${runtime}`) : ""}`;
+  return `${pc2.dim("\u2502")} ${pc2.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? pc2.dim(`  ${runtime}`) : ""}`;
 }
 
 // packages/cli/src/commands/inbox.ts
@@ -1250,7 +1389,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);
@@ -1323,7 +1462,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 = readAuthorityRun2(context.projectRoot, runId) ?? normalizeRemoteRunDetails(await getRunDetailsViaServer(context, runId).catch(() => ({})));
+      const record = readAuthorityRun2(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." });
       }
@@ -1344,7 +1483,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") {
@@ -1421,8 +1561,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, {
@@ -1442,7 +1583,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") {
@@ -1577,7 +1718,8 @@ async function executeRun(context, args) {
         }
         return { ok: true, group: "run", command, details: { runId, dryRun: true } };
       }
-      await steerRunViaServer(context, runId, message.trim());
+      const trimmedMessage = message.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}.`);
       }
@@ -1598,7 +1740,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 };

package/dist/src/commands/server.js

@@ -361,6 +361,10 @@ 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 reportServerPhase(label) {
+  serverPhaseListener?.(label);
+}
 function cleanToken(value) {
   const trimmed = value?.trim();
   return trimmed ? trimmed : null;
@@ -403,6 +407,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 {
@@ -412,6 +417,7 @@ async function ensureServerForCli(projectRoot) {
         serverProjectRoot
       };
     }
+    reportServerPhase("Starting local Rig server\u2026");
     const connection = await ensureLocalRigServerConnection(projectRoot);
     return {
       baseUrl: connection.baseUrl,
@@ -518,6 +524,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}`, {