@h-rig/core 0.0.6-alpha.7 → 0.0.6-alpha.70

package/dist/src/define-config.js

@@ -2,6 +2,23 @@
 // packages/core/src/define-config.ts
 import { Schema } from "effect";
 import { RigConfig } from "@rig/contracts";
+function normalizeWorkspaceConfig(raw) {
+  const workspace = raw && typeof raw === "object" && !Array.isArray(raw) ? { ...raw } : { mainRepo: "." };
+  workspace.checkout = workspace.checkout ?? workspace.isolation ?? "worktree";
+  workspace.isolation = workspace.isolation ?? workspace.checkout;
+  workspace.sandbox = workspace.sandbox ?? "enforce";
+  return workspace;
+}
+function applyConfigDefaults(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw))
+    return raw;
+  const record = raw;
+  return {
+    ...record,
+    plugins: Array.isArray(record.plugins) ? record.plugins : [],
+    workspace: normalizeWorkspaceConfig(record.workspace)
+  };
+}
 function defineConfig(cfg) {
   const runtimeByName = new Map;
   const plugins = cfg.plugins ?? [];
@@ -10,7 +27,7 @@ function defineConfig(cfg) {
       runtimeByName.set(plugin.name, plugin.__runtime);
     }
   }
-  const decoded = Schema.decodeUnknownSync(RigConfig)(cfg);
+  const decoded = Schema.decodeUnknownSync(RigConfig)(applyConfigDefaults(cfg));
   const decodedPlugins = decoded.plugins.map((p) => {
     const runtime = runtimeByName.get(p.name);
     if (!runtime)
@@ -20,5 +37,6 @@ function defineConfig(cfg) {
   return { ...decoded, plugins: decodedPlugins };
 }
 export {
-  defineConfig
+  defineConfig,
+  applyConfigDefaults
 };

package/dist/src/define-plugin.js

@@ -43,6 +43,23 @@ function definePlugin(meta, runtime) {
       }
     }
   }
+  const declaredHooks = new Map((validated.contributes?.hooks ?? []).map((h) => [h.id, h]));
+  for (const hookId of Object.keys(runtime.hooks ?? {})) {
+    const metadata = declaredHooks.get(hookId);
+    if (!metadata) {
+      throw new Error(`definePlugin(${validated.name}): typed hook "${hookId}" has no matching metadata entry in contributes.hooks`);
+    }
+    if (metadata.command) {
+      throw new Error(`definePlugin(${validated.name}): hook "${hookId}" has both a typed implementation and a command string \u2014 pick one`);
+    }
+  }
+  if (runtime.hooks) {
+    for (const h of declaredHooks.values()) {
+      if (!runtime.hooks[h.id] && !h.command) {
+        throw new Error(`definePlugin(${validated.name}): hook metadata "${h.id}" has no implementation (typed function or command)`);
+      }
+    }
+  }
   return { ...validated, __runtime: runtime };
 }
 export {

package/dist/src/engineReadModelReducer.js

@@ -149,7 +149,7 @@ function mapLegacySessionStatusToRunStatus(status) {
     case "error":
       return "failed";
     case "stopped":
-      return "cancelled";
+      return "stopped";
     default:
       return "created";
   }
@@ -185,12 +185,15 @@ function mapTaskStatusFromRunStatus(status, fallback) {
     case "paused":
       return "in_progress";
     case "reviewing":
+    case "closing-out":
       return "under_review";
+    case "needs-attention":
+      return "blocked";
     case "completed":
       return "completed";
     case "failed":
       return "ready";
-    case "cancelled":
+    case "stopped":
       return "cancelled";
   }
 }
@@ -1040,7 +1043,7 @@ function applyEngineEvent(snapshot, event) {
           ...base,
           runs: patchById(base.runs, payload.runId, (run) => ({
             ...run,
-            status: "cancelled",
+            status: "stopped",
             updatedAt: payload.createdAt,
             completedAt: payload.createdAt
           }))

package/dist/src/index.js

@@ -43,11 +43,45 @@ function definePlugin(meta, runtime) {
       }
     }
   }
