@h-rig/cli 0.0.6-alpha.27 → 0.0.6-alpha.29

package/dist/src/commands/plugin.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 takeOption(args, option) {
@@ -43,6 +41,9 @@ Usage: ${usage}`);
   return taskId;
 }
 
+// packages/cli/src/commands/plugin.ts
+import { buildPluginHostContext } from "@rig/runtime/control-plane/plugin-host-context";
+
 // packages/cli/src/commands/_parsers.ts
 async function loadRigConfigOrNull(projectRoot) {
   try {
@@ -58,8 +59,7 @@ async function executePlugin(context, args) {
   const [command = "list", ...rest] = args;
   switch (command) {
     case "list": {
-      requireNoExtraArgs(rest, "bun run rig plugin list");
-      const legacyPlugins = context.plugins.list();
+      requireNoExtraArgs(rest, "rig plugin list");
       const declarative = [];
       const config = await loadRigConfigOrNull(context.projectRoot);
       if (config && Array.isArray(config.plugins)) {
@@ -75,16 +75,15 @@ async function executePlugin(context, args) {
             taskSources: (c.taskSources ?? []).map((s) => s.id),
             skills: (c.skills ?? []).map((s) => s.id),
             taskFieldExtensions: (c.taskFieldSchemas ?? []).map((f) => f.id),
-            cliCommands: (c.cliCommands ?? []).map((c2) => c2.id)
+            cliCommands: (c.cliCommands ?? []).map((entry) => entry.id)
           });
         }
       }
       if (context.outputMode === "text") {
-        if (legacyPlugins.length === 0 && declarative.length === 0) {
-          console.log("No plugins loaded.");
-        }
-        if (declarative.length > 0) {
-          console.log("Declarative plugins (rig.config.ts):");
+        if (declarative.length === 0) {
+          console.log("No plugins loaded. Declare plugins in rig.config.ts.");
+        } else {
+          console.log("Plugins (rig.config.ts):");
           for (const p of declarative) {
             console.log(`  ${p.name}@${p.version}`);
             const lines = [];
@@ -103,31 +102,45 @@ async function executePlugin(context, args) {
             if (p.taskFieldExtensions.length)
               lines.push(`    task-fields: ${p.taskFieldExtensions.join(", ")}`);
             if (p.cliCommands.length)
-              lines.push(`    cli-commands: ${p.cliCommands.join(", ")}`);
+              lines.push(`    cli-commands: ${p.cliCommands.join(", ")} (run with \`rig plugin run <id>\`)`);
             for (const line of lines)
               console.log(line);
           }
         }
-        if (legacyPlugins.length > 0) {
-          console.log("Legacy disk-scan plugins (rig/plugins/):");
-          for (const plugin of legacyPlugins) {
-            const validators = plugin.validators.length > 0 ? plugin.validators.join(", ") : "none";
-            console.log(`  ${plugin.name} (validators: ${validators})`);
-          }
-        }
       }
       return {
         ok: true,
         group: "plugin",
         command,
-        details: { declarative, legacy: legacyPlugins }
+        details: { declarative }
       };
     }
     case "validate": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "bun run rig plugin validate --task <beads-id>");
-      const taskId = requireTask(task, "bun run rig plugin validate --task <beads-id>");
-      const results = await context.plugins.runValidators(taskId);
+      requireNoExtraArgs(remaining, "rig plugin validate --task <task-id>");
+      const taskId = requireTask(task, "rig plugin validate --task <task-id>");
+      const hostCtx = await buildPluginHostContext(context.projectRoot);
+      if (!hostCtx) {
+        throw new CliError2(`No rig.config found at ${context.projectRoot}. Run \`rig init\` to set up plugins.`, 2);
+      }
+      const validators = hostCtx.validatorRegistry.list();
+      const results = [];
+      for (const validator of validators) {
+        try {
+          results.push(await validator.run({
+            taskId,
+            workspaceRoot: context.projectRoot,
+            scope: []
+          }));
+        } catch (error) {
+          results.push({
+            id: validator.id,
+            passed: false,
+            summary: `${validator.id} failed unexpectedly`,
+            details: `${error}`
+          });
+        }
+      }
       const passed = results.filter((result) => result.passed).length;
       const failed = results.length - passed;
       if (context.outputMode === "text") {
@@ -158,10 +171,51 @@ async function executePlugin(context, args) {
         }
       };
     }
