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

package/dist/src/commands/stats.js

@@ -1,7 +1,4 @@
 // @bun
-// packages/cli/src/commands/stats.ts
-import pc4 from "picocolors";
-
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
@@ -44,731 +41,203 @@ Usage: ${usage}`);
   }
 }
 
-// packages/cli/src/commands/stats.ts
-import { computeRigStats } from "@rig/runtime/control-plane/native/run-stats";
-
-// packages/cli/src/commands/_connection-state.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { homedir } from "os";
-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>`." });
-  }
-}
-function writeJsonFile(path, value) {
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(value, null, 2)}
-`, "utf8");
-}
-function normalizeConnection(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value))
-    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 };
-  }
-  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: {} };
-  }
-  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;
-    }
-  }
-  return { connections };
-}
-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
-  };
-}
-function writeRepoConnection(projectRoot, state) {
-  writeJsonFile(resolveRepoConnectionPath(projectRoot), state);
-}
-function resolveSelectedConnection(projectRoot, options = {}) {
-  const repo = readRepoConnection(projectRoot);
-  if (!repo)
-    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 };
-}
-function writeRepoServerProjectRoot(projectRoot, serverProjectRoot) {
-  const repo = readRepoConnection(projectRoot);
-  if (!repo)
-    return;
-  writeRepoConnection(projectRoot, { ...repo, serverProjectRoot });
-}
-function isRemoteConnectionSelected(projectRoot) {
-  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
-}
-
-// packages/cli/src/commands/_server-client.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
-import { resolve as resolve2 } from "path";
-import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
-var scopedGitHubBearerTokens = new Map;
-var serverPhaseListener = null;
-function setServerPhaseListener(listener) {
-  const previous = serverPhaseListener;
-  serverPhaseListener = listener;
-  return previous;
-}
-function reportServerPhase(label) {
-  serverPhaseListener?.(label);
-}
-function cleanToken(value) {
-  const trimmed = value?.trim();
-  return trimmed ? trimmed : null;
-}
-function readPrivateRemoteSessionToken(projectRoot) {
-  const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
-  if (!existsSync2(path))
-    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);
-  } 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;
-  try {
-    const parsed = JSON.parse(readFileSync2(path, "utf8"));
-    return cleanToken(typeof parsed.token === "string" ? parsed.token : undefined);
-  } catch {
-    return null;
-  }
-}
-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);
-    }
-    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 (!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;
-  }
-}
-function mergeHeaders(headers, authToken) {
-  const merged = new Headers(headers);
-  if (authToken) {
-    merged.set("authorization", `Bearer ${authToken}`);
-  }
-  return merged;
-}
-function diagnosticMessage(payload) {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload))
-    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}`] : [];
-  });
-  return messages.length > 0 ? messages.join("; ") : null;
-}
-var serverReachabilityCache = new Map;
-async function probeServerReachability(baseUrl, authToken) {
-  try {
-    const response = await fetch(`${baseUrl.replace(/\/+$/, "")}/api/server/status`, {
-      headers: mergeHeaders(undefined, authToken),
-      signal: AbortSignal.timeout(1500)
-    });
-    return response.ok;
-  } catch {
-    return false;
-  }
-}
-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;
-  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 });
-  }
-  const text = await response.text();
-  const payload = text.trim().length > 0 ? (() => {
-    try {
-      return JSON.parse(text);
-    } catch {
-      return null;
-    }
-  })() : 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 });
-  }
-  return payload;
-}
-var RESUMABLE_RUN_STATUSES = new Set([
-  "created",
-  "preparing",
-  "running",
-  "validating",
-  "reviewing",
-  "stopped",
-  "failed",
-  "needs-attention",
-  "needs_attention"
-]);
-
-// 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/_cli-format.ts
 import pc from "picocolors";
-var themeDim = (value) => ink3(value);
-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);
+var dim = pc.dim;
+var faintBar = pc.dim("\u2502");
+var accent = pc.cyan;
+function compactValue(value) {
+  if (value === null || value === undefined)
+    return "\u2014";
+  if (typeof value === "string")
+    return value;
+  if (typeof value === "number" || typeof value === "boolean")
+    return String(value);
+  return JSON.stringify(value);
 }
-function formatSection(title, subtitle) {
-  return `${pc.bold(accent("\u25C6"))} ${pc.bold(title)}${subtitle ? themeDim(` \u2014 ${subtitle}`) : ""}`;
+function printFormattedOutput(message) {
+  console.log(message);
 }
-function formatNextSteps(steps) {
-  if (steps.length === 0)
-    return [];
-  return [pc.bold("Next"), ...steps.map((step) => `${accent("\u203A")} ${step}`)];
-}
-
-// 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}
+function formatStatsTable(rows) {
+  return rows.map(([label, value]) => `${faintBar} ${dim(label.padEnd(20))} ${compactValue(value)}`).join(`
 `);
-    const update2 = (next) => {
-      lastLabel = next;
-    };
-    activeUpdate = update2;
-    const previousListener2 = setServerPhaseListener(update2);
-    try {
-      return await work(update2);
-    } finally {
-      activeUpdate = null;
-      setServerPhaseListener(previousListener2);
-    }
-  }
-  const spinner = createTtySpinner({
-    label,
-    output,
-    frames: 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);
-  }
 }
 
 // packages/cli/src/commands/_help-catalog.ts
