@h-rig/cli 0.0.6-alpha.90 → 0.0.6-alpha.91

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

@@ -1,129 +1,40 @@
 // @bun
-// packages/cli/src/app/drone-ui.ts
-import { ProcessTerminal, TUI, Text, Input, SelectList, matchesKey } from "@earendil-works/pi-tui";
-
-// packages/cli/src/app/theme.ts
-var RIG_PALETTE = {
-  ink: "#f2f3f6",
-  ink2: "#aeb0ba",
-  ink3: "#6c6e79",
-  ink4: "#44464f",
-  accent: "#ccff4d",
-  accentDim: "#a9d63f",
-  cyan: "#56d8ff",
-  red: "#ff5d5d",
-  yellow: "#ffd24d"
-};
-function hexToRgb(hex) {
-  const value = hex.replace("#", "");
-  return [
-    Number.parseInt(value.slice(0, 2), 16),
-    Number.parseInt(value.slice(2, 4), 16),
-    Number.parseInt(value.slice(4, 6), 16)
-  ];
-}
-function fg(hex) {
-  const [r, g, b] = hexToRgb(hex);
-  return (text) => `\x1B[38;2;${r};${g};${b}m${text}\x1B[39m`;
-}
-var ink = fg(RIG_PALETTE.ink);
-var ink2 = fg(RIG_PALETTE.ink2);
-var ink3 = fg(RIG_PALETTE.ink3);
-var ink4 = fg(RIG_PALETTE.ink4);
-var accent = fg(RIG_PALETTE.accent);
-var accentDim = fg(RIG_PALETTE.accentDim);
-var cyan = fg(RIG_PALETTE.cyan);
-var red = fg(RIG_PALETTE.red);
-var yellow = fg(RIG_PALETTE.yellow);
-function bold(text) {
-  return `\x1B[1m${text}\x1B[22m`;
-}
-var DRONE_ART = [
-  "  .-=-.                   .-=-.   ",
-  " ( !!! )                 ( !!! )  ",
-  "  '-=-'._               _.'-=-'   ",
-  "        '._           _.'         ",
-  "           '=$$$$$$$=.'           ",
-  "          =$$$$$$$$$$$=           ",
-  "         $$$@@@@@@@@@@$$$         ",
-  "        $$$@@        @@$$$        ",
-  "        $$@    ?     @$$$         ",
-  "        $$$@   '-'   @$$$         ",
-  "        $$$@@        @@$$$        ",
-  "         $$$@@@@@@@@@@$$$         ",
-  "          =$$$$$$$$$$$=           ",
-  "           '=$$$$$$$=.'           ",
-  "        _.'           '._         ",
-  "  .-=-.'                 '.-=-.   ",
-  " ( !!! )                 ( !!! )  ",
-  "  '-=-'                   '-=-'   "
-];
-var EYE_FRAMES = ["@", "o", "."];
-var DRONE_WIDTH = DRONE_ART[0].length;
-var DRONE_HEIGHT = DRONE_ART.length;
-var MICRO_BLADES = ["---", "\\\\\\", "|||", "///"];
-function microDroneFrame(tick) {
-  const blade = MICRO_BLADES[tick % MICRO_BLADES.length];
-  const eye = EYE_FRAMES[Math.floor(tick / 2) % EYE_FRAMES.length];
-  return `(${blade})${eye}(${blade})`;
-}
-var MICRO_DRONE_FRAMES = Array.from({ length: 12 }, (_, index) => microDroneFrame(index));
-
-// packages/cli/src/app/drone-ui.ts
-function droneNote(message, title) {
-  if (title)
-    console.log(` ${accentDim("\u25C7")} ${bold(ink2(title))}`);
-  for (const line of message.split(`
-`)) {
-    console.log(` ${ink4("\u2502")} ${line}`);
-  }
-}
-
 // packages/cli/src/commands/_cli-format.ts
 import pc from "picocolors";
