@h-rig/runtime 0.0.6-alpha.3 → 0.0.6-alpha.30

package/dist/src/index.js

@@ -12,22 +12,27 @@ var RIG_STATE_DIRNAME = ".rig";
 var RIG_ARTIFACTS_DIRNAME = "artifacts";
 function resolveNearestRigProjectRoot(startDir) {
   let current = resolve(startDir);
-  let fallbackCandidate = null;
+  let weakMarkerCandidate = null;
   let projectCandidate = null;
   for (;; ) {
     const hasDefinition = existsSync(resolve(current, RIG_DEFINITION_DIRNAME));
     const hasState = existsSync(resolve(current, RIG_STATE_DIRNAME));
+    const hasTaskConfig = existsSync(resolve(current, RIG_STATE_DIRNAME, "task-config.json"));
     const hasConfig = existsSync(resolve(current, "rig.config.ts")) || existsSync(resolve(current, "rig.config.json"));
+    const hasGit = existsSync(resolve(current, ".git"));
     const hasControlPlane = existsSync(resolve(current, "packages", "cli", "bin", "rig.ts")) || existsSync(resolve(current, "packages", "server"));
-    if (hasDefinition || hasState || hasConfig) {
-      fallbackCandidate = current;
-      if (hasControlPlane) {
-        projectCandidate = current;
-      }
+    if ((hasDefinition || hasState || hasConfig) && weakMarkerCandidate === null) {
+      weakMarkerCandidate = current;
+    }
+    if ((hasControlPlane || hasConfig || hasTaskConfig) && projectCandidate === null) {
+      projectCandidate = current;
+    }
+    if (hasGit) {
+      return projectCandidate ?? current;
     }
     const parent = resolve(current, "..");
     if (parent === current) {
-      return projectCandidate ?? fallbackCandidate ?? resolve(startDir);
+      return projectCandidate ?? weakMarkerCandidate ?? resolve(startDir);
     }
     current = parent;
   }
@@ -619,6 +624,18 @@ async function waitForServerHealthy(baseUrl, authToken, timeoutMs) {
   }
   return false;
 }
+function resolveRigServerSpawnPlan(projectRoot, host, authToken, which = (command) => Bun.which(command)) {
+  const binary = process.env.RIG_SERVER_BIN?.trim() || which("rig-server")?.trim();
+  const args = ["start", "--host", host, "--port", "0", "--auth-token", authToken];
+  if (binary) {
+    return { command: binary, args, cwd: projectRoot };
+  }
+  return {
+    command: "bun",
+    args: ["run", "packages/server/src/server.ts", ...args],
+    cwd: resolve5(import.meta.dir, "../../..")
+  };
+}
 async function waitForPublishedServer(projectRoot, authToken, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
@@ -644,23 +661,13 @@ async function ensureLocalRigServerConnection(projectRoot, options = {}) {
   const host = options.host ?? "127.0.0.1";
   const startupTimeoutMs = options.startupTimeoutMs ?? 15000;
   const authToken = Buffer.from(crypto.getRandomValues(new Uint8Array(24))).toString("hex");
-  const workspaceRoot = resolve5(import.meta.dir, "../../..");
   const bootstrapLogPath = resolveRigServerLogPath(projectRoot);
   mkdirSync2(resolveRigServerPaths(projectRoot).logsDir, { recursive: true });
   const bootstrapLogFd = openSync(bootstrapLogPath, "w");
   clearPublishedRigServerState(projectRoot);
-  const child = spawn("bun", [
-    "run",
-    "packages/server/src/server.ts",
-    "start",
-    "--host",
-    host,
-    "--port",
-    "0",
-    "--auth-token",
-    authToken
-  ], {
-    cwd: workspaceRoot,
+  const spawnPlan = resolveRigServerSpawnPlan(projectRoot, host, authToken);
+  const child = spawn(spawnPlan.command, [...spawnPlan.args], {
+    cwd: spawnPlan.cwd,
     env: {
       ...process.env,
       PROJECT_RIG_ROOT: projectRoot
@@ -1062,280 +1069,6 @@ async function spawnProcess(command, args, options) {
   });
   return { exitCode, stdout, stderr, timedOut };
 }
-// packages/runtime/src/plugins.ts
-import { existsSync as existsSync6, readdirSync } from "fs";
-import { basename as basename3, resolve as resolve7 } from "path";
-
-// packages/runtime/src/control-plane/runtime/plugin-mode.ts
-var LEGACY_PLUGIN_SCAN_ENV = "RIG_LEGACY_PLUGIN_SCAN";
-function isLegacyPluginScanEnabled(env = process.env) {
-  const value = env[LEGACY_PLUGIN_SCAN_ENV]?.trim().toLowerCase();
-  return value === "1" || value === "true" || value === "yes" || value === "on";
-}
-
-// packages/runtime/src/plugins.ts
-var runtimeHookPhases = ["beforeCommand", "afterCommand", "onEvent"];
-var PLUGIN_SOURCE_PATTERN = /\.plugin\.(ts|js|mjs|cjs)$/;
-function inferRuntimePluginName(fileName) {
-  return fileName.replace(PLUGIN_SOURCE_PATTERN, "");
-}
-function describeRuntimePluginFiles(filePaths) {
-  return filePaths.filter((filePath) => PLUGIN_SOURCE_PATTERN.test(filePath)).map((filePath) => {
-    const fileName = filePath.split(/[\\/]/).at(-1) ?? filePath;
-    const name = inferRuntimePluginName(fileName);
-    return { name, sourcePath: filePath, binaryName: name };
-  });
-}
-
-class PluginManager {
-  eventBus;
-  context;
-  pluginDir;
-  pluginFiles;
-  pluginNames;
-  localBinDir;
-  imageBinDir;
-  pluginsRequireBinaries;
-  ensureImageBinDir;
-  plugins = null;
-  loadPromise = null;
-  constructor(options) {
-    this.eventBus = options.eventBus;
-    this.context = options.context;
-    this.pluginDir = options.pluginDir;
-    this.pluginFiles = options.pluginFiles;
-    this.pluginNames = options.pluginNames;
-    this.localBinDir = options.localBinDir;
-    this.imageBinDir = options.imageBinDir;
-    this.pluginsRequireBinaries = options.pluginsRequireBinaries;
-    this.ensureImageBinDir = options.ensureImageBinDir;
-  }
-  static async load(options) {
-    const pluginDir = options.pluginDir ?? resolve7(options.projectRoot, "rig", "plugins");
-    const localBinDir = options.localBinDir ?? resolve7(options.projectRoot, "rig", "plugins");
-    const imageBinDir = options.imageBinDir ?? (options.runtimeContext ? resolve7(options.runtimeContext.binDir, "plugins") : "");
-    const legacyPluginScan = options.legacyPluginScan ?? isLegacyPluginScanEnabled(options.env);
-    const pluginFiles = legacyPluginScan ? safeReadDir(pluginDir).filter((entry) => PLUGIN_SOURCE_PATTERN.test(entry)) : [];
-    const pluginNames = pluginFiles.map((file) => inferRuntimePluginName(basename3(file)));
-    const context = {
-      projectRoot: options.projectRoot,
-      runId: options.runId,
-      eventBus: options.eventBus
-    };
-    return new PluginManager({
-      eventBus: options.eventBus,
-      context,
-      pluginDir,
-      pluginFiles,
-      pluginNames,
-      localBinDir,
-      imageBinDir,
-      pluginsRequireBinaries: options.pluginsRequireBinaries ?? true,
-      ensureImageBinDir: options.ensureImageBinDir
-    });
-  }
-  list() {
-    if (this.plugins) {
-      return this.plugins.map((plugin) => ({
-        name: plugin.name,
-        validators: plugin.validators?.map((validator) => validator.id) ?? []
-      }));
-    }
-    return this.pluginNames.map((name) => ({ name, validators: [] }));
-  }
-  async beforeCommand(ctx) {
-    const plugins = await this.ensureLoaded();
-    for (const plugin of plugins) {
-      if (!plugin.beforeCommand)
-        continue;
-      await this.safeInvoke(plugin.name, "beforeCommand", () => plugin.beforeCommand?.(ctx, this.context));
-    }
-  }
-  async afterCommand(result) {
-    const plugins = await this.ensureLoaded();
-    for (const plugin of plugins) {
-      if (!plugin.afterCommand)
-        continue;
-      await this.safeInvoke(plugin.name, "afterCommand", () => plugin.afterCommand?.(result, this.context));
-    }
-  }
-  async onEvent(event) {
-    const plugins = this.plugins;
-    if (!plugins)
-      return;
-    for (const plugin of plugins) {
-      if (!plugin.onEvent)
-        continue;
-      await this.safeInvoke(plugin.name, "onEvent", () => plugin.onEvent?.(event, this.context));
-    }
-  }
-  async runValidators(taskId) {
-    const plugins = await this.ensureLoaded();
-    const results = [];
-    for (const plugin of plugins) {
-      for (const validator of plugin.validators ?? []) {
-        await this.eventBus.emit("validator.started", {
-          plugin: plugin.name,
-          validator: validator.id,
-          taskId
-        });
-        try {
-          const result = await validator.run({ taskId, projectRoot: this.context.projectRoot }, this.context);
-          results.push(result);
-          await this.eventBus.emit("validator.finished", {
-            plugin: plugin.name,
-            validator: validator.id,
-            taskId,
-            passed: result.passed,
-            summary: result.summary
-          });
-        } catch (error) {
-          const failed = {
-            id: validator.id,
-            passed: false,
-            summary: `${plugin.name}/${validator.id} failed unexpectedly`,
-            details: `${error}`
-          };
-          results.push(failed);
-          await this.eventBus.emit("validator.finished", {
-            plugin: plugin.name,
-            validator: validator.id,
-            taskId,
-            passed: false,
-            summary: failed.summary,
-            details: failed.details
-          });
-        }
-      }
-    }
-    return results;
-  }
-  async ensureLoaded() {
-    if (this.plugins)
-      return this.plugins;
-    if (this.loadPromise)
-      return this.loadPromise;
-    this.loadPromise = this.loadCompiledPlugins();
-    try {
-      this.plugins = await this.loadPromise;
-      return this.plugins;
-    } finally {
-      this.loadPromise = null;
-    }
-  }
-  resolveBinPath(binName) {
-    const candidates = [this.imageBinDir, this.localBinDir].filter(Boolean).map((dir) => resolve7(dir, binName));
-    return candidates.find((candidate) => existsSync6(candidate));
-  }
-  async loadCompiledPlugins() {
-    const plugins = [];
-    for (const file of this.pluginFiles) {
-      const binName = inferRuntimePluginName(basename3(file));
-      let binPath = this.resolveBinPath(binName);
-      if (!binPath && !this.imageBinDir && this.pluginsRequireBinaries && this.ensureImageBinDir) {
-        try {
-          this.imageBinDir = await this.ensureImageBinDir(this.context.projectRoot);
-          binPath = this.resolveBinPath(binName);
-        } catch {}
-      }
-      if (!binPath) {
-        const triedPaths = [this.imageBinDir, this.localBinDir].filter(Boolean).map((dir) => resolve7(dir, binName));
-        const missingError = `Compiled plugin binary not found for '${binName}'. Tried: ${triedPaths.join(", ")}`;
-        await this.eventBus.emit("plugin.error", {
-          file: resolve7(this.pluginDir, file),
-          phase: "load",
-          error: missingError
-        });
-        if (this.pluginsRequireBinaries) {
-          throw new Error(missingError);
-        }
-        plugins.push({ name: binName, validators: [] });
-        await this.eventBus.emit("plugin.loaded", {
-          plugin: binName,
-          file: resolve7(this.pluginDir, file),
-          source: "metadata-only"
-        });
-        continue;
-      }
-      const wrapper = createBinaryPluginWrapper(binName, binPath, this.context.projectRoot);
-      plugins.push(wrapper);
-      await this.eventBus.emit("plugin.loaded", {
-        plugin: wrapper.name,
-        file: binPath,
-        source: "compiled-binary"
-      });
-    }
-    return plugins;
-  }
-  async safeInvoke(pluginName, hook, call) {
-    try {
-      await call();
-    } catch (error) {
-      await this.eventBus.emit("plugin.error", {
-        plugin: pluginName,
-        phase: hook,
-        error: `${error}`
-      });
-    }
-  }
-}
-function createBinaryPluginWrapper(name, binPath, projectRoot) {
-  return {
-    name,
-    validators: [
-      {
-        id: `${name}:compiled`,
-        async run(ctx) {
-          const { exitCode, stdout, stderr } = await launchRuntimeBinary({
-            binaryPath: binPath,
-            args: ["--validate", ctx.taskId, ctx.projectRoot],
-            cwd: projectRoot
-          });
-          if (exitCode !== 0) {
-            return {
-              id: `${name}:compiled`,
-              passed: false,
-              summary: `Plugin binary ${name} exited with code ${exitCode}`,
-              details: stderr || stdout
-            };
-          }
-          try {
-            const results = JSON.parse(stdout.trim());
-            const failed = results.filter((result) => !result.passed);
-            if (failed.length > 0) {
-              return {
-                id: `${name}:compiled`,
-                passed: false,
-                summary: `${failed.length} of ${results.length} validator(s) failed`,
-                details: failed.map((result) => `${result.id}: ${result.summary}`).join(`
-`)
-              };
-            }
-            return {
-              id: `${name}:compiled`,
-              passed: true,
-              summary: `All ${results.length} validator(s) passed`
-            };
-          } catch {
-            return {
-              id: `${name}:compiled`,
-              passed: false,
-              summary: `Failed to parse output from compiled plugin ${name}`,
-              details: stdout.slice(0, 500)
-            };
-          }
-        }
-      }
-    ]
-  };
-}
-function safeReadDir(path) {
-  try {
-    return readdirSync(path, { withFileTypes: true }).filter((entry) => entry.isFile()).map((entry) => entry.name).sort();
-  } catch {
-    return [];
-  }
-}
 // packages/runtime/src/agent-mode.ts
 function looksLikeShellInvocation(args, mode = process.env.RIG_AGENT_MODE) {
   if (mode === "shell") {
@@ -1592,7 +1325,6 @@ var RIG_RUNTIME_PACKAGE = "@rig/runtime";
 export {
   writeRuntimeContext,
   secretDefinesFromEnv,
-  runtimeHookPhases,
   runtimeContextStringFields,
   runtimeContextArrayFields,
   runtimeBinaryAssetEntries,
@@ -1608,10 +1340,8 @@ export {
   loadDotEnvSecrets,
   launchRuntimeBinary,
   isRuntimeBinaryAssetEntry,
-  inferRuntimePluginName,
   findTaskById,
   ensureLocalRigServerConnection,
-  describeRuntimePluginFiles,
   createRuntimeExecutionSession,
   createRuntimeBinaryBuildManifest,
   createPluginTaskRecordReader,
@@ -1624,7 +1354,6 @@ export {
   RIG_RUNTIME_PACKAGE,
   RIG_DEFINITION_DIRNAME,
   RIG_ARTIFACTS_DIRNAME,
-  PluginManager,
   HttpRuntimeRunReporter,
   HttpRuntimeHostSession,
   GeneralCliEventBus,

package/dist/src/layout.js

@@ -7,22 +7,27 @@ var RIG_STATE_DIRNAME = ".rig";
 var RIG_ARTIFACTS_DIRNAME = "artifacts";
 function resolveNearestRigProjectRoot(startDir) {
   let current = resolve(startDir);
-  let fallbackCandidate = null;
+  let weakMarkerCandidate = null;
   let projectCandidate = null;
   for (;; ) {
     const hasDefinition = existsSync(resolve(current, RIG_DEFINITION_DIRNAME));
     const hasState = existsSync(resolve(current, RIG_STATE_DIRNAME));
+    const hasTaskConfig = existsSync(resolve(current, RIG_STATE_DIRNAME, "task-config.json"));
     const hasConfig = existsSync(resolve(current, "rig.config.ts")) || existsSync(resolve(current, "rig.config.json"));
+    const hasGit = existsSync(resolve(current, ".git"));
     const hasControlPlane = existsSync(resolve(current, "packages", "cli", "bin", "rig.ts")) || existsSync(resolve(current, "packages", "server"));
-    if (hasDefinition || hasState || hasConfig) {
-      fallbackCandidate = current;
-      if (hasControlPlane) {
-        projectCandidate = current;
-      }
+    if ((hasDefinition || hasState || hasConfig) && weakMarkerCandidate === null) {
+      weakMarkerCandidate = current;
+    }
+    if ((hasControlPlane || hasConfig || hasTaskConfig) && projectCandidate === null) {
+      projectCandidate = current;
+    }
+    if (hasGit) {
+      return projectCandidate ?? current;
     }
     const parent = resolve(current, "..");
     if (parent === current) {
-      return projectCandidate ?? fallbackCandidate ?? resolve(startDir);
+      return projectCandidate ?? weakMarkerCandidate ?? resolve(startDir);
     }
     current = parent;
   }

package/dist/src/local-server.js

@@ -134,6 +134,18 @@ async function waitForServerHealthy(baseUrl, authToken, timeoutMs) {
   }
   return false;
 }
+function resolveRigServerSpawnPlan(projectRoot, host, authToken, which = (command) => Bun.which(command)) {
+  const binary = process.env.RIG_SERVER_BIN?.trim() || which("rig-server")?.trim();
+  const args = ["start", "--host", host, "--port", "0", "--auth-token", authToken];
+  if (binary) {
+    return { command: binary, args, cwd: projectRoot };
+  }
+  return {
+    command: "bun",
+    args: ["run", "packages/server/src/server.ts", ...args],
+    cwd: resolve2(import.meta.dir, "../../..")
+  };
+}
 async function waitForPublishedServer(projectRoot, authToken, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
@@ -159,23 +171,13 @@ async function ensureLocalRigServerConnection(projectRoot, options = {}) {
   const host = options.host ?? "127.0.0.1";
   const startupTimeoutMs = options.startupTimeoutMs ?? 15000;
   const authToken = Buffer.from(crypto.getRandomValues(new Uint8Array(24))).toString("hex");
-  const workspaceRoot = resolve2(import.meta.dir, "../../..");
   const bootstrapLogPath = resolveRigServerLogPath(projectRoot);
   mkdirSync(resolveRigServerPaths(projectRoot).logsDir, { recursive: true });
   const bootstrapLogFd = openSync(bootstrapLogPath, "w");
   clearPublishedRigServerState(projectRoot);
-  const child = spawn("bun", [
-    "run",
-    "packages/server/src/server.ts",
-    "start",
-    "--host",
-    host,
-    "--port",
-    "0",
-    "--auth-token",
-    authToken
-  ], {
-    cwd: workspaceRoot,
+  const spawnPlan = resolveRigServerSpawnPlan(projectRoot, host, authToken);
+  const child = spawn(spawnPlan.command, [...spawnPlan.args], {
+    cwd: spawnPlan.cwd,
     env: {
       ...process.env,
       PROJECT_RIG_ROOT: projectRoot
@@ -195,8 +197,12 @@ ${bootstrapLog}` : ` No bootstrap log was written.`;
   }
   return toLocalServerConnection(ready);
 }
+var __testOnly = {
+  resolveRigServerSpawnPlan
+};
 export {
   readPublishedRigServerStateSync,
   readPublishedRigServerState,
-  ensureLocalRigServerConnection
+  ensureLocalRigServerConnection,
+  __testOnly
 };

package/native/darwin-arm64/rig-git.build-manifest.json

@@ -1,4 +1,4 @@
 {
   "version": 1,
-  "buildKey": "{\"version\":1,\"sourcePath\":\"/var/folders/zr/6js4xbjs3bgf46v76j145mlw0000gn/T/rig-native/rig-git-darwin-arm64\",\"sourceDigest\":\"5d1f9d17af5789a15328b4c4aff2b155962bd9d8e180812fa67a30c1685b2bf3\"}"
+  "buildKey": "{\"version\":1,\"sourcePath\":\"/var/folders/zr/6js4xbjs3bgf46v76j145mlw0000gn/T/rig-native/rig-git-darwin-arm64\",\"sourceDigest\":\"67ef79af508d46b1134d48b315c236cad8225f53ef1959d3e0bd09801c7884c4\"}"
 }

package/native/darwin-arm64/rig-shell.build-manifest.json

@@ -1,4 +1,4 @@
 {
   "version": 1,
-  "buildKey": "{\"version\":1,\"sourcePath\":\"/var/folders/zr/6js4xbjs3bgf46v76j145mlw0000gn/T/rig-native/rig-shell-darwin-arm64\",\"sourceDigest\":\"082addd699beb1eb87d242208741012bba54becf7e2c3cd85904c68c200be3e3\"}"
+  "buildKey": "{\"version\":1,\"sourcePath\":\"/var/folders/zr/6js4xbjs3bgf46v76j145mlw0000gn/T/rig-native/rig-shell-darwin-arm64\",\"sourceDigest\":\"b7ec0fc575a3b2bea9bf2538207d59a5400c2cb3561080c24b87e0194954bd7a\"}"
 }

package/native/darwin-arm64/rig-tools.build-manifest.json

@@ -1,4 +1,4 @@
 {
   "version": 1,
-  "buildKey": "{\"version\":1,\"sourcePath\":\"/var/folders/zr/6js4xbjs3bgf46v76j145mlw0000gn/T/rig-native/rig-tools-darwin-arm64\",\"sourceDigest\":\"a0950e37e897d520196d93e5487bade084e5f0cad45c57843b4e9f16a6421da8\"}"
+  "buildKey": "{\"version\":1,\"sourcePath\":\"/var/folders/zr/6js4xbjs3bgf46v76j145mlw0000gn/T/rig-native/rig-tools-darwin-arm64\",\"sourceDigest\":\"abfbb45225c08b4cc154e2cc5a70d0b8ba83d162a027c23a9c71ca22b350854d\"}"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/runtime",
-  "version": "0.0.6-alpha.3",
+  "version": "0.0.6-alpha.30",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -63,12 +63,14 @@
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
   "dependencies": {
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.30",
     "@libsql/client": "^0.17.2",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.3",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.3",
-    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.3",
-    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.3",
-    "@rig/validator-kit": "npm:@h-rig/validator-kit@0.0.6-alpha.3",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.30",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.30",
+    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.30",
+    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.30",
+    "@rig/skill-loader": "npm:@h-rig/skill-loader@0.0.6-alpha.30",
+    "@rig/validator-kit": "npm:@h-rig/validator-kit@0.0.6-alpha.30",
     "effect": "4.0.0-beta.78",
     "smol-toml": "^1.6.0"
   }