+    case "run": {
+      const [commandId, ...commandArgs] = rest;
+      if (!commandId) {
+        throw new CliError2("Usage: rig plugin run <command-id> [args...]");
+      }
+      const hostCtx = await buildPluginHostContext(context.projectRoot);
+      if (!hostCtx) {
+        throw new CliError2(`No rig.config found at ${context.projectRoot}. Run \`rig init\` to set up plugins.`, 2);
+      }
+      const registration = resolvePluginCliCommand(hostCtx.pluginHost.listCliCommands(), commandId);
+      if (!registration) {
+        const available = hostCtx.pluginHost.listCliCommands().map((entry) => entry.id);
+        throw new CliError2(available.length > 0 ? `Unknown plugin command "${commandId}". Available: ${available.join(", ")}` : `No plugin CLI commands are registered. Plugins contribute them via contributes.cliCommands.`, 2);
+      }
+      if (context.dryRun) {
+        if (context.outputMode === "text") {
+          console.log(`[dry-run] ${registration.command}${commandArgs.length ? ` ${commandArgs.join(" ")}` : ""}`);
+        }
+        return { ok: true, group: "plugin", command, details: { id: registration.id, dryRun: true } };
+      }
+      const proc = Bun.spawn(["bash", "-c", `${registration.command} "$@"`, registration.id, ...commandArgs], {
+        cwd: context.projectRoot,
+        env: process.env,
+        stdin: "inherit",
+        stdout: "inherit",
+        stderr: "inherit"
+      });
+      const exitCode = await proc.exited;
+      if (exitCode !== 0) {
+        throw new CliError2(`Plugin command "${registration.id}" exited with code ${exitCode}.`, exitCode);
+      }
+      return { ok: true, group: "plugin", command, details: { id: registration.id, exitCode } };
+    }
     default:
       throw new CliError2(`Unknown plugin command: ${command}`);
   }
 }
+function resolvePluginCliCommand(commands, requested) {
+  const exact = commands.find((entry) => entry.id === requested);
+  if (exact)
+    return exact;
+  const byLocalPart = commands.filter((entry) => entry.id.split(":").slice(1).join(":") === requested);
+  return byLocalPart.length === 1 ? byLocalPart[0] : undefined;
+}
 export {
+  resolvePluginCliCommand,
   executePlugin
 };

package/dist/src/commands/profile-and-review.js

