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

package/dist/src/index.js

@@ -1,4 +1,19 @@
 // @bun
+var __defProp = Object.defineProperty;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {
+      get: all[name],
+      enumerable: true,
+      configurable: true,
+      set: __exportSetter.bind(all, name)
+    });
+};
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
 // packages/cli/src/runner.ts
@@ -8,8 +23,6 @@ import { resolve } 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 withProjectRoot(projectRoot) {
@@ -18,7 +31,6 @@ function withProjectRoot(projectRoot) {
 function formatCommand(parts) {
   return parts.map((part) => /[^a-zA-Z0-9_./:-]/.test(part) ? JSON.stringify(part) : part).join(" ");
 }
-var AGENT_DISPATCH_SOURCE = "packages/runtime/bin/rig-agent-dispatch.ts";
 function hasAgentDispatchSource(root) {
   return existsSync(resolve(root, AGENT_DISPATCH_SOURCE));
 }
@@ -63,13 +75,6 @@ async function ensureAgentShellBinary(projectRoot, options = {}) {
 }
 async function initializeRuntime(options) {
   const eventBus = new EventBus({ projectRoot: options.projectRoot, runId: options.runId });
-  const runtimeContext = loadRuntimeContextFromEnv() ?? undefined;
-  const plugins = await PluginManager.load({
-    projectRoot: options.projectRoot,
-    runId: eventBus.getRunId(),
-    eventBus,
-    runtimeContext
-  });
   const context = {
     projectRoot: options.projectRoot,
     dryRun: options.dryRun,
@@ -77,10 +82,8 @@ async function initializeRuntime(options) {
     runId: eventBus.getRunId(),
     policyMode: options.policyMode,
     eventBus,
-    plugins,
     emitEvent: async (type, payload) => {
-      const event = await eventBus.emit(type, payload);
-      await plugins.onEvent(event);
+      await eventBus.emit(type, payload);
     }
   };
   context.runCommand = async (parts) => runCommand(context, parts);
@@ -89,8 +92,7 @@ async function initializeRuntime(options) {
     outputMode: context.outputMode,
     dryRun: context.dryRun,
     policyMode: context.policyMode ?? loadPolicy(options.projectRoot).mode,
-    policyFile: resolve(options.projectRoot, "rig/policy/policy.json"),
-    plugins: context.plugins.list()
+    policyFile: resolve(options.projectRoot, "rig/policy/policy.json")
   });
   return context;
 }
@@ -141,7 +143,6 @@ async function runCommand(context, parts) {
     });
     throw new CliError(`Policy blocked command: ${formatted}`, 126);
   }
