@h-rig/cli 0.0.6-alpha.3 → 0.0.6-alpha.31

package/dist/src/commands/_task-picker.js

@@ -1,6 +1,9 @@
 // @bun
 // packages/cli/src/commands/_task-picker.ts
-import { createInterface } from "readline/promises";
+import { cancel, isCancel, select } from "@clack/prompts";
+
+// packages/cli/src/commands/_operator-surface.ts
+import { createInterface as createPromptInterface } from "readline/promises";
 function taskId(task) {
   return typeof task.id === "string" && task.id.trim() ? task.id : "<unknown>";
 }
@@ -13,6 +16,19 @@ function taskStatus(task) {
 function renderTaskPickerRows(tasks) {
   return tasks.map((task, index) => `${index + 1}. ${taskId(task)} \xB7 ${taskStatus(task)} \xB7 ${taskTitle(task)}`);
 }
+async function promptForTaskSelection(question) {
+  const rl = createPromptInterface({ input: process.stdin, output: process.stdout });
+  try {
+    return await rl.question(question);
+  } finally {
+    rl.close();
+  }
+}
+
+// packages/cli/src/commands/_task-picker.ts
+function taskId2(task) {
+  return typeof task.id === "string" && task.id.trim() ? task.id : "<unknown>";
+}
 async function selectTaskWithTextPicker(tasks, io = {}) {
   if (tasks.length === 0)
     return null;
@@ -22,25 +38,37 @@ async function selectTaskWithTextPicker(tasks, io = {}) {
   if (!isTty) {
     throw new Error("task run requires an interactive terminal to pick a task; pass --task <id>, --next, or --detach with a task id.");
   }
-  const prompt = io.prompt ?? (async (question) => {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    try {
-      return await rl.question(question);
-    } finally {
-      rl.close();
+  if (io.prompt || io.renderer) {
+    const prompt = io.prompt ?? promptForTaskSelection;
+    const renderer = io.renderer ?? { writeLine: (line) => process.stdout.write(`${line}
+`) };
+    renderer.writeLine("Select Rig task:");
+    for (const row of renderTaskPickerRows(tasks))
+      renderer.writeLine(`  ${row}`);
+    const answer2 = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
+    if (!answer2)
+      return null;
+    if (/^\d+$/.test(answer2)) {
+      const index2 = Number.parseInt(answer2, 10) - 1;
+      return tasks[index2] ?? null;
     }
+    return tasks.find((task) => taskId2(task) === answer2) ?? null;
+  }
+  const options = tasks.map((task, index2) => ({
+    value: `${index2}`,
+    label: `${taskId2(task)} \xB7 ${typeof task.title === "string" && task.title.trim() ? task.title.trim() : "Untitled task"}`,
+    hint: typeof task.status === "string" && task.status.trim() ? task.status.trim() : undefined
+  }));
+  const answer = await select({
+    message: "Select Rig task",
+    options
   });
-  console.log("Select Rig task:");
-  for (const row of renderTaskPickerRows(tasks))
-    console.log(`  ${row}`);
-  const answer = (await prompt(`Task [1-${tasks.length}] or id: `)).trim();
-  if (!answer)
+  if (isCancel(answer)) {
+    cancel("No task selected.");
     return null;
-  if (/^\d+$/.test(answer)) {
-    const index = Number.parseInt(answer, 10) - 1;
-    return tasks[index] ?? null;
   }
-  return tasks.find((task) => taskId(task) === answer) ?? null;
+  const index = Number.parseInt(String(answer), 10);
+  return Number.isFinite(index) ? tasks[index] ?? null : null;
 }
 export {
   selectTaskWithTextPicker,

package/dist/src/commands/agent.js

@@ -6,8 +6,6 @@ import { resolve as resolve2 } from "path";
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
 function takeFlag(args, flag) {
@@ -126,6 +124,7 @@ function upsertAgentAuthorityRun(projectRoot, input) {
   const runtimeAdapter = normalizeRuntimeAdapter(input.runtimeAdapter ?? existing?.runtimeAdapter ?? "claude-code");
   const title = resolveTaskTitleForAuthorityRun(projectRoot, input.taskId) ?? input.taskId;
   const next = {
+    ...existing ?? {},
     runId: input.runId,
     projectRoot,
     workspaceId: existing?.workspaceId ?? RIG_WORKSPACE_ID,
@@ -220,6 +219,7 @@ import { ensureProjectMainFreshBeforeRun } from "@rig/runtime/control-plane/proj
 
 // packages/cli/src/commands/_server-client.ts
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
+var scopedGitHubBearerTokens = new Map;
 
 // packages/cli/src/commands/_preflight.ts
 async function runProjectMainSyncPreflight(context, options) {
@@ -288,7 +288,7 @@ async function executeAgent(context, args) {
   const [command = "list", ...rest] = args;
   switch (command) {
     case "list": {
-      requireNoExtraArgs(rest, "bun run rig agent list");
+      requireNoExtraArgs(rest, "rig agent list");
       const runtimes = await listAgentRuntimes(context.projectRoot);
       if (context.outputMode === "text") {
         if (runtimes.length === 0) {
@@ -309,12 +309,12 @@ async function executeAgent(context, args) {
       pending = modeResult.rest;
       const taskResult = takeOption(pending, "--task");
       pending = taskResult.rest;
-      requireNoExtraArgs(pending, "bun run rig agent prepare --task <id> [--id <id>] [--mode worktree]");
+      requireNoExtraArgs(pending, "rig agent prepare --task <id> [--id <id>] [--mode worktree]");
       const mode = parseIsolationMode(modeResult.value, false);
       const id = idResult.value || agentId("agent");
       const taskId = taskResult.value?.trim();
       if (!taskId) {
-        throw new CliError2("Usage: bun run rig agent prepare --task <id> [--id <id>] [--mode worktree]");
+        throw new CliError2("Usage: rig agent prepare --task <id> [--id <id>] [--mode worktree]");
       }
       const runtime = await withMutedConsole(context.outputMode === "json", () => ensureAgentRuntime({
         projectRoot: context.projectRoot,
@@ -332,7 +332,7 @@ async function executeAgent(context, args) {
     case "run": {
       const { options, commandParts } = splitAtDoubleDash(rest);
       if (commandParts.length === 0) {
-        throw new CliError2("Usage: bun run rig agent run [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
+        throw new CliError2("Usage: rig agent run [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
       }
       let pending = options;
       const idResult = takeOption(pending, "--id");
@@ -343,12 +343,12 @@ async function executeAgent(context, args) {
       pending = taskResult.rest;
       const skipProjectSyncResult = takeFlag(pending, "--skip-project-sync");
       pending = skipProjectSyncResult.rest;
-      requireNoExtraArgs(pending, "bun run rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
+      requireNoExtraArgs(pending, "rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
       const mode = parseIsolationMode(modeResult.value, false);
       const id = idResult.value || agentId("agent-run");
       const taskId = taskResult.value?.trim();
       if (!taskId) {
-        throw new CliError2("Usage: bun run rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
+        throw new CliError2("Usage: rig agent run --task <id> [--id <id>] [--mode worktree] [--skip-project-sync] -- <command...>");
       }
       await runProjectMainSyncPreflight(context, { disabled: skipProjectSyncResult.value });
       const createdAt = new Date().toISOString();
@@ -462,7 +462,7 @@ ${result.stderr.trim()}` : ""}`, result.exitCode);
       pending = allResult.rest;
       const idResult = takeOption(pending, "--id");
       pending = idResult.rest;
-      requireNoExtraArgs(pending, "bun run rig agent cleanup (--id <id> | --all)");
+      requireNoExtraArgs(pending, "rig agent cleanup (--id <id> | --all)");
       if (!allResult.value && !idResult.value) {
         throw new CliError2("Provide --id <id> or --all.");
       }

package/dist/src/commands/browser.js

@@ -12,8 +12,6 @@ import pc2 from "picocolors";
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
 function takeFlag(args, flag) {
@@ -351,7 +349,7 @@ async function executeBrowser(context, args) {
     return { ok: true, group: "browser", command: "help" };
   }
   if (command === "explain") {
-    requireNoExtraArgs(rest, "bun run rig browser explain");
+    requireNoExtraArgs(rest, "rig browser explain");
     console.log(browserAgentUsageText());
     return { ok: true, group: "browser", command: "explain" };
   }
@@ -377,7 +375,7 @@ ${browserHelpText()}`);
 
 ${browserHelpText()}`);
     }
-    requireNoExtraArgs(appRest, `bun run rig browser ${command} ${subcommand}`);
+    requireNoExtraArgs(appRest, `rig browser ${command} ${subcommand}`);
     await context.runCommand(["bun", "run", `app:${subcommand}:browser:${appSlug}`]);
     return { ok: true, group: "browser", command: `${command}-${subcommand}` };
   }
@@ -389,7 +387,7 @@ ${browserHelpText()}`);
   };
   const packageScript = packageScripts[command];
   if (packageScript) {
-    requireNoExtraArgs(rest, `bun run rig browser ${command}`);
+    requireNoExtraArgs(rest, `rig browser ${command}`);
     await context.runCommand(["bun", "run", "--filter=@rig/browser", packageScript]);
     return { ok: true, group: "browser", command };
   }
@@ -416,7 +414,7 @@ async function executeBrowserDemo(context, args) {
   pending = keepOpenFlag.rest;
   const noBuildFlag = takeFlag(pending, "--no-build");
   pending = noBuildFlag.rest;
-  requireNoExtraArgs(pending, "bun run rig browser demo [--port <n>] [--profile <name>] [--state-dir <path>] [--target-url <url>] [--keep-open] [--no-build]");
+  requireNoExtraArgs(pending, "rig browser demo [--port <n>] [--profile <name>] [--state-dir <path>] [--target-url <url>] [--keep-open] [--no-build]");
   if (context.outputMode !== "text" || !process.stdin.isTTY || !process.stdout.isTTY) {
     throw new CliError2("rig browser demo requires an interactive TTY in text mode.");
   }

package/dist/src/commands/connect.js

@@ -1,10 +1,11 @@
 // @bun
+// packages/cli/src/commands/connect.ts
+import { cancel, isCancel, select } from "@clack/prompts";
+
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
 function requireNoExtraArgs(args, usage) {
@@ -103,12 +104,82 @@ function writeRepoConnection(projectRoot, state) {
   writeJsonFile(resolveRepoConnectionPath(projectRoot), state);
 }
 
+// packages/cli/src/commands/_cli-format.ts
+import { log, note } from "@clack/prompts";
+import pc from "picocolors";
+function truncate(value, width) {
+  if (value.length <= width)
+    return value;
+  if (width <= 1)
+    return "\u2026";
+  return `${value.slice(0, width - 1)}\u2026`;
+}
+function pad(value, width) {
+  return value.length >= width ? value : `${value}${" ".repeat(width - value.length)}`;
+}
+function statusColor(status) {
+  const normalized = status.toLowerCase();
+  if (["completed", "merged", "closed", "done", "accepted", "pass", "selected", "approved"].includes(normalized))
+    return pc.green;
+  if (["failed", "needs_attention", "needs-attention", "blocked", "error", "rejected"].includes(normalized))
+    return pc.red;
+  if (["running", "reviewing", "validating", "in_progress", "in-progress", "remote"].includes(normalized))
+    return pc.cyan;
+  if (["ready", "open", "queued", "created", "preparing", "local", "pending"].includes(normalized))
+    return pc.yellow;
+  return pc.dim;
+}
+function formatStatusPill(status) {
+  const label = status || "unknown";
+  return statusColor(label)(`\u25CF ${label}`);
+}
+function formatSection(title, subtitle) {
+  return `${pc.bold(pc.cyan("\u25C6"))} ${pc.bold(title)}${subtitle ? pc.dim(` \u2014 ${subtitle}`) : ""}`;
+}
+function formatSuccessCard(title, rows = []) {
+  const body = rows.filter(([, value]) => value !== undefined && value !== null && String(value).length > 0).map(([key, value]) => `${pc.dim("\u2502")} ${pc.dim(key.padEnd(12))} ${value}`);
+  return [formatSection(title), ...body].join(`
+`);
+}
+function formatNextSteps(steps) {
+  if (steps.length === 0)
+    return [];
+  return [pc.bold("Next"), ...steps.map((step) => `${pc.dim("\u203A")} ${step}`)];
+}
+function formatConnectionList(connections) {
+  const rows = [["local", { kind: "local", mode: "auto" }], ...Object.entries(connections)];
+  const aliasWidth = Math.min(24, Math.max(5, ...rows.map(([alias]) => alias.length)));
+  const lines = rows.map(([alias, connection]) => [
+    pc.bold(pad(truncate(alias, aliasWidth), aliasWidth)),
+    formatStatusPill(connection.kind),
+    connection.kind === "remote" ? connection.baseUrl ?? "" : connection.mode ?? "local"
+  ].join("  "));
+  return [formatSection("Rig servers", `${rows.length} available`), `${pc.bold(pad("ALIAS", aliasWidth))}  ${pc.bold("KIND")}  ${pc.bold("TARGET")}`, ...lines, "", ...formatNextSteps(["Select one: `rig server use <alias|local>`"])].join(`
+`);
+}
+function formatConnectionStatus(selected, connections) {
+  const connection = selected === "local" ? { kind: "local", mode: "auto" } : connections[selected];
+  const target = !connection ? "not configured" : connection.kind === "remote" ? connection.baseUrl : "local";
+  return [
+    formatSection("Rig server", "selected for this repo"),
+    `${pc.dim("\u2502")} ${pc.dim("selected ")} ${pc.bold(selected)}`,
+    `${pc.dim("\u2502")} ${pc.dim("kind     ")} ${formatStatusPill(connection?.kind ?? "unknown")}`,
+    `${pc.dim("\u2502")} ${pc.dim("target   ")} ${target ?? "not configured"}`,
+    "",
+    ...formatNextSteps(["Change: `rig server use <alias|local>`", "List saved servers: `rig server list`"])
+  ].join(`
+`);
+}
+
 // packages/cli/src/commands/connect.ts
-function parseConnection(alias, value) {
+function usageName(options) {
+  return `rig ${options.group}`;
+}
+function parseConnection(alias, value, options) {
   if (alias === "local" && !value)
     return { kind: "local", mode: "auto" };
   if (!value)
-    throw new CliError2("Missing remote server URL. Usage: rig connect add <alias> <url>", 1);
+    throw new CliError2(`Missing remote server URL. Usage: ${usageName(options)} add <alias> <url>`, 1);
   let parsed;
   try {
     parsed = new URL(value);
@@ -127,54 +198,90 @@ function printJsonOrText(context, payload, text) {
     console.log(text);
   }
 }
-async function executeConnect(context, args) {
+async function promptForConnectionAlias(context) {
+  const state = readGlobalConnections();
+  const repo = readRepoConnection(context.projectRoot);
+  const options = [
+    { value: "local", label: "local", hint: "Use/start a local Rig server" },
+    ...Object.entries(state.connections).map(([alias, connection]) => ({
+      value: alias,
+      label: alias,
+      hint: connection.kind === "remote" ? connection.baseUrl : "local"
+    }))
+  ].filter((option, index, all) => all.findIndex((candidate) => candidate.value === option.value) === index);
+  const answer = await select({
+    message: "Select Rig server for this repo",
+    initialValue: repo?.selected ?? "local",
+    options
+  });
+  if (isCancel(answer)) {
+    cancel("No server selected.");
+    throw new CliError2("No server selected.", 3);
+  }
+  return String(answer);
+}
+async function executeConnectionCommand(context, args, options) {
   const [command, ...rest] = args;
   switch (command ?? "status") {
     case "list": {
-      requireNoExtraArgs(rest, "rig connect list");
+      requireNoExtraArgs(rest, `${usageName(options)} list`);
       const state = readGlobalConnections();
-      printJsonOrText(context, state, Object.entries(state.connections).map(([alias, connection]) => `${alias}	${connection.kind === "remote" ? connection.baseUrl : "local"}`).join(`
-`) || "No Rig connections configured.");
-      return { ok: true, group: "connect", command: "list", details: state };
+      printJsonOrText(context, state, formatConnectionList(state.connections));
+      return { ok: true, group: options.group, command: "list", details: state };
     }
     case "add": {
       const [alias, url, ...extra] = rest;
       if (!alias)
-        throw new CliError2("Missing alias. Usage: rig connect add <alias> <url>", 1);
-      requireNoExtraArgs(extra, "rig connect add <alias> <url>");
-      const connection = parseConnection(alias, url);
+        throw new CliError2(`Missing alias. Usage: ${usageName(options)} add <alias> <url>`, 1);
+      requireNoExtraArgs(extra, `${usageName(options)} add <alias> <url>`);
+      const connection = parseConnection(alias, url, options);
       const state = upsertGlobalConnection(alias, connection);
-      printJsonOrText(context, { alias, connection }, `Added Rig connection ${alias}.`);
-      return { ok: true, group: "connect", command: "add", details: { alias, connection, count: Object.keys(state.connections).length } };
+      printJsonOrText(context, { alias, connection }, formatSuccessCard("Rig server saved", [
+        ["alias", alias],
+        ["target", connection.kind === "remote" ? connection.baseUrl : "local"],
+        ["next", `${usageName(options)} use ${alias}`]
+      ]));
+      return { ok: true, group: options.group, command: "add", details: { alias, connection, count: Object.keys(state.connections).length } };
     }
     case "use": {
-      const [alias, ...extra] = rest;
+      let [alias, ...extra] = rest;
+      requireNoExtraArgs(extra, `${usageName(options)} use <alias|local>`);
+      if (!alias && options.interactiveUse && context.outputMode === "text" && process.stdin.isTTY) {
+        alias = await promptForConnectionAlias(context);
+      }
       if (!alias)
-        throw new CliError2("Missing alias. Usage: rig connect use <alias|local>", 1);
-      requireNoExtraArgs(extra, "rig connect use <alias|local>");
+        throw new CliError2(`Missing alias. Usage: ${usageName(options)} use <alias|local>`, 1);
       if (alias !== "local") {
         const state = readGlobalConnections();
         if (!state.connections[alias])
-          throw new CliError2(`Unknown Rig connection: ${alias}`, 1);
+          throw new CliError2(`Unknown Rig server: ${alias}`, 1);
       }
       const repoState = { selected: alias, linkedAt: new Date().toISOString() };
       writeRepoConnection(context.projectRoot, repoState);
-      printJsonOrText(context, repoState, `Selected Rig connection ${alias} for this repo.`);
-      return { ok: true, group: "connect", command: "use", details: repoState };
+      printJsonOrText(context, repoState, formatSuccessCard("Rig server selected", [
+        ["selected", alias],
+        ["scope", "this repo"],
+        ["next", "rig task list"]
+      ]));
+      return { ok: true, group: options.group, command: "use", details: repoState };
     }
     case "status": {
-      requireNoExtraArgs(rest, "rig connect status");
+      requireNoExtraArgs(rest, `${usageName(options)} status`);
       const repo = readRepoConnection(context.projectRoot);
       const global = readGlobalConnections();
       const details = { selected: repo?.selected ?? "local", repo, connections: global.connections };
-      printJsonOrText(context, details, `Selected Rig connection: ${details.selected}`);
-      return { ok: true, group: "connect", command: "status", details };
+      printJsonOrText(context, details, formatConnectionStatus(details.selected, global.connections));
+      return { ok: true, group: options.group, command: "status", details };
     }
     default:
-      throw new CliError2(`Unknown connect command: ${String(command)}
-Usage: rig connect <list|add|use|status>`, 1);
+      throw new CliError2(`Unknown ${options.group} command: ${String(command)}
+Usage: ${usageName(options)} <list|add|use|status>`, 1);
   }
 }
+async function executeConnect(context, args) {
+  return executeConnectionCommand(context, args, { group: "connect" });
+}
 export {
+  executeConnectionCommand,
   executeConnect
 };

package/dist/src/commands/dist.js

@@ -19,8 +19,6 @@ import { resolve as resolve3 } from "path";
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
 function takeOption(args, option) {
@@ -185,7 +183,7 @@ async function executeDist(context, args) {
   switch (command) {
     case "build": {
       const { value: outputDir, rest: pending } = takeOption(rest, "--output-dir");
-      requireNoExtraArgs(pending, "bun run rig dist build [--output-dir <dir>]");
+      requireNoExtraArgs(pending, "rig dist build [--output-dir <dir>]");
       const commandParts = ["bun", "run", "packages/cli/bin/build-rig-binaries.ts"];
       if (outputDir) {
         commandParts.push("--output-dir", outputDir);
@@ -199,7 +197,7 @@ async function executeDist(context, args) {
       pending = scopeResult.rest;
       const pathResult = takeOption(pending, "--path");
       pending = pathResult.rest;
-      requireNoExtraArgs(pending, "bun run rig dist install [--scope user|system] [--path <dir>]");
+      requireNoExtraArgs(pending, "rig dist install [--scope user|system] [--path <dir>]");
       const scope = parseInstallScope(scopeResult.value);
       const installDir = resolveInstallDir(scope, pathResult.value);
       mkdirSync(installDir, { recursive: true });
@@ -242,7 +240,7 @@ async function executeDist(context, args) {
       };
     }
     case "doctor": {
-      requireNoExtraArgs(rest, "bun run rig dist doctor");
+      requireNoExtraArgs(rest, "rig dist doctor");
       const details = await runDistDoctor(context.projectRoot);
       if (context.outputMode === "text") {
         console.log(`bun: ${details.bun.available ? `ok (${details.bun.version})` : "missing"}`);
@@ -253,7 +251,7 @@ async function executeDist(context, args) {
       return { ok: true, group: "dist", command, details };
     }
     case "rebuild-agent": {
-      requireNoExtraArgs(rest, "bun run rig dist rebuild-agent");
+      requireNoExtraArgs(rest, "rig dist rebuild-agent");
       const fp = await computeRuntimeImageFingerprint(context.projectRoot);
       const currentId = computeRuntimeImageId(fp);
       const imagesDir = resolve3(resolveControlPlaneMonorepoRuntimeDir(context.projectRoot), "images");

package/dist/src/commands/doctor.js

@@ -5,8 +5,6 @@ var __require = import.meta.require;
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
 function requireNoExtraArgs(args, usage) {
@@ -98,17 +96,16 @@ function resolveSelectedConnection(projectRoot, options = {}) {
   const global = readGlobalConnections(options);
   const connection = global.connections[repo.selected];
   if (!connection) {
-    throw new CliError2(`Selected Rig connection "${repo.selected}" was not found. Run \`rig connect list\` or \`rig connect use local\`.`, 1);
+    throw new CliError2(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
   }
   return { alias: repo.selected, connection };
 }
 
 // packages/cli/src/commands/_server-client.ts
-import { spawnSync } from "child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } from "path";
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
-var cachedGitHubBearerToken;
+var scopedGitHubBearerTokens = new Map;
 function cleanToken(value) {
   const trimmed = value?.trim();
   return trimmed ? trimmed : null;
@@ -125,25 +122,13 @@ function readPrivateRemoteSessionToken(projectRoot) {
   }
 }
 function readGitHubBearerTokenForRemote(projectRoot) {
-  if (cachedGitHubBearerToken !== undefined)
-    return cachedGitHubBearerToken;
+  const scopedKey = resolve2(projectRoot);
+  if (scopedGitHubBearerTokens.has(scopedKey))
+    return scopedGitHubBearerTokens.get(scopedKey) ?? null;
   const privateSession = readPrivateRemoteSessionToken(projectRoot);
-  if (privateSession) {
-    cachedGitHubBearerToken = privateSession;
-    return cachedGitHubBearerToken;
-  }
-  const envToken = cleanToken(process.env.RIG_GITHUB_TOKEN) ?? cleanToken(process.env.GITHUB_TOKEN) ?? cleanToken(process.env.GH_TOKEN);
-  if (envToken) {
-    cachedGitHubBearerToken = envToken;
-    return cachedGitHubBearerToken;
-  }
-  const result = spawnSync("gh", ["auth", "token"], {
-    encoding: "utf8",
-    timeout: 5000,
-    stdio: ["ignore", "pipe", "ignore"]
-  });
-  cachedGitHubBearerToken = result.status === 0 ? cleanToken(result.stdout) : null;
-  return cachedGitHubBearerToken;
+  if (privateSession)
+    return privateSession;
+  return cleanToken(process.env.RIG_SERVER_AUTH_TOKEN) ?? cleanToken(process.env.RIG_REMOTE_AUTH_TOKEN);
 }
 async function ensureServerForCli(projectRoot) {
   try {
@@ -226,7 +211,8 @@ async function loadRigConfigOrNull(projectRoot) {
 import { existsSync as existsSync3, readFileSync as readFileSync3, rmSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { resolve as resolve3 } from "path";
-var PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
+var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
+var LEGACY_PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
 async function defaultCommandRunner(command, options = {}) {
   const proc = Bun.spawn(command, { cwd: options.cwd, stdout: "pipe", stderr: "pipe" });
   const [stdout, stderr, exitCode] = await Promise.all([
@@ -245,7 +231,7 @@ function resolvePiHomeDir(inputHomeDir) {
 function piListContainsPiRig(output) {
   return output.split(/\r?\n/).some((line) => {
     const normalized = line.trim();
-    return normalized.includes(PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
+    return normalized.includes(PI_RIG_PACKAGE_NAME) || normalized.includes(LEGACY_PI_RIG_PACKAGE_NAME) || /(?:^|[\\/])packages[\\/]pi-rig(?:$|\s)/.test(normalized);
   });
 }
 async function safeRun(runner, command, options) {
@@ -421,7 +407,7 @@ async function runRigDoctorChecks(options) {
   const taskSourceKind = config?.taskSource?.kind;
   checks.push(taskSourceKind ? check("task-source", "task source configured", "pass", taskSourceKind) : check("task-source", "task source configured", "fail", "missing taskSource", "Configure taskSource in rig.config.ts."));
   const repo = readRepoConnection(projectRoot);
-  checks.push(repo ? check("project-link", "repo selected Rig connection", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to link this checkout to a GitHub repo slug.") : check("project-link", "repo selected Rig connection", "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig connect use <alias|local>`."));
+  checks.push(repo ? check("project-link", "repo selected Rig server", repo.project ? "pass" : "warn", `${repo.selected}${repo.project ? ` -> ${repo.project}` : ""}`, "Run `rig init --yes --repo owner/repo` to link this checkout to a GitHub repo slug.") : check("project-link", "repo selected Rig server", "fail", "missing .rig/state/connection.json", "Run `rig init` or `rig server use <alias|local>`."));
   const selected = (() => {
     try {
       return resolveSelectedConnection(projectRoot);
@@ -429,7 +415,7 @@ async function runRigDoctorChecks(options) {
       return null;
     }
   })();
-  checks.push(selected ? check("connection", "selected server connection", "pass", selected.connection.kind === "remote" ? selected.connection.baseUrl : "local auto") : check("connection", "selected server connection", repo ? "fail" : "warn", repo ? "selected alias is missing" : "will auto-start local server", repo ? "Run `rig connect list` and `rig connect use <alias|local>`." : undefined));
+  checks.push(selected ? check("connection", "selected server connection", "pass", selected.connection.kind === "remote" ? selected.connection.baseUrl : "local auto") : check("connection", "selected server", repo ? "fail" : "warn", repo ? "selected alias is missing" : "will auto-start local server", repo ? "Run `rig server list` and `rig server use <alias|local>`." : undefined));
   let server = null;
   try {
     server = await (options.resolveServer ?? ensureServerForCli)(projectRoot);

package/dist/src/commands/github.js

@@ -1,13 +1,11 @@
 // @bun
 // packages/cli/src/commands/github.ts
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync } from "child_process";
 
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
 import { CliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
 function takeOption(args, option) {
@@ -32,7 +30,6 @@ function takeOption(args, option) {
 }
 
 // packages/cli/src/commands/_server-client.ts
-import { spawnSync } from "child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } from "path";
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
@@ -114,13 +111,13 @@ function resolveSelectedConnection(projectRoot, options = {}) {
   const global = readGlobalConnections(options);
   const connection = global.connections[repo.selected];
   if (!connection) {
-    throw new CliError2(`Selected Rig connection "${repo.selected}" was not found. Run \`rig connect list\` or \`rig connect use local\`.`, 1);
+    throw new CliError2(`Selected Rig server "${repo.selected}" was not found. Run \`rig server list\` or \`rig server use local\`.`, 1);
   }
   return { alias: repo.selected, connection };
 }
 
 // packages/cli/src/commands/_server-client.ts
-var cachedGitHubBearerToken;
+var scopedGitHubBearerTokens = new Map;
 function cleanToken(value) {
   const trimmed = value?.trim();
   return trimmed ? trimmed : null;
@@ -137,25 +134,13 @@ function readPrivateRemoteSessionToken(projectRoot) {
   }
 }
 function readGitHubBearerTokenForRemote(projectRoot) {
-  if (cachedGitHubBearerToken !== undefined)
-    return cachedGitHubBearerToken;
+  const scopedKey = resolve2(projectRoot);
+  if (scopedGitHubBearerTokens.has(scopedKey))
+    return scopedGitHubBearerTokens.get(scopedKey) ?? null;
   const privateSession = readPrivateRemoteSessionToken(projectRoot);
-  if (privateSession) {
-    cachedGitHubBearerToken = privateSession;
-    return cachedGitHubBearerToken;
-  }
-  const envToken = cleanToken(process.env.RIG_GITHUB_TOKEN) ?? cleanToken(process.env.GITHUB_TOKEN) ?? cleanToken(process.env.GH_TOKEN);
-  if (envToken) {
-    cachedGitHubBearerToken = envToken;
-    return cachedGitHubBearerToken;
-  }
-  const result = spawnSync("gh", ["auth", "token"], {
-    encoding: "utf8",
-    timeout: 5000,
-    stdio: ["ignore", "pipe", "ignore"]
-  });
-  cachedGitHubBearerToken = result.status === 0 ? cleanToken(result.stdout) : null;
-  return cachedGitHubBearerToken;
+  if (privateSession)
+    return privateSession;
+  return cleanToken(process.env.RIG_SERVER_AUTH_TOKEN) ?? cleanToken(process.env.RIG_REMOTE_AUTH_TOKEN);
 }
 async function ensureServerForCli(projectRoot) {
   try {
@@ -244,7 +229,7 @@ function printPayload(context, payload, fallback) {
     console.log(fallback);
 }
 function readGhToken() {
-  const result = spawnSync2("gh", ["auth", "token"], { encoding: "utf8" });
+  const result = spawnSync("gh", ["auth", "token"], { encoding: "utf8" });
   if (result.status !== 0) {
     const detail = result.stderr?.trim() || result.stdout?.trim() || "gh auth token failed";
     throw new CliError2(`Could not import GitHub token from gh: ${detail}`, 1);