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

package/dist/src/control-plane/runtime/queue.js

@@ -149,32 +149,32 @@ var RIG_DEFINITION_DIRNAME = "rig", RIG_ARTIFACTS_DIRNAME = "artifacts";
 var init_layout = () => {};
 
 // packages/runtime/src/control-plane/runtime/sandbox/utils.ts
-import { existsSync as existsSync20, readdirSync as readdirSync3, realpathSync } from "fs";
-import { resolve as resolve21 } from "path";
+import { existsSync as existsSync21, readdirSync as readdirSync4, realpathSync } from "fs";
+import { resolve as resolve22 } from "path";
 function toRealPath(path) {
-  if (!existsSync20(path)) {
-    return resolve21(path);
+  if (!existsSync21(path)) {
+    return resolve22(path);
   }
   try {
     return realpathSync.native(path);
   } catch {
-    return resolve21(path);
+    return resolve22(path);
   }
 }
 function resolveHostGitMetadataPaths(projectRoot, workspaceDir) {
   const candidates = new Set;
   const addPath = (candidate) => {
-    if (existsSync20(candidate)) {
+    if (existsSync21(candidate)) {
       candidates.add(toRealPath(candidate));
     }
   };
-  addPath(resolve21(projectRoot, ".git"));
-  addPath(resolve21(workspaceDir, "..", "..", ".git"));
+  addPath(resolve22(projectRoot, ".git"));
+  addPath(resolve22(workspaceDir, "..", "..", ".git"));
   for (const repoRoot of resolveHostRepoRootPaths(projectRoot)) {
-    addPath(resolve21(repoRoot, ".git"));
+    addPath(resolve22(repoRoot, ".git"));
   }
-  const workspaceGit = resolve21(workspaceDir, ".git");
-  if (existsSync20(workspaceGit)) {
+  const workspaceGit = resolve22(workspaceDir, ".git");
+  if (existsSync21(workspaceGit)) {
     addPath(workspaceGit);
   }
   return [...candidates];
@@ -182,7 +182,7 @@ function resolveHostGitMetadataPaths(projectRoot, workspaceDir) {
 function resolveHostRepoRootPaths(projectRoot) {
   const candidates = new Set;
   const addPath = (candidate) => {
-    if (existsSync20(candidate)) {
+    if (existsSync21(candidate)) {
       candidates.add(toRealPath(candidate));
     }
   };
@@ -192,11 +192,11 @@ function resolveHostRepoRootPaths(projectRoot) {
       addPath(monorepoRoot);
     }
   } catch {}
-  const reposDir = resolve21(projectRoot, "repos");
-  if (existsSync20(reposDir)) {
-    for (const entry of readdirSync3(reposDir, { withFileTypes: true })) {
+  const reposDir = resolve22(projectRoot, "repos");
+  if (existsSync21(reposDir)) {
+    for (const entry of readdirSync4(reposDir, { withFileTypes: true })) {
       if (entry.isDirectory() || entry.isSymbolicLink()) {
-        addPath(resolve21(reposDir, entry.name));
+        addPath(resolve22(reposDir, entry.name));
       }
     }
   }
@@ -240,8 +240,8 @@ var exports_backend_seatbelt = {};
 __export(exports_backend_seatbelt, {
   SeatbeltBackend: () => SeatbeltBackend
 });
-import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync11 } from "fs";
-import { resolve as resolve32 } from "path";
+import { mkdirSync as mkdirSync17, writeFileSync as writeFileSync12 } from "fs";
+import { resolve as resolve33 } from "path";
 
 class SeatbeltBackend {
   kind = "macos-seatbelt";
@@ -265,11 +265,11 @@ class SeatbeltBackend {
     };
   }
   writeSeatbeltProfile(options) {
-    const sandboxDir = resolve32(options.runtime.rootDir, "sandbox");
-    mkdirSync16(sandboxDir, { recursive: true });
-    const profilePath = resolve32(sandboxDir, "seatbelt.sb");
+    const sandboxDir = resolve33(options.runtime.rootDir, "sandbox");
+    mkdirSync17(sandboxDir, { recursive: true });
+    const profilePath = resolve33(sandboxDir, "seatbelt.sb");
     const profile = this.renderProfile(options);
-    writeFileSync11(profilePath, `${profile}
+    writeFileSync12(profilePath, `${profile}
 `, "utf-8");
     return profilePath;
   }
@@ -354,7 +354,7 @@ class SeatbeltBackend {
     const realHome = process.env.HOME?.trim();
     if (realHome) {
       for (const binSubdir of [".local/bin", ".cargo/bin"]) {
-        const binPath = resolve32(realHome, binSubdir);
+        const binPath = resolve33(realHome, binSubdir);
         if (ctx.pathExists(binPath)) {
           lines.push(`(allow file-read* (subpath ${seatbeltString(ctx.realPath(binPath))}))`);
         }
@@ -383,8 +383,8 @@ var exports_backend_bwrap = {};
 __export(exports_backend_bwrap, {
   BwrapBackend: () => BwrapBackend
 });
-import { mkdirSync as mkdirSync17 } from "fs";
-import { resolve as resolve33 } from "path";
+import { mkdirSync as mkdirSync18 } from "fs";
+import { resolve as resolve34 } from "path";
 
 class BwrapBackend {
   kind = "linux-bwrap";
@@ -513,18 +513,18 @@ class BwrapBackend {
     const realHome = process.env.HOME?.trim();
     if (realHome) {
       for (const binSubdir of [".local/bin", ".local/lib", ".cargo/bin"]) {
-        const binPath = ctx.realPath(resolve33(realHome, binSubdir));
+        const binPath = ctx.realPath(resolve34(realHome, binSubdir));
         if (ctx.pathExists(binPath)) {
           args.push("--ro-bind", binPath, binPath);
         }
       }
-      const agentSshDir = resolve33(homeReal, ".ssh");
+      const agentSshDir = resolve34(homeReal, ".ssh");
       if (ctx.pathExists(agentSshDir)) {
         args.push("--ro-bind", agentSshDir, agentSshDir);
       } else {
-        const hostSshDir = resolve33(realHome, ".ssh");
+        const hostSshDir = resolve34(realHome, ".ssh");
         if (ctx.pathExists(hostSshDir)) {
-          mkdirSync17(agentSshDir, { recursive: true });
+          mkdirSync18(agentSshDir, { recursive: true });
           args.push("--ro-bind", hostSshDir, agentSshDir);
           args.push("--ro-bind", hostSshDir, hostSshDir);
         }
@@ -567,8 +567,8 @@ var init_backend_bwrap = __esm(() => {
 
 // packages/runtime/src/control-plane/runtime/queue.ts
 init_layout();
-import { existsSync as existsSync33 } from "fs";
-import { resolve as resolve36 } from "path";
+import { existsSync as existsSync34 } from "fs";
+import { resolve as resolve37 } from "path";
 
 // packages/runtime/src/control-plane/native/task-state.ts
 import { existsSync as existsSync9, readFileSync as readFileSync5, readdirSync, statSync as statSync2, writeFileSync as writeFileSync3 } from "fs";
@@ -3029,9 +3029,9 @@ function primeGuardHotPaths() {
 }
 primeGuardHotPaths();
 // packages/runtime/src/control-plane/runtime/isolation/index.ts
-import { existsSync as existsSync32, mkdirSync as mkdirSync18, readFileSync as readFileSync15, rmSync as rmSync12 } from "fs";
+import { existsSync as existsSync33, mkdirSync as mkdirSync19, readFileSync as readFileSync16, rmSync as rmSync13 } from "fs";
 import { copyFile, mkdir as mkdir4, writeFile as writeFile2 } from "fs/promises";
-import { resolve as resolve35 } from "path";
+import { resolve as resolve36 } from "path";
 // packages/runtime/src/control-plane/memory-sync/db.ts
 import { Database } from "bun:sqlite";
 import { mkdirSync as mkdirSync4 } from "fs";
@@ -3319,8 +3319,8 @@ async function readCanonicalMemoryDb(projectRoot, deps = {}) {
 var DEFAULT_RESULT_LIMIT = DEFAULT_RUNTIME_MEMORY_RETRIEVAL.topK;
 var DAY_MS = 24 * 60 * 60 * 1000;
 // packages/runtime/src/control-plane/native/task-ops.ts
-import { appendFileSync, existsSync as existsSync23, mkdirSync as mkdirSync9, readFileSync as readFileSync11, writeFileSync as writeFileSync8 } from "fs";
-import { resolve as resolve25 } from "path";
+import { appendFileSync, existsSync as existsSync24, mkdirSync as mkdirSync10, readFileSync as readFileSync12, writeFileSync as writeFileSync9 } from "fs";
+import { resolve as resolve26 } from "path";
 
 // packages/runtime/src/build-time-config.ts
 function normalizeBuildConfig(value) {
@@ -4122,6 +4122,49 @@ function safeReadJson(path) {
   }
 }
 
+// packages/runtime/src/control-plane/skill-materializer.ts
+import { existsSync as existsSync17, mkdirSync as mkdirSync8, readFileSync as readFileSync8, readdirSync as readdirSync2, rmSync as rmSync7, writeFileSync as writeFileSync6 } from "fs";
+import { resolve as resolve18 } from "path";
+import { loadSkill } from "@rig/skill-loader";
+var MARKER_FILENAME = ".rig-plugin";
+function skillDirName(id) {
+  return id.replace(/[^a-zA-Z0-9._-]+/g, "-");
+}
+async function materializeSkills(projectRoot, entries) {
+  const skillsRoot = resolve18(projectRoot, ".pi", "skills");
+  if (existsSync17(skillsRoot)) {
+    for (const name of readdirSync2(skillsRoot)) {
+      const dir = resolve18(skillsRoot, name);
+      if (existsSync17(resolve18(dir, MARKER_FILENAME))) {
+        rmSync7(dir, { recursive: true, force: true });
+      }
+    }
+  }
+  const written = [];
+  for (const { pluginName, skill } of entries) {
+    const sourcePath = resolve18(projectRoot, skill.path);
+    if (!existsSync17(sourcePath)) {
+      console.warn(`[plugin-host] skill "${skill.id}" from plugin "${pluginName}" not materialized: ${sourcePath} does not exist`);
+      continue;
+    }
+    let body;
+    try {
+      await loadSkill(sourcePath);
+      body = readFileSync8(sourcePath, "utf-8");
+    } catch (err) {
+      console.warn(`[plugin-host] skill "${skill.id}" from plugin "${pluginName}" not materialized: ${err instanceof Error ? err.message : err}`);
+      continue;
+    }
+    const dir = resolve18(skillsRoot, skillDirName(skill.id));
+    mkdirSync8(dir, { recursive: true });
+    writeFileSync6(resolve18(dir, "SKILL.md"), body, "utf-8");
+    writeFileSync6(resolve18(dir, MARKER_FILENAME), `${JSON.stringify({ plugin: pluginName, skillId: skill.id }, null, 2)}
+`, "utf-8");
+    written.push({ id: skill.id, pluginName, directory: dir });
+  }
+  return written;
+}
+
 // packages/runtime/src/control-plane/plugin-host-context.ts
 async function buildPluginHostContext(projectRoot) {
   let config;
@@ -4158,6 +4201,17 @@ async function buildPluginHostContext(projectRoot) {
   } catch (err) {
     console.warn(`[plugin-host] hook materialization failed: ${err instanceof Error ? err.message : err}`);
   }
+  try {
+    const skillEntries = config.plugins.flatMap((plugin) => (plugin.contributes?.skills ?? []).map((skill) => ({
+      pluginName: plugin.name,
+      skill
+    })));
+    if (skillEntries.length > 0) {
+      await materializeSkills(projectRoot, skillEntries);
+    }
+  } catch (err) {
+    console.warn(`[plugin-host] skill materialization failed: ${err instanceof Error ? err.message : err}`);
+  }
   return {
     config,
     pluginHost,
@@ -4171,12 +4225,12 @@ async function buildPluginHostContext(projectRoot) {
 
 // packages/runtime/src/control-plane/tasks/source-aware-task-config-source.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync18, readFileSync as readFileSync9, readdirSync as readdirSync2, statSync as statSync5, writeFileSync as writeFileSync6 } from "fs";
-import { basename as basename6, join as join4, resolve as resolve19 } from "path";
+import { existsSync as existsSync19, readFileSync as readFileSync10, readdirSync as readdirSync3, statSync as statSync5, writeFileSync as writeFileSync7 } from "fs";
+import { basename as basename6, join as join4, resolve as resolve20 } from "path";
 
 // packages/runtime/src/control-plane/tasks/legacy-task-config-source.ts
-import { existsSync as existsSync17, readFileSync as readFileSync8 } from "fs";
-import { resolve as resolve18 } from "path";
+import { existsSync as existsSync18, readFileSync as readFileSync9 } from "fs";
+import { resolve as resolve19 } from "path";
 
 // packages/runtime/src/control-plane/tasks/task-record-reader.ts
 async function findTaskById(reader, id) {
@@ -4199,7 +4253,7 @@ class LegacyTaskConfigReadError extends Error {
   }
 }
 function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve18(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve19(projectRoot, ".rig", "task-config.json");
   const reader = {
     async listTasks() {
       return readLegacyTaskRecords(projectRoot, configPath);
@@ -4210,8 +4264,8 @@ function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
   };
   return reader;
 }
-function readLegacyTaskRecords(projectRoot, configPath = resolve18(projectRoot, ".rig", "task-config.json")) {
-  if (!existsSync17(configPath)) {
+function readLegacyTaskRecords(projectRoot, configPath = resolve19(projectRoot, ".rig", "task-config.json")) {
+  if (!existsSync18(configPath)) {
     return [];
   }
   const rawConfig = readLegacyTaskConfigJson(projectRoot, configPath);
@@ -4219,7 +4273,7 @@ function readLegacyTaskRecords(projectRoot, configPath = resolve18(projectRoot,
 }
 function readLegacyTaskConfigJson(projectRoot, configPath) {
   try {
-    const parsed = JSON.parse(readFileSync8(configPath, "utf8"));
+    const parsed = JSON.parse(readFileSync9(configPath, "utf8"));
     if (isPlainRecord(parsed)) {
       return parsed;
     }
@@ -4303,7 +4357,7 @@ function isPlainRecord(candidate) {
 var STATUS_LABELS = new Set(["ready", "blocked", "in-progress", "under-review", "failed", "cancelled"]);
 var FILE_TASK_PATTERN2 = /\.(task\.)?json$/;
 function createSourceAwareTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve19(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve20(projectRoot, ".rig", "task-config.json");
   const legacy = createLegacyTaskConfigRecordReader(projectRoot, { configPath });
   const spawnFn = options.spawn ?? spawnSync;
   const ghBinary = options.ghBinary ?? "gh";
@@ -4386,10 +4440,10 @@ function readMaterializedTaskMetadata(entry) {
   return metadata;
 }
 function readConfiguredFilesTaskSourcePath2(projectRoot) {
-  const jsonPath = resolve19(projectRoot, "rig.config.json");
-  if (existsSync18(jsonPath)) {
+  const jsonPath = resolve20(projectRoot, "rig.config.json");
+  if (existsSync19(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync9(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync10(jsonPath, "utf8"));
       if (isPlainRecord2(parsed) && isPlainRecord2(parsed.taskSource)) {
         const source = parsed.taskSource;
         return source.kind === "files" && typeof source.path === "string" ? source.path : null;
@@ -4398,12 +4452,12 @@ function readConfiguredFilesTaskSourcePath2(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve19(projectRoot, "rig.config.ts");
-  if (!existsSync18(tsPath)) {
+  const tsPath = resolve20(projectRoot, "rig.config.ts");
+  if (!existsSync19(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync9(tsPath, "utf8");
+    const source = readFileSync10(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     if (kind !== "files") {
@@ -4423,10 +4477,10 @@ function readRawTaskEntry(configPath, taskId) {
   return isPlainRecord2(entry) ? entry : null;
 }
 function readRawTaskConfig(configPath) {
-  if (!existsSync18(configPath)) {
+  if (!existsSync19(configPath)) {
     return null;
   }
-  const parsed = JSON.parse(readFileSync9(configPath, "utf8"));
+  const parsed = JSON.parse(readFileSync10(configPath, "utf8"));
   return isPlainRecord2(parsed) ? parsed : null;
 }
 function stripLegacyTaskConfigMetadata2(raw) {
@@ -4434,12 +4488,12 @@ function stripLegacyTaskConfigMetadata2(raw) {
   return tasks;
 }
 function listFileBackedTasks(projectRoot, sourcePath) {
-  const directory = resolve19(projectRoot, sourcePath);
-  if (!existsSync18(directory)) {
+  const directory = resolve20(projectRoot, sourcePath);
+  if (!existsSync19(directory)) {
     return [];
   }
   const tasks = [];
-  for (const name of readdirSync2(directory)) {
+  for (const name of readdirSync3(directory)) {
     if (!FILE_TASK_PATTERN2.test(name))
       continue;
     const inferredId = basename6(name).replace(FILE_TASK_PATTERN2, "");
@@ -4450,11 +4504,11 @@ function listFileBackedTasks(projectRoot, sourcePath) {
   return tasks;
 }
 function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
-  const file = findFileBackedTaskFile(resolve19(projectRoot, sourcePath), taskId);
+  const file = findFileBackedTaskFile(resolve20(projectRoot, sourcePath), taskId);
   if (!file) {
     return null;
   }
-  const raw = JSON.parse(readFileSync9(file, "utf8"));
+  const raw = JSON.parse(readFileSync10(file, "utf8"));
   if (!isPlainRecord2(raw)) {
     return null;
   }
@@ -4467,17 +4521,17 @@ function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
   };
 }
 function findFileBackedTaskFile(directory, taskId) {
-  if (!existsSync18(directory)) {
+  if (!existsSync19(directory)) {
     return null;
   }
-  for (const name of readdirSync2(directory)) {
+  for (const name of readdirSync3(directory)) {
     if (!FILE_TASK_PATTERN2.test(name))
       continue;
     const file = join4(directory, name);
     try {
       if (!statSync5(file).isFile())
         continue;
-      const raw = JSON.parse(readFileSync9(file, "utf8"));
+      const raw = JSON.parse(readFileSync10(file, "utf8"));
       const inferredId = basename6(file).replace(FILE_TASK_PATTERN2, "");
       const id = isPlainRecord2(raw) && typeof raw.id === "string" ? raw.id : inferredId;
       if (id === taskId) {
@@ -4560,8 +4614,8 @@ function githubStatusFor(issue) {
   return "open";
 }
 function selectedGitHubEnv() {
-  const token = process.env.RIG_GITHUB_SELECTED_TOKEN?.trim() ?? "";
-  return { GH_TOKEN: token, GITHUB_TOKEN: token };
+  const token = process.env.RIG_GITHUB_SELECTED_TOKEN?.trim() || process.env.RIG_GITHUB_TOKEN?.trim() || "";
+  return { GH_TOKEN: token, GITHUB_TOKEN: token, RIG_GITHUB_TOKEN: token };
 }
 function ghSpawnOptions() {
   return { encoding: "utf-8", env: { ...process.env, ...selectedGitHubEnv() } };
@@ -4641,8 +4695,8 @@ init_layout();
 
 // packages/runtime/src/binary-run.ts
 init_layout();
-import { chmodSync as chmodSync4, cpSync, existsSync as existsSync19, mkdirSync as mkdirSync8, renameSync as renameSync3, rmSync as rmSync7, writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename7, dirname as dirname11, resolve as resolve20 } from "path";
+import { chmodSync as chmodSync4, cpSync, existsSync as existsSync20, mkdirSync as mkdirSync9, renameSync as renameSync3, rmSync as rmSync8, writeFileSync as writeFileSync8 } from "fs";
+import { basename as basename7, dirname as dirname11, resolve as resolve21 } from "path";
 import { fileURLToPath } from "url";
 import { drainMicrotasks, gcAndSweep } from "bun:jsc";
 var runtimeBinaryBuildQueue = Promise.resolve();
@@ -4668,9 +4722,9 @@ async function buildRuntimeBinary(options) {
   });
 }
 async function buildRuntimeBinaryInProcess(options, manifest) {
-  const tempBuildDir = resolve20(dirname11(options.outputPath), `.bun-build-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`);
-  const tempOutputPath = resolve20(tempBuildDir, basename7(options.outputPath));
-  mkdirSync8(tempBuildDir, { recursive: true });
+  const tempBuildDir = resolve21(dirname11(options.outputPath), `.bun-build-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+  const tempOutputPath = resolve21(tempBuildDir, basename7(options.outputPath));
+  mkdirSync9(tempBuildDir, { recursive: true });
   await withTemporaryEnv({
     ...options.env,
     ...options.define ? { RIG_BUILD_CONFIG_JSON: JSON.stringify(options.define) } : {}
@@ -4695,7 +4749,7 @@ async function buildRuntimeBinaryInProcess(options, manifest) {
 `);
       throw new Error(`Failed to build ${options.entrypoint}: ${details || "Bun.build() returned errors"}`);
     }
-    if (!existsSync19(tempOutputPath)) {
+    if (!existsSync20(tempOutputPath)) {
       const emitted = buildResult.outputs.map((output) => output.path).join(", ") || "(none)";
       throw new Error(`Failed to build ${options.entrypoint}: Bun.build() did not emit ${tempOutputPath}. Emitted: ${emitted}`);
     }
@@ -4710,7 +4764,7 @@ async function buildRuntimeBinaryInProcess(options, manifest) {
       });
     }
   })).finally(() => {
-    rmSync7(tempBuildDir, { recursive: true, force: true });
+    rmSync8(tempBuildDir, { recursive: true, force: true });
   });
 }
 function runBestEffortBuildGc() {
@@ -4727,8 +4781,8 @@ function runtimeBinaryCacheManifestPath(outputPath) {
 function resolveRuntimeBinaryBuildOptions(options) {
   return {
     ...options,
-    entrypoint: resolve20(options.cwd, options.sourcePath),
-    outputPath: resolve20(options.outputPath)
+    entrypoint: resolve21(options.cwd, options.sourcePath),
+    outputPath: resolve21(options.outputPath)
   };
 }
 function shouldUseRuntimeBinaryBuildWorker() {
@@ -4742,7 +4796,7 @@ function shouldUseRuntimeBinaryBuildWorker() {
 }
 async function buildRuntimeBinaryViaWorker(options) {
   const workerSourcePath = resolveRuntimeBinaryBuildWorkerSourcePath(options);
-  if (!workerSourcePath || !existsSync19(workerSourcePath)) {
+  if (!workerSourcePath || !existsSync20(workerSourcePath)) {
     await buildRuntimeBinaryInProcess(options, {
       manifestPath: runtimeBinaryCacheManifestPath(options.outputPath),
       buildKey: createRuntimeBinaryBuildKey({
@@ -4773,13 +4827,13 @@ async function buildRuntimeBinaryViaWorker(options) {
     new Response(build.stdout).text(),
     new Response(build.stderr).text()
   ]);
-  rmSync7(payloadPath, { force: true });
+  rmSync8(payloadPath, { force: true });
   if (exitCode !== 0) {
     throw new Error(`Failed to build ${options.entrypoint}: ${(stderr || stdout || `worker exited ${exitCode}`).trim()}`);
   }
 }
 function createRuntimeBinaryBuildWorkerPayloadPath(outputPath) {
-  return resolve20(dirname11(outputPath), `.bun-build-worker-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`);
+  return resolve21(dirname11(outputPath), `.bun-build-worker-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`);
 }
 function resolveRuntimeBinaryBuildWorkerSourcePath(options) {
   const envRoots = [
@@ -4788,13 +4842,13 @@ function resolveRuntimeBinaryBuildWorkerSourcePath(options) {
     process.env.PROJECT_RIG_ROOT?.trim()
   ].filter(Boolean);
   for (const root of envRoots) {
-    const candidate = resolve20(root, "packages/runtime/src/binary-build-worker.ts");
-    if (existsSync19(candidate)) {
+    const candidate = resolve21(root, "packages/runtime/src/binary-build-worker.ts");
+    if (existsSync20(candidate)) {
       return candidate;
     }
   }
-  const localCandidate = resolve20(import.meta.dir, "binary-build-worker.ts");
-  return existsSync19(localCandidate) ? localCandidate : null;
+  const localCandidate = resolve21(import.meta.dir, "binary-build-worker.ts");
+  return existsSync20(localCandidate) ? localCandidate : null;
 }
 function resolveRuntimeBinaryBuildWorkerInvocation() {
   const bunPath = Bun.which("bun");
@@ -4830,7 +4884,7 @@ function createRuntimeBinaryBuildKey(input) {
   });
 }
 async function isRuntimeBinaryBuildFresh(input) {
-  if (!existsSync19(input.outputPath) || !existsSync19(input.manifestPath)) {
+  if (!existsSync20(input.outputPath) || !existsSync20(input.manifestPath)) {
     return false;
   }
   let manifest = null;
@@ -4843,7 +4897,7 @@ async function isRuntimeBinaryBuildFresh(input) {
     return false;
   }
   for (const [filePath, expectedDigest] of Object.entries(manifest.inputs || {})) {
-    if (!existsSync19(filePath)) {
+    if (!existsSync20(filePath)) {
       return false;
     }
     if (await sha256File4(filePath) !== expectedDigest) {
@@ -4856,7 +4910,7 @@ async function writeRuntimeBinaryCacheManifest(input) {
   const inputs = {};
   for (const inputPath of Object.keys(input.metafile?.inputs || {}).sort()) {
     const normalized = normalizeBuildInputPath(input.cwd, inputPath);
-    if (!normalized || !existsSync19(normalized)) {
+    if (!normalized || !existsSync20(normalized)) {
       continue;
     }
     inputs[normalized] = await sha256File4(normalized);
@@ -4879,7 +4933,7 @@ function normalizeBuildInputPath(cwd, inputPath) {
   if (inputPath.startsWith("<")) {
     return null;
   }
-  return resolve20(cwd, inputPath);
+  return resolve21(cwd, inputPath);
 }
 async function sha256File4(path) {
   const hasher = new Bun.CryptoHasher("sha256");
@@ -4895,8 +4949,8 @@ function sortRecord(value) {
 async function runSerializedRuntimeBinaryBuild(action) {
   const previous = runtimeBinaryBuildQueue;
   let release;
-  runtimeBinaryBuildQueue = new Promise((resolve21) => {
-    release = resolve21;
+  runtimeBinaryBuildQueue = new Promise((resolve22) => {
+    release = resolve22;
   });
   await previous;
   try {
@@ -4941,11 +4995,11 @@ async function withTemporaryCwd(cwd, action) {
 }
 
 // packages/runtime/src/control-plane/runtime/provisioning-env.ts
-import { delimiter, resolve as resolve23 } from "path";
+import { delimiter, resolve as resolve24 } from "path";
 
 // packages/runtime/src/control-plane/runtime/runtime-paths.ts
-import { existsSync as existsSync21, readdirSync as readdirSync4, realpathSync as realpathSync2 } from "fs";
-import { resolve as resolve22 } from "path";
+import { existsSync as existsSync22, readdirSync as readdirSync5, realpathSync as realpathSync2 } from "fs";
+import { resolve as resolve23 } from "path";
 
 // packages/runtime/src/control-plane/runtime/sandbox-utils.ts
 init_utils();
@@ -4962,7 +5016,7 @@ function resolveBunBinaryPath() {
   }
   const home = process.env.HOME?.trim();
   const fallbackCandidates = [
-    home ? resolve22(home, ".bun/bin/bun") : "",
+    home ? resolve23(home, ".bun/bin/bun") : "",
     "/opt/homebrew/bin/bun",
     "/usr/local/bin/bun",
     "/usr/bin/bun"
@@ -4990,8 +5044,8 @@ function resolveClaudeBinaryPath() {
   }
   const home = process.env.HOME?.trim();
   const fallbackCandidates = [
-    home ? resolve22(home, ".local/bin/claude") : "",
-    home ? resolve22(home, ".local/share/claude/local/claude") : "",
+    home ? resolve23(home, ".local/bin/claude") : "",
+    home ? resolve23(home, ".local/share/claude/local/claude") : "",
     "/opt/homebrew/bin/claude",
     "/usr/local/bin/claude",
     "/usr/bin/claude"
@@ -5005,35 +5059,35 @@ function resolveClaudeBinaryPath() {
   throw new Error("claude not found in PATH");
 }
 function resolveBunInstallDir(bunBinaryPath = resolveBunBinaryPath()) {
-  return resolve22(bunBinaryPath, "../..");
+  return resolve23(bunBinaryPath, "../..");
 }
 function resolveClaudeInstallDir() {
   const realPath = resolveClaudeBinaryPath();
-  return resolve22(realPath, "..");
+  return resolve23(realPath, "..");
 }
 function resolveNodeInstallDir() {
   const preferredNode = resolvePreferredNodeBinary();
   if (!preferredNode)
     return null;
   const explicitNode = process.env.RIG_NODE_BIN?.trim();
-  if (explicitNode && resolve22(explicitNode) === resolve22(preferredNode)) {
-    return preferredNode.endsWith("/bin/node") ? resolve22(preferredNode, "../..") : resolve22(preferredNode, "..");
+  if (explicitNode && resolve23(explicitNode) === resolve23(preferredNode)) {
+    return preferredNode.endsWith("/bin/node") ? resolve23(preferredNode, "../..") : resolve23(preferredNode, "..");
   }
   try {
     const realPath = realpathSync2(preferredNode);
     if (realPath.endsWith("/bin/node")) {
-      return resolve22(realPath, "../..");
+      return resolve23(realPath, "../..");
     }
-    return resolve22(realPath, "..");
+    return resolve23(realPath, "..");
   } catch {
-    return resolve22(preferredNode, "..");
+    return resolve23(preferredNode, "..");
   }
 }
 function resolveRuntimeDependencyRoots(runtimeDirs) {
   const roots = [];
   if (process.platform === "darwin") {
     for (const macPath of ["/opt/homebrew", "/opt/homebrew/opt"]) {
-      if (existsSync21(macPath)) {
+      if (existsSync22(macPath)) {
         roots.push(macPath);
       }
     }
@@ -5051,23 +5105,23 @@ function resolvePreferredNodeBinary() {
   const candidates = [];
   const envNode = process.env.RIG_NODE_BIN?.trim();
   if (envNode) {
-    const explicit = resolve22(envNode);
-    if (existsSync21(explicit)) {
+    const explicit = resolve23(envNode);
+    if (existsSync22(explicit)) {
       return explicit;
     }
   }
   const nvmBin = process.env.NVM_BIN?.trim();
   if (nvmBin) {
-    candidates.push(resolve22(nvmBin, "node"));
+    candidates.push(resolve23(nvmBin, "node"));
   }
   const home = process.env.HOME?.trim();
   if (home) {
-    const nvmVersionsDir = resolve22(home, ".nvm/versions/node");
-    if (existsSync21(nvmVersionsDir)) {
+    const nvmVersionsDir = resolve23(home, ".nvm/versions/node");
+    if (existsSync22(nvmVersionsDir)) {
       try {
-        const versionDirs = readdirSync4(nvmVersionsDir).map((entry) => entry.trim()).filter((entry) => /^v\d+\.\d+\.\d+$/.test(entry)).sort((a, b) => Bun.semver.order(b.replace(/^v/, ""), a.replace(/^v/, "")));
+        const versionDirs = readdirSync5(nvmVersionsDir).map((entry) => entry.trim()).filter((entry) => /^v\d+\.\d+\.\d+$/.test(entry)).sort((a, b) => Bun.semver.order(b.replace(/^v/, ""), a.replace(/^v/, "")));
         for (const versionDir of versionDirs) {
-          candidates.push(resolve22(nvmVersionsDir, versionDir, "bin/node"));
+          candidates.push(resolve23(nvmVersionsDir, versionDir, "bin/node"));
         }
       } catch {}
     }
@@ -5076,8 +5130,8 @@ function resolvePreferredNodeBinary() {
   if (whichNode) {
     candidates.push(whichNode);
   }
-  const deduped = uniq(candidates.map((candidate) => resolve22(candidate)));
-  const existing = deduped.filter((candidate) => existsSync21(candidate));
+  const deduped = uniq(candidates.map((candidate) => resolve23(candidate)));
+  const existing = deduped.filter((candidate) => existsSync22(candidate));
   if (existing.length === 0) {
     return null;
   }
@@ -5091,7 +5145,7 @@ function resolvePreferredNodeBinary() {
   return existing[0] ?? null;
 }
 function inferNodeMajor(nodeBinaryPath) {
-  const normalized = resolve22(nodeBinaryPath).replace(/\\/g, "/");
+  const normalized = resolve23(nodeBinaryPath).replace(/\\/g, "/");
   const match = normalized.match(/(?:^|\/)(?:node-)?v?(\d+)\.\d+\.\d+(?:\/|$)/);
   if (!match) {
     return null;
@@ -5103,8 +5157,8 @@ function normalizeExecutablePath(candidate) {
   if (!candidate) {
     return "";
   }
-  const normalized = resolve22(candidate);
-  if (!existsSync21(normalized)) {
+  const normalized = resolve23(candidate);
+  if (!existsSync22(normalized)) {
     return "";
   }
   try {
@@ -5114,7 +5168,7 @@ function normalizeExecutablePath(candidate) {
   }
 }
 function looksLikeRuntimeGateway(candidate) {
-  const normalized = resolve22(candidate).replace(/\\/g, "/");
+  const normalized = resolve23(candidate).replace(/\\/g, "/");
   return normalized.includes("/.rig/bin/") || normalized.endsWith("/rig-shell") || normalized.endsWith("/rig-agent");
 }
 
@@ -5135,7 +5189,7 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
     try {
       return resolveClaudeInstallDir();
     } catch {
-      return resolve23(claudeBinary, "..");
+      return resolve24(claudeBinary, "..");
     }
   })() : "";
   const nodeDir = resolveNodeInstallDir();
@@ -5145,8 +5199,8 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
     `${bunDir}/bin`,
     claudeDir,
     nodeDir ? `${nodeDir}/bin` : "",
-    realHome ? resolve23(realHome, ".local/bin") : "",
-    realHome ? resolve23(realHome, ".cargo/bin") : "",
+    realHome ? resolve24(realHome, ".local/bin") : "",
+    realHome ? resolve24(realHome, ".cargo/bin") : "",
     ...inheritedPath,
     "/usr/local/bin",
     "/usr/local/sbin",
@@ -5175,8 +5229,8 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
 }
 
 // packages/runtime/src/control-plane/runtime/baked-secrets.ts
-import { existsSync as existsSync22, readFileSync as readFileSync10 } from "fs";
-import { resolve as resolve24 } from "path";
+import { existsSync as existsSync23, readFileSync as readFileSync11 } from "fs";
+import { resolve as resolve25 } from "path";
 var BAKED_RUNTIME_SECRETS = {
   ANTHROPIC_API_KEY: typeof RIG_BAKED_ANTHROPIC_API_KEY !== "undefined" ? RIG_BAKED_ANTHROPIC_API_KEY : "",
   OPENAI_API_KEY: typeof RIG_BAKED_OPENAI_API_KEY !== "undefined" ? RIG_BAKED_OPENAI_API_KEY : "",
@@ -5219,12 +5273,12 @@ function resolveRuntimeSecrets(env, baked = BAKED_RUNTIME_SECRETS) {
   return resolved;
 }
 function loadDotEnvSecrets(projectRoot, env = process.env) {
-  const dotenvPath = resolve24(projectRoot, ".env");
-  if (!existsSync22(dotenvPath)) {
+  const dotenvPath = resolve25(projectRoot, ".env");
+  if (!existsSync23(dotenvPath)) {
     return {};
   }
   const parsed = {};
-  const lines = readFileSync10(dotenvPath, "utf-8").split(/\r?\n/);
+  const lines = readFileSync11(dotenvPath, "utf-8").split(/\r?\n/);
   for (const rawLine of lines) {
     const line = rawLine.trim();
     if (!line || line.startsWith("#")) {
@@ -5581,16 +5635,16 @@ async function taskDeps(projectRoot, taskId) {
   for (const dep of deps) {
     const artifactDir = artifactDirForId(projectRoot, dep);
     console.log(`=== ${dep} ===`);
-    if (!existsSync23(artifactDir)) {
+    if (!existsSync24(artifactDir)) {
       console.log(`  (no artifacts yet)
 `);
       continue;
     }
-    printArtifactSection(resolve25(artifactDir, "decision-log.md"), "--- Decisions ---");
-    printArtifactSection(resolve25(artifactDir, "next-actions.md"), "--- Next Actions (for you) ---");
-    const changedFiles = resolve25(artifactDir, "changed-files.txt");
-    if (existsSync23(changedFiles)) {
-      const lines = readFileSync11(changedFiles, "utf-8").split(/\r?\n/).filter(Boolean);
+    printArtifactSection(resolve26(artifactDir, "decision-log.md"), "--- Decisions ---");
+    printArtifactSection(resolve26(artifactDir, "next-actions.md"), "--- Next Actions (for you) ---");
+    const changedFiles = resolve26(artifactDir, "changed-files.txt");
+    if (existsSync24(changedFiles)) {
+      const lines = readFileSync12(changedFiles, "utf-8").split(/\r?\n/).filter(Boolean);
       console.log(`--- Changed Files (${lines.length}) ---`);
       for (const line of lines) {
         console.log(line);
@@ -5714,12 +5768,12 @@ function printIndented(text) {
   }
 }
 function readLocalBeadsTasks(projectRoot) {
-  const issuesPath = resolve25(resolveMonorepoRoot2(projectRoot), ".beads/issues.jsonl");
-  if (!existsSync23(issuesPath)) {
+  const issuesPath = resolve26(resolveMonorepoRoot2(projectRoot), ".beads/issues.jsonl");
+  if (!existsSync24(issuesPath)) {
     return [];
   }
   const tasks = [];
-  for (const line of readFileSync11(issuesPath, "utf-8").split(/\r?\n/)) {
+  for (const line of readFileSync12(issuesPath, "utf-8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -5832,11 +5886,11 @@ function taskDependencies(projectRoot, taskId, tracker) {
   return [...ids].sort();
 }
 function printArtifactSection(path, header) {
-  if (!existsSync23(path)) {
+  if (!existsSync24(path)) {
     return;
   }
   console.log(header);
-  process.stdout.write(readFileSync11(path, "utf-8"));
+  process.stdout.write(readFileSync12(path, "utf-8"));
   console.log("");
 }
 
@@ -5938,7 +5992,7 @@ init_layout();
 
 // packages/runtime/src/control-plane/runtime/overlay.ts
 init_layout();
-import { mkdirSync as mkdirSync10 } from "fs";
+import { mkdirSync as mkdirSync11 } from "fs";
 function ensureRuntimeOverlay(projectRoot, runtimeId, workspaceDir) {
   const layout = resolveRuntimeWorkspaceLayout(workspaceDir ?? projectRoot);
   const rootDir = layout.rigRoot;
@@ -5950,14 +6004,14 @@ function ensureRuntimeOverlay(projectRoot, runtimeId, workspaceDir) {
   const sessionDir = layout.sessionDir;
   const runtimeDir = layout.runtimeDir;
   const contextPath = layout.contextPath;
-  mkdirSync10(rootDir, { recursive: true });
-  mkdirSync10(homeDir, { recursive: true });
-  mkdirSync10(tmpDir, { recursive: true });
-  mkdirSync10(cacheDir, { recursive: true });
-  mkdirSync10(logsDir, { recursive: true });
-  mkdirSync10(stateDir, { recursive: true });
-  mkdirSync10(sessionDir, { recursive: true });
-  mkdirSync10(runtimeDir, { recursive: true });
+  mkdirSync11(rootDir, { recursive: true });
+  mkdirSync11(homeDir, { recursive: true });
+  mkdirSync11(tmpDir, { recursive: true });
+  mkdirSync11(cacheDir, { recursive: true });
+  mkdirSync11(logsDir, { recursive: true });
+  mkdirSync11(stateDir, { recursive: true });
+  mkdirSync11(sessionDir, { recursive: true });
+  mkdirSync11(runtimeDir, { recursive: true });
   return {
     rootDir,
     homeDir,
@@ -5975,17 +6029,17 @@ import {
   chmodSync as chmodSync5,
   copyFileSync as copyFileSync5,
   cpSync as cpSync2,
-  existsSync as existsSync25,
-  mkdirSync as mkdirSync11,
+  existsSync as existsSync26,
+  mkdirSync as mkdirSync12,
   statSync as statSync6,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync10
 } from "fs";
 import { mkdir as mkdir2 } from "fs/promises";
-import { basename as basename8, delimiter as delimiter2, resolve as resolve27 } from "path";
+import { basename as basename8, delimiter as delimiter2, resolve as resolve28 } from "path";
 
 // packages/runtime/src/control-plane/runtime/isolation/shared.ts
-import { existsSync as existsSync24, readFileSync as readFileSync12, rmSync as rmSync8 } from "fs";
-import { resolve as resolve26 } from "path";
+import { existsSync as existsSync25, readFileSync as readFileSync13, rmSync as rmSync9 } from "fs";
+import { resolve as resolve27 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 var generatedCredentialFiles = new Set;
 var credentialCleanupRegistered = false;
@@ -6010,7 +6064,7 @@ function resolveHostGitBinary() {
     if (!candidate || isRuntimeGatewayGitPath(candidate)) {
       continue;
     }
-    if (existsSync24(candidate)) {
+    if (existsSync25(candidate)) {
       return candidate;
     }
   }
@@ -6076,7 +6130,7 @@ async function refreshRemoteBranch(repoRoot, remote, branch) {
   }
 }
 async function tryReadGitHead(repoRoot) {
-  if (!existsSync24(resolve26(repoRoot, ".git"))) {
+  if (!existsSync25(resolve27(repoRoot, ".git"))) {
     return;
   }
   const result = await runGitCommand(repoRoot, ["rev-parse", "HEAD"]);
@@ -6087,7 +6141,7 @@ async function tryReadGitHead(repoRoot) {
   return value || undefined;
 }
 async function captureRepoDirtyFiles(repoRoot) {
-  if (!existsSync24(resolve26(repoRoot, ".git"))) {
+  if (!existsSync25(resolve27(repoRoot, ".git"))) {
     return [];
   }
   const files = new Set;
@@ -6123,7 +6177,7 @@ function registerCredentialCleanup(path) {
   const cleanup = () => {
     for (const filePath of generatedCredentialFiles) {
       try {
-        rmSync8(filePath, { force: true });
+        rmSync9(filePath, { force: true });
       } catch {}
     }
     generatedCredentialFiles.clear();
@@ -6178,20 +6232,23 @@ function hashProjectPath(workspaceDir) {
 }
 function resolveGithubCliBinaryPath() {
   const explicit = process.env.RIG_GH_BIN?.trim();
-  if (explicit && existsSync24(explicit)) {
+  if (explicit && existsSync25(explicit) && !isRuntimeGatewayGhPath(explicit)) {
     return explicit;
   }
-  const bunResolved = Bun.which("gh");
-  if (bunResolved && existsSync24(bunResolved)) {
-    return bunResolved;
-  }
-  for (const candidate of ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"]) {
-    if (existsSync24(candidate)) {
+  for (const candidate of ["/usr/bin/gh", "/opt/homebrew/bin/gh", "/usr/local/bin/gh"]) {
+    if (existsSync25(candidate)) {
       return candidate;
     }
   }
+  const bunResolved = Bun.which("gh");
+  if (bunResolved && existsSync25(bunResolved) && !isRuntimeGatewayGhPath(bunResolved)) {
+    return bunResolved;
+  }
   return "";
 }
+function isRuntimeGatewayGhPath(candidate) {
+  return /\/\.rig\/bin\/gh$/.test(candidate.replace(/\\/g, "/"));
+}
 async function resolveGithubCliAuthToken(ghBinary = "") {
   const gh = ghBinary || resolveGithubCliBinaryPath();
   if (!gh) {
@@ -6218,17 +6275,17 @@ function resolveSystemCertBundlePath() {
     "/opt/homebrew/etc/openssl@3/cert.pem"
   ];
   for (const candidate of candidates) {
-    if (candidate && existsSync24(candidate)) {
-      return resolve26(candidate);
+    if (candidate && existsSync25(candidate)) {
+      return resolve27(candidate);
     }
   }
   return "";
 }
 function readKnownHosts(path) {
-  if (!existsSync24(path)) {
+  if (!existsSync25(path)) {
     return new Set;
   }
-  return new Set(readFileSync12(path, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
+  return new Set(readFileSync13(path, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
 }
 
 // packages/runtime/src/control-plane/runtime/isolation/home.ts
@@ -6239,6 +6296,21 @@ var GITHUB_KNOWN_HOSTS = [
   "github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk="
 ].join(`
 `);
+function resolveControlPlaneSourceRoot(projectRoot) {
+  const candidates = [
+    process.env.RIG_CONTROL_PLANE_SOURCE_ROOT?.trim(),
+    process.env.RIG_HOST_PROJECT_ROOT?.trim(),
+    resolve28(import.meta.dir, "../../../../.."),
+    projectRoot
+  ].filter((value) => Boolean(value));
+  for (const candidate of candidates) {
+    const root = resolve28(candidate);
+    if (existsSync26(resolve28(root, "packages/runtime/src/control-plane/pi-sessiond/bin.ts"))) {
+      return root;
+    }
+  }
+  return "";
+}
 async function runtimeEnv(projectRoot, runtime) {
   const bunBinaryPath = resolveBunBinaryPath();
   const bunDir = resolveBunInstallDir(bunBinaryPath);
@@ -6253,7 +6325,7 @@ async function runtimeEnv(projectRoot, runtime) {
     try {
       return resolveClaudeInstallDir();
     } catch {
-      return resolve27(claudeBinaryPath, "..");
+      return resolve28(claudeBinaryPath, "..");
     }
   })() : "";
   const nodeDir = resolveNodeInstallDir();
@@ -6268,8 +6340,8 @@ async function runtimeEnv(projectRoot, runtime) {
     `${bunDir}/bin`,
     claudeDir,
     nodeDir ? `${nodeDir}/bin` : "",
-    realHome ? resolve27(realHome, ".local/bin") : "",
-    realHome ? resolve27(realHome, ".cargo/bin") : "",
+    realHome ? resolve28(realHome, ".local/bin") : "",
+    realHome ? resolve28(realHome, ".cargo/bin") : "",
     ...inheritedPath,
     "/usr/local/bin",
     "/usr/local/sbin",
@@ -6280,18 +6352,22 @@ async function runtimeEnv(projectRoot, runtime) {
     "/usr/sbin",
     "/sbin"
   ].filter(Boolean);
-  const runtimeBash = resolve27(runtime.binDir, "bash");
-  const runtimeRigGit = resolve27(runtime.binDir, runtimeRigGitFileName());
-  const preferredShell = existsSync25(runtimeBash) ? runtimeBash : "/bin/bash";
+  const runtimeBash = resolve28(runtime.binDir, "bash");
+  const runtimeRigGit = resolve28(runtime.binDir, runtimeRigGitFileName());
+  const preferredShell = existsSync26(runtimeBash) ? runtimeBash : "/bin/bash";
   const nativeRuntimeLibraryPath = await materializeNativeRuntimeLibrary(runtime.binDir);
+  const controlPlaneSourceRoot = resolveControlPlaneSourceRoot(projectRoot);
   const env = {
     PROJECT_RIG_ROOT: projectRoot,
     RIG_HOST_PROJECT_ROOT: projectRoot,
+    ...controlPlaneSourceRoot ? { RIG_CONTROL_PLANE_SOURCE_ROOT: controlPlaneSourceRoot } : {},
     HOME: runtime.homeDir,
     TMPDIR: runtime.tmpDir,
     XDG_CACHE_HOME: runtime.cacheDir,
     XDG_STATE_HOME: runtime.stateDir,
     RIG_AGENT_ID: runtime.id,
+    ...process.env.RIG_RUN_ID?.trim() ? { RIG_RUN_ID: process.env.RIG_RUN_ID.trim() } : {},
+    ...process.env.RIG_SERVER_RUN_ID?.trim() ? { RIG_SERVER_RUN_ID: process.env.RIG_SERVER_RUN_ID.trim() } : {},
     RIG_TASK_ID: runtime.taskId,
     RIG_TASK_RUNTIME_ID: runtime.id,
     RIG_TASK_WORKSPACE: runtime.workspaceDir,
@@ -6299,30 +6375,30 @@ async function runtimeEnv(projectRoot, runtime) {
     RIG_RUNTIME_MODE: runtime.mode,
     RIG_RUNTIME_HOME: runtime.rootDir,
     RIG_RUNTIME_BIN_DIR: runtime.binDir,
-    ...existsSync25(runtimeRigGit) ? { RIG_NATIVE_GIT_BIN: runtimeRigGit } : {},
+    ...existsSync26(runtimeRigGit) ? { RIG_NATIVE_GIT_BIN: runtimeRigGit } : {},
     RIG_BUN_PATH: bunBinaryPath,
     ...claudeBinaryPath ? { RIG_CLAUDE_PATH: claudeBinaryPath } : {},
-    RIG_AGENT_BIN: resolve27(runtime.binDir, "rig-agent"),
+    RIG_AGENT_BIN: resolve28(runtime.binDir, "rig-agent"),
     RIG_HOOKS_ACTIVE: "1",
     RIG_AUTO_PR_ON_COMPLETE: "1",
-    RIG_POLICY_FILE: resolve27(projectRoot, "rig/policy/policy.json"),
+    RIG_POLICY_FILE: resolve28(projectRoot, "rig/policy/policy.json"),
     RIG_STATE_DIR: runtime.stateDir,
     RIG_LOGS_DIR: runtime.logsDir,
-    RIG_SESSION_FILE: resolve27(runtime.sessionDir, "session.json"),
+    RIG_SESSION_FILE: resolve28(runtime.sessionDir, "session.json"),
     MONOREPO_ROOT: runtime.workspaceDir,
     MONOREPO_MAIN_ROOT: monorepoMainRoot,
-    TS_API_TESTS_DIR: resolve27(runtime.workspaceDir, "TSAPITests"),
+    TS_API_TESTS_DIR: resolve28(runtime.workspaceDir, "TSAPITests"),
     BASH: preferredShell,
     SHELL: preferredShell,
     PATH: [...new Set(pathEntries)].join(delimiter2),
     LANG: process.env.LANG ?? "en_US.UTF-8",
     TERM: process.env.TERM ?? "xterm-256color",
     PYTHONDONTWRITEBYTECODE: "1",
-    PYTHONPYCACHEPREFIX: resolve27(runtime.cacheDir, "python"),
+    PYTHONPYCACHEPREFIX: resolve28(runtime.cacheDir, "python"),
     ...process.env.RIG_PR_BASE_PROJECT && { RIG_PR_BASE_PROJECT: process.env.RIG_PR_BASE_PROJECT },
     ...process.env.RIG_PR_BASE_MONOREPO && { RIG_PR_BASE_MONOREPO: process.env.RIG_PR_BASE_MONOREPO },
     CLAUDE_HOME: runtime.claudeHomeDir,
-    PI_CODING_AGENT_DIR: resolve27(runtime.homeDir, ".pi", "agent"),
+    PI_CODING_AGENT_DIR: resolve28(runtime.homeDir, ".pi", "agent"),
     [RUNTIME_CONTEXT_ENV]: runtime.contextFile,
     ...nativeRuntimeLibraryPath ? { RIG_NATIVE_RUNTIME_LIB: nativeRuntimeLibraryPath } : {},
     ...hostGhBinary ? { RIG_GH_BIN: hostGhBinary } : {},
@@ -6333,16 +6409,16 @@ async function runtimeEnv(projectRoot, runtime) {
       NODE_EXTRA_CA_CERTS: runtimeCertBundlePath
     } : {}
   };
-  const knownHostsPath = resolve27(runtime.homeDir, ".ssh", "known_hosts");
-  if (existsSync25(knownHostsPath)) {
-    const agentSshKey = resolve27(runtime.homeDir, ".ssh", "rig-agent-key");
+  const knownHostsPath = resolve28(runtime.homeDir, ".ssh", "known_hosts");
+  if (existsSync26(knownHostsPath)) {
+    const agentSshKey = resolve28(runtime.homeDir, ".ssh", "rig-agent-key");
     const sshParts = [
       "ssh",
       `-o UserKnownHostsFile="${knownHostsPath}"`,
       "-o StrictHostKeyChecking=yes",
       "-F /dev/null"
     ];
-    if (existsSync25(agentSshKey)) {
+    if (existsSync26(agentSshKey)) {
       sshParts.splice(1, 0, `-i "${agentSshKey}"`, "-o IdentitiesOnly=yes");
     }
     env.GIT_SSH_COMMAND = sshParts.join(" ");
@@ -6379,7 +6455,7 @@ async function runtimeEnv(projectRoot, runtime) {
   if (!env.GREPTILE_GITHUB_TOKEN && env.GITHUB_TOKEN) {
     env.GREPTILE_GITHUB_TOKEN = env.GITHUB_TOKEN;
   }
-  if (existsSync25(runtime.contextFile)) {
+  if (existsSync26(runtime.contextFile)) {
     const runtimeContext = loadRuntimeContext(runtime.contextFile);
     Object.assign(env, runtimeMemoryEnvFromContext(runtimeContext));
     Object.assign(env, browserEnvFromContext(runtimeContext.browser));
@@ -6408,30 +6484,30 @@ async function provisionRuntimeHome(runtime, options = {}) {
   await mkdir2(runtime.cacheDir, { recursive: true });
   await provisionAgentSshKey(runtime.homeDir);
   if (options.provider === "codex") {
-    const hasCodexAuth = await injectCodexAuth(resolve27(runtime.homeDir, ".codex"));
+    const hasCodexAuth = await injectCodexAuth(resolve28(runtime.homeDir, ".codex"));
     if (!hasCodexAuth) {
       console.warn("[rig] No Codex auth.json found for isolated runtime. " + "Run `codex login` in your host shell, then retry the agent run.");
     }
   }
   if (options.provider === "pi") {
-    const hasPiAuth = await injectPiAgentConfig(resolve27(runtime.homeDir, ".pi", "agent"));
+    const hasPiAuth = await injectPiAgentConfig(resolve28(runtime.homeDir, ".pi", "agent"));
     if (!hasPiAuth) {
       console.warn("[rig] No Pi auth.json found for isolated runtime. " + "Run `pi /login` in your host shell, then retry the agent run.");
     }
   }
 }
 async function provisionClaudeHome(config) {
-  mkdirSync11(config.claudeHomeDir, { recursive: true });
-  const workspaceSettings = resolve27(config.workspaceDir, ".claude/settings.json");
-  const hostSettings = resolve27(config.hostProjectRoot, ".claude/settings.json");
-  const projectSettings = existsSync25(workspaceSettings) ? workspaceSettings : hostSettings;
+  mkdirSync12(config.claudeHomeDir, { recursive: true });
+  const workspaceSettings = resolve28(config.workspaceDir, ".claude/settings.json");
+  const hostSettings = resolve28(config.hostProjectRoot, ".claude/settings.json");
+  const projectSettings = existsSync26(workspaceSettings) ? workspaceSettings : hostSettings;
   const runtimeSettings = await loadRuntimeClaudeSettings(projectSettings);
-  if (existsSync25(projectSettings)) {
-    writeFileSync9(resolve27(config.claudeHomeDir, "settings.local.json"), `${JSON.stringify(runtimeSettings, null, 2)}
+  if (existsSync26(projectSettings)) {
+    writeFileSync10(resolve28(config.claudeHomeDir, "settings.local.json"), `${JSON.stringify(runtimeSettings, null, 2)}
 `, "utf-8");
   }
   writeClaudeProjectSettings(config.claudeHomeDir, config.workspaceDir, runtimeSettings);
-  writeFileSync9(resolve27(config.claudeHomeDir, "settings.json"), JSON.stringify({
+  writeFileSync10(resolve28(config.claudeHomeDir, "settings.json"), JSON.stringify({
     permissions: { defaultMode: "bypassPermissions" },
     autoMemoryEnabled: false
   }, null, 2));
@@ -6439,12 +6515,12 @@ async function provisionClaudeHome(config) {
   if (!hasCredentials) {
     console.warn("[rig] No Claude credentials found for isolated runtime. " + "Run `claude /login` in your host shell, then retry the agent run.");
   }
-  const realClaudeHome = resolve27(process.env.HOME ?? "", ".claude");
-  if (process.env.HOME && existsSync25(resolve27(realClaudeHome, "CLAUDE.md"))) {
-    cpSync2(resolve27(realClaudeHome, "CLAUDE.md"), resolve27(config.claudeHomeDir, "CLAUDE.md"));
+  const realClaudeHome = resolve28(process.env.HOME ?? "", ".claude");
+  if (process.env.HOME && existsSync26(resolve28(realClaudeHome, "CLAUDE.md"))) {
+    cpSync2(resolve28(realClaudeHome, "CLAUDE.md"), resolve28(config.claudeHomeDir, "CLAUDE.md"));
   }
-  if (process.env.HOME && existsSync25(resolve27(realClaudeHome, "agents"))) {
-    cpSync2(resolve27(realClaudeHome, "agents"), resolve27(config.claudeHomeDir, "agents"), { recursive: true });
+  if (process.env.HOME && existsSync26(resolve28(realClaudeHome, "agents"))) {
+    cpSync2(resolve28(realClaudeHome, "agents"), resolve28(config.claudeHomeDir, "agents"), { recursive: true });
   }
   if (process.platform === "darwin" && process.env.HOME) {
     writeClaudeProjectSettings(realClaudeHome, config.workspaceDir, runtimeSettings);
@@ -6455,10 +6531,10 @@ async function materializeRuntimeCertBundle(runtime) {
   if (!sourcePath) {
     return "";
   }
-  const certsDir = resolve27(runtime.rootDir, "certs");
-  const targetPath = resolve27(certsDir, "ca-certificates.pem");
+  const certsDir = resolve28(runtime.rootDir, "certs");
+  const targetPath = resolve28(certsDir, "ca-certificates.pem");
   await mkdir2(certsDir, { recursive: true });
-  let shouldCopy = !existsSync25(targetPath);
+  let shouldCopy = !existsSync26(targetPath);
   if (!shouldCopy) {
     try {
       shouldCopy = statSync6(sourcePath).mtimeMs > statSync6(targetPath).mtimeMs;
@@ -6480,7 +6556,7 @@ function applyGitHubCredentialHelperEnv(env) {
   env.GIT_CONFIG_VALUE_1 = '!f() { test "$1" = get || exit 0; token="${GITHUB_TOKEN:-${GH_TOKEN:-${RIG_GITHUB_TOKEN:-}}}"; test -n "$token" || exit 0; echo username=x-access-token; echo password="$token"; }; f';
 }
 function persistRuntimeSecrets(runtimeRoot, env) {
-  const secretsPath = resolve27(runtimeRoot, "runtime-secrets.json");
+  const secretsPath = resolve28(runtimeRoot, "runtime-secrets.json");
   const persisted = {};
   for (const key of [
     "GITHUB_TOKEN",
@@ -6499,12 +6575,12 @@ function persistRuntimeSecrets(runtimeRoot, env) {
   if (Object.keys(persisted).length === 0) {
     return;
   }
-  writeFileSync9(secretsPath, `${JSON.stringify(persisted, null, 2)}
+  writeFileSync10(secretsPath, `${JSON.stringify(persisted, null, 2)}
 `, "utf-8");
 }
 async function provisionAgentSshKey(homeDir) {
-  const sshDir = resolve27(homeDir, ".ssh");
-  if (!existsSync25(sshDir)) {
+  const sshDir = resolve28(homeDir, ".ssh");
+  if (!existsSync26(sshDir)) {
     await mkdir2(sshDir, { recursive: true });
   }
   seedKnownHosts(sshDir);
@@ -6512,27 +6588,27 @@ async function provisionAgentSshKey(homeDir) {
   const privateKey = decodeProvisionedSshKey(secrets.GITHUB_SSH_KEY);
   if (!privateKey) {
     const hostKeyPath = resolveHostSshKeyPath(process.env.HOME ?? "");
-    if (!process.env.HOME || !existsSync25(hostKeyPath)) {
+    if (!process.env.HOME || !existsSync26(hostKeyPath)) {
       return;
     }
-    const agentKeyPath2 = resolve27(sshDir, "rig-agent-key");
-    if (!existsSync25(agentKeyPath2)) {
+    const agentKeyPath2 = resolve28(sshDir, "rig-agent-key");
+    if (!existsSync26(agentKeyPath2)) {
       copyFileSync5(hostKeyPath, agentKeyPath2);
       chmodSync5(agentKeyPath2, 384);
     }
     const hostPubPath = `${hostKeyPath}.pub`;
-    if (existsSync25(hostPubPath)) {
+    if (existsSync26(hostPubPath)) {
       const agentPubPath = `${agentKeyPath2}.pub`;
-      if (!existsSync25(agentPubPath)) {
+      if (!existsSync26(agentPubPath)) {
         copyFileSync5(hostPubPath, agentPubPath);
       }
     }
     writeSshConfig(sshDir, agentKeyPath2);
     return;
   }
-  const agentKeyPath = resolve27(sshDir, "rig-agent-key");
-  if (!existsSync25(agentKeyPath)) {
-    writeFileSync9(agentKeyPath, privateKey, { mode: 384 });
+  const agentKeyPath = resolve28(sshDir, "rig-agent-key");
+  if (!existsSync26(agentKeyPath)) {
+    writeFileSync10(agentKeyPath, privateKey, { mode: 384 });
   }
   writeSshConfig(sshDir, agentKeyPath);
 }
@@ -6549,21 +6625,21 @@ function decodeProvisionedSshKey(encodedKey) {
 `;
 }
 function resolveHostSshKeyPath(homeDir) {
-  const sshDir = resolve27(homeDir, ".ssh");
+  const sshDir = resolve28(homeDir, ".ssh");
   const candidates = [
     "rig-agent-key",
     "id_ed25519",
     "id_ecdsa",
     "id_rsa"
-  ].map((name) => resolve27(sshDir, name));
-  return candidates.find((candidate) => existsSync25(candidate)) ?? resolve27(sshDir, "rig-agent-key");
+  ].map((name) => resolve28(sshDir, name));
+  return candidates.find((candidate) => existsSync26(candidate)) ?? resolve28(sshDir, "rig-agent-key");
 }
 function writeSshConfig(sshDir, keyPath) {
-  const configPath = resolve27(sshDir, "config");
-  if (existsSync25(configPath)) {
+  const configPath = resolve28(sshDir, "config");
+  if (existsSync26(configPath)) {
     return;
   }
-  const knownHostsPath = resolve27(sshDir, "known_hosts");
+  const knownHostsPath = resolve28(sshDir, "known_hosts");
   const config = [
     "Host github.com",
     `  IdentityFile ${keyPath}`,
@@ -6573,10 +6649,10 @@ function writeSshConfig(sshDir, keyPath) {
     ""
   ].join(`
 `);
-  writeFileSync9(configPath, config, { mode: 420 });
+  writeFileSync10(configPath, config, { mode: 420 });
 }
 function seedKnownHosts(sshDir) {
-  const knownHostsPath = resolve27(sshDir, "known_hosts");
+  const knownHostsPath = resolve28(sshDir, "known_hosts");
   const existingLines = readKnownHosts(knownHostsPath);
   const requiredLines = GITHUB_KNOWN_HOSTS.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
   const missing = requiredLines.filter((line) => !existingLines.has(line));
@@ -6587,23 +6663,23 @@ function seedKnownHosts(sshDir) {
     for (const line of missing) {
       existingLines.add(line);
     }
-    writeFileSync9(knownHostsPath, `${Array.from(existingLines).join(`
+    writeFileSync10(knownHostsPath, `${Array.from(existingLines).join(`
 `)}
 `, { mode: 420 });
   } catch (err) {
-    const hint = existsSync25(knownHostsPath) ? "" : " \u2014 known_hosts is missing; git SSH operations may fail";
+    const hint = existsSync26(knownHostsPath) ? "" : " \u2014 known_hosts is missing; git SSH operations may fail";
     console.warn(`[rig] Could not update ${knownHostsPath}: ${err instanceof Error ? err.message : String(err)}${hint}`);
   }
 }
 function writeClaudeProjectSettings(claudeHomeDir, workspaceDir, runtimeSettings) {
   const projectHash = hashProjectPath(workspaceDir);
-  const projectDir = resolve27(claudeHomeDir, "projects", projectHash);
-  mkdirSync11(projectDir, { recursive: true });
-  writeFileSync9(resolve27(projectDir, "settings.json"), `${JSON.stringify(runtimeSettings, null, 2)}
+  const projectDir = resolve28(claudeHomeDir, "projects", projectHash);
+  mkdirSync12(projectDir, { recursive: true });
+  writeFileSync10(resolve28(projectDir, "settings.json"), `${JSON.stringify(runtimeSettings, null, 2)}
 `, "utf-8");
 }
 async function loadRuntimeClaudeSettings(projectSettingsPath) {
-  if (!existsSync25(projectSettingsPath)) {
+  if (!existsSync26(projectSettingsPath)) {
     return {};
   }
   let parsed;
@@ -6649,7 +6725,7 @@ async function loadRuntimeClaudeSettings(projectSettingsPath) {
   return clone;
 }
 async function injectClaudeCredentials(claudeHomeDir, options = {}) {
-  const credentialsPath = resolve27(claudeHomeDir, ".credentials.json");
+  const credentialsPath = resolve28(claudeHomeDir, ".credentials.json");
   const platform = options.platform ?? process.platform;
   if (platform === "darwin") {
     const raw = options.loadKeychainCredentials ? await options.loadKeychainCredentials() : await (async () => {
@@ -6659,16 +6735,16 @@ async function injectClaudeCredentials(claudeHomeDir, options = {}) {
     if (raw) {
       try {
         JSON.parse(raw);
-        writeFileSync9(credentialsPath, raw, { mode: 384 });
+        writeFileSync10(credentialsPath, raw, { mode: 384 });
         registerCredentialCleanup(credentialsPath);
         return true;
       } catch {}
     }
   }
-  const hostClaudeHome = options.hostClaudeHome ? resolve27(options.hostClaudeHome) : process.env.CLAUDE_HOME?.trim() ? resolve27(process.env.CLAUDE_HOME) : process.env.HOME ? resolve27(process.env.HOME, ".claude") : "";
+  const hostClaudeHome = options.hostClaudeHome ? resolve28(options.hostClaudeHome) : process.env.CLAUDE_HOME?.trim() ? resolve28(process.env.CLAUDE_HOME) : process.env.HOME ? resolve28(process.env.HOME, ".claude") : "";
   if (hostClaudeHome) {
-    const realCredentials = resolve27(hostClaudeHome, ".credentials.json");
-    if (existsSync25(realCredentials)) {
+    const realCredentials = resolve28(hostClaudeHome, ".credentials.json");
+    if (existsSync26(realCredentials)) {
       cpSync2(realCredentials, credentialsPath);
       return true;
     }
@@ -6676,36 +6752,36 @@ async function injectClaudeCredentials(claudeHomeDir, options = {}) {
   return false;
 }
 async function injectCodexAuth(codexHomeDir) {
-  mkdirSync11(codexHomeDir, { recursive: true });
-  const hostCodexHome = process.env.CODEX_HOME?.trim() ? resolve27(process.env.CODEX_HOME) : process.env.HOME ? resolve27(process.env.HOME, ".codex") : "";
+  mkdirSync12(codexHomeDir, { recursive: true });
+  const hostCodexHome = process.env.CODEX_HOME?.trim() ? resolve28(process.env.CODEX_HOME) : process.env.HOME ? resolve28(process.env.HOME, ".codex") : "";
   if (!hostCodexHome) {
     return false;
   }
-  const hostAuthPath = resolve27(hostCodexHome, "auth.json");
-  if (!existsSync25(hostAuthPath)) {
+  const hostAuthPath = resolve28(hostCodexHome, "auth.json");
+  if (!existsSync26(hostAuthPath)) {
     return false;
   }
-  const runtimeAuthPath = resolve27(codexHomeDir, "auth.json");
+  const runtimeAuthPath = resolve28(codexHomeDir, "auth.json");
   copyFileSync5(hostAuthPath, runtimeAuthPath);
   chmodSync5(runtimeAuthPath, 384);
   return true;
 }
 async function injectPiAgentConfig(piAgentDir) {
-  mkdirSync11(piAgentDir, { recursive: true });
-  const hostPiAgentDir = process.env.PI_CODING_AGENT_DIR?.trim() ? resolve27(process.env.PI_CODING_AGENT_DIR) : process.env.HOME ? resolve27(process.env.HOME, ".pi", "agent") : "";
+  mkdirSync12(piAgentDir, { recursive: true });
+  const hostPiAgentDir = process.env.PI_CODING_AGENT_DIR?.trim() ? resolve28(process.env.PI_CODING_AGENT_DIR) : process.env.HOME ? resolve28(process.env.HOME, ".pi", "agent") : "";
   if (!hostPiAgentDir) {
     return false;
   }
-  const hostAuthPath = resolve27(hostPiAgentDir, "auth.json");
-  if (!existsSync25(hostAuthPath)) {
+  const hostAuthPath = resolve28(hostPiAgentDir, "auth.json");
+  if (!existsSync26(hostAuthPath)) {
     return false;
   }
-  const runtimeAuthPath = resolve27(piAgentDir, "auth.json");
+  const runtimeAuthPath = resolve28(piAgentDir, "auth.json");
   copyFileSync5(hostAuthPath, runtimeAuthPath);
   chmodSync5(runtimeAuthPath, 384);
-  const hostSettingsPath = resolve27(hostPiAgentDir, "settings.json");
-  if (existsSync25(hostSettingsPath)) {
-    const runtimeSettingsPath = resolve27(piAgentDir, "settings.json");
+  const hostSettingsPath = resolve28(hostPiAgentDir, "settings.json");
+  if (existsSync26(hostSettingsPath)) {
+    const runtimeSettingsPath = resolve28(piAgentDir, "settings.json");
     copyFileSync5(hostSettingsPath, runtimeSettingsPath);
     chmodSync5(runtimeSettingsPath, 384);
   }
@@ -6713,13 +6789,13 @@ async function injectPiAgentConfig(piAgentDir) {
 }
 
 // packages/runtime/src/control-plane/runtime/tooling/claude-router.ts
-import { existsSync as existsSync26, mkdirSync as mkdirSync12, statSync as statSync7, writeFileSync as writeFileSync10 } from "fs";
-import { resolve as resolve28 } from "path";
+import { existsSync as existsSync27, mkdirSync as mkdirSync13, statSync as statSync7, writeFileSync as writeFileSync11 } from "fs";
+import { resolve as resolve29 } from "path";
 var CLAUDE_ROUTER_SERVER_NAME = "rig_runtime_tools";
 function buildRuntimeToolRouterServerConfig(options) {
   return {
     type: "stdio",
-    command: resolve28(options.binDir, "rig-tool-router"),
+    command: resolve29(options.binDir, "rig-tool-router"),
     args: [],
     env: {
       RIG_RUNTIME_CONTEXT_FILE: options.contextFile,
@@ -6728,14 +6804,14 @@ function buildRuntimeToolRouterServerConfig(options) {
   };
 }
 function writeClaudeRuntimeToolRouterConfig(options) {
-  const configPath = resolve28(options.stateDir, "claude-runtime-tools.mcp.json");
-  mkdirSync12(options.stateDir, { recursive: true });
+  const configPath = resolve29(options.stateDir, "claude-runtime-tools.mcp.json");
+  mkdirSync13(options.stateDir, { recursive: true });
   const payload = {
     mcpServers: {
       [CLAUDE_ROUTER_SERVER_NAME]: buildRuntimeToolRouterServerConfig(options)
     }
   };
-  writeFileSync10(configPath, `${JSON.stringify(payload, null, 2)}
+  writeFileSync11(configPath, `${JSON.stringify(payload, null, 2)}
 `, "utf-8");
   return configPath;
 }
@@ -6744,8 +6820,8 @@ if (false) {}
 init_layout();
 
 // packages/runtime/src/control-plane/runtime/isolation/worktree.ts
-import { existsSync as existsSync27, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "fs";
-import { dirname as dirname12, resolve as resolve29 } from "path";
+import { existsSync as existsSync28, mkdirSync as mkdirSync14, rmSync as rmSync10 } from "fs";
+import { dirname as dirname12, resolve as resolve30 } from "path";
 async function resolveMonorepoBaseRef(monorepoRoot) {
   const explicit = process.env.RIG_RUNTIME_BASE_REF?.trim();
   if (explicit) {
@@ -6781,12 +6857,12 @@ function ensureProvisioningHostProjectRootEnv(projectRoot) {
 }
 async function provisionRuntimeWorktree(config) {
   const branch = runtimeBranchName(config.taskId, config.runtimeId);
-  let hasValidWorktree = existsSync27(resolve29(config.workspaceDir, ".git")) && (await runGitCommand(config.workspaceDir, ["rev-parse", "--show-toplevel"])).exitCode === 0;
-  if (existsSync27(config.workspaceDir) && !hasValidWorktree) {
-    rmSync9(config.workspaceDir, { recursive: true, force: true });
+  let hasValidWorktree = existsSync28(resolve30(config.workspaceDir, ".git")) && (await runGitCommand(config.workspaceDir, ["rev-parse", "--show-toplevel"])).exitCode === 0;
+  if (existsSync28(config.workspaceDir) && !hasValidWorktree) {
+    rmSync10(config.workspaceDir, { recursive: true, force: true });
   }
   if (!hasValidWorktree) {
-    mkdirSync13(dirname12(config.workspaceDir), { recursive: true });
+    mkdirSync14(dirname12(config.workspaceDir), { recursive: true });
     const branchExists = await runGitCommand(config.monorepoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`]);
     const add = branchExists.exitCode === 0 ? await runGitCommand(config.monorepoRoot, ["worktree", "add", "--force", config.workspaceDir, branch]) : await runGitCommand(config.monorepoRoot, ["worktree", "add", "--force", "-b", branch, config.workspaceDir, config.baseRef]);
     if (add.exitCode !== 0) {
@@ -6962,31 +7038,31 @@ async function preferredBaseRemotes(repoRoot) {
 
 // packages/runtime/src/control-plane/runtime/isolation/toolchain.ts
 import {
-  existsSync as existsSync29,
+  existsSync as existsSync30,
   lstatSync,
-  mkdirSync as mkdirSync15,
-  readdirSync as readdirSync5,
-  readFileSync as readFileSync14,
-  rmSync as rmSync10,
+  mkdirSync as mkdirSync16,
+  readdirSync as readdirSync6,
+  readFileSync as readFileSync15,
+  rmSync as rmSync11,
   statSync as statSync9,
   symlinkSync as symlinkSync4
 } from "fs";
 import { mkdir as mkdir3, writeFile } from "fs/promises";
-import { dirname as dirname14, resolve as resolve31 } from "path";
+import { dirname as dirname14, resolve as resolve32 } from "path";
 
 // packages/runtime/src/control-plane/runtime/tooling/claude-router-binary.ts
-import { chmodSync as chmodSync6, copyFileSync as copyFileSync6, existsSync as existsSync28, mkdirSync as mkdirSync14, statSync as statSync8 } from "fs";
+import { chmodSync as chmodSync6, copyFileSync as copyFileSync6, existsSync as existsSync29, mkdirSync as mkdirSync15, statSync as statSync8 } from "fs";
 import { tmpdir as tmpdir6 } from "os";
-import { dirname as dirname13, resolve as resolve30 } from "path";
-var sharedRouterOutputDir = resolve30(tmpdir6(), "rig-native");
-var sharedRouterOutputPath = resolve30(sharedRouterOutputDir, `rig-tool-router-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+import { dirname as dirname13, resolve as resolve31 } from "path";
+var sharedRouterOutputDir = resolve31(tmpdir6(), "rig-native");
+var sharedRouterOutputPath = resolve31(sharedRouterOutputDir, `rig-tool-router-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
 function runtimeClaudeToolRouterFileName() {
   return `rig-tool-router${process.platform === "win32" ? ".exe" : ""}`;
 }
 async function ensureClaudeToolRouterBinaryPath(projectRoot, outputPath = sharedRouterOutputPath) {
-  const sourcePath = resolve30(projectRoot, "packages/runtime/src/control-plane/runtime/tooling/claude-router.ts");
-  mkdirSync14(dirname13(outputPath), { recursive: true });
-  const needsBuild = !existsSync28(outputPath) || statSync8(sourcePath).mtimeMs > statSync8(outputPath).mtimeMs;
+  const sourcePath = resolve31(projectRoot, "packages/runtime/src/control-plane/runtime/tooling/claude-router.ts");
+  mkdirSync15(dirname13(outputPath), { recursive: true });
+  const needsBuild = !existsSync29(outputPath) || statSync8(sourcePath).mtimeMs > statSync8(outputPath).mtimeMs;
   if (!needsBuild) {
     return outputPath;
   }
@@ -7000,9 +7076,9 @@ async function ensureClaudeToolRouterBinaryPath(projectRoot, outputPath = shared
 }
 async function materializeClaudeToolRouterBinary(projectRoot, targetDir) {
   const sourcePath = await ensureClaudeToolRouterBinaryPath(projectRoot);
-  const targetPath = resolve30(targetDir, runtimeClaudeToolRouterFileName());
-  mkdirSync14(targetDir, { recursive: true });
-  const needsCopy = !existsSync28(targetPath) || statSync8(sourcePath).mtimeMs > statSync8(targetPath).mtimeMs;
+  const targetPath = resolve31(targetDir, runtimeClaudeToolRouterFileName());
+  mkdirSync15(targetDir, { recursive: true });
+  const needsCopy = !existsSync29(targetPath) || statSync8(sourcePath).mtimeMs > statSync8(targetPath).mtimeMs;
   if (needsCopy) {
     copyFileSync6(sourcePath, targetPath);
     chmodSync6(targetPath, 493);
@@ -7015,48 +7091,48 @@ var GIT_INDEX_LOCK_RETRY_DELAY_MS = 250;
 var GIT_INDEX_LOCK_STALE_AFTER_MS = 5000;
 function resolveRigSourceRoot(projectRoot) {
   const hostProjectRoot = process.env.RIG_HOST_PROJECT_ROOT?.trim();
-  if (hostProjectRoot && existsSync29(resolve31(hostProjectRoot, "packages/runtime/bin/rig-agent.ts"))) {
+  if (hostProjectRoot && existsSync30(resolve32(hostProjectRoot, "packages/runtime/bin/rig-agent.ts"))) {
     return hostProjectRoot;
   }
-  const fromModule = resolve31(import.meta.dir, "../../../../../..");
-  if (existsSync29(resolve31(fromModule, "packages/runtime/bin/rig-agent.ts"))) {
+  const fromModule = resolve32(import.meta.dir, "../../../../../..");
+  if (existsSync30(resolve32(fromModule, "packages/runtime/bin/rig-agent.ts"))) {
     return fromModule;
   }
   return projectRoot;
 }
 function prepareTrackedRuntimePaths(logsDir, stateDir, sessionDir) {
-  for (const path of [logsDir, stateDir, sessionDir, resolve31(sessionDir, "session.json")]) {
+  for (const path of [logsDir, stateDir, sessionDir, resolve32(sessionDir, "session.json")]) {
     removeSymbolicLink(path);
   }
   runtimePrepareTrackedPathsNative({
     logsDir,
     stateDir,
     sessionDir,
-    controlledBashLogFile: resolve31(logsDir, "controlled-bash.jsonl"),
-    eventsFile: resolve31(logsDir, "control-plane.events.jsonl")
+    controlledBashLogFile: resolve32(logsDir, "controlled-bash.jsonl"),
+    eventsFile: resolve32(logsDir, "control-plane.events.jsonl")
   });
 }
 async function initializeRuntimeStateFiles(stateDir, sessionDir, taskId) {
   await mkdir3(stateDir, { recursive: true });
   await mkdir3(sessionDir, { recursive: true });
-  const failedApproachesPath = resolve31(stateDir, "failed_approaches.md");
-  if (!existsSync29(failedApproachesPath)) {
+  const failedApproachesPath = resolve32(stateDir, "failed_approaches.md");
+  if (!existsSync30(failedApproachesPath)) {
     await writeFile(failedApproachesPath, `# Failed Approaches
 
 `);
   }
-  const hookTripsPath = resolve31(stateDir, "hook_trips.log");
-  if (!existsSync29(hookTripsPath)) {
+  const hookTripsPath = resolve32(stateDir, "hook_trips.log");
+  if (!existsSync30(hookTripsPath)) {
     await writeFile(hookTripsPath, "");
   }
-  const sessionFile = resolve31(sessionDir, "session.json");
+  const sessionFile = resolve32(sessionDir, "session.json");
   if (taskId) {
     await writeFile(sessionFile, JSON.stringify({ activeTaskIds: [taskId] }));
   }
 }
 async function resetEphemeralTaskArtifacts(workspaceDir, taskId) {
-  const artifactDir = resolve31(workspaceDir, "artifacts", taskId);
-  const runtimeSnapshotDir = resolve31(artifactDir, "runtime-snapshots");
+  const artifactDir = resolve32(workspaceDir, "artifacts", taskId);
+  const runtimeSnapshotDir = resolve32(artifactDir, "runtime-snapshots");
   let preservedTrackedFiles = false;
   for (const file of [
     "changed-files.txt",
@@ -7072,13 +7148,13 @@ async function resetEphemeralTaskArtifacts(workspaceDir, taskId) {
       preservedTrackedFiles = true;
       continue;
     }
-    rmSync10(resolve31(artifactDir, file), { force: true });
+    rmSync11(resolve32(artifactDir, file), { force: true });
   }
   const runtimeSnapshotRelativePath = `artifacts/${taskId}/runtime-snapshots`;
   if (await resetTrackedArtifactPath(workspaceDir, runtimeSnapshotRelativePath)) {
     preservedTrackedFiles = true;
   } else {
-    rmSync10(runtimeSnapshotDir, { recursive: true, force: true });
+    rmSync11(runtimeSnapshotDir, { recursive: true, force: true });
   }
   if (preservedTrackedFiles) {
     console.log(`[rig-agent] Preserved tracked runtime artifact files in ${taskId}; skipped ephemeral cleanup for committed paths.`);
@@ -7111,28 +7187,28 @@ async function buildRuntimeToolchain(options) {
     throw new Error("Failed to provision the native Zig runtime library.");
   }
   const rigSourceRoot = resolveRigSourceRoot(options.projectRoot);
-  await buildBinary("packages/cli/bin/rig.ts", resolve31(options.binDir, "rig"), rigSourceRoot);
-  await buildBinary("packages/runtime/bin/rig-agent.ts", resolve31(options.binDir, "rig-agent"), rigSourceRoot, {
+  await buildBinary("packages/cli/bin/rig.ts", resolve32(options.binDir, "rig"), rigSourceRoot);
+  await buildBinary("packages/runtime/bin/rig-agent.ts", resolve32(options.binDir, "rig-agent"), rigSourceRoot, {
     ...options.runtimeSecretDefines,
     AGENT_TASK_ID: options.taskId,
     AGENT_PROJECT_ROOT: options.projectRoot,
     AGENT_RUNTIME_ID: options.runtimeId,
     AGENT_SCOPE_HASH: options.bakedScopeHash,
     AGENT_MANIFEST_PATH: options.manifestPath,
-    AGENT_BINARY_PATH: resolve31(options.binDir, "rig-agent"),
+    AGENT_BINARY_PATH: resolve32(options.binDir, "rig-agent"),
     AGENT_INFO_OUTPUT: options.bakedInfoOutput,
     AGENT_DEPS_OUTPUT: options.bakedDepsOutput,
     AGENT_STATUS_OUTPUT: options.bakedStatusOutput
   });
-  await buildBinary("packages/runtime/src/control-plane/controlled-bash.ts", resolve31(options.binDir, "controlled-bash"), rigSourceRoot, {
+  await buildBinary("packages/runtime/src/control-plane/controlled-bash.ts", resolve32(options.binDir, "controlled-bash"), rigSourceRoot, {
     AGENT_PROJECT_ROOT: options.projectRoot,
     AGENT_LOGS_DIR: options.logsDir,
     AGENT_MONOREPO_ROOT: resolveMonorepoRoot3(options.projectRoot),
-    AGENT_TS_API_TESTS_DIR: resolve31(options.workspaceDir, "TSAPITests"),
-    AGENT_RIG_AGENT_BIN: resolve31(options.binDir, "rig-agent")
+    AGENT_TS_API_TESTS_DIR: resolve32(options.workspaceDir, "TSAPITests"),
+    AGENT_RIG_AGENT_BIN: resolve32(options.binDir, "rig-agent")
   });
-  await buildBinary("packages/runtime/bin/rig-browser-tool.ts", resolve31(options.binDir, runtimeBrowserToolBinaryName()), rigSourceRoot);
-  await buildBinary("packages/runtime/src/control-plane/runtime/snapshot/sidecar.ts", resolve31(options.binDir, "snapshot-sidecar"), rigSourceRoot, {
+  await buildBinary("packages/runtime/bin/rig-browser-tool.ts", resolve32(options.binDir, runtimeBrowserToolBinaryName()), rigSourceRoot);
+  await buildBinary("packages/runtime/src/control-plane/runtime/snapshot/sidecar.ts", resolve32(options.binDir, "snapshot-sidecar"), rigSourceRoot, {
     AGENT_PROJECT_ROOT: options.projectRoot,
     AGENT_BUN_PATH: resolveBunBinaryPath()
   });
@@ -7141,15 +7217,15 @@ async function buildRuntimeToolchain(options) {
     AGENT_BUN_PATH: resolveBunBinaryPath()
   };
   for (const hookName of hookNames) {
-    await buildBinary(`packages/runtime/src/control-plane/hooks/${hookName}.ts`, resolve31(runtimeBins.hooksDir, hookName), rigSourceRoot, hookDefines);
+    await buildBinary(`packages/runtime/src/control-plane/hooks/${hookName}.ts`, resolve32(runtimeBins.hooksDir, hookName), rigSourceRoot, hookDefines);
   }
-  const pluginsDir = resolve31(options.projectRoot, "rig/plugins");
-  if (existsSync29(pluginsDir)) {
-    for (const entry of readdirSync5(pluginsDir, { withFileTypes: true })) {
+  const pluginsDir = resolve32(options.projectRoot, "rig/plugins");
+  if (existsSync30(pluginsDir)) {
+    for (const entry of readdirSync6(pluginsDir, { withFileTypes: true })) {
       const match = entry.name.match(/^(.+)\.plugin\.(ts|js|mjs|cjs)$/);
       if (!match)
         continue;
-      await buildBinary(`rig/plugins/${entry.name}`, resolve31(runtimeBins.pluginsDir, match[1]), options.projectRoot);
+      await buildBinary(`rig/plugins/${entry.name}`, resolve32(runtimeBins.pluginsDir, match[1]), options.projectRoot);
     }
   }
   await materializeRigGitBinary(options.binDir);
@@ -7159,8 +7235,8 @@ async function buildRuntimeToolchain(options) {
 }
 async function writeRuntimeManifest(config) {
   const scopeHash = sha256Hex(JSON.stringify(config.scopes));
-  const binarySha256 = sha256Hex(readFileSync14(config.binaryPath));
-  const manifestPath = resolve31(config.runtimeRoot, "manifest.json");
+  const binarySha256 = sha256Hex(readFileSync15(config.binaryPath));
+  const manifestPath = resolve32(config.runtimeRoot, "manifest.json");
   const manifest = {
     runtimeId: config.runtimeId,
     taskId: config.taskId,
@@ -7194,7 +7270,7 @@ function removeSymbolicLink(path) {
   } catch {
     return;
   }
-  rmSync10(path, { force: true, recursive: true });
+  rmSync11(path, { force: true, recursive: true });
 }
 async function resetTrackedArtifactPath(workspaceDir, relativePath) {
   const tracked = await runGitLsFiles(workspaceDir, relativePath);
@@ -7220,7 +7296,7 @@ async function restoreTrackedArtifactPathWithRetry(workspaceDir, relativePath, r
   const retryDelayMs = options.retryDelayMs ?? GIT_INDEX_LOCK_RETRY_DELAY_MS;
   const now = options.now ?? Date.now;
   const statMtimeMs = options.statMtimeMs ?? readFileMtimeMs;
-  const removeFile = options.removeFile ?? ((path) => rmSync10(path, { force: true }));
+  const removeFile = options.removeFile ?? ((path) => rmSync11(path, { force: true }));
   const log = options.log ?? console.warn;
   let lastOutput = "";
   for (let attempt = 0;attempt <= maxRetries; attempt += 1) {
@@ -7280,31 +7356,31 @@ function readFileMtimeMs(path) {
 }
 function linkRuntimeDependencyLayers(monorepoRoot, workspaceDir) {
   linkGenericNodeModulesLayers(monorepoRoot, workspaceDir);
-  const sourceNodeModules = resolve31(monorepoRoot, "humoongate", "node_modules");
-  if (!existsSync29(sourceNodeModules)) {} else {
-    const runtimeHumoongate = resolve31(workspaceDir, "humoongate");
-    if (existsSync29(resolve31(runtimeHumoongate, "package.json"))) {
-      const targetNodeModules = resolve31(runtimeHumoongate, "node_modules");
+  const sourceNodeModules = resolve32(monorepoRoot, "humoongate", "node_modules");
+  if (!existsSync30(sourceNodeModules)) {} else {
+    const runtimeHumoongate = resolve32(workspaceDir, "humoongate");
+    if (existsSync30(resolve32(runtimeHumoongate, "package.json"))) {
+      const targetNodeModules = resolve32(runtimeHumoongate, "node_modules");
       runtimeLinkDependencyLayerNative(sourceNodeModules, targetNodeModules);
     }
   }
-  const runtimeHpNext = resolve31(workspaceDir, "microservices", "hp-next-frontend", "app");
-  if (!existsSync29(resolve31(runtimeHpNext, "package.json"))) {
+  const runtimeHpNext = resolve32(workspaceDir, "microservices", "hp-next-frontend", "app");
+  if (!existsSync30(resolve32(runtimeHpNext, "package.json"))) {
     return;
   }
-  const sourceHpNextNodeModules = resolve31(monorepoRoot, "microservices", "hp-next-frontend", "app", "node_modules");
-  const sourceMonorepoNodeModules = resolve31(monorepoRoot, "node_modules");
-  const targetHpNextNodeModules = resolve31(runtimeHpNext, "node_modules");
-  if (existsSync29(sourceHpNextNodeModules)) {
+  const sourceHpNextNodeModules = resolve32(monorepoRoot, "microservices", "hp-next-frontend", "app", "node_modules");
+  const sourceMonorepoNodeModules = resolve32(monorepoRoot, "node_modules");
+  const targetHpNextNodeModules = resolve32(runtimeHpNext, "node_modules");
+  if (existsSync30(sourceHpNextNodeModules)) {
     runtimeLinkDependencyLayerNative(sourceHpNextNodeModules, targetHpNextNodeModules);
     return;
   }
-  if (existsSync29(sourceMonorepoNodeModules)) {
+  if (existsSync30(sourceMonorepoNodeModules)) {
     runtimeLinkDependencyLayerNative(sourceMonorepoNodeModules, targetHpNextNodeModules);
   }
 }
 function linkGenericNodeModulesLayers(monorepoRoot, workspaceDir) {
-  linkNodeModulesLayer(resolve31(monorepoRoot, "node_modules"), resolve31(workspaceDir, "node_modules"));
+  linkNodeModulesLayer(resolve32(monorepoRoot, "node_modules"), resolve32(workspaceDir, "node_modules"));
   for (const relativePackageDir of [
     "apps/native-app/apps/marketing",
     "apps/native-app/apps/web",
@@ -7326,15 +7402,15 @@ function linkGenericNodeModulesLayers(monorepoRoot, workspaceDir) {
     "packages/standard-plugin",
     "packages/validator-kit"
   ]) {
-    const workspacePackageDir = resolve31(workspaceDir, relativePackageDir);
-    if (!existsSync29(resolve31(workspacePackageDir, "package.json"))) {
+    const workspacePackageDir = resolve32(workspaceDir, relativePackageDir);
+    if (!existsSync30(resolve32(workspacePackageDir, "package.json"))) {
       continue;
     }
-    linkNodeModulesLayer(resolve31(monorepoRoot, relativePackageDir, "node_modules"), resolve31(workspacePackageDir, "node_modules"));
+    linkNodeModulesLayer(resolve32(monorepoRoot, relativePackageDir, "node_modules"), resolve32(workspacePackageDir, "node_modules"));
   }
 }
 function linkNodeModulesLayer(sourceDir, targetDir) {
-  if (!existsSync29(sourceDir) || existsSync29(targetDir)) {
+  if (!existsSync30(sourceDir) || existsSync30(targetDir)) {
     return;
   }
   try {
@@ -7343,25 +7419,25 @@ function linkNodeModulesLayer(sourceDir, targetDir) {
   } catch (error) {
     console.warn(`[rig-agent] Native dependency-layer linking failed for ${targetDir}; using symlink fallback: ${error instanceof Error ? error.message : String(error)}`);
   }
-  mkdirSync15(dirname14(targetDir), { recursive: true });
+  mkdirSync16(dirname14(targetDir), { recursive: true });
   symlinkSync4(sourceDir, targetDir, "dir");
 }
 function ensureRuntimeBinTrees(runtimeBinDir) {
-  const hooksDir = resolve31(runtimeBinDir, "hooks");
-  const pluginsDir = resolve31(runtimeBinDir, "plugins");
-  const validatorsDir = resolve31(runtimeBinDir, "validators");
-  mkdirSync15(hooksDir, { recursive: true });
-  mkdirSync15(pluginsDir, { recursive: true });
-  mkdirSync15(validatorsDir, { recursive: true });
+  const hooksDir = resolve32(runtimeBinDir, "hooks");
+  const pluginsDir = resolve32(runtimeBinDir, "plugins");
+  const validatorsDir = resolve32(runtimeBinDir, "validators");
+  mkdirSync16(hooksDir, { recursive: true });
+  mkdirSync16(pluginsDir, { recursive: true });
+  mkdirSync16(validatorsDir, { recursive: true });
   return { hooksDir, pluginsDir, validatorsDir };
 }
 
 // packages/runtime/src/control-plane/runtime/isolation/runner.ts
-import { existsSync as existsSync31, rmSync as rmSync11, writeFileSync as writeFileSync12 } from "fs";
-import { basename as basename9, resolve as resolve34 } from "path";
+import { existsSync as existsSync32, rmSync as rmSync12, writeFileSync as writeFileSync13 } from "fs";
+import { basename as basename9, resolve as resolve35 } from "path";
 
 // packages/runtime/src/control-plane/runtime/sandbox/backend.ts
-import { existsSync as existsSync30 } from "fs";
+import { existsSync as existsSync31 } from "fs";
 init_utils();
 
 // packages/runtime/src/control-plane/runtime/sandbox/backend-none.ts
@@ -7461,13 +7537,13 @@ async function resolveBackend(projectRoot, options) {
     depRoots
   };
   const fsContext = {
-    pathExists: (p) => existsSync30(p),
+    pathExists: (p) => existsSync31(p),
     realPath: toRealPath
   };
   if (process.platform === "darwin" && (!requestedBackend || requestedBackend === "macos-seatbelt")) {
     const seatbelt = Bun.which("sandbox-exec");
     probed.push("sandbox-exec");
-    if (seatbelt && existsSync30(seatbelt)) {
+    if (seatbelt && existsSync31(seatbelt)) {
       const SeatbeltBackendClass = loadSeatbeltBackend();
       if (SeatbeltBackendClass) {
         return {
@@ -7588,10 +7664,10 @@ init_layout();
 var SNAPSHOT_SIDECAR_READY_TIMEOUT_MS = 1e4;
 async function startRuntimeSnapshotSidecar(runtime, options = {}) {
   const instanceId = sanitizeRuntimeRefSegment(options.instanceId?.trim() || runtime.id);
-  const readyFile = resolve34(runtime.stateDir, `runtime-snapshot-sidecar-${instanceId}.ready`);
-  const requestFile = resolve34(runtime.stateDir, `runtime-snapshot-sidecar-${instanceId}.request.json`);
-  rmSync11(readyFile, { force: true });
-  rmSync11(requestFile, { force: true });
+  const readyFile = resolve35(runtime.stateDir, `runtime-snapshot-sidecar-${instanceId}.ready`);
+  const requestFile = resolve35(runtime.stateDir, `runtime-snapshot-sidecar-${instanceId}.request.json`);
+  rmSync12(readyFile, { force: true });
+  rmSync12(requestFile, { force: true });
   const sidecarBinary = resolveSnapshotSidecarBinaryPath(runtime.binDir);
   const useCompiledSidecar = shouldUseCompiledSnapshotSidecar(sidecarBinary);
   const bunCli = useCompiledSidecar ? null : resolveBunCliInvocation();
@@ -7629,19 +7705,19 @@ async function startRuntimeSnapshotSidecar(runtime, options = {}) {
         proc.kill("SIGTERM");
       } catch {}
       await proc.exited;
-      rmSync11(readyFile, { force: true });
-      rmSync11(requestFile, { force: true });
+      rmSync12(readyFile, { force: true });
+      rmSync12(requestFile, { force: true });
     },
     finalize: async (commandParts, exitCode) => {
-      writeFileSync12(requestFile, `${JSON.stringify({ command: commandParts, exitCode })}
+      writeFileSync13(requestFile, `${JSON.stringify({ command: commandParts, exitCode })}
 `, "utf-8");
       const [sidecarExitCode, stdout, stderr] = await Promise.all([
         proc.exited,
         stdoutTextPromise,
         stderrTextPromise
       ]);
-      rmSync11(readyFile, { force: true });
-      rmSync11(requestFile, { force: true });
+      rmSync12(readyFile, { force: true });
+      rmSync12(requestFile, { force: true });
       if (sidecarExitCode !== 0) {
         throw new Error(`snapshot sidecar failed (${sidecarExitCode}): ${stderr || stdout}`);
       }
@@ -7697,8 +7773,8 @@ async function runInAgentRuntime(options) {
     const stdout = await new Response(proc.stdout).text();
     const stderr = await new Response(proc.stderr).text();
     try {
-      await Bun.write(resolve34(options.runtime.logsDir, "agent-stdout.log"), stdout);
-      await Bun.write(resolve34(options.runtime.logsDir, "agent-stderr.log"), stderr);
+      await Bun.write(resolve35(options.runtime.logsDir, "agent-stdout.log"), stdout);
+      await Bun.write(resolve35(options.runtime.logsDir, "agent-stderr.log"), stderr);
     } catch {}
     await snapshotSidecar.finalize(runtimeCommand, exitCode);
     return {
@@ -7730,10 +7806,10 @@ function resolveSnapshotSidecarScriptPath() {
   return resolveRuntimeSourceScriptPath("snapshot-sidecar.ts");
 }
 function resolveSnapshotSidecarBinaryPath(binDir) {
-  return resolve34(binDir, "snapshot-sidecar");
+  return resolve35(binDir, "snapshot-sidecar");
 }
 function shouldUseCompiledSnapshotSidecar(binaryPath) {
-  if (!existsSync31(binaryPath)) {
+  if (!existsSync32(binaryPath)) {
     return false;
   }
   const preference = process.env.RIG_USE_COMPILED_SNAPSHOT_SIDECAR?.trim().toLowerCase();
@@ -7748,12 +7824,12 @@ function resolveRuntimeSourceScriptPath(fileName) {
     process.env.PROJECT_RIG_ROOT?.trim()
   ].filter((value) => Boolean(value));
   for (const root of hostRoots) {
-    const candidate = resolve34(root, "packages/runtime/src/control-plane/runtime", fileName);
-    if (existsSync31(candidate)) {
+    const candidate = resolve35(root, "packages/runtime/src/control-plane/runtime", fileName);
+    if (existsSync32(candidate)) {
       return candidate;
     }
   }
-  return resolve34(import.meta.dir, "..", fileName);
+  return resolve35(import.meta.dir, "..", fileName);
 }
 function resolveBunCliInvocation() {
   if (process.env.RIG_BUN_PATH?.trim()) {
@@ -7780,7 +7856,7 @@ function resolveBunCliInvocation() {
 async function waitForSnapshotSidecarReady(readyFile, proc, stdoutTextPromise, stderrTextPromise) {
   const deadline = Date.now() + SNAPSHOT_SIDECAR_READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
-    if (existsSync31(readyFile)) {
+    if (existsSync32(readyFile)) {
       return;
     }
     const exitCode = proc.exitCode;
@@ -7798,9 +7874,9 @@ var CANONICAL_MEMORY_DB_PATH2 = "rig/memory/project-memory.db";
 async function hydrateRuntimeMemory(options) {
   const snapshot = await readCanonicalMemoryDb(options.projectRoot);
   const workspaceLayout = resolveRuntimeWorkspaceLayout(options.workspaceDir);
-  const hydratedPath = resolve35(workspaceLayout.stateDir, "memory", "project-memory.db");
+  const hydratedPath = resolve36(workspaceLayout.stateDir, "memory", "project-memory.db");
   try {
-    await mkdir4(resolve35(workspaceLayout.stateDir, "memory"), { recursive: true });
+    await mkdir4(resolve36(workspaceLayout.stateDir, "memory"), { recursive: true });
     await copyFile(snapshot.dbPath, hydratedPath);
     return {
       canonicalPath: CANONICAL_MEMORY_DB_PATH2,
@@ -7815,12 +7891,12 @@ async function hydrateRuntimeMemory(options) {
   }
 }
 async function createRuntimeTaskRecordReader(options) {
-  const legacyConfigPath = resolve35(options.projectRoot, ".rig", "task-config.json");
+  const legacyConfigPath = resolve36(options.projectRoot, ".rig", "task-config.json");
   let pluginHostContext = null;
   try {
     pluginHostContext = await buildPluginHostContext(options.projectRoot);
   } catch (error) {
-    if (!existsSync32(legacyConfigPath)) {
+    if (!existsSync33(legacyConfigPath)) {
       throw error;
     }
     const message = `Plugin task source unavailable; using source-aware .rig/task-config.json compatibility path: ${error instanceof Error ? error.message : String(error)}`;
@@ -7840,7 +7916,7 @@ async function createRuntimeTaskRecordReader(options) {
       source: "plugin"
     };
   }
-  if (existsSync32(legacyConfigPath)) {
+  if (existsSync33(legacyConfigPath)) {
     const message = "Using source-aware .rig/task-config.json task source compatibility path";
     options.diagnostics?.(message);
     console.warn(message);
@@ -7857,10 +7933,10 @@ async function createRuntimeTaskRecordReader(options) {
   };
 }
 function readConfiguredTaskSourceKindHint(projectRoot) {
-  const jsonPath = resolve35(projectRoot, "rig.config.json");
-  if (existsSync32(jsonPath)) {
+  const jsonPath = resolve36(projectRoot, "rig.config.json");
+  if (existsSync33(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync15(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync16(jsonPath, "utf8"));
       if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
         const taskSource = parsed.taskSource;
         if (taskSource && typeof taskSource === "object" && !Array.isArray(taskSource)) {
@@ -7872,12 +7948,12 @@ function readConfiguredTaskSourceKindHint(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve35(projectRoot, "rig.config.ts");
-  if (!existsSync32(tsPath)) {
+  const tsPath = resolve36(projectRoot, "rig.config.ts");
+  if (!existsSync33(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync15(tsPath, "utf8");
+    const source = readFileSync16(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     return kind ?? null;
@@ -7947,8 +8023,8 @@ async function writeRuntimeTaskConfigProjection(options) {
     ...options.taskEntry.validation && options.taskEntry.validation.length > 0 ? { validation: options.taskEntry.validation } : {},
     ...options.taskEntry.browser ? { browser: options.taskEntry.browser } : {}
   };
-  const configPath = resolve35(options.workspaceDir, ".rig", "task-config.json");
-  await mkdir4(resolve35(options.workspaceDir, ".rig"), { recursive: true });
+  const configPath = resolve36(options.workspaceDir, ".rig", "task-config.json");
+  await mkdir4(resolve36(options.workspaceDir, ".rig"), { recursive: true });
   await writeFile2(configPath, `${JSON.stringify({ [options.task.id]: entry }, null, 2)}
 `, "utf-8");
 }
@@ -8012,9 +8088,9 @@ async function ensureAgentRuntime(options) {
   }
   ensureProvisioningHostProjectRootEnv(options.projectRoot);
   const monorepoRoot = resolveMonorepoRoot3(options.projectRoot);
-  const workspaceDir = resolve35(monorepoRoot, ".worktrees", runtimeWorktreeName(options.taskId, options.id));
+  const workspaceDir = resolve36(monorepoRoot, ".worktrees", runtimeWorktreeName(options.taskId, options.id));
   const createdAt = new Date().toISOString();
-  if (!existsSync32(resolve35(monorepoRoot, ".git"))) {
+  if (!existsSync33(resolve36(monorepoRoot, ".git"))) {
     throw new Error(`Monorepo root is not a git checkout: ${monorepoRoot}`);
   }
   const taskResolution = await resolveRuntimeTaskRecord({
@@ -8049,7 +8125,7 @@ async function ensureAgentRuntime(options) {
     logsDir: overlay.logsDir,
     stateDir: overlay.stateDir,
     sessionDir: overlay.sessionDir,
-    claudeHomeDir: resolve35(workspaceLayout.homeDir, ".claude"),
+    claudeHomeDir: resolve36(workspaceLayout.homeDir, ".claude"),
     contextFile: overlay.contextPath,
     binDir: workspaceLayout.binDir,
     createdAt
@@ -8062,10 +8138,14 @@ async function ensureAgentRuntime(options) {
     projectRoot: options.projectRoot,
     workspaceDir
   });
-  mkdirSync18(runtime.binDir, { recursive: true });
-  mkdirSync18(workspaceLayout.distDir, { recursive: true });
+  mkdirSync19(runtime.binDir, { recursive: true });
+  mkdirSync19(workspaceLayout.distDir, { recursive: true });
   prepareRuntimeWorkspace(options.projectRoot, workspaceDir);
-  await resetEphemeralTaskArtifacts(workspaceDir, options.taskId);
+  if (options.preserveTaskArtifacts) {
+    console.log(`[rig-agent] Preserving runtime task artifacts for resume of ${options.taskId}.`);
+  } else {
+    await resetEphemeralTaskArtifacts(workspaceDir, options.taskId);
+  }
   const ctx = {
     runtimeId: options.id,
     taskId: options.taskId,
@@ -8078,7 +8158,7 @@ async function ensureAgentRuntime(options) {
       runtimeId: options.id
     }),
     workspaceDir,
-    artifactRoot: resolve35(workspaceDir, "artifacts", options.taskId),
+    artifactRoot: resolve36(workspaceDir, "artifacts", options.taskId),
     hostProjectRoot: options.projectRoot,
     monorepoMainRoot: monorepoRoot,
     monorepoBaseRef: baseRef,
@@ -8094,8 +8174,8 @@ async function ensureAgentRuntime(options) {
     stateDir: overlay.stateDir,
     logsDir: overlay.logsDir,
     sessionDir: overlay.sessionDir,
-    sessionFile: resolve35(overlay.sessionDir, "session.json"),
-    policyFile: resolve35(options.projectRoot, "rig/policy/policy.json"),
+    sessionFile: resolve36(overlay.sessionDir, "session.json"),
+    policyFile: resolve36(options.projectRoot, "rig/policy/policy.json"),
     binDir: runtime.binDir,
     createdAt,
     memory
@@ -8106,9 +8186,9 @@ async function ensureAgentRuntime(options) {
     task: taskResolution.task,
     taskEntry
   });
-  const manifestPath = resolve35(runtimeRoot, "manifest.json");
+  const manifestPath = resolve36(runtimeRoot, "manifest.json");
   const bakedScopeHash = sha256Hex(JSON.stringify(taskEntry.scope || []));
-  const runtimeAgentBinary = resolve35(runtime.binDir, "rig-agent");
+  const runtimeAgentBinary = resolve36(runtime.binDir, "rig-agent");
   await ensureRigGitBinaryPath();
   const bakedInfoOutput = await captureTaskInfoOutput({
     projectRoot: options.projectRoot,
@@ -8123,10 +8203,10 @@ async function ensureAgentRuntime(options) {
   const bakedStatusOutput = await captureStdout(async () => {
     taskStatus(options.projectRoot);
   });
-  rmSync12(runtime.binDir, { recursive: true, force: true });
-  rmSync12(workspaceLayout.distDir, { recursive: true, force: true });
-  mkdirSync18(runtime.binDir, { recursive: true });
-  mkdirSync18(workspaceLayout.distDir, { recursive: true });
+  rmSync13(runtime.binDir, { recursive: true, force: true });
+  rmSync13(workspaceLayout.distDir, { recursive: true, force: true });
+  mkdirSync19(runtime.binDir, { recursive: true });
+  mkdirSync19(workspaceLayout.distDir, { recursive: true });
   await buildRuntimeToolchain({
     projectRoot: options.projectRoot,
     workspaceDir,
@@ -8163,9 +8243,9 @@ async function ensureAgentRuntime(options) {
     workspaceDir,
     taskEntry
   });
-  const sandboxDir = resolve35(runtimeRoot, "sandbox");
+  const sandboxDir = resolve36(runtimeRoot, "sandbox");
   await mkdir4(sandboxDir, { recursive: true });
-  await writeFile2(resolve35(runtimeRoot, "runtime.json"), JSON.stringify({
+  await writeFile2(resolve36(runtimeRoot, "runtime.json"), JSON.stringify({
     id: options.id,
     taskId: options.taskId,
     mode: "worktree",
@@ -8221,13 +8301,6 @@ async function runPriorityQueue(context, options) {
         let result;
         if (options.action === "pipeline") {
           result = await runTaskStep(context, task.id, "validate", effectiveIsolation, workerRuntime);
-          if (!context.dryRun) {
-            const validatorResults = await context.plugins.runValidators(task.id);
-            const failedValidators = validatorResults.filter((item) => !item.passed);
-            if (failedValidators.length > 0) {
-              throw new Error(`Plugin validators failed for ${task.id}: ${failedValidators.map((item) => item.id).join(", ")}`);
-            }
-          }
           result = await runTaskStep(context, task.id, "verify", effectiveIsolation, workerRuntime);
         } else {
           result = await runTaskStep(context, task.id, options.action, effectiveIsolation, workerRuntime);
@@ -8326,12 +8399,12 @@ ${result.stderr.trim()}` : ""}`);
 }
 function resolveTaskCommand(projectRoot, action, taskId, hostProjectRoot = projectRoot) {
   try {
-    const compiledRig = resolve36(resolveRigLayout(projectRoot).binDir, "rig");
-    if (existsSync33(compiledRig)) {
+    const compiledRig = resolve37(resolveRigLayout(projectRoot).binDir, "rig");
+    if (existsSync34(compiledRig)) {
       return [compiledRig, "task", action, "--task", taskId];
     }
   } catch {}
-  return ["bun", "run", resolve36(hostProjectRoot, "packages/cli/bin/rig.ts"), "task", action, "--task", taskId];
+  return ["bun", "run", resolve37(hostProjectRoot, "packages/cli/bin/rig.ts"), "task", action, "--task", taskId];
 }
 function rankTasks(projectRoot, snapshot) {
   const readyTaskIds = listReadyTaskIdsFromTracker(snapshot);