+  const declaredHooks = new Map((validated.contributes?.hooks ?? []).map((h) => [h.id, h]));
+  for (const hookId of Object.keys(runtime.hooks ?? {})) {
+    const metadata = declaredHooks.get(hookId);
+    if (!metadata) {
+      throw new Error(`definePlugin(${validated.name}): typed hook "${hookId}" has no matching metadata entry in contributes.hooks`);
+    }
+    if (metadata.command) {
+      throw new Error(`definePlugin(${validated.name}): hook "${hookId}" has both a typed implementation and a command string \u2014 pick one`);
+    }
+  }
+  if (runtime.hooks) {
+    for (const h of declaredHooks.values()) {
+      if (!runtime.hooks[h.id] && !h.command) {
+        throw new Error(`definePlugin(${validated.name}): hook metadata "${h.id}" has no implementation (typed function or command)`);
+      }
+    }
+  }
   return { ...validated, __runtime: runtime };
 }
 // packages/core/src/define-config.ts
 import { Schema as Schema2 } from "effect";
 import { RigConfig } from "@rig/contracts";
+function normalizeWorkspaceConfig(raw) {
+  const workspace = raw && typeof raw === "object" && !Array.isArray(raw) ? { ...raw } : { mainRepo: "." };
+  workspace.checkout = workspace.checkout ?? workspace.isolation ?? "worktree";
+  workspace.isolation = workspace.isolation ?? workspace.checkout;
+  workspace.sandbox = workspace.sandbox ?? "enforce";
+  return workspace;
+}
+function applyConfigDefaults(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw))
+    return raw;
+  const record = raw;
+  return {
+    ...record,
+    plugins: Array.isArray(record.plugins) ? record.plugins : [],
+    workspace: normalizeWorkspaceConfig(record.workspace)
+  };
+}
 function defineConfig(cfg) {
   const runtimeByName = new Map;
   const plugins = cfg.plugins ?? [];
@@ -56,7 +90,7 @@ function defineConfig(cfg) {
       runtimeByName.set(plugin.name, plugin.__runtime);
     }
   }
-  const decoded = Schema2.decodeUnknownSync(RigConfig)(cfg);
+  const decoded = Schema2.decodeUnknownSync(RigConfig)(applyConfigDefaults(cfg));
   const decodedPlugins = decoded.plugins.map((p) => {
     const runtime = runtimeByName.get(p.name);
     if (!runtime)
@@ -124,6 +158,24 @@ function assertRuntimeMatchesMetadata(plugin) {
       }
     }
   }