-var themeDim = (value) => ink3(value);
-var themeFaint = (value) => ink4(value);
-function stringField(record, key, fallback = "") {
-  const value = record[key];
-  return typeof value === "string" && value.trim() ? value.trim() : fallback;
-}
+var dim = pc.dim;
+var faintBar = pc.dim("\u2502");
+var accent = pc.cyan;
 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.flatMap((entry) => typeof entry === "string" && entry.trim() ? [entry.trim()] : []) : [];
+  return Array.isArray(value) ? value.filter((entry) => typeof entry === "string" && entry.trim().length > 0) : [];
 }
 function rawObject(record) {
-  const raw = record.raw;
-  return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+  const value = record.raw;
+  return value && typeof value === "object" && !Array.isArray(value) ? value : record;
 }
 function truncate(value, width) {
-  if (value.length <= width)
-    return value;
-  if (width <= 1)
-    return "\u2026";
-  return `${value.slice(0, width - 1)}\u2026`;
+  return value.length <= width ? value : `${value.slice(0, Math.max(0, width - 1))}\u2026`;
 }
 function pad(value, width) {
   return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
 }
 function statusColor(status) {
-  const normalized = status.toLowerCase();
-  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved", "running"].includes(normalized))
-    return accent;
-  if (["failed", "needs_attention", "needs-attention", "blocked", "error", "rejected"].includes(normalized))
-    return red;
-  if (["reviewing", "validating", "in_progress", "in-progress", "remote", "preparing", "closing-out"].includes(normalized))
-    return cyan;
-  if (["ready", "open", "queued", "created", "local", "pending"].includes(normalized))
-    return yellow;
-  return themeDim;
+  const normalized = status.trim().toLowerCase();
+  if (["done", "completed", "ready", "healthy", "open", "approved"].includes(normalized))
+    return pc.green;
+  if (["failed", "error", "blocked", "rejected", "stopped"].includes(normalized))
+    return pc.red;
+  if (["running", "in_progress", "in-progress", "active", "booting"].includes(normalized))
+    return pc.cyan;
+  if (["pending", "queued", "created", "local"].includes(normalized))
+    return pc.yellow;
+  return pc.dim;
 }
 function compactDate(value) {
-  if (!value.trim())
-    return "";
   const parsed = Date.parse(value);
   if (!Number.isFinite(parsed))
     return value;
@@ -131,19 +42,17 @@ function compactDate(value) {
 }
 function compactValue(value) {
   if (value === null || value === undefined)
-    return "";
+    return "\u2014";
   if (typeof value === "string")
     return value;
   if (typeof value === "number" || typeof value === "boolean")
     return String(value);
-  if (Array.isArray(value))
-    return value.map(compactValue).filter(Boolean).join(", ");
   return JSON.stringify(value);
 }
 function firstString(record, keys, fallback = "") {
   for (const key of keys) {
-    const value = stringField(record, key);
-    if (value)
+    const value = record[key];
+    if (typeof value === "string" && value.trim())
       return value;
   }
   return fallback;
@@ -160,25 +69,18 @@ function runTitleOf(run) {
 function requestIdOf(entry) {
   return firstString(entry, ["requestId", "id", "approvalId", "inputId"], "(unknown-request)");
 }
-function shouldUseClackOutput() {
-  return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
-}
-function printFormattedOutput(message, options = {}) {
-  if (!shouldUseClackOutput()) {
-    console.log(message);
-    return;
-  }
-  droneNote(message, options.title);
+function printFormattedOutput(message) {
+  console.log(message);
 }
 function formatStatusPill(status) {
   const label = status || "unknown";
   return statusColor(label)(`\u25CF ${label}`);
 }
 function formatSection(title, subtitle) {
-  return `${pc.bold(accent("\u25C6"))} ${pc.bold(title)}${subtitle ? themeDim(` \u2014 ${subtitle}`) : ""}`;
+  return `${pc.bold(accent("\u25C6"))} ${pc.bold(title)}${subtitle ? dim(` \u2014 ${subtitle}`) : ""}`;
 }
 function formatSuccessCard(title, rows = []) {
-  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${themeFaint("\u2502")} ${themeDim(key.padEnd(12))} ${value}`);
+  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${faintBar} ${dim(key.padEnd(12))} ${value}`);
   return [formatSection(title), ...body].join(`
 `);
 }
@@ -187,66 +89,59 @@ function formatNextSteps(steps) {
     return [];
   return [pc.bold("Next"), ...steps.map((step) => `${accent("\u203A")} ${step}`)];
 }
+function formatLegacyAutomationSurface() {
+  return [];
+}
 function formatTaskList(tasks, options = {}) {
-  if (options.raw)
-    return tasks.map((task) => JSON.stringify(task)).join(`
+  if (tasks.length === 0) {
+    return [formatSection("Tasks", "empty"), dim("No tasks available."), "", ...formatNextSteps(["Refresh: `rig task list`", "Pick next: `rig task next`"])].join(`
 `);
-  if (tasks.length === 0)
-    return [formatSection("Tasks", "none found"), ...formatNextSteps(["Try `rig server status` to confirm the selected server.", "Relax filters or run `rig task run --title ... --initial-prompt ...` for ad hoc work."])].join(`
-`);
-  const rows = tasks.map((task) => {
-    const raw = rawObject(task);
-    const id = stringField(task, "id", "<unknown>");
-    const status = stringField(task, "status", "unknown");
-    const title = stringField(task, "title", "Untitled task");
-    const source = stringField(task, "source", stringField(raw, "source", ""));
-    const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
-    return { id, status, title, source, labels };
-  });
-  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")}`;
+  }
+  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 ? themeDim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
-    const source = row.source ? themeDim(`  ${row.source}`) : "";
+    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", `${rows.length} shown`), header, ...body, "", ...formatNextSteps(["Run one: `rig task run <id>` or `rig task run --next`", "Attach later: `rig run attach <run-id> --follow`"])].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 id = stringField(task, "id", stringField(raw, "id", "<unknown>"));
-  const status = stringField(task, "status", stringField(raw, "status", "unknown"));
-  const title = stringField(task, "title", stringField(raw, "title", "Untitled task"));
-  const source = stringField(task, "source", stringField(raw, "source", ""));
-  const url = stringField(task, "url", stringField(raw, "url", ""));
-  const number = numberField(task, "number") ?? numberField(raw, "number");
-  const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
-  const assignees = arrayField(task, "assignees").length > 0 ? arrayField(task, "assignees") : arrayField(raw, "assignees");
-  const readiness = compactValue(task.readiness ?? raw.readiness);
-  const validators = compactValue(task.validators ?? raw.validators ?? task.validation ?? raw.validation);
-  const rows = [
-    ["task", pc.bold(id)],
-    ["status", formatStatusPill(status)],
-    ["title", title],
-    ["source", source],
-    ["number", number],
-    ["labels", labels.length ? labels.map((label) => `#${label}`).join(" ") : ""],
-    ["assignees", assignees.join(", ")],
-    ["readiness", readiness],
-    ["validators", validators],
-    ["url", url]
-  ];
-  return [
-    formatSuccessCard(options.title ?? (options.selected ? "Selected task" : "Task"), rows),
-    "",
-    ...formatNextSteps([`Start: \`rig task run ${id}\``, `Details: \`rig task show ${id} --raw\``])
-  ].join(`
+  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) {
@@ -256,179 +151,155 @@ function formatRunList(runs, options = {}) {
   if (runs.length === 0) {
     return [
       formatSection("Runs", "none recorded"),
-      options.source === "server" ? themeDim("No runs recorded on the selected Rig server.") : themeDim("No runs recorded in .rig/runs."),
+      options.source === "server" ? dim("No runs recorded on the selected server.") : dim("No runs recorded in local state."),
       "",
-      ...formatNextSteps(["Start one: `rig task run --next`", "Check server: `rig server status`"])
+      ...formatLegacyAutomationSurface()
     ].join(`
 `);
   }
-  const rows = runs.map((run) => {
-    const runId = stringField(run, "runId", stringField(run, "id", "(unknown-run)"));
-    const status = stringField(run, "status", "unknown");
-    const taskId = stringField(run, "taskId", "");
-    const title = stringField(run, "title", taskId || "(untitled)");
-    const runtime = stringField(run, "runtimeAdapter", "");
-    return { runId, status, title, runtime };
+  const body = runs.map((run) => {
+    const row = run;
+    const runId = runIdOf(row);
+    const status = firstString(row, ["status"], "unknown");
+    const runtime = firstString(row, ["runtime", "runtimeAdapter"], "");
+    return [
+      pc.bold(runId),
+      statusColor(status)(pad(truncate(status, 12), 12)),
+      `${runTitleOf(row)}${runtime ? dim(`  ${runtime}`) : ""}`
+    ].join("  ");
   });
-  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 body = rows.map((row) => [
-    pc.bold(pad(truncate(row.runId, idWidth), idWidth)),
-    statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-    `${row.title}${row.runtime ? themeDim(`  ${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(`
+  return [formatSection("Runs", options.source === "server" ? "selected server" : "local state"), ...body, "", ...formatLegacyAutomationSurface()].join(`
 `);
 }
 function formatSubmittedRun(input) {
-  const rows = [["run", pc.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}`]);
-  }
-  const runtime = [input.runtimeAdapter || "pi", input.runtimeMode || "full-access", input.interactionMode || "default"].filter(Boolean).join(" \xB7 ");
-  rows.push(["runtime", runtime]);
-  return [
-    formatSuccessCard("Run submitted", rows),
-    "",
-    ...formatNextSteps([
-      `Attach: \`rig run attach ${input.runId} --follow\``,
-      `Inspect: \`rig run show ${input.runId}\``,
-      input.detached ? "Submitted detached; attach when you are ready." : "Interactive mode opens the enriched bundled Pi (native UI + Rig layers, worker brain)."
-    ])
-  ].join(`
-`);
+  return formatSuccessCard("Run submitted", [
+    ["run", input.runId],
+    ["task", input.taskId ?? undefined],
+    ["title", input.title ?? undefined],
+    ["queue", input.queuePosition ?? undefined]
+  ]);
 }
 function formatRunCard(run, options = {}) {
-  const raw = rawObject(run);
-  const merged = { ...raw, ...run };
-  const runId = runIdOf(merged);
-  const status = firstString(merged, ["status"], "unknown");
-  const taskId = taskIdOf(merged);
-  const title = runTitleOf(merged);
-  const runtime = firstString(merged, ["runtimeAdapter", "runtime", "adapter"]);
-  const mode = firstString(merged, ["runtimeMode", "mode"]);
-  const interaction = firstString(merged, ["interactionMode"]);
-  const created = compactDate(firstString(merged, ["createdAt"]));
-  const started = compactDate(firstString(merged, ["startedAt"]));
-  const updated = compactDate(firstString(merged, ["updatedAt"]));
-  const completed = compactDate(firstString(merged, ["completedAt", "finishedAt"]));
-  const worktree = firstString(merged, ["worktreePath", "cwd", "projectRoot"]);
-  const piSession = merged.piSession && typeof merged.piSession === "object" && !Array.isArray(merged.piSession) ? firstString(merged.piSession, ["sessionId", "id"]) : "";
-  const timeline = Array.isArray(merged.timeline) ? merged.timeline.length : null;
-  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)],
-    ["status", formatStatusPill(status)],
-    ["task", taskId],
-    ["title", title],
-    ["runtime", [runtime, mode, interaction].filter(Boolean).join(" \xB7 ")],
-    ["created", created],
-    ["started", started],
-    ["updated", updated],
-    ["completed", completed],
-    ["worktree", worktree],
-    ["pi", piSession],
-    ["timeline", timeline],
-    ["approvals", approvals],
-    ["inputs", inputs]
-  ];
-  return [
-    formatSuccessCard(options.title ?? "Run details", rows),
-    "",
-    ...formatNextSteps([`Follow live: \`rig run attach ${runId} --follow\``, `Raw payload: \`rig run show ${runId} --raw\``])
-  ].join(`
+  const record = run;
+  const lines = [formatSection(options.title ?? "Run")];
+  for (const [label, value] of [
+    ["run", runIdOf(record)],
+    ["task", taskIdOf(record)],
+    ["title", runTitleOf(record)],
+    ["status", firstString(record, ["status"], "unknown")],
+    ["runtime", firstString(record, ["runtime", "runtimeAdapter"], "")],
+    ["created", firstString(record, ["createdAt"], "")],
+    ["updated", firstString(record, ["updatedAt"], "")]
+  ]) {
+    if (value)
+      lines.push(`${faintBar} ${dim(label.padEnd(12))} ${label === "created" || label === "updated" ? compactDate(value) : value}`);
+  }
+  const errorSummary = firstString(record, ["errorSummary"]);
+  if (errorSummary)
+    lines.push(`${faintBar} Error: ${errorSummary}`);
+  return lines.join(`
 `);
 }
 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})`));
-  if (activeRuns.length === 0) {
-    lines.push(themeDim("No active runs."));
-  } else {
-    for (const run of activeRuns) {
+  lines.push(`Active runs (${activeRuns.length})`);
+  if (activeRuns.length === 0)
+    lines.push(dim("No active runs."));
+  else
+    for (const run of activeRuns)
       lines.push(formatRunSummaryLine(run));
-    }
-  }
-  lines.push("", pc.bold(`Recent runs (${recentRuns.length})`));
-  if (recentRuns.length === 0) {
-    lines.push(themeDim("No recent terminal runs."));
-  } else {
-    for (const run of recentRuns.slice(0, 10)) {
+  lines.push("", `Recent runs (${recentRuns.length})`);
+  if (recentRuns.length === 0)
+    lines.push(dim("No recent terminal runs."));
+  else
+    for (const run of recentRuns.slice(0, 10))
       lines.push(formatRunSummaryLine(run));
-    }
-  }
-  lines.push("", ...formatNextSteps(["Start work: `rig task run --next`", "Attach: `rig run attach <run-id> --follow`", "Details: `rig run show <run-id>`"]));
+  lines.push("", ...formatLegacyAutomationSurface());
   return lines.join(`
 `);
 }
 function formatRunSummaryLine(run) {
   const record = run;
   const runId = runIdOf(record);
-  const status = firstString(record, ["status"], "unknown");
   const taskId = taskIdOf(record);
   const title = runTitleOf(record);
-  const runtime = firstString(record, ["runtimeAdapter", "runtime", "adapter"]);
+  const status = firstString(record, ["status"], "unknown");
+  const runtime = firstString(record, ["runtime", "runtimeAdapter"], "");
   const descriptor = [taskId, title].filter(Boolean).join(" \xB7 ");
-  return `${themeFaint("\u2502")} ${pc.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? themeDim(`  ${runtime}`) : ""}`;
+  return `${faintBar} ${pc.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? dim(`  ${runtime}`) : ""}`;
 }
 function formatInboxList(kind, entries) {
-  const title = kind === "approvals" ? "Approval inbox" : "Input inbox";
+  const title = kind === "approvals" ? "Pending approvals" : "Pending user input";
   if (entries.length === 0) {
     return [
       formatSection(title, "empty"),
-      themeDim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
+      dim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
       "",
-      ...formatNextSteps(["Check runs: `rig run status`", "Start work: `rig task run --next`"])
+      ...formatLegacyAutomationSurface()
     ].join(`
 `);
   }
-  const lines = [formatSection(title, `${entries.length} pending`)];
-  for (const entry of entries) {
-    const record = entry.record && typeof entry.record === "object" && !Array.isArray(entry.record) ? entry.record : entry;
-    const runId = firstString(entry, ["runId"], firstString(record, ["runId"]));
-    const taskId = firstString(entry, ["taskId"], firstString(record, ["taskId", "task"]));
-    const requestId = requestIdOf(record);
-    const status = firstString(record, ["status", "state"], "pending");
+  const lines = [formatSection(title, `${entries.length}`)];
+  for (const record of entries) {
+    const runId = firstString(record, ["runId"], "(unknown-run)");
+    const taskId = firstString(record, ["taskId"], "");
+    const status = firstString(record, ["status"], "pending");
     const prompt = firstString(record, ["prompt", "message", "reason", "title", "summary"], kind === "approvals" ? "Approval requested" : "Input requested");
-    lines.push(`${themeFaint("\u2502")} ${pc.bold(requestId)} ${formatStatusPill(status)} ${prompt}`);
-    lines.push(`${themeFaint("\u2502")} ${themeDim("run      ")} ${runId || "(unknown-run)"}${taskId ? themeDim(`  task ${taskId}`) : ""}`);
+    lines.push(`${faintBar} ${pc.bold(requestIdOf(record))} ${formatStatusPill(status)} ${prompt}`);
+    lines.push(`${faintBar} ${dim("run".padEnd(12))} ${runId}${taskId ? dim(`  task ${taskId}`) : ""}`);
   }
-  lines.push("", ...formatNextSteps(kind === "approvals" ? ["Resolve: `rig inbox approve --run <run-id> --request <request-id> --decision approve|reject`", "Rejoin: `rig run attach <run-id> --follow`"] : ["Respond: `rig inbox respond --run <run-id> --request <request-id> --answer key=value`", "Rejoin: `rig run attach <run-id> --follow`"]));
+  lines.push("", ...formatLegacyAutomationSurface(), ...formatNextSteps(kind === "approvals" ? ["Resolve: `rig inbox approve --run <run-id> --request <request-id> --decision approve|reject`"] : ["Reply: `rig inbox answer --run <run-id> --request <request-id> --text ...`"]));
   return lines.join(`
 `);
 }
 function formatConnectionList(connections) {
-  const rows = [["local", { kind: "local", mode: "auto" }], ...Object.entries(connections)];
-  const aliasWidth = Math.min(24, Math.max(5, ...rows.map(([alias]) => alias.length)));
-  const lines = rows.map(([alias, connection]) => [
-    pc.bold(pad(truncate(alias, aliasWidth), aliasWidth)),
-    formatStatusPill(connection.kind),
-    connection.kind === "remote" ? connection.baseUrl ?? "" : connection.mode ?? "local"
-  ].join("  "));
-  return [formatSection("Rig servers", `${rows.length} available`), `${pc.bold(pad("ALIAS", aliasWidth))}  ${pc.bold("KIND")}  ${pc.bold("TARGET")}`, ...lines, "", ...formatNextSteps(["Select one: `rig server use <alias|local>`"])].join(`
+  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) {
-  const connection = selected === "local" ? { kind: "local", mode: "auto" } : connections[selected];
-  const target = !connection ? "not configured" : connection.kind === "remote" ? connection.baseUrl : "local";
-  return [
-    formatSection("Rig server", "selected for this repo"),
-    `${themeFaint("\u2502")} ${themeDim("selected ")} ${pc.bold(selected)}`,
-    `${themeFaint("\u2502")} ${themeDim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
-    `${themeFaint("\u2502")} ${themeDim("target   ")} ${target ?? "not configured"}`,
-    "",
-    ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
-  ].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,
@@ -436,6 +307,7 @@ export {
   formatSuccessCard,
   formatSubmittedRun,
   formatStatusPill,
+  formatStatsTable,
   formatSection,
   formatRunStatus,
   formatRunList,

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

@@ -17,6 +17,10 @@ export type RepoConnectionState = {
      * Sent as the x-rig-project-root header on every remote request.
      */
     serverProjectRoot?: string;
+    /** The selected alias that produced serverProjectRoot. Prevents cross-alias reuse. */
+    serverProjectRootAlias?: string;
+    /** The remote base URL that produced serverProjectRoot. Prevents same-alias retarget leaks. */
+    serverProjectRootBaseUrl?: string;
 };
 export declare function resolveGlobalConnectionsPath(env?: NodeJS.ProcessEnv): string;
 export declare function resolveRepoConnectionPath(projectRoot: string): string;
@@ -39,6 +43,12 @@ export declare function resolveSelectedConnection(projectRoot: string, options?:
     serverProjectRoot?: string;
 } | null;
 /** Persist the server-host project root this repo scopes to (multi-root serving). */
-export declare function writeRepoServerProjectRoot(projectRoot: string, serverProjectRoot: string): void;
+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;