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

package/dist/src/commands/queue.js

@@ -1,12 +1,19 @@
 // @bun
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } 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";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 function takeFlag(args, flag) {
   const rest = [];
   let value = false;
@@ -27,7 +34,7 @@ function takeOption(args, option) {
     if (current === option) {
       const next = args[index + 1];
       if (!next || next.startsWith("-")) {
-        throw new CliError(`Missing value for ${option}`);
+        throw new CliError(`Missing value for ${option}`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} <value>\`.` });
       }
       value = next;
       index += 1;
@@ -56,7 +63,7 @@ function parsePositiveInt(value, option, fallback) {
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
@@ -70,7 +77,7 @@ function parseAction(value) {
   if (value === "pipeline") {
     return "pipeline";
   }
-  throw new CliError2(`Invalid --action value: ${value}. Use validate, verify, or pipeline.`);
+  throw new CliError(`Invalid --action value: ${value}. Use validate, verify, or pipeline.`);
 }
 function parseIsolationMode(value, allowOff) {
   if (!value) {
@@ -82,7 +89,7 @@ function parseIsolationMode(value, allowOff) {
   if (allowOff && value === "off") {
     return value;
   }
-  throw new CliError2(`Invalid isolation mode: ${value}. Use ${allowOff ? "off|" : ""}worktree.`);
+  throw new CliError(`Invalid isolation mode: ${value}. Use ${allowOff ? "off|" : ""}worktree.`);
 }
 
 // packages/cli/src/commands/_preflight.ts
@@ -90,6 +97,19 @@ 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;
+var serverReachabilityCache = new Map;
+var RESUMABLE_RUN_STATUSES = new Set([
+  "created",
+  "preparing",
+  "running",
+  "validating",
+  "reviewing",
+  "stopped",
+  "failed",
+  "needs-attention",
+  "needs_attention"
+]);
 
 // packages/cli/src/commands/_preflight.ts
 async function runProjectMainSyncPreflight(context, options) {
@@ -105,7 +125,7 @@ async function runProjectMainSyncPreflight(context, options) {
     runBootstrap: async () => {
       const bootstrap = await context.runCommand(["bun", "run", "bootstrap"]);
       if (bootstrap.exitCode !== 0) {
-        throw new CliError2(bootstrap.stderr || bootstrap.stdout || "bun run bootstrap failed during project pre-run sync", bootstrap.exitCode || 1);
+        throw new CliError(bootstrap.stderr || bootstrap.stdout || "bun run bootstrap failed during project pre-run sync", bootstrap.exitCode || 1);
       }
     }
   });
@@ -150,7 +170,7 @@ async function executeQueue(context, args) {
       pending = failFastResult.rest;
       const skipProjectSyncResult = takeFlag(pending, "--skip-project-sync");
       pending = skipProjectSyncResult.rest;
-      requireNoExtraArgs(pending, "bun run rig queue run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]");
+      requireNoExtraArgs(pending, "rig queue run [--workers <n>] [--max-tasks <n>] [--action validate|verify|pipeline] [--isolation off|worktree] [--no-runtime-reuse] [--fail-fast] [--skip-project-sync]");
       const workers = parsePositiveInt(workersResult.value, "--workers", 2);
       const maxTasks = parsePositiveInt(maxTasksResult.value, "--max-tasks", 10);
       const action = parseAction(actionResult.value);
@@ -171,7 +191,7 @@ async function executeQueue(context, args) {
         console.log(`Failed: ${summary.failed}`);
       }
       if (summary.failed > 0) {
-        throw new CliError2(`Queue finished with ${summary.failed} failed task(s).`, 3);
+        throw new CliError(`Queue finished with ${summary.failed} failed task(s).`, 3, { hint: "Inspect the failures with `rig inspect failures`, then re-run `rig queue run`." });
       }
       return {
         ok: true,
@@ -189,7 +209,7 @@ async function executeQueue(context, args) {
       };
     }
     default:
-      throw new CliError2(`Unknown queue command: ${command}`);
+      throw new CliError(`Unknown queue command: ${command}`, 1, { hint: "Run `rig queue --help` \u2014 the primary command is `rig queue run`." });
   }
 }
 export {

package/dist/src/commands/remote.d.ts

@@ -0,0 +1,3 @@
+import { type RunnerContext } from "../runner";
+import type { CommandOutcome } from "@rig/runtime/control-plane/runtime/types";
+export declare function executeRemote(context: RunnerContext, args: string[]): Promise<CommandOutcome>;

package/dist/src/commands/remote.js

@@ -1,12 +1,19 @@
 // @bun
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } 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";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 function takeFlag(args, flag) {
   const rest = [];
   let value = false;
@@ -27,7 +34,7 @@ function takeOption(args, option) {
     if (current === option) {
       const next = args[index + 1];
       if (!next || next.startsWith("-")) {
-        throw new CliError(`Missing value for ${option}`);
+        throw new CliError(`Missing value for ${option}`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} <value>\`.` });
       }
       value = next;
       index += 1;
@@ -75,17 +82,17 @@ function parseOptionalPositiveInt(value, option) {
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
 function parseRequiredPositiveInt(value, option) {
   if (!value) {
-    throw new CliError2(`Missing value for ${option}.`);
+    throw new CliError(`Missing value for ${option}.`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} 10\`.` });
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
@@ -134,7 +141,7 @@ async function executeRemote(context, args) {
     const [subcommand = "list", ...subRest] = rest;
     switch (subcommand) {
       case "list": {
-        requireNoExtraArgs(subRest, "bun run rig remote endpoint list");
+        requireNoExtraArgs(subRest, "rig remote endpoint list");
         const endpoints = listManagedRemoteEndpoints(undefined, context.projectRoot);
         const redactedEndpoints = endpoints.map((endpoint2) => redactRemoteEndpoint(endpoint2));
         if (context.outputMode === "text") {
@@ -158,9 +165,9 @@ async function executeRemote(context, args) {
         pending2 = port.rest;
         const token = takeOption(pending2, "--token");
         pending2 = token.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint add --alias <a> --host <h> --port <n> --token <t>");
+        requireNoExtraArgs(pending2, "rig remote endpoint add --alias <a> --host <h> --port <n> --token <t>");
         if (!alias.value || !host.value || !token.value || !port.value) {
-          throw new CliError2("remote endpoint add requires --alias, --host, --port, and --token.");
+          throw new CliError("remote endpoint add requires --alias, --host, --port, and --token.", 1, { hint: "Re-run as `rig remote endpoint add --alias <a> --host <h> --port <n> --token <t>`." });
         }
         const created = upsertManagedRemoteEndpoint({
           alias: alias.value,
@@ -185,9 +192,9 @@ async function executeRemote(context, args) {
         pending2 = port.rest;
         const token = takeOption(pending2, "--token");
         pending2 = token.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint update --id <id> [--alias <a>] [--host <h>] [--port <n>] [--token <t>]");
+        requireNoExtraArgs(pending2, "rig remote endpoint update --id <id> [--alias <a>] [--host <h>] [--port <n>] [--token <t>]");
         if (!endpointId.value && !alias.value) {
-          throw new CliError2("remote endpoint update requires --id <id> or --alias <a>.");
+          throw new CliError("remote endpoint update requires --id <id> or --alias <a>.", 1, { hint: "List endpoints with `rig remote endpoint list`, then pass --id or --alias." });
         }
         const updated = updateManagedRemoteEndpointInAuthority(context.projectRoot, {
           endpointId: endpointId.value || undefined,
@@ -197,7 +204,7 @@ async function executeRemote(context, args) {
           token: token.value || undefined
         });
         if (!updated) {
-          throw new CliError2("Remote endpoint not found.", 2);
+          throw new CliError("Remote endpoint not found.", 2, { hint: "Run `rig remote endpoint list` to see configured endpoints." });
         }
         if (context.outputMode === "text") {
           console.log(`Updated remote endpoint ${updated.alias} -> ${updated.host}:${updated.port}`);
@@ -208,13 +215,13 @@ async function executeRemote(context, args) {
         let pending2 = subRest;
         const alias = takeOption(pending2, "--alias");
         pending2 = alias.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint remove --alias <a>");
+        requireNoExtraArgs(pending2, "rig remote endpoint remove --alias <a>");
         if (!alias.value) {
-          throw new CliError2("remote endpoint remove requires --alias.");
+          throw new CliError("remote endpoint remove requires --alias.", 1, { hint: "Run `rig remote endpoint list` to find the alias, then `rig remote endpoint remove --alias <a>`." });
         }
         const removed = removeManagedRemoteEndpoint(alias.value, undefined, context.projectRoot);
         if (!removed) {
-          throw new CliError2(`Remote endpoint alias not found: ${alias.value}`, 2);
+          throw new CliError(`Remote endpoint alias not found: ${alias.value}`, 2, { hint: "Run `rig remote endpoint list` to see configured endpoint aliases." });
         }
         if (context.outputMode === "text") {
           console.log(`Removed remote endpoint ${alias.value}`);
@@ -225,9 +232,9 @@ async function executeRemote(context, args) {
         let pending2 = subRest;
         const alias = takeOption(pending2, "--alias");
         pending2 = alias.rest;
-        requireNoExtraArgs(pending2, "bun run rig remote endpoint test --alias <a>");
+        requireNoExtraArgs(pending2, "rig remote endpoint test --alias <a>");
         if (!alias.value) {
-          throw new CliError2("remote endpoint test requires --alias.");
+          throw new CliError("remote endpoint test requires --alias.", 1, { hint: "Run `rig remote endpoint list` to find the alias, then `rig remote endpoint test --alias <a>`." });
         }
         const endpoint2 = resolveRemoteEndpoint({ remoteAlias: alias.value, projectRoot: context.projectRoot });
         const client = new RemoteWsClient(endpoint2);
@@ -256,7 +263,7 @@ async function executeRemote(context, args) {
         }
       }
       case "migrate": {
-        requireNoExtraArgs(subRest, "bun run rig remote endpoint migrate");
+        requireNoExtraArgs(subRest, "rig remote endpoint migrate");
         const result = migrateManagedRemoteEndpoints(context.projectRoot);
         if (context.outputMode === "text") {
           console.log(`Imported ${result.imported} endpoint(s) from ${result.sourcePath}${result.skipped > 0 ? `, skipped ${result.skipped}` : ""}.`);
@@ -264,7 +271,7 @@ async function executeRemote(context, args) {
         return { ok: true, group: "remote", command: "endpoint migrate", details: result };
       }
       case "doctor": {
-        requireNoExtraArgs(subRest, "bun run rig remote endpoint doctor");
+        requireNoExtraArgs(subRest, "rig remote endpoint doctor");
         const result = doctorManagedRemoteEndpoints(context.projectRoot);
         if (context.outputMode === "text") {
           console.log(JSON.stringify(result, null, 2));
@@ -272,7 +279,7 @@ async function executeRemote(context, args) {
         return { ok: true, group: "remote", command: "endpoint doctor", details: result };
       }
       default:
-        throw new CliError2(`Unknown remote endpoint command: ${subcommand}`);
+        throw new CliError(`Unknown remote endpoint command: ${subcommand}`, 1, { hint: "Run `rig remote --help` for endpoint commands (list|add|update|remove|test)." });
     }
   }
   let pending = rest;
@@ -317,17 +324,17 @@ async function executeRemote(context, args) {
   try {
     switch (command) {
       case "test": {
-        requireNoExtraArgs(pending, "bun run rig remote test [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(pending, "rig remote test [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const response = await withClient((client) => client.ping());
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
       case "status": {
-        requireNoExtraArgs(pending, "bun run rig remote status [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(pending, "rig remote status [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const response = await withClient((client) => client.getState());
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
       case "tasks": {
-        requireNoExtraArgs(pending, "bun run rig remote tasks [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(pending, "rig remote tasks [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const response = await withClient((client) => client.getTasks());
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
@@ -337,11 +344,11 @@ async function executeRemote(context, args) {
         watchPending = secondsResult.rest;
         const eventResult = takeOption(watchPending, "--event");
         watchPending = eventResult.rest;
-        requireNoExtraArgs(watchPending, "bun run rig remote watch [--seconds <n>] [--event <type>] [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
+        requireNoExtraArgs(watchPending, "rig remote watch [--seconds <n>] [--event <type>] [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]");
         const seconds = parseOptionalPositiveInt(secondsResult.value, "--seconds");
         const eventFilter = eventResult.value || undefined;
         if (context.outputMode === "json" && !seconds) {
-          throw new CliError2("--json remote watch requires --seconds <n> to produce bounded output.", 2);
+          throw new CliError("--json remote watch requires --seconds <n> to produce bounded output.", 2, { hint: "Re-run as `rig remote watch --seconds 10 --json`." });
         }
         const captured = [];
         let dropped = 0;
@@ -406,7 +413,7 @@ async function executeRemote(context, args) {
       case "stop":
       case "continue":
       case "refresh": {
-        requireNoExtraArgs(pending, `bun run rig remote ${command} [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        requireNoExtraArgs(pending, `rig remote ${command} [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
         const response = await withClient(async (client) => {
           switch (command) {
             case "pause":
@@ -429,7 +436,7 @@ async function executeRemote(context, args) {
         let countPending = pending;
         const countResult = takeOption(countPending, "--count");
         countPending = countResult.rest;
-        requireNoExtraArgs(countPending, `bun run rig remote ${command} --count <n> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        requireNoExtraArgs(countPending, `rig remote ${command} --count <n> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
         const count = parseRequiredPositiveInt(countResult.value, "--count");
         const response = await withClient(async (client) => command === "add-iterations" ? await client.addIterations(count) : await client.removeIterations(count));
         assertRemoteOperationSuccess(command, response);
@@ -440,8 +447,8 @@ async function executeRemote(context, args) {
         let taskPending = pending;
         const taskResult = takeOption(taskPending, "--task");
         taskPending = taskResult.rest;
-        requireNoExtraArgs(taskPending, `bun run rig remote ${command} --task <id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
-        const taskId = requireTask(taskResult.value, `bun run rig remote ${command} --task <id>`);
+        requireNoExtraArgs(taskPending, `rig remote ${command} --task <id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        const taskId = requireTask(taskResult.value, `rig remote ${command} --task <id>`);
         const response = await withClient(async (client) => command === "prompt-preview" ? await client.getPromptPreview(taskId) : await client.getIterationOutput(taskId));
         assertRemoteOperationSuccess(command, response);
         return { ok: true, group: "remote", command, details: toDetails(response) };
@@ -454,7 +461,7 @@ async function executeRemote(context, args) {
         orchestrationPending = maxIterationsResult.rest;
         const directMergeResult = takeFlag(orchestrationPending, "--direct-merge");
         orchestrationPending = directMergeResult.rest;
-        requireNoExtraArgs(orchestrationPending, "bun run rig remote orchestrate-start [--max-workers <n>] [--max-iterations <n>] [--direct-merge]");
+        requireNoExtraArgs(orchestrationPending, "rig remote orchestrate-start [--max-workers <n>] [--max-iterations <n>] [--direct-merge]");
         const response = await withClient((client) => client.startOrchestration({
           maxWorkers: parseOptionalPositiveInt(maxWorkersResult.value, "--max-workers"),
           maxIterations: parseOptionalPositiveInt(maxIterationsResult.value, "--max-iterations"),
@@ -475,8 +482,8 @@ async function executeRemote(context, args) {
         let orchestrationPending = pending;
         const idResult = takeOption(orchestrationPending, "--id");
         orchestrationPending = idResult.rest;
-        requireNoExtraArgs(orchestrationPending, `bun run rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
-        const orchestrationId = requireTask(idResult.value, `bun run rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        requireNoExtraArgs(orchestrationPending, `rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
+        const orchestrationId = requireTask(idResult.value, `rig remote ${command} --id <orch-id> [--remote <alias>] [--host <host>] [--port <n>] [--token <token>]`);
         const response = await withClient(async (client) => {
           switch (command) {
             case "orchestrate-pause":
@@ -493,11 +500,11 @@ async function executeRemote(context, args) {
         return { ok: true, group: "remote", command, details: toDetails(response) };
       }
       default:
-        throw new CliError2(`Unknown remote command: ${command}`);
+        throw new CliError(`Unknown remote command: ${command}`, 1, { hint: "Run `rig remote --help` to list remote commands." });
     }
   } catch (error) {
     if (error instanceof RemoteCliError) {
-      throw new CliError2(`[${error.code}] ${error.message}`, error.exitCode);
+      throw new CliError(`[${error.code}] ${error.message}`, error.exitCode);
     }
     throw error;
   }

package/dist/src/commands/repo-git-harness.d.ts

@@ -0,0 +1,5 @@
+import { type RunnerContext } from "../runner";
+import type { CommandOutcome } from "@rig/runtime/control-plane/runtime/types";
+export declare function executeRepo(context: RunnerContext, args: string[]): Promise<CommandOutcome>;
+export declare function executeGit(context: RunnerContext, args: string[]): Promise<CommandOutcome>;
+export declare function executeHarness(context: RunnerContext, args: string[]): Promise<CommandOutcome>;

package/dist/src/commands/repo-git-harness.js

@@ -1,12 +1,19 @@
 // @bun
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } 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";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 function formatCommand(parts) {
   return parts.map((part) => /[^a-zA-Z0-9_./:-]/.test(part) ? JSON.stringify(part) : part).join(" ");
 }
@@ -30,7 +37,7 @@ function takeOption(args, option) {
     if (current === option) {
       const next = args[index + 1];
       if (!next || next.startsWith("-")) {
-        throw new CliError(`Missing value for ${option}`);
+        throw new CliError(`Missing value for ${option}`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} <value>\`.` });
       }
       value = next;
       index += 1;
@@ -148,7 +155,7 @@ async function enforceNativeCommandPolicy(context, args, options) {
     appendControlledBashAudit(context, mode, command, args, matchedRuleIds, action === "block" ? "blocked" : action === "warn" ? "warn" : undefined);
   }
   if (action === "block") {
-    throw new CliError2(`Policy blocked command: ${command}`, 126);
+    throw new CliError(`Policy blocked command: ${command}`, 126, { hint: "Review rig/policy/policy.json, or re-run with `--policy-mode observe` to log instead of block." });
   }
 }
 
@@ -158,23 +165,23 @@ async function executeRepo(context, args) {
   switch (command) {
     case "sync": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig repo sync [--task <beads-id>]");
+      requireNoExtraArgs(remaining, "rig repo sync [--task <task-id>]");
       withMutedConsole(context.outputMode === "json", () => repoEnsure(context.projectRoot, task || undefined));
       return { ok: true, group: "repo", command, details: { task: task || null } };
     }
     case "reset-baseline": {
       const { value: keepTaskStatusFlag, rest: remaining } = takeFlag(rest, "--keep-task-status");
-      requireNoExtraArgs(remaining, "bun run rig repo reset-baseline [--keep-task-status]");
+      requireNoExtraArgs(remaining, "rig repo reset-baseline [--keep-task-status]");
       withMutedConsole(context.outputMode === "json", () => resetBaseline(context.projectRoot, keepTaskStatusFlag));
       return { ok: true, group: "repo", command, details: { keepTaskStatus: keepTaskStatusFlag } };
     }
     default:
-      throw new CliError2(`Unknown repo command: ${command}`);
+      throw new CliError(`Unknown repo command: ${command}`, 1, { hint: "Run `rig repo --help` \u2014 commands are sync|reset-baseline." });
   }
 }
 async function executeGit(context, args) {
   if (args.length === 0) {
-    throw new CliError2("Usage: bun run rig git <git-flow args...>");
+    throw new CliError("Usage: rig git <git-flow args...>");
   }
   await enforceNativeCommandPolicy(context, args, {
     commandPrefix: "rig-agent git",
@@ -187,15 +194,15 @@ async function executeGit(context, args) {
     return { ok: true, group: "git", command: args[0] ?? "git" };
   }
   try {
-    await executeHarnessCommand(context.projectRoot, context.plugins, ["git", ...args]);
+    await executeHarnessCommand(context.projectRoot, ["git", ...args]);
   } catch (error) {
-    throw new CliError2(error instanceof Error ? error.message : String(error), 2);
+    throw new CliError(error instanceof Error ? error.message : String(error), 2);
   }
   return { ok: true, group: "git", command: args[0] ?? "git" };
 }
 async function executeHarness(context, args) {
   if (args.length === 0) {
-    throw new CliError2("Usage: bun run rig harness <harness args...>");
+    throw new CliError("Usage: rig harness <harness args...>");
   }
   await enforceNativeCommandPolicy(context, args, {
     commandPrefix: "rig-agent",
@@ -208,9 +215,9 @@ async function executeHarness(context, args) {
     return { ok: true, group: "harness", command: args[0] ?? "harness" };
   }
   try {
-    await executeHarnessCommand(context.projectRoot, context.plugins, args);
+    await executeHarnessCommand(context.projectRoot, args);
   } catch (error) {
-    throw new CliError2(error instanceof Error ? error.message : String(error), 2);
+    throw new CliError(error instanceof Error ? error.message : String(error), 2);
   }
   return { ok: true, group: "harness", command: args[0] ?? "harness" };
 }

package/dist/src/commands/run.d.ts

@@ -0,0 +1,3 @@
+import { type RunnerContext } from "../runner";
+import type { CommandOutcome } from "@rig/runtime/control-plane/runtime/types";
+export declare function executeRun(context: RunnerContext, args: string[]): Promise<CommandOutcome>;