@h-rig/cli-surface-plugin 0.0.6-alpha.157 → 0.0.6-alpha.159

package/dist/src/app/drone-ui.d.ts

@@ -3,20 +3,9 @@ type DroneSelectOption<T extends string> = {
     readonly label: string;
     readonly hint?: string;
 };
-type DroneSpinner = {
-    start(message: string): void;
-    stop(message?: string): void;
-    error(message?: string): void;
-};
 export declare function droneIntro(title: string, subtitle?: string): void;
 export declare function droneOutro(text: string): void;
-export declare function droneNote(message: string, title?: string): void;
-export declare function droneStep(text: string): void;
-export declare function droneInfo(text: string): void;
-export declare function droneWarn(text: string): void;
-export declare function droneError(text: string): void;
 export declare function droneCancel(text: string): void;
-export declare function droneSpinner(): DroneSpinner;
 export declare function droneSelect<T extends string>(input: {
     readonly message: string;
     readonly options: readonly DroneSelectOption<T>[];

package/dist/src/app/drone-ui.js

@@ -1,69 +1,6 @@
 // @bun
 // packages/cli-surface-plugin/src/app/drone-ui.ts
 import { Input, matchesKey, ProcessTerminal, SelectList, Text, TUI } from "@oh-my-pi/pi-tui";
-
-// packages/cli-surface-plugin/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 ?? 16) : 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-surface-plugin/src/app/drone-ui.ts
 var PALETTE = {
   ink: "#f2f3f6",
   ink2: "#aeb0ba",
@@ -106,12 +43,6 @@ var MICRO_DRONE_FRAMES = Array.from({ length: 12 }, (_, index) => {
 function bold(text) {
   return `\x1B[1m${text}\x1B[22m`;
 }
-function renderMicroDroneFrame(frame) {
-  const tick = Math.max(0, MICRO_DRONE_FRAMES.indexOf(frame));
-  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
-  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
-  return `${ink4("(")}${cyan(blade)}${ink4(")")}${bold(accent(eye))}${ink4("(")}${cyan(blade)}${ink4(")")}`;
-}
 function hairline(width = Math.min(process.stdout.columns ?? 80, 100)) {
   return ink4("\u2500".repeat(Math.max(10, width)));
 }
@@ -125,48 +56,9 @@ function droneOutro(text) {
   console.log(` ${accent("\u25C6")} ${ink2(text)}`);
   console.log("");
 }
-function droneNote(message, title) {
-  if (title)
-    console.log(` ${accentDim("\u25C7")} ${bold(ink2(title))}`);
-  for (const line of message.split(`
-`))
-    console.log(` ${ink4("\u2502")} ${line}`);
-}
-function droneStep(text) {
-  console.log(` ${accent("\u203A")} ${ink(text)}`);
-}
-function droneInfo(text) {
-  console.log(` ${cyan("\xB7")} ${ink2(text)}`);
-}
-function droneWarn(text) {
-  console.log(` ${yellow("\u25B2")} ${ink2(text)}`);
-}
-function droneError(text) {
-  console.log(` ${red("\u2716")} ${ink2(text)}`);
-}
 function droneCancel(text) {
   console.log(` ${red("\u2716")} ${ink3(text)}`);
 }
-function droneSpinner() {
-  let active = null;
-  return {
-    start(message) {
-      active = createTtySpinner({
-        label: message,
-        frames: MICRO_DRONE_FRAMES,
-        styleFrame: renderMicroDroneFrame
-      });
-    },
-    stop(message) {
-      active?.stop(message ? ` ${accent("\u25C6")} ${ink2(message)}` : undefined);
-      active = null;
-    },
-    error(message) {
-      active?.stop(message ? ` ${red("\u2716")} ${ink2(message)}` : undefined);
-      active = null;
-    }
-  };
-}
 var DRONE_SYMBOLS = {
   cursor: "\u2192",
   inputCursor: "\u258F",
@@ -263,16 +155,10 @@ async function droneConfirm(input) {
   return answer === null ? null : answer === "yes";
 }
 export {
-  droneWarn,
   droneText,
-  droneStep,
-  droneSpinner,
   droneSelect,
   droneOutro,
-  droneNote,
   droneIntro,
-  droneInfo,
-  droneError,
   droneConfirm,
   droneCancel
 };

package/dist/src/commands/_async-ui.d.ts

@@ -1,4 +1,4 @@
-import type { OutputMode } from "@rig/runtime";
+import type { OutputMode } from "@rig/contracts";
 export type SpinnerOutput = Pick<NodeJS.WriteStream, "write"> & {
     readonly isTTY?: boolean;
 };

package/dist/src/commands/_cli-format.d.ts

@@ -1,18 +1,9 @@
-export type CliTaskLike = Record<string, unknown>;
 export type CliRunLike = Record<string, unknown>;
 export declare function printFormattedOutput(message: string): void;
 export declare function formatStatusPill(status: string): string;
 export declare function formatSection(title: string, subtitle?: string): string;
 export declare function formatSuccessCard(title: string, rows?: Array<[string, string | number | null | undefined]>): string;
 export declare function formatNextSteps(steps: readonly string[]): string[];
-export declare function formatTaskList(tasks: readonly CliTaskLike[], options?: {
-    raw?: boolean;
-}): string;
-export declare function formatTaskCard(task: CliTaskLike, options?: {
-    title?: string;
-    selected?: boolean;
-}): string;
-export declare function formatTaskDetails(task: CliTaskLike): string;
 export declare function formatRunList(runs: readonly CliRunLike[], options?: {
     source?: "local" | "server";
 }): string;
@@ -33,24 +24,4 @@ export declare function formatRunStatus(summary: {
     source?: "local" | "server";
 }): string;
 export declare function formatInboxList(kind: "approvals" | "inputs", entries: readonly Record<string, unknown>[]): string;
-export declare function formatConnectionList(connections: Record<string, {
-    kind: string;
-    baseUrl?: string;
-    mode?: string;
-}>): string;
-export declare function formatConnectionStatus(selected: string, connections: Record<string, {
-    kind: string;
-    baseUrl?: string;
-    mode?: string;
-}>, repo?: {
-    project?: string;
-    serverProjectRoot?: string;
-} | null, remoteProjectLink?: {
-    ok?: boolean;
-    status?: string;
-    serverProjectRoot?: string;
-    message?: string;
-    hint?: string;
-} | null): string;
 export declare function formatStatsTable(rows: Array<[string, unknown]>): string;
-export declare function readOptionalCount(record: Record<string, unknown>, key: string): number | null;

package/dist/src/commands/_cli-format.js

@@ -1,7 +1,6 @@
 // @bun
 // packages/cli-surface-plugin/src/commands/_cli-format.ts
 import pc from "picocolors";
-import { runStatusColorRole, runStatusText, statusColorRole } from "@rig/run-worker/runs";
 var dim = pc.dim;
 var faintBar = pc.dim("\u2502");
 var accent = pc.cyan;
@@ -9,14 +8,6 @@ function numberField(record, key) {
   const value = record[key];
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
-function arrayField(record, key) {
-  const value = record[key];
-  return Array.isArray(value) ? value.filter((entry) => typeof entry === "string" && entry.trim().length > 0) : [];
-}
-function rawObject(record) {
-  const value = record.raw;
-  return value && typeof value === "object" && !Array.isArray(value) ? value : record;
-}
 function truncate(value, width) {
   return value.length <= width ? value : `${value.slice(0, Math.max(0, width - 1))}\u2026`;
 }
@@ -38,6 +29,52 @@ function colorForRole(role) {
       return pc.dim;
   }
 }
+function normalizeStatus(status) {
+  const normalized = String(status ?? "").trim().toLowerCase().replace(/[\s_]+/g, "-");
+  return normalized === "waiting-input" ? "waiting-user-input" : normalized;
+}
+function statusColorRole(status) {
+  switch (normalizeStatus(status)) {
+    case "done":
+    case "completed":
+    case "ready":
+    case "healthy":
+    case "approved":
+    case "merged":
+      return "success";
+    case "needs-attention":
+    case "waiting-approval":
+    case "waiting-user-input":
+    case "blocked":
+    case "paused":
+      return "action-yellow";
+    case "running":
+    case "adopted":
+    case "preparing":
+    case "created":
+    case "queued":
+    case "starting":
+    case "pending":
+    case "in-progress":
+    case "active":
+    case "booting":
+    case "validating":
+    case "reviewing":
+    case "closing-out":
+      return "active-cyan";
+    case "failed":
+    case "error":
+    case "rejected":
+      return "failure";
+    case "stopped":
+    case "cancelled":
+    case "canceled":
+    case "stale":
+      return "muted";
+    default:
+      return "neutral";
+  }
+}
 function statusColor(status) {
   return colorForRole(statusColorRole(status));
 }
@@ -77,10 +114,20 @@ function requestIdOf(entry) {
   return firstString(entry, ["requestId", "id", "approvalId", "inputId"], "(unknown-request)");
 }
 function runLikeStatusText(run) {
-  return runStatusText(run);
+  const record = run;
+  const normalized = normalizeStatus(record.status);
+  return normalized || (record.live === true && record.stale !== true ? "starting" : "unknown");
 }
 function runLikeStatusColor(run) {
-  return colorForRole(runStatusColorRole(run));
+  const record = run;
+  const pendingApprovals = numberField(record, "pendingApprovals") ?? 0;
+  const pendingInputs = numberField(record, "pendingInputs") ?? 0;
+  const stallCount = numberField(record, "stallCount") ?? 0;
+  const status = runLikeStatusText(run);
+  if (status !== "completed" && status !== "failed" && status !== "stopped" && (status === "needs-attention" || pendingApprovals + pendingInputs > 0 || stallCount > 0)) {
+    return colorForRole("action-yellow");
+  }
+  return colorForRole(statusColorRole(status));
 }
 function printFormattedOutput(message) {
   console.log(message);
@@ -105,61 +152,6 @@ function formatNextSteps(steps) {
 function formatLegacyAutomationSurface() {
   return [];
 }
-function formatTaskList(tasks, options = {}) {
-  if (tasks.length === 0) {
-    return [formatSection("Tasks", "empty"), dim("No tasks available."), "", ...formatNextSteps(["Refresh: `rig task list`", "Pick next: `rig task next`"])].join(`
-`);
-  }
-  if (options.raw) {
-    return JSON.stringify(tasks, null, 2);
-  }
-  const rows = tasks.map((task) => summarizeTaskRow(task));
-  const idWidth = Math.max(2, ...rows.map((row) => row.id.length));
-  const statusWidth = Math.max(6, ...rows.map((row) => row.status.length));
-  const body = rows.map((row) => {
-    const labels = row.labels.length > 0 ? dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
-    const source = row.source ? dim(`  ${row.source}`) : "";
-    return [
-      pc.bold(pad(truncate(row.id, idWidth), idWidth)),
-      statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-      `${row.title}${labels}${source}`
-    ].join("  ");
-  });
-  return [formatSection("Tasks", `${tasks.length}`), ...body].join(`
-`);
-}
-function summarizeTaskRow(task) {
-  const raw = rawObject(task);
-  return {
-    id: firstString(task, ["id", "taskId"], "(unknown-task)"),
-    title: firstString(task, ["title", "summary", "name"], "(untitled)"),
-    status: firstString(task, ["status"], "unknown"),
-    labels: arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels"),
-    source: firstString(task, ["source"], "")
-  };
-}
-function formatTaskCard(task, options = {}) {
-  const raw = rawObject(task);
-  const lines = [formatSection(options.title ?? (options.selected ? "Selected task" : "Task"))];
-  for (const [label, value] of [
-    ["id", firstString(task, ["id", "taskId"], "(unknown-task)")],
-    ["title", firstString(task, ["title", "summary", "name"], "(untitled)")],
-    ["status", firstString(task, ["status"], "unknown")],
-    ["source", firstString(task, ["source"], "")],
-    ["url", firstString(raw, ["url"], "")]
-  ]) {
-    if (value)
-      lines.push(`${faintBar} ${dim(label.padEnd(12))} ${value}`);
-  }
-  const labels = arrayField(task, "labels");
-  if (labels.length > 0)
-    lines.push(`${faintBar} ${dim("labels".padEnd(12))} ${labels.map((label) => `#${label}`).join(" ")}`);
-  return lines.join(`
-`);
-}
-function formatTaskDetails(task) {
-  return formatTaskCard(task, { title: "Task details" });
-}
 function formatRunList(runs, options = {}) {
   if (runs.length === 0) {
     return [
@@ -267,56 +259,12 @@ function formatInboxList(kind, entries) {
   return lines.join(`
 `);
 }
-function formatConnectionList(connections) {
-  const names = Object.keys(connections).sort();
-  if (names.length === 0) {
-    return [formatSection("Rig servers", "empty"), dim("No saved server connections.")].join(`
-`);
-  }
-  return [formatSection("Rig servers", `${names.length}`), ...names.map((name) => {
-    const connection = connections[name];
-    const target = connection.kind === "remote" ? connection.baseUrl ?? "(missing url)" : connection.mode ?? "local";
-    return `${faintBar} ${pc.bold(name)} ${dim(connection.kind)} ${target}`;
-  })].join(`
-`);
-}
-function formatConnectionStatus(selected, connections, repo, remoteProjectLink) {
-  const selectedConnection = connections[selected];
-  const lines = [formatSection("Rig server", "selected for this repo")];
-  lines.push(`${faintBar} ${dim("selected".padEnd(12))} ${pc.bold(selected)}`);
-  if (selectedConnection) {
-    lines.push(`${faintBar} ${dim("kind".padEnd(12))} ${selectedConnection.kind}`);
-    if (selectedConnection.baseUrl)
-      lines.push(`${faintBar} ${dim("base url".padEnd(12))} ${selectedConnection.baseUrl}`);
-    if (selectedConnection.mode)
-      lines.push(`${faintBar} ${dim("mode".padEnd(12))} ${selectedConnection.mode}`);
-  }
-  if (repo?.project)
-    lines.push(`${faintBar} ${dim("project".padEnd(12))} ${repo.project}`);
-  if (repo?.serverProjectRoot)
-    lines.push(`${faintBar} ${dim("server root".padEnd(12))} ${repo.serverProjectRoot}`);
-  if (remoteProjectLink?.status)
-    lines.push(`${faintBar} ${dim("link".padEnd(12))} ${remoteProjectLink.status}`);
-  if (remoteProjectLink?.message)
-    lines.push(`${faintBar} ${dim("message".padEnd(12))} ${remoteProjectLink.message}`);
-  if (remoteProjectLink?.hint)
-    lines.push(`${faintBar} ${dim("hint".padEnd(12))} ${remoteProjectLink.hint}`);
-  return lines.join(`
-`);
-}
 function formatStatsTable(rows) {
   return rows.map(([label, value]) => `${faintBar} ${dim(label.padEnd(20))} ${compactValue(value)}`).join(`
 `);
 }
-function readOptionalCount(record, key) {
-  return numberField(record, key);
-}
 export {
-  readOptionalCount,
   printFormattedOutput,
-  formatTaskList,
-  formatTaskDetails,
-  formatTaskCard,
   formatSuccessCard,
   formatSubmittedRun,
   formatStatusPill,
@@ -326,7 +274,5 @@ export {
   formatRunList,
   formatRunCard,
   formatNextSteps,
-  formatInboxList,
-  formatConnectionStatus,
-  formatConnectionList
+  formatInboxList
 };

package/dist/src/commands/_connection-state.d.ts

@@ -5,50 +5,23 @@ export type RigConnection = {
     kind: "remote";
     baseUrl: string;
 };
-export type GlobalConnectionState = {
-    connections: Record<string, RigConnection>;
-};
 export type RepoConnectionState = {
     selected: string;
-    project?: string;
-    linkedAt?: string;
+    project?: string | undefined;
+    linkedAt?: string | undefined;
     /**
      * The server-host project root this repo scopes to (multi-root serving).
      * Sent as the x-rig-project-root header on every remote request.
      */
-    serverProjectRoot?: string;
+    serverProjectRoot?: string | undefined;
     /** The selected alias that produced serverProjectRoot. Prevents cross-alias reuse. */
-    serverProjectRootAlias?: string;
+    serverProjectRootAlias?: string | undefined;
     /** The remote base URL that produced serverProjectRoot. Prevents same-alias retarget leaks. */
-    serverProjectRootBaseUrl?: string;
+    serverProjectRootBaseUrl?: string | undefined;
 };
-export declare function resolveGlobalConnectionsPath(env?: NodeJS.ProcessEnv): string;
 export declare function resolveRepoConnectionPath(projectRoot: string): string;
-export declare function readGlobalConnections(options?: {
-    env?: NodeJS.ProcessEnv;
-}): GlobalConnectionState;
-export declare function writeGlobalConnections(state: GlobalConnectionState, options?: {
-    env?: NodeJS.ProcessEnv;
-}): void;
-export declare function upsertGlobalConnection(alias: string, connection: RigConnection, options?: {
-    env?: NodeJS.ProcessEnv;
-}): GlobalConnectionState;
 export declare function readRepoConnection(projectRoot: string): RepoConnectionState | null;
 export declare function writeRepoConnection(projectRoot: string, state: RepoConnectionState): void;
-export declare function resolveSelectedConnection(projectRoot: string, options?: {
-    env?: NodeJS.ProcessEnv;
-}): {
-    alias: string;
-    connection: RigConnection;
-    serverProjectRoot?: string;
-} | null;
 /** Persist the server-host project root this repo scopes to (multi-root serving). */
-export declare function writeRepoServerProjectRoot(projectRoot: string, serverProjectRoot: string, metadata?: {
-    alias?: string;
-    baseUrl?: string;
-    project?: string;
-}): void;
 /** Remove a stale server-host root while preserving selected server/repo state. */
-export declare function clearRepoServerProjectRoot(projectRoot: string): void;
-/** Whether this repo's selected connection targets a remote Rig server. */
-export declare function isRemoteConnectionSelected(projectRoot: string): boolean;
+/** Whether this repo's selected connection targets a remote Rig server. */