@h-rig/cli 0.0.6-alpha.26 → 0.0.6-alpha.28

package/dist/bin/rig.js

@@ -495,15 +495,15 @@ function buildBugReportMarkdown(input, browser, screenshots, assets) {
     ...input.issueId ? [
       `- Canonical task assets live under \`artifacts/${input.issueId}/bug-report/\`.`,
       `- Start with \`artifacts/${input.issueId}/bug-report/task.md\` and the files in \`artifacts/${input.issueId}/bug-report/assets/\`.`,
-      browserRequired ? `- Run \`bun run rig task info --task ${input.issueId}\` to confirm browser wiring before debugging.` : `- Run \`bun run rig task info --task ${input.issueId}\` to confirm scope and artifact links before debugging.`
+      browserRequired ? `- Run \`rig task info --task ${input.issueId}\` to confirm browser wiring before debugging.` : `- Run \`rig task info --task ${input.issueId}\` to confirm scope and artifact links before debugging.`
     ] : [
-      "- Draft-only report: convert this into a beads task before assigning it to an agent run."
+      "- Draft-only report: convert this into a Rig task before assigning it to an agent run."
     ],
     "",
     "## Validation",
     "",
     "```bash",
-    ...input.issueId ? [`bun run rig task validate --task ${input.issueId}`] : [],
+    ...input.issueId ? [`rig task validate --task ${input.issueId}`] : [],
     ...browserRequired ? [
       "bun run app:check:browser:hp-next",
       "bun run app:e2e:browser:hp-next"
@@ -650,7 +650,7 @@ async function executeTaskReportBug(context, args) {
   pending = outputRootResult.rest;
   const slugResult = takeOption(pending, "--slug");
   pending = slugResult.rest;
-  requireNoExtraArgs(pending, "bun run rig report-bug [--no-prompt] [--no-beads] [--browser|--no-browser] --title <text> --url <url> [--asset <dragged-file>]");
+  requireNoExtraArgs(pending, "rig report-bug [--no-prompt] [--no-beads] [--browser|--no-browser] --title <text> --url <url> [--asset <dragged-file>]");
   let draft = {
     outputRoot: outputRootResult.value || "",
     title: titleResult.value,
@@ -755,7 +755,7 @@ async function executeTaskReportBug(context, args) {
     console.log(`Evidence assets: ${result.assetDir}`);
     if (taskConfigPath) {
       console.log(`Task config: ${taskConfigPath}`);
-      console.log(`Run: bun run rig task info --task ${issueId}`);
+      console.log(`Run: rig task info --task ${issueId}`);
     }
   }
   return {
@@ -1578,7 +1578,7 @@ async function executeBrowser(context, args) {
     return { ok: true, group: "browser", command: "help" };
   }
   if (command === "explain") {
-    requireNoExtraArgs(rest, "bun run rig browser explain");
+    requireNoExtraArgs(rest, "rig browser explain");
     console.log(browserAgentUsageText());
     return { ok: true, group: "browser", command: "explain" };
   }
@@ -1604,7 +1604,7 @@ ${browserHelpText()}`);
 
 ${browserHelpText()}`);
     }
-    requireNoExtraArgs(appRest, `bun run rig browser ${command} ${subcommand}`);
+    requireNoExtraArgs(appRest, `rig browser ${command} ${subcommand}`);
     await context.runCommand(["bun", "run", `app:${subcommand}:browser:${appSlug}`]);
     return { ok: true, group: "browser", command: `${command}-${subcommand}` };
   }
@@ -1616,7 +1616,7 @@ ${browserHelpText()}`);
   };
   const packageScript = packageScripts[command];
   if (packageScript) {
-    requireNoExtraArgs(rest, `bun run rig browser ${command}`);
+    requireNoExtraArgs(rest, `rig browser ${command}`);
     await context.runCommand(["bun", "run", "--filter=@rig/browser", packageScript]);
     return { ok: true, group: "browser", command };
   }
@@ -1643,7 +1643,7 @@ async function executeBrowserDemo(context, args) {
   pending = keepOpenFlag.rest;
   const noBuildFlag = takeFlag(pending, "--no-build");
   pending = noBuildFlag.rest;
-  requireNoExtraArgs(pending, "bun run rig browser demo [--port <n>] [--profile <name>] [--state-dir <path>] [--target-url <url>] [--keep-open] [--no-build]");
+  requireNoExtraArgs(pending, "rig browser demo [--port <n>] [--profile <name>] [--state-dir <path>] [--target-url <url>] [--keep-open] [--no-build]");
   if (context.outputMode !== "text" || !process.stdin.isTTY || !process.stdout.isTTY) {
     throw new CliError2("rig browser demo requires an interactive TTY in text mode.");
   }
@@ -2154,17 +2154,17 @@ async function executeProfile(context, args) {
   const [command = "show", ...rest] = args;
   switch (command) {
     case "show":
-      requireNoExtraArgs(rest, "bun run rig profile show");
+      requireNoExtraArgs(rest, "rig profile show");
       await withMutedConsole(context.outputMode === "json", () => showProfile(context.projectRoot));
       return { ok: true, group: "profile", command };
     case "set": {
       if (rest.length === 0) {
-        throw new CliError2("Usage: bun run rig profile set <claude-code|codex-cli|pi> or set [--model ...] [--runtime ...] [--plugin ...]");
+        throw new CliError2("Usage: rig profile set <claude-code|codex-cli|pi> or set [--model ...] [--runtime ...] [--plugin ...]");
       }
       const preset = rest[0];
       if (preset && !preset.startsWith("-")) {
         if (rest.length !== 1) {
-          throw new CliError2("Usage: bun run rig profile set <claude-code|codex-cli|pi>");
+          throw new CliError2("Usage: rig profile set <claude-code|codex-cli|pi>");
         }
         try {
           await withMutedConsole(context.outputMode === "json", () => setProfile(context.projectRoot, { preset }));
@@ -2180,7 +2180,7 @@ async function executeProfile(context, args) {
       pending = runtimeResult.rest;
       const pluginResult = takeOption(pending, "--plugin");
       pending = pluginResult.rest;
-      requireNoExtraArgs(pending, "bun run rig profile set [--model ...] [--runtime ...] [--plugin ...]");
+      requireNoExtraArgs(pending, "rig profile set [--model ...] [--runtime ...] [--plugin ...]");
       if (!modelResult.value && !runtimeResult.value && !pluginResult.value) {
         throw new CliError2("Provide at least one of --model, --runtime, or --plugin.");
       }
@@ -2212,21 +2212,21 @@ async function executeReview(context, args) {
   const [command = "show", ...rest] = args;
   switch (command) {
     case "show":
-      requireNoExtraArgs(rest, "bun run rig review show");
+      requireNoExtraArgs(rest, "rig review show");
       await withMutedConsole(context.outputMode === "json", () => showReviewProfile(context.projectRoot));
       return { ok: true, group: "review", command };
     case "set": {
       if (rest.length === 0) {
-        throw new CliError2("Usage: bun run rig review set <off|advisory|required> [--provider greptile]");
+        throw new CliError2("Usage: rig review set <off|advisory|required> [--provider greptile]");
       }
       const mode = rest[0];
       if (!mode) {
-        throw new CliError2("Usage: bun run rig review set <off|advisory|required> [--provider greptile]");
+        throw new CliError2("Usage: rig review set <off|advisory|required> [--provider greptile]");
       }
       let pending = rest.slice(1);
       const providerResult = takeOption(pending, "--provider");
       pending = providerResult.rest;
-      requireNoExtraArgs(pending, "bun run rig review set <off|advisory|required> [--provider greptile]");
+      requireNoExtraArgs(pending, "rig review set <off|advisory|required> [--provider greptile]");
       try {
         await withMutedConsole(context.outputMode === "json", () => {
           return setReviewProfile(context.projectRoot, mode, providerResult.value);
@@ -2311,13 +2311,13 @@ async function executeRepo(context, args) {
   switch (command) {
     case "sync": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig repo sync [--task <beads-id>]");
+      requireNoExtraArgs(remaining, "rig repo sync [--task <task-id>]");
       withMutedConsole(context.outputMode === "json", () => repoEnsure(context.projectRoot, task || undefined));
       return { ok: true, group: "repo", command, details: { task: task || null } };
     }
     case "reset-baseline": {
       const { value: keepTaskStatusFlag, rest: remaining } = takeFlag(rest, "--keep-task-status");
-      requireNoExtraArgs(remaining, "bun run rig repo reset-baseline [--keep-task-status]");
+      requireNoExtraArgs(remaining, "rig repo reset-baseline [--keep-task-status]");
       withMutedConsole(context.outputMode === "json", () => resetBaseline(context.projectRoot, keepTaskStatusFlag));
       return { ok: true, group: "repo", command, details: { keepTaskStatus: keepTaskStatusFlag } };
     }
@@ -2327,7 +2327,7 @@ async function executeRepo(context, args) {
 }
 async function executeGit(context, args) {
   if (args.length === 0) {
-    throw new CliError2("Usage: bun run rig git <git-flow args...>");
+    throw new CliError2("Usage: rig git <git-flow args...>");
   }
   await enforceNativeCommandPolicy(context, args, {
     commandPrefix: "rig-agent git",
@@ -2348,7 +2348,7 @@ async function executeGit(context, args) {
 }
 async function executeHarness(context, args) {
   if (args.length === 0) {
-    throw new CliError2("Usage: bun run rig harness <harness args...>");
+    throw new CliError2("Usage: rig harness <harness args...>");
   }
   await enforceNativeCommandPolicy(context, args, {
     commandPrefix: "rig-agent",
@@ -2457,7 +2457,7 @@ async function executePlugin(context, args) {
   const [command = "list", ...rest] = args;
   switch (command) {
     case "list": {
-      requireNoExtraArgs(rest, "bun run rig plugin list");
+      requireNoExtraArgs(rest, "rig plugin list");
       const legacyPlugins = context.plugins.list();
       const declarative = [];
       const config = await loadRigConfigOrNull(context.projectRoot);
@@ -2524,8 +2524,8 @@ async function executePlugin(context, args) {
     }
     case "validate": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig plugin validate --task <beads-id>");
-      const taskId = requireTask(task, "bun run rig plugin validate --task <beads-id>");
+      requireNoExtraArgs(remaining, "rig plugin validate --task <task-id>");
+      const taskId = requireTask(task, "rig plugin validate --task <task-id>");
       const results = await context.plugins.runValidators(taskId);
       const passed = results.filter((result) => result.passed).length;
       const failed = results.length - passed;
@@ -2665,7 +2665,7 @@ function resolveSelectedConnection(projectRoot, options = {}) {
   const global = readGlobalConnections(options);
   const connection = global.connections[repo.selected];
   if (!connection) {
-    throw new CliError2(`Selected Rig connection "${repo.selected}" was not found. Run \`rig connect list\` or \`rig connect use local\`.`, 1);
+    throw new CliError2(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
   }
   return { alias: repo.selected, connection };
 }
@@ -3157,7 +3157,7 @@ async function runFastTaskRunPreflight(context, options = {}) {
     }
   }
   const repo = readRepoConnection(context.projectRoot);