-  await context.plugins.beforeCommand({ command: commandWithEnv, formattedCommand: formatted });
   const startedAt = new Date;
   await context.emitEvent("command.started", {
     command: commandWithEnv,
@@ -161,7 +162,6 @@ async function runCommand(context, parts) {
     if (context.outputMode === "text") {
       console.log(`$ ${formatted}`);
     }
-    await context.plugins.afterCommand(dryResult);
     await context.emitEvent("command.finished", {
       ...dryResult,
       dryRun: true
@@ -201,7 +201,6 @@ async function runCommand(context, parts) {
     stdout: context.outputMode === "json" ? stdout : undefined,
     stderr: context.outputMode === "json" ? stderr : undefined
   };
-  await context.plugins.afterCommand(result);
   if (exitCode !== 0) {
     await context.emitEvent("command.failed", {
       ...result
@@ -260,11 +259,278 @@ Usage: ${usage}`);
   }
   return taskId;
 }
+var AGENT_DISPATCH_SOURCE = "packages/runtime/bin/rig-agent-dispatch.ts";
+var init_runner = () => {};
+
+// packages/cli/src/commands/_parsers.ts
+import { homedir } from "os";
+import { resolve as resolve7 } from "path";
+function parsePositiveInt(value, option, fallback) {
+  if (!value) {
+    return fallback;
+  }
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    throw new CliError2(`Invalid ${option} value: ${value}`);
+  }
+  return parsed;
+}
+function parseOptionalPositiveInt(value, option) {
+  if (!value) {
+    return;
+  }
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    throw new CliError2(`Invalid ${option} value: ${value}`);
+  }
+  return parsed;
+}
+function parseRequiredPositiveInt(value, option) {
+  if (!value) {
+    throw new CliError2(`Missing value for ${option}.`);
+  }
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    throw new CliError2(`Invalid ${option} value: ${value}`);
+  }
+  return parsed;
+}
+function parseAction(value) {
+  if (!value || value === "validate") {
+    return "validate";
+  }
+  if (value === "verify") {
+    return "verify";
+  }
+  if (value === "pipeline") {
+    return "pipeline";
+  }
+  throw new CliError2(`Invalid --action value: ${value}. Use validate, verify, or pipeline.`);
+}
+function parseIsolationMode(value, allowOff) {
+  if (!value) {
+    return "worktree";
+  }
+  if (value === "worktree") {
+    return value;
+  }
+  if (allowOff && value === "off") {
+    return value;
+  }
+  throw new CliError2(`Invalid isolation mode: ${value}. Use ${allowOff ? "off|" : ""}worktree.`);
+}
+function parseInstallScope(value) {
+  if (!value || value === "user") {
+    return "user";
+  }
+  if (value === "system") {
+    return "system";
+  }
+  throw new CliError2(`Invalid --scope value: ${value}. Use user|system.`);
+}
+function resolveInstallDir(scope, explicitPath) {
+  if (explicitPath) {
+    return resolve7(explicitPath);
+  }
+  if (scope === "system") {
+    return "/usr/local/bin";
+  }
+  return resolve7(homedir(), ".local/bin");
+}
+async function loadRigConfigOrNull(projectRoot) {
+  try {
+    const { loadConfig } = await import("@rig/core/load-config");
+    return await loadConfig(projectRoot);
+  } catch {
+    return null;
+  }
+}
+var init__parsers = __esm(() => {
+  init_runner();
+});
+
+// packages/cli/src/commands/plugin.ts
+var exports_plugin = {};
+__export(exports_plugin, {
+  resolvePluginCliCommand: () => resolvePluginCliCommand,
+  executePlugin: () => executePlugin
+});
+import { buildPluginHostContext } from "@rig/runtime/control-plane/plugin-host-context";
+async function executePlugin(context, args) {
+  const [command = "list", ...rest] = args;
+  switch (command) {
+    case "list": {
+      requireNoExtraArgs(rest, "rig plugin list");
+      const declarative = [];
+      const config = await loadRigConfigOrNull(context.projectRoot);
+      if (config && Array.isArray(config.plugins)) {
+        for (const plugin of config.plugins) {
+          const c = plugin.contributes ?? {};
+          declarative.push({
+            name: plugin.name,
+            version: plugin.version,
+            validators: (c.validators ?? []).map((v) => v.id),
+            hooks: (c.hooks ?? []).map((h) => h.id),
+            agentRoles: (c.agentRoles ?? []).map((r) => r.id),
+            repoSources: (c.repoSources ?? []).map((r) => r.id),
+            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((entry) => entry.id)
+          });
+        }
+      }
+      if (context.outputMode === "text") {
+        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 = [];
+            if (p.validators.length)
+              lines.push(`    validators: ${p.validators.join(", ")}`);
+            if (p.hooks.length)
+              lines.push(`    hooks: ${p.hooks.join(", ")}`);
+            if (p.agentRoles.length)
+              lines.push(`    agent-roles: ${p.agentRoles.join(", ")}`);
+            if (p.repoSources.length)
+              lines.push(`    repo-sources: ${p.repoSources.join(", ")}`);
+            if (p.taskSources.length)
+              lines.push(`    task-sources: ${p.taskSources.join(", ")}`);
+            if (p.skills.length)
+              lines.push(`    skills: ${p.skills.join(", ")}`);
+            if (p.taskFieldExtensions.length)
+              lines.push(`    task-fields: ${p.taskFieldExtensions.join(", ")}`);
+            if (p.cliCommands.length)
+              lines.push(`    cli-commands: ${p.cliCommands.join(", ")} (run with \`rig plugin run <id>\`)`);
+            for (const line of lines)
+              console.log(line);
+          }
+        }
+      }
+      return {
+        ok: true,
+        group: "plugin",
+        command,
+        details: { declarative }
+      };
+    }
+    case "validate": {
+      const { value: task, rest: remaining } = takeOption(rest, "--task");
+      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") {
+        if (results.length === 0) {
+          console.log("No plugin validators registered.");
+        } else {
+          for (const result of results) {
+            const icon = result.passed ? "PASS" : "FAIL";
+            console.log(`[${icon}] ${result.id}: ${result.summary}`);
+            if (result.details && !result.passed) {
+              console.log(result.details);
+            }
+          }
+        }
+      }
+      if (failed > 0) {
+        throw new CliError2(`Plugin validation failed for ${failed} validator(s).`, 2);
+      }
+      return {
+        ok: true,
+        group: "plugin",
+        command,
+        details: {
+          taskId,
+          passed,
+          failed,
+          results
+        }
+      };
+    }
+    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;
+}
+var init_plugin = __esm(() => {
+  init_runner();
+  init__parsers();
+});
 
 // packages/cli/src/commands.ts
+init_runner();
+import {
+  existsSync as existsSync14
+} from "fs";
+import { resolve as resolve23 } from "path";
 import { readBuildConfig } from "@rig/runtime/build-time-config";
 
 // packages/cli/src/commands/browser.ts
+init_runner();
 import { mkdirSync as mkdirSync3, rmSync as rmSync2 } from "fs";
 import { resolve as resolve5 } from "path";
 import { spawn } from "child_process";
@@ -275,6 +541,7 @@ import pc2 from "picocolors";
 import { runCapture as runCapture2 } from "@rig/runtime/control-plane/native/utils";
 
 // packages/cli/src/commands/task-report-bug.ts
+init_runner();
 import { existsSync as existsSync3, readFileSync, writeFileSync as writeFileSync2 } from "fs";
 import { resolve as resolve4 } from "path";
 import * as clack from "@clack/prompts";
@@ -2099,6 +2366,7 @@ async function stopBrowserDemo(child) {
 }
 
 // packages/cli/src/commands/profile-and-review.ts
+init_runner();
 import {
   setProfile,
   setReviewProfile,
@@ -2238,10 +2506,12 @@ async function executeReview(context, args) {
 }
 
 // packages/cli/src/commands/repo-git-harness.ts
+init_runner();
 import { executeHarnessCommand } from "@rig/runtime/control-plane/native/harness-cli";
 import { repoEnsure, resetBaseline } from "@rig/runtime/control-plane/native/repo-ops";
 
 // packages/cli/src/commands/_policy.ts
+init_runner();
 import { appendFileSync, mkdirSync as mkdirSync4 } from "fs";
 import { resolve as resolve6 } from "path";
 import { evaluate as evaluate2, loadPolicy as loadPolicy2, resolveAction as resolveAction2 } from "@rig/runtime/control-plane/runtime/guard";
@@ -2336,7 +2606,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);
   }
@@ -2357,214 +2627,27 @@ 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);
   }
   return { ok: true, group: "harness", command: args[0] ?? "harness" };
 }
 