+  const declaredHooks = new Map((plugin.contributes?.hooks ?? []).map((hook) => [hook.id, hook]));
+  const runtimeHooks = plugin.__runtime?.hooks;
+  for (const hookId of Object.keys(runtimeHooks ?? {})) {
+    const metadata = declaredHooks.get(hookId);
+    if (!metadata) {
+      throw new Error(`plugin "${plugin.name}" typed hook "${hookId}" has no matching metadata entry in contributes.hooks`);
+    }
+    if (metadata.command) {
+      throw new Error(`plugin "${plugin.name}" hook "${hookId}" has both a typed implementation and a command string \u2014 pick one`);
+    }
+  }
+  if (runtimeHooks) {
+    for (const hook of declaredHooks.values()) {
+      if (!runtimeHooks[hook.id] && !hook.command) {
+        throw new Error(`plugin "${plugin.name}" hook metadata "${hook.id}" has no implementation (typed function or command)`);
+      }
+    }
+  }
 }
 function createPluginHost(plugins) {
   assertUniquePluginNames(plugins);
@@ -263,7 +315,7 @@ function buildRigInitConfigSource(input) {
   lines.push(`    issueUpdates: "lifecycle",`);
   lines.push(`    projects: { enabled: false },`);
   lines.push(`  },`);
-  lines.push(`  automation: { maxValidationAttempts: 30, maxPrFixIterations: 30 },`);
+  lines.push(`  automation: { maxValidationAttempts: 30, maxPrFixIterations: 100500 },`);
   lines.push(`  pr: { mode: "auto", watchChecks: true, autoFixChecks: true, autoFixReview: true },`);
   lines.push(`  merge: { mode: "auto", method: "repo-default", deleteBranch: "repo-default", bypass: false },`);
   lines.push(`  issueAnalysis: { enabled: true, harness: "pi", mode: "continuous" },`);
@@ -422,7 +474,7 @@ function mapLegacySessionStatusToRunStatus(status) {
     case "error":
       return "failed";
     case "stopped":
-      return "cancelled";
+      return "stopped";
     default:
       return "created";
   }
@@ -458,12 +510,15 @@ function mapTaskStatusFromRunStatus(status, fallback) {
     case "paused":
       return "in_progress";
     case "reviewing":
+    case "closing-out":
       return "under_review";
+    case "needs-attention":
+      return "blocked";
     case "completed":
       return "completed";
     case "failed":
       return "ready";
-    case "cancelled":
+    case "stopped":
       return "cancelled";
   }
 }
@@ -1313,7 +1368,7 @@ function applyEngineEvent(snapshot, event) {
           ...base,
           runs: patchById(base.runs, payload.runId, (run) => ({
             ...run,
-            status: "cancelled",
+            status: "stopped",
             updatedAt: payload.createdAt,
             completedAt: payload.createdAt
           }))

package/dist/src/load-config.js

@@ -1,17 +1,145 @@
 // @bun
 // packages/core/src/load-config.ts
-import { existsSync, readFileSync } from "fs";
-import { join } from "path";
-import { pathToFileURL } from "url";
+import { existsSync, mkdtempSync, readFileSync, rmSync } from "fs";
+import { tmpdir } from "os";
+import { dirname, join } from "path";
+import { fileURLToPath, pathToFileURL } from "url";
+import { Schema as Schema2 } from "effect";
+import { RigConfig as RigConfig2 } from "@rig/contracts";
+
+// packages/core/src/define-config.ts
 import { Schema } from "effect";
 import { RigConfig } from "@rig/contracts";
+function normalizeWorkspaceConfig(raw) {
+  const workspace = raw && typeof raw === "object" && !Array.isArray(raw) ? { ...raw } : { mainRepo: "." };
+  workspace.checkout = workspace.checkout ?? workspace.isolation ?? "worktree";
+  workspace.isolation = workspace.isolation ?? workspace.checkout;
+  workspace.sandbox = workspace.sandbox ?? "enforce";
+  return workspace;
+}
+function applyConfigDefaults(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw))
+    return raw;
+  const record = raw;
+  return {
+    ...record,
+    plugins: Array.isArray(record.plugins) ? record.plugins : [],
+    workspace: normalizeWorkspaceConfig(record.workspace)
+  };
+}
+
+// packages/core/src/load-config.ts
 var TS_NAMES = ["rig.config.ts", "rig.config.mts"];
 var JSON_NAMES = ["rig.config.json"];
