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

package/dist/src/launcher.js

@@ -1,7 +1,7 @@
 // @bun
 // packages/cli/src/launcher.ts
 import { existsSync } from "fs";
-import { resolve } from "path";
+import { basename, resolve } from "path";
 import { loadDotEnvSecrets } from "@rig/runtime/baked-secrets";
 import { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, resolveNearestRigProjectRoot } from "@rig/runtime/layout";
 function parsePolicyMode(value) {
@@ -14,7 +14,7 @@ function parsePolicyMode(value) {
   throw new Error(`Invalid --policy-mode value: ${value}. Use off|observe|enforce.`);
 }
 function hasRigProjectMarker(candidate) {
-  return existsSync(resolve(candidate, RIG_DEFINITION_DIRNAME)) || existsSync(resolve(candidate, RIG_STATE_DIRNAME)) || existsSync(resolve(candidate, "rig.config.ts")) || existsSync(resolve(candidate, "rig.config.json"));
+  return existsSync(resolve(candidate, RIG_DEFINITION_DIRNAME)) || existsSync(resolve(candidate, RIG_STATE_DIRNAME)) || existsSync(resolve(candidate, "rig.config.ts")) || existsSync(resolve(candidate, "rig.config.json")) || existsSync(resolve(candidate, ".git"));
 }
 function resolveProjectRoot({
   envProjectRoot,
@@ -26,7 +26,9 @@ function resolveProjectRoot({
     return resolve(cwd, envProjectRoot);
   }
   const fallbackImportDir = importDir ?? cwd;
-  const candidates = [cwd, resolve(execPath, "..", ".."), resolve(fallbackImportDir, "..")];
+  const execName = basename(execPath).toLowerCase();
+  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve(execPath, "..", "..")] : [];
+  const candidates = [cwd, ...execCandidates, resolve(fallbackImportDir, "..")];
   for (const candidate of candidates) {
     const nearest = resolveNearestRigProjectRoot(candidate);
     if (hasRigProjectMarker(nearest)) {

package/dist/src/report-bug.js

@@ -166,15 +166,15 @@ function buildBugReportMarkdown(input, browser, screenshots, assets) {
     ...input.issueId ? [
       `- Canonical task assets live under \`artifacts/${input.issueId}/bug-report/\`.`,
       `- Start with \`artifacts/${input.issueId}/bug-report/task.md\` and the files in \`artifacts/${input.issueId}/bug-report/assets/\`.`,
-      browserRequired ? `- Run \`bun run rig task info --task ${input.issueId}\` to confirm browser wiring before debugging.` : `- Run \`bun run rig task info --task ${input.issueId}\` to confirm scope and artifact links before debugging.`
+      browserRequired ? `- Run \`rig task info --task ${input.issueId}\` to confirm browser wiring before debugging.` : `- Run \`rig task info --task ${input.issueId}\` to confirm scope and artifact links before debugging.`
     ] : [
-      "- Draft-only report: convert this into a beads task before assigning it to an agent run."
+      "- Draft-only report: convert this into a Rig task before assigning it to an agent run."
     ],
     "",
     "## Validation",
     "",
     "```bash",
-    ...input.issueId ? [`bun run rig task validate --task ${input.issueId}`] : [],
+    ...input.issueId ? [`rig task validate --task ${input.issueId}`] : [],
     ...browserRequired ? [
       "bun run app:check:browser:hp-next",
       "bun run app:e2e:browser:hp-next"

package/dist/src/runner.js

@@ -6,8 +6,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) {
@@ -61,13 +59,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,
@@ -75,10 +66,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);
@@ -87,8 +76,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;
 }
@@ -99,12 +87,13 @@ async function runCommand(context, parts) {
   const envMode = process.env.RIG_BASH_MODE;
   const effectiveMode = context.policyMode || (envMode === "off" || envMode === "observe" || envMode === "enforce" ? envMode : loadPolicy(context.projectRoot).mode);
   const controlledPath = `${resolve(context.projectRoot, ".rig", "bin")}:${context.projectRoot}/rig/tools:${process.env.PATH ?? ""}`;
-  const controlledBash = await ensureAgentShellBinary(context.projectRoot);
+  const usesInfrastructureBinary = parts[0] === "rig-server";
+  const controlledBash = usesInfrastructureBinary ? null : await ensureAgentShellBinary(context.projectRoot);
   const commandEnv = [
     "env",
     `PATH=${controlledPath}`,
     `PROJECT_RIG_ROOT=${context.projectRoot}`,
-    `BASH=${controlledBash}`,
+    ...controlledBash ? [`BASH=${controlledBash}`] : [],
     `RIG_BASH_MODE=${effectiveMode}`,
     `RIG_POLICY_FILE=${resolve(context.projectRoot, "rig/policy/policy.json")}`,
     ...context.eventBus.getEventsFile() ? [`RIG_EVENTS_FILE=${context.eventBus.getEventsFile()}`] : []
@@ -138,7 +127,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,
@@ -158,7 +146,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
@@ -198,7 +185,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.3",
+  "version": "0.0.6-alpha.31",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,9 +23,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.3",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.3",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.3",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.31",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.31",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.31",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.31",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.31",
     "picocolors": "^1.1.1"
   }
 }