@@ -3,8 +3,6 @@
 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) {
@@ -86,17 +84,17 @@ async function executeProfile(context, args) {
   const [command = "show", ...rest] = args;
   switch (command) {
     case "show":
-      requireNoExtraArgs(rest, "bun run rig profile show");
+      requireNoExtraArgs(rest, "rig profile show");
       await withMutedConsole(context.outputMode === "json", () => showProfile(context.projectRoot));
       return { ok: true, group: "profile", command };
     case "set": {
       if (rest.length === 0) {
-        throw new CliError2("Usage: bun run rig profile set <claude-code|codex-cli|pi> or set [--model ...] [--runtime ...] [--plugin ...]");
+        throw new CliError2("Usage: rig profile set <claude-code|codex-cli|pi> or set [--model ...] [--runtime ...] [--plugin ...]");
       }
       const preset = rest[0];
       if (preset && !preset.startsWith("-")) {
         if (rest.length !== 1) {
-          throw new CliError2("Usage: bun run rig profile set <claude-code|codex-cli|pi>");
+          throw new CliError2("Usage: rig profile set <claude-code|codex-cli|pi>");
         }
         try {
           await withMutedConsole(context.outputMode === "json", () => setProfile(context.projectRoot, { preset }));
@@ -112,7 +110,7 @@ async function executeProfile(context, args) {
       pending = runtimeResult.rest;
       const pluginResult = takeOption(pending, "--plugin");
       pending = pluginResult.rest;
-      requireNoExtraArgs(pending, "bun run rig profile set [--model ...] [--runtime ...] [--plugin ...]");
+      requireNoExtraArgs(pending, "rig profile set [--model ...] [--runtime ...] [--plugin ...]");
       if (!modelResult.value && !runtimeResult.value && !pluginResult.value) {
         throw new CliError2("Provide at least one of --model, --runtime, or --plugin.");
       }
@@ -144,21 +142,21 @@ async function executeReview(context, args) {
   const [command = "show", ...rest] = args;
   switch (command) {
     case "show":
-      requireNoExtraArgs(rest, "bun run rig review show");
+      requireNoExtraArgs(rest, "rig review show");
       await withMutedConsole(context.outputMode === "json", () => showReviewProfile(context.projectRoot));
       return { ok: true, group: "review", command };
     case "set": {
       if (rest.length === 0) {
-        throw new CliError2("Usage: bun run rig review set <off|advisory|required> [--provider greptile]");
+        throw new CliError2("Usage: rig review set <off|advisory|required> [--provider greptile]");
       }
       const mode = rest[0];
       if (!mode) {
-        throw new CliError2("Usage: bun run rig review set <off|advisory|required> [--provider greptile]");
+        throw new CliError2("Usage: rig review set <off|advisory|required> [--provider greptile]");
       }
       let pending = rest.slice(1);
       const providerResult = takeOption(pending, "--provider");
       pending = providerResult.rest;
-      requireNoExtraArgs(pending, "bun run rig review set <off|advisory|required> [--provider greptile]");
+      requireNoExtraArgs(pending, "rig review set <off|advisory|required> [--provider greptile]");
       try {
         await withMutedConsole(context.outputMode === "json", () => {
           return setReviewProfile(context.projectRoot, mode, providerResult.value);

package/dist/src/commands/queue.js

@@ -3,8 +3,6 @@
 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) {
@@ -151,7 +149,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);

package/dist/src/commands/remote.js

@@ -3,8 +3,6 @@
 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) {
@@ -134,7 +132,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,7 +156,7 @@ 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.");
         }
@@ -185,7 +183,7 @@ 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>.");
         }
@@ -208,7 +206,7 @@ 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.");
         }
@@ -225,7 +223,7 @@ 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.");
         }
@@ -256,7 +254,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 +262,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));
@@ -317,17 +315,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,7 +335,7 @@ 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) {
@@ -406,7 +404,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 +427,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 +438,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 +452,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 +473,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":

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

@@ -3,8 +3,6 @@
 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 formatCommand(parts) {
@@ -158,13 +156,13 @@ 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 } };
     }
@@ -174,7 +172,7 @@ async function executeRepo(context, args) {
 }
 async function executeGit(context, args) {
   if (args.length === 0) {
-    throw new CliError2("Usage: bun run rig git <git-flow args...>");
+    throw new CliError2("Usage: rig git <git-flow args...>");
   }
   await enforceNativeCommandPolicy(context, args, {
     commandPrefix: "rig-agent git",
@@ -187,7 +185,7 @@ 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);
   }
@@ -195,7 +193,7 @@ async function executeGit(context, args) {
 }
 async function executeHarness(context, args) {
   if (args.length === 0) {
-    throw new CliError2("Usage: bun run rig harness <harness args...>");
+    throw new CliError2("Usage: rig harness <harness args...>");
   }
   await enforceNativeCommandPolicy(context, args, {
     commandPrefix: "rig-agent",
@@ -208,7 +206,7 @@ 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);
   }