-import pc3 from "picocolors";
+import pc2 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Pi console",
-    subtitle: "the operator surface \u2014 every attach opens the run's FULL Pi session",
+    title: "Open Rig",
+    subtitle: "normal UX \u2014 bare rig opens the bundled Rig Cockpit inside OMP",
     commands: [
-      { command: "rig run attach <run-id>", description: "Open the run's Pi console: complete transcript (live AND finished runs), worker turns streaming in live." },
-      { command: "type a message", description: "Inside the console, plain text steers the worker mid-turn \u2014 it lands in the agent's context, not a local model." },
-      { command: "!<command>", description: "Inside the console, runs shell in the WORKER's workspace; output streams back into the transcript." },
-      { command: "/<command>", description: "The palette includes the WORKER session's slash commands ([worker]-tagged) next to /rig." },
-      { command: "/rig abort | /rig stop", description: "Abort the worker's current turn, or stop the whole run, from inside the console." },
-      { command: "rig run steer <id> --message <text>", description: "Steer without attaching \u2014 queue a message; the worker picks it up within seconds." }
+      { command: "rig", description: "Open Rig Cockpit with OMP collaboration substrate for the current workspace." },
+      { command: "rig --workspace <path>", description: "Open Rig Cockpit for another workspace." },
+      { command: "/rig", description: "Inside OMP, reopen the Rig Cockpit." },
+      { command: "rig join <link>", description: "Join an encrypted OMP collaborative session from another operator." }
     ]
   },
   {
-    title: "Start here",
-    subtitle: "one-time setup, pick a server",
+    title: "Server",
+    subtitle: "select execution placement before reading or dispatching work",
     commands: [
-      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
-      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." },
-      { command: "rig server status", description: "Show the selected server for this repo." }
+      { command: "Cockpit Server", description: "Select/configure local or remote execution placement and the project-root link." },
+      { command: "Server target \u2192 Local", description: "Use local execution placement for the selected project." },
+      { command: "Server target \u2192 Remote", description: "Use remote execution placement with the server-host project root preserved." }
     ]
   },
   {
-    title: "Work",
-    subtitle: "find a task, put an agent on it, answer what it asks",
+    title: "Tasks",
+    subtitle: "configured task source on the selected target feeds task detail",
     commands: [
-      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
-      { command: "rig task run --next", description: "Dispatch an agent on the next ready task; interactive mode drops you into its Pi console." },
-      { command: "rig run status", description: "Active and recent runs at a glance." },
-      { command: "rig run attach <id> --follow", description: "Same as plain attach \u2014 the Pi console is always the interactive surface." },
-      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." }
+      { command: "Cockpit Tasks", description: "List tasks from the selected server target's configured task source." },
+      { command: "Task detail", description: "Review task id, title, body, source status, labels, and issue URL before dispatch." },
+      { command: "Task detail \u2192 Dispatch", description: "Submit the selected task run through the selected target, then attach the collaborative OMP session." },
+      { command: "rig triage", description: "Run the configured issueAnalysis pass once; use cron/launchd/CI to schedule continuous triage." }
     ]
   },
   {
-    title: "Watch",
-    subtitle: "fleet metrics and per-task forensics",
+    title: "Runs",
+    subtitle: "dispatched Rig runs attach through collaborative OMP sessions",
     commands: [
-      { command: "rig stats [--since 7d]", description: "Fleet metrics: completion/failure rates, median run time, steering, stalls." },
-      { command: "rig inspect logs --task <id>", description: "Latest run log for a task." },
-      { command: "rig inspect diff --task <id>", description: "Changed files for a task." }
+      { command: "OMP Runs screen", description: "Open dispatched runs, collaboration links, cwd, identity, status, and inbox counts." },
+      { command: "rig join <link>", description: "Join a shared OMP session without changing execution placement." },
+      { command: "OMP collab guest view", description: "Watch the shared transcript live; write links can prompt the originating session." }
     ]
   },
   {
-    title: "Unblock",
-    subtitle: "diagnose wiring, fix auth",
+    title: "Inbox + Doctor",
+    subtitle: "approvals, user prompts, and health checks live inside Rig/OMP",
     commands: [
-      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
-      { command: "rig github auth status", description: "GitHub auth state on the selected server." }
+      { command: "OMP Inbox screen", description: "Review and answer pending approval/user-input workflow entries." },
+      { command: "/rig inbox", description: "Open the inbox screen from inside OMP." },
+      { command: "OMP Doctor screen", description: "Probe session discovery, collaboration registry, selected target, and workflow-entry health." }
     ]
   },
   {
     title: "Extend",
-    subtitle: "plugins contribute validators, hooks, task sources, commands",
+    subtitle: "plugins and OMP extensions shape the worker environment",
     commands: [
-      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." },
-      { command: "rig plugin run <command-id>", description: "Execute a plugin-contributed CLI command." }
+      { command: "rig.config.ts plugins", description: "Register task sources, validators, hooks, skills, roles, and workflow metadata." },
+      { command: "runtime.pi.packages", description: "Declare team-wide OMP/Pi extension packages for sessions and workers." }
     ]
   }
 ];
 var PRIMARY_GROUPS = [
   {
     name: "server",
-    summary: "Choose, inspect, and start the Rig server that owns tasks and runs.",
-    usage: ["rig server <status|list|add|use|start> [options]"],
+    summary: "Select and configure local vs remote execution placement.",
+    usage: ["rig server <status|list|use|add|remove> [options]"],
     commands: [
-      { command: "status", description: "Show the selected server for this repo.", primary: true },
-      { command: "use local", description: "Switch this repo to the local Rig server.", primary: true },
-      { command: "add <alias> <url>", description: "Save a remote Rig server URL.", primary: true },
-      { command: "use <alias>", description: "Select a saved remote server alias.", primary: true },
-      { command: "list", description: "List saved local/remote server aliases.", primary: true },
-      { command: "start [--host <host>] [--port <n>]", description: "Start a local rig-server process." }
+      { command: "status", description: "Show the selected placement (local or remote alias) and task source.", primary: true },
+      { command: "list", description: "List local plus configured remote endpoints; marks the selected one.", primary: true },
+      { command: "use local|<alias>", description: "Select where runs execute \u2014 local, or a configured remote alias.", primary: true },
+      { command: "add --alias <a> --host <h> [--port <n>] [--token <t>]", description: "Add a remote SSH endpoint (the same store run dispatch resolves).", primary: true },
+      { command: "remove <alias>", description: "Remove a configured remote endpoint." }
     ],
     examples: [
       "rig server status",
-      "rig server add prod https://where.rig-does.work",
-      "rig server use prod",
-      "rig server use local",
-      "rig server start --port 3773"
+      "rig server add --alias prod --host prod.example.com --port 22",
+      "rig server use prod"
     ],
-    next: ["Use `rig task list` to see server-owned work.", "Use `rig run list` or `rig run attach <id> --follow` to monitor runs."]
+    next: [
+      "Placement is read by run dispatch (`rig task run` / `rig run <task>`).",
+      "The same selection is available in-session on the bare `rig` board."
+    ]
   },
   {
     name: "task",
-    summary: "Find work, start Pi-backed runs, and validate task results.",
-    usage: ["rig task <list|next|show|run> [options]"],
+    summary: "Find work, dispatch task runs, and validate task results.",
+    usage: ["rig task <list|next|show|run|ready|validate> [options]"],
     commands: [
-      { command: "list [--assignee <login|me|@me>] [--state open|closed]", description: "List tasks from the selected server/source.", primary: true },
-      { command: "next [filters]", description: "Render the next matching task as a selected-task card.", primary: true },
-      { command: "show <id>|--task <id> [--raw]", description: "Show a human task summary; --raw prints the full payload.", primary: true },
-      { command: "run [#<issue>|<task-id>|--next|--task <id>]", description: "Submit a task run; interactive follows with bundled Pi.", primary: true },
+      { command: "list [--assignee <login|me|@me>] [--state open|closed]", description: "List tasks from the configured task source.", primary: true },
+      { command: "next [filters]", description: "Render the next ready task as a selected-task card.", primary: true },
+      { command: "show <id>|--task <id> [--raw]", description: "Show a task summary; --raw prints the full payload.", primary: true },
+      { command: "run [#<issue>|<task-id>|--task <id>]", description: "Dispatch the task as a detached run; attach with `rig run attach <run-id>`.", primary: true },
       { command: "ready", description: "List task IDs that are runnable now." },
-      { command: "validate|verify [--task <id>]", description: "Run configured task checks/review gates." },
+      { command: "validate|verify [--task <id>]", description: "Run the task's configured checks / review gates." },
       { command: "details --task <id>", description: "Show full task info from the configured source." },
       { command: "reopen [--task <id> | --all] [--reason <text>]", description: "Reopen closed task(s) in the configured source." },
       { command: "artifacts|artifact-dir|artifact-write", description: "Inspect or write task artifacts." },
-      { command: "report-bug", description: "Create a structured bug report/task." }
+      { command: "info [--task <id>]", description: "Show the active/selected task's full runtime info." },
+      { command: "scope [--files] [--task <id>]", description: "Show the task's scope (and changed files with --files)." },
+      { command: "deps [--task <id>]", description: "Show the task's dependency graph." },
+      { command: "status", description: "Show project task-tracker progress." },
+      { command: "lookup <id>", description: "Resolve a task id to its canonical record path." },
+      { command: "record <decision|failure> <text> [--task <id>]", description: "Append a decision or failure note to the task." }
     ],
     examples: [
       "rig task list --assignee @me --limit 20",
-      "rig task next",
       "rig task show 123 --raw",
-      "rig task run --next",
-      "rig task run #123 --runtime-adapter pi",
-      "rig task run --title 'Investigate deploy drift' --initial-prompt 'Check server health'"
+      "rig task run #123"
     ],
-    next: ["Use `--detach` to submit without attaching.", "Use `rig run attach <run-id> --follow` to rejoin a live run."]
+    next: ["The same flow is available in-session: run bare `rig`, then Cockpit Tasks \u2192 Task detail \u2192 Dispatch."]
   },
   {
     name: "run",
-    summary: "Observe, attach to, and control Rig runs. `attach` opens the Pi console \u2014 the full worker session, live.",
-    usage: ["rig run <list|status|show|attach|steer|stop|resume|restart> [options]"],
+    summary: "Observe, attach to, and control runs over the OMP collab substrate.",
+    usage: ["rig run <list|status|start|start-serial|start-parallel|show|attach|steer|stop|resume|restart> [options]"],
     commands: [
-      { command: "list", description: "List recent runs from the selected server or local state.", primary: true },
-      { command: "status", description: "Render active and recent run groups.", primary: true },
-      { command: "show <id>|--run <id> [--raw]", description: "Show a human run summary; --raw prints the full payload.", primary: true },
-      { command: "attach <run-id>|--run <id>", description: "Open the run's Pi console \u2014 see 'Inside the console' below. Works on live AND finished runs.", primary: true },
-      { command: "steer <run-id> --message <text>", description: "Queue a steering message into a live worker without attaching \u2014 delivered into the agent's context within seconds.", primary: true },
-      { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
-      { command: "resume [<run-id>]", description: "Resume an interrupted run on the selected server (defaults to the most recent resumable)." },
-      { command: "restart [<run-id>]", description: "Re-dispatch a run from a clean runtime, reopening its Pi session where possible." },
-      { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events (scripts; humans should attach)." },
-      { command: "replay <run-id>|--run <id> [--with-session]", description: "Print the run's consolidated run.jsonl as a merged timeline; --with-session interleaves the Pi session log." },
-      { command: "delete|cleanup", description: "Remove completed run records/artifacts." }
+      { command: "list", description: "List discoverable runs (relay-registry + on-disk OMP run journals).", primary: true },
+      { command: "status", description: "Render active vs recent runs from the run journals.", primary: true },
+      { command: "start [#<issue>|<task-id>|--next|--task <id>] [--title <t>]", description: "Dispatch one task as a detached run; attach with the printed run id.", primary: true },
+      { command: "start-parallel [--limit <n>]", description: "Dispatch all currently-ready tasks as detached runs (limited when requested).", primary: true },
+      { command: "start-serial", description: "Dispatch the next ready task only; run again after it finishes to continue serially.", primary: true },
+      { command: "show <id>|--run <id> [--raw]", description: "Show a run's folded journal projection; --raw prints JSON.", primary: true },
+      { command: "attach <run-id>|--run <id>", description: "Attach to a live run's collab session (resolves the join link).", primary: true },
+      { command: "resume [<run-id>]", description: "Re-dispatch the run's task as a fresh detached run." },
+      { command: "steer <run-id> --message <text>", description: "Steer a live run via its journal (local runs headless; remote runs attach to steer).", primary: true },
+      { command: "stop [<run-id>|--run <id>] [--reason <text>]", description: "Request graceful stop of a live run (local headless; remote attach to stop).", primary: true },
+      { command: "replay <run-id>|--run <id> [--with-session]", description: "Print the run's consolidated journal timeline." },
+      { command: "delete|cleanup", description: "Remove a finished run's live registry entry." }
     ],
     examples: [
-      "rig run attach <run-id>          # full session console \u2014 live mirror, steering, worker shell",
-      "rig run steer <run-id> --message 'focus on the failing test first'",
-      "rig run list",
-      "rig run show <run-id>",
-      "rig run stop <run-id>"
+      "rig run start --next",
+      "rig run start-parallel --limit 3",
+      "rig run attach <run-id>"
     ],
     next: [
-      "Inside the console: the run's COMPLETE transcript loads on open (finished runs too), and new worker turns stream in live.",
-      "Inside the console: plain text = steering into the worker's context \xB7 !<cmd> = shell in the WORKER workspace \xB7 /<cmd> includes the worker session's commands \xB7 /rig abort stops the current turn.",
-      "The console is read-write but remote-only: nothing runs on your machine; the worker keeps running when you exit.",
-      "Use `rig task run --next` to create a new run; interactive mode drops you straight into its console.",
-      "Use `--json` when scripts need the full structured record."
+      "Attach to steer or stop a live run: rig run attach <run-id>.",
+      "The same runs appear in-session on the bare `rig` board."
     ]
   },
   {
     name: "inbox",
     summary: "Review approval and user-input requests that block worker runs.",
-    usage: ["rig inbox <approvals|approve|inputs|respond> [options]"],
+    usage: ["rig inbox <approvals|inputs|approve|respond> [options]"],
     commands: [
-      { command: "approvals [--run <id>] [--task <id>]", description: "List pending approvals.", primary: true },
-      { command: "inputs [--run <id>] [--task <id>]", description: "List pending user-input requests.", primary: true },
-      { command: "approve --run <id> --request <id> --decision approve|reject", description: "Resolve an approval request." },
-      { command: "respond --run <id> --request <id> --answer key=value", description: "Answer a user-input request." }
+      { command: "approvals [--run <id>] [--task <id>]", description: "List pending approval requests across runs.", primary: true },
+      { command: "inputs [--run <id>] [--task <id>]", description: "List pending user-input requests across runs.", primary: true },
+      { command: "approve --run <id> --request <id> --decision approve|reject", description: "Resolve an approval \u2014 delivered over collab, so attach to resolve." },
+      { command: "respond --run <id> --request <id> --answer key=value", description: "Answer a user-input request \u2014 attach to resolve." }
     ],
     examples: [
       "rig inbox approvals",
-      "rig inbox inputs --run <run-id>",
-      "rig inbox approve --run <run-id> --request <request-id> --decision approve"
+      "rig inbox inputs --run <run-id>"
     ],
-    next: ["Rejoin the run after resolving a block: `rig run attach <run-id> --follow`."]
+    next: ["Resolve a request by attaching to its run: rig run attach <run-id>."]
   },
   {
     name: "stats",
     summary: "Fleet metrics computed from on-disk run journals (no server required).",
     usage: ["rig stats [show] [--since <7d|30d|ISO date>]"],
     commands: [
-      { command: "show [--since <window>]", description: "Total runs, completion/failure/needs-attention rates, median run time, steering, stalls, approvals.", primary: true }
+      { command: "show [--since <window>]", description: "Totals, completion/failure/needs-attention rates, run time, steering, stalls, approvals.", primary: true }
     ],
     examples: [
-      "rig stats",
       "rig stats --since 7d",
-      "rig stats --since 2026-06-01 --json"
+      "rig stats --json"
     ],
-    next: ["Inspect outliers with `rig run list` and `rig run show <run-id>`.", "Use `--json` for the schema'd envelope (see docs/cli-json.md)."]
+    next: ["Inspect outliers with `rig run list` and `rig run show <run-id>`."]
   },
   {
     name: "inspect",
-    summary: "Inspect logs, artifacts, graphs, failures for a task.",
+    summary: "Inspect logs, artifacts, failures, graph, and diffs for a task.",
     usage: ["rig inspect <logs|artifacts|failures|graph|audit|diff> --task <id>"],
     commands: [
-      { command: "logs --task <id>", description: "Latest run log for a task (local or selected server).", primary: true },
+      { command: "logs --task <id>", description: "Latest run log for a task.", primary: true },
       { command: "artifacts --task <id>", description: "List the task's completion artifacts.", primary: true },
+      { command: "diff --task <id>", description: "List files changed by a task.", primary: true },
       { command: "failures --task <id>", description: "Recorded failures for a task.", primary: true },
-      { command: "diff --task <id>", description: "Changed files for a task.", primary: true },
       { command: "graph", description: "Task dependency graph." },
       { command: "audit", description: "Controlled-command audit trail." }
     ],
@@ -798,72 +267,75 @@ var PRIMARY_GROUPS = [
   },
   {
     name: "init",
-    summary: "Set up Rig for this repo: server, GitHub auth, checkout strategy, task source, and Pi wiring.",
+    summary: "Legacy automation-only config bootstrap/repair helper; not root onboarding.",
     usage: ["rig init [--yes] [--server local|remote] [--repo owner/repo] [--remote-url <url>]"],
     commands: [
-      { command: "init", description: "Interactive setup wizard for a new or existing Rig repo.", primary: true },
-      { command: "init --demo", description: "Offline demo project: files task source + 3 sample tasks, zero GitHub.", primary: true },
-      { command: "init --yes", description: "Non-interactive setup using detected/default settings.", primary: true },
-      { command: "init --server remote --remote-url <url>", description: "Link this repo to a remote Rig server.", primary: true },
-      { command: "init --repair", description: "Repair missing private state without replacing project config." }
+      { command: "init", description: "Legacy/fenced setup wizard for compatibility projects; not onboarding.", primary: true },
+      { command: "init --demo", description: "Legacy/fenced offline demo project for compatibility tests.", primary: true },
+      { command: "init --yes", description: "Legacy/fenced non-interactive setup for old automation.", primary: true },
+      { command: "init --server remote --remote-url <url>", description: "Legacy/fenced remote server link setup.", primary: true },
+      { command: "init --repair", description: "Legacy/fenced repair of missing private compatibility state." }
     ],
     examples: [
-      "rig init",
-      "rig init --demo",
-      "rig init --yes --repo humanity-org/humanwork",
-      "rig init --server remote --remote-url https://where.rig-does.work --repo owner/repo"
+      "rig init --demo   # legacy compatibility only",
+      "rig init --repair # legacy compatibility only"
     ],
-    next: ["After init, run `rig server status`.", "Then use `rig task list` and `rig task run --next` for day-to-day work."]
+    next: ["For onboarding and normal UX, run bare `rig`, then use Cockpit Server/Tasks and dispatch from Task detail."]
   },
   {
     name: "doctor",
-    summary: "Diagnostics for project/server/GitHub/Pi state.",
+    summary: "Diagnostic-only compatibility checks; normal health lives in the OMP Doctor screen.",
     usage: ["rig doctor"],
     commands: [
-      { command: "doctor", description: "Run setup and runtime diagnostics.", primary: true },
-      { command: "check", description: "Compatibility spelling for diagnostics." }
+      { command: "doctor", description: "Diagnostic/legacy-only: check compatibility setup/runtime state; not onboarding.", primary: true },
+      { command: "check", description: "Diagnostic/legacy-only spelling for compatibility checks." }
     ],
-    examples: ["rig doctor", "rig doctor --json"],
-    next: ["Use `rig server status` and `rig github auth status` to inspect common failure points."]
+    examples: ["rig doctor --json # legacy diagnostic automation only"],
+    next: ["For normal UX, use the OMP Doctor screen."]
   },
   {
     name: "github",
-    summary: "GitHub auth helpers for the selected Rig server.",
+    summary: "Legacy automation-only GitHub auth helpers for selected compatibility servers.",
     usage: ["rig github auth <status|import-gh|token>"],
     commands: [
-      { command: "auth status", description: "Show GitHub auth state.", primary: true },
-      { command: "auth import-gh", description: "Import the current `gh` token into the selected server." },
-      { command: "auth token --token <token>", description: "Store a token on the selected server." }
+      { command: "auth status", description: "Legacy automation-only: show GitHub auth state.", primary: true },
+      { command: "auth import-gh", description: "Legacy automation-only: import the current `gh` token into the selected server." },
+      { command: "auth token --token <token>", description: "Legacy automation-only: store a token on the selected server." }
     ],
-    examples: ["rig github auth status", "rig github auth import-gh"],
-    next: ["After auth is valid, use `rig task run --next`."]
+    examples: ["rig github auth status # legacy automation only"],
+    next: ["For normal UX, use bare `rig` and the OMP extension cockpit."]
   }
 ];
 var ADVANCED_GROUPS = [
-  { name: "setup", summary: "Bootstrap/check local setup.", usage: ["rig setup <bootstrap|check|preflight>"], commands: [{ command: "bootstrap|check|preflight", description: "Setup helpers." }] },
-  { name: "profile", summary: "Runtime profile/model defaults.", usage: ["rig profile <show|set>"], commands: [{ command: "show", description: "Show active profile." }] },
+  {
+    name: "setup",
+    summary: "Legacy automation-only setup bootstrap/check helpers.",
+    usage: ["rig setup <bootstrap|check|preflight>"],
+    commands: [
+      { command: "bootstrap", description: "Legacy automation-only: bootstrap local setup dependencies.", primary: true },
+      { command: "check", description: "Legacy automation-only: check local setup state (toolchain, deps, config).", primary: true },
+      { command: "preflight", description: "Legacy automation-only: run preflight checks before an old run.", primary: true }
+    ]
+  },
+  {
+    name: "profile",
+    summary: "Runtime profile/model defaults.",
+    usage: ["rig profile <show|set>"],
+    commands: [
+      { command: "show", description: "Show the active execution profile.", primary: true },
+      { command: "set [--model <model>] [--runtime <runtime>] [--plugin <plugin>]", description: "Set model/runtime/plugin profile defaults.", primary: true }
+    ]
+  },
   {
     name: "review",
     summary: "Inspect or change completion review gate policy.",
     usage: ["rig review <show|set>"],
     commands: [
       { command: "show", description: "Show current review gate settings." },
-      { command: "set <off|advisory|required> [--provider greptile]", description: "Change review strictness/provider." }
+      { command: "set <off|advisory|required> [--provider <provider>]", description: "Change review strictness/provider (e.g. --provider greptile)." }
     ],
     examples: ["rig review show", "rig review set required --provider greptile"],
-    next: ["Use `rig inbox approvals` for blocked run handoffs."]
-  },
-  {
-    name: "browser",
-    summary: "Browser/app diagnostics for browser-required tasks.",
-    usage: ["rig browser <help|explain|demo|app|hp-next> [options]"],
-    commands: [
-      { command: "help", description: "Rich browser command help (canonical: `rig browser help`)." },
-      { command: "explain", description: "Explain the browser-required task contract." },
-      { command: "demo", description: "Run browser demo flows against a local page." },
-      { command: "app", description: "Launch the Rig Browser workstation app." },
-      { command: "hp-next <dev|check|e2e|reset>", description: "Drive the hp-next browser test harness." }
-    ]
+    next: ["For normal workflow handoffs, use the OMP Inbox screen."]
   },
   {
     name: "pi",
@@ -878,23 +350,81 @@ var ADVANCED_GROUPS = [
     examples: ["rig pi search subagents", "rig pi add pi-subagents", "rig pi list"],
     next: ["Config-managed extensions: declare `runtime: { pi: { packages: [...] } }` in rig.config.ts \u2014 workers pick them up automatically."]
   },
-  { name: "queue", summary: "Run task queues locally.", usage: ["rig queue run [options]"], commands: [{ command: "run", description: "Process queue work." }] },
-  { name: "agent", summary: "Runtime agent workspace helpers.", usage: ["rig agent <list|prepare|run|cleanup>"], commands: [{ command: "list", description: "List prepared agents." }] },
+  {
+    name: "queue",
+    summary: "Run task queues locally.",
+    usage: ["rig queue run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]"],
+    commands: [
+      { command: "run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]", description: "Process queue work: drain matching tasks with N workers, optional per-task action and isolation.", primary: true }
+    ]
+  },
+  {
+    name: "agent",
+    summary: "Runtime agent workspace helpers.",
+    usage: ["rig agent <list|prepare|run|cleanup>"],
+    commands: [
+      { command: "list", description: "List prepared agent runtimes.", primary: true },
+      { command: "prepare [--id <id>] [--mode <mode>] [--task <task>]", description: "Prepare an isolated agent runtime workspace.", primary: true },
+      { command: "run [--id <id>] [--mode <mode>] [--task <task>] [--skip-project-sync]", description: "Prepare (if needed) and run an agent in its workspace.", primary: true },
+      { command: "cleanup [--all] [--id <id>]", description: "Remove prepared agent workspaces.", primary: true }
+    ]
+  },
   { name: "inspector", summary: "Event stream and drift scanners.", usage: ["rig inspector <stream|scan-upstream-drift>"], commands: [{ command: "stream", description: "Stream events." }] },
-  { name: "dist", summary: "Build/install packaged Rig CLI.", usage: ["rig dist <build|install|doctor>"], commands: [{ command: "build", description: "Build distribution." }] },
-  { name: "workspace", summary: "Workspace topology/service helpers.", usage: ["rig workspace <summary|topology|remote-hosts>"], commands: [{ command: "summary", description: "Show workspace summary." }] },
-  { name: "remote", summary: "Compatibility remote orchestration controls.", usage: ["rig remote <status|watch|pause|resume|...>"], commands: [{ command: "status", description: "Show remote state." }] },
+  {
+    name: "dist",
+    summary: "Build/install packaged Rig CLI.",
+    usage: ["rig dist <build|install|doctor|rebuild-agent>"],
+    commands: [
+      { command: "build [--output-dir <dir>]", description: "Build the distributable Rig CLI.", primary: true },
+      { command: "install [--scope <scope>] [--path <path>]", description: "Install the built CLI to a scope/path.", primary: true },
+      { command: "doctor", description: "Diagnose the dist toolchain and install state.", primary: true },
+      { command: "rebuild-agent", description: "Rebuild the agent runtime image, pruning stale images.", primary: true }
+    ]
+  },
+  {
+    name: "workspace",
+    summary: "Workspace topology/service helpers.",
+    usage: ["rig workspace <summary|topology|remote-hosts|service-fabric>"],
+    commands: [
+      { command: "summary", description: "Show workspace summary.", primary: true },
+      { command: "topology", description: "List discovered workspace services.", primary: true },
+      { command: "remote-hosts", description: "List configured remote workspace hosts.", primary: true },
+      { command: "service-fabric <status|up|verify|down> [--service <name>]", description: "Inspect or mutate the workspace service fabric.", primary: true }
+    ]
+  },
+  {
+    name: "remote",
+    summary: "Legacy automation-only remote orchestration controls.",
+    usage: ["rig remote <status|tasks|watch|pause|resume|continue|stop|refresh|add-iterations|remove-iterations|endpoint ...>"],
+    commands: [
+      { command: "status [--remote <alias>]", description: "Legacy automation-only: show old remote orchestration state.", primary: true },
+      { command: "tasks [--remote <alias>]", description: "Legacy automation-only: list the old remote's tracked tasks.", primary: true },
+      { command: "watch [--remote <alias>] [--seconds <n>] [--event <type>]", description: "Legacy automation-only: stream old remote orchestration events.", primary: true },
+      { command: "pause [--remote <alias>]", description: "Legacy automation-only: pause old remote orchestration.", primary: true },
+      { command: "resume [--remote <alias>] [--max-workers <n>] [--max-iterations <n>] [--direct-merge]", description: "Legacy automation-only: resume old remote orchestration with optional tuning.", primary: true },
+      { command: "continue [--remote <alias>]", description: "Legacy automation-only: continue a paused old remote.", primary: true },
+      { command: "stop [--remote <alias>]", description: "Legacy automation-only: stop old remote orchestration.", primary: true },
+      { command: "refresh [--remote <alias>]", description: "Legacy automation-only: refresh old remote state.", primary: true },
+      { command: "add-iterations [--count <n>] [--remote <alias>]", description: "Legacy automation-only: grant an old remote more iterations.", primary: true },
+      { command: "remove-iterations [--count <n>] [--remote <alias>]", description: "Legacy automation-only: reduce an old remote's iteration budget.", primary: true },
+      { command: "endpoint list", description: "Legacy automation-only: list configured remote endpoints.", primary: true },
+      { command: "endpoint add --alias <alias> --host <host> --port <n> [--token <token>]", description: "Legacy automation-only: register a remote endpoint.", primary: true },
+      { command: "endpoint remove --alias <alias>", description: "Legacy automation-only: remove a remote endpoint.", primary: true },
+      { command: "endpoint test [--alias <alias>]", description: "Legacy diagnostic-only: test connectivity to a remote endpoint.", primary: true },
+      { command: "endpoint doctor", description: "Legacy diagnostic-only: diagnose remote endpoint configuration.", primary: true }
+    ]
+  },
   { name: "git", summary: "Pass through to Rig git-flow helper.", usage: ["rig git <args...>"], commands: [{ command: "<args...>", description: "Advanced git flow operations." }] },
   { name: "harness", summary: "Pass through to runtime harness CLI.", usage: ["rig harness <args...>"], commands: [{ command: "<args...>", description: "Advanced harness operations." }] },
   { name: "test", summary: "Project test wrappers.", usage: ["rig test <unit|e2e|all>"], commands: [{ command: "all", description: "Run configured project tests." }] }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
-  return pc3.bold(pc3.cyan(title));
+  return pc2.bold(pc2.cyan(title));
 }
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
-  return `${pc3.dim("\u2502")} ${pc3.bold(commandColumn)} ${description}`;
+  return `${pc2.dim("\u2502")} ${pc2.bold(commandColumn)} ${description}`;
 }
 function renderCommandBlock(commands) {
   return commands.map((entry) => commandLine(entry.command, entry.description)).join(`
@@ -904,40 +434,40 @@ function renderGroup(group) {
   const lines = [
     `${heading(`rig ${group.name}`)} \u2014 ${group.summary}`,
     "",
-    pc3.bold("Usage"),
+    pc2.bold("Usage"),
     ...group.usage.map((line) => `  ${line}`),
     "",
-    pc3.bold("Commands"),
+    pc2.bold("Commands"),
     ...group.commands.map((entry) => commandLine(entry.command, entry.description))
   ];
   if (group.examples?.length) {
-    lines.push("", pc3.bold("Examples"), ...group.examples.map((line) => `  ${pc3.dim("$")} ${line}`));
+    lines.push("", pc2.bold("Examples"), ...group.examples.map((line) => `  ${pc2.dim("$")} ${line}`));
   }
   if (group.next?.length) {
-    lines.push("", pc3.bold("Next steps"), ...group.next.map((line) => `  ${pc3.dim("\u203A")} ${line}`));
+    lines.push("", pc2.bold("Next steps"), ...group.next.map((line) => `  ${pc2.dim("\u203A")} ${line}`));
   }
   if (group.advanced?.length) {
-    lines.push("", pc3.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc3.dim("\u203A")} ${line}`));
+    lines.push("", pc2.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc2.dim("\u203A")} ${line}`));
   }
   return lines.join(`
 `);
 }
 function renderTopLevelHelp() {
   return [
-    `${heading("rig")} ${pc3.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
-    pc3.dim("The loop: pick a task, dispatch an agent, open its Pi console (`rig run attach <id>`) to watch and steer it live, clear inbox gates, merge."),
+    `${heading("rig")} ${pc2.dim("\u2014 Rig Cockpit for autonomous coding agents")}`,
+    pc2.dim("The loop: bare `rig` \u2192 Cockpit \u2192 Server target \u2192 Tasks \u2192 Task detail \u2192 Dispatch/Attach; every run uses OMP collaboration as the session substrate."),
     "",
     ...TOP_LEVEL_SECTIONS.flatMap((section) => [
-      `${pc3.bold(pc3.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc3.dim(section.subtitle)}`,
+      `${pc2.bold(pc2.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc2.dim(section.subtitle)}`,
       renderCommandBlock(section.commands),
       ""
     ]),
-    pc3.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
+    pc2.dim("More: `rig help --advanced` for fenced legacy/diagnostic commands; `rig <group> --help` for per-group compatibility help; `rig --version` for the installed version."),
     "",
-    pc3.bold("Global options"),
-    commandLine("--project <path>", "Use a project root instead of auto-discovery."),
-    commandLine("--json", "Emit structured output for scripts/agents."),
-    commandLine("--dry-run", "Print the command plan without mutating state.")
+    pc2.bold("Root options"),
+    commandLine("--workspace <path>", "Open Rig Cockpit for a workspace instead of the current directory."),
+    commandLine("--json", "Compatibility flag for fenced legacy/diagnostic subcommands."),
+    commandLine("--dry-run", "Compatibility flag for fenced legacy/diagnostic subcommands.")
   ].join(`
 `).trimEnd();
 }
@@ -949,6 +479,339 @@ function printGroupHelpDocument(groupName) {
   console.log(renderGroupHelp(groupName) ?? renderTopLevelHelp());
 }
 
+// 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 {
+  foldRunSessionEntries,
+  sessionIdFromSessionFile as sessionIdFromSessionFile2
+} from "@rig/contracts";
+import { listAgentRuntimes as listAgentRuntimes2 } from "@rig/runtime/control-plane/runtime/isolation";
+
+// packages/cli/src/commands/_run-bridge.ts
+import { existsSync, readdirSync, readFileSync } from "fs";
+import { dirname, resolve } from "path";
+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 isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+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;
+  }
+  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;
+}
+async function listLocalRunCollabSessions(projectRoot) {
+  let runtimes;
+  try {
+    runtimes = await listAgentRuntimes(projectRoot);
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const runtime of runtimes) {
+    const collab = readLocalRunCollab(runtime);
+    if (collab)
+      out.push(collab);
+  }
+  return out;
+}
+async function listActiveRunCollab(filter) {
+  return defaultListActiveCollabSessions(filter);
+}
+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))];
+}
+
+// packages/cli/src/commands/_run-diagnostics.ts
+function normalizeString(value) {
+  if (typeof value !== "string")
+    return null;
+  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 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/_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 files = readdirSync2(sessionDir).filter((file) => file.endsWith(".jsonl")).sort().reverse();
+    return files[0] ? resolve2(sessionDir, files[0]) : null;
+  } catch {
+    return null;
+  }
+}
+function readSessionRunEntries(sessionPath) {
+  if (!sessionPath || !existsSync2(sessionPath))
+    return [];
+  let raw;
+  try {
+    raw = readFileSync2(sessionPath, "utf8");
+  } catch {
+    return [];
+  }
+  const entries = [];
+  for (const line of raw.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    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 } : {}
+    });
+  }
+  return entries;
+}
+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 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 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;
+  });
+}
+async function listRunProjections(projectRoot, filter = {}) {
+  const byRunId = new Map;
+  let live = [];
+  try {
+    live = await listActiveRunCollab(filter);
+  } catch {
+    live = [];
+  }
+  for (const collab of live) {
+    const record = recordFromLiveCollab(collab);
+    byRunId.set(record.runId, record);
+  }
+  let runtimes = [];
+  try {
+    runtimes = await listAgentRuntimes2(projectRoot);
+  } catch {
+    runtimes = [];
+  }
+  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;
+    }
+    if (byRunId.has(runtime.id))
+      continue;
+    byRunId.set(record.runId, record);
+  }
+  return sortByRecency([...byRunId.values()]);
+}
+
 // packages/cli/src/commands/stats.ts
 var DAY_MS = 24 * 60 * 60 * 1000;
 function parseSinceOption(value, now = new Date) {
@@ -957,95 +820,160 @@ function parseSinceOption(value, now = new Date) {
   const trimmed = value.trim();
   const relative = trimmed.match(/^(\d+)d$/i);
   if (relative?.[1]) {
-    return new Date(now.getTime() - Number.parseInt(relative[1], 10) * DAY_MS);
+    const days = Number.parseInt(relative[1], 10);
+    if (!Number.isFinite(days) || days <= 0) {
+      throw new CliError(`Invalid --since value: ${value}`, 2, {
+        hint: "Use an ISO date or a relative window like `7d`."
+      });
+    }
+    return new Date(now.getTime() - days * DAY_MS);
   }
   const parsed = Date.parse(trimmed);
   if (!Number.isFinite(parsed)) {
-    throw new CliError(`Invalid --since value: ${trimmed}. Use <n>d (e.g. 7d, 30d) or an ISO date (e.g. 2026-06-01).`, 2, { hint: "Re-run with a valid window, e.g. `rig stats --since 7d` or `rig stats --since 2026-06-01`." });
+    throw new CliError(`Invalid --since value: ${value}`, 2, {
+      hint: "Use an ISO date or a relative window like `7d`."
+    });
   }
   return new Date(parsed);
 }
+function parseTimestamp(value) {
+  if (!value)
+    return null;
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function median(values) {
+  if (values.length === 0)
+    return null;
+  const sorted = [...values].sort((left, right) => left - right);
+  const middle = Math.floor(sorted.length / 2);
+  return sorted.length % 2 === 1 ? sorted[middle] : (sorted[middle - 1] + sorted[middle]) / 2;
+}
+function rate(part, total) {
+  return total === 0 ? null : part / total;
+}
+function isNeedsAttention(run) {
+  return run.status === "needs-attention" || run.pendingApprovals + run.pendingInputs > 0 || run.stallCount > 0;
+}
+function completedDuration(run) {
+  if (run.status !== "completed")
+    return null;
+  const startedAt = parseTimestamp(run.startedAt);
+  const completedAt = parseTimestamp(run.completedAt);
+  if (startedAt === null || completedAt === null || completedAt < startedAt)
+    return null;
+  return completedAt - startedAt;
+}
+async function computeRigStats(projectRoot, options = {}) {
+  const sinceMs = options.since ? options.since.getTime() : null;
+  const allRuns = await (options.listRuns ?? listRunProjections)(projectRoot);
+  const runs = allRuns.filter((run) => {
+    if (sinceMs === null)
+      return true;
+    const startedAt = parseTimestamp(run.startedAt);
+    return startedAt !== null && startedAt >= sinceMs;
+  });
+  const statusCounts = {};
+  const completionDurations = [];
+  let completedRuns = 0;
+  let failedRuns = 0;
+  let needsAttentionRuns = 0;
+  let steeringTotal = 0;
+  let stallTotal = 0;
+  let approvalsPending = 0;
+  for (const run of runs) {
+    const status = run.status || "unknown";
+    statusCounts[status] = (statusCounts[status] ?? 0) + 1;
+    if (status === "completed")
+      completedRuns += 1;
+    if (status === "failed")
+      failedRuns += 1;
+    if (isNeedsAttention(run))
+      needsAttentionRuns += 1;
+    const duration = completedDuration(run);
+    if (duration !== null)
+      completionDurations.push(duration);
+    steeringTotal += run.steeringCount;
+    stallTotal += run.stallCount;
+    approvalsPending += run.pendingApprovals;
+  }
+  const totalRuns = runs.length;
+  return {
+    since: options.since ? options.since.toISOString() : null,
+    totalRuns,
+    statusCounts,
+    completedRuns,
+    failedRuns,
+    needsAttentionRuns,
+    completionRate: rate(completedRuns, totalRuns),
+    failureRate: rate(failedRuns, totalRuns),
+    needsAttentionRate: rate(needsAttentionRuns, totalRuns),
+    medianCompletionMs: median(completionDurations),
+    steeringTotal,
+    steeringPerRun: totalRuns === 0 ? null : steeringTotal / totalRuns,
+    stallTotal,
+    approvalsRequested: approvalsPending,
+    approvalsApproved: 0,
+    approvalsRejected: 0,
+    approvalsPending
+  };
+}
 function formatPercent(value) {
-  if (value === null)
-    return "\u2014";
-  return `${(value * 100).toFixed(1)}%`;
+  return value === null ? "\u2014" : `${Math.round(value * 100)}%`;
 }
 function formatDuration(ms) {
   if (ms === null)
     return "\u2014";
-  if (ms < 1000)
-    return `${Math.round(ms)}ms`;
-  const seconds = ms / 1000;
+  const seconds = Math.round(ms / 1000);
   if (seconds < 60)
-    return `${seconds.toFixed(0)}s`;
-  const minutes = seconds / 60;
+    return `${seconds}s`;
+  const minutes = Math.round(ms / 60000);
   if (minutes < 60)
-    return `${Math.floor(minutes)}m ${Math.round(seconds % 60)}s`;
+    return `${minutes}m`;
   const hours = Math.floor(minutes / 60);
-  return `${hours}h ${Math.round(minutes % 60)}m`;
+  const remainder = minutes % 60;
+  return remainder === 0 ? `${hours}h` : `${hours}h ${remainder}m`;
 }
-function formatStatsReport(stats) {
-  const window = stats.since ? `since ${stats.since}` : "all time";
-  const rows = [
-    ["runs", String(stats.totalRuns)],
+function formatStatsRows(stats) {
+  return [
+    ["window", stats.since ? `since ${stats.since}` : "all runs"],
+    ["total runs", stats.totalRuns],
     ["completed", `${stats.completedRuns} (${formatPercent(stats.completionRate)})`],
     ["failed", `${stats.failedRuns} (${formatPercent(stats.failureRate)})`],
-    ["needs attn", `${stats.needsAttentionRuns} (${formatPercent(stats.needsAttentionRate)})`],
-    ["median time", formatDuration(stats.medianCompletionMs)],
-    ["steering", `${stats.steeringTotal} total \xB7 ${stats.steeringPerRun === null ? "\u2014" : stats.steeringPerRun.toFixed(2)}/run`],
-    ["stalls", String(stats.stallTotal)],
-    ["approvals", `${stats.approvalsRequested} requested \xB7 ${stats.approvalsApproved} approved \xB7 ${stats.approvalsRejected} rejected \xB7 ${stats.approvalsPending} pending`]
+    ["needs attention", `${stats.needsAttentionRuns} (${formatPercent(stats.needsAttentionRate)})`],
+    ["median run time", formatDuration(stats.medianCompletionMs)],
+    ["steering", stats.steeringTotal],
+    ["stalls", stats.stallTotal],
+    ["pending approvals", stats.approvalsPending]
   ];
-  const keyWidth = Math.max(...rows.map(([key]) => key.length));
-  const lines = [
-    formatSection("Fleet stats", window),
-    ...rows.map(([key, value]) => `${pc4.dim("\u2502")} ${pc4.dim(key.padEnd(keyWidth + 2))} ${value}`)
-  ];
-  const otherStatuses = Object.entries(stats.statusCounts).filter(([status]) => !["completed", "failed", "needs-attention"].includes(status)).sort(([, left], [, right]) => right - left);
-  if (otherStatuses.length > 0) {
-    lines.push(`${pc4.dim("\u2502")} ${pc4.dim("other".padEnd(keyWidth + 2))} ${otherStatuses.map(([status, count]) => `${status}:${count}`).join(" ")}`);
-  }
-  lines.push("", ...formatNextSteps([
-    "Inspect a run: `rig run list` then `rig run show <run-id>`",
-    "Narrow the window: `rig stats --since 7d`"
-  ]));
-  return lines.join(`
-`);
 }
-async function executeStats(context, args) {
-  const [first, ...rest] = args;
-  const isImplicitShow = first === undefined || first.startsWith("-");
-  const command = isImplicitShow ? "show" : first;
-  const pending = isImplicitShow ? args : rest;
-  switch (command) {
-    case "show": {
-      const sinceResult = takeOption(pending, "--since");
-      requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
-      const since = parseSinceOption(sinceResult.value);
-      const remoteStats = isRemoteConnectionSelected(context.projectRoot);
-      const stats = await withSpinner(remoteStats ? "Computing fleet stats on the server\u2026" : "Scanning local run state\u2026", async () => remoteStats ? await requestServerJson(context, `/api/stats${since ? `?since=${encodeURIComponent(since.toISOString())}` : ""}`) : computeRigStats(context.projectRoot, { since }), { outputMode: context.outputMode });
-      if (context.outputMode === "text") {
-        printFormattedOutput(formatStatsReport(stats));
-      }
-      return {
-        ok: true,
-        group: "stats",
-        command: "show",
-        details: stats
-      };
-    }
-    case "help": {
-      if (context.outputMode === "text")
-        printGroupHelpDocument("stats");
-      return { ok: true, group: "stats", command: "help" };
-    }
-    default:
-      throw new CliError(`Unknown stats command: ${command}. Use \`rig stats\` or \`rig stats show [--since <7d|30d|ISO date>]\`.`, 2, { hint: "Run `rig stats --since 7d` for the last week, or `rig stats --help` for usage." });
+async function executeStats(context, args, deps = {}) {
+  const [first = "show", ...rest] = args;
+  const command = first.startsWith("-") ? "show" : first;
+  const commandArgs = first.startsWith("-") ? args : rest;
+  if (command === "help") {
+    printGroupHelpDocument("stats");
+    return { ok: true, group: "stats", command };
+  }
+  if (command !== "show") {
+    throw new CliError(`Unknown stats command: ${command}`, 1, {
+      hint: "Run `rig stats --help` \u2014 the default command is `show`."
+    });
+  }
+  const sinceResult = takeOption(commandArgs, "--since");
+  requireNoExtraArgs(sinceResult.rest, "rig stats [show] [--since <7d|30d|ISO date>]");
+  const details = await computeRigStats(context.projectRoot, {
+    since: parseSinceOption(sinceResult.value),
+    listRuns: deps.listRuns
+  });
+  if (context.outputMode === "text") {
+    printFormattedOutput(formatStatsTable(formatStatsRows(details)));
   }
+  return { ok: true, group: "stats", command, details };
 }
 export {
   parseSinceOption,
-  formatStatsReport,
+  formatStatsRows,
   executeStats,
   computeRigStats
 };