@h-rig/cli 0.0.6-alpha.36 → 0.0.6-alpha.38

package/dist/bin/rig.js

@@ -531,7 +531,8 @@ import { loadPolicy as loadPolicy3 } from "@rig/runtime/control-plane/runtime/gu
 // packages/cli/src/commands.ts
 init_runner();
 import {
-  existsSync as existsSync16
+  existsSync as existsSync16,
+  readFileSync as readFileSync12
 } from "fs";
 import { resolve as resolve25 } from "path";
 import { readBuildConfig } from "@rig/runtime/build-time-config";
@@ -6305,6 +6306,7 @@ ${acceptance}` : null,
 ${sourceContractLines.join(`
 `)}` : null,
     scopeText || renderSourceScopeValidation(sourceTask, sourceValidation) || null,
+    readPriorPrProgressForPrompt(input.projectRoot, input.taskId),
     initialPrompt ? `Additional operator guidance:
 ${initialPrompt}` : null,
     providerLines.length > 0 ? `Provider-specific runtime tooling:
@@ -6314,6 +6316,26 @@ ${providerLines.join(" ")}` : null,
 
 `);
 }
+function readPriorPrProgressForPrompt(projectRoot, taskId) {
+  for (const candidate of [
+    resolve20(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve20(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    try {
+      const raw = JSON.parse(readFileSync8(candidate, "utf8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 function firstPromptString(...values) {
   for (const value of values) {
     const trimmed = typeof value === "string" ? value.trim() : "";
@@ -8715,52 +8737,50 @@ import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@c
 import pc4 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Server",
-    subtitle: "choose the local or remote Rig server that owns this repo",
+    title: "Start here",
+    subtitle: "one-time setup for a 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." }
+      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
+      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
+      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." }
     ]
   },
   {
-    title: "Tasks",
-    subtitle: "find work, inspect it, and submit Pi-backed workers",
+    title: "Work",
+    subtitle: "find a task and put an agent on it",
     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." }
+      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
+      { command: "rig task next", description: "The next ready task, as a card." },
+      { command: "rig task run --next", description: "Dispatch an agent; interactive mode opens the native Pi session." },
+      { command: "rig task run <id> --detach", description: "Fire-and-forget a specific task." }
     ]
   },
   {
-    title: "Runs",
-    subtitle: "observe, attach to, and stop live or recent runs",
+    title: "Watch & steer",
+    subtitle: "live runs are observable and steerable, attached or not",
     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." }
+      { command: "rig run status", description: "Active and recent runs at a glance." },
+      { command: "rig run attach <id> --follow", description: "Join the live Pi session (worker keeps running if you /detach)." },
+      { command: "rig run steer <id> -m <text>", description: "Drop a message into a live worker without attaching." },
+      { command: "rig run stop <id>", description: "Cancel a running worker." }
     ]
   },
   {
-    title: "Review / inbox",
-    subtitle: "clear blocked runs and configure completion review",
+    title: "Unblock & gate",
+    subtitle: "answer what workers ask; control what merges",
     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." }
+      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." },
+      { command: "rig inbox inputs", description: "Questions workers asked (then `rig inbox respond \u2026`)." },
+      { command: "rig review show|set", description: "The completion review gate (Greptile is mandatory on merges)." }
     ]
   },
   {
-    title: "Health / setup",
-    subtitle: "bootstrap and diagnose the repo/server/GitHub/Pi path",
+    title: "Extend",
+    subtitle: "more Pi, more plugins",
     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." }
+      { command: "rig pi search <term>", description: "Discover community Pi extensions on npm." },
+      { command: "rig pi add <pkg>", description: "Add a Pi extension to this project (workers pick it up too)." },
+      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." }
     ]
   }
 ];
@@ -8910,7 +8930,19 @@ var PRIMARY_GROUPS = [
 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: "inspect",
+    summary: "Inspect logs, artifacts, graphs, failures 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)." },
+      { command: "artifacts --task <id>", description: "List the task's completion artifacts." },
+      { command: "failures --task <id>", description: "Recorded failures for a task." },
+      { command: "graph", description: "Task dependency graph." },
+      { command: "audit", description: "Controlled-command audit trail." },
+      { command: "diff --task <id>", description: "Changed files for a task." }
+    ]
+  },
   { 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." }] },
   {
@@ -8961,13 +8993,32 @@ var ADVANCED_GROUPS = [
 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 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." }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
   return pc4.bold(pc4.cyan(title));
 }
+function renderRigBanner(version) {
+  const m = (s) => pc4.bold(pc4.magenta(s));
+  const c = (s) => pc4.bold(pc4.cyan(s));
+  const y = (s) => pc4.yellow(s);
+  const d = (s) => pc4.dim(s);
+  const lines = [
+    m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
+    m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
+    c("    \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557") + d("    \u2591\u2592"),
+    c("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551") + d(" \u2588\u2593\u2591"),
+    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")} ${pc4.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")}`
+  ];
+  return lines.join(`
+`);
+}
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
   return `${pc4.dim("\u2502")} ${pc4.bold(commandColumn)} ${description}`;
