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

package/dist/src/commands/_help-catalog.js

@@ -6,183 +6,177 @@ function helpCatalog() {
 }
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Pi console",
-    subtitle: "the operator surface \u2014 every attach opens the run's FULL Pi session",
+    title: "Open Rig",
+    subtitle: "normal UX \u2014 bare rig opens the bundled Rig Cockpit inside OMP",
     commands: [
-      { command: "rig run attach <run-id>", description: "Open the run's Pi console: complete transcript (live AND finished runs), worker turns streaming in live." },
-      { command: "type a message", description: "Inside the console, plain text steers the worker mid-turn \u2014 it lands in the agent's context, not a local model." },
-      { command: "!<command>", description: "Inside the console, runs shell in the WORKER's workspace; output streams back into the transcript." },
-      { command: "/<command>", description: "The palette includes the WORKER session's slash commands ([worker]-tagged) next to /rig." },
-      { command: "/rig abort | /rig stop", description: "Abort the worker's current turn, or stop the whole run, from inside the console." },
-      { command: "rig run steer <id> --message <text>", description: "Steer without attaching \u2014 queue a message; the worker picks it up within seconds." }
+      { command: "rig", description: "Open Rig Cockpit with OMP collaboration substrate for the current workspace." },
+      { command: "rig --workspace <path>", description: "Open Rig Cockpit for another workspace." },
+      { command: "/rig", description: "Inside OMP, reopen the Rig Cockpit." },
+      { command: "rig join <link>", description: "Join an encrypted OMP collaborative session from another operator." }
     ]
   },
   {
-    title: "Start here",
-    subtitle: "one-time setup, pick a server",
+    title: "Server",
+    subtitle: "select execution placement before reading or dispatching work",
     commands: [
-      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
-      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." },
-      { command: "rig server status", description: "Show the selected server for this repo." }
+      { command: "Cockpit Server", description: "Select/configure local or remote execution placement and the project-root link." },
+      { command: "Server target \u2192 Local", description: "Use local execution placement for the selected project." },
+      { command: "Server target \u2192 Remote", description: "Use remote execution placement with the server-host project root preserved." }
     ]
   },
   {
-    title: "Work",
-    subtitle: "find a task, put an agent on it, answer what it asks",
+    title: "Tasks",
+    subtitle: "configured task source on the selected target feeds task detail",
     commands: [
-      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
-      { command: "rig task run --next", description: "Dispatch an agent on the next ready task; interactive mode drops you into its Pi console." },
-      { command: "rig run status", description: "Active and recent runs at a glance." },
-      { command: "rig run attach <id> --follow", description: "Same as plain attach \u2014 the Pi console is always the interactive surface." },
-      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." }
+      { command: "Cockpit Tasks", description: "List tasks from the selected server target's configured task source." },
+      { command: "Task detail", description: "Review task id, title, body, source status, labels, and issue URL before dispatch." },
+      { command: "Task detail \u2192 Dispatch", description: "Submit the selected task run through the selected target, then attach the collaborative OMP session." },
+      { command: "rig triage", description: "Run the configured issueAnalysis pass once; use cron/launchd/CI to schedule continuous triage." }
     ]
   },
   {
-    title: "Watch",
-    subtitle: "fleet metrics and per-task forensics",
+    title: "Runs",
+    subtitle: "dispatched Rig runs attach through collaborative OMP sessions",
     commands: [
-      { command: "rig stats [--since 7d]", description: "Fleet metrics: completion/failure rates, median run time, steering, stalls." },
-      { command: "rig inspect logs --task <id>", description: "Latest run log for a task." },
-      { command: "rig inspect diff --task <id>", description: "Changed files for a task." }
+      { command: "OMP Runs screen", description: "Open dispatched runs, collaboration links, cwd, identity, status, and inbox counts." },
+      { command: "rig join <link>", description: "Join a shared OMP session without changing execution placement." },
+      { command: "OMP collab guest view", description: "Watch the shared transcript live; write links can prompt the originating session." }
     ]
   },
   {
-    title: "Unblock",
-    subtitle: "diagnose wiring, fix auth",
+    title: "Inbox + Doctor",
+    subtitle: "approvals, user prompts, and health checks live inside Rig/OMP",
     commands: [
-      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
-      { command: "rig github auth status", description: "GitHub auth state on the selected server." }
+      { command: "OMP Inbox screen", description: "Review and answer pending approval/user-input workflow entries." },
+      { command: "/rig inbox", description: "Open the inbox screen from inside OMP." },
+      { command: "OMP Doctor screen", description: "Probe session discovery, collaboration registry, selected target, and workflow-entry health." }
     ]
   },
   {
     title: "Extend",
-    subtitle: "plugins contribute validators, hooks, task sources, commands",
+    subtitle: "plugins and OMP extensions shape the worker environment",
     commands: [
-      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." },
-      { command: "rig plugin run <command-id>", description: "Execute a plugin-contributed CLI command." }
+      { command: "rig.config.ts plugins", description: "Register task sources, validators, hooks, skills, roles, and workflow metadata." },
+      { command: "runtime.pi.packages", description: "Declare team-wide OMP/Pi extension packages for sessions and workers." }
     ]
   }
 ];
 var PRIMARY_GROUPS = [
   {
     name: "server",
-    summary: "Choose, inspect, and start the Rig server that owns tasks and runs.",
-    usage: ["rig server <status|list|add|use|start> [options]"],
+    summary: "Select and configure local vs remote execution placement.",
+    usage: ["rig server <status|list|use|add|remove> [options]"],
     commands: [
-      { command: "status", description: "Show the selected server for this repo.", primary: true },
-      { command: "use local", description: "Switch this repo to the local Rig server.", primary: true },
-      { command: "add <alias> <url>", description: "Save a remote Rig server URL.", primary: true },
-      { command: "use <alias>", description: "Select a saved remote server alias.", primary: true },
-      { command: "list", description: "List saved local/remote server aliases.", primary: true },
-      { command: "start [--host <host>] [--port <n>]", description: "Start a local rig-server process." }
+      { command: "status", description: "Show the selected placement (local or remote alias) and task source.", primary: true },
+      { command: "list", description: "List local plus configured remote endpoints; marks the selected one.", primary: true },
+      { command: "use local|<alias>", description: "Select where runs execute \u2014 local, or a configured remote alias.", primary: true },
+      { command: "add --alias <a> --host <h> [--port <n>] [--token <t>]", description: "Add a remote SSH endpoint (the same store run dispatch resolves).", primary: true },
+      { command: "remove <alias>", description: "Remove a configured remote endpoint." }
     ],
     examples: [
       "rig server status",
-      "rig server add prod https://where.rig-does.work",
-      "rig server use prod",
-      "rig server use local",
-      "rig server start --port 3773"
+      "rig server add --alias prod --host prod.example.com --port 22",
+      "rig server use prod"
     ],
-    next: ["Use `rig task list` to see server-owned work.", "Use `rig run list` or `rig run attach <id> --follow` to monitor runs."]
+    next: [
+      "Placement is read by run dispatch (`rig task run` / `rig run <task>`).",
+      "The same selection is available in-session on the bare `rig` board."
+    ]
   },
   {
     name: "task",
-    summary: "Find work, start Pi-backed runs, and validate task results.",
-    usage: ["rig task <list|next|show|run> [options]"],
+    summary: "Find work, dispatch task runs, and validate task results.",
+    usage: ["rig task <list|next|show|run|ready|validate> [options]"],
     commands: [
-      { command: "list [--assignee <login|me|@me>] [--state open|closed]", description: "List tasks from the selected server/source.", primary: true },
-      { command: "next [filters]", description: "Render the next matching task as a selected-task card.", primary: true },
-      { command: "show <id>|--task <id> [--raw]", description: "Show a human task summary; --raw prints the full payload.", primary: true },
-      { command: "run [#<issue>|<task-id>|--next|--task <id>]", description: "Submit a task run; interactive follows with bundled Pi.", primary: true },
+      { command: "list [--assignee <login|me|@me>] [--state open|closed]", description: "List tasks from the configured task source.", primary: true },
+      { command: "next [filters]", description: "Render the next ready task as a selected-task card.", primary: true },
+      { command: "show <id>|--task <id> [--raw]", description: "Show a task summary; --raw prints the full payload.", primary: true },
+      { command: "run [#<issue>|<task-id>|--task <id>]", description: "Dispatch the task as a detached run; attach with `rig run attach <run-id>`.", primary: true },
       { command: "ready", description: "List task IDs that are runnable now." },
-      { command: "validate|verify [--task <id>]", description: "Run configured task checks/review gates." },
+      { command: "validate|verify [--task <id>]", description: "Run the task's configured checks / review gates." },
       { command: "details --task <id>", description: "Show full task info from the configured source." },
       { command: "reopen [--task <id> | --all] [--reason <text>]", description: "Reopen closed task(s) in the configured source." },
       { command: "artifacts|artifact-dir|artifact-write", description: "Inspect or write task artifacts." },
-      { command: "report-bug", description: "Create a structured bug report/task." }
+      { command: "info [--task <id>]", description: "Show the active/selected task's full runtime info." },
+      { command: "scope [--files] [--task <id>]", description: "Show the task's scope (and changed files with --files)." },
+      { command: "deps [--task <id>]", description: "Show the task's dependency graph." },
+      { command: "status", description: "Show project task-tracker progress." },
+      { command: "lookup <id>", description: "Resolve a task id to its canonical record path." },
+      { command: "record <decision|failure> <text> [--task <id>]", description: "Append a decision or failure note to the task." }
     ],
     examples: [
       "rig task list --assignee @me --limit 20",
-      "rig task next",
       "rig task show 123 --raw",
-      "rig task run --next",
-      "rig task run #123 --runtime-adapter pi",
-      "rig task run --title 'Investigate deploy drift' --initial-prompt 'Check server health'"
+      "rig task run #123"
     ],
-    next: ["Use `--detach` to submit without attaching.", "Use `rig run attach <run-id> --follow` to rejoin a live run."]
+    next: ["The same flow is available in-session: run bare `rig`, then Cockpit Tasks \u2192 Task detail \u2192 Dispatch."]
   },
   {
     name: "run",
-    summary: "Observe, attach to, and control Rig runs. `attach` opens the Pi console \u2014 the full worker session, live.",
-    usage: ["rig run <list|status|show|attach|steer|stop|resume|restart> [options]"],
+    summary: "Observe, attach to, and control runs over the OMP collab substrate.",
+    usage: ["rig run <list|status|start|start-serial|start-parallel|show|attach|steer|stop|resume|restart> [options]"],
     commands: [
-      { command: "list", description: "List recent runs from the selected server or local state.", primary: true },
-      { command: "status", description: "Render active and recent run groups.", primary: true },
-      { command: "show <id>|--run <id> [--raw]", description: "Show a human run summary; --raw prints the full payload.", primary: true },
-      { command: "attach <run-id>|--run <id>", description: "Open the run's Pi console \u2014 see 'Inside the console' below. Works on live AND finished runs.", primary: true },
-      { command: "steer <run-id> --message <text>", description: "Queue a steering message into a live worker without attaching \u2014 delivered into the agent's context within seconds.", primary: true },
-      { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
-      { command: "resume [<run-id>]", description: "Resume an interrupted run on the selected server (defaults to the most recent resumable)." },
-      { command: "restart [<run-id>]", description: "Re-dispatch a run from a clean runtime, reopening its Pi session where possible." },
-      { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events (scripts; humans should attach)." },
-      { command: "replay <run-id>|--run <id> [--with-session]", description: "Print the run's consolidated run.jsonl as a merged timeline; --with-session interleaves the Pi session log." },
-      { command: "delete|cleanup", description: "Remove completed run records/artifacts." }
+      { command: "list", description: "List discoverable runs (relay-registry + on-disk OMP run journals).", primary: true },
+      { command: "status", description: "Render active vs recent runs from the run journals.", primary: true },
+      { command: "start [#<issue>|<task-id>|--next|--task <id>] [--title <t>]", description: "Dispatch one task as a detached run; attach with the printed run id.", primary: true },
+      { command: "start-parallel [--limit <n>]", description: "Dispatch all currently-ready tasks as detached runs (limited when requested).", primary: true },
+      { command: "start-serial", description: "Dispatch the next ready task only; run again after it finishes to continue serially.", primary: true },
+      { command: "show <id>|--run <id> [--raw]", description: "Show a run's folded journal projection; --raw prints JSON.", primary: true },
+      { command: "attach <run-id>|--run <id>", description: "Attach to a live run's collab session (resolves the join link).", primary: true },
+      { command: "resume [<run-id>]", description: "Re-dispatch the run's task as a fresh detached run." },
+      { command: "steer <run-id> --message <text>", description: "Steer a live run via its journal (local runs headless; remote runs attach to steer).", primary: true },
+      { command: "stop [<run-id>|--run <id>] [--reason <text>]", description: "Request graceful stop of a live run (local headless; remote attach to stop).", primary: true },
+      { command: "replay <run-id>|--run <id> [--with-session]", description: "Print the run's consolidated journal timeline." },
+      { command: "delete|cleanup", description: "Remove a finished run's live registry entry." }
     ],
     examples: [
-      "rig run attach <run-id>          # full session console \u2014 live mirror, steering, worker shell",
-      "rig run steer <run-id> --message 'focus on the failing test first'",
-      "rig run list",
-      "rig run show <run-id>",
-      "rig run stop <run-id>"
+      "rig run start --next",
+      "rig run start-parallel --limit 3",
+      "rig run attach <run-id>"
     ],
     next: [
-      "Inside the console: the run's COMPLETE transcript loads on open (finished runs too), and new worker turns stream in live.",
-      "Inside the console: plain text = steering into the worker's context \xB7 !<cmd> = shell in the WORKER workspace \xB7 /<cmd> includes the worker session's commands \xB7 /rig abort stops the current turn.",
-      "The console is read-write but remote-only: nothing runs on your machine; the worker keeps running when you exit.",
-      "Use `rig task run --next` to create a new run; interactive mode drops you straight into its console.",
-      "Use `--json` when scripts need the full structured record."
+      "Attach to steer or stop a live run: rig run attach <run-id>.",
+      "The same runs appear in-session on the bare `rig` board."
     ]
   },
   {
     name: "inbox",
     summary: "Review approval and user-input requests that block worker runs.",
-    usage: ["rig inbox <approvals|approve|inputs|respond> [options]"],
+    usage: ["rig inbox <approvals|inputs|approve|respond> [options]"],
     commands: [
-      { command: "approvals [--run <id>] [--task <id>]", description: "List pending approvals.", primary: true },
-      { command: "inputs [--run <id>] [--task <id>]", description: "List pending user-input requests.", primary: true },
-      { command: "approve --run <id> --request <id> --decision approve|reject", description: "Resolve an approval request." },
-      { command: "respond --run <id> --request <id> --answer key=value", description: "Answer a user-input request." }
+      { command: "approvals [--run <id>] [--task <id>]", description: "List pending approval requests across runs.", primary: true },
+      { command: "inputs [--run <id>] [--task <id>]", description: "List pending user-input requests across runs.", primary: true },
+      { command: "approve --run <id> --request <id> --decision approve|reject", description: "Resolve an approval \u2014 delivered over collab, so attach to resolve." },
+      { command: "respond --run <id> --request <id> --answer key=value", description: "Answer a user-input request \u2014 attach to resolve." }
     ],
     examples: [
       "rig inbox approvals",
-      "rig inbox inputs --run <run-id>",
-      "rig inbox approve --run <run-id> --request <request-id> --decision approve"
+      "rig inbox inputs --run <run-id>"
     ],
-    next: ["Rejoin the run after resolving a block: `rig run attach <run-id> --follow`."]
+    next: ["Resolve a request by attaching to its run: rig run attach <run-id>."]
   },
   {
     name: "stats",
     summary: "Fleet metrics computed from on-disk run journals (no server required).",
     usage: ["rig stats [show] [--since <7d|30d|ISO date>]"],
     commands: [
-      { command: "show [--since <window>]", description: "Total runs, completion/failure/needs-attention rates, median run time, steering, stalls, approvals.", primary: true }
+      { command: "show [--since <window>]", description: "Totals, completion/failure/needs-attention rates, run time, steering, stalls, approvals.", primary: true }
     ],
     examples: [
-      "rig stats",
       "rig stats --since 7d",
-      "rig stats --since 2026-06-01 --json"
+      "rig stats --json"
     ],
-    next: ["Inspect outliers with `rig run list` and `rig run show <run-id>`.", "Use `--json` for the schema'd envelope (see docs/cli-json.md)."]
+    next: ["Inspect outliers with `rig run list` and `rig run show <run-id>`."]
   },
   {
     name: "inspect",
-    summary: "Inspect logs, artifacts, graphs, failures for a task.",
+    summary: "Inspect logs, artifacts, failures, graph, and diffs for a task.",
     usage: ["rig inspect <logs|artifacts|failures|graph|audit|diff> --task <id>"],
     commands: [
-      { command: "logs --task <id>", description: "Latest run log for a task (local or selected server).", primary: true },
+      { command: "logs --task <id>", description: "Latest run log for a task.", primary: true },
       { command: "artifacts --task <id>", description: "List the task's completion artifacts.", primary: true },
+      { command: "diff --task <id>", description: "List files changed by a task.", primary: true },
       { command: "failures --task <id>", description: "Recorded failures for a task.", primary: true },
-      { command: "diff --task <id>", description: "Changed files for a task.", primary: true },
       { command: "graph", description: "Task dependency graph." },
       { command: "audit", description: "Controlled-command audit trail." }
     ],
@@ -212,72 +206,75 @@ var PRIMARY_GROUPS = [
   },
   {
     name: "init",
-    summary: "Set up Rig for this repo: server, GitHub auth, checkout strategy, task source, and Pi wiring.",
+    summary: "Legacy automation-only config bootstrap/repair helper; not root onboarding.",
     usage: ["rig init [--yes] [--server local|remote] [--repo owner/repo] [--remote-url <url>]"],
     commands: [
-      { command: "init", description: "Interactive setup wizard for a new or existing Rig repo.", primary: true },
-      { command: "init --demo", description: "Offline demo project: files task source + 3 sample tasks, zero GitHub.", primary: true },
-      { command: "init --yes", description: "Non-interactive setup using detected/default settings.", primary: true },
-      { command: "init --server remote --remote-url <url>", description: "Link this repo to a remote Rig server.", primary: true },
-      { command: "init --repair", description: "Repair missing private state without replacing project config." }
+      { command: "init", description: "Legacy/fenced setup wizard for compatibility projects; not onboarding.", primary: true },
+      { command: "init --demo", description: "Legacy/fenced offline demo project for compatibility tests.", primary: true },
+      { command: "init --yes", description: "Legacy/fenced non-interactive setup for old automation.", primary: true },
+      { command: "init --server remote --remote-url <url>", description: "Legacy/fenced remote server link setup.", primary: true },
+      { command: "init --repair", description: "Legacy/fenced repair of missing private compatibility state." }
     ],
     examples: [
-      "rig init",
-      "rig init --demo",
-      "rig init --yes --repo humanity-org/humanwork",
-      "rig init --server remote --remote-url https://where.rig-does.work --repo owner/repo"
+      "rig init --demo   # legacy compatibility only",
+      "rig init --repair # legacy compatibility only"
     ],
-    next: ["After init, run `rig server status`.", "Then use `rig task list` and `rig task run --next` for day-to-day work."]
+    next: ["For onboarding and normal UX, run bare `rig`, then use Cockpit Server/Tasks and dispatch from Task detail."]
   },
   {
     name: "doctor",
-    summary: "Diagnostics for project/server/GitHub/Pi state.",
+    summary: "Diagnostic-only compatibility checks; normal health lives in the OMP Doctor screen.",
     usage: ["rig doctor"],
     commands: [
-      { command: "doctor", description: "Run setup and runtime diagnostics.", primary: true },
-      { command: "check", description: "Compatibility spelling for diagnostics." }
+      { command: "doctor", description: "Diagnostic/legacy-only: check compatibility setup/runtime state; not onboarding.", primary: true },
+      { command: "check", description: "Diagnostic/legacy-only spelling for compatibility checks." }
     ],
-    examples: ["rig doctor", "rig doctor --json"],
-    next: ["Use `rig server status` and `rig github auth status` to inspect common failure points."]
+    examples: ["rig doctor --json # legacy diagnostic automation only"],
+    next: ["For normal UX, use the OMP Doctor screen."]
   },
   {
     name: "github",
-    summary: "GitHub auth helpers for the selected Rig server.",
+    summary: "Legacy automation-only GitHub auth helpers for selected compatibility servers.",
     usage: ["rig github auth <status|import-gh|token>"],
     commands: [
-      { command: "auth status", description: "Show GitHub auth state.", primary: true },
-      { command: "auth import-gh", description: "Import the current `gh` token into the selected server." },
-      { command: "auth token --token <token>", description: "Store a token on the selected server." }
+      { command: "auth status", description: "Legacy automation-only: show GitHub auth state.", primary: true },
+      { command: "auth import-gh", description: "Legacy automation-only: import the current `gh` token into the selected server." },
+      { command: "auth token --token <token>", description: "Legacy automation-only: store a token on the selected server." }
     ],
-    examples: ["rig github auth status", "rig github auth import-gh"],
-    next: ["After auth is valid, use `rig task run --next`."]
+    examples: ["rig github auth status # legacy automation only"],
+    next: ["For normal UX, use bare `rig` and the OMP extension cockpit."]
   }
 ];
 var ADVANCED_GROUPS = [
-  { name: "setup", summary: "Bootstrap/check local setup.", usage: ["rig setup <bootstrap|check|preflight>"], commands: [{ command: "bootstrap|check|preflight", description: "Setup helpers." }] },
-  { name: "profile", summary: "Runtime profile/model defaults.", usage: ["rig profile <show|set>"], commands: [{ command: "show", description: "Show active profile." }] },
+  {
+    name: "setup",
+    summary: "Legacy automation-only setup bootstrap/check helpers.",
+    usage: ["rig setup <bootstrap|check|preflight>"],
+    commands: [
+      { command: "bootstrap", description: "Legacy automation-only: bootstrap local setup dependencies.", primary: true },
+      { command: "check", description: "Legacy automation-only: check local setup state (toolchain, deps, config).", primary: true },
+      { command: "preflight", description: "Legacy automation-only: run preflight checks before an old run.", primary: true }
+    ]
+  },
+  {
+    name: "profile",
+    summary: "Runtime profile/model defaults.",
+    usage: ["rig profile <show|set>"],
+    commands: [
+      { command: "show", description: "Show the active execution profile.", primary: true },
+      { command: "set [--model <model>] [--runtime <runtime>] [--plugin <plugin>]", description: "Set model/runtime/plugin profile defaults.", primary: true }
+    ]
+  },
   {
     name: "review",
     summary: "Inspect or change completion review gate policy.",
     usage: ["rig review <show|set>"],
     commands: [
       { command: "show", description: "Show current review gate settings." },
-      { command: "set <off|advisory|required> [--provider greptile]", description: "Change review strictness/provider." }
+      { command: "set <off|advisory|required> [--provider <provider>]", description: "Change review strictness/provider (e.g. --provider greptile)." }
     ],
     examples: ["rig review show", "rig review set required --provider greptile"],
-    next: ["Use `rig inbox approvals` for blocked run handoffs."]
-  },
-  {
-    name: "browser",
-    summary: "Browser/app diagnostics for browser-required tasks.",
-    usage: ["rig browser <help|explain|demo|app|hp-next> [options]"],
-    commands: [
-      { command: "help", description: "Rich browser command help (canonical: `rig browser help`)." },
-      { command: "explain", description: "Explain the browser-required task contract." },
-      { command: "demo", description: "Run browser demo flows against a local page." },
-      { command: "app", description: "Launch the Rig Browser workstation app." },
-      { command: "hp-next <dev|check|e2e|reset>", description: "Drive the hp-next browser test harness." }
-    ]
+    next: ["For normal workflow handoffs, use the OMP Inbox screen."]
   },
   {
     name: "pi",
@@ -292,21 +289,79 @@ var ADVANCED_GROUPS = [
     examples: ["rig pi search subagents", "rig pi add pi-subagents", "rig pi list"],
     next: ["Config-managed extensions: declare `runtime: { pi: { packages: [...] } }` in rig.config.ts \u2014 workers pick them up automatically."]
   },
-  { name: "queue", summary: "Run task queues locally.", usage: ["rig queue run [options]"], commands: [{ command: "run", description: "Process queue work." }] },
-  { name: "agent", summary: "Runtime agent workspace helpers.", usage: ["rig agent <list|prepare|run|cleanup>"], commands: [{ command: "list", description: "List prepared agents." }] },
+  {
+    name: "queue",
+    summary: "Run task queues locally.",
+    usage: ["rig queue run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]"],
+    commands: [
+      { command: "run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]", description: "Process queue work: drain matching tasks with N workers, optional per-task action and isolation.", primary: true }
+    ]
+  },
+  {
+    name: "agent",
+    summary: "Runtime agent workspace helpers.",
+    usage: ["rig agent <list|prepare|run|cleanup>"],
+    commands: [
+      { command: "list", description: "List prepared agent runtimes.", primary: true },
+      { command: "prepare [--id <id>] [--mode <mode>] [--task <task>]", description: "Prepare an isolated agent runtime workspace.", primary: true },
+      { command: "run [--id <id>] [--mode <mode>] [--task <task>] [--skip-project-sync]", description: "Prepare (if needed) and run an agent in its workspace.", primary: true },
+      { command: "cleanup [--all] [--id <id>]", description: "Remove prepared agent workspaces.", primary: true }
+    ]
+  },
   { name: "inspector", summary: "Event stream and drift scanners.", usage: ["rig inspector <stream|scan-upstream-drift>"], commands: [{ command: "stream", description: "Stream events." }] },
-  { name: "dist", summary: "Build/install packaged Rig CLI.", usage: ["rig dist <build|install|doctor>"], commands: [{ command: "build", description: "Build distribution." }] },
-  { name: "workspace", summary: "Workspace topology/service helpers.", usage: ["rig workspace <summary|topology|remote-hosts>"], commands: [{ command: "summary", description: "Show workspace summary." }] },
-  { name: "remote", summary: "Compatibility remote orchestration controls.", usage: ["rig remote <status|watch|pause|resume|...>"], commands: [{ command: "status", description: "Show remote state." }] },
+  {
+    name: "dist",
+    summary: "Build/install packaged Rig CLI.",
+    usage: ["rig dist <build|install|doctor|rebuild-agent>"],
+    commands: [
+      { command: "build [--output-dir <dir>]", description: "Build the distributable Rig CLI.", primary: true },
+      { command: "install [--scope <scope>] [--path <path>]", description: "Install the built CLI to a scope/path.", primary: true },
+      { command: "doctor", description: "Diagnose the dist toolchain and install state.", primary: true },
+      { command: "rebuild-agent", description: "Rebuild the agent runtime image, pruning stale images.", primary: true }
+    ]
+  },
+  {
+    name: "workspace",
+    summary: "Workspace topology/service helpers.",
+    usage: ["rig workspace <summary|topology|remote-hosts|service-fabric>"],
+    commands: [
+      { command: "summary", description: "Show workspace summary.", primary: true },
+      { command: "topology", description: "List discovered workspace services.", primary: true },
+      { command: "remote-hosts", description: "List configured remote workspace hosts.", primary: true },
+      { command: "service-fabric <status|up|verify|down> [--service <name>]", description: "Inspect or mutate the workspace service fabric.", primary: true }
+    ]
+  },
+  {
+    name: "remote",
+    summary: "Legacy automation-only remote orchestration controls.",
+    usage: ["rig remote <status|tasks|watch|pause|resume|continue|stop|refresh|add-iterations|remove-iterations|endpoint ...>"],
+    commands: [
+      { command: "status [--remote <alias>]", description: "Legacy automation-only: show old remote orchestration state.", primary: true },
+      { command: "tasks [--remote <alias>]", description: "Legacy automation-only: list the old remote's tracked tasks.", primary: true },
+      { command: "watch [--remote <alias>] [--seconds <n>] [--event <type>]", description: "Legacy automation-only: stream old remote orchestration events.", primary: true },
+      { command: "pause [--remote <alias>]", description: "Legacy automation-only: pause old remote orchestration.", primary: true },
+      { command: "resume [--remote <alias>] [--max-workers <n>] [--max-iterations <n>] [--direct-merge]", description: "Legacy automation-only: resume old remote orchestration with optional tuning.", primary: true },
+      { command: "continue [--remote <alias>]", description: "Legacy automation-only: continue a paused old remote.", primary: true },
+      { command: "stop [--remote <alias>]", description: "Legacy automation-only: stop old remote orchestration.", primary: true },
+      { command: "refresh [--remote <alias>]", description: "Legacy automation-only: refresh old remote state.", primary: true },
+      { command: "add-iterations [--count <n>] [--remote <alias>]", description: "Legacy automation-only: grant an old remote more iterations.", primary: true },
+      { command: "remove-iterations [--count <n>] [--remote <alias>]", description: "Legacy automation-only: reduce an old remote's iteration budget.", primary: true },
+      { command: "endpoint list", description: "Legacy automation-only: list configured remote endpoints.", primary: true },
+      { command: "endpoint add --alias <alias> --host <host> --port <n> [--token <token>]", description: "Legacy automation-only: register a remote endpoint.", primary: true },
+      { command: "endpoint remove --alias <alias>", description: "Legacy automation-only: remove a remote endpoint.", primary: true },
+      { command: "endpoint test [--alias <alias>]", description: "Legacy diagnostic-only: test connectivity to a remote endpoint.", primary: true },
+      { command: "endpoint doctor", description: "Legacy diagnostic-only: diagnose remote endpoint configuration.", primary: true }
+    ]
+  },
   { name: "git", summary: "Pass through to Rig git-flow helper.", usage: ["rig git <args...>"], commands: [{ command: "<args...>", description: "Advanced git flow operations." }] },
   { name: "harness", summary: "Pass through to runtime harness CLI.", usage: ["rig harness <args...>"], commands: [{ command: "<args...>", description: "Advanced harness operations." }] },
   { name: "test", summary: "Project test wrappers.", usage: ["rig test <unit|e2e|all>"], commands: [{ command: "all", description: "Run configured project tests." }] }
 ];
 var 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: "Local epic queue starters (server-owned tasks use `rig task run ...`)." },
-  { command: "rig remote orchestrate-*", description: "Compatibility remote orchestration commands." }
+  { command: "rig server task-run ...", description: "Internal legacy server-owned task execution entry point." },
+  { command: "rig server notify-test [--event <type>]", description: "Internal diagnostic event notification smoke command." },
+  { command: "rig run start|start-serial|start-parallel", description: "Dispatch task runs over the current local/remote run substrate." },
+  { command: "rig remote orchestrate-*", description: "Legacy automation-only remote orchestration commands." }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
@@ -325,8 +380,8 @@ function renderRigBanner(version) {
     y("    \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D") + d("   \u2592\u2591"),
     y("    \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D "),
     "",
-    `    ${c("\u25E2\u25E4")} ${pc.bold("the control rig for autonomous coding agents")} ${m("//")} ${d("you are the operator")}`,
-    version ? `    ${d(`v${version} \xB7 jack in: rig task run --next`)}` : `    ${d("jack in: rig task run --next")}`
+    `    ${c("\u25E2\u25E4")} ${pc.bold("OMP extension cockpit for autonomous coding agents")} ${m("//")} ${d("you are the operator")}`,
+    version ? `    ${d(`v${version} \xB7 jack in: rig`)}` : `    ${d("jack in: rig")}`
   ];
   return lines.join(`
 `);
@@ -363,29 +418,32 @@ function renderGroup(group) {
 }
 function renderTopLevelHelp() {
   return [
-    `${heading("rig")} ${pc.dim("\u2014 server-owned task/run control plane for Pi-backed engineering work")}`,
-    pc.dim("The loop: pick a task, dispatch an agent, open its Pi console (`rig run attach <id>`) to watch and steer it live, clear inbox gates, merge."),
+    `${heading("rig")} ${pc.dim("\u2014 Rig Cockpit for autonomous coding agents")}`,
+    pc.dim("The loop: bare `rig` \u2192 Cockpit \u2192 Server target \u2192 Tasks \u2192 Task detail \u2192 Dispatch/Attach; every run uses OMP collaboration as the session substrate."),
     "",
     ...TOP_LEVEL_SECTIONS.flatMap((section) => [
       `${pc.bold(pc.magenta(`\u25C7 ${section.title}`))} \u2014 ${pc.dim(section.subtitle)}`,
       renderCommandBlock(section.commands),
       ""
     ]),
-    pc.dim("More: `rig help --advanced` for dev/compatibility commands; `rig <group> --help` for rich per-group help; `rig --version` for the installed version."),
+    pc.dim("More: `rig help --advanced` for fenced legacy/diagnostic commands; `rig <group> --help` for per-group compatibility help; `rig --version` for the installed version."),
     "",
-    pc.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.")
+    pc.bold("Root options"),
+    commandLine("--workspace <path>", "Open Rig Cockpit for a workspace instead of the current directory."),
+    commandLine("--json", "Compatibility flag for fenced legacy/diagnostic subcommands."),
+    commandLine("--dry-run", "Compatibility flag for fenced legacy/diagnostic subcommands.")
   ].join(`
 `).trimEnd();
 }
 function renderAdvancedHelp() {
   return [
-    `${heading("rig advanced")} \u2014 compatibility, diagnostics, and internal surfaces`,
+    `${heading("rig advanced")} \u2014 fenced legacy compatibility, diagnostics, and internal surfaces`,
+    "",
+    pc.bold("Normal public UX"),
+    "  rig, rig --workspace <path>, rig join <collab-link>, and /rig inside OMP",
     "",
-    pc.bold("Primary groups"),
-    "  init, server, task, run, inbox, repo, plugin, inspect, stats, doctor, github",
+    pc.bold("Legacy/diagnostic groups"),
+    "  init, server, task, run, inbox, inspect, stats, doctor, github, setup, remote",
     "",
     pc.bold("Advanced commands"),
     ...ADVANCED_COMMANDS.map((entry) => commandLine(entry.command, entry.description)),
@@ -393,7 +451,7 @@ function renderAdvancedHelp() {
     pc.bold("Advanced groups"),
     ...ADVANCED_GROUPS.map((group) => commandLine(group.name, group.summary)),
     "",
-    pc.dim("All groups remain callable. Prefer `rig server`, `rig task`, `rig run`, and `rig inbox` for day-to-day work.")
+    pc.dim("Legacy groups remain callable for old automation and diagnostics. Prefer bare `rig` and the OMP cockpit for day-to-day work.")
   ].join(`
 `);
 }
@@ -404,11 +462,13 @@ function renderGroupHelp(groupName) {
 function listHelpGroups() {
   return ALL_GROUPS.map((group) => group.name);
 }
-function suggestGroupCommandForWord(word) {
+function suggestGroupCommandForWord(word, liveGroups) {
   const normalized = word.trim().toLowerCase();
   if (!normalized)
     return null;
   for (const group of ALL_GROUPS) {
+    if (liveGroups && !liveGroups.has(group.name))
+      continue;
     for (const entry of group.commands) {
       const firstToken = entry.command.split(/\s+/)[0] ?? "";
       const names = firstToken.split("|").map((name) => name.trim().toLowerCase());