-// packages/cli/src/commands/_parsers.ts
-import { homedir } from "os";
-import { resolve as resolve7 } from "path";
-function parsePositiveInt(value, option, fallback) {
-  if (!value) {
-    return fallback;
-  }
-  const parsed = Number.parseInt(value, 10);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
-  }
-  return parsed;
-}
-function parseOptionalPositiveInt(value, option) {
-  if (!value) {
-    return;
-  }
-  const parsed = Number.parseInt(value, 10);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
-  }
-  return parsed;
-}
-function parseRequiredPositiveInt(value, option) {
-  if (!value) {
-    throw new CliError2(`Missing value for ${option}.`);
-  }
-  const parsed = Number.parseInt(value, 10);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
-  }
-  return parsed;
-}
-function parseAction(value) {
-  if (!value || value === "validate") {
-    return "validate";
-  }
-  if (value === "verify") {
-    return "verify";
-  }
-  if (value === "pipeline") {
-    return "pipeline";
-  }
-  throw new CliError2(`Invalid --action value: ${value}. Use validate, verify, or pipeline.`);
-}
-function parseIsolationMode(value, allowOff) {
-  if (!value) {
-    return "worktree";
-  }
-  if (value === "worktree") {
-    return value;
-  }
-  if (allowOff && value === "off") {
-    return value;
-  }
-  throw new CliError2(`Invalid isolation mode: ${value}. Use ${allowOff ? "off|" : ""}worktree.`);
-}
-function parseInstallScope(value) {
-  if (!value || value === "user") {
-    return "user";
-  }
-  if (value === "system") {
-    return "system";
-  }
-  throw new CliError2(`Invalid --scope value: ${value}. Use user|system.`);
-}
-function resolveInstallDir(scope, explicitPath) {
-  if (explicitPath) {
-    return resolve7(explicitPath);
-  }
-  if (scope === "system") {
-    return "/usr/local/bin";
-  }
-  return resolve7(homedir(), ".local/bin");
-}
-async function loadRigConfigOrNull(projectRoot) {
-  try {
-    const { loadConfig } = await import("@rig/core/load-config");
-    return await loadConfig(projectRoot);
-  } catch {
-    return null;
-  }
-}
-
-// packages/cli/src/commands/plugin.ts
-async function executePlugin(context, args) {
-  const [command = "list", ...rest] = args;
-  switch (command) {
-    case "list": {
-      requireNoExtraArgs(rest, "rig plugin list");
-      const legacyPlugins = context.plugins.list();
-      const declarative = [];
-      const config = await loadRigConfigOrNull(context.projectRoot);
-      if (config && Array.isArray(config.plugins)) {
-        for (const plugin of config.plugins) {
-          const c = plugin.contributes ?? {};
-          declarative.push({
-            name: plugin.name,
-            version: plugin.version,
-            validators: (c.validators ?? []).map((v) => v.id),
-            hooks: (c.hooks ?? []).map((h) => h.id),
-            agentRoles: (c.agentRoles ?? []).map((r) => r.id),
-            repoSources: (c.repoSources ?? []).map((r) => r.id),
-            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)
-          });
-        }
-      }
-      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):");
-          for (const p of declarative) {
-            console.log(`  ${p.name}@${p.version}`);
-            const lines = [];
-            if (p.validators.length)
-              lines.push(`    validators: ${p.validators.join(", ")}`);
-            if (p.hooks.length)
-              lines.push(`    hooks: ${p.hooks.join(", ")}`);
-            if (p.agentRoles.length)
-              lines.push(`    agent-roles: ${p.agentRoles.join(", ")}`);
-            if (p.repoSources.length)
-              lines.push(`    repo-sources: ${p.repoSources.join(", ")}`);
-            if (p.taskSources.length)
-              lines.push(`    task-sources: ${p.taskSources.join(", ")}`);
-            if (p.skills.length)
-              lines.push(`    skills: ${p.skills.join(", ")}`);
-            if (p.taskFieldExtensions.length)
-              lines.push(`    task-fields: ${p.taskFieldExtensions.join(", ")}`);
-            if (p.cliCommands.length)
-              lines.push(`    cli-commands: ${p.cliCommands.join(", ")}`);
-            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 }
-      };
-    }
-    case "validate": {
-      const { value: task, rest: remaining } = takeOption(rest, "--task");
-      requireNoExtraArgs(remaining, "rig plugin validate --task <task-id>");
-      const taskId = requireTask(task, "rig plugin validate --task <task-id>");
-      const results = await context.plugins.runValidators(taskId);
-      const passed = results.filter((result) => result.passed).length;
-      const failed = results.length - passed;
-      if (context.outputMode === "text") {
-        if (results.length === 0) {
-          console.log("No plugin validators registered.");
-        } else {
-          for (const result of results) {
-            const icon = result.passed ? "PASS" : "FAIL";
-            console.log(`[${icon}] ${result.id}: ${result.summary}`);
-            if (result.details && !result.passed) {
-              console.log(result.details);
-            }
-          }
-        }
-      }
-      if (failed > 0) {
-        throw new CliError2(`Plugin validation failed for ${failed} validator(s).`, 2);
-      }
-      return {
-        ok: true,
-        group: "plugin",
-        command,
-        details: {
-          taskId,
-          passed,
-          failed,
-          results
-        }
-      };
-    }
-    default:
-      throw new CliError2(`Unknown plugin command: ${command}`);
-  }
-}
+// packages/cli/src/commands.ts
+init_plugin();
 
 // packages/cli/src/commands/queue.ts