@@ -9041,12 +9092,25 @@ function renderGroupHelp(groupName) {
 function shouldUseClackOutput2() {
   return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
 }
-function printTopLevelHelp() {
+function printTopLevelHelp(state = {}) {
   if (!shouldUseClackOutput2()) {
     console.log(renderTopLevelHelp());
     return;
   }
-  intro3("rig");
+  console.log(renderRigBanner(state.version));
+  console.log("");
+  if (state.projectInitialized === false) {
+    intro3("no rig project in this directory");
+    note4([
+      commandLine("rig init", "Set this repo up: config, GitHub auth, task source, server, Pi."),
+      commandLine("rig init --yes", "Same, non-interactive, sensible defaults."),
+      commandLine("rig doctor", "Already initialized somewhere else? Check the wiring.")
+    ].join(`
+`), "Get started");
+    outro3("After init: rig task run --next puts an agent on your next task.");
+    return;
+  }
+  intro3(state.selectedServer ? `server: ${state.selectedServer}` : "rig");
   for (const section of TOP_LEVEL_SECTIONS) {
     note4(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
   }
@@ -9057,7 +9121,7 @@ function printTopLevelHelp() {
     commandLine("--dry-run", "Print the command plan without mutating state.")
   ].join(`
 `), "Global options");
-  outro3("Server \u2192 task \u2192 run \u2192 inbox/review.");
+  outro3("init \u2192 task run \u2192 watch/steer \u2192 inbox/review \u2192 merged.");
 }
 function printAdvancedHelp() {
   if (!shouldUseClackOutput2()) {
@@ -11923,9 +11987,23 @@ function isHelpArg(arg) {
 function helpText() {
   return renderTopLevelHelp();
 }
+function resolveTopLevelLaunchState(context) {
+  const projectInitialized = hasInitializedRigProject(context.projectRoot);
+  let selectedServer = null;
+  if (projectInitialized) {
+    try {
+      const statePath = resolve25(context.projectRoot, ".rig", "state", "connection.json");
+      if (existsSync16(statePath)) {
+        const parsed = JSON.parse(readFileSync12(statePath, "utf-8"));
+        selectedServer = parsed.remoteUrl || parsed.url || parsed.selected || null;
+      }
+    } catch {}
+  }
+  return { projectInitialized, selectedServer, version: process.env.RIG_CLI_VERSION || readBuildConfig().RIG_CLI_VERSION || undefined };
+}
 async function execute(context, args) {
   if (args.length === 0) {
-    printTopLevelHelp();
+    printTopLevelHelp(resolveTopLevelLaunchState(context));
     return { ok: true, group: "help", command: "show" };
   }
   const [first, ...rest] = args;

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

@@ -4,52 +4,50 @@ import { intro, log, note, outro } from "@clack/prompts";
 import pc from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Server",
-    subtitle: "choose the local or remote Rig server that owns this repo",
+    title: "Start here",
+    subtitle: "one-time setup for a 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." }
+      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
+      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
+      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." }
     ]
   },
   {
-    title: "Tasks",
-    subtitle: "find work, inspect it, and submit Pi-backed workers",
+    title: "Work",
+    subtitle: "find a task and put an agent on it",
     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." }
+      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
+      { command: "rig task next", description: "The next ready task, as a card." },
+      { command: "rig task run --next", description: "Dispatch an agent; interactive mode opens the native Pi session." },
+      { command: "rig task run <id> --detach", description: "Fire-and-forget a specific task." }
     ]
   },
   {
-    title: "Runs",
-    subtitle: "observe, attach to, and stop live or recent runs",
+    title: "Watch & steer",
+    subtitle: "live runs are observable and steerable, attached or not",
     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." }
+      { command: "rig run status", description: "Active and recent runs at a glance." },
+      { command: "rig run attach <id> --follow", description: "Join the live Pi session (worker keeps running if you /detach)." },
+      { command: "rig run steer <id> -m <text>", description: "Drop a message into a live worker without attaching." },
+      { command: "rig run stop <id>", description: "Cancel a running worker." }
     ]
   },
   {
-    title: "Review / inbox",
-    subtitle: "clear blocked runs and configure completion review",
+    title: "Unblock & gate",
+    subtitle: "answer what workers ask; control what merges",
     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." }
+      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." },
+      { command: "rig inbox inputs", description: "Questions workers asked (then `rig inbox respond \u2026`)." },
+      { command: "rig review show|set", description: "The completion review gate (Greptile is mandatory on merges)." }
     ]
   },
   {
-    title: "Health / setup",
-    subtitle: "bootstrap and diagnose the repo/server/GitHub/Pi path",
+    title: "Extend",
+    subtitle: "more Pi, more plugins",
     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." }
+      { command: "rig pi search <term>", description: "Discover community Pi extensions on npm." },
+      { command: "rig pi add <pkg>", description: "Add a Pi extension to this project (workers pick it up too)." },
+      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." }
     ]
   }
 ];