-  checks.push(repo ? preflightCheck("project-link", "project linked to Rig connection", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to record the GitHub repo slug.") : preflightCheck("project-link", "project linked to Rig connection", legacyServerCompatibility ? "warn" : "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig connect use <alias|local>`."));
+  checks.push(repo ? preflightCheck("project-link", "project linked to Rig server", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to record the GitHub repo slug.") : preflightCheck("project-link", "project linked to Rig server", legacyServerCompatibility ? "warn" : "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig server use <alias|local>`."));
   try {
     const auth = await request("/api/github/auth/status");
     checks.push(isAuthenticated(auth) ? preflightCheck("github-auth", "GitHub auth valid", "pass") : preflightCheck("github-auth", "GitHub auth valid", legacyServerCompatibility ? "warn" : "fail", "not authenticated", "Run `rig github auth import-gh` or `rig github auth token --token <token>`."));
@@ -3275,7 +3275,7 @@ async function executeQueue(context, args) {
       pending = failFastResult.rest;
       const skipProjectSyncResult = takeFlag(pending, "--skip-project-sync");
       pending = skipProjectSyncResult.rest;
-      requireNoExtraArgs(pending, "bun run rig queue run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]");
+      requireNoExtraArgs(pending, "rig queue run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]");
       const workers = parsePositiveInt(workersResult.value, "--workers", 2);
       const maxTasks = parsePositiveInt(maxTasksResult.value, "--max-tasks", 10);
       const action = parseAction(actionResult.value);
@@ -3453,7 +3453,7 @@ async function executeAgent(context, args) {
   const [command = "list", ...rest] = args;
   switch (command) {
     case "list": {
-      requireNoExtraArgs(rest, "bun run rig agent list");
+      requireNoExtraArgs(rest, "rig agent list");
       const runtimes = await listAgentRuntimes(context.projectRoot);
       if (context.outputMode === "text") {
         if (runtimes.length === 0) {
@@ -3474,12 +3474,12 @@ async function executeAgent(context, args) {
       pending = modeResult.rest;
       const taskResult = takeOption(pending, "--task");
       pending = taskResult.rest;
-      requireNoExtraArgs(pending, "bun run rig agent prepare --task <id> [--id <id>] [--mode worktree]");
+      requireNoExtraArgs(pending, "rig agent prepare --task <id> [--id <id>] [--mode worktree]");
       const mode = parseIsolationMode(modeResult.value, false);
       const id = idResult.value || agentId("agent");
       const taskId = taskResult.value?.trim();
       if (!taskId) {
-        throw new CliError2("Usage: bun run rig agent prepare --task <id> [--id <id>] [--mode worktree]");
+        throw new CliError2("Usage: rig agent prepare --task <id> [--id <id>] [--mode worktree]");
       }
       const runtime = await withMutedConsole(context.outputMode === "json", () => ensureAgentRuntime({
         projectRoot: context.projectRoot,
@@ -3497,7 +3497,7 @@ async function executeAgent(context, args) {
     case "run": {
       const { options, commandParts } = splitAtDoubleDash(rest);
       if (commandParts.length === 0) {
-        throw new CliError2("Usage: bun run rig agent run [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
+        throw new CliError2("Usage: rig agent run [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
       }
       let pending = options;
       const idResult = takeOption(pending, "--id");
@@ -3508,12 +3508,12 @@ async function executeAgent(context, args) {
       pending = taskResult.rest;
       const skipProjectSyncResult = takeFlag(pending, "--skip-project-sync");
       pending = skipProjectSyncResult.rest;
-      requireNoExtraArgs(pending, "bun run rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
+      requireNoExtraArgs(pending, "rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
       const mode = parseIsolationMode(modeResult.value, false);
       const id = idResult.value || agentId("agent-run");
       const taskId = taskResult.value?.trim();
       if (!taskId) {
-        throw new CliError2("Usage: bun run rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
+        throw new CliError2("Usage: rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
       }
       await runProjectMainSyncPreflight(context, { disabled: skipProjectSyncResult.value });
       const createdAt = new Date().toISOString();
@@ -3627,7 +3627,7 @@ ${result.stderr.trim()}` : ""}`, result.exitCode);
       pending = allResult.rest;
       const idResult = takeOption(pending, "--id");
       pending = idResult.rest;
-      requireNoExtraArgs(pending, "bun run rig agent cleanup (--id <id> | --all)");
+      requireNoExtraArgs(pending, "rig agent cleanup (--id <id> | --all)");
       if (!allResult.value && !idResult.value) {
         throw new CliError2("Provide --id <id> or --all.");
       }
@@ -3763,7 +3763,7 @@ async function executeDist(context, args) {
   switch (command) {
     case "build": {
       const { value: outputDir, rest: pending } = takeOption(rest, "--output-dir");
-      requireNoExtraArgs(pending, "bun run rig dist build [--output-dir <dir>]");
+      requireNoExtraArgs(pending, "rig dist build [--output-dir <dir>]");
       const commandParts = ["bun", "run", "packages/cli/bin/build-rig-binaries.ts"];
       if (outputDir) {
         commandParts.push("--output-dir", outputDir);
@@ -3777,7 +3777,7 @@ async function executeDist(context, args) {
       pending = scopeResult.rest;
       const pathResult = takeOption(pending, "--path");
       pending = pathResult.rest;
-      requireNoExtraArgs(pending, "bun run rig dist install [--scope user|system] [--path <dir>]");
+      requireNoExtraArgs(pending, "rig dist install [--scope user|system] [--path <dir>]");
       const scope = parseInstallScope(scopeResult.value);
       const installDir = resolveInstallDir(scope, pathResult.value);
       mkdirSync6(installDir, { recursive: true });
@@ -3820,7 +3820,7 @@ async function executeDist(context, args) {
       };
     }
     case "doctor": {
-      requireNoExtraArgs(rest, "bun run rig dist doctor");
+      requireNoExtraArgs(rest, "rig dist doctor");
       const details = await runDistDoctor(context.projectRoot);
       if (context.outputMode === "text") {
         console.log(`bun: ${details.bun.available ? `ok (${details.bun.version})` : "missing"}`);
@@ -3831,7 +3831,7 @@ async function executeDist(context, args) {
       return { ok: true, group: "dist", command, details };
     }
     case "rebuild-agent": {
-      requireNoExtraArgs(rest, "bun run rig dist rebuild-agent");
+      requireNoExtraArgs(rest, "rig dist rebuild-agent");
       const fp = await computeRuntimeImageFingerprint(context.projectRoot);
       const currentId = computeRuntimeImageId(fp);
       const imagesDir = resolve12(resolveControlPlaneMonorepoRuntimeDir(context.projectRoot), "images");
@@ -3983,6 +3983,414 @@ import {
   readJsonlFile as readJsonlFile3,
   resolveAuthorityRunDir as resolveAuthorityRunDir2
 } from "@rig/runtime/control-plane/authority-files";
+
+// packages/cli/src/commands/_cli-format.ts
+import { log as log3, note as note3 } from "@clack/prompts";
+import pc3 from "picocolors";
+function stringField(record, key, fallback = "") {
+  const value = record[key];
+  return typeof value === "string" && value.trim() ? value.trim() : fallback;
+}
+function numberField(record, key) {
+  const value = record[key];
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function arrayField(record, key) {
+  const value = record[key];
+  return Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.trim() ? [entry.trim()] : []) : [];
+}
+function rawObject(record) {
+  const raw = record.raw;
+  return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+}
+function truncate(value, width) {
+  if (value.length <= width)
+    return value;
+  if (width <= 1)
+    return "\u2026";
+  return `${value.slice(0, width - 1)}\u2026`;
+}
+function pad(value, width) {
+  return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
+}
+function statusColor(status) {
+  const normalized = status.toLowerCase();
+  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved"].includes(normalized))
+    return pc3.green;
+  if (["failed", "needs_attention", "needs-attention", "blocked", "error", "rejected"].includes(normalized))
+    return pc3.red;
+  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
+    return pc3.cyan;
+  if (["ready", "open", "queued", "created", "preparing", "local", "pending"].includes(normalized))
+    return pc3.yellow;
+  return pc3.dim;
+}
+function compactDate(value) {
+  if (!value.trim())
+    return "";
+  const parsed = Date.parse(value);
+  if (!Number.isFinite(parsed))
+    return value;
+  return new Date(parsed).toISOString().replace("T", " ").replace(/\.\d{3}Z$/, "Z");
+}
+function compactValue(value) {
+  if (value === null || value === undefined)
+    return "";
+  if (typeof value === "string")
+    return value;
+  if (typeof value === "number" || typeof value === "boolean")
+    return String(value);
+  if (Array.isArray(value))
+    return value.map(compactValue).filter(Boolean).join(", ");
+  return JSON.stringify(value);
+}
+function firstString(record, keys, fallback = "") {
+  for (const key of keys) {
+    const value = stringField(record, key);
+    if (value)
+      return value;
+  }
+  return fallback;
+}
+function runIdOf(run) {
+  return firstString(run, ["runId", "id"], "(unknown-run)");
+}
+function taskIdOf(run) {
+  return firstString(run, ["taskId", "task", "task_id"]);
+}
+function runTitleOf(run) {
+  return firstString(run, ["title", "summary", "name"], taskIdOf(run) || "(untitled)");
+}
+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(message2, options = {}) {
+  if (!shouldUseClackOutput()) {
+    console.log(message2);
+    return;
+  }
+  if (options.title)
+    note3(message2, options.title);
+  else
+    log3.message(message2);
+}
+function formatStatusPill(status) {
+  const label = status || "unknown";
+  return statusColor(label)(`\u25CF ${label}`);
+}
+function formatSection(title, subtitle) {
+  return `${pc3.bold(pc3.cyan("\u25C6"))} ${pc3.bold(title)}${subtitle ? pc3.dim(` \u2014 ${subtitle}`) : ""}`;
+}
+function formatSuccessCard(title, rows = []) {
+  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc3.dim("\u2502")} ${pc3.dim(key.padEnd(12))} ${value}`);
+  return [formatSection(title), ...body].join(`
+`);
+}
+function formatNextSteps(steps) {
+  if (steps.length === 0)
+    return [];
+  return [pc3.bold("Next"), ...steps.map((step) => `${pc3.dim("\u203A")} ${step}`)];
+}
+function formatTaskList(tasks, options = {}) {
+  if (options.raw)
+    return tasks.map((task) => JSON.stringify(task)).join(`
+`);
+  if (tasks.length === 0)
+    return [formatSection("Tasks", "none found"), ...formatNextSteps(["Try `rig server status` to confirm the selected server.", "Relax filters or run `rig task run --title ... --initial-prompt ...` for ad hoc work."])].join(`
+`);
+  const rows = tasks.map((task) => {
+    const raw = rawObject(task);
+    const id = stringField(task, "id", "<unknown>");
+    const status = stringField(task, "status", "unknown");
+    const title = stringField(task, "title", "Untitled task");
+    const source = stringField(task, "source", stringField(raw, "source", ""));
+    const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
+    return { id, status, title, source, labels };
+  });
+  const idWidth = Math.min(18, Math.max(4, ...rows.map((row) => row.id.length)));
+  const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
+  const header = `${pc3.bold(pad("TASK", idWidth))}  ${pc3.bold(pad("STATUS", statusWidth))}  ${pc3.bold("TITLE")}`;
+  const body = rows.map((row) => {
+    const labels = row.labels.length > 0 ? pc3.dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
+    const source = row.source ? pc3.dim(`  ${row.source}`) : "";
+    return [
+      pc3.bold(pad(truncate(row.id, idWidth), idWidth)),
+      statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
+      `${row.title}${labels}${source}`
+    ].join("  ");
+  });
+  return [formatSection("Tasks", `${rows.length} shown`), header, ...body, "", ...formatNextSteps(["Run one: `rig task run <id>` or `rig task run --next`", "Attach later: `rig run attach <run-id> --follow`"])].join(`
+`);
+}
+function formatTaskCard(task, options = {}) {
+  const raw = rawObject(task);
+  const id = stringField(task, "id", stringField(raw, "id", "<unknown>"));
+  const status = stringField(task, "status", stringField(raw, "status", "unknown"));
+  const title = stringField(task, "title", stringField(raw, "title", "Untitled task"));
+  const source = stringField(task, "source", stringField(raw, "source", ""));
+  const url = stringField(task, "url", stringField(raw, "url", ""));
+  const number = numberField(task, "number") ?? numberField(raw, "number");
+  const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
+  const assignees = arrayField(task, "assignees").length > 0 ? arrayField(task, "assignees") : arrayField(raw, "assignees");
+  const readiness = compactValue(task.readiness ?? raw.readiness);
+  const validators = compactValue(task.validators ?? raw.validators ?? task.validation ?? raw.validation);
+  const rows = [
+    ["task", pc3.bold(id)],
+    ["status", formatStatusPill(status)],
+    ["title", title],
+    ["source", source],
+    ["number", number],
+    ["labels", labels.length ? labels.map((label) => `#${label}`).join(" ") : ""],
+    ["assignees", assignees.join(", ")],
+    ["readiness", readiness],
+    ["validators", validators],
+    ["url", url]
+  ];
+  return [
+    formatSuccessCard(options.title ?? (options.selected ? "Selected task" : "Task"), rows),
+    "",
+    ...formatNextSteps([`Start: \`rig task run ${id}\``, `Details: \`rig task show ${id} --raw\``])
+  ].join(`
+`);
+}
+function formatTaskDetails(task) {
+  return formatTaskCard(task, { title: "Task details" });
+}
+function formatRunList(runs, options = {}) {
+  if (runs.length === 0) {
+    return [
+      formatSection("Runs", "none recorded"),
+      options.source === "server" ? pc3.dim("No runs recorded on the selected Rig server.") : pc3.dim("No runs recorded in .rig/runs."),
+      "",
+      ...formatNextSteps(["Start one: `rig task run --next`", "Check server: `rig server status`"])
+    ].join(`
+`);
+  }
+  const rows = runs.map((run) => {
+    const runId = stringField(run, "runId", stringField(run, "id", "(unknown-run)"));
+    const status = stringField(run, "status", "unknown");
+    const taskId = stringField(run, "taskId", "");
+    const title = stringField(run, "title", taskId || "(untitled)");
+    const runtime = stringField(run, "runtimeAdapter", "");
+    return { runId, status, title, runtime };
+  });
+  const idWidth = Math.min(36, Math.max(6, ...rows.map((row) => row.runId.length)));
+  const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
+  const header = `${pc3.bold(pad("RUN", idWidth))}  ${pc3.bold(pad("STATUS", statusWidth))}  ${pc3.bold("TITLE")}`;
+  const body = rows.map((row) => [
+    pc3.bold(pad(truncate(row.runId, idWidth), idWidth)),
+    statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
+    `${row.title}${row.runtime ? pc3.dim(`  ${row.runtime}`) : ""}`
+  ].join("  "));
+  return [formatSection("Runs", options.source === "server" ? "selected server" : "local state"), header, ...body, "", ...formatNextSteps(["Follow live: `rig run attach <run-id> --follow`", "Details: `rig run show <run-id>`"])].join(`
+`);
+}
+function formatSubmittedRun(input) {
+  const rows = [["run", pc3.bold(input.runId)]];
+  if (input.task) {
+    const id = stringField(input.task, "id", "<unknown>");
+    const status = stringField(input.task, "status", "unknown");
+    const title = stringField(input.task, "title", "Untitled task");
+    rows.push(["task", `${pc3.bold(id)} ${formatStatusPill(status)} ${title}`]);
+  }
+  const runtime = [input.runtimeAdapter || "pi", input.runtimeMode || "full-access", input.interactionMode || "default"].filter(Boolean).join(" \xB7 ");
+  rows.push(["runtime", runtime]);
+  return [
+    formatSuccessCard("Run submitted", rows),
+    "",
+    ...formatNextSteps([
+      `Attach: \`rig run attach ${input.runId} --follow\``,
+      `Inspect: \`rig run show ${input.runId}\``,
+      input.detached ? "Submitted detached; attach when you are ready." : "Interactive mode opens the native bundled Pi frontend."
+    ])
+  ].join(`
+`);
+}
+function formatRunCard(run, options = {}) {
+  const raw = rawObject(run);
+  const merged = { ...raw, ...run };
+  const runId = runIdOf(merged);
+  const status = firstString(merged, ["status"], "unknown");
+  const taskId = taskIdOf(merged);
+  const title = runTitleOf(merged);
+  const runtime = firstString(merged, ["runtimeAdapter", "runtime", "adapter"]);
+  const mode = firstString(merged, ["runtimeMode", "mode"]);
+  const interaction = firstString(merged, ["interactionMode"]);
+  const created = compactDate(firstString(merged, ["createdAt"]));
+  const started = compactDate(firstString(merged, ["startedAt"]));
+  const updated = compactDate(firstString(merged, ["updatedAt"]));
+  const completed = compactDate(firstString(merged, ["completedAt", "finishedAt"]));
+  const worktree = firstString(merged, ["worktreePath", "cwd", "projectRoot"]);
+  const piSession = merged.piSession && typeof merged.piSession === "object" && !Array.isArray(merged.piSession) ? firstString(merged.piSession, ["sessionId", "id"]) : "";
+  const timeline = Array.isArray(merged.timeline) ? merged.timeline.length : null;
+  const approvals = Array.isArray(merged.approvals) ? merged.approvals.length : null;
+  const inputs = Array.isArray(merged.userInputs) ? merged.userInputs.length : null;
+  const rows = [
+    ["run", pc3.bold(runId)],
+    ["status", formatStatusPill(status)],
+    ["task", taskId],
+    ["title", title],
+    ["runtime", [runtime, mode, interaction].filter(Boolean).join(" \xB7 ")],
+    ["created", created],
+    ["started", started],
+    ["updated", updated],
+    ["completed", completed],
+    ["worktree", worktree],
+    ["pi", piSession],
+    ["timeline", timeline],
+    ["approvals", approvals],
+    ["inputs", inputs]
+  ];
+  return [
+    formatSuccessCard(options.title ?? "Run details", rows),
+    "",
+    ...formatNextSteps([`Follow live: \`rig run attach ${runId} --follow\``, `Raw payload: \`rig run show ${runId} --raw\``])
+  ].join(`
+`);
+}
+function formatRunStatus(summary, options = {}) {
+  const activeRuns = summary.activeRuns ?? [];
+  const recentRuns = summary.recentRuns ?? [];
+  const lines = [formatSection("Run status", options.source === "server" ? "selected server" : "local state")];
+  lines.push("", pc3.bold(`Active runs (${activeRuns.length})`));
+  if (activeRuns.length === 0) {
+    lines.push(pc3.dim("No active runs."));
+  } else {
+    for (const run of activeRuns) {
+      lines.push(formatRunSummaryLine(run));
+    }
+  }
+  lines.push("", pc3.bold(`Recent runs (${recentRuns.length})`));
+  if (recentRuns.length === 0) {
+    lines.push(pc3.dim("No recent terminal runs."));
+  } else {
+    for (const run of recentRuns.slice(0, 10)) {
+      lines.push(formatRunSummaryLine(run));
+    }
+  }
+  lines.push("", ...formatNextSteps(["Start work: `rig task run --next`", "Attach: `rig run attach <run-id> --follow`", "Details: `rig run show <run-id>`"]));
+  return lines.join(`
+`);
+}
+function formatRunSummaryLine(run) {
+  const record = run;
+  const runId = runIdOf(record);
+  const status = firstString(record, ["status"], "unknown");
+  const taskId = taskIdOf(record);
+  const title = runTitleOf(record);
+  const runtime = firstString(record, ["runtimeAdapter", "runtime", "adapter"]);
+  const descriptor = [taskId, title].filter(Boolean).join(" \xB7 ");
+  return `${pc3.dim("\u2502")} ${pc3.bold(runId)} ${formatStatusPill(status)} ${descriptor}${runtime ? pc3.dim(`  ${runtime}`) : ""}`;
+}
+function formatInboxList(kind, entries) {
+  const title = kind === "approvals" ? "Approval inbox" : "Input inbox";
+  if (entries.length === 0) {
+    return [
+      formatSection(title, "empty"),
+      pc3.dim(kind === "approvals" ? "No pending approvals." : "No pending user-input requests."),
+      "",
+      ...formatNextSteps(["Check runs: `rig run status`", "Start work: `rig task run --next`"])
+    ].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 prompt = firstString(record, ["prompt", "message", "reason", "title", "summary"], kind === "approvals" ? "Approval requested" : "Input requested");
+    lines.push(`${pc3.dim("\u2502")} ${pc3.bold(requestId)} ${formatStatusPill(status)} ${prompt}`);
+    lines.push(`${pc3.dim("\u2502")} ${pc3.dim("run      ")} ${runId || "(unknown-run)"}${taskId ? pc3.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`"]));
+  return lines.join(`
+`);
+}
+function formatConnectionList(connections) {
+  const rows = [["local", { kind: "local", mode: "auto" }], ...Object.entries(connections)];
+  const aliasWidth = Math.min(24, Math.max(5, ...rows.map(([alias]) => alias.length)));
+  const lines = rows.map(([alias, connection]) => [
+    pc3.bold(pad(truncate(alias, aliasWidth), aliasWidth)),
+    formatStatusPill(connection.kind),
+    connection.kind === "remote" ? connection.baseUrl ?? "" : connection.mode ?? "local"
+  ].join("  "));
+  return [formatSection("Rig servers", `${rows.length} available`), `${pc3.bold(pad("ALIAS", aliasWidth))}  ${pc3.bold("KIND")}  ${pc3.bold("TARGET")}`, ...lines, "", ...formatNextSteps(["Select one: `rig server use <alias|local>`"])].join(`
+`);
+}
+function formatConnectionStatus(selected, connections) {
+  const connection = selected === "local" ? { kind: "local", mode: "auto" } : connections[selected];
+  const target = !connection ? "not configured" : connection.kind === "remote" ? connection.baseUrl : "local";
+  return [
+    formatSection("Rig server", "selected for this repo"),
+    `${pc3.dim("\u2502")} ${pc3.dim("selected ")} ${pc3.bold(selected)}`,
+    `${pc3.dim("\u2502")} ${pc3.dim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
+    `${pc3.dim("\u2502")} ${pc3.dim("target   ")} ${target ?? "not configured"}`,
+    "",
+    ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
+  ].join(`
+`);
+}
+
+// packages/cli/src/commands/inbox.ts
+function isRemoteConnectionSelected(projectRoot) {
+  return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
+}
+function runMatches(entry, filters) {
+  const runId = typeof entry.runId === "string" ? entry.runId : typeof entry.id === "string" ? entry.id : "";
+  const taskId = typeof entry.taskId === "string" ? entry.taskId : "";
+  return (!filters.run || runId === filters.run) && (!filters.task || taskId === filters.task);
+}
+function normalizeRemoteRunDetails(payload) {
+  const run = payload.run;
+  if (run && typeof run === "object" && !Array.isArray(run)) {
+    return {
+      ...run,
+      ...Array.isArray(payload.timeline) ? { timeline: payload.timeline } : {},
+      ...Array.isArray(payload.approvals) ? { approvals: payload.approvals } : {},
+      ...Array.isArray(payload.userInputs) ? { userInputs: payload.userInputs } : {}
+    };
+  }
+  return payload;
+}
+function remoteRecordsFromRun(run, kind) {
+  const key = kind === "approvals" ? "approvals" : "userInputs";
+  const direct = run[key];
+  if (!Array.isArray(direct))
+    return [];
+  const runId = typeof run.runId === "string" ? run.runId : typeof run.id === "string" ? run.id : "";
+  const taskId = typeof run.taskId === "string" ? run.taskId : "";
+  return direct.filter((record) => Boolean(record && typeof record === "object" && !Array.isArray(record))).map((record) => ({ runId, taskId, record }));
+}
+async function listRemoteInboxRecords(context, kind, filters) {
+  const runs = (await listRunsViaServer(context, { limit: 100 })).filter((entry) => runMatches(entry, filters));
+  const records = [];
+  for (const run of runs) {
+    const runId = typeof run.runId === "string" ? run.runId : typeof run.id === "string" ? run.id : "";
+    const detailed = runId ? normalizeRemoteRunDetails(await getRunDetailsViaServer(context, runId).catch(() => run)) : run;
+    records.push(...remoteRecordsFromRun(detailed, kind));
+  }
+  return records;
+}
+function listLocalInboxRecords(context, kind, filters) {
+  const fileName = kind === "approvals" ? "approvals.jsonl" : "user-input.jsonl";
+  const runs = listAuthorityRuns(context.projectRoot).filter((entry) => (!filters.run || entry.runId === filters.run) && (!filters.task || entry.taskId === filters.task));
+  return runs.flatMap((entry) => readJsonlFile3(resolve13(resolveAuthorityRunDir2(context.projectRoot, entry.runId), fileName)).map((record) => ({
+    runId: entry.runId,
+    taskId: entry.taskId ?? undefined,
+    record
+  })));
+}
+async function listInboxRecords(context, kind, filters) {
+  if (isRemoteConnectionSelected(context.projectRoot)) {
+    return listRemoteInboxRecords(context, kind, filters);
+  }
+  return listLocalInboxRecords(context, kind, filters);
+}
 async function executeInbox(context, args) {
   const [command = "approvals", ...rest] = args;
   switch (command) {
@@ -3992,16 +4400,10 @@ async function executeInbox(context, args) {
       pending = run.rest;
       const task = takeOption(pending, "--task");
       pending = task.rest;
-      requireNoExtraArgs(pending, "bun run rig inbox approvals [--run <id>] [--task <id>]");
-      const runs = listAuthorityRuns(context.projectRoot).filter((entry) => (!run.value || entry.runId === run.value) && (!task.value || entry.taskId === task.value));
-      const approvals = runs.flatMap((entry) => readJsonlFile3(resolve13(resolveAuthorityRunDir2(context.projectRoot, entry.runId), "approvals.jsonl")).map((record) => ({
-        runId: entry.runId,
-        record
-      })));
+      requireNoExtraArgs(pending, "rig inbox approvals [--run <id>] [--task <id>]");
+      const approvals = await listInboxRecords(context, "approvals", { run: run.value, task: task.value });
       if (context.outputMode === "text") {
-        for (const approval of approvals) {
-          console.log(JSON.stringify(approval));
-        }
+        printFormattedOutput(formatInboxList("approvals", approvals));
       }
       return { ok: true, group: "inbox", command, details: { approvals } };
     }
@@ -4013,19 +4415,22 @@ async function executeInbox(context, args) {
       pending = request.rest;
       const decision = takeOption(pending, "--decision");
       pending = decision.rest;
-      const note3 = takeOption(pending, "--note");
-      pending = note3.rest;
-      requireNoExtraArgs(pending, "bun run rig inbox approve --run <id> --request <id> --decision approve|reject [--note <text>]");
+      const note4 = takeOption(pending, "--note");
+      pending = note4.rest;
+      requireNoExtraArgs(pending, "rig inbox approve --run <id> --request <id> --decision approve|reject [--note <text>]");
       if (!run.value || !request.value || !decision.value) {
         throw new CliError2("approve requires --run, --request, and --decision.");
       }
       if (decision.value !== "approve" && decision.value !== "reject") {
         throw new CliError2("decision must be approve or reject.");
       }
+      if (isRemoteConnectionSelected(context.projectRoot)) {
+        throw new CliError2("Remote approval resolution is not available from this CLI yet; use the server UI/API or switch to local state for direct JSONL edits.", 2);
+      }
       const approvalsPath = resolve13(resolveAuthorityRunDir2(context.projectRoot, run.value), "approvals.jsonl");
       const approvals = readJsonlFile3(approvalsPath);
       const resolvedAt = new Date().toISOString();
-      const next = approvals.map((entry) => entry.requestId === request.value || entry.id === request.value ? { ...entry, status: "resolved", decision: decision.value, note: note3.value ?? null, resolvedAt } : entry);
+      const next = approvals.map((entry) => entry.requestId === request.value || entry.id === request.value ? { ...entry, status: "resolved", decision: decision.value, note: note4.value ?? null, resolvedAt } : entry);
       writeFileSync4(approvalsPath, `${next.map((entry) => JSON.stringify(entry)).join(`
 `)}
 `, "utf8");
@@ -4037,16 +4442,10 @@ async function executeInbox(context, args) {
       pending = run.rest;
       const task = takeOption(pending, "--task");
       pending = task.rest;
-      requireNoExtraArgs(pending, "bun run rig inbox inputs [--run <id>] [--task <id>]");
-      const runs = listAuthorityRuns(context.projectRoot).filter((entry) => (!run.value || entry.runId === run.value) && (!task.value || entry.taskId === task.value));
-      const requests = runs.flatMap((entry) => readJsonlFile3(resolve13(resolveAuthorityRunDir2(context.projectRoot, entry.runId), "user-input.jsonl")).map((record) => ({
-        runId: entry.runId,
-        record
-      })));
+      requireNoExtraArgs(pending, "rig inbox inputs [--run <id>] [--task <id>]");
+      const requests = await listInboxRecords(context, "inputs", { run: run.value, task: task.value });
       if (context.outputMode === "text") {
-        for (const request of requests) {
-          console.log(JSON.stringify(request));
-        }
+        printFormattedOutput(formatInboxList("inputs", requests));
       }
       return { ok: true, group: "inbox", command, details: { requests } };
     }
@@ -4073,10 +4472,13 @@ async function executeInbox(context, args) {
           remaining.push(current);
         }
       }
-      requireNoExtraArgs(remaining, "bun run rig inbox respond --run <id> --request <id> --answer key=value [--answer key=value]");
+      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 CliError2("respond requires --run, --request, and at least one --answer.");
       }
+      if (isRemoteConnectionSelected(context.projectRoot)) {
+        throw new CliError2("Remote input responses are not available from this CLI yet; use the server UI/API or switch to local state for direct JSONL edits.", 2);
+      }
       const parsedAnswers = Object.fromEntries(answers.map((entry) => {
         const [key, ...restValue] = entry.split("=");
         return [key, restValue.join("=")];
@@ -4500,7 +4902,7 @@ async function runRigDoctorChecks(options) {
   const taskSourceKind = config?.taskSource?.kind;
   checks.push(taskSourceKind ? check("task-source", "task source configured", "pass", taskSourceKind) : check("task-source", "task source configured", "fail", "missing taskSource", "Configure taskSource in rig.config.ts."));
   const repo = readRepoConnection(projectRoot);
-  checks.push(repo ? check("project-link", "repo selected Rig connection", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to link this checkout to a GitHub repo slug.") : check("project-link", "repo selected Rig connection", "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig connect use <alias|local>`."));
+  checks.push(repo ? check("project-link", "repo selected Rig server", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to link this checkout to a GitHub repo slug.") : check("project-link", "repo selected Rig server", "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig server use <alias|local>`."));
   const selected = (() => {
     try {
       return resolveSelectedConnection(projectRoot);
@@ -4508,7 +4910,7 @@ async function runRigDoctorChecks(options) {
       return null;
     }
   })();
-  checks.push(selected ? check("connection", "selected server connection", "pass", selected.connection.kind === "remote" ? selected.connection.baseUrl : "local auto") : check("connection", "selected server connection", repo ? "fail" : "warn", repo ? "selected alias is missing" : "will auto-start local server", repo ? "Run `rig connect list` and `rig connect use <alias|local>`." : undefined));
+  checks.push(selected ? check("connection", "selected server connection", "pass", selected.connection.kind === "remote" ? selected.connection.baseUrl : "local auto") : check("connection", "selected server", repo ? "fail" : "warn", repo ? "selected alias is missing" : "will auto-start local server", repo ? "Run `rig server list` and `rig server use <alias|local>`." : undefined));
   let server = null;
   try {
     server = await (options.resolveServer ?? ensureServerForCli)(projectRoot);
@@ -5291,187 +5693,32 @@ async function runInteractiveControlPlaneInit(context, prompts) {
     githubProjectStatusField: projectConfig.githubProjectStatusField,
     githubProjectStatuses: projectConfig.githubProjectStatuses,
     remoteCheckout,
-    repair,
-    privateStateOnly,
-    yes: remoteGhTokenConfirmed || undefined
-  });
-  const details = result.details && typeof result.details === "object" && !Array.isArray(result.details) ? result.details : {};
-  const deviceAuth = details.deviceAuth && typeof details.deviceAuth === "object" && !Array.isArray(details.deviceAuth) ? details.deviceAuth : null;
-  const deviceMessage = deviceAuth ? ` GitHub device flow: open ${String(deviceAuth.verificationUri ?? deviceAuth.verification_uri ?? deviceAuth.verification_uri_complete ?? "the verification URL returned by the server")} and enter ${String(deviceAuth.userCode ?? deviceAuth.user_code ?? "the returned user code")}.` : "";
-  prompts.outro?.(`Rig project initialized.${deviceMessage} Next: rig doctor && rig task list`);
-  return result;
-}
-async function executeInit(context, args) {
-  const parsed = parseInitOptions(args);
-  if (parsed.options.yes || parsed.options.server || parsed.options.repoSlug || parsed.options.githubToken || parsed.options.privateStateOnly || parsed.options.repair || parsed.options.githubAuthMethod || parsed.options.remoteCheckout) {
-    if (parsed.rest.length > 0)
-      throw new CliError2(`Unexpected arguments: ${parsed.rest.join(" ")}
-Usage: rig init [--server local|remote] [--remote-url <url>] [--repo owner/repo] [--github-auth gh|token|device|skip] [--github-token <token>] [--github-project off|<project-id>] [--remote-checkout managed-clone|current-ref|uploaded-snapshot|existing-path] [--yes]`, 1);
-    return runControlPlaneInit(context, parsed.options);
-  }
-  if (parsed.rest.length > 0)
-    throw new CliError2(`Unexpected arguments: ${parsed.rest.join(" ")}
-Usage: rig init`, 1);
-  return runInteractiveControlPlaneInit(context, await loadClackPrompts());
-}
-
-// packages/cli/src/commands/connect.ts
-import { cancel as cancel2, isCancel as isCancel2, select as select2 } from "@clack/prompts";
-
-// packages/cli/src/commands/_cli-format.ts
-import pc3 from "picocolors";
-function stringField(record, key, fallback = "") {
-  const value = record[key];
-  return typeof value === "string" && value.trim() ? value.trim() : fallback;
-}
-function arrayField(record, key) {
-  const value = record[key];
-  return Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.trim() ? [entry.trim()] : []) : [];
-}
-function rawObject(record) {
-  const raw = record.raw;
-  return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
-}
-function truncate(value, width) {
-  if (value.length <= width)
-    return value;
-  if (width <= 1)
-    return "\u2026";
-  return `${value.slice(0, width - 1)}\u2026`;
-}
-function pad(value, width) {
-  return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
-}
-function statusColor(status) {
-  const normalized = status.toLowerCase();
-  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected"].includes(normalized))
-    return pc3.green;
-  if (["failed", "needs_attention", "needs-attention", "blocked", "error"].includes(normalized))
-    return pc3.red;
-  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
-    return pc3.cyan;
-  if (["ready", "open", "queued", "created", "preparing", "local"].includes(normalized))
-    return pc3.yellow;
-  return pc3.dim;
-}
-function formatStatusPill(status) {
-  const label = status || "unknown";
-  return statusColor(label)(`\u25CF ${label}`);
-}
-function formatSection(title, subtitle) {
-  return `${pc3.bold(pc3.cyan("\u25C6"))} ${pc3.bold(title)}${subtitle ? pc3.dim(` \u2014 ${subtitle}`) : ""}`;
-}
-function formatSuccessCard(title, rows = []) {
-  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc3.dim("\u2502")} ${pc3.dim(key.padEnd(9))} ${value}`);
-  return [formatSection(title), ...body].join(`
-`);
-}
-function formatNextSteps(steps) {
-  if (steps.length === 0)
-    return [];
-  return [pc3.bold("Next"), ...steps.map((step) => `${pc3.dim("\u203A")} ${step}`)];
-}
-function formatTaskList(tasks, options = {}) {
-  if (options.raw)
-    return tasks.map((task) => JSON.stringify(task)).join(`
-`);
-  if (tasks.length === 0)
-    return [formatSection("Tasks", "none found"), ...formatNextSteps(["Try `rig server status` to confirm the selected server.", "Relax filters or run `rig task run --title ... --initial-prompt ...` for ad hoc work."])].join(`
-`);
-  const rows = tasks.map((task) => {
-    const raw = rawObject(task);
-    const id = stringField(task, "id", "<unknown>");
-    const status = stringField(task, "status", "unknown");
-    const title = stringField(task, "title", "Untitled task");
-    const source = stringField(task, "source", stringField(raw, "source", ""));
-    const labels = arrayField(task, "labels").length > 0 ? arrayField(task, "labels") : arrayField(raw, "labels");
-    return { id, status, title, source, labels };
-  });
-  const idWidth = Math.min(18, Math.max(4, ...rows.map((row) => row.id.length)));
-  const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
-  const header = `${pc3.bold(pad("TASK", idWidth))}  ${pc3.bold(pad("STATUS", statusWidth))}  ${pc3.bold("TITLE")}`;
-  const body = rows.map((row) => {
-    const labels = row.labels.length > 0 ? pc3.dim(`  ${row.labels.slice(0, 4).map((label) => `#${label}`).join(" ")}`) : "";
-    const source = row.source ? pc3.dim(`  ${row.source}`) : "";
-    return [
-      pc3.bold(pad(truncate(row.id, idWidth), idWidth)),
-      statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-      `${row.title}${labels}${source}`
-    ].join("  ");
-  });
-  return [formatSection("Tasks", `${rows.length} shown`), header, ...body, "", ...formatNextSteps(["Run one: `rig task run <id>` or `rig task run --next`", "Attach later: `rig run attach <run-id> --follow`"])].join(`
-`);
-}
-function formatRunList(runs, options = {}) {
-  if (runs.length === 0) {
-    return [
-      formatSection("Runs", "none recorded"),
-      options.source === "server" ? pc3.dim("No runs recorded on the selected Rig server.") : pc3.dim("No runs recorded in .rig/runs."),
-      "",
-      ...formatNextSteps(["Start one: `rig task run --next`", "Check server: `rig server status`"])
-    ].join(`
-`);
-  }
-  const rows = runs.map((run) => {
-    const runId = stringField(run, "runId", stringField(run, "id", "(unknown-run)"));
-    const status = stringField(run, "status", "unknown");
-    const taskId = stringField(run, "taskId", "");
-    const title = stringField(run, "title", taskId || "(untitled)");
-    const runtime = stringField(run, "runtimeAdapter", "");
-    return { runId, status, title, runtime };
-  });
-  const idWidth = Math.min(36, Math.max(6, ...rows.map((row) => row.runId.length)));
-  const statusWidth = Math.min(16, Math.max(6, ...rows.map((row) => row.status.length)));
-  const header = `${pc3.bold(pad("RUN", idWidth))}  ${pc3.bold(pad("STATUS", statusWidth))}  ${pc3.bold("TITLE")}`;
-  const body = rows.map((row) => [
-    pc3.bold(pad(truncate(row.runId, idWidth), idWidth)),
-    statusColor(row.status)(pad(truncate(row.status, statusWidth), statusWidth)),
-    `${row.title}${row.runtime ? pc3.dim(`  ${row.runtime}`) : ""}`
-  ].join("  "));
-  return [formatSection("Runs", options.source === "server" ? "selected server" : "local state"), header, ...body, "", ...formatNextSteps(["Follow live: `rig run attach <run-id> --follow`", "Details: `rig run show --run <run-id>`"])].join(`
-`);
-}
-function formatSubmittedRun(input) {
-  const rows = [["run", pc3.bold(input.runId)]];
-  if (input.task) {
-    const id = stringField(input.task, "id", "<unknown>");
-    const status = stringField(input.task, "status", "unknown");
-    const title = stringField(input.task, "title", "Untitled task");
-    rows.push(["task", `${pc3.bold(id)} ${formatStatusPill(status)} ${title}`]);
-  }
-  return [
-    formatSuccessCard("Run submitted", rows),
-    "",
-    ...formatNextSteps([`Attach: \`rig run attach ${input.runId} --follow\``, `Inspect: \`rig run show --run ${input.runId}\``])
-  ].join(`
-`);
-}
-function formatConnectionList(connections) {
-  const rows = [["local", { kind: "local", mode: "auto" }], ...Object.entries(connections)];
-  const aliasWidth = Math.min(24, Math.max(5, ...rows.map(([alias]) => alias.length)));
-  const lines = rows.map(([alias, connection]) => [
-    pc3.bold(pad(truncate(alias, aliasWidth), aliasWidth)),
-    formatStatusPill(connection.kind),
-    connection.kind === "remote" ? connection.baseUrl ?? "" : connection.mode ?? "local"
-  ].join("  "));
-  return [formatSection("Rig servers", `${rows.length} available`), `${pc3.bold(pad("ALIAS", aliasWidth))}  ${pc3.bold("KIND")}  ${pc3.bold("TARGET")}`, ...lines, "", ...formatNextSteps(["Select one: `rig server use <alias|local>`"])].join(`
-`);
+    repair,
+    privateStateOnly,
+    yes: remoteGhTokenConfirmed || undefined
+  });
+  const details = result.details && typeof result.details === "object" && !Array.isArray(result.details) ? result.details : {};
+  const deviceAuth = details.deviceAuth && typeof details.deviceAuth === "object" && !Array.isArray(details.deviceAuth) ? details.deviceAuth : null;
+  const deviceMessage = deviceAuth ? ` GitHub device flow: open ${String(deviceAuth.verificationUri ?? deviceAuth.verification_uri ?? deviceAuth.verification_uri_complete ?? "the verification URL returned by the server")} and enter ${String(deviceAuth.userCode ?? deviceAuth.user_code ?? "the returned user code")}.` : "";
+  prompts.outro?.(`Rig project initialized.${deviceMessage} Next: rig doctor && rig task list`);
+  return result;
 }
-function formatConnectionStatus(selected, connections) {
-  const connection = selected === "local" ? { kind: "local", mode: "auto" } : connections[selected];
-  const target = !connection ? "not configured" : connection.kind === "remote" ? connection.baseUrl : "local";
-  return [
-    formatSection("Rig server", "selected for this repo"),
-    `${pc3.dim("\u2502")} ${pc3.dim("selected ")} ${pc3.bold(selected)}`,
-    `${pc3.dim("\u2502")} ${pc3.dim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
-    `${pc3.dim("\u2502")} ${pc3.dim("target   ")} ${target ?? "not configured"}`,
-    "",
-    ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
-  ].join(`
-`);
+async function executeInit(context, args) {
+  const parsed = parseInitOptions(args);
+  if (parsed.options.yes || parsed.options.server || parsed.options.repoSlug || parsed.options.githubToken || parsed.options.privateStateOnly || parsed.options.repair || parsed.options.githubAuthMethod || parsed.options.remoteCheckout) {
+    if (parsed.rest.length > 0)
+      throw new CliError2(`Unexpected arguments: ${parsed.rest.join(" ")}
+Usage: rig init [--server local|remote] [--remote-url <url>] [--repo owner/repo] [--github-auth gh|token|device|skip] [--github-token <token>] [--github-project off|<project-id>] [--remote-checkout managed-clone|current-ref|uploaded-snapshot|existing-path] [--yes]`, 1);
+    return runControlPlaneInit(context, parsed.options);
+  }
+  if (parsed.rest.length > 0)
+    throw new CliError2(`Unexpected arguments: ${parsed.rest.join(" ")}
+Usage: rig init`, 1);
+  return runInteractiveControlPlaneInit(context, await loadClackPrompts());
 }
 
 // packages/cli/src/commands/connect.ts
+import { cancel as cancel2, isCancel as isCancel2, select as select2 } from "@clack/prompts";
 function usageName(options) {
   return `rig ${options.group}`;
 }
@@ -5896,8 +6143,8 @@ async function executeInspect(context, args) {
   switch (command) {
     case "logs": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig inspect logs --task <beads-id>");
-      const requiredTask = requireTask(task, "bun run rig inspect logs --task <beads-id>");
+      requireNoExtraArgs(remaining, "rig inspect logs --task <task-id>");
+      const requiredTask = requireTask(task, "rig inspect logs --task <task-id>");
       const latestRun = listAuthorityRuns2(context.projectRoot).map((entry) => readAuthorityRun3(context.projectRoot, entry.runId)).filter((run) => Boolean(run)).filter((run) => run.taskId === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
       if (!latestRun) {
         throw new CliError2(`No runs found for ${requiredTask}.`);
@@ -5911,8 +6158,8 @@ async function executeInspect(context, args) {
     }
     case "artifacts": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig inspect artifacts --task <beads-id>");
-      const requiredTask = requireTask(task, "bun run rig inspect artifacts --task <beads-id>");
+      requireNoExtraArgs(remaining, "rig inspect artifacts --task <task-id>");
+      const requiredTask = requireTask(task, "rig inspect artifacts --task <task-id>");
       const artifactRoot = resolveTaskArtifactDirs(context.projectRoot, requiredTask).find((path) => existsSync11(path));
       if (!artifactRoot) {
         throw new CliError2(`No artifacts found for ${requiredTask}.`);
@@ -5926,8 +6173,8 @@ async function executeInspect(context, args) {
       previewPending = task.rest;
       const file = takeOption(previewPending, "--file");
       previewPending = file.rest;
-      requireNoExtraArgs(previewPending, "bun run rig inspect artifact --task <beads-id> --file <name>");
-      const requiredTask = requireTask(task.value, "bun run rig inspect artifact --task <beads-id> --file <name>");
+      requireNoExtraArgs(previewPending, "rig inspect artifact --task <task-id> --file <name>");
+      const requiredTask = requireTask(task.value, "rig inspect artifact --task <task-id> --file <name>");
       if (!file.value) {
         throw new CliError2("Missing --file for rig inspect artifact.");
       }
@@ -5956,7 +6203,7 @@ async function executeInspect(context, args) {
     }
     case "diff": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig inspect diff [--task <beads-id>]");
+      requireNoExtraArgs(remaining, "rig inspect diff [--task <task-id>]");
       if (task) {
         const files = changedFilesForTask(context.projectRoot, task, false);
         for (const file of files) {
@@ -5968,7 +6215,7 @@ async function executeInspect(context, args) {
       return { ok: true, group: "inspect", command, details: { task: task || null } };
     }
     case "failures": {
-      requireNoExtraArgs(rest, "bun run rig inspect failures");
+      requireNoExtraArgs(rest, "rig inspect failures");
       const failed = resolveHarnessPaths2(context.projectRoot).failedApproachesPath;
       if (!existsSync11(failed)) {
         console.log("No failures recorded.");
@@ -5978,7 +6225,7 @@ async function executeInspect(context, args) {
       return { ok: true, group: "inspect", command };
     }
     case "graph":
-      requireNoExtraArgs(rest, "bun run rig inspect graph");
+      requireNoExtraArgs(rest, "rig inspect graph");
       {
         const monorepoRoot = resolveMonorepoRoot2(context.projectRoot);
         const result = runCapture3(["br", "--no-db", "list", "--pretty"], monorepoRoot);
@@ -5989,7 +6236,7 @@ async function executeInspect(context, args) {
       }
       return { ok: true, group: "inspect", command };
     case "audit": {
-      requireNoExtraArgs(rest, "bun run rig inspect audit");
+      requireNoExtraArgs(rest, "rig inspect audit");
       const auditPath = resolve19(resolveHarnessPaths2(context.projectRoot).logsDir, "audit.jsonl");
       if (!existsSync11(auditPath)) {
         console.log("No audit log found.");
@@ -6048,7 +6295,7 @@ async function executeInspector(context, args) {
       pending = secondsResult.rest;
       const pollMsResult = takeOption(pending, "--poll-ms");
       pending = pollMsResult.rest;
-      requireNoExtraArgs(pending, "bun run rig inspector stream [--once] [--seconds <n>] [--poll-ms <n>]");
+      requireNoExtraArgs(pending, "rig inspector stream [--once] [--seconds <n>] [--poll-ms <n>]");
       const seconds = secondsResult.value ? parseRequiredPositiveInt(secondsResult.value, "--seconds") : null;
       const pollMs = pollMsResult.value ? parseRequiredPositiveInt(pollMsResult.value, "--poll-ms") : null;
       if (context.outputMode === "json" && !onceResult.value && !seconds) {
@@ -6142,7 +6389,7 @@ async function executeInspector(context, args) {
       let pending = rest;
       const scanIdResult = takeOption(pending, "--scan-id");
       pending = scanIdResult.rest;
-      requireNoExtraArgs(pending, "bun run rig inspector scan-upstream-drift [--scan-id <id>]");
+      requireNoExtraArgs(pending, "rig inspector scan-upstream-drift [--scan-id <id>]");
       const connection = await ensureLocalRigServerConnection2(context.projectRoot);
       const response = await fetch(new URL("/api/inspector/tools/invoke", connection.baseUrl), {
         method: "POST",
@@ -6253,7 +6500,7 @@ async function executeRemote(context, args) {
     const [subcommand = "list", ...subRest] = rest;
     switch (subcommand) {
       case "list": {
-        requireNoExtraArgs(subRest, "bun run rig remote endpoint list");
+        requireNoExtraArgs(subRest, "rig remote endpoint list");
         const endpoints = listManagedRemoteEndpoints(undefined, context.projectRoot);
         const redactedEndpoints = endpoints.map((endpoint2) => redactRemoteEndpoint(endpoint2));
         if (context.outputMode === "text") {
@@ -6277,7 +6524,7 @@ async function executeRemote(context, args) {
         pending2 = port.rest;
         const token = takeOption(pending2, "--token");
         pending2 = token.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint add --alias <a> --host <h> --port <n> --token <t>");
+        requireNoExtraArgs(pending2, "rig remote endpoint add --alias <a> --host <h> --port <n> --token <t>");
         if (!alias.value || !host.value || !token.value || !port.value) {
           throw new CliError2("remote endpoint add requires --alias, --host, --port, and --token.");
         }
@@ -6304,7 +6551,7 @@ async function executeRemote(context, args) {
         pending2 = port.rest;
         const token = takeOption(pending2, "--token");
         pending2 = token.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint update --id <id> [--alias <a>] [--host <h>] [--port <n>] [--token <t>]");
+        requireNoExtraArgs(pending2, "rig remote endpoint update --id <id> [--alias <a>] [--host <h>] [--port <n>] [--token <t>]");
         if (!endpointId.value && !alias.value) {
           throw new CliError2("remote endpoint update requires --id <id> or --alias <a>.");
         }
@@ -6327,7 +6574,7 @@ async function executeRemote(context, args) {
         let pending2 = subRest;
         const alias = takeOption(pending2, "--alias");
         pending2 = alias.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint remove --alias <a>");
+        requireNoExtraArgs(pending2, "rig remote endpoint remove --alias <a>");
         if (!alias.value) {
           throw new CliError2("remote endpoint remove requires --alias.");
         }
@@ -6344,7 +6591,7 @@ async function executeRemote(context, args) {
         let pending2 = subRest;
         const alias = takeOption(pending2, "--alias");
         pending2 = alias.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint test --alias <a>");
+        requireNoExtraArgs(pending2, "rig remote endpoint test --alias <a>");
         if (!alias.value) {
           throw new CliError2("remote endpoint test requires --alias.");
         }
@@ -6375,7 +6622,7 @@ async function executeRemote(context, args) {
         }
       }
       case "migrate": {
-        requireNoExtraArgs(subRest, "bun run rig remote endpoint migrate");
+        requireNoExtraArgs(subRest, "rig remote endpoint migrate");
         const result = migrateManagedRemoteEndpoints(context.projectRoot);
         if (context.outputMode === "text") {
           console.log(`Imported ${result.imported} endpoint(s) from ${result.sourcePath}${result.skipped > 0 ? `, skipped ${result.skipped}` : ""}.`);
@@ -6383,7 +6630,7 @@ async function executeRemote(context, args) {
         return { ok: true, group: "remote", command: "endpoint migrate", details: result };
       }
       case "doctor": {
-        requireNoExtraArgs(subRest, "bun run rig remote endpoint doctor");
+        requireNoExtraArgs(subRest, "rig remote endpoint doctor");
         const result = doctorManagedRemoteEndpoints(context.projectRoot);
         if (context.outputMode === "text") {
           console.log(JSON.stringify(result, null, 2));
@@ -6436,17 +6683,17 @@ async function executeRemote(context, args) {
   try {
     switch (command) {
       case "test": {
-        requireNoExtraArgs(pending, "bun run rig remote test [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(pending, "rig remote test [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const response = await withClient((client) => client.ping());
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
       case "status": {
-        requireNoExtraArgs(pending, "bun run rig remote status [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(pending, "rig remote status [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const response = await withClient((client) => client.getState());
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
       case "tasks": {
-        requireNoExtraArgs(pending, "bun run rig remote tasks [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(pending, "rig remote tasks [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const response = await withClient((client) => client.getTasks());
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
@@ -6456,7 +6703,7 @@ async function executeRemote(context, args) {
         watchPending = secondsResult.rest;
         const eventResult = takeOption(watchPending, "--event");
         watchPending = eventResult.rest;
-        requireNoExtraArgs(watchPending, "bun run rig remote watch [--seconds <n>] [--event <type>] [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(watchPending, "rig remote watch [--seconds <n>] [--event <type>] [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const seconds = parseOptionalPositiveInt(secondsResult.value, "--seconds");
         const eventFilter = eventResult.value || undefined;
         if (context.outputMode === "json" && !seconds) {
@@ -6525,7 +6772,7 @@ async function executeRemote(context, args) {
       case "stop":
       case "continue":
       case "refresh": {
-        requireNoExtraArgs(pending, `bun run rig remote ${command} [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        requireNoExtraArgs(pending, `rig remote ${command} [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
         const response = await withClient(async (client) => {
           switch (command) {
             case "pause":
@@ -6548,7 +6795,7 @@ async function executeRemote(context, args) {
         let countPending = pending;
         const countResult = takeOption(countPending, "--count");
         countPending = countResult.rest;
-        requireNoExtraArgs(countPending, `bun run rig remote ${command} --count <n> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        requireNoExtraArgs(countPending, `rig remote ${command} --count <n> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
         const count = parseRequiredPositiveInt(countResult.value, "--count");
         const response = await withClient(async (client) => command === "add-iterations" ? await client.addIterations(count) : await client.removeIterations(count));
         assertRemoteOperationSuccess(command, response);
@@ -6559,8 +6806,8 @@ async function executeRemote(context, args) {
         let taskPending = pending;
         const taskResult = takeOption(taskPending, "--task");
         taskPending = taskResult.rest;
-        requireNoExtraArgs(taskPending, `bun run rig remote ${command} --task <id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
-        const taskId = requireTask(taskResult.value, `bun run rig remote ${command} --task <id>`);
+        requireNoExtraArgs(taskPending, `rig remote ${command} --task <id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        const taskId = requireTask(taskResult.value, `rig remote ${command} --task <id>`);
         const response = await withClient(async (client) => command === "prompt-preview" ? await client.getPromptPreview(taskId) : await client.getIterationOutput(taskId));
         assertRemoteOperationSuccess(command, response);
         return { ok: true, group: "remote", command, details: toDetails(response) };
@@ -6573,7 +6820,7 @@ async function executeRemote(context, args) {
         orchestrationPending = maxIterationsResult.rest;
         const directMergeResult = takeFlag(orchestrationPending, "--direct-merge");
         orchestrationPending = directMergeResult.rest;
-        requireNoExtraArgs(orchestrationPending, "bun run rig remote orchestrate-start [--max-workers <n>] [--max-iterations <n>] [--direct-merge]");
+        requireNoExtraArgs(orchestrationPending, "rig remote orchestrate-start [--max-workers <n>] [--max-iterations <n>] [--direct-merge]");
         const response = await withClient((client) => client.startOrchestration({
           maxWorkers: parseOptionalPositiveInt(maxWorkersResult.value, "--max-workers"),
           maxIterations: parseOptionalPositiveInt(maxIterationsResult.value, "--max-iterations"),
@@ -6594,8 +6841,8 @@ async function executeRemote(context, args) {
         let orchestrationPending = pending;
         const idResult = takeOption(orchestrationPending, "--id");
         orchestrationPending = idResult.rest;
-        requireNoExtraArgs(orchestrationPending, `bun run rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
-        const orchestrationId = requireTask(idResult.value, `bun run rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        requireNoExtraArgs(orchestrationPending, `rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        const orchestrationId = requireTask(idResult.value, `rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
         const response = await withClient(async (client) => {
           switch (command) {
             case "orchestrate-pause":
@@ -6659,8 +6906,8 @@ var CANONICAL_STAGES = [
   "Merge",
   "Complete"
 ];
-function logDetail(log3) {
-  return typeof log3.detail === "string" ? log3.detail.trim() : "";
+function logDetail(log4) {
+  return typeof log4.detail === "string" ? log4.detail.trim() : "";
 }
 function parseProviderProtocolLog(title, detail) {
   if (title.trim().toLowerCase() !== "agent output")
@@ -6707,12 +6954,12 @@ function renderOperatorSnapshot(snapshot) {
   const status = String(run.status ?? "unknown");
   const logs = snapshot.logs ?? [];
   const latestByStage = new Map;
-  for (const log3 of logs) {
-    const title = String(log3.title ?? "").toLowerCase();
-    const stageName = String(log3.stage ?? "").toLowerCase();
+  for (const log4 of logs) {
+    const title = String(log4.title ?? "").toLowerCase();
+    const stageName = String(log4.stage ?? "").toLowerCase();
     const stage = CANONICAL_STAGES.find((candidate) => candidate.toLowerCase() === title || candidate.toLowerCase() === stageName);
     if (stage)
-      latestByStage.set(stage, log3);
+      latestByStage.set(stage, log4);
   }
   const stageLines = CANONICAL_STAGES.flatMap((stage) => {
     const match = latestByStage.get(stage);
@@ -7516,7 +7763,7 @@ async function attachRunOperatorView(context, input) {
 }
 
 // packages/cli/src/commands/run.ts
-function normalizeRemoteRunDetails(payload) {
+function normalizeRemoteRunDetails2(payload) {
   const run = payload.run;
   if (!run || typeof run !== "object" || Array.isArray(run))
     return null;
@@ -7528,11 +7775,11 @@ function normalizeRemoteRunDetails(payload) {
   };
 }
 var REMOTE_TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged"]);
-function isRemoteConnectionSelected(projectRoot) {
+function isRemoteConnectionSelected2(projectRoot) {
   return resolveSelectedConnection(projectRoot)?.connection.kind === "remote";
 }
 async function listRunsForSelectedConnection(context, options = {}) {
-  if (isRemoteConnectionSelected(context.projectRoot)) {
+  if (isRemoteConnectionSelected2(context.projectRoot)) {
     return { runs: await listRunsViaServer(context, options), source: "server" };
   }
   return { runs: listAuthorityRuns3(context.projectRoot), source: "local" };
@@ -7541,9 +7788,6 @@ function runStringField(run, key, fallback = "") {
   const value = run[key];
   return typeof value === "string" && value.trim() ? value : fallback;
 }
-function runDisplayTitle(run) {
-  return runStringField(run, "title", runStringField(run, "taskId", "(untitled)"));
-}
 function buildServerRunStatus(runs) {
   const activeRuns = runs.filter((run) => !REMOTE_TERMINAL_RUN_STATUSES.has(runStringField(run, "status").toLowerCase()));
   const recentRuns = runs.filter((run) => REMOTE_TERMINAL_RUN_STATUSES.has(runStringField(run, "status").toLowerCase()));
@@ -7613,10 +7857,10 @@ async function executeRun(context, args) {
   const runtimeContext = loadRuntimeContextFromEnv2() ?? undefined;
   switch (command) {
     case "list": {
-      requireNoExtraArgs(rest, "bun run rig run list");
+      requireNoExtraArgs(rest, "rig run list");
       const { runs, source } = await listRunsForSelectedConnection(context, { limit: 100 });
       if (context.outputMode === "text") {
-        console.log(formatRunList(runs, { source }));
+        printFormattedOutput(formatRunList(runs, { source }));
       }
       return { ok: true, group: "run", command, details: { runs, source } };
     }
@@ -7626,7 +7870,7 @@ async function executeRun(context, args) {
       pending = run.rest;
       const purgeArtifacts = takeFlag(pending, "--purge-artifacts");
       pending = purgeArtifacts.rest;
-      requireNoExtraArgs(pending, "bun run rig run delete --run <id> [--purge-artifacts]");
+      requireNoExtraArgs(pending, "rig run delete --run <id> [--purge-artifacts]");
       if (!run.value) {
         throw new CliError2("run delete requires --run <id>.");
       }
@@ -7656,7 +7900,7 @@ async function executeRun(context, args) {
       pending = keepRuntimes.rest;
       const keepQueue = takeFlag(pending, "--keep-queue");
       pending = keepQueue.rest;
-      requireNoExtraArgs(pending, "bun run rig run cleanup --all [--keep-artifacts] [--keep-runtimes] [--keep-queue]");
+      requireNoExtraArgs(pending, "rig run cleanup --all [--keep-artifacts] [--keep-runtimes] [--keep-queue]");
       if (!all.value) {
         throw new CliError2("run cleanup currently requires --all.");
       }
@@ -7675,20 +7919,25 @@ async function executeRun(context, args) {
     }
     case "show": {
       let pending = rest;
+      const rawResult = takeFlag(pending, "--raw");
+      pending = rawResult.rest;
       const run = takeOption(pending, "--run");
       pending = run.rest;
-      requireNoExtraArgs(pending, "bun run rig run show --run <id>");
-      if (!run.value) {
-        throw new CliError2("run show requires --run <id>.");
+      const positionalRunId = pending.length > 0 && pending[0] && !pending[0].startsWith("-") ? pending[0] : undefined;
+      const extra = positionalRunId ? pending.slice(1) : pending;
+      requireNoExtraArgs(extra, "rig run show <id>|--run <id> [--raw]");
+      const runId = run.value ?? positionalRunId;
+      if (!runId) {
+        throw new CliError2("run show requires a run id.");
       }
-      const record = readAuthorityRun4(context.projectRoot, run.value) ?? normalizeRemoteRunDetails(await getRunDetailsViaServer(context, run.value).catch(() => ({})));
+      const record = readAuthorityRun4(context.projectRoot, runId) ?? normalizeRemoteRunDetails2(await getRunDetailsViaServer(context, runId).catch(() => ({})));
       if (!record) {
-        throw new CliError2(`Run not found: ${run.value}`, 2);
+        throw new CliError2(`Run not found: ${runId}`, 2);
       }
       if (context.outputMode === "text") {
-        console.log(JSON.stringify(record, null, 2));
+        printFormattedOutput(rawResult.value ? JSON.stringify(record, null, 2) : formatRunCard(record));
       }
-      return { ok: true, group: "run", command, details: record };
+      return { ok: true, group: "run", command, details: { ...record, rawOutput: rawResult.value } };
     }
     case "timeline": {
       let pending = rest;
@@ -7696,7 +7945,7 @@ async function executeRun(context, args) {
       pending = run.rest;
       const follow = takeFlag(pending, "--follow");
       pending = follow.rest;
-      requireNoExtraArgs(pending, "bun run rig run timeline --run <id> [--follow]");
+      requireNoExtraArgs(pending, "rig run timeline --run <id> [--follow]");
       if (!run.value) {
         throw new CliError2("run timeline requires --run <id>.");
       }
@@ -7733,7 +7982,7 @@ async function executeRun(context, args) {
       pending = pollMs.rest;
       const positionalRunId = pending.length > 0 ? pending[0] : undefined;
       const extra = positionalRunId ? pending.slice(1) : pending;
-      requireNoExtraArgs(extra, "bun run rig run attach <run-id>|--run <run-id> [--message <text>] [--once|--follow] [--poll-ms <ms>]");
+      requireNoExtraArgs(extra, "rig run attach <run-id>|--run <run-id> [--message <text>] [--once|--follow] [--poll-ms <ms>]");
       const runId = runOption.value ?? positionalRunId;
       if (!runId) {
         throw new CliError2("run attach requires a run id.", 2);
@@ -7753,28 +8002,18 @@ async function executeRun(context, args) {
       return { ok: true, group: "run", command, details: { ...attached, steered: attached.steered || steered } };
     }
     case "status": {
-      requireNoExtraArgs(rest, "bun run rig run status");
+      requireNoExtraArgs(rest, "rig run status");
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run status");
         }
         return { ok: true, group: "run", command };
       }
-      const summary = isRemoteConnectionSelected(context.projectRoot) ? buildServerRunStatus(await listRunsViaServer(context, { limit: 100 })) : runStatus(context.projectRoot, runtimeContext);
+      const summary = isRemoteConnectionSelected2(context.projectRoot) ? buildServerRunStatus(await listRunsViaServer(context, { limit: 100 })) : runStatus(context.projectRoot, runtimeContext);
       const activeRuns = Array.isArray(summary.activeRuns) ? summary.activeRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
       const recentRuns = Array.isArray(summary.recentRuns) ? summary.recentRuns.filter((run) => Boolean(run && typeof run === "object" && !Array.isArray(run))) : [];
       if (context.outputMode === "text") {
-        console.log(`Active runs: ${activeRuns.length}`);
-        for (const run of activeRuns) {
-          console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runStringField(run, "taskId", runDisplayTitle(run))}`);
-        }
-        if (recentRuns.length > 0) {
-          console.log("");
-          console.log("Recent runs:");
-          for (const run of recentRuns) {
-            console.log(`- ${runStringField(run, "runId", "(unknown-run)")} \xB7 ${runStringField(run, "status", "unknown")} \xB7 ${runStringField(run, "taskId", runDisplayTitle(run))}`);
-          }
-        }
+        printFormattedOutput(formatRunStatus({ activeRuns, recentRuns, runs: Array.isArray(summary.runs) ? summary.runs : [...activeRuns, ...recentRuns] }, { source: isRemoteConnectionSelected2(context.projectRoot) ? "server" : "local" }));
       }
       return { ok: true, group: "run", command, details: summary };
     }
@@ -7798,7 +8037,7 @@ async function executeRun(context, args) {
       pending = pollResult.rest;
       const noServerResult = takeFlag(pending, "--no-server");
       pending = noServerResult.rest;
-      requireNoExtraArgs(pending, "bun run rig run start [--epic <id>] [--prompt-epic|--no-epic-prompt] [--ws-port <n>] [--server-host <host>] [--server-port <n>] [--poll-ms <n>] [--no-server]");
+      requireNoExtraArgs(pending, "rig run start [--epic <id>] [--prompt-epic|--no-epic-prompt] [--ws-port <n>] [--server-host <host>] [--server-port <n>] [--poll-ms <n>] [--no-server]");
       if (promptEpicResult.value && noEpicPromptResult.value) {
         throw new CliError2("Cannot use --prompt-epic and --no-epic-prompt together.");
       }
@@ -7846,7 +8085,7 @@ async function executeRun(context, args) {
       };
     }
     case "resume": {
-      requireNoExtraArgs(rest, "bun run rig run resume");
+      requireNoExtraArgs(rest, "rig run resume");
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run resume");
@@ -7860,7 +8099,7 @@ async function executeRun(context, args) {
       return { ok: true, group: "run", command, details: resumed };
     }
     case "restart": {
-      requireNoExtraArgs(rest, "bun run rig run restart");
+      requireNoExtraArgs(rest, "rig run restart");
       if (context.dryRun) {
         if (context.outputMode === "text") {
           console.log("[dry-run] rig run restart");
@@ -7877,7 +8116,7 @@ async function executeRun(context, args) {
       const runOption = takeOption(rest, "--run");
       const positionalRunId = runOption.rest.length > 0 ? runOption.rest[0] : undefined;
       const extra = positionalRunId ? runOption.rest.slice(1) : runOption.rest;
-      requireNoExtraArgs(extra, "bun run rig run stop [<run-id>|--run <id>]");
+      requireNoExtraArgs(extra, "rig run stop [<run-id>|--run <id>]");
       const runId = runOption.value ?? positionalRunId;
       if (context.dryRun) {
         return {
@@ -8015,73 +8254,425 @@ async function executeServer(context, args, options) {
       throw new CliError2(`Unknown server command: ${command}`);
   }
 }
-
-// packages/cli/src/commands/task.ts
-import { readFileSync as readFileSync9 } from "fs";
-import { spawnSync as spawnSync3 } from "child_process";
-import { resolve as resolve20 } from "path";
-import { cancel as cancel4, confirm as confirm2, isCancel as isCancel4 } from "@clack/prompts";
-import {
-  taskArtifactDir,
-  taskArtifacts,
-  taskArtifactWrite,
-  taskDeps,
-  taskInfo,
-  taskLookup as taskLookup2,
-  taskReady,
-  taskRecord,
-  taskReopen,
-  taskScope,
-  taskStatus as taskStatus2,
-  taskValidate,
-  taskVerify
-} from "@rig/runtime/control-plane/native/task-ops";
-
-// packages/cli/src/commands/_task-picker.ts
-import { cancel as cancel3, isCancel as isCancel3, select as select3 } from "@clack/prompts";
-function taskId2(task) {
-  return typeof task.id === "string" && task.id.trim() ? task.id : "<unknown>";
+
+// packages/cli/src/commands/task.ts
+import { readFileSync as readFileSync9 } from "fs";
+import { spawnSync as spawnSync3 } from "child_process";
+import { resolve as resolve20 } from "path";
+import { cancel as cancel4, confirm as confirm2, isCancel as isCancel4 } from "@clack/prompts";
+import {
+  taskArtifactDir,
+  taskArtifacts,
+  taskArtifactWrite,
+  taskDeps,
+  taskInfo,
+  taskLookup as taskLookup2,
+  taskReady,
+  taskRecord,
+  taskReopen,
+  taskScope,
+  taskStatus as taskStatus2,
+  taskValidate,
+  taskVerify
+} from "@rig/runtime/control-plane/native/task-ops";
+
+// packages/cli/src/commands/_task-picker.ts
+import { cancel as cancel3, isCancel as isCancel3, select as select3 } from "@clack/prompts";
+function taskId2(task) {
+  return typeof task.id === "string" && task.id.trim() ? task.id : "<unknown>";
+}
+async function selectTaskWithTextPicker(tasks, io = {}) {
+  if (tasks.length === 0)
+    return null;
+  if (tasks.length === 1)
+    return tasks[0];
+  const isTty = io.isTty ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  if (!isTty) {
+    throw new Error("task run requires an interactive terminal to pick a task; pass --task <id>, --next, or --detach with a task id.");
+  }
+  if (io.prompt || io.renderer) {
+    const prompt = io.prompt ?? promptForTaskSelection;
+    const renderer = io.renderer ?? { writeLine: (line) => process.stdout.write(`${line}
+`) };
+    renderer.writeLine("Select Rig task:");
+    for (const row of renderTaskPickerRows(tasks))
+      renderer.writeLine(`  ${row}`);
+    const answer2 = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
+    if (!answer2)
+      return null;
+    if (/^\d+$/.test(answer2)) {
+      const index2 = Number.parseInt(answer2, 10) - 1;
+      return tasks[index2] ?? null;
+    }
+    return tasks.find((task) => taskId2(task) === answer2) ?? null;
+  }
+  const options = tasks.map((task, index2) => ({
+    value: `${index2}`,
+    label: `${taskId2(task)} \xB7 ${typeof task.title === "string" && task.title.trim() ? task.title.trim() : "Untitled task"}`,
+    hint: typeof task.status === "string" && task.status.trim() ? task.status.trim() : undefined
+  }));
+  const answer = await select3({
+    message: "Select Rig task",
+    options
+  });
+  if (isCancel3(answer)) {
+    cancel3("No task selected.");
+    return null;
+  }
+  const index = Number.parseInt(String(answer), 10);
+  return Number.isFinite(index) ? tasks[index] ?? null : null;
+}
+
+// packages/cli/src/commands/_help-catalog.ts
+import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@clack/prompts";
+import pc4 from "picocolors";
+var TOP_LEVEL_SECTIONS = [
+  {
+    title: "Server",
+    subtitle: "choose the local or remote Rig server that owns this repo",
+    commands: [
+      { command: "rig server status", description: "Show the selected local/remote server for this repo." },
+      { command: "rig server use local", description: "Switch this repo back to the local Rig server." },
+      { command: "rig server add <alias> <url>", description: "Save a remote Rig server alias." },
+      { command: "rig server use <alias>", description: "Switch this repo to a saved remote server." },
+      { command: "rig server list", description: "Show saved server aliases, including local." }
+    ]
+  },
+  {
+    title: "Tasks",
+    subtitle: "find work, inspect it, and submit Pi-backed workers",
+    commands: [
+      { command: "rig task list", description: "List tasks from the selected task source/server." },
+      { command: "rig task next", description: "Show the next matching task as a selected-task card." },
+      { command: "rig task show <id>", description: "Show a human task summary; add --raw or --json for the full payload." },
+      { command: "rig task run <id|--next> [--detach]", description: "Submit a task run; interactive mode follows with bundled Pi." }
+    ]
+  },
+  {
+    title: "Runs",
+    subtitle: "observe, attach to, and stop live or recent runs",
+    commands: [
+      { command: "rig run list", description: "List recent runs from the selected server or local state." },
+      { command: "rig run show <id>", description: "Show a human run summary; add --raw or --json for the full payload." },
+      { command: "rig run attach <id> --follow", description: "Open the native bundled Pi live view for a worker run." },
+      { command: "rig run stop <id>", description: "Request cancellation for a running worker." }
+    ]
+  },
+  {
+    title: "Review / inbox",
+    subtitle: "clear blocked runs and configure completion review",
+    commands: [
+      { command: "rig inbox approvals", description: "List pending approval requests from local/server run state." },
+      { command: "rig inbox inputs", description: "List pending user-input requests from local/server run state." },
+      { command: "rig review show|set", description: "Inspect or change the review gate policy." }
+    ]
+  },
+  {
+    title: "Health / setup",
+    subtitle: "bootstrap and diagnose the repo/server/GitHub/Pi path",
+    commands: [
+      { command: "rig init", description: "Interactive setup: config, GitHub auth, task source, server, checkout, Pi." },
+      { command: "rig doctor", description: "Diagnose project/server/GitHub/task/Pi wiring." },
+      { command: "rig github auth status", description: "Show GitHub auth state on the selected Rig server." }
+    ]
+  }
+];
+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]"],
+    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." }
+    ],
+    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"
+    ],
+    next: ["Use `rig task list` to see server-owned work.", "Use `rig run list` or `rig run attach <id> --follow` to monitor runs."],
+    advanced: ["Compatibility alias: `rig connect ...` remains callable."]
+  },
+  {
+    name: "task",
+    summary: "Find work, start Pi-backed runs, and validate task results.",
+    usage: ["rig task <list|next|show|run> [options]"],
+    commands: [
+      { command: "list [--assignee <login|@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: "validate|verify [--task <id>]", description: "Run configured task checks/review gates." },
+      { command: "artifacts|artifact-dir|artifact-write", description: "Inspect or write task artifacts." },
+      { command: "report-bug", description: "Create a structured bug report/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'"
+    ],
+    next: ["Use `--detach` to submit without attaching.", "Use `rig run attach <run-id> --follow` to rejoin a live run."]
+  },
+  {
+    name: "run",
+    summary: "Observe, attach to, and control Rig runs.",
+    usage: ["rig run <list|status|show|attach|stop> [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> [--follow]", description: "Attach to the run; --follow launches native bundled Pi for live Pi runs.", primary: true },
+      { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
+      { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events." },
+      { command: "delete|cleanup", description: "Remove completed run records/artifacts." }
+    ],
+    examples: [
+      "rig run list",
+      "rig run status",
+      "rig run show <run-id>",
+      "rig run attach <run-id> --follow",
+      "rig run stop <run-id>"
+    ],
+    next: ["Use `rig task run --next` to create a new run.", "Use `--json` when scripts need the full structured record."]
+  },
+  {
+    name: "inbox",
+    summary: "Review approval and user-input requests that block worker runs.",
+    usage: ["rig inbox <approvals|approve|inputs|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." }
+    ],
+    examples: [
+      "rig inbox approvals",
+      "rig inbox inputs --run <run-id>",
+      "rig inbox approve --run <run-id> --request <request-id> --decision approve"
+    ],
+    next: ["Rejoin the run after resolving a block: `rig run attach <run-id> --follow`."]
+  },
+  {
+    name: "review",
+    summary: "Inspect or change completion review gate policy.",
+    usage: ["rig review <show|set>"],
+    commands: [
+      { command: "show", description: "Show current review gate settings.", primary: true },
+      { command: "set <off|advisory|required> [--provider greptile]", description: "Change review strictness/provider.", primary: true }
+    ],
+    examples: ["rig review show", "rig review set required --provider greptile"],
+    next: ["Use `rig inbox approvals` for blocked run handoffs."]
+  },
+  {
+    name: "init",
+    summary: "Set up Rig for this repo: server, GitHub auth, checkout strategy, task source, and Pi wiring.",
+    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 --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." }
+    ],
+    examples: [
+      "rig init",
+      "rig init --yes --repo humanity-org/humanwork",
+      "rig init --server remote --remote-url https://where.rig-does.work --repo owner/repo"
+    ],
+    next: ["After init, run `rig server status`.", "Then use `rig task list` and `rig task run --next` for day-to-day work."]
+  },
+  {
+    name: "doctor",
+    summary: "Diagnostics for project/server/GitHub/Pi state.",
+    usage: ["rig doctor"],
+    commands: [
+      { command: "doctor", description: "Run setup and runtime diagnostics.", primary: true },
+      { command: "check", description: "Compatibility spelling for diagnostics." }
+    ],
+    examples: ["rig doctor", "rig doctor --json"],
+    next: ["Use `rig server status` and `rig github auth status` to inspect common failure points."]
+  },
+  {
+    name: "github",
+    summary: "GitHub auth helpers for the selected Rig server.",
+    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." }
+    ],
+    examples: ["rig github auth status", "rig github auth import-gh"],
+    next: ["After auth is valid, use `rig task run --next`."]
+  }
+];
+var ADVANCED_GROUPS = [
+  { name: "connect", summary: "Compatibility alias for `rig server` selection commands.", usage: ["rig connect <status|list|add|use>"], commands: [{ command: "status|list|add|use", description: "Use `rig server ...` for the primary UX." }] },
+  { name: "setup", summary: "Bootstrap/check local setup.", usage: ["rig setup <bootstrap|check|preflight>"], commands: [{ command: "bootstrap|check|preflight", description: "Setup helpers." }] },
+  { name: "inspect", summary: "Inspect logs, artifacts, graphs, failures.", usage: ["rig inspect <logs|artifacts|failures|graph|audit|diff>"], commands: [{ command: "logs --task <id>", description: "Inspect task logs." }] },
+  { name: "repo", summary: "Repository sync/baseline helpers.", usage: ["rig repo <sync|reset-baseline>"], commands: [{ command: "sync", description: "Sync project repository state." }] },
+  { name: "profile", summary: "Runtime profile/model defaults.", usage: ["rig profile <show|set>"], commands: [{ command: "show", description: "Show active profile." }] },
+  { name: "browser", summary: "Browser/app diagnostics.", usage: ["rig browser <help|explain|demo|app>"], commands: [{ command: "help", description: "Browser command help." }] },
+  { name: "plugin", summary: "Plugin validation/listing.", usage: ["rig plugin <list|validate>"], commands: [{ command: "list", description: "List plugins." }] },
+  { 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: "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: "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 ADVANCED_COMMANDS = [
+  { command: "rig server task-run ...", description: "Internal server-owned task execution entry point." },
+  { command: "rig server notify-test [--event <type>]", description: "Internal event notification smoke command." },
+  { command: "rig run start|start-serial|start-parallel", description: "Compatibility local run starters; prefer `rig task run ...`." },
+  { command: "rig setup install-agent-shell", description: "Development helper for materializing the agent shell." },
+  { command: "rig remote orchestrate-*", description: "Compatibility remote orchestration commands." }
+];
+var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
+function heading(title) {
+  return pc4.bold(pc4.cyan(title));
+}
+function commandLine(command, description) {
+  const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
+  return `${pc4.dim("\u2502")} ${pc4.bold(commandColumn)} ${description}`;
+}
+function renderCommandBlock(commands) {
+  return commands.map((entry) => commandLine(entry.command, entry.description)).join(`
+`);
+}
+function renderGroup(group) {
+  const lines = [
+    `${heading(`rig ${group.name}`)} \u2014 ${group.summary}`,
+    "",
+    pc4.bold("Usage"),
+    ...group.usage.map((line) => `  ${line}`),
+    "",
+    pc4.bold("Commands"),
+    ...group.commands.map((entry) => commandLine(entry.command, entry.description))
+  ];
+  if (group.examples?.length) {
+    lines.push("", pc4.bold("Examples"), ...group.examples.map((line) => `  ${pc4.dim("$")} ${line}`));
+  }
+  if (group.next?.length) {
+    lines.push("", pc4.bold("Next steps"), ...group.next.map((line) => `  ${pc4.dim("\u203A")} ${line}`));
+  }
+  if (group.advanced?.length) {
+    lines.push("", pc4.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc4.dim("\u203A")} ${line}`));
+  }
+  return lines.join(`
+`);
+}
+function renderTopLevelHelp() {
+  return [
+    `${heading("rig")} ${pc4.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
+    pc4.dim("Current path: select a server, choose a task, submit a run, attach with native Pi, clear inbox/review gates."),
+    "",
+    ...TOP_LEVEL_SECTIONS.flatMap((section) => [
+      `${pc4.bold(pc4.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc4.dim(section.subtitle)}`,
+      renderCommandBlock(section.commands),
+      ""
+    ]),
+    pc4.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
+    "",
+    pc4.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.")
+  ].join(`
+`).trimEnd();
 }
-async function selectTaskWithTextPicker(tasks, io = {}) {
-  if (tasks.length === 0)
-    return null;
-  if (tasks.length === 1)
-    return tasks[0];
-  const isTty = io.isTty ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
-  if (!isTty) {
-    throw new Error("task run requires an interactive terminal to pick a task; pass --task <id>, --next, or --detach with a task id.");
+function renderAdvancedHelp() {
+  return [
+    `${heading("rig advanced")} \u2014 compatibility, diagnostics, and internal surfaces`,
+    "",
+    pc4.bold("Primary groups"),
+    "  server, task, run, inbox, review, init, doctor, github",
+    "",
+    pc4.bold("Advanced commands"),
+    ...ADVANCED_COMMANDS.map((entry) => commandLine(entry.command, entry.description)),
+    "",
+    pc4.bold("Advanced groups"),
+    ...ADVANCED_GROUPS.map((group) => commandLine(group.name, group.summary)),
+    "",
+    pc4.dim("All groups remain callable. Prefer `rig server`, `rig task`, `rig run`, `rig inbox`, and `rig review` for day-to-day work.")
+  ].join(`
+`);
+}
+function renderGroupHelp(groupName) {
+  const group = ALL_GROUPS.find((candidate) => candidate.name === groupName);
+  return group ? renderGroup(group) : null;
+}
+function shouldUseClackOutput2() {
+  return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
+}
+function printTopLevelHelp() {
+  if (!shouldUseClackOutput2()) {
+    console.log(renderTopLevelHelp());
+    return;
   }
-  if (io.prompt || io.renderer) {
-    const prompt = io.prompt ?? promptForTaskSelection;
-    const renderer = io.renderer ?? { writeLine: (line) => process.stdout.write(`${line}
-`) };
-    renderer.writeLine("Select Rig task:");
-    for (const row of renderTaskPickerRows(tasks))
-      renderer.writeLine(`  ${row}`);
-    const answer2 = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
-    if (!answer2)
-      return null;
-    if (/^\d+$/.test(answer2)) {
-      const index2 = Number.parseInt(answer2, 10) - 1;
-      return tasks[index2] ?? null;
-    }
-    return tasks.find((task) => taskId2(task) === answer2) ?? null;
+  intro3("rig");
+  for (const section of TOP_LEVEL_SECTIONS) {
+    note4(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
   }
-  const options = tasks.map((task, index2) => ({
-    value: `${index2}`,
-    label: `${taskId2(task)} \xB7 ${typeof task.title === "string" && task.title.trim() ? task.title.trim() : "Untitled task"}`,
-    hint: typeof task.status === "string" && task.status.trim() ? task.status.trim() : undefined
-  }));
-  const answer = await select3({
-    message: "Select Rig task",
-    options
-  });
-  if (isCancel3(answer)) {
-    cancel3("No task selected.");
-    return null;
+  log4.info("More: rig help --advanced \xB7 rig <group> --help \xB7 rig --version");
+  note4([
+    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.")
+  ].join(`
+`), "Global options");
+  outro3("Server \u2192 task \u2192 run \u2192 inbox/review.");
+}
+function printAdvancedHelp() {
+  if (!shouldUseClackOutput2()) {
+    console.log(renderAdvancedHelp());
+    return;
   }
-  const index = Number.parseInt(String(answer), 10);
-  return Number.isFinite(index) ? tasks[index] ?? null : null;
+  intro3("rig advanced");
+  note4(ADVANCED_COMMANDS.map((entry) => commandLine(entry.command, entry.description)).join(`
+`), "Advanced commands");
+  note4(ADVANCED_GROUPS.map((group) => commandLine(group.name, group.summary)).join(`
+`), "Advanced groups");
+  outro3("Primary daily flow: rig server \xB7 rig task \xB7 rig run \xB7 rig inbox \xB7 rig review.");
+}
+function printGroupHelpDocument(groupName) {
+  const rendered = renderGroupHelp(groupName) ?? renderTopLevelHelp();
+  if (!shouldUseClackOutput2()) {
+    console.log(rendered);
+    return;
+  }
+  const group = ALL_GROUPS.find((candidate) => candidate.name === groupName);
+  if (!group) {
+    printTopLevelHelp();
+    return;
+  }
+  intro3(`rig ${group.name}`);
+  note4(group.summary, "Purpose");
+  note4(group.usage.join(`
+`), "Usage");
+  note4(group.commands.map((entry) => commandLine(entry.command, entry.description)).join(`
+`), "Commands");
+  if (group.examples?.length)
+    note4(group.examples.map((line) => `$ ${line}`).join(`
+`), "Examples");
+  if (group.next?.length)
+    note4(group.next.map((line) => `\u203A ${line}`).join(`
+`), "Next steps");
+  if (group.advanced?.length)
+    log4.info(group.advanced.join(`
+`));
+  outro3("Run with --json when scripts need structured output.");
 }
 
 // packages/cli/src/commands/task.ts
@@ -8235,27 +8826,30 @@ function summarizeTask(task, options = {}) {
     ...options.raw ? { raw: raw ?? task } : {}
   };
 }
-function printTaskSummary(task) {
-  console.log(formatTaskList([task]));
-}
 async function validatorRegistryForTaskCommands(projectRoot) {
   return buildPluginHostContext(projectRoot).then((ctx) => ctx?.validatorRegistry ?? undefined).catch(() => {
     return;
   });
 }
 async function executeTask(context, args, options) {
-  const [command = "info", ...rest] = args;
+  if (args.length === 0) {
+    if (context.outputMode === "text") {
+      printGroupHelpDocument("task");
+    }
+    return { ok: true, group: "task", command: "help" };
+  }
+  const [command = "help", ...rest] = args;
   switch (command) {
     case "list": {
       let pending = rest;
       const rawResult = takeFlag(pending, "--raw");
       pending = rawResult.rest;
       const { filters, rest: remaining } = parseTaskFilters(pending);
-      requireNoExtraArgs(remaining, "bun run rig task list [--raw] [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
+      requireNoExtraArgs(remaining, "rig task list [--raw] [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
       const tasks = await listWorkspaceTasksViaServer(context, filters);
       if (context.outputMode === "text") {
         const renderedTasks = rawResult.value ? tasks.map((task) => summarizeTask(task, { raw: true })) : tasks.map((task) => summarizeTask(task));
-        console.log(formatTaskList(renderedTasks, { raw: rawResult.value }));
+        printFormattedOutput(formatTaskList(renderedTasks, { raw: rawResult.value }));
       }
       return {
         ok: true,
@@ -8265,10 +8859,13 @@ async function executeTask(context, args, options) {
       };
     }
     case "show": {
-      const taskOption = takeOption(rest, "--task");
+      let pending = rest;
+      const rawResult = takeFlag(pending, "--raw");
+      pending = rawResult.rest;
+      const taskOption = takeOption(pending, "--task");
       const positional = taskOption.rest.length > 0 && taskOption.rest[0] && !taskOption.rest[0].startsWith("-") ? taskOption.rest[0] : undefined;
       const remaining = positional ? taskOption.rest.slice(1) : taskOption.rest;
-      requireNoExtraArgs(remaining, "bun run rig task show <id>|--task <id>");
+      requireNoExtraArgs(remaining, "rig task show <id>|--task <id> [--raw]");
       const taskId3 = normalizeTaskRunTaskId(taskOption.value ?? positional);
       if (!taskId3)
         throw new CliError2("task show requires a task id.", 2);
@@ -8276,19 +8873,20 @@ async function executeTask(context, args, options) {
       if (!task)
         throw new CliError2(`Task not found: ${taskId3}`, 3);
       const summary = summarizeTask(task, { raw: true });
-      if (context.outputMode === "text")
-        console.log(JSON.stringify(summary, null, 2));
-      return { ok: true, group: "task", command, details: { task: summary } };
+      if (context.outputMode === "text") {
+        printFormattedOutput(rawResult.value ? JSON.stringify(summary, null, 2) : formatTaskDetails(summary));
+      }
+      return { ok: true, group: "task", command, details: { task: summary, raw: rawResult.value } };
     }
     case "next": {
       const { filters, rest: remaining } = parseTaskFilters(rest);
-      requireNoExtraArgs(remaining, "bun run rig task next [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
+      requireNoExtraArgs(remaining, "rig task next [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>]");
       const selected = await selectNextWorkspaceTaskViaServer(context, filters);
       if (context.outputMode === "text") {
         if (selected.task) {
-          printTaskSummary(selected.task);
+          printFormattedOutput(formatTaskCard(summarizeTask(selected.task, { raw: true }), { title: "Selected task", selected: true }));
         } else {
-          console.log("No matching tasks.");
+          printFormattedOutput("No matching tasks.\n\nNext\n\u203A Try `rig task list` to inspect available work.\n\u203A Check server: `rig server status`");
         }
       }
       return {
@@ -8304,31 +8902,31 @@ async function executeTask(context, args, options) {
     }
     case "info": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig task info [--task <beads-id>]");
+      requireNoExtraArgs(remaining, "rig task info [--task <task-id>]");
       await withMutedConsole(context.outputMode === "json", () => taskInfo(context.projectRoot, task || undefined));
       return { ok: true, group: "task", command, details: { task: task || null } };
     }
     case "scope": {
       const filesFlag = takeFlag(rest, "--files");
       const { value: task, rest: remaining } = takeOption(filesFlag.rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig task scope [--task <id>] [--files]");
+      requireNoExtraArgs(remaining, "rig task scope [--task <id>] [--files]");
       await withMutedConsole(context.outputMode === "json", () => taskScope(context.projectRoot, filesFlag.value, task || undefined));
       return { ok: true, group: "task", command, details: { files: filesFlag.value, task: task || null } };
     }
     case "deps":
-      requireNoExtraArgs(rest, "bun run rig task deps");
+      requireNoExtraArgs(rest, "rig task deps");
       await withMutedConsole(context.outputMode === "json", () => taskDeps(context.projectRoot));
       return { ok: true, group: "task", command };
     case "status":
-      requireNoExtraArgs(rest, "bun run rig task status");
+      requireNoExtraArgs(rest, "rig task status");
       withMutedConsole(context.outputMode === "json", () => taskStatus2(context.projectRoot));
       return { ok: true, group: "task", command };
     case "artifacts":
-      requireNoExtraArgs(rest, "bun run rig task artifacts");
+      requireNoExtraArgs(rest, "rig task artifacts");
       withMutedConsole(context.outputMode === "json", () => taskArtifacts(context.projectRoot));
       return { ok: true, group: "task", command };
     case "artifact-dir": {
-      requireNoExtraArgs(rest, "bun run rig task artifact-dir");
+      requireNoExtraArgs(rest, "rig task artifact-dir");
       const path = taskArtifactDir(context.projectRoot);
       if (context.outputMode === "text") {
         console.log(path);
@@ -8337,7 +8935,7 @@ async function executeTask(context, args, options) {
     }
     case "artifact-write": {
       if (rest.length < 1) {
-        throw new CliError2(`Usage: bun run rig task artifact-write <filename> [--file <path>]
+        throw new CliError2(`Usage: rig task artifact-write <filename> [--file <path>]
 ` + `  Reads content from stdin (or --file), writes to the active task artifact dir.
 ` + "  Example: echo '...' | rig task artifact-write collection-audit.md");
       }
@@ -8350,7 +8948,7 @@ async function executeTask(context, args, options) {
         content = await readStdin();
       }
       if (!artifactFilename) {
-        throw new CliError2("Usage: bun run rig task artifact-write <filename> [--file path]");
+        throw new CliError2("Usage: rig task artifact-write <filename> [--file path]");
       }
       withMutedConsole(context.outputMode === "json", () => taskArtifactWrite(context.projectRoot, artifactFilename, content));
       return { ok: true, group: "task", command, details: { filename: artifactFilename } };
@@ -8359,11 +8957,11 @@ async function executeTask(context, args, options) {
       return options.executeTaskReportBug(context, rest);
     case "lookup": {
       if (rest.length !== 1) {
-        throw new CliError2("Usage: bun run rig task lookup <beads-id>");
+        throw new CliError2("Usage: rig task lookup <task-id>");
       }
       const lookupId = rest[0];
       if (!lookupId) {
-        throw new CliError2("Usage: bun run rig task lookup <beads-id>");
+        throw new CliError2("Usage: rig task lookup <task-id>");
       }
       const result = taskLookup2(context.projectRoot, lookupId);
       if (context.outputMode === "text") {
@@ -8373,17 +8971,17 @@ async function executeTask(context, args, options) {
     }
     case "record": {
       if (rest.length < 2) {
-        throw new CliError2("Usage: bun run rig task record <decision|failure> <text>");
+        throw new CliError2("Usage: rig task record <decision|failure> <text>");
       }
       const type = rest[0];
       if (type !== "decision" && type !== "failure") {
-        throw new CliError2("Usage: bun run rig task record <decision|failure> <text>");
+        throw new CliError2("Usage: rig task record <decision|failure> <text>");
       }
       withMutedConsole(context.outputMode === "json", () => taskRecord(context.projectRoot, type, rest.slice(1).join(" ")));
       return { ok: true, group: "task", command, details: { type: rest[0] } };
     }
     case "ready":
-      requireNoExtraArgs(rest, "bun run rig task ready");
+      requireNoExtraArgs(rest, "rig task ready");
       await withMutedConsole(context.outputMode === "json", () => taskReady(context.projectRoot));
       return { ok: true, group: "task", command };
     case "run": {
@@ -8420,7 +9018,7 @@ async function executeTask(context, args, options) {
       if (positionalTaskId) {
         pending = pending.slice(1);
       }
-      requireNoExtraArgs(pending, "bun run rig task run [#<issue>|<task-id>] [--next] [--task <id>] [--detach] [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>] [--title <text>] [--runtime-adapter claude-code|codex|pi] [--model <model>] [--runtime-mode <mode>] [--interaction-mode <mode>] [--initial-prompt <text>] [--pr auto|ask|off] [--no-pr] [--dirty-baseline head|dirty-snapshot] [--skip-project-sync]");
+      requireNoExtraArgs(pending, "rig task run [#<issue>|<task-id>] [--next] [--task <id>] [--detach] [--assignee <login|@me>] [--assigned-to <login|me|@me>] [--state open|closed] [--status <status>] [--limit <n>] [--title <text>] [--runtime-adapter claude-code|codex|pi] [--model <model>] [--runtime-mode <mode>] [--interaction-mode <mode>] [--initial-prompt <text>] [--pr auto|ask|off] [--no-pr] [--dirty-baseline head|dirty-snapshot] [--skip-project-sync]");
       if (nextResult.value && (taskResult.value || positionalTaskId)) {
         throw new CliError2("task run cannot combine --next with an explicit task id.", 2);
       }
@@ -8474,10 +9072,24 @@ async function executeTask(context, args, options) {
       });
       let attachDetails = null;
       if (!detachResult.value && context.outputMode === "text") {
-        console.log(formatSubmittedRun({ runId: submitted.runId, task: selectedTask ? summarizeTask(selectedTask) : null }));
+        printFormattedOutput(formatSubmittedRun({
+          runId: submitted.runId,
+          task: selectedTask ? summarizeTask(selectedTask) : null,
+          runtimeAdapter,
+          runtimeMode: runtimeModeResult.value || projectDefaults.runtimeMode || "full-access",
+          interactionMode: interactionModeResult.value || "default",
+          detached: false
+        }));
         attachDetails = await attachRunOperatorView(context, { runId: submitted.runId, follow: true });
       } else if (context.outputMode === "text") {
-        console.log(formatSubmittedRun({ runId: submitted.runId, task: selectedTask ? summarizeTask(selectedTask) : null }));
+        printFormattedOutput(formatSubmittedRun({
+          runId: submitted.runId,
+          task: selectedTask ? summarizeTask(selectedTask) : null,
+          runtimeAdapter,
+          runtimeMode: runtimeModeResult.value || projectDefaults.runtimeMode || "full-access",
+          interactionMode: interactionModeResult.value || "default",
+          detached: true
+        }));
       }
       return {
         ok: true,
@@ -8501,7 +9113,7 @@ async function executeTask(context, args, options) {
     }
     case "validate": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig task validate [--task <beads-id>]");
+      requireNoExtraArgs(remaining, "rig task validate [--task <task-id>]");
       if (context.dryRun) {
         await context.runCommand(["rig", "task", "validate", ...task ? ["--task", task] : []]);
         return { ok: true, group: "task", command, details: { task: task || "active" } };
@@ -8514,7 +9126,7 @@ async function executeTask(context, args, options) {
     }
     case "verify": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig task verify [--task <beads-id>]");
+      requireNoExtraArgs(remaining, "rig task verify [--task <task-id>]");
       if (context.dryRun) {
         await context.runCommand(["rig", "task", "verify", ...task ? ["--task", task] : []]);
         return { ok: true, group: "task", command, details: { task: task || "active" } };
@@ -8527,15 +9139,15 @@ async function executeTask(context, args, options) {
     }
     case "reset": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig task reset --task <beads-id>");
-      const requiredTask = requireTask(task, "bun run rig task reset --task <beads-id>");
+      requireNoExtraArgs(remaining, "rig task reset --task <task-id>");
+      const requiredTask = requireTask(task, "rig task reset --task <task-id>");
       await context.runCommand(["br", "--no-db", "update", requiredTask, "--status", "open"]);
       return { ok: true, group: "task", command, details: { task: requiredTask } };
     }
     case "details": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig task details --task <beads-id>");
-      const requiredTask = requireTask(task, "bun run rig task details --task <beads-id>");
+      requireNoExtraArgs(remaining, "rig task details --task <task-id>");
+      const requiredTask = requireTask(task, "rig task details --task <task-id>");
       await withMutedConsole(context.outputMode === "json", () => taskInfo(context.projectRoot, requiredTask));
       return { ok: true, group: "task", command, details: { task: requiredTask } };
     }
@@ -8543,9 +9155,9 @@ async function executeTask(context, args, options) {
       const { value: task, rest: rest1 } = takeOption(rest, "--task");
       const allFlag = takeFlag(rest1, "--all");
       const { rest: remaining } = takeOption(allFlag.rest, "--reason");
-      requireNoExtraArgs(remaining, "bun run rig task reopen [--task <id> | --all] [--reason <text>]");
+      requireNoExtraArgs(remaining, "rig task reopen [--task <id> | --all] [--reason <text>]");
       if (!allFlag.value && !task) {
-        throw new CliError2("Usage: bun run rig task reopen [--task <id> | --all] [--reason <text>]");
+        throw new CliError2("Usage: rig task reopen [--task <id> | --all] [--reason <text>]");
       }
       const summary = withMutedConsole(context.outputMode === "json", () => taskReopen(context.projectRoot, {
         all: allFlag.value,
@@ -10580,15 +11192,15 @@ async function executeTest(context, args) {
   const [command = "unit", ...rest] = args;
   switch (command) {
     case "unit":
-      requireNoExtraArgs(rest, "bun run rig test unit");
+      requireNoExtraArgs(rest, "rig test unit");
       await context.runCommand(["bun", "test", "tests/harness/", "--ignore", "tests/harness/e2e/**"]);
       return { ok: true, group: "test", command };
     case "e2e":
-      requireNoExtraArgs(rest, "bun run rig test e2e");
+      requireNoExtraArgs(rest, "rig test e2e");
       await context.runCommand(["bun", "test", "tests/harness/e2e/"]);
       return { ok: true, group: "test", command };
     case "all":
-      requireNoExtraArgs(rest, "bun run rig test all");
+      requireNoExtraArgs(rest, "rig test all");
       await context.runCommand(["bun", "test", "tests/harness/"]);
       return { ok: true, group: "test", command };
     default:
@@ -10608,7 +11220,7 @@ async function executeSetup(context, args) {
   const [command = "check", ...rest] = args;
   switch (command) {
     case "bootstrap":
-      requireNoExtraArgs(rest, "bun run rig setup bootstrap");
+      requireNoExtraArgs(rest, "rig setup bootstrap");
       {
         const hostBash = Bun.which("bash") || "/bin/bash";
         const env = { ...process.env };
@@ -10631,21 +11243,21 @@ async function executeSetup(context, args) {
       }
       return { ok: true, group: "setup", command };
     case "check":
-      requireNoExtraArgs(rest, `bun run rig setup ${command}`);
+      requireNoExtraArgs(rest, `rig setup ${command}`);
       {
         const checks = await withMutedConsole(context.outputMode === "json", () => runSetupCheck(context.projectRoot));
         return { ok: true, group: "setup", command, details: { checks, failures: countDoctorFailures(checks) } };
       }
     case "setup":
-      requireNoExtraArgs(rest, "bun run rig setup setup");
+      requireNoExtraArgs(rest, "rig setup setup");
       withMutedConsole(context.outputMode === "json", () => runSetupInit(context.projectRoot));
       return { ok: true, group: "setup", command };
     case "preflight":
-      requireNoExtraArgs(rest, "bun run rig setup preflight");
+      requireNoExtraArgs(rest, "rig setup preflight");
       await withMutedConsole(context.outputMode === "json", () => runSetupPreflight(context.projectRoot));
       return { ok: true, group: "setup", command };
     case "install-agent-shell":
-      requireNoExtraArgs(rest, "bun run rig setup install-agent-shell");
+      requireNoExtraArgs(rest, "rig setup install-agent-shell");
       if (context.outputMode === "text") {
         console.log("install-agent-shell is deprecated. Runtime shells now use compiled rig-agent directly.");
       }
@@ -10710,7 +11322,7 @@ async function executeWorkspace(context, args) {
   const [command = "summary", ...rest] = args;
   switch (command) {
     case "summary": {
-      requireNoExtraArgs(rest, "bun run rig workspace summary");
+      requireNoExtraArgs(rest, "rig workspace summary");
       const summary = await readWorkspaceSummary(context.projectRoot);
       if (context.outputMode === "text") {
         console.log("Workspace Summary");
@@ -10735,7 +11347,7 @@ Warnings:`);
       return { ok: true, group: "workspace", command, details: summary };
     }
     case "topology": {
-      requireNoExtraArgs(rest, "bun run rig workspace topology");
+      requireNoExtraArgs(rest, "rig workspace topology");
       const topology = readWorkspaceTopology(context.projectRoot);
       if (context.outputMode === "text") {
         console.log(`Topology: ${topology.status}`);
@@ -10748,7 +11360,7 @@ Warnings:`);
       return { ok: true, group: "workspace", command, details: topology };
     }
     case "remote-hosts": {
-      requireNoExtraArgs(rest, "bun run rig workspace remote-hosts");
+      requireNoExtraArgs(rest, "rig workspace remote-hosts");
       const fleet = readWorkspaceRemoteFleet(context.projectRoot);
       if (context.outputMode === "text") {
         console.log(`Remote Hosts: ${fleet.status}`);
@@ -10763,7 +11375,7 @@ Warnings:`);
       let pending = serviceRest;
       const services = takeOption(pending, "--service");
       pending = services.rest;
-      requireNoExtraArgs(pending, "bun run rig workspace service-fabric <status|up|verify|down> [--service <name>]");
+      requireNoExtraArgs(pending, "rig workspace service-fabric <status|up|verify|down> [--service <name>]");
       if (action !== "status" && action !== "up" && action !== "verify" && action !== "down") {
         throw new CliError2(`Unknown workspace service-fabric action: ${action}`);
       }
@@ -10784,171 +11396,6 @@ Warnings:`);
   }
 }
 
-// packages/cli/src/commands/_help-catalog.ts
-import pc4 from "picocolors";
-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]"],
-    commands: [
-      { command: "status", description: "Show the selected server for this repo.", primary: true },
-      { command: "list", description: "List saved local/remote server aliases.", primary: true },
-      { command: "add <alias> <url>", description: "Save a remote Rig server URL.", primary: true },
-      { command: "use [alias|local]", description: "Select a server; prompts in an interactive TTY.", primary: true },
-      { command: "start [--host <host>] [--port <n>]", description: "Start a local rig-server process.", primary: true }
-    ],
-    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"
-    ],
-    next: ["Use `rig task list` to see server-owned work.", "Use `rig run list` or `rig run attach <id> --follow` to monitor runs."],
-    advanced: ["Compatibility alias: `rig connect ...` remains callable."]
-  },
-  {
-    name: "task",
-    summary: "Find work, start Pi-backed runs, and validate task results.",
-    usage: ["rig task <list|next|show|run> [options]"],
-    commands: [
-      { command: "list [--assignee <login|@me>] [--state open|closed]", description: "List tasks from the selected server/source.", primary: true },
-      { command: "next [filters]", description: "Pick the next matching task.", primary: true },
-      { command: "show <id>|--task <id>", description: "Show task details.", primary: true },
-      { command: "run [#<issue>|<task-id>|--next|--task <id>]", description: "Submit a task run; interactive follows with bundled Pi.", primary: true },
-      { command: "validate|verify [--task <id>]", description: "Run configured task checks/review gates." },
-      { command: "artifacts|artifact-dir|artifact-write", description: "Inspect or write task artifacts." },
-      { command: "report-bug", description: "Create a structured bug report/task." }
-    ],
-    examples: [
-      "rig task list --assignee @me --limit 20",
-      "rig task run --next",
-      "rig task run #123 --runtime-adapter pi",
-      "rig task run --title 'Investigate deploy drift' --initial-prompt 'Check server health'"
-    ],
-    next: ["Use `--detach` to submit without attaching.", "Use `rig run attach <run-id> --follow` to rejoin a live run."]
-  },
-  {
-    name: "run",
-    summary: "Observe, attach to, and control Rig runs.",
-    usage: ["rig run <list|status|show|attach|stop> [options]"],
-    commands: [
-      { command: "list", description: "List recent runs from the selected server or local state.", primary: true },
-      { command: "status", description: "Summarize active and recent runs.", primary: true },
-      { command: "show --run <id>", description: "Show one run record.", primary: true },
-      { command: "attach <run-id>|--run <id> [--follow]", description: "Attach to the run; `--follow` launches native bundled Pi for live Pi runs.", primary: true },
-      { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
-      { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events." },
-      { command: "delete|cleanup", description: "Remove completed run records/artifacts." }
-    ],
-    examples: [
-      "rig run list",
-      "rig run attach 01234567-89ab-cdef-0123-456789abcdef --follow",
-      "rig run show --run <run-id>",
-      "rig run stop <run-id>"
-    ],
-    next: ["Use `rig task run --next` to create a new run.", "Use `--json` when scripts need the full structured record."]
-  }
-];
-var ADVANCED_GROUPS = [
-  { name: "init", summary: "Initialize or repair Rig project state.", usage: ["rig init [options]"], commands: [{ command: "init", description: "Configure project/server/GitHub integration." }] },
-  { name: "connect", summary: "Compatibility alias for `rig server` selection commands.", usage: ["rig connect <status|list|add|use>"], commands: [{ command: "status|list|add|use", description: "Use `rig server ...` for the primary UX." }] },
-  { name: "github", summary: "GitHub auth helpers.", usage: ["rig github auth <status|import-gh|token>"], commands: [{ command: "auth status", description: "Show GitHub auth state." }] },
-  { name: "doctor", summary: "Diagnostics for project/server/GitHub/Pi state.", usage: ["rig doctor [check|run|shared|...]"], commands: [{ command: "check", description: "Run diagnostics." }] },
-  { name: "setup", summary: "Bootstrap/check local setup.", usage: ["rig setup <bootstrap|check|preflight>"], commands: [{ command: "bootstrap|check|preflight", description: "Setup helpers." }] },
-  { name: "inspect", summary: "Inspect logs, artifacts, graphs, failures.", usage: ["rig inspect <logs|artifacts|failures|graph|audit|diff>"], commands: [{ command: "logs --task <id>", description: "Inspect task logs." }] },
-  { name: "repo", summary: "Repository sync/baseline helpers.", usage: ["rig repo <sync|reset-baseline>"], commands: [{ command: "sync", description: "Sync project repository state." }] },
-  { name: "profile", summary: "Runtime profile/model defaults.", usage: ["rig profile <show|set>"], commands: [{ command: "show", description: "Show active profile." }] },
-  { name: "review", summary: "Review policy configuration.", usage: ["rig review <show|set>"], commands: [{ command: "show", description: "Show review settings." }] },
-  { name: "browser", summary: "Browser/app diagnostics.", usage: ["rig browser <help|explain|demo|app>"], commands: [{ command: "help", description: "Browser command help." }] },
-  { name: "plugin", summary: "Plugin validation/listing.", usage: ["rig plugin <list|validate>"], commands: [{ command: "list", description: "List plugins." }] },
-  { 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: "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: "Legacy remote orchestration controls.", usage: ["rig remote <status|watch|pause|resume|...>"], commands: [{ command: "status", description: "Show remote state." }] },
-  { name: "inbox", summary: "Approval/input inbox for blocked runs.", usage: ["rig inbox <approvals|approve|inputs|respond>"], commands: [{ command: "approvals", description: "List pending approvals." }] },
-  { 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 pc4.bold(pc4.cyan(title));
-}
-function commandLine(command, description) {
-  const commandColumn = command.length >= 34 ? `${command}  ` : command.padEnd(34);
-  return `  ${pc4.bold(commandColumn)} ${description}`;
-}
-function renderGroup(group) {
-  const lines = [
-    `${heading(`rig ${group.name}`)} \u2014 ${group.summary}`,
-    "",
-    pc4.bold("Usage"),
-    ...group.usage.map((line) => `  ${line}`),
-    "",
-    pc4.bold("Commands"),
-    ...group.commands.map((entry) => commandLine(entry.command, entry.description))
-  ];
-  if (group.examples?.length) {
-    lines.push("", pc4.bold("Examples"), ...group.examples.map((line) => `  ${pc4.dim("$")} ${line}`));
-  }
-  if (group.next?.length) {
-    lines.push("", pc4.bold("Next steps"), ...group.next.map((line) => `  ${pc4.dim("\u203A")} ${line}`));
-  }
-  if (group.advanced?.length) {
-    lines.push("", pc4.bold("Compatibility / advanced"), ...group.advanced.map((line) => `  ${pc4.dim("\u203A")} ${line}`));
-  }
-  return lines.join(`
-`);
-}
-function renderTopLevelHelp() {
-  return [
-    `${heading("rig")} \u2014 server-owned task/run control plane`,
-    "",
-    pc4.bold("Common workflows"),
-    "  rig server status                 Show selected local/remote server",
-    "  rig task list                     List available work",
-    "  rig task run --next               Start next task and attach with native Pi",
-    "  rig run list                      List recent runs",
-    "  rig run attach <run-id> --follow  Rejoin a live run",
-    "",
-    pc4.bold("Primary groups"),
-    ...PRIMARY_GROUPS.map((group) => commandLine(group.name, group.summary)),
-    "",
-    pc4.bold("Help"),
-    "  rig <group> --help                Rich help for server, task, run, and other groups",
-    "  rig help --advanced               Legacy/dev/compat command surface",
-    "  rig --version                     Print version",
-    "",
-    pc4.bold("Global options"),
-    "  --project <path>                  Use a project root instead of auto-discovery",
-    "  --json                            Output structured JSON",
-    "  --dry-run                         Print command execution plan only"
-  ].join(`
-`);
-}
-function renderAdvancedHelp() {
-  return [
-    `${heading("rig advanced")} \u2014 legacy, dev, and compatibility groups`,
-    "",
-    pc4.bold("Primary groups are still"),
-    "  server, task, run",
-    "",
-    pc4.bold("Advanced groups"),
-    ...ADVANCED_GROUPS.map((group) => commandLine(group.name, group.summary)),
-    "",
-    pc4.dim("All groups remain callable. Prefer `rig server`, `rig task`, and `rig run` for day-to-day work.")
-  ].join(`
-`);
-}
-function renderGroupHelp(groupName) {
-  const group = ALL_GROUPS.find((candidate) => candidate.name === groupName);
-  return group ? renderGroup(group) : null;
-}
-
 // packages/cli/src/commands.ts
 import { ensureProjectMainFreshBeforeRun as ensureProjectMainFreshBeforeRun2 } from "@rig/runtime/control-plane/project-main-pre-run-sync";
 var TOP_LEVEL_ALIASES = {
@@ -10960,7 +11407,7 @@ var TOP_LEVEL_ALIASES = {
   status: ["run", "status"],
   start: ["task", "run", "--next"],
   "start-parallel": ["run", "start-parallel"],
-  "start-serial": ["task", "run", "--next"],
+  "start-serial": ["run", "start-serial"],
   resume: ["run", "resume"],
   stop: ["run", "stop"],
   ready: ["task", "ready"],
@@ -11016,7 +11463,7 @@ var GROUPS = new Set([
   "test"
 ]);
 function printGroupHelp(group) {
-  console.log(renderGroupHelp(group) ?? helpText());
+  printGroupHelpDocument(group);
 }
 function isHelpArg(arg) {
   return arg === "--help" || arg === "-h" || arg === "help";
@@ -11026,7 +11473,7 @@ function helpText() {
 }
 async function execute(context, args) {
   if (args.length === 0) {
-    console.log(helpText());
+    printTopLevelHelp();
     return { ok: true, group: "help", command: "show" };
   }
   const [first, ...rest] = args;
@@ -11037,14 +11484,14 @@ ${helpText()}`);
   }
   if (first === "help" || first === "--help" || first === "-h") {
     if (rest[0] === "--advanced") {
-      console.log(renderAdvancedHelp());
+      printAdvancedHelp();
       return { ok: true, group: "help", command: "advanced" };
     }
     if (rest[0]) {
-      console.log(renderGroupHelp(rest[0]) ?? helpText());
+      printGroupHelp(rest[0]);
       return { ok: true, group: "help", command: rest[0] };
     }
-    console.log(helpText());
+    printTopLevelHelp();
     return { ok: true, group: "help", command: "show" };
   }
   if (first === "--version" || first === "-V" || first === "version") {