+function isModuleResolutionError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("Cannot find module") || message.includes("Could not resolve");
+}
+function runningFromCompiledBinary() {
+  return import.meta.url.includes("$bunfs");
+}
+var runtimeBundleQueue = Promise.resolve();
+function enqueueRuntimeBundle(operation) {
+  const next = runtimeBundleQueue.then(operation, operation);
+  runtimeBundleQueue = next.then(() => {
+    return;
+  }, () => {
+    return;
+  });
+  return next;
+}
+async function importConfigViaRuntimeBundleUnserialized(configPath) {
+  const bun = globalThis.Bun;
+  if (!bun?.build) {
+    throw new Error(`Failed to import ${configPath}: bare imports could not be resolved and no Bun.build runtime bundler is available.`);
+  }
+  const hostDir = (() => {
+    try {
+      return dirname(fileURLToPath(import.meta.url));
+    } catch {
+      return process.cwd();
+    }
+  })();
+  const configDir = dirname(configPath);
+  const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
+  const hostResolverPlugin = {
+    name: "rig-host-package-resolver",
+    setup(build) {
+      build.onResolve({ filter: /^@rig\// }, (args) => {
+        const candidates = [
+          [args.path, configDir],
+          [args.path, hostDir],
+          [args.path.replace(/^@rig\//, "@h-rig/"), hostDir]
+        ];
+        for (const [specifier, parent] of candidates) {
+          try {
+            const resolved = bun.resolveSync?.(specifier, parent);
+            if (resolved)
+              return { path: resolved };
+          } catch {}
+        }
+        return;
+      });
+      build.onResolve({ filter: /.*/ }, (args) => {
+        if (/^(?:node|bun):/.test(args.path))
+          return;
+        const parent = args.importer ? dirname(args.importer) : configDir;
+        try {
+          const resolved = bun.resolveSync?.(args.path, parent);
+          if (resolved)
+            return { path: resolved };
+        } catch {
+          return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
+        }
+        return;
+      });
+      build.onLoad({ filter: /.*/, namespace: UNRESOLVED_NAMESPACE }, (args) => ({
+        loader: "js",
+        contents: `module.exports = {};
+throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not resolve: "${args.path}". Maybe you need to "bun install"?`)});
+`
+      }));
+    }
+  };
+  const result = await bun.build({
+    entrypoints: [configPath],
+    target: "bun",
+    format: "esm",
+    throw: false,
+    plugins: [hostResolverPlugin]
+  });
+  if (!result.success || !result.outputs[0]) {
+    const detail = result.logs.map((log) => String(log)).join(`
+`);
+    throw new Error(`Failed to bundle ${configPath}: ${detail || "unknown bundler error"}`);
+  }
+  const dir = mkdtempSync(join(tmpdir(), "rig-config-bundle-"));
+  try {
+    const bundledPath = join(dir, "rig.config.bundled.js");
+    await bun.write(bundledPath, await result.outputs[0].text());
+    return await import(pathToFileURL(bundledPath).href);
+  } finally {
+    try {
+      rmSync(dir, { recursive: true, force: true });
+    } catch {}
+  }
+}
 async function loadConfig(cwd) {
   for (const name of TS_NAMES) {
     const p = join(cwd, name);
     if (existsSync(p)) {
-      const mod = await import(pathToFileURL(p).href);
+      const mod = await enqueueRuntimeBundle(async () => {
+        if (runningFromCompiledBinary()) {
+          return importConfigViaRuntimeBundleUnserialized(p);
+        }
+        try {
+          return await import(pathToFileURL(p).href);
+        } catch (error) {
+          if (!isModuleResolutionError(error))
+            throw error;
+          return importConfigViaRuntimeBundleUnserialized(p);
+        }
+      });
       const raw = mod.default ?? mod.config;
       return decodePreservingRuntime(raw);
     }
@@ -35,7 +163,7 @@ function decodePreservingRuntime(raw) {
       }
     }
   }
-  const decoded = Schema.decodeUnknownSync(RigConfig)(raw);
+  const decoded = Schema2.decodeUnknownSync(RigConfig2)(applyConfigDefaults(raw));
   const plugins = decoded.plugins.map((p) => {
     const runtime = runtimeByName.get(p.name);
     if (!runtime)

package/dist/src/plugin-host.js

@@ -58,6 +58,24 @@ function assertRuntimeMatchesMetadata(plugin) {
       }
     }
   }
+  const declaredHooks = new Map((plugin.contributes?.hooks ?? []).map((hook) => [hook.id, hook]));
+  const runtimeHooks = plugin.__runtime?.hooks;
+  for (const hookId of Object.keys(runtimeHooks ?? {})) {
+    const metadata = declaredHooks.get(hookId);
+    if (!metadata) {
+      throw new Error(`plugin "${plugin.name}" typed hook "${hookId}" has no matching metadata entry in contributes.hooks`);
+    }
+    if (metadata.command) {
+      throw new Error(`plugin "${plugin.name}" hook "${hookId}" has both a typed implementation and a command string \u2014 pick one`);
+    }
+  }
+  if (runtimeHooks) {
+    for (const hook of declaredHooks.values()) {
+      if (!runtimeHooks[hook.id] && !hook.command) {
+        throw new Error(`plugin "${plugin.name}" hook metadata "${hook.id}" has no implementation (typed function or command)`);
+      }
+    }
+  }
 }
 function createPluginHost(plugins) {
   assertUniquePluginNames(plugins);

package/dist/src/rig-init-builder.js

@@ -43,7 +43,7 @@ function buildRigInitConfigSource(input) {
   lines.push(`    issueUpdates: "lifecycle",`);
   lines.push(`    projects: { enabled: false },`);
   lines.push(`  },`);
-  lines.push(`  automation: { maxValidationAttempts: 30, maxPrFixIterations: 30 },`);
+  lines.push(`  automation: { maxValidationAttempts: 30, maxPrFixIterations: 100500 },`);
   lines.push(`  pr: { mode: "auto", watchChecks: true, autoFixChecks: true, autoFixReview: true },`);
   lines.push(`  merge: { mode: "auto", method: "repo-default", deleteBranch: "repo-default", bypass: false },`);
   lines.push(`  issueAnalysis: { enabled: true, harness: "pi", mode: "continuous" },`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/core",
-  "version": "0.0.6-alpha.7",
+  "version": "0.0.6-alpha.70",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -31,7 +31,7 @@
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.7",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.70",
     "effect": "4.0.0-beta.78"
   }
 }