@@ -199,7 +197,19 @@ var PRIMARY_GROUPS = [
 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: "inspect",
+    summary: "Inspect logs, artifacts, graphs, failures 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)." },
+      { command: "artifacts --task <id>", description: "List the task's completion artifacts." },
+      { command: "failures --task <id>", description: "Recorded failures for a task." },
+      { command: "graph", description: "Task dependency graph." },
+      { command: "audit", description: "Controlled-command audit trail." },
+      { command: "diff --task <id>", description: "Changed files for a task." }
+    ]
+  },
   { 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." }] },
   {
@@ -250,13 +260,32 @@ var ADVANCED_GROUPS = [
 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 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." }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
   return pc.bold(pc.cyan(title));
 }
+function renderRigBanner(version) {
+  const m = (s) => pc.bold(pc.magenta(s));
+  const c = (s) => pc.bold(pc.cyan(s));
+  const y = (s) => pc.yellow(s);
+  const d = (s) => pc.dim(s);
+  const lines = [
+    m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
+    m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
+    c("    \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557") + d("    \u2591\u2592"),
+    c("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551") + d(" \u2588\u2593\u2591"),
+    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")}`
+  ];
+  return lines.join(`
+`);
+}
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
   return `${pc.dim("\u2502")} ${pc.bold(commandColumn)} ${description}`;
@@ -333,12 +362,25 @@ function listHelpGroups() {
 function shouldUseClackOutput() {
   return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
 }
-function printTopLevelHelp() {
+function printTopLevelHelp(state = {}) {
   if (!shouldUseClackOutput()) {
     console.log(renderTopLevelHelp());
     return;
   }
-  intro("rig");
+  console.log(renderRigBanner(state.version));
+  console.log("");
+  if (state.projectInitialized === false) {
+    intro("no rig project in this directory");
+    note([
+      commandLine("rig init", "Set this repo up: config, GitHub auth, task source, server, Pi."),
+      commandLine("rig init --yes", "Same, non-interactive, sensible defaults."),
+      commandLine("rig doctor", "Already initialized somewhere else? Check the wiring.")
+    ].join(`
+`), "Get started");
+    outro("After init: rig task run --next puts an agent on your next task.");
+    return;
+  }
+  intro(state.selectedServer ? `server: ${state.selectedServer}` : "rig");
   for (const section of TOP_LEVEL_SECTIONS) {
     note(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
   }
@@ -349,7 +391,7 @@ function printTopLevelHelp() {
     commandLine("--dry-run", "Print the command plan without mutating state.")
   ].join(`
 `), "Global options");
-  outro("Server \u2192 task \u2192 run \u2192 inbox/review.");
+  outro("init \u2192 task run \u2192 watch/steer \u2192 inbox/review \u2192 merged.");
 }
 function printAdvancedHelp() {
   if (!shouldUseClackOutput()) {
@@ -393,6 +435,7 @@ function printGroupHelpDocument(groupName) {
 }
 export {
   renderTopLevelHelp,
+  renderRigBanner,
   renderGroupHelp,
   renderAdvancedHelp,
   printTopLevelHelp,

package/dist/src/commands/_run-driver-helpers.js

@@ -205,6 +205,7 @@ ${acceptance}` : null,
 ${sourceContractLines.join(`
 `)}` : null,
     scopeText || renderSourceScopeValidation(sourceTask, sourceValidation) || null,
+    readPriorPrProgressForPrompt(input.projectRoot, input.taskId),
     initialPrompt ? `Additional operator guidance:
 ${initialPrompt}` : null,
     providerLines.length > 0 ? `Provider-specific runtime tooling:
@@ -214,6 +215,26 @@ ${providerLines.join(" ")}` : null,
 
 `);
 }
+function readPriorPrProgressForPrompt(projectRoot, taskId) {
+  for (const candidate of [
+    resolve3(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve3(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    try {
+      const raw = JSON.parse(readFileSync(candidate, "utf8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 function firstPromptString(...values) {
   for (const value of values) {
     const trimmed = typeof value === "string" ? value.trim() : "";

package/dist/src/commands/task-run-driver.js

@@ -314,6 +314,7 @@ ${acceptance}` : null,
 ${sourceContractLines.join(`
 `)}` : null,
     scopeText || renderSourceScopeValidation(sourceTask, sourceValidation) || null,
+    readPriorPrProgressForPrompt(input.projectRoot, input.taskId),
     initialPrompt ? `Additional operator guidance:
 ${initialPrompt}` : null,
     providerLines.length > 0 ? `Provider-specific runtime tooling:
@@ -323,6 +324,26 @@ ${providerLines.join(" ")}` : null,
 
 `);
 }
+function readPriorPrProgressForPrompt(projectRoot, taskId) {
+  for (const candidate of [
+    resolve3(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve3(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    try {
+      const raw = JSON.parse(readFileSync(candidate, "utf8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 function firstPromptString(...values) {
   for (const value of values) {
     const trimmed = typeof value === "string" ? value.trim() : "";

package/dist/src/commands/task.js

@@ -1874,52 +1874,50 @@ import { intro, log as log2, note as note2, outro } from "@clack/prompts";
 import pc2 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Server",
-    subtitle: "choose the local or remote Rig server that owns this repo",
+    title: "Start here",
+    subtitle: "one-time setup for a 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." }
+      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
+      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
+      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." }
     ]
   },
   {
-    title: "Tasks",
-    subtitle: "find work, inspect it, and submit Pi-backed workers",
+    title: "Work",
+    subtitle: "find a task and put an agent on it",
     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." }
+      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
+      { command: "rig task next", description: "The next ready task, as a card." },
+      { command: "rig task run --next", description: "Dispatch an agent; interactive mode opens the native Pi session." },
+      { command: "rig task run <id> --detach", description: "Fire-and-forget a specific task." }
     ]
   },
   {
-    title: "Runs",
-    subtitle: "observe, attach to, and stop live or recent runs",
+    title: "Watch & steer",
+    subtitle: "live runs are observable and steerable, attached or not",
     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." }
+      { command: "rig run status", description: "Active and recent runs at a glance." },
+      { command: "rig run attach <id> --follow", description: "Join the live Pi session (worker keeps running if you /detach)." },
+      { command: "rig run steer <id> -m <text>", description: "Drop a message into a live worker without attaching." },
+      { command: "rig run stop <id>", description: "Cancel a running worker." }
     ]
   },
   {
-    title: "Review / inbox",
-    subtitle: "clear blocked runs and configure completion review",
+    title: "Unblock & gate",
+    subtitle: "answer what workers ask; control what merges",
     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." }
+      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." },
+      { command: "rig inbox inputs", description: "Questions workers asked (then `rig inbox respond \u2026`)." },
+      { command: "rig review show|set", description: "The completion review gate (Greptile is mandatory on merges)." }
     ]
   },
   {
-    title: "Health / setup",
-    subtitle: "bootstrap and diagnose the repo/server/GitHub/Pi path",
+    title: "Extend",
+    subtitle: "more Pi, more plugins",
     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." }
+      { command: "rig pi search <term>", description: "Discover community Pi extensions on npm." },
+      { command: "rig pi add <pkg>", description: "Add a Pi extension to this project (workers pick it up too)." },
+      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." }
     ]
   }
 ];
@@ -2069,7 +2067,19 @@ var PRIMARY_GROUPS = [
 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: "inspect",
+    summary: "Inspect logs, artifacts, graphs, failures 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)." },
+      { command: "artifacts --task <id>", description: "List the task's completion artifacts." },
+      { command: "failures --task <id>", description: "Recorded failures for a task." },
+      { command: "graph", description: "Task dependency graph." },
+      { command: "audit", description: "Controlled-command audit trail." },
+      { command: "diff --task <id>", description: "Changed files for a task." }
+    ]
+  },
   { 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." }] },
   {
@@ -2121,6 +2131,25 @@ var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
   return pc2.bold(pc2.cyan(title));
 }
+function renderRigBanner(version) {
+  const m = (s) => pc2.bold(pc2.magenta(s));
+  const c = (s) => pc2.bold(pc2.cyan(s));
+  const y = (s) => pc2.yellow(s);
+  const d = (s) => pc2.dim(s);
+  const lines = [
+    m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
+    m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
+    c("    \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557") + d("    \u2591\u2592"),
+    c("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551") + d(" \u2588\u2593\u2591"),
+    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")} ${pc2.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")}`
+  ];
+  return lines.join(`
+`);
+}
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
   return `${pc2.dim("\u2502")} ${pc2.bold(commandColumn)} ${description}`;
@@ -2177,12 +2206,25 @@ function renderGroupHelp(groupName) {
 function shouldUseClackOutput2() {
   return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
 }
-function printTopLevelHelp() {
+function printTopLevelHelp(state = {}) {
   if (!shouldUseClackOutput2()) {
     console.log(renderTopLevelHelp());
     return;
   }
-  intro("rig");
+  console.log(renderRigBanner(state.version));
+  console.log("");
+  if (state.projectInitialized === false) {
+    intro("no rig project in this directory");
+    note2([
+      commandLine("rig init", "Set this repo up: config, GitHub auth, task source, server, Pi."),
+      commandLine("rig init --yes", "Same, non-interactive, sensible defaults."),
+      commandLine("rig doctor", "Already initialized somewhere else? Check the wiring.")
+    ].join(`
+`), "Get started");
+    outro("After init: rig task run --next puts an agent on your next task.");
+    return;
+  }
+  intro(state.selectedServer ? `server: ${state.selectedServer}` : "rig");
   for (const section of TOP_LEVEL_SECTIONS) {
     note2(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
   }
@@ -2193,7 +2235,7 @@ function printTopLevelHelp() {
     commandLine("--dry-run", "Print the command plan without mutating state.")
   ].join(`
 `), "Global options");
-  outro("Server \u2192 task \u2192 run \u2192 inbox/review.");
+  outro("init \u2192 task run \u2192 watch/steer \u2192 inbox/review \u2192 merged.");
 }
 function printGroupHelpDocument(groupName) {
   const rendered = renderGroupHelp(groupName) ?? renderTopLevelHelp();

package/dist/src/commands.js

@@ -337,7 +337,8 @@ var init_plugin = __esm(() => {
 // packages/cli/src/commands.ts
 init_runner();
 import {
-  existsSync as existsSync15
+  existsSync as existsSync15,
+  readFileSync as readFileSync12
 } from "fs";
 import { resolve as resolve24 } from "path";
 import { readBuildConfig } from "@rig/runtime/build-time-config";
@@ -6111,6 +6112,7 @@ ${acceptance}` : null,
 ${sourceContractLines.join(`
 `)}` : null,
     scopeText || renderSourceScopeValidation(sourceTask, sourceValidation) || null,
+    readPriorPrProgressForPrompt(input.projectRoot, input.taskId),
     initialPrompt ? `Additional operator guidance:
 ${initialPrompt}` : null,
     providerLines.length > 0 ? `Provider-specific runtime tooling:
@@ -6120,6 +6122,26 @@ ${providerLines.join(" ")}` : null,
 
 `);
 }
+function readPriorPrProgressForPrompt(projectRoot, taskId) {
+  for (const candidate of [
+    resolve19(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve19(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    try {
+      const raw = JSON.parse(readFileSync8(candidate, "utf8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 function firstPromptString(...values) {
   for (const value of values) {
     const trimmed = typeof value === "string" ? value.trim() : "";
@@ -8521,52 +8543,50 @@ import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@c
 import pc4 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Server",
-    subtitle: "choose the local or remote Rig server that owns this repo",
+    title: "Start here",
+    subtitle: "one-time setup for a 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." }
+      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
+      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
+      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." }
     ]
   },
   {
-    title: "Tasks",
-    subtitle: "find work, inspect it, and submit Pi-backed workers",
+    title: "Work",
+    subtitle: "find a task and put an agent on it",
     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." }
+      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
+      { command: "rig task next", description: "The next ready task, as a card." },
+      { command: "rig task run --next", description: "Dispatch an agent; interactive mode opens the native Pi session." },
+      { command: "rig task run <id> --detach", description: "Fire-and-forget a specific task." }
     ]
   },
   {
-    title: "Runs",
-    subtitle: "observe, attach to, and stop live or recent runs",
+    title: "Watch & steer",
+    subtitle: "live runs are observable and steerable, attached or not",
     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." }
+      { command: "rig run status", description: "Active and recent runs at a glance." },
+      { command: "rig run attach <id> --follow", description: "Join the live Pi session (worker keeps running if you /detach)." },
+      { command: "rig run steer <id> -m <text>", description: "Drop a message into a live worker without attaching." },
+      { command: "rig run stop <id>", description: "Cancel a running worker." }
     ]
   },
   {
-    title: "Review / inbox",
-    subtitle: "clear blocked runs and configure completion review",
+    title: "Unblock & gate",
+    subtitle: "answer what workers ask; control what merges",
     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." }
+      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." },
+      { command: "rig inbox inputs", description: "Questions workers asked (then `rig inbox respond \u2026`)." },
+      { command: "rig review show|set", description: "The completion review gate (Greptile is mandatory on merges)." }
     ]
   },
   {
-    title: "Health / setup",
-    subtitle: "bootstrap and diagnose the repo/server/GitHub/Pi path",
+    title: "Extend",
+    subtitle: "more Pi, more plugins",
     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." }
+      { command: "rig pi search <term>", description: "Discover community Pi extensions on npm." },
+      { command: "rig pi add <pkg>", description: "Add a Pi extension to this project (workers pick it up too)." },
+      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." }
     ]
   }
 ];
@@ -8716,7 +8736,19 @@ var PRIMARY_GROUPS = [
 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: "inspect",
+    summary: "Inspect logs, artifacts, graphs, failures 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)." },
+      { command: "artifacts --task <id>", description: "List the task's completion artifacts." },
+      { command: "failures --task <id>", description: "Recorded failures for a task." },
+      { command: "graph", description: "Task dependency graph." },
+      { command: "audit", description: "Controlled-command audit trail." },
+      { command: "diff --task <id>", description: "Changed files for a task." }
+    ]
+  },
   { 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." }] },
   {
@@ -8767,13 +8799,32 @@ var ADVANCED_GROUPS = [
 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 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." }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
   return pc4.bold(pc4.cyan(title));
 }
+function renderRigBanner(version) {
+  const m = (s) => pc4.bold(pc4.magenta(s));
+  const c = (s) => pc4.bold(pc4.cyan(s));
+  const y = (s) => pc4.yellow(s);
+  const d = (s) => pc4.dim(s);
+  const lines = [
+    m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
+    m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
+    c("    \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557") + d("    \u2591\u2592"),
+    c("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551") + d(" \u2588\u2593\u2591"),
+    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")} ${pc4.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")}`
+  ];
+  return lines.join(`
+`);
+}
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
   return `${pc4.dim("\u2502")} ${pc4.bold(commandColumn)} ${description}`;
@@ -8847,12 +8898,25 @@ function renderGroupHelp(groupName) {
 function shouldUseClackOutput2() {
   return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
 }
-function printTopLevelHelp() {
+function printTopLevelHelp(state = {}) {
   if (!shouldUseClackOutput2()) {
     console.log(renderTopLevelHelp());
     return;
   }
-  intro3("rig");
+  console.log(renderRigBanner(state.version));
+  console.log("");
+  if (state.projectInitialized === false) {
+    intro3("no rig project in this directory");
+    note4([
+      commandLine("rig init", "Set this repo up: config, GitHub auth, task source, server, Pi."),
+      commandLine("rig init --yes", "Same, non-interactive, sensible defaults."),
+      commandLine("rig doctor", "Already initialized somewhere else? Check the wiring.")
+    ].join(`
+`), "Get started");
+    outro3("After init: rig task run --next puts an agent on your next task.");
+    return;
+  }
+  intro3(state.selectedServer ? `server: ${state.selectedServer}` : "rig");
   for (const section of TOP_LEVEL_SECTIONS) {
     note4(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
   }
@@ -8863,7 +8927,7 @@ function printTopLevelHelp() {
     commandLine("--dry-run", "Print the command plan without mutating state.")
   ].join(`
 `), "Global options");
-  outro3("Server \u2192 task \u2192 run \u2192 inbox/review.");
+  outro3("init \u2192 task run \u2192 watch/steer \u2192 inbox/review \u2192 merged.");
 }
 function printAdvancedHelp() {
   if (!shouldUseClackOutput2()) {
@@ -11729,9 +11793,23 @@ function isHelpArg(arg) {
 function helpText() {
   return renderTopLevelHelp();
 }
+function resolveTopLevelLaunchState(context) {
+  const projectInitialized = hasInitializedRigProject(context.projectRoot);
+  let selectedServer = null;
+  if (projectInitialized) {
+    try {
+      const statePath = resolve24(context.projectRoot, ".rig", "state", "connection.json");
+      if (existsSync15(statePath)) {
+        const parsed = JSON.parse(readFileSync12(statePath, "utf-8"));
+        selectedServer = parsed.remoteUrl || parsed.url || parsed.selected || null;
+      }
+    } catch {}
+  }
+  return { projectInitialized, selectedServer, version: process.env.RIG_CLI_VERSION || readBuildConfig().RIG_CLI_VERSION || undefined };
+}
 async function execute(context, args) {
   if (args.length === 0) {
-    printTopLevelHelp();
+    printTopLevelHelp(resolveTopLevelLaunchState(context));
     return { ok: true, group: "help", command: "show" };
   }
   const [first, ...rest] = args;

package/dist/src/index.js

@@ -527,7 +527,8 @@ var init_plugin = __esm(() => {
 // packages/cli/src/commands.ts
 init_runner();
 import {
-  existsSync as existsSync16
+  existsSync as existsSync16,
+  readFileSync as readFileSync12
 } from "fs";
 import { resolve as resolve25 } from "path";
 import { readBuildConfig } from "@rig/runtime/build-time-config";
@@ -6301,6 +6302,7 @@ ${acceptance}` : null,
 ${sourceContractLines.join(`
 `)}` : null,
     scopeText || renderSourceScopeValidation(sourceTask, sourceValidation) || null,
+    readPriorPrProgressForPrompt(input.projectRoot, input.taskId),
     initialPrompt ? `Additional operator guidance:
 ${initialPrompt}` : null,
     providerLines.length > 0 ? `Provider-specific runtime tooling:
@@ -6310,6 +6312,26 @@ ${providerLines.join(" ")}` : null,
 
 `);
 }
+function readPriorPrProgressForPrompt(projectRoot, taskId) {
+  for (const candidate of [
+    resolve20(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve20(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    try {
+      const raw = JSON.parse(readFileSync8(candidate, "utf8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 function firstPromptString(...values) {
   for (const value of values) {
     const trimmed = typeof value === "string" ? value.trim() : "";
@@ -8711,52 +8733,50 @@ import { intro as intro3, log as log4, note as note4, outro as outro3 } from "@c
 import pc4 from "picocolors";
 var TOP_LEVEL_SECTIONS = [
   {
-    title: "Server",
-    subtitle: "choose the local or remote Rig server that owns this repo",
+    title: "Start here",
+    subtitle: "one-time setup for a 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." }
+      { command: "rig init", description: "Wizard: config, GitHub auth, task source, server, Pi wiring." },
+      { command: "rig doctor", description: "Check every part of the wiring \u2014 run this when anything feels off." },
+      { command: "rig server use <alias|local>", description: "Pick which Rig server owns this repo (`rig server list` to see them)." }
     ]
   },
   {
-    title: "Tasks",
-    subtitle: "find work, inspect it, and submit Pi-backed workers",
+    title: "Work",
+    subtitle: "find a task and put an agent on it",
     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." }
+      { command: "rig task list", description: "What's on the board (from the selected source/server)." },
+      { command: "rig task next", description: "The next ready task, as a card." },
+      { command: "rig task run --next", description: "Dispatch an agent; interactive mode opens the native Pi session." },
+      { command: "rig task run <id> --detach", description: "Fire-and-forget a specific task." }
     ]
   },
   {
-    title: "Runs",
-    subtitle: "observe, attach to, and stop live or recent runs",
+    title: "Watch & steer",
+    subtitle: "live runs are observable and steerable, attached or not",
     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." }
+      { command: "rig run status", description: "Active and recent runs at a glance." },
+      { command: "rig run attach <id> --follow", description: "Join the live Pi session (worker keeps running if you /detach)." },
+      { command: "rig run steer <id> -m <text>", description: "Drop a message into a live worker without attaching." },
+      { command: "rig run stop <id>", description: "Cancel a running worker." }
     ]
   },
   {
-    title: "Review / inbox",
-    subtitle: "clear blocked runs and configure completion review",
+    title: "Unblock & gate",
+    subtitle: "answer what workers ask; control what merges",
     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." }
+      { command: "rig inbox approvals", description: "Approvals workers are waiting on (then `rig inbox approve \u2026`)." },
+      { command: "rig inbox inputs", description: "Questions workers asked (then `rig inbox respond \u2026`)." },
+      { command: "rig review show|set", description: "The completion review gate (Greptile is mandatory on merges)." }
     ]
   },
   {
-    title: "Health / setup",
-    subtitle: "bootstrap and diagnose the repo/server/GitHub/Pi path",
+    title: "Extend",
+    subtitle: "more Pi, more plugins",
     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." }
+      { command: "rig pi search <term>", description: "Discover community Pi extensions on npm." },
+      { command: "rig pi add <pkg>", description: "Add a Pi extension to this project (workers pick it up too)." },
+      { command: "rig plugin list", description: "What the rig.config.ts plugins contribute." }
     ]
   }
 ];
@@ -8906,7 +8926,19 @@ var PRIMARY_GROUPS = [
 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: "inspect",
+    summary: "Inspect logs, artifacts, graphs, failures 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)." },
+      { command: "artifacts --task <id>", description: "List the task's completion artifacts." },
+      { command: "failures --task <id>", description: "Recorded failures for a task." },
+      { command: "graph", description: "Task dependency graph." },
+      { command: "audit", description: "Controlled-command audit trail." },
+      { command: "diff --task <id>", description: "Changed files for a task." }
+    ]
+  },
   { 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." }] },
   {
@@ -8957,13 +8989,32 @@ var ADVANCED_GROUPS = [
 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 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." }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
 function heading(title) {
   return pc4.bold(pc4.cyan(title));
 }
+function renderRigBanner(version) {
+  const m = (s) => pc4.bold(pc4.magenta(s));
+  const c = (s) => pc4.bold(pc4.cyan(s));
+  const y = (s) => pc4.yellow(s);
+  const d = (s) => pc4.dim(s);
+  const lines = [
+    m("    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ") + d("  \u2591\u2592\u2593\u2588 "),
+    m("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ") + d("\u2593\u2592\u2591"),
+    c("    \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557") + d("    \u2591\u2592"),
+    c("    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551") + d(" \u2588\u2593\u2591"),
+    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")} ${pc4.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")}`
+  ];
+  return lines.join(`
+`);
+}
 function commandLine(command, description) {
   const commandColumn = command.length >= 38 ? `${command}  ` : command.padEnd(38);
   return `${pc4.dim("\u2502")} ${pc4.bold(commandColumn)} ${description}`;
@@ -9037,12 +9088,25 @@ function renderGroupHelp(groupName) {
 function shouldUseClackOutput2() {
   return Boolean(process.stdout.isTTY) && process.env.RIG_CLI_PLAIN_HELP !== "1";
 }
-function printTopLevelHelp() {
+function printTopLevelHelp(state = {}) {
   if (!shouldUseClackOutput2()) {
     console.log(renderTopLevelHelp());
     return;
   }
-  intro3("rig");
+  console.log(renderRigBanner(state.version));
+  console.log("");
+  if (state.projectInitialized === false) {
+    intro3("no rig project in this directory");
+    note4([
+      commandLine("rig init", "Set this repo up: config, GitHub auth, task source, server, Pi."),
+      commandLine("rig init --yes", "Same, non-interactive, sensible defaults."),
+      commandLine("rig doctor", "Already initialized somewhere else? Check the wiring.")
+    ].join(`
+`), "Get started");
+    outro3("After init: rig task run --next puts an agent on your next task.");
+    return;
+  }
+  intro3(state.selectedServer ? `server: ${state.selectedServer}` : "rig");
   for (const section of TOP_LEVEL_SECTIONS) {
     note4(renderCommandBlock(section.commands), `${section.title} \u2014 ${section.subtitle}`);
   }
@@ -9053,7 +9117,7 @@ function printTopLevelHelp() {
     commandLine("--dry-run", "Print the command plan without mutating state.")
   ].join(`
 `), "Global options");
-  outro3("Server \u2192 task \u2192 run \u2192 inbox/review.");
+  outro3("init \u2192 task run \u2192 watch/steer \u2192 inbox/review \u2192 merged.");
 }
 function printAdvancedHelp() {
   if (!shouldUseClackOutput2()) {
@@ -11919,9 +11983,23 @@ function isHelpArg(arg) {
 function helpText() {
   return renderTopLevelHelp();
 }
+function resolveTopLevelLaunchState(context) {
+  const projectInitialized = hasInitializedRigProject(context.projectRoot);
+  let selectedServer = null;
+  if (projectInitialized) {
+    try {
+      const statePath = resolve25(context.projectRoot, ".rig", "state", "connection.json");
+      if (existsSync16(statePath)) {
+        const parsed = JSON.parse(readFileSync12(statePath, "utf-8"));
+        selectedServer = parsed.remoteUrl || parsed.url || parsed.selected || null;
+      }
+    } catch {}
+  }
+  return { projectInitialized, selectedServer, version: process.env.RIG_CLI_VERSION || readBuildConfig().RIG_CLI_VERSION || undefined };
+}
 async function execute(context, args) {
   if (args.length === 0) {
-    printTopLevelHelp();
+    printTopLevelHelp(resolveTopLevelLaunchState(context));
     return { ok: true, group: "help", command: "show" };
   }
   const [first, ...rest] = args;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.36",
+  "version": "0.0.6-alpha.38",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,11 +23,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.36",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.36",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.36",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.36",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.36",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.38",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.38",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.38",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.38",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.38",
     "picocolors": "^1.1.1"
   }
 }