+init_runner();
+init__parsers();
 import { runPriorityQueue } from "@rig/runtime/control-plane/runtime/queue";
 
 // packages/cli/src/commands/_preflight.ts
+init_runner();
 import { ensureProjectMainFreshBeforeRun } from "@rig/runtime/control-plane/project-main-pre-run-sync";
 
 // packages/cli/src/commands/_connection-state.ts
+init_runner();
 import { existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
 import { homedir as homedir2 } from "os";
 import { dirname, resolve as resolve8 } from "path";
@@ -2667,6 +2750,7 @@ function resolveSelectedConnection(projectRoot, options = {}) {
 }
 
 // packages/cli/src/commands/_server-client.ts
+init_runner();
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
 import { resolve as resolve9 } from "path";
 import { ensureLocalRigServerConnection } from "@rig/runtime/local-server";
@@ -3315,6 +3399,7 @@ async function executeQueue(context, args) {
 }
 
 // packages/cli/src/commands/agent.ts
+init_runner();
 import { resolve as resolve11 } from "path";
 import {
   agentId,
@@ -3422,6 +3507,7 @@ function upsertAgentAuthorityRun(projectRoot, input) {
 }
 
 // packages/cli/src/commands/agent.ts
+init__parsers();
 function splitAtDoubleDash(args) {
   const separatorIndex = args.indexOf("--");
   if (separatorIndex === -1) {
@@ -3655,6 +3741,8 @@ ${result.stderr.trim()}` : ""}`, result.exitCode);
 }
 
 // packages/cli/src/commands/dist.ts
+init_runner();
+init__parsers();
 import {
   chmodSync,
   copyFileSync as copyFileSync2,
@@ -3972,6 +4060,7 @@ async function executeDist(context, args) {
 }
 
 // packages/cli/src/commands/inbox.ts
+init_runner();
 import { writeFileSync as writeFileSync4 } from "fs";
 import { resolve as resolve13 } from "path";
 import {
@@ -4494,6 +4583,7 @@ async function executeInbox(context, args) {
 }
 
 // packages/cli/src/commands/init.ts
+init_runner();
 import { appendFileSync as appendFileSync2, existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
 import { spawnSync } from "child_process";
 import { resolve as resolve17 } from "path";
@@ -4769,9 +4859,11 @@ async function uploadSnapshotArchiveViaServer(context, input) {
 }
 
 // packages/cli/src/commands/_doctor-checks.ts
+init_runner();
 import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
 import { resolve as resolve16 } from "path";
 import { isSupportedBunVersion, MIN_SUPPORTED_BUN_VERSION } from "@rig/runtime/control-plane/setup-version";
+init__parsers();
 function check(id, label, status, detail, remediation) {
   return {
     id,
@@ -5714,6 +5806,7 @@ Usage: rig init`, 1);
 }
 
 // packages/cli/src/commands/connect.ts
+init_runner();
 import { cancel as cancel2, isCancel as isCancel2, select as select2 } from "@clack/prompts";
 function usageName(options) {
   return `rig ${options.group}`;
@@ -5826,6 +5919,7 @@ async function executeConnect(context, args) {
 }
 
 // packages/cli/src/commands/github.ts
+init_runner();
 import { spawnSync as spawnSync2 } from "child_process";
 function printPayload(context, payload, fallback) {
   if (context.outputMode === "json")
@@ -5881,6 +5975,7 @@ async function executeGithub(context, args) {
 }
 
 // packages/cli/src/commands/doctor.ts
+init_runner();
 async function executeDoctor(context, args) {
   requireNoExtraArgs(args, "rig doctor");
   const checks = await runRigDoctorChecks({ projectRoot: context.projectRoot });
@@ -5896,6 +5991,7 @@ async function executeDoctor(context, args) {
 }
 
 // packages/cli/src/commands/_run-driver-helpers.ts
+init_runner();
 import { readFileSync as readFileSync7 } from "fs";
 import { resolve as resolve18 } from "path";
 import {
@@ -6123,6 +6219,7 @@ function renderSourceScopeValidation(task, validation) {
 }
 
 // packages/cli/src/commands/inspect.ts
+init_runner();
 import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
 import { resolve as resolve19 } from "path";
 import {
@@ -6250,6 +6347,8 @@ async function executeInspect(context, args) {
 }
 
 // packages/cli/src/commands/inspector.ts
+init_runner();
+init__parsers();
 import { iterateServerSentEvents } from "@rig/client";
 import { ensureLocalRigServerConnection as ensureLocalRigServerConnection2 } from "@rig/runtime/local-server";
 function formatInspectorStreamLine(payload) {
@@ -6440,6 +6539,8 @@ async function executeInspector(context, args) {
 }
 
 // packages/cli/src/commands/remote.ts
+init_runner();
+init__parsers();
 import {
   doctorManagedRemoteEndpoints,
   listManagedRemoteEndpoints,
@@ -6866,6 +6967,8 @@ async function executeRemote(context, args) {
 }
 
 // packages/cli/src/commands/run.ts
+init_runner();
+init__parsers();
 import { createInterface as createInterface2 } from "readline/promises";
 import {
   listAuthorityRuns as listAuthorityRuns3,
@@ -6883,7 +6986,7 @@ import {
   startRun,
   defaultStartRunOptions
 } from "@rig/runtime/control-plane/native/run-ops";
-import { loadRuntimeContextFromEnv as loadRuntimeContextFromEnv2 } from "@rig/runtime/control-plane/runtime/context";
+import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 
 // packages/cli/src/commands/_operator-surface.ts
 import { createInterface } from "readline";
@@ -7850,7 +7953,7 @@ async function promptForEpicSelection(projectRoot, command) {
 }
 async function executeRun(context, args) {
   const [command = "status", ...rest] = args;
-  const runtimeContext = loadRuntimeContextFromEnv2() ?? undefined;
+  const runtimeContext = loadRuntimeContextFromEnv() ?? undefined;
   switch (command) {
     case "list": {
       requireNoExtraArgs(rest, "rig run list");
@@ -8151,6 +8254,7 @@ async function executeRun(context, args) {
 }
 
 // packages/cli/src/commands/server.ts
+init_runner();
 async function executeServer(context, args, options) {
   const [command = "status", ...rest] = args;
   if (["status", "list", "add", "use"].includes(command)) {
@@ -8252,6 +8356,7 @@ async function executeServer(context, args, options) {
 }
 
 // packages/cli/src/commands/task.ts
+init_runner();
 import { readFileSync as readFileSync9 } from "fs";
 import { spawnSync as spawnSync3 } from "child_process";
 import { resolve as resolve20 } from "path";
@@ -8406,6 +8511,9 @@ var PRIMARY_GROUPS = [
       { command: "show <id>|--task <id> [--raw]", description: "Show a human task summary; --raw prints the full payload.", primary: true },
       { command: "run [#<issue>|<task-id>|--next|--task <id>]", description: "Submit a task run; interactive follows with bundled Pi.", primary: true },
       { command: "validate|verify [--task <id>]", description: "Run configured task checks/review gates." },
+      { command: "details --task <id>", description: "Show full task info from the configured source." },
+      { command: "reopen [--task <id> | --all] [--reason <text>]", description: "Reopen closed task(s) in the configured source." },
+      { command: "reset --task <id>", description: "Compatibility spelling of `reopen --task <id>`." },
       { command: "artifacts|artifact-dir|artifact-write", description: "Inspect or write task artifacts." },
       { command: "report-bug", description: "Create a structured bug report/task." }
     ],
@@ -8430,6 +8538,8 @@ var PRIMARY_GROUPS = [
       { command: "attach <run-id>|--run <id> [--follow]", description: "Attach to the run; --follow launches native bundled Pi for live Pi runs.", primary: true },
       { command: "stop [<run-id>|--run <id>]", description: "Request stop for one run or local active runs.", primary: true },
       { command: "timeline --run <id> [--follow]", description: "Stream raw run timeline events." },
+      { command: "resume", description: "Resume the most recent interrupted local run." },
+      { command: "restart", description: "Restart the most recent local run from a clean runtime." },
       { command: "delete|cleanup", description: "Remove completed run records/artifacts." }
     ],
     examples: [
@@ -8516,8 +8626,28 @@ var ADVANCED_GROUPS = [
   { name: "inspect", summary: "Inspect logs, artifacts, graphs, failures.", usage: ["rig inspect <logs|artifacts|failures|graph|audit|diff>"], commands: [{ command: "logs --task <id>", description: "Inspect task logs." }] },
   { name: "repo", summary: "Repository sync/baseline helpers.", usage: ["rig repo <sync|reset-baseline>"], commands: [{ command: "sync", description: "Sync project repository state." }] },
   { name: "profile", summary: "Runtime profile/model defaults.", usage: ["rig profile <show|set>"], commands: [{ command: "show", description: "Show active profile." }] },
-  { name: "browser", summary: "Browser/app diagnostics.", usage: ["rig browser <help|explain|demo|app>"], commands: [{ command: "help", description: "Browser command help." }] },
-  { name: "plugin", summary: "Plugin validation/listing.", usage: ["rig plugin <list|validate>"], commands: [{ command: "list", description: "List plugins." }] },
+  {
+    name: "browser",
+    summary: "Browser/app diagnostics for browser-required tasks.",
+    usage: ["rig browser <help|explain|demo|app|hp-next> [options]"],
+    commands: [
+      { command: "help", description: "Rich browser command help (canonical: `rig browser help`)." },
+      { command: "explain", description: "Explain the browser-required task contract." },
+      { command: "demo", description: "Run browser demo flows against a local page." },
+      { command: "app", description: "Launch the Rig Browser workstation app." },
+      { command: "hp-next <dev|check|e2e|reset>", description: "Drive the hp-next browser test harness." }
+    ]
+  },
+  {
+    name: "plugin",
+    summary: "Plugin listing, validation, and plugin-contributed commands.",
+    usage: ["rig plugin <list|validate|run> [options]"],
+    commands: [
+      { command: "list", description: "List plugins declared in rig.config.ts and their contributions." },
+      { command: "validate --task <id>", description: "Run plugin-contributed validators for a task." },
+      { command: "run <command-id> [args...]", description: "Execute a plugin-contributed CLI command (also callable as `rig <command-id>`)." }
+    ]
+  },
   { name: "queue", summary: "Run task queues locally.", usage: ["rig queue run [options]"], commands: [{ command: "run", description: "Process queue work." }] },
   { name: "agent", summary: "Runtime agent workspace helpers.", usage: ["rig agent <list|prepare|run|cleanup>"], commands: [{ command: "list", description: "List prepared agents." }] },
   { name: "inspector", summary: "Event stream and drift scanners.", usage: ["rig inspector <stream|scan-upstream-drift>"], commands: [{ command: "stream", description: "Stream events." }] },
@@ -8532,7 +8662,6 @@ var ADVANCED_COMMANDS = [
   { command: "rig server task-run ...", description: "Internal server-owned task execution entry point." },
   { command: "rig server notify-test [--event <type>]", description: "Internal event notification smoke command." },
   { command: "rig run start|start-serial|start-parallel", description: "Compatibility local run starters; prefer `rig task run ...`." },
-  { command: "rig setup install-agent-shell", description: "Development helper for materializing the agent shell." },
   { command: "rig remote orchestrate-*", description: "Compatibility remote orchestration commands." }
 ];
 var ALL_GROUPS = [...PRIMARY_GROUPS, ...ADVANCED_GROUPS];
@@ -8672,7 +8801,7 @@ function printGroupHelpDocument(groupName) {
 }
 
 // packages/cli/src/commands/task.ts
-import { buildPluginHostContext } from "@rig/runtime/control-plane/plugin-host-context";
+import { buildPluginHostContext as buildPluginHostContext2 } from "@rig/runtime/control-plane/plugin-host-context";
 import { loadConfig } from "@rig/core/load-config";
 async function readStdin() {
   const chunks = [];
@@ -8823,7 +8952,7 @@ function summarizeTask(task, options = {}) {
   };
 }
 async function validatorRegistryForTaskCommands(projectRoot) {
-  return buildPluginHostContext(projectRoot).then((ctx) => ctx?.validatorRegistry ?? undefined).catch(() => {
+  return buildPluginHostContext2(projectRoot).then((ctx) => ctx?.validatorRegistry ?? undefined).catch(() => {
     return;
   });
 }
@@ -9127,7 +9256,7 @@ async function executeTask(context, args, options) {
         await context.runCommand(["rig", "task", "verify", ...task ? ["--task", task] : []]);
         return { ok: true, group: "task", command, details: { task: task || "active" } };
       }
-      const ok = await withMutedConsole(context.outputMode === "json", () => taskVerify(context.projectRoot, context.plugins, task || undefined));
+      const ok = await withMutedConsole(context.outputMode === "json", () => taskVerify(context.projectRoot, task || undefined));
       if (!ok) {
         throw new CliError2(`Verification rejected for ${task || "active task"}.`, 2);
       }
@@ -9137,8 +9266,12 @@ async function executeTask(context, args, options) {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
       requireNoExtraArgs(remaining, "rig task reset --task <task-id>");
       const requiredTask = requireTask(task, "rig task reset --task <task-id>");
-      await context.runCommand(["br", "--no-db", "update", requiredTask, "--status", "open"]);
-      return { ok: true, group: "task", command, details: { task: requiredTask } };
+      const summary = withMutedConsole(context.outputMode === "json", () => taskReopen(context.projectRoot, {
+        all: false,
+        taskId: requiredTask,
+        dryRun: false
+      }));
+      return { ok: true, group: "task", command, details: summary };
     }
     case "details": {
       const { value: task, rest: remaining } = takeOption(rest, "--task");
@@ -9168,6 +9301,7 @@ async function executeTask(context, args, options) {
 }
 
 // packages/cli/src/commands/task-run-driver.ts
+init_runner();
 import { copyFileSync as copyFileSync3, existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync10, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
 import { resolve as resolve21 } from "path";
 import { spawn as spawn2, spawnSync as spawnSync4 } from "child_process";
@@ -11184,6 +11318,7 @@ Failed to update task source for ${input.taskId ?? runtimeTaskId} to failed: ${e
 }
 
 // packages/cli/src/commands/test.ts
+init_runner();
 async function executeTest(context, args) {
   const [command = "unit", ...rest] = args;
   switch (command) {
@@ -11205,6 +11340,7 @@ async function executeTest(context, args) {
 }
 
 // packages/cli/src/commands/setup.ts
+init_runner();
 import { existsSync as existsSync13, mkdirSync as mkdirSync9, readdirSync as readdirSync2, writeFileSync as writeFileSync7 } from "fs";
 import { resolve as resolve22 } from "path";
 import { createPluginHost } from "@rig/core";
@@ -11212,6 +11348,7 @@ import {
   isSupportedBunVersion as isSupportedBunVersion2,
   MIN_SUPPORTED_BUN_VERSION as MIN_SUPPORTED_BUN_VERSION2
 } from "@rig/runtime/control-plane/setup-version";
+init__parsers();
 async function executeSetup(context, args) {
   const [command = "check", ...rest] = args;
   switch (command) {
@@ -11252,12 +11389,6 @@ async function executeSetup(context, args) {
       requireNoExtraArgs(rest, "rig setup preflight");
       await withMutedConsole(context.outputMode === "json", () => runSetupPreflight(context.projectRoot));
       return { ok: true, group: "setup", command };
-    case "install-agent-shell":
-      requireNoExtraArgs(rest, "rig setup install-agent-shell");
-      if (context.outputMode === "text") {
-        console.log("install-agent-shell is deprecated. Runtime shells now use compiled rig-agent directly.");
-      }
-      return { ok: true, group: "setup", command };
     default:
       throw new CliError2(`Unknown setup command: ${command}`);
   }
@@ -11308,6 +11439,7 @@ async function runSetupPreflight(projectRoot) {
 }
 
 // packages/cli/src/commands/workspace.ts
+init_runner();
 import {
   mutateWorkspaceServiceFabric,
   readWorkspaceRemoteFleet,
@@ -11399,7 +11531,6 @@ var TOP_LEVEL_ALIASES = {
   check: ["setup", "check"],
   preflight: ["setup", "preflight"],
   install: ["dist", "install"],
-  "install-shell": ["setup", "install-agent-shell"],
   status: ["run", "status"],
   start: ["task", "run", "--next"],
   "start-parallel": ["run", "start-parallel"],
@@ -11432,6 +11563,30 @@ var TOP_LEVEL_ALIASES = {
   "remote-watch": ["remote", "watch"],
   doctor: ["doctor", "check"]
 };
+var PROJECT_REQUIRED_GROUPS = new Set([
+  "task",
+  "run",
+  "inbox",
+  "review",
+  "queue",
+  "agent",
+  "repo",
+  "inspect"
+]);
+var RIG_CONFIG_FILENAMES = ["rig.config.ts", "rig.config.mts", "rig.config.json"];
+function hasInitializedRigProject(projectRoot) {
+  return RIG_CONFIG_FILENAMES.some((name) => existsSync14(resolve23(projectRoot, name))) || existsSync14(resolve23(projectRoot, ".rig"));
+}
+function requireInitializedRigProject(context, group) {
+  if (hasInitializedRigProject(context.projectRoot)) {
+    return;
+  }
+  throw new CliError2([
+    `No Rig project found at ${context.projectRoot} (expected rig.config.ts or a .rig/ state directory).`,
+    "Run `rig init` to set up this repo, or pass --project <path> to point at an existing Rig project."
+  ].join(`
+`), 2);
+}
 var GROUPS = new Set([
   "init",
   "setup",
@@ -11529,10 +11684,28 @@ ${helpText()}`);
     }
     return executeGroup(context, group, [command, ...aliasArgs, ...rest]);
   }
+  if (await matchesPluginCliCommand(context, first)) {
+    return executeGroup(context, "plugin", ["run", first, ...rest]);
+  }
   throw new CliError2(`Unknown group or command: ${first}
 
 ${helpText()}`);
 }
+async function matchesPluginCliCommand(context, requested) {
+  if (!hasInitializedRigProject(context.projectRoot)) {
+    return false;
+  }
+  try {
+    const { buildPluginHostContext: buildPluginHostContext3 } = await import("@rig/runtime/control-plane/plugin-host-context");
+    const hostCtx = await buildPluginHostContext3(context.projectRoot);
+    if (!hostCtx)
+      return false;
+    const { resolvePluginCliCommand: resolvePluginCliCommand2 } = await Promise.resolve().then(() => (init_plugin(), exports_plugin));
+    return Boolean(resolvePluginCliCommand2(hostCtx.pluginHost.listCliCommands(), requested));
+  } catch {
+    return false;
+  }
+}
 var GROUPS_WITH_CUSTOM_HELP = new Set(["browser"]);
 async function executeGroup(context, group, args) {
   if (isHelpArg(args[0]) && !GROUPS_WITH_CUSTOM_HELP.has(group)) {
@@ -11541,6 +11714,9 @@ async function executeGroup(context, group, args) {
     }
     return { ok: true, group, command: "help" };
   }
+  if (PROJECT_REQUIRED_GROUPS.has(group)) {
+    requireInitializedRigProject(context, group);
+  }
   switch (group) {
     case "setup":
       return executeSetup(context, args);
@@ -11612,8 +11788,8 @@ var __testOnly = {
   validateRequiredBugPromptValue
 };
 // packages/cli/src/launcher.ts
-import { existsSync as existsSync14 } from "fs";
-import { basename as basename2, resolve as resolve23 } from "path";
+import { existsSync as existsSync15 } from "fs";
+import { basename as basename2, resolve as resolve24 } from "path";
 import { loadDotEnvSecrets } from "@rig/runtime/baked-secrets";
 import { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, resolveNearestRigProjectRoot } from "@rig/runtime/layout";
 function parsePolicyMode(value) {
@@ -11626,7 +11802,7 @@ function parsePolicyMode(value) {
   throw new Error(`Invalid --policy-mode value: ${value}. Use off|observe|enforce.`);
 }
 function hasRigProjectMarker(candidate) {
-  return existsSync14(resolve23(candidate, RIG_DEFINITION_DIRNAME)) || existsSync14(resolve23(candidate, RIG_STATE_DIRNAME)) || existsSync14(resolve23(candidate, "rig.config.ts")) || existsSync14(resolve23(candidate, "rig.config.json")) || existsSync14(resolve23(candidate, ".git"));
+  return existsSync15(resolve24(candidate, RIG_DEFINITION_DIRNAME)) || existsSync15(resolve24(candidate, RIG_STATE_DIRNAME)) || existsSync15(resolve24(candidate, "rig.config.ts")) || existsSync15(resolve24(candidate, "rig.config.json")) || existsSync15(resolve24(candidate, ".git"));
 }
 function resolveProjectRoot({
   envProjectRoot,
@@ -11635,19 +11811,19 @@ function resolveProjectRoot({
   cwd = process.cwd()
 }) {
   if (envProjectRoot) {
-    return resolve23(cwd, envProjectRoot);
+    return resolve24(cwd, envProjectRoot);
   }
   const fallbackImportDir = importDir ?? cwd;
   const execName = basename2(execPath).toLowerCase();
-  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve23(execPath, "..", "..")] : [];
-  const candidates = [cwd, ...execCandidates, resolve23(fallbackImportDir, "..")];
+  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve24(execPath, "..", "..")] : [];
+  const candidates = [cwd, ...execCandidates, resolve24(fallbackImportDir, "..")];
   for (const candidate of candidates) {
     const nearest = resolveNearestRigProjectRoot(candidate);
     if (hasRigProjectMarker(nearest)) {
       return nearest;
     }
   }
-  return resolve23(cwd);
+  return resolve24(cwd);
 }
 function normalizeCliErrorCode(message2, isCliError) {
   if (message2.startsWith("Invalid --policy-mode value:")) {
@@ -11714,7 +11890,7 @@ async function runRigCli(module, options = {}) {
         runId: context.runId,
         outcome,
         eventsFile: context.eventBus.getEventsFile(),
-        policyFile: resolve23(projectRoot, "rig", "policy", "policy.json"),
+        policyFile: resolve24(projectRoot, "rig", "policy", "policy.json"),
         policyMode: context.policyMode ?? policyMode ?? module.loadPolicy(projectRoot).mode
       }, null, 2));
     }
@@ -11738,6 +11914,7 @@ function hydrateProcessEnvFromDotEnv(projectRoot) {
 }
 
 // packages/cli/src/index.ts
+init_runner();
 var RIG_CLI_PACKAGE = "@rig/cli";
 export {
   withProjectRoot,