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

package/dist/src/commands/inbox.js

@@ -1,4 +1,7 @@
 // @bun
+// packages/cli/src/commands/inbox.ts
+import { Duration, Effect, Stream } from "effect";
+
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
@@ -41,176 +44,30 @@ Usage: ${usage}`);
   }
 }
 
-// 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));
-function renderMicroDroneFrame(tick) {
-  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(")")}`;
-}
-
-// 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/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/inbox.ts
+import { localRunChanges } from "@rig/runtime/control-plane/run-discovery-stream";
 
 // 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 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 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;
@@ -218,633 +75,505 @@ function firstString(record, keys, fallback = "") {
 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 formatNextSteps(steps) {
   if (steps.length === 0)
     return [];
   return [pc.bold("Next"), ...steps.map((step) => `${accent("\u203A")} ${step}`)];
 }
+function formatLegacyAutomationSurface() {
+  return [];
+}
 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(`
 `);
 }
 
-// packages/cli/src/commands/_server-client.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+// packages/cli/src/commands/_run-projection.ts
+import { existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } from "path";
-import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
+import {
+  foldRunSessionEntries,
+  sessionIdFromSessionFile as sessionIdFromSessionFile2
+} from "@rig/contracts";
+import { listAgentRuntimes as listAgentRuntimes2 } from "@rig/runtime/control-plane/runtime/isolation";
 
-// packages/cli/src/commands/_connection-state.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { homedir } from "os";
+// packages/cli/src/commands/_run-bridge.ts
+import { existsSync, readdirSync, readFileSync } from "fs";
 import { dirname, resolve } from "path";
