@h-rig/runtime 0.0.6-alpha.20 → 0.0.6-alpha.22

package/dist/bin/rig-agent-dispatch.js

@@ -567,6 +567,7 @@ var init_backend_bwrap = __esm(() => {
 });
 
 // packages/runtime/src/control-plane/agent-wrapper.ts
+import { createRequire } from "module";
 import { resolve as resolve35 } from "path";
 import { existsSync as existsSync33, mkdirSync as mkdirSync19, writeFileSync as writeFileSync13 } from "fs";
 
@@ -8884,6 +8885,7 @@ function formatJsonRpcError(error) {
 }
 
 // packages/runtime/src/control-plane/agent-wrapper.ts
+var requireFromRuntime = createRequire(import.meta.url);
 async function finalizeRuntimeSnapshot(snapshotSidecar, providerCommand, exitCode, context) {
   try {
     await snapshotSidecar.finalize(providerCommand, exitCode);
@@ -9029,14 +9031,26 @@ async function runAgentWrapper(options = {}) {
         },
         command: providerCommand
       })).command;
-      const proc = Bun.spawn(command, {
-        cwd: runtime.workspaceDir,
-        env,
-        stdin: "inherit",
-        stdout: "inherit",
-        stderr: "inherit"
-      });
-      exitCode = await proc.exited;
+      if (provider === "pi" && isPiRpcArgs(providerArgs)) {
+        const prompt = await readProcessStdin();
+        exitCode = await runPiRpcProvider({
+          command,
+          cwd: runtime.workspaceDir,
+          env,
+          prompt,
+          runId: process.env.RIG_SERVER_RUN_ID?.trim() || undefined,
+          sessionName: process.env.RIG_SERVER_RUN_ID?.trim() ? `Rig ${process.env.RIG_SERVER_RUN_ID.trim()}` : `Rig ${runtime.taskId}`
+        });
+      } else {
+        const proc = Bun.spawn(command, {
+          cwd: runtime.workspaceDir,
+          env,
+          stdin: "inherit",
+          stdout: "inherit",
+          stderr: "inherit"
+        });
+        exitCode = await proc.exited;
+      }
     }
     if (snapshotSidecar) {
       await finalizeRuntimeSnapshot(snapshotSidecar, providerCommand, exitCode, {
@@ -9073,6 +9087,215 @@ async function runAgentWrapper(options = {}) {
   }
   return finalExitCode;
 }
+function parseJsonRecord(line) {
+  try {
+    const parsed = JSON.parse(line);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+async function readProcessStdin() {
+  if (process.stdin.isTTY)
+    return "";
+  return await new Promise((resolveRead) => {
+    let data = "";
+    process.stdin.setEncoding("utf8");
+    process.stdin.on("data", (chunk) => {
+      data += String(chunk);
+    });
+    process.stdin.on("end", () => resolveRead(data));
+    process.stdin.resume();
+  });
+}
+async function pumpReadableLines(stream, onLine) {
+  if (!stream)
+    return;
+  const reader = stream.getReader();
+  const decoder = new TextDecoder;
+  let buffer = "";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      buffer += decoder.decode(value, { stream: true });
+      const parts = buffer.split(/\r?\n/);
+      buffer = parts.pop() ?? "";
+      for (const part of parts)
+        onLine(part);
+    }
+    buffer += decoder.decode();
+    if (buffer)
+      onLine(buffer);
+  } finally {
+    reader.releaseLock();
+  }
+}
+function isBlockingPiRpcUiRequest(record) {
+  if (record.type !== "extension_ui_request")
+    return false;
+  return record.method === "select" || record.method === "confirm" || record.method === "input" || record.method === "editor";
+}
+function writeRpcCommand(stdin, command) {
+  stdin.write(`${JSON.stringify(command)}
+`);
+}
+function joinUrl(baseUrl, pathname) {
+  return `${baseUrl.replace(/\/+$/, "")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
+}
+async function readQueuedSteeringFromServer(input) {
+  if (!input.serverUrl || !input.runId)
+    return [];
+  const headers = {};
+  if (input.authToken)
+    headers.authorization = `Bearer ${input.authToken}`;
+  const response = await fetch(joinUrl(input.serverUrl, `/api/runs/${encodeURIComponent(input.runId)}/steering?ack=1`), { headers });
+  if (!response.ok)
+    return [];
+  const payload = await response.json().catch(() => null);
+  const messages = payload && typeof payload === "object" && !Array.isArray(payload) ? payload.messages : null;
+  return Array.isArray(messages) ? messages.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+}
+function steeringMessageText(entry) {
+  const message = typeof entry.message === "string" ? entry.message.trim() : "";
+  return message || null;
+}
+function isPiRpcArgs(args) {
+  return cliOptionValue(args, "--mode") === "rpc";
+}
+async function runPiRpcProvider(input) {
+  const stdout = input.stdout ?? process.stdout;
+  const stderr = input.stderr ?? process.stderr;
+  const proc = Bun.spawn(input.command, {
+    cwd: input.cwd,
+    env: input.env,
+    stdin: "pipe",
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  let sawAgentEnd = false;
+  let promptError = null;
+  let stdinOpen = true;
+  let steeringPollStopped = false;
+  const closeStdin = () => {
+    if (!stdinOpen)
+      return;
+    stdinOpen = false;
+    try {
+      steeringPollStopped = true;
+      proc.stdin.end();
+    } catch {}
+  };
+  const send = (command) => {
+    if (!stdinOpen)
+      return;
+    try {
+      writeRpcCommand(proc.stdin, command);
+    } catch (error) {
+      promptError ??= error instanceof Error ? error.message : String(error);
+    }
+  };
+  const forwardSigterm = () => {
+    try {
+      proc.kill("SIGTERM");
+    } catch {}
+  };
+  process.once("SIGTERM", forwardSigterm);
+  const pollSteering = async () => {
+    const serverUrl = input.env.RIG_SERVER_URL || input.env.RIG_SERVER_BASE_URL;
+    const authToken = input.env.RIG_AUTH_TOKEN || input.env.RIG_SERVER_AUTH_TOKEN;
+    while (!steeringPollStopped && stdinOpen) {
+      try {
+        const messages = await readQueuedSteeringFromServer({ serverUrl, authToken, runId: input.runId });
+        for (const message of messages) {
+          const text = steeringMessageText(message);
+          if (!text || !stdinOpen)
+            continue;
+          send({
+            id: typeof message.id === "string" ? `rig_steer_${message.id}` : `rig_steer_${Date.now()}`,
+            type: "prompt",
+            message: text,
+            streamingBehavior: "steer"
+          });
+          emitWrapperEvent("pi.rpc.steering.delivered", {
+            runId: input.runId ?? null,
+            steeringId: typeof message.id === "string" ? message.id : null,
+            actor: typeof message.actor === "string" ? message.actor : "operator",
+            message: text
+          });
+        }
+      } catch (error) {
+        emitWrapperEvent("pi.rpc.steering.poll.failed", {
+          runId: input.runId ?? null,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+      await sleep(1000);
+    }
+  };
+  const stdoutPump = pumpReadableLines(proc.stdout, (line) => {
+    stdout.write(`${line}
+`);
+    const record = parseJsonRecord(line.trim());
+    if (!record)
+      return;
+    if (record.type === "agent_end") {
+      sawAgentEnd = true;
+      closeStdin();
+      return;
+    }
+    if (record.type === "response" && record.command === "prompt" && record.success === false) {
+      promptError = typeof record.error === "string" ? record.error : "Pi RPC prompt failed.";
+      closeStdin();
+      return;
+    }
+    if (isBlockingPiRpcUiRequest(record)) {
+      const id = typeof record.id === "string" ? record.id : "";
+      if (id) {
+        send({ type: "extension_ui_response", id, cancelled: true });
+        emitWrapperEvent("pi.rpc.extension_ui.cancelled", {
+          id,
+          method: record.method,
+          reason: "noninteractive Rig worker RPC session"
+        });
+      }
+    }
+  });
+  const stderrPump = pumpReadableLines(proc.stderr, (line) => {
+    stderr.write(`${line}
+`);
+  });
+  if (input.sessionName?.trim()) {
+    send({ id: "rig_set_session_name", type: "set_session_name", name: input.sessionName.trim() });
+  }
+  const steeringPollPromise = pollSteering();
+  if (input.prompt.trim()) {
+    send({ id: "rig_initial_prompt", type: "prompt", message: input.prompt });
+    emitWrapperEvent("pi.rpc.prompt.sent", {
+      runId: input.runId ?? null,
+      kind: "initial",
+      bytes: Buffer.byteLength(input.prompt)
+    });
+  } else {
+    closeStdin();
+  }
+  const exitCode = await proc.exited;
+  process.off("SIGTERM", forwardSigterm);
+  steeringPollStopped = true;
+  await Promise.all([stdoutPump, stderrPump, steeringPollPromise]);
+  if (promptError) {
+    stderr.write(`[rig-agent] Pi RPC prompt failed: ${promptError}
+`);
+    return exitCode === 0 ? 1 : exitCode;
+  }
+  if (input.prompt.trim() && !sawAgentEnd && exitCode === 0) {
+    stderr.write(`[rig-agent] Pi RPC exited before emitting agent_end.
+`);
+    return 1;
+  }
+  return exitCode;
+}
 function resolveFinalProviderExitCode(input) {
   if (input.providerExitCode !== 0) {
     return input.providerExitCode;
@@ -9116,6 +9339,12 @@ function buildProviderArgs(provider, runtime, argv) {
       piArgs.unshift(normalizePiModelForProvider(model, piProvider));
       piArgs.unshift("--model");
     }
+    if (!hasCliOption(piArgs, "--mode")) {
+      piArgs.push("--mode", process.env.RIG_PI_TRANSPORT?.trim() === "print" ? "json" : "rpc");
+      if (process.env.RIG_PI_TRANSPORT?.trim() === "print" && !hasCliOption(piArgs, "--print")) {
+        piArgs.push("--print");
+      }
+    }
     return piArgs;
   }
   return [
@@ -9213,17 +9442,38 @@ function normalizePiModelForProvider(model, provider) {
   }
   return model;
 }
+function resolveFromShellPath(binary) {
+  const resolved = Bun.spawnSync(["sh", "-lc", `command -v ${binary}`], {
+    stdout: "pipe",
+    stderr: "ignore",
+    stdin: "ignore",
+    env: process.env
+  });
+  if (resolved.exitCode !== 0)
+    return null;
+  const path = resolved.stdout.toString().trim().split(/\r?\n/)[0]?.trim();
+  return path || null;
+}
+function resolveBundledPiBinary() {
+  try {
+    const packageJson = requireFromRuntime.resolve("@earendil-works/pi-coding-agent/package.json");
+    const binaryPath = resolve35(packageJson, "..", "dist", "cli.js");
+    return existsSync33(binaryPath) ? binaryPath : null;
+  } catch {
+    return null;
+  }
+}
 function providerBinary(provider) {
   if (provider === "codex") {
-    return Bun.which("codex") || "codex";
+    return resolveFromShellPath("codex") || Bun.which("codex") || "codex";
   }
   if (provider === "pi") {
-    return Bun.which("pi") || "pi";
+    return process.env.RIG_PI_BINARY?.trim() || resolveBundledPiBinary() || resolveFromShellPath("pi") || Bun.which("pi") || "pi";
   }
   try {
     return resolveClaudeBinaryPath();
   } catch {
-    return Bun.which("claude") || "claude";
+    return resolveFromShellPath("claude") || Bun.which("claude") || "claude";
   }
 }
 function emitWrapperEvent(type, payload) {

package/dist/src/control-plane/agent-wrapper.js

@@ -567,6 +567,7 @@ var init_backend_bwrap = __esm(() => {
 });
 
 // packages/runtime/src/control-plane/agent-wrapper.ts
+import { createRequire } from "module";
 import { resolve as resolve35 } from "path";
 import { existsSync as existsSync33, mkdirSync as mkdirSync19, writeFileSync as writeFileSync13 } from "fs";
 
@@ -9152,6 +9153,7 @@ function formatJsonRpcError(error) {
 }
 
 // packages/runtime/src/control-plane/agent-wrapper.ts
+var requireFromRuntime = createRequire(import.meta.url);
 async function finalizeRuntimeSnapshot(snapshotSidecar, providerCommand, exitCode, context) {
   try {
     await snapshotSidecar.finalize(providerCommand, exitCode);
@@ -9297,14 +9299,26 @@ async function runAgentWrapper(options = {}) {
         },
         command: providerCommand
       })).command;
-      const proc = Bun.spawn(command, {
-        cwd: runtime.workspaceDir,
-        env,
-        stdin: "inherit",
-        stdout: "inherit",
-        stderr: "inherit"
-      });
-      exitCode = await proc.exited;
+      if (provider === "pi" && isPiRpcArgs(providerArgs)) {
+        const prompt = await readProcessStdin();
+        exitCode = await runPiRpcProvider({
+          command,
+          cwd: runtime.workspaceDir,
+          env,
+          prompt,
+          runId: process.env.RIG_SERVER_RUN_ID?.trim() || undefined,
+          sessionName: process.env.RIG_SERVER_RUN_ID?.trim() ? `Rig ${process.env.RIG_SERVER_RUN_ID.trim()}` : `Rig ${runtime.taskId}`
+        });
+      } else {
+        const proc = Bun.spawn(command, {
+          cwd: runtime.workspaceDir,
+          env,
+          stdin: "inherit",
+          stdout: "inherit",
+          stderr: "inherit"
+        });
+        exitCode = await proc.exited;
+      }
     }
     if (snapshotSidecar) {
       await finalizeRuntimeSnapshot(snapshotSidecar, providerCommand, exitCode, {
@@ -9341,6 +9355,215 @@ async function runAgentWrapper(options = {}) {
   }
   return finalExitCode;
 }
+function parseJsonRecord(line) {
+  try {
+    const parsed = JSON.parse(line);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+async function readProcessStdin() {
+  if (process.stdin.isTTY)
+    return "";
+  return await new Promise((resolveRead) => {
+    let data = "";
+    process.stdin.setEncoding("utf8");
+    process.stdin.on("data", (chunk) => {
+      data += String(chunk);
+    });
+    process.stdin.on("end", () => resolveRead(data));
+    process.stdin.resume();
+  });
+}
+async function pumpReadableLines(stream, onLine) {
+  if (!stream)
+    return;
+  const reader = stream.getReader();
+  const decoder = new TextDecoder;
+  let buffer = "";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      buffer += decoder.decode(value, { stream: true });
+      const parts = buffer.split(/\r?\n/);
+      buffer = parts.pop() ?? "";
+      for (const part of parts)
+        onLine(part);
+    }
+    buffer += decoder.decode();
+    if (buffer)
+      onLine(buffer);
+  } finally {
+    reader.releaseLock();
+  }
+}
+function isBlockingPiRpcUiRequest(record) {
+  if (record.type !== "extension_ui_request")
+    return false;
+  return record.method === "select" || record.method === "confirm" || record.method === "input" || record.method === "editor";
+}
+function writeRpcCommand(stdin, command) {
+  stdin.write(`${JSON.stringify(command)}
+`);
+}
+function joinUrl(baseUrl, pathname) {
+  return `${baseUrl.replace(/\/+$/, "")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
+}
+async function readQueuedSteeringFromServer(input) {
+  if (!input.serverUrl || !input.runId)
+    return [];
+  const headers = {};
+  if (input.authToken)
+    headers.authorization = `Bearer ${input.authToken}`;
+  const response = await fetch(joinUrl(input.serverUrl, `/api/runs/${encodeURIComponent(input.runId)}/steering?ack=1`), { headers });
+  if (!response.ok)
+    return [];
+  const payload = await response.json().catch(() => null);
+  const messages = payload && typeof payload === "object" && !Array.isArray(payload) ? payload.messages : null;
+  return Array.isArray(messages) ? messages.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+}
+function steeringMessageText(entry) {
+  const message = typeof entry.message === "string" ? entry.message.trim() : "";
+  return message || null;
+}
+function isPiRpcArgs(args) {
+  return cliOptionValue(args, "--mode") === "rpc";
+}
+async function runPiRpcProvider(input) {
+  const stdout = input.stdout ?? process.stdout;
+  const stderr = input.stderr ?? process.stderr;
+  const proc = Bun.spawn(input.command, {
+    cwd: input.cwd,
+    env: input.env,
+    stdin: "pipe",
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  let sawAgentEnd = false;
+  let promptError = null;
+  let stdinOpen = true;
+  let steeringPollStopped = false;
+  const closeStdin = () => {
+    if (!stdinOpen)
+      return;
+    stdinOpen = false;
+    try {
+      steeringPollStopped = true;
+      proc.stdin.end();
+    } catch {}
+  };
+  const send = (command) => {
+    if (!stdinOpen)
+      return;
+    try {
+      writeRpcCommand(proc.stdin, command);
+    } catch (error) {
+      promptError ??= error instanceof Error ? error.message : String(error);
+    }
+  };
+  const forwardSigterm = () => {
+    try {
+      proc.kill("SIGTERM");
+    } catch {}
+  };
+  process.once("SIGTERM", forwardSigterm);
+  const pollSteering = async () => {
+    const serverUrl = input.env.RIG_SERVER_URL || input.env.RIG_SERVER_BASE_URL;
+    const authToken = input.env.RIG_AUTH_TOKEN || input.env.RIG_SERVER_AUTH_TOKEN;
+    while (!steeringPollStopped && stdinOpen) {
+      try {
+        const messages = await readQueuedSteeringFromServer({ serverUrl, authToken, runId: input.runId });
+        for (const message of messages) {
+          const text = steeringMessageText(message);
+          if (!text || !stdinOpen)
+            continue;
+          send({
+            id: typeof message.id === "string" ? `rig_steer_${message.id}` : `rig_steer_${Date.now()}`,
+            type: "prompt",
+            message: text,
+            streamingBehavior: "steer"
+          });
+          emitWrapperEvent("pi.rpc.steering.delivered", {
+            runId: input.runId ?? null,
+            steeringId: typeof message.id === "string" ? message.id : null,
+            actor: typeof message.actor === "string" ? message.actor : "operator",
+            message: text
+          });
+        }
+      } catch (error) {
+        emitWrapperEvent("pi.rpc.steering.poll.failed", {
+          runId: input.runId ?? null,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+      await sleep(1000);
+    }
+  };
+  const stdoutPump = pumpReadableLines(proc.stdout, (line) => {
+    stdout.write(`${line}
+`);
+    const record = parseJsonRecord(line.trim());
+    if (!record)
+      return;
+    if (record.type === "agent_end") {
+      sawAgentEnd = true;
+      closeStdin();
+      return;
+    }
+    if (record.type === "response" && record.command === "prompt" && record.success === false) {
+      promptError = typeof record.error === "string" ? record.error : "Pi RPC prompt failed.";
+      closeStdin();
+      return;
+    }
+    if (isBlockingPiRpcUiRequest(record)) {
+      const id = typeof record.id === "string" ? record.id : "";
+      if (id) {
+        send({ type: "extension_ui_response", id, cancelled: true });
+        emitWrapperEvent("pi.rpc.extension_ui.cancelled", {
+          id,
+          method: record.method,
+          reason: "noninteractive Rig worker RPC session"
+        });
+      }
+    }
+  });
+  const stderrPump = pumpReadableLines(proc.stderr, (line) => {
+    stderr.write(`${line}
+`);
+  });
+  if (input.sessionName?.trim()) {
+    send({ id: "rig_set_session_name", type: "set_session_name", name: input.sessionName.trim() });
+  }
+  const steeringPollPromise = pollSteering();
+  if (input.prompt.trim()) {
+    send({ id: "rig_initial_prompt", type: "prompt", message: input.prompt });
+    emitWrapperEvent("pi.rpc.prompt.sent", {
+      runId: input.runId ?? null,
+      kind: "initial",
+      bytes: Buffer.byteLength(input.prompt)
+    });
+  } else {
+    closeStdin();
+  }
+  const exitCode = await proc.exited;
+  process.off("SIGTERM", forwardSigterm);
+  steeringPollStopped = true;
+  await Promise.all([stdoutPump, stderrPump, steeringPollPromise]);
+  if (promptError) {
+    stderr.write(`[rig-agent] Pi RPC prompt failed: ${promptError}
+`);
+    return exitCode === 0 ? 1 : exitCode;
+  }
+  if (input.prompt.trim() && !sawAgentEnd && exitCode === 0) {
+    stderr.write(`[rig-agent] Pi RPC exited before emitting agent_end.
+`);
+    return 1;
+  }
+  return exitCode;
+}
 function resolveFinalProviderExitCode(input) {
   if (input.providerExitCode !== 0) {
     return input.providerExitCode;
@@ -9384,6 +9607,12 @@ function buildProviderArgs(provider, runtime, argv) {
       piArgs.unshift(normalizePiModelForProvider(model, piProvider));
       piArgs.unshift("--model");
     }
+    if (!hasCliOption(piArgs, "--mode")) {
+      piArgs.push("--mode", process.env.RIG_PI_TRANSPORT?.trim() === "print" ? "json" : "rpc");
+      if (process.env.RIG_PI_TRANSPORT?.trim() === "print" && !hasCliOption(piArgs, "--print")) {
+        piArgs.push("--print");
+      }
+    }
     return piArgs;
   }
   return [
@@ -9481,17 +9710,38 @@ function normalizePiModelForProvider(model, provider) {
   }
   return model;
 }
+function resolveFromShellPath(binary) {
+  const resolved = Bun.spawnSync(["sh", "-lc", `command -v ${binary}`], {
+    stdout: "pipe",
+    stderr: "ignore",
+    stdin: "ignore",
+    env: process.env
+  });
+  if (resolved.exitCode !== 0)
+    return null;
+  const path = resolved.stdout.toString().trim().split(/\r?\n/)[0]?.trim();
+  return path || null;
+}
+function resolveBundledPiBinary() {
+  try {
+    const packageJson = requireFromRuntime.resolve("@earendil-works/pi-coding-agent/package.json");
+    const binaryPath = resolve35(packageJson, "..", "dist", "cli.js");
+    return existsSync33(binaryPath) ? binaryPath : null;
+  } catch {
+    return null;
+  }
+}
 function providerBinary(provider) {
   if (provider === "codex") {
-    return Bun.which("codex") || "codex";
+    return resolveFromShellPath("codex") || Bun.which("codex") || "codex";
   }
   if (provider === "pi") {
-    return Bun.which("pi") || "pi";
+    return process.env.RIG_PI_BINARY?.trim() || resolveBundledPiBinary() || resolveFromShellPath("pi") || Bun.which("pi") || "pi";
   }
   try {
     return resolveClaudeBinaryPath();
   } catch {
-    return Bun.which("claude") || "claude";
+    return resolveFromShellPath("claude") || Bun.which("claude") || "claude";
   }
 }
 function emitWrapperEvent(type, payload) {
@@ -9726,6 +9976,7 @@ export {
   updateTaskSourceAfterRun,
   startOptionalRuntimeSnapshotSidecar,
   shouldBypassProviderSandboxOnPlatform,
+  runPiRpcProvider,
   runAgentWrapper,
   resolveTaskFromBeads,
   resolveFinalProviderExitCode,

package/package.json

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