@h-rig/cli 0.0.6-alpha.35 → 0.0.6-alpha.37

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() : "";
@@ -6394,7 +6416,24 @@ async function executeInspect(context, args) {
       const requiredTask = requireTask(task, "rig inspect logs --task <task-id>");
       const latestRun = listAuthorityRuns2(context.projectRoot).map((entry) => readAuthorityRun3(context.projectRoot, entry.runId)).filter((run) => Boolean(run)).filter((run) => run.taskId === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
       if (!latestRun) {
-        throw new CliError2(`No runs found for ${requiredTask}.`);
+        const serverRuns = await listRunsViaServer(context, { limit: 200 }).catch(() => []);
+        const serverRun = serverRuns.filter((run) => String(run.taskId ?? "") === requiredTask).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0];
+        if (!serverRun || typeof serverRun.runId !== "string") {
+          throw new CliError2(`No runs found for ${requiredTask} (local or on the selected server).`);
+        }
+        const page = await getRunLogsViaServer(context, serverRun.runId, { limit: 500 });
+        const entries = Array.isArray(page.entries) ? page.entries : [];
+        if (context.outputMode === "text") {
+          for (const entry of entries) {
+            const record = entry && typeof entry === "object" ? entry : {};
+            const title = String(record.title ?? "");
+            const detail = String(record.detail ?? "");
+            console.log([title, detail].filter(Boolean).join(" \u2014 "));
+          }
+          if (entries.length === 0)
+            console.log(`(no log entries for run ${serverRun.runId})`);
+        }
+        return { ok: true, group: "inspect", command, details: { task: requiredTask, runId: serverRun.runId, source: "server", entries } };
       }
       const logsPath = resolve21(resolveAuthorityRunDir4(context.projectRoot, latestRun.runId), "logs.jsonl");
       if (!existsSync13(logsPath)) {
@@ -7679,7 +7718,38 @@ function parseWsPayload(message2) {
     return JSON.parse(message2.data);
   return JSON.parse(Buffer.from(message2.data).toString("utf8"));
 }
-async function connectWorkerStream(options, ctx, state) {
+var BRIDGE_LOCAL_COMMANDS = new Set(["detach", "quit", "q", "stop"]);
+function registerDaemonCommandsNatively(pi, options, ctx, state, commands, registered) {
+  for (const command of commands) {
+    const record = recordOf(command);
+    const name = typeof record?.name === "string" ? record.name : "";
+    if (!name || registered.has(name) || BRIDGE_LOCAL_COMMANDS.has(name))
+      continue;
+    registered.add(name);
+    const description = typeof record?.description === "string" ? record.description : undefined;
+    const source = typeof record?.source === "string" ? record.source : "worker";
+    try {
+      pi.registerCommand(name, {
+        description: `[worker ${source}] ${description ?? ""}`.trim(),
+        handler: async (args) => {
+          const text2 = `/${name}${args ? ` ${args}` : ""}`;
+          appendTranscript(state, "You", text2);
+          try {
+            const result = await runRunPiCommandViaServer(options.context, options.runId, text2);
+            const message2 = typeof result.message === "string" ? result.message : "worker command accepted";
+            appendTranscript(state, "System", message2);
+            if (state.nativeStream)
+              ctx.ui.notify(message2, "info");
+          } catch (error) {
+            reportBridgeError(ctx, state, error instanceof Error ? error.message : String(error));
+          }
+          updatePiUi(ctx, state);
+        }
+      });
+    } catch {}
+  }
+}
+async function connectWorkerStream(options, pi, ctx, state, registeredDaemonCommands) {
   const ready = await waitForWorkerReady(options, ctx, state);
   if (!ready)
     return;
@@ -7734,6 +7804,7 @@ async function connectWorkerStream(options, ctx, state) {
       const record = recordOf(command);
       return typeof record?.name === "string" ? [`/${record.name}`] : [];
     });
+    registerDaemonCommandsNatively(pi, options, ctx, state, commands, registeredDaemonCommands);
     catchupDone = true;
     for (const payload of buffered.splice(0))
       applyEnvelope(ctx, state, payload);
@@ -7861,6 +7932,7 @@ function createRigWorkerPiBridgeExtension(options) {
     };
     if (options.initialMessageSent)
       appendTranscript(state, "System", "Initial message sent to worker Pi daemon.");
+    const registeredDaemonCommands = new Set;
     let nativePiUiContextAvailable = false;
     pi.on("user_bash", (event) => {
       state.nativeStream = Boolean(state.nativeStream || nativePiUiContextAvailable);
@@ -7893,7 +7965,7 @@ function createRigWorkerPiBridgeExtension(options) {
         });
         return { consume: true };
       });
-      connectWorkerStream(options, ctx, state).catch((error) => {
+      connectWorkerStream(options, pi, ctx, state, registeredDaemonCommands).catch((error) => {
         appendTranscript(state, "Error", error instanceof Error ? error.message : String(error));
         updatePiUi(ctx, state);
       });
@@ -7940,8 +8012,6 @@ async function attachRunBundledPiFrontend(context, input) {
       "--no-tools",
       "--no-builtin-tools",
       "--no-skills",
-      "--no-prompt-templates",
-      "--no-themes",
       "--no-context-files",
       "--no-approve"
     ], {
@@ -8486,6 +8556,7 @@ async function executeRun(context, args) {
 
 // packages/cli/src/commands/server.ts
 init_runner();
+import { resolveRigServerCommand } from "@rig/runtime/local-server";
 async function executeServer(context, args, options) {
   const [command = "status", ...rest] = args;
   if (["status", "list", "add", "use"].includes(command)) {
@@ -8503,7 +8574,8 @@ async function executeServer(context, args, options) {
       const authTokenResult = takeOption(pending, "--auth-token");
       pending = authTokenResult.rest;
       requireNoExtraArgs(pending, "rig server start [--host <host>] [--port <n>] [--poll-ms <n>] [--auth-token <token>]");
-      const commandParts = ["rig-server", "start"];
+      const serverCommand = resolveRigServerCommand(context.projectRoot);
+      const commandParts = [serverCommand.command, ...serverCommand.commandArgs, "start"];
       if (hostResult.value) {
         commandParts.push("--host", hostResult.value);
       }
@@ -8526,7 +8598,8 @@ async function executeServer(context, args, options) {
       const eventResult = takeOption(pending, "--event");
       pending = eventResult.rest;
       requireNoExtraArgs(pending, "rig server notify-test [--event <type>]");
-      const commandParts = ["rig-server", "notify-test"];
+      const serverCommand = resolveRigServerCommand(context.projectRoot);
+      const commandParts = [serverCommand.command, ...serverCommand.commandArgs, "notify-test"];
       if (eventResult.value) {
         commandParts.push("--event", eventResult.value);
       }
@@ -8660,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." }
     ]
   }
 ];
@@ -8913,6 +8984,25 @@ 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}`;
@@ -8986,12 +9076,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}`);
   }
@@ -9002,7 +9105,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()) {
@@ -11868,9 +11971,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.35",
+  "version": "0.0.6-alpha.37",
   "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.35",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.35",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.35",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.35",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.35",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.37",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.37",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.37",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.37",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.37",
     "picocolors": "^1.1.1"
   }
 }