-function resolveGlobalConnectionsPath(env = process.env) {
-  const explicit = env.RIG_CONNECTIONS_FILE?.trim();
-  if (explicit)
-    return resolve(explicit);
-  const stateDir = env.RIG_GLOBAL_STATE_DIR?.trim();
-  if (stateDir)
-    return resolve(stateDir, "connections.json");
-  return resolve(homedir(), ".rig", "connections.json");
-}
-function resolveRepoConnectionPath(projectRoot) {
-  return resolve(projectRoot, ".rig", "state", "connection.json");
-}
-function readJsonFile(path) {
-  if (!existsSync(path))
-    return null;
-  try {
-    return JSON.parse(readFileSync(path, "utf8"));
-  } catch (error) {
-    throw new CliError(`Invalid Rig connection state at ${path}: ${error instanceof Error ? error.message : String(error)}`, 1, { hint: "Fix or delete that file, then re-select a server with `rig server use <alias|local>`." });
-  }
+import { CUSTOM_TYPE_FOR, sessionIdFromSessionFile } from "@rig/contracts";
+import { createPluginHost } from "@rig/core";
+import { loadConfig } from "@rig/core/load-config";
+import { resolveOwnerNamespaceKey, resolveRegistryBaseUrl, resolveRegistrySecret, resolveSelectedRemote } from "@rig/runtime/control-plane/remote";
+import { listAgentRuntimes } from "@rig/runtime/control-plane/runtime/isolation";
+import { createRegistryClient } from "@rig/relay-registry";
+import {
+  listActiveCollabSessions as ompListActiveCollabSessions
+} from "@oh-my-pi/pi-coding-agent/collab/api";
+function registrySecret(env = process.env) {
+  return resolveRegistrySecret(process.cwd(), env) ?? null;
+}
+function registryBaseUrl(env = process.env) {
+  return resolveRegistryBaseUrl(process.cwd(), env);
+}
+function collabFromRegistryEntry(entry) {
+  return {
+    sessionId: entry.roomId,
+    sessionPath: "",
+    cwd: "",
+    title: entry.title,
+    joinLink: entry.joinLink,
+    webLink: entry.webLink,
+    relayUrl: entry.relayUrl,
+    owner: entry.owner,
+    selectedRepo: entry.repo,
+    startedAt: entry.startedAt,
+    updatedAt: entry.heartbeatAt,
+    ...entry.pid === undefined ? {} : { pid: entry.pid },
+    stale: entry.stale
+  };
 }
-function writeJsonFile(path, value) {
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(value, null, 2)}
-`, "utf8");
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
 }
-function normalizeConnection(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value))
+function readLocalRunCollab(runtime) {
+  if (!runtime.sessionDir || !existsSync(runtime.sessionDir))
+    return null;
+  let files;
+  try {
+    files = readdirSync(runtime.sessionDir).filter((f) => f.endsWith(".jsonl")).sort().reverse();
+  } catch {
     return null;
-  const record = value;
-  if (record.kind === "local")
-    return { kind: "local", mode: "auto" };
-  if (record.kind === "remote" && typeof record.baseUrl === "string" && record.baseUrl.trim()) {
-    const baseUrl = record.baseUrl.trim().replace(/\/+$/, "");
-    return { kind: "remote", baseUrl };
+  }
+  for (const file of files) {
+    let lines;
+    try {
+      lines = readFileSync(resolve(runtime.sessionDir, file), "utf8").split(`
+`);
+    } catch {
+      continue;
+    }
+    let host = null;
+    for (const line of lines) {
+      if (!line.includes("collab-host-started"))
+        continue;
+      let entry;
+      try {
+        entry = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!isRecord(entry) || entry.customType !== CUSTOM_TYPE_FOR["timeline-entry"] || !isRecord(entry.data))
+        continue;
+      const payload = isRecord(entry.data.payload) ? entry.data.payload : entry.data;
+      if (payload.type !== "collab-host-started")
+        continue;
+      host = {
+        roomId: typeof payload.roomId === "string" ? payload.roomId : undefined,
+        joinLink: typeof payload.joinLink === "string" ? payload.joinLink : undefined,
+        webLink: typeof payload.webLink === "string" ? payload.webLink : undefined,
+        relayUrl: typeof payload.relayUrl === "string" ? payload.relayUrl : undefined,
+        at: typeof entry.data.at === "string" ? entry.data.at : undefined
+      };
+    }
+    if (!host?.joinLink)
+      continue;
+    const at = host.at ?? "";
+    const sessionId = host.roomId ?? sessionIdFromSessionFile(resolve(runtime.sessionDir, file)) ?? runtime.id;
+    return {
+      sessionId,
+      sessionPath: resolve(runtime.sessionDir, file),
+      cwd: runtime.workspaceDir,
+      joinLink: host.joinLink,
+      webLink: host.webLink ?? "",
+      relayUrl: host.relayUrl ?? "",
+      title: runtime.taskId ? `[${runtime.taskId}] Rig run ${sessionId}` : `Rig run ${sessionId}`,
+      startedAt: at,
+      updatedAt: at,
+      stale: false
+    };
   }
   return null;
 }
-function readGlobalConnections(options = {}) {
-  const path = resolveGlobalConnectionsPath(options.env ?? process.env);
-  const payload = readJsonFile(path);
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
-    return { connections: {} };
+async function listLocalRunCollabSessions(projectRoot) {
+  let runtimes;
+  try {
+    runtimes = await listAgentRuntimes(projectRoot);
+  } catch {
+    return [];
   }
-  const rawConnections = payload.connections;
-  const connections = {};
-  if (rawConnections && typeof rawConnections === "object" && !Array.isArray(rawConnections)) {
-    for (const [alias, raw] of Object.entries(rawConnections)) {
-      const connection = normalizeConnection(raw);
-      if (connection)
-        connections[alias] = connection;
-    }
+  const out = [];
+  for (const runtime of runtimes) {
+    const collab = readLocalRunCollab(runtime);
+    if (collab)
+      out.push(collab);
   }
-  return { connections };
+  return out;
 }
-function readRepoConnection(projectRoot) {
-  const payload = readJsonFile(resolveRepoConnectionPath(projectRoot));
-  if (!payload || typeof payload !== "object" || Array.isArray(payload))
-    return null;
-  const record = payload;
-  const selected = typeof record.selected === "string" ? record.selected.trim() : "";
-  if (!selected)
-    return null;
-  return {
-    selected,
-    project: typeof record.project === "string" ? record.project : undefined,
-    linkedAt: typeof record.linkedAt === "string" ? record.linkedAt : undefined,
-    serverProjectRoot: typeof record.serverProjectRoot === "string" && record.serverProjectRoot.trim() ? record.serverProjectRoot.trim() : undefined
-  };
+async function listActiveRunCollab(filter) {
+  return defaultListActiveCollabSessions(filter);
 }
-function writeRepoConnection(projectRoot, state) {
-  writeJsonFile(resolveRepoConnectionPath(projectRoot), state);
+async function defaultListActiveCollabSessions(filter) {
+  const projectRoot = process.cwd();
+  const local = await listLocalRunCollabSessions(projectRoot);
+  const namespaceKey = filter.namespaceKey ?? resolveOwnerNamespaceKey(projectRoot);
+  const secret = registrySecret();
+  const remote = namespaceKey && secret ? (await createRegistryClient({ baseUrl: registryBaseUrl(), namespaceKey, secret }).listRoomsByOwner(filter)).map(collabFromRegistryEntry) : await ompListActiveCollabSessions(filter);
+  const seen = new Set(local.map((c) => c.sessionId));
+  return [...local, ...remote.filter((c) => !seen.has(c.sessionId))];
 }
-function resolveSelectedConnection(projectRoot, options = {}) {
-  const repo = readRepoConnection(projectRoot);
-  if (!repo)
+
+// packages/cli/src/commands/_run-diagnostics.ts
+function normalizeString(value) {
+  if (typeof value !== "string")
     return null;
-  if (repo.selected === "local")
-    return { alias: "local", connection: { kind: "local", mode: "auto" }, serverProjectRoot: repo.serverProjectRoot };
-  const global = readGlobalConnections(options);
-  const connection = global.connections[repo.selected];
-  if (!connection) {
-    throw new CliError(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
-  }
-  return { alias: repo.selected, connection, serverProjectRoot: repo.serverProjectRoot };
+  const normalized = value.replace(/\s+/g, " ").trim();
+  return normalized.length > 0 ? normalized : null;
+}
+function isGenericRunFailure(value) {
+  const text = normalizeString(value);
+  return Boolean(text && /^Task run failed \([^)]*\)$/i.test(text));
+}
+function appendCandidate(candidates, value) {
+  const text = normalizeString(value);
+  if (text && !candidates.includes(text))
+    candidates.push(text);
+}
+function categorizeUsefulRunError(lines) {
+  const taskSourceFailure = lines.find((line) => /failed to update task source/i.test(line));
+  if (taskSourceFailure)
+    return `Task source update failed: ${taskSourceFailure}`;
+  const moduleFailure = lines.find((line) => /cannot find module/i.test(line));
+  if (moduleFailure)
+    return `Runtime module resolution failed: ${moduleFailure}`;
+  const providerFailure = lines.find((line) => /no api key found|unauthorized|authentication failed|invalid api key/i.test(line));
+  if (providerFailure)
+    return `Provider authentication failed: ${providerFailure}`;
+  return null;
 }
-function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
-  const repo = readRepoConnection(projectRoot);
-  if (!repo)
-    return;
-  writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
+function summarizeUsefulRunError(projection) {
+  if (projection.status !== "failed")
+    return null;
+  const candidates = [];
+  for (const anomaly of projection.anomalies) {
+    appendCandidate(candidates, `Journal anomaly (${anomaly.kind}): ${anomaly.detail}`);
+  }
+  for (const phase of projection.closeoutPhases) {
+    if (phase.outcome === "failed")
+      appendCandidate(candidates, phase.detail);
+  }
+  for (const entry of projection.statusHistory) {
+    appendCandidate(candidates, entry.reason);
+  }
+  appendCandidate(candidates, projection.record.statusDetail);
+  appendCandidate(candidates, projection.record.errorText);
+  const nonGeneric = candidates.filter((candidate) => !isGenericRunFailure(candidate));
+  return categorizeUsefulRunError(nonGeneric) ?? nonGeneric.at(-1) ?? normalizeString(projection.record.errorText);
 }
 
-// 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;
-}
-function readPrivateRemoteSessionToken(projectRoot) {
-  const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
-  if (!existsSync2(path))
+// packages/cli/src/commands/_run-projection.ts
+var EMPTY_PROJECTION = foldRunSessionEntries([], "");
+function stringOrNull(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function newestSessionFile(sessionDir) {
+  if (!sessionDir || !existsSync2(sessionDir))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync2(path, "utf8"));
-    return cleanToken(typeof parsed.apiSessionToken === "string" ? parsed.apiSessionToken : typeof parsed.sessionToken === "string" ? parsed.sessionToken : undefined);
+    const files = readdirSync2(sessionDir).filter((file) => file.endsWith(".jsonl")).sort().reverse();
+    return files[0] ? resolve2(sessionDir, files[0]) : null;
   } catch {
     return null;
   }
 }
-function readGitHubBearerTokenForRemote(projectRoot) {
-  const scopedKey = resolve2(projectRoot);
-  if (scopedGitHubBearerTokens.has(scopedKey))
-    return scopedGitHubBearerTokens.get(scopedKey) ?? null;
-  const privateSession = readPrivateRemoteSessionToken(projectRoot);
-  if (privateSession)
-    return privateSession;
-  return cleanToken(process.env.RIG_SERVER_AUTH_TOKEN) ?? cleanToken(process.env.RIG_REMOTE_AUTH_TOKEN);
-}
-function readStoredGitHubAuthToken(projectRoot) {
-  const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
-  if (!existsSync2(path))
-    return null;
+function readSessionRunEntries(sessionPath) {
+  if (!sessionPath || !existsSync2(sessionPath))
+    return [];
+  let raw;
   try {
-    const parsed = JSON.parse(readFileSync2(path, "utf8"));
-    return cleanToken(typeof parsed.token === "string" ? parsed.token : undefined);
+    raw = readFileSync2(sessionPath, "utf8");
   } catch {
-    return null;
+    return [];
   }
-}
-function readLocalConnectionFallbackToken(projectRoot) {
-  return readGitHubBearerTokenForRemote(projectRoot) ?? cleanToken(process.env.RIG_GITHUB_TOKEN) ?? readStoredGitHubAuthToken(projectRoot);
-}
-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 {
-        baseUrl: selected.connection.baseUrl,
-        authToken,
-        connectionKind: "remote",
-        serverProjectRoot
-      };
-    }
-    reportServerPhase("Starting local Rig server\u2026");
-    const connection = await ensureLocalRigServerConnection(projectRoot);
-    return {
-      baseUrl: connection.baseUrl,
-      authToken: connection.authToken ?? readLocalConnectionFallbackToken(projectRoot),
-      connectionKind: "local",
-      serverProjectRoot: resolve2(projectRoot)
-    };
-  } catch (error) {
-    if (error instanceof Error) {
-      throw new CliError(error.message, 1);
+  const entries = [];
+  for (const line of raw.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      continue;
     }
-    throw error;
-  }
-}
-async function backfillRemoteServerProjectRoot(projectRoot, baseUrl, authToken) {
-  const repo = readRepoConnection(projectRoot);
-  const slug = repo?.project?.trim();
-  if (!slug)
-    return null;
-  try {
-    const response = await fetch(`${baseUrl}/api/projects/${encodeURIComponent(slug)}`, {
-      headers: mergeHeaders(undefined, authToken)
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+      continue;
+    entries.push({
+      type: "type" in parsed && typeof parsed.type === "string" ? parsed.type : "",
+      ..."customType" in parsed && typeof parsed.customType === "string" ? { customType: parsed.customType } : {},
+      ..."data" in parsed ? { data: parsed.data } : {}
     });
-    if (!response.ok)
-      return null;
-    const payload = await response.json();
-    const project = payload.project && typeof payload.project === "object" && !Array.isArray(payload.project) ? payload.project : null;
-    const checkouts = Array.isArray(project?.checkouts) ? project.checkouts : [];
-    const latestCheckout = [...checkouts].reverse().find((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry) && typeof entry.path === "string"));
-    const path = typeof latestCheckout?.path === "string" && latestCheckout.path.trim() ? latestCheckout.path.trim() : null;
-    if (path)
-      writeRepoServerProjectRoot(projectRoot, path);
-    return path;
-  } catch {
-    return null;
   }
+  return entries;
 }
-function mergeHeaders(headers, authToken) {
-  const merged = new Headers(headers);
-  if (authToken) {
-    merged.set("authorization", `Bearer ${authToken}`);
-  }
-  return merged;
+function recordFromProjection(runId, projection, presence) {
+  const record = projection.record;
+  const status = projection.status ?? (presence.stale ? "stale" : presence.live ? "running" : "unknown");
+  const taskId = stringOrNull(record.taskId) ?? presence.fallbackTaskId ?? null;
+  const title = stringOrNull(record.title) ?? stringOrNull(presence.title) ?? (taskId ? `Run ${taskId}` : `Rig run ${runId}`);
+  return {
+    runId,
+    taskId,
+    title,
+    status,
+    source: presence.source,
+    live: presence.live,
+    stale: presence.stale,
+    startedAt: stringOrNull(record.startedAt) ?? presence.startedAt ?? null,
+    updatedAt: stringOrNull(record.updatedAt) ?? presence.updatedAt ?? projection.lastEventAt ?? null,
+    completedAt: stringOrNull(record.completedAt),
+    joinLink: presence.joinLink ?? null,
+    webLink: presence.webLink ?? null,
+    relayUrl: presence.relayUrl ?? null,
+    sessionPath: stringOrNull(record.sessionPath) ?? presence.sessionPath ?? null,
+    prUrl: stringOrNull(record.prUrl),
+    worktreePath: stringOrNull(record.worktreePath),
+    pendingApprovals: projection.pendingApprovals.length,
+    pendingInputs: projection.pendingUserInputs.length,
+    steeringCount: projection.steeringCount,
+    stallCount: projection.stallCount,
+    errorSummary: summarizeUsefulRunError(projection),
+    projection
+  };
 }
-function diagnosticMessage(payload) {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload))
+function recordFromLiveCollab(collab) {
+  const runId = collab.sessionId;
+  const sessionPath = stringOrNull(collab.sessionPath);
+  const projection = sessionPath ? foldRunSessionEntries(readSessionRunEntries(sessionPath), runId) : EMPTY_PROJECTION;
+  return recordFromProjection(runId, projection, {
+    source: sessionPath ? "local" : "remote",
+    live: !collab.stale,
+    stale: Boolean(collab.stale),
+    title: collab.title,
+    joinLink: stringOrNull(collab.joinLink),
+    webLink: stringOrNull(collab.webLink),
+    relayUrl: stringOrNull(collab.relayUrl),
+    sessionPath,
+    startedAt: stringOrNull(collab.startedAt),
+    updatedAt: stringOrNull(collab.updatedAt)
+  });
+}
+function recordFromRuntime(runtime) {
+  const sessionPath = newestSessionFile(runtime.sessionDir ?? "");
+  if (!sessionPath)
     return null;
-  const record = payload;
-  const diagnostics = Array.isArray(record.diagnostics) ? record.diagnostics : [];
-  const messages = diagnostics.flatMap((entry) => {
-    if (!entry || typeof entry !== "object" || Array.isArray(entry))
-      return [];
-    const diagnostic = entry;
-    const kind = typeof diagnostic.kind === "string" ? diagnostic.kind : "task-source";
-    const message = typeof diagnostic.message === "string" ? diagnostic.message : null;
-    return message ? [`${kind}: ${message}`] : [];
+  const projection = foldRunSessionEntries(readSessionRunEntries(sessionPath), runtime.id);
+  if (projection.lastSeq === 0)
+    return null;
+  return recordFromProjection(sessionIdFromSessionFile2(sessionPath) ?? runtime.id, projection, {
+    source: "local",
+    live: false,
+    stale: false,
+    sessionPath,
+    fallbackTaskId: stringOrNull(runtime.taskId)
+  });
+}
+function sortByRecency(records) {
+  return [...records].sort((a, b) => {
+    const at = Date.parse(b.updatedAt ?? b.startedAt ?? "") || 0;
+    const bt = Date.parse(a.updatedAt ?? a.startedAt ?? "") || 0;
+    return at - bt;
   });
-  return messages.length > 0 ? messages.join("; ") : null;
 }
-var serverReachabilityCache = new Map;
-async function probeServerReachability(baseUrl, authToken) {
+async function listRunProjections(projectRoot, filter = {}) {
+  const byRunId = new Map;
+  let live = [];
   try {
-    const response = await fetch(`${baseUrl.replace(/\/+$/, "")}/api/server/status`, {
-      headers: mergeHeaders(undefined, authToken),
-      signal: AbortSignal.timeout(1500)
-    });
-    return response.ok;
+    live = await listActiveRunCollab(filter);
   } catch {
-    return false;
+    live = [];
   }
-}
-function cachedServerReachability(projectRoot, baseUrl, authToken) {
-  const key = resolve2(projectRoot);
-  const cached = serverReachabilityCache.get(key);
-  if (cached)
-    return cached;
-  const probe = probeServerReachability(baseUrl, authToken);
-  serverReachabilityCache.set(key, probe);
-  return probe;
-}
-function describeSelectedServer(projectRoot, server) {
-  try {
-    const selected = resolveSelectedConnection(projectRoot);
-    if (selected) {
-      return {
-        alias: selected.alias,
-        target: selected.connection.kind === "remote" ? selected.connection.baseUrl : server.baseUrl
-      };
-    }
-  } catch {}
-  return { alias: server.connectionKind === "remote" ? "remote" : "local", target: server.baseUrl };
-}
-async function buildServerFailureContext(projectRoot, server) {
-  const { alias, target } = describeSelectedServer(projectRoot, server);
-  const reachable = await cachedServerReachability(projectRoot, server.baseUrl, server.authToken);
-  const reachability = reachable ? "server is reachable" : "server is unreachable";
-  return {
-    contextLine: `Currently connected to: ${alias} at ${target} (${reachability}).`,
-    hint: "Check the selected server with `rig server status`, or switch with `rig server use <alias|local>`."
-  };
-}
-async function requestServerJson(context, pathname, init = {}) {
-  const server = await ensureServerForCli(context.projectRoot);
-  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;
+  for (const collab of live) {
+    const record = recordFromLiveCollab(collab);
+    byRunId.set(record.runId, record);
+  }
+  let runtimes = [];
   try {
-    response = await fetch(`${server.baseUrl}${pathname}`, {
-      ...init,
-      headers
-    });
-  } catch (error) {
-    const failure = await buildServerFailureContext(context.projectRoot, server);
-    throw new CliError(`Rig server request failed: ${error instanceof Error ? error.message : String(error)}
-${failure.contextLine}`, 1, { hint: failure.hint });
+    runtimes = await listAgentRuntimes2(projectRoot);
+  } catch {
+    runtimes = [];
   }
-  const text = await response.text();
-  const payload = text.trim().length > 0 ? (() => {
-    try {
-      return JSON.parse(text);
-    } catch {
-      return null;
+  for (const runtime of runtimes) {
+    const record = recordFromRuntime(runtime);
+    if (!record)
+      continue;
+    const sessionId = sessionIdFromSessionFile2(record.sessionPath);
+    const liveMatch = sessionId ? byRunId.get(sessionId) : undefined;
+    if (liveMatch) {
+      if (liveMatch.source === "remote" || !liveMatch.sessionPath) {
+        byRunId.set(liveMatch.runId, { ...liveMatch, sessionPath: record.sessionPath, source: "local" });
+      }
+      continue;
     }
-  })() : null;
-  if (!response.ok) {
-    const diagnostics = diagnosticMessage(payload);
-    const rawDetail = diagnostics ?? (text || response.statusText);
-    const detail = diagnostics ? rawDetail : rawDetail.split(`
-`).map((line) => line.trim()).find((line) => line.length > 0)?.slice(0, 200) ?? response.statusText;
-    const failure = await buildServerFailureContext(context.projectRoot, server);
-    throw new CliError(`Rig server request failed (${response.status}): ${detail}
-${failure.contextLine}`, 1, { hint: failure.hint });
+    if (byRunId.has(runtime.id))
+      continue;
+    byRunId.set(record.runId, record);
   }
-  return payload;
-}
-var RESUMABLE_RUN_STATUSES = new Set([
-  "created",
-  "preparing",
-  "running",
-  "validating",
-  "reviewing",
-  "stopped",
-  "failed",
-  "needs-attention",
-  "needs_attention"
-]);
+  return sortByRecency([...byRunId.values()]);
+}
 
-// packages/cli/src/commands/_async-ui.ts
-import pc2 from "picocolors";
-var DONE_SYMBOL = pc2.green("\u25C7");
-var FAIL_SYMBOL = pc2.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);
+// packages/cli/src/commands/inbox.ts
+function promptFromPayload(payload, fallback) {
+  if (payload && typeof payload === "object") {
+    const record = payload;
+    for (const key of ["title", "message", "reason", "prompt", "summary"]) {
+      const value = record[key];
+      if (typeof value === "string" && value.trim().length > 0)
+        return value.trim();
     }
   }
-  const spinner = createTtySpinner({
-    label,
-    output,
-    frames: MICRO_DRONE_FRAMES,
-    styleFrame: (frame) => renderMicroDroneFrame(Math.max(0, MICRO_DRONE_FRAMES.indexOf(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);
-  }
+  return fallback;
 }
-
-// packages/cli/src/commands/inbox.ts
-async function listInboxRecords(context, kind, filters) {
-  const params = new URLSearchParams;
-  if (filters.run)
-    params.set("runId", filters.run);
-  if (filters.task)
-    params.set("taskId", filters.task);
-  const query = params.size > 0 ? `?${params.toString()}` : "";
-  const payload = await requestServerJson(context, `/api/inbox/${kind}${query}`);
-  const records = Array.isArray(payload) ? payload : [];
-  return filters.pendingOnly ? records.filter((entry) => (entry.status ?? "pending") !== "resolved") : records;
+function recordsFromRun(run, kind) {
+  const pending = kind === "approvals" ? run.projection.pendingApprovals : run.projection.pendingUserInputs;
+  return pending.map((request) => ({
+    runId: run.runId,
+    taskId: run.taskId,
+    requestId: request.requestId,
+    status: "pending",
+    prompt: promptFromPayload(request.payload, kind === "approvals" ? "Approval requested" : "Input requested"),
+    requestedAt: request.requestedAt,
+    payload: request.payload
+  }));
+}
+async function listInboxRecords(context, kind, filters = {}, deps = {}) {
+  const runs = await (deps.listRuns ?? ((root) => listRunProjections(root)))(context.projectRoot);
+  const out = [];
+  for (const run of runs) {
+    if (filters.run && run.runId !== filters.run)
+      continue;
+    if (filters.task && run.taskId !== filters.task)
+      continue;
+    out.push(...recordsFromRun(run, kind));
+  }
+  return out;
 }
 async function readPendingInboxCounts(context) {
   try {
     const [approvals, inputs] = await Promise.all([
-      listInboxRecords(context, "approvals", { pendingOnly: true }),
-      listInboxRecords(context, "inputs", { pendingOnly: true })
+      listInboxRecords(context, "approvals"),
+      listInboxRecords(context, "inputs")
     ]);
     return { approvals: approvals.length, inputs: inputs.length };
   } catch {
     return null;
   }
 }
-async function printPendingInboxFooter(context) {
-  if (context.outputMode !== "text")
-    return;
-  const counts = await readPendingInboxCounts(context);
-  if (!counts || counts.approvals === 0 && counts.inputs === 0)
-    return;
-  const parts = [];
-  if (counts.approvals > 0)
-    parts.push(`${counts.approvals} approval${counts.approvals === 1 ? "" : "s"}`);
-  if (counts.inputs > 0)
-    parts.push(`${counts.inputs} input request${counts.inputs === 1 ? "" : "s"}`);
-  console.log(`
-\u26A0 ${parts.join(" and ")} pending \u2014 run \`rig inbox\` to review.`);
-}
-function renderList(context, kind, records) {
-  if (context.outputMode === "text") {
-    printFormattedOutput(formatInboxList(kind, records));
-  }
-}
-async function watchInbox(context, filters) {
-  const render = async () => {
-    const [approvals, inputs] = await Promise.all([
-      listInboxRecords(context, "approvals", { ...filters, pendingOnly: true }),
-      listInboxRecords(context, "inputs", { ...filters, pendingOnly: true })
-    ]);
-    console.clear();
-    console.log(`rig inbox \u2014 watching (Ctrl-C to stop) \u2014 ${new Date().toLocaleTimeString()}`);
-    renderList(context, "approvals", approvals);
-    renderList(context, "inputs", inputs);
-    if (approvals.length === 0 && inputs.length === 0) {
-      console.log("Nothing pending.");
-    } else {
-      console.log(`
-Resolve with: rig inbox approve --run <id> --request <id> --decision approve|reject`);
-    }
-  };
-  await render();
-  const server = await ensureServerForCli(context.projectRoot);
-  const relevant = /"type":"rig\.(approval|user-input)\./;
-  const fallbackTimer = setInterval(() => {
-    render();
-  }, 30000);
-  fallbackTimer.unref?.();
-  for (;; ) {
-    try {
-      const response = await fetch(`${server.baseUrl}/api/server/events`, {
-        headers: {
-          ...server.authToken ? { authorization: `Bearer ${server.authToken}` } : {},
-          ...server.serverProjectRoot ? { "x-rig-project-root": server.serverProjectRoot } : {},
-          accept: "text/event-stream"
-        }
-      });
-      if (!response.ok || !response.body)
-        throw new Error(`SSE ${response.status}`);
-      const reader = response.body.getReader();
-      const decoder = new TextDecoder;
-      for (;; ) {
-        const { done, value } = await reader.read();
-        if (done)
-          break;
-        const chunk = decoder.decode(value, { stream: true });
-        if (relevant.test(chunk)) {
-          await render();
-        }
-      }
-    } catch {
-      await render();
-      await new Promise((resolveSleep) => setTimeout(resolveSleep, 2000));
-    }
+function resolveRequiresAttach(runId, verb) {
+  const target = runId ?? "<run-id>";
+  throw new CliError(`rig inbox ${verb} cannot deliver a resolution into a live worker from a one-shot command.`, 2, { hint: `Attach to resolve interactively: rig run attach ${target}` });
+}
+async function readInboxSnapshot(context, filters, deps) {
+  const [approvals, inputs] = await Promise.all([
+    listInboxRecords(context, "approvals", filters, deps),
+    listInboxRecords(context, "inputs", filters, deps)
+  ]);
+  return { approvals, inputs };
+}
+function renderInboxSnapshot(snapshot) {
+  console.clear();
+  console.log(`rig inbox \u2014 watching (Ctrl-C to stop) \u2014 ${new Date().toLocaleTimeString()}`);
+  printFormattedOutput(formatInboxList("approvals", snapshot.approvals.map((entry) => ({ ...entry }))));
+  printFormattedOutput(formatInboxList("inputs", snapshot.inputs.map((entry) => ({ ...entry }))));
+  if (snapshot.approvals.length === 0 && snapshot.inputs.length === 0)
+    console.log("Nothing pending.");
+}
+async function watchInbox(context, filters, deps) {
+  const snapshot = await readInboxSnapshot(context, filters, deps);
+  if (context.outputMode !== "text") {
+    return { ok: true, group: "inbox", command: "watch", details: snapshot };
   }
+  renderInboxSnapshot(snapshot);
+  await Effect.runPromise(localRunChanges(context.projectRoot).pipe(Stream.debounce(Duration.millis(500)), Stream.runForEach(() => Effect.promise(async () => {
+    renderInboxSnapshot(await readInboxSnapshot(context, filters, deps));
+  }))));
+  return { ok: true, group: "inbox", command: "watch", details: snapshot };
 }
-async function executeInbox(context, args) {
+async function executeInbox(context, args, deps = {}) {
   const [command = "approvals", ...rest] = args;
+  const text = context.outputMode === "text";
   switch (command) {
-    case "approvals": {
-      let pending = rest;
-      const run = takeOption(pending, "--run");
-      pending = run.rest;
-      const task = takeOption(pending, "--task");
-      pending = task.rest;
-      requireNoExtraArgs(pending, "rig inbox approvals [--run <id>] [--task <id>]");
-      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 } };
-    }
+    case "approvals":
     case "inputs": {
-      let pending = rest;
-      const run = takeOption(pending, "--run");
-      pending = run.rest;
-      const task = takeOption(pending, "--task");
-      pending = task.rest;
-      requireNoExtraArgs(pending, "rig inbox inputs [--run <id>] [--task <id>]");
-      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 } };
+      const run = takeOption(rest, "--run");
+      const task = takeOption(run.rest, "--task");
+      requireNoExtraArgs(task.rest, `rig inbox ${command} [--run <id>] [--task <id>]`);
+      const kind = command === "approvals" ? "approvals" : "inputs";
+      const filters = {
+        ...run.value ? { run: run.value } : {},
+        ...task.value ? { task: task.value } : {}
+      };
+      const entries = await listInboxRecords(context, kind, filters, deps);
+      if (text)
+        printFormattedOutput(formatInboxList(kind, entries.map((entry) => ({ ...entry }))));
+      return { ok: true, group: "inbox", command, details: { entries } };
     }
     case "approve": {
-      let pending = rest;
-      const run = takeOption(pending, "--run");
-      pending = run.rest;
-      const request = takeOption(pending, "--request");
-      pending = request.rest;
-      const decision = takeOption(pending, "--decision");
-      pending = decision.rest;
-      const note = takeOption(pending, "--note");
-      pending = note.rest;
-      requireNoExtraArgs(pending, "rig inbox approve --run <id> --request <id> --decision approve|reject [--note <text>]");
-      if (!run.value || !request.value || !decision.value) {
-        throw new CliError("approve requires --run, --request, and --decision. List pending requests with `rig inbox approvals`.");
-      }
-      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 withSpinner(`Resolving approval ${request.value}\u2026`, () => requestServerJson(context, "/api/inbox/approvals/resolve", {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({
-          runId: run.value,
-          requestId: request.value,
-          decision: decision.value,
-          note: note.value ?? null
-        })
-      }), { outputMode: context.outputMode });
-      return { ok: true, group: "inbox", command, details: { result } };
+      const run = takeOption(rest, "--run");
+      resolveRequiresAttach(run.value, "approve");
+      break;
     }
     case "respond": {
-      let pending = rest;
-      const run = takeOption(pending, "--run");
-      pending = run.rest;
-      const request = takeOption(pending, "--request");
-      pending = request.rest;
-      const answers = [];
-      const remaining = [];
-      for (let index = 0;index < pending.length; index += 1) {
-        const current = pending[index];
-        if (current === "--answer") {
-          const next = pending[index + 1];
-          if (!next || next.startsWith("-")) {
-            throw new CliError("Missing value for --answer", 1, { hint: "Pass key=value pairs, e.g. `rig inbox respond --run <id> --request <id> --answer key=value`." });
-          }
-          answers.push(next);
-          index += 1;
-          continue;
-        }
-        if (current !== undefined) {
-          remaining.push(current);
-        }
-      }
-      requireNoExtraArgs(remaining, "rig inbox respond --run <id> --request <id> --answer key=value [--answer key=value]");
-      if (!run.value || !request.value || answers.length === 0) {
-        throw new CliError("respond requires --run, --request, and at least one --answer. List pending requests with `rig inbox inputs`.");
-      }
-      const parsedAnswers = Object.fromEntries(answers.map((entry) => {
-        const [key, ...restValue] = entry.split("=");
-        return [key, restValue.join("=")];
-      }));
-      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({
-          runId: run.value,
-          requestId: request.value,
-          answers: parsedAnswers
-        })
-      }), { outputMode: context.outputMode });
-      return { ok: true, group: "inbox", command, details: { result } };
+      const run = takeOption(rest, "--run");
+      resolveRequiresAttach(run.value, "respond");
+      break;
     }
     case "watch": {
-      let pending = rest;
-      const run = takeOption(pending, "--run");
-      pending = run.rest;
-      const task = takeOption(pending, "--task");
-      pending = task.rest;
-      requireNoExtraArgs(pending, "rig inbox watch [--run <id>] [--task <id>]");
-      return await watchInbox(context, { run: run.value, task: task.value });
+      const run = takeOption(rest, "--run");
+      const task = takeOption(run.rest, "--task");
+      requireNoExtraArgs(task.rest, "rig inbox watch [--run <id>] [--task <id>]");
+      const filters = {
+        ...run.value ? { run: run.value } : {},
+        ...task.value ? { task: task.value } : {}
+      };
+      return watchInbox(context, filters, deps);
     }
     default:
-      throw new CliError(`Unknown inbox command: ${command}. Use approvals|inputs|approve|respond|watch.`);
+      throw new CliError(`Unknown inbox command: ${command}`, 1, { hint: "Run `rig inbox --help` to list inbox commands." });
   }
+  return { ok: true, group: "inbox", command };
 }
 export {
   readPendingInboxCounts,
-  printPendingInboxFooter,
   listInboxRecords,
   executeInbox
 };