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

package/dist/src/control-plane/runtime/isolation/index.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 existsSync19, readdirSync as readdirSync3, realpathSync } from "fs";
-import { resolve as resolve19 } from "path";
+import { existsSync as existsSync20, readdirSync as readdirSync4, realpathSync } from "fs";
+import { resolve as resolve20 } from "path";
 function toRealPath(path) {
-  if (!existsSync19(path)) {
-    return resolve19(path);
+  if (!existsSync20(path)) {
+    return resolve20(path);
   }
   try {
     return realpathSync.native(path);
   } catch {
-    return resolve19(path);
+    return resolve20(path);
   }
 }
 function resolveHostGitMetadataPaths(projectRoot, workspaceDir) {
   const candidates = new Set;
   const addPath = (candidate) => {
-    if (existsSync19(candidate)) {
+    if (existsSync20(candidate)) {
       candidates.add(toRealPath(candidate));
     }
   };
-  addPath(resolve19(projectRoot, ".git"));
-  addPath(resolve19(workspaceDir, "..", "..", ".git"));
+  addPath(resolve20(projectRoot, ".git"));
+  addPath(resolve20(workspaceDir, "..", "..", ".git"));
   for (const repoRoot of resolveHostRepoRootPaths(projectRoot)) {
-    addPath(resolve19(repoRoot, ".git"));
+    addPath(resolve20(repoRoot, ".git"));
   }
-  const workspaceGit = resolve19(workspaceDir, ".git");
-  if (existsSync19(workspaceGit)) {
+  const workspaceGit = resolve20(workspaceDir, ".git");
+  if (existsSync20(workspaceGit)) {
     addPath(workspaceGit);
   }
   return [...candidates];
@@ -182,7 +182,7 @@ function resolveHostGitMetadataPaths(projectRoot, workspaceDir) {
 function resolveHostRepoRootPaths(projectRoot) {
   const candidates = new Set;
   const addPath = (candidate) => {
-    if (existsSync19(candidate)) {
+    if (existsSync20(candidate)) {
       candidates.add(toRealPath(candidate));
     }
   };
@@ -192,11 +192,11 @@ function resolveHostRepoRootPaths(projectRoot) {
       addPath(monorepoRoot);
     }
   } catch {}
-  const reposDir = resolve19(projectRoot, "repos");
-  if (existsSync19(reposDir)) {
-    for (const entry of readdirSync3(reposDir, { withFileTypes: true })) {
+  const reposDir = resolve20(projectRoot, "repos");
+  if (existsSync20(reposDir)) {
+    for (const entry of readdirSync4(reposDir, { withFileTypes: true })) {
       if (entry.isDirectory() || entry.isSymbolicLink()) {
-        addPath(resolve19(reposDir, entry.name));
+        addPath(resolve20(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);
         }
@@ -566,9 +566,9 @@ var init_backend_bwrap = __esm(() => {
 });
 
 // packages/runtime/src/control-plane/runtime/isolation/index.ts
-import { existsSync as existsSync33, mkdirSync as mkdirSync18, readFileSync as readFileSync15, rmSync as rmSync12 } from "fs";
+import { existsSync as existsSync34, mkdirSync as mkdirSync19, readFileSync as readFileSync16, rmSync as rmSync13 } from "fs";
 import { copyFile, mkdir as mkdir3, writeFile as writeFile2 } from "fs/promises";
-import { resolve as resolve35 } from "path";
+import { resolve as resolve36 } from "path";
 
 // packages/runtime/src/control-plane/native/git-native.ts
 import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
@@ -1858,8 +1858,8 @@ function isAgentRuntimeContextPath(path) {
 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 existsSync22, mkdirSync as mkdirSync9, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "fs";
-import { resolve as resolve23 } from "path";
+import { appendFileSync, existsSync as existsSync23, mkdirSync as mkdirSync10, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "fs";
+import { resolve as resolve24 } from "path";
 
 // packages/runtime/src/build-time-config.ts
 function normalizeBuildConfig(value) {
@@ -2710,6 +2710,49 @@ function safeReadJson(path) {
   }
 }
 
+// packages/runtime/src/control-plane/skill-materializer.ts
+import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync5, readdirSync, rmSync as rmSync7, writeFileSync as writeFileSync5 } from "fs";
+import { resolve as resolve12 } 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 = resolve12(projectRoot, ".pi", "skills");
+  if (existsSync12(skillsRoot)) {
+    for (const name of readdirSync(skillsRoot)) {
+      const dir = resolve12(skillsRoot, name);
+      if (existsSync12(resolve12(dir, MARKER_FILENAME))) {
+        rmSync7(dir, { recursive: true, force: true });
+      }
+    }
+  }
+  const written = [];
+  for (const { pluginName, skill } of entries) {
+    const sourcePath = resolve12(projectRoot, skill.path);
+    if (!existsSync12(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 = readFileSync5(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 = resolve12(skillsRoot, skillDirName(skill.id));
+    mkdirSync8(dir, { recursive: true });
+    writeFileSync5(resolve12(dir, "SKILL.md"), body, "utf-8");
+    writeFileSync5(resolve12(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;
@@ -2746,6 +2789,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,
@@ -2759,12 +2813,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 existsSync13, readFileSync as readFileSync6, readdirSync, statSync as statSync3, writeFileSync as writeFileSync5 } from "fs";
-import { basename as basename4, join as join3, resolve as resolve13 } from "path";
+import { existsSync as existsSync14, readFileSync as readFileSync7, readdirSync as readdirSync2, statSync as statSync3, writeFileSync as writeFileSync6 } from "fs";
+import { basename as basename4, join as join3, resolve as resolve14 } from "path";
 
 // packages/runtime/src/control-plane/tasks/legacy-task-config-source.ts
-import { existsSync as existsSync12, readFileSync as readFileSync5 } from "fs";
-import { resolve as resolve12 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync6 } from "fs";
+import { resolve as resolve13 } from "path";
 
 // packages/runtime/src/control-plane/tasks/task-record-reader.ts
 async function findTaskById(reader, id) {
@@ -2787,7 +2841,7 @@ class LegacyTaskConfigReadError extends Error {
   }
 }
 function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve12(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve13(projectRoot, ".rig", "task-config.json");
   const reader = {
     async listTasks() {
       return readLegacyTaskRecords(projectRoot, configPath);
@@ -2798,8 +2852,8 @@ function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
   };
   return reader;
 }
-function readLegacyTaskRecords(projectRoot, configPath = resolve12(projectRoot, ".rig", "task-config.json")) {
-  if (!existsSync12(configPath)) {
+function readLegacyTaskRecords(projectRoot, configPath = resolve13(projectRoot, ".rig", "task-config.json")) {
+  if (!existsSync13(configPath)) {
     return [];
   }
   const rawConfig = readLegacyTaskConfigJson(projectRoot, configPath);
@@ -2807,7 +2861,7 @@ function readLegacyTaskRecords(projectRoot, configPath = resolve12(projectRoot,
 }
 function readLegacyTaskConfigJson(projectRoot, configPath) {
   try {
-    const parsed = JSON.parse(readFileSync5(configPath, "utf8"));
+    const parsed = JSON.parse(readFileSync6(configPath, "utf8"));
     if (isPlainRecord(parsed)) {
       return parsed;
     }
@@ -2891,7 +2945,7 @@ function isPlainRecord(candidate) {
 var STATUS_LABELS = new Set(["ready", "blocked", "in-progress", "under-review", "failed", "cancelled"]);
 var FILE_TASK_PATTERN = /\.(task\.)?json$/;
 function createSourceAwareTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve13(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve14(projectRoot, ".rig", "task-config.json");
   const legacy = createLegacyTaskConfigRecordReader(projectRoot, { configPath });
   const spawnFn = options.spawn ?? spawnSync;
   const ghBinary = options.ghBinary ?? "gh";
@@ -2974,10 +3028,10 @@ function readMaterializedTaskMetadata(entry) {
   return metadata;
 }
 function readConfiguredFilesTaskSourcePath(projectRoot) {
-  const jsonPath = resolve13(projectRoot, "rig.config.json");
-  if (existsSync13(jsonPath)) {
+  const jsonPath = resolve14(projectRoot, "rig.config.json");
+  if (existsSync14(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync6(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync7(jsonPath, "utf8"));
       if (isPlainRecord2(parsed) && isPlainRecord2(parsed.taskSource)) {
         const source = parsed.taskSource;
         return source.kind === "files" && typeof source.path === "string" ? source.path : null;
@@ -2986,12 +3040,12 @@ function readConfiguredFilesTaskSourcePath(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve13(projectRoot, "rig.config.ts");
-  if (!existsSync13(tsPath)) {
+  const tsPath = resolve14(projectRoot, "rig.config.ts");
+  if (!existsSync14(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync6(tsPath, "utf8");
+    const source = readFileSync7(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     if (kind !== "files") {
@@ -3011,10 +3065,10 @@ function readRawTaskEntry(configPath, taskId) {
   return isPlainRecord2(entry) ? entry : null;
 }
 function readRawTaskConfig(configPath) {
-  if (!existsSync13(configPath)) {
+  if (!existsSync14(configPath)) {
     return null;
   }
-  const parsed = JSON.parse(readFileSync6(configPath, "utf8"));
+  const parsed = JSON.parse(readFileSync7(configPath, "utf8"));
   return isPlainRecord2(parsed) ? parsed : null;
 }
 function stripLegacyTaskConfigMetadata2(raw) {
@@ -3022,12 +3076,12 @@ function stripLegacyTaskConfigMetadata2(raw) {
   return tasks;
 }
 function listFileBackedTasks(projectRoot, sourcePath) {
-  const directory = resolve13(projectRoot, sourcePath);
-  if (!existsSync13(directory)) {
+  const directory = resolve14(projectRoot, sourcePath);
+  if (!existsSync14(directory)) {
     return [];
   }
   const tasks = [];
-  for (const name of readdirSync(directory)) {
+  for (const name of readdirSync2(directory)) {
     if (!FILE_TASK_PATTERN.test(name))
       continue;
     const inferredId = basename4(name).replace(FILE_TASK_PATTERN, "");
@@ -3038,11 +3092,11 @@ function listFileBackedTasks(projectRoot, sourcePath) {
   return tasks;
 }
 function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
-  const file = findFileBackedTaskFile(resolve13(projectRoot, sourcePath), taskId);
+  const file = findFileBackedTaskFile(resolve14(projectRoot, sourcePath), taskId);
   if (!file) {
     return null;
   }
-  const raw = JSON.parse(readFileSync6(file, "utf8"));
+  const raw = JSON.parse(readFileSync7(file, "utf8"));
   if (!isPlainRecord2(raw)) {
     return null;
   }
@@ -3055,17 +3109,17 @@ function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
   };
 }
 function findFileBackedTaskFile(directory, taskId) {
-  if (!existsSync13(directory)) {
+  if (!existsSync14(directory)) {
     return null;
   }
-  for (const name of readdirSync(directory)) {
+  for (const name of readdirSync2(directory)) {
     if (!FILE_TASK_PATTERN.test(name))
       continue;
     const file = join3(directory, name);
     try {
       if (!statSync3(file).isFile())
         continue;
-      const raw = JSON.parse(readFileSync6(file, "utf8"));
+      const raw = JSON.parse(readFileSync7(file, "utf8"));
       const inferredId = basename4(file).replace(FILE_TASK_PATTERN, "");
       const id = isPlainRecord2(raw) && typeof raw.id === "string" ? raw.id : inferredId;
       if (id === taskId) {
@@ -3148,8 +3202,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() } };
@@ -3225,8 +3279,8 @@ async function readConfiguredTaskSourceTask(projectRoot, taskId) {
 }
 
 // packages/runtime/src/control-plane/native/task-state.ts
-import { existsSync as existsSync17, readFileSync as readFileSync8, readdirSync as readdirSync2, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
-import { basename as basename6, resolve as resolve17 } from "path";
+import { existsSync as existsSync18, readFileSync as readFileSync9, readdirSync as readdirSync3, statSync as statSync4, writeFileSync as writeFileSync7 } from "fs";
+import { basename as basename6, resolve as resolve18 } from "path";
 
 // packages/runtime/src/control-plane/state-sync/types.ts
 var SUPPORTED_TASK_STATE_SCHEMA_VERSION = 1;
@@ -3334,39 +3388,39 @@ function readTaskStateMetadataEnvelope(raw) {
   };
 }
 // packages/runtime/src/control-plane/state-sync/read.ts
-import { existsSync as existsSync16, readFileSync as readFileSync7 } from "fs";
-import { resolve as resolve16 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync8 } from "fs";
+import { resolve as resolve17 } from "path";
 
 // packages/runtime/src/control-plane/state-sync/repo.ts
-import { existsSync as existsSync15 } from "fs";
-import { resolve as resolve15 } from "path";
+import { existsSync as existsSync16 } from "fs";
+import { resolve as resolve16 } from "path";
 
 // packages/runtime/src/control-plane/repos/layout.ts
 init_layout();
-import { existsSync as existsSync14 } from "fs";
-import { basename as basename5, dirname as dirname9, join as join4, resolve as resolve14 } from "path";
+import { existsSync as existsSync15 } from "fs";
+import { basename as basename5, dirname as dirname9, join as join4, resolve as resolve15 } from "path";
 function resolveRepoStateDir(projectRoot) {
-  const normalizedProjectRoot = resolve14(projectRoot);
+  const normalizedProjectRoot = resolve15(projectRoot);
   const projectParent = dirname9(normalizedProjectRoot);
   if (basename5(projectParent) === ".worktrees") {
     const ownerRoot = dirname9(projectParent);
-    const ownerHasRepoMarkers = existsSync14(resolve14(ownerRoot, ".git")) || existsSync14(resolve14(ownerRoot, ".rig", "state"));
+    const ownerHasRepoMarkers = existsSync15(resolve15(ownerRoot, ".git")) || existsSync15(resolve15(ownerRoot, ".rig", "state"));
     if (ownerHasRepoMarkers) {
-      return resolve14(ownerRoot, ".rig", "state");
+      return resolve15(ownerRoot, ".rig", "state");
     }
   }
-  return resolve14(projectRoot, ".rig", "state");
+  return resolve15(projectRoot, ".rig", "state");
 }
 function resolveManagedRepoLayout(projectRoot, repoId) {
-  const normalizedProjectRoot = resolve14(projectRoot);
+  const normalizedProjectRoot = resolve15(projectRoot);
   const entry = getManagedRepoEntry(repoId);
   const stateDir = resolveRepoStateDir(normalizedProjectRoot);
   const metadataRelativePath = join4("repos", entry.id);
-  const metadataRoot = resolve14(stateDir, metadataRelativePath);
+  const metadataRoot = resolve15(stateDir, metadataRelativePath);
   const runtimeWorkspace = process.env.RIG_TASK_WORKSPACE?.trim();
-  const runsInsideTaskWorktree = runtimeWorkspace && resolve14(runtimeWorkspace) === normalizedProjectRoot || basename5(dirname9(normalizedProjectRoot)) === ".worktrees";
+  const runsInsideTaskWorktree = runtimeWorkspace && resolve15(runtimeWorkspace) === normalizedProjectRoot || basename5(dirname9(normalizedProjectRoot)) === ".worktrees";
   const isPrimaryManagedRepo = listManagedRepoEntries()[0]?.id === repoId;
-  const checkoutRoot = isPrimaryManagedRepo && runsInsideTaskWorktree ? resolveMonorepoRoot(normalizedProjectRoot) : entry.checkoutEnvVar && process.env[entry.checkoutEnvVar]?.trim() ? resolve14(process.env[entry.checkoutEnvVar].trim()) : resolve14(normalizedProjectRoot, entry.alias);
+  const checkoutRoot = isPrimaryManagedRepo && runsInsideTaskWorktree ? resolveMonorepoRoot(normalizedProjectRoot) : entry.checkoutEnvVar && process.env[entry.checkoutEnvVar]?.trim() ? resolve15(process.env[entry.checkoutEnvVar].trim()) : resolve15(normalizedProjectRoot, entry.alias);
   return {
     projectRoot: normalizedProjectRoot,
     repoId: entry.id,
@@ -3374,12 +3428,12 @@ function resolveManagedRepoLayout(projectRoot, repoId) {
     defaultBranch: entry.defaultBranch,
     remoteUrl: entry.remoteEnvVar && process.env[entry.remoteEnvVar]?.trim() ? process.env[entry.remoteEnvVar].trim() : entry.defaultRemoteUrl,
     checkoutRoot,
-    worktreesRoot: resolve14(checkoutRoot, ".worktrees"),
+    worktreesRoot: resolve15(checkoutRoot, ".worktrees"),
     stateDir,
     metadataRoot,
     metadataRelativePath,
-    mirrorRoot: resolve14(metadataRoot, "mirror.git"),
-    mirrorStatePath: resolve14(metadataRoot, "mirror-state.json"),
+    mirrorRoot: resolve15(metadataRoot, "mirror.git"),
+    mirrorStatePath: resolve15(metadataRoot, "mirror-state.json"),
     mirrorStateRelativePath: join4(metadataRelativePath, "mirror-state.json")
   };
 }
@@ -3397,7 +3451,7 @@ function resolveTrackerRepoPath(projectRoot) {
   const monorepoRoot = resolveMonorepoRoot2(projectRoot);
   try {
     const layout = resolveMonorepoRepoLayout(projectRoot);
-    if (existsSync15(resolve15(layout.mirrorRoot, "HEAD"))) {
+    if (existsSync16(resolve16(layout.mirrorRoot, "HEAD"))) {
       return layout.mirrorRoot;
     }
   } catch {}
@@ -3408,8 +3462,8 @@ function resolveTrackerRepoPath(projectRoot) {
 var DEFAULT_READ_DEPS2 = {
   fetchRef: nativeFetchRef,
   readBlobAtRef: nativeReadBlobAtRef,
-  exists: existsSync16,
-  readFile: (path) => readFileSync7(path, "utf8")
+  exists: existsSync17,
+  readFile: (path) => readFileSync8(path, "utf8")
 };
 function parseIssueStatus(rawStatus) {
   const normalized = normalizeTaskLifecycleStatus(rawStatus);
@@ -3490,12 +3544,12 @@ function shouldPreferLocalTrackerState(options) {
   if (runtimeContextPath) {
     return true;
   }
-  return existsSync16(resolve16(runtimeWorkspace, ".rig", "runtime-context.json"));
+  return existsSync17(resolve17(runtimeWorkspace, ".rig", "runtime-context.json"));
 }
 function readLocalTrackerState(projectRoot, deps) {
   const monorepoRoot = resolveMonorepoRoot2(projectRoot);
-  const issuesPath = resolve16(monorepoRoot, ".beads", "issues.jsonl");
-  const taskStatePath = resolve16(monorepoRoot, ".beads", "task-state.json");
+  const issuesPath = resolve17(monorepoRoot, ".beads", "issues.jsonl");
+  const taskStatePath = resolve17(monorepoRoot, ".beads", "task-state.json");
   return projectSyncedTrackerSnapshot({
     source: "local",
     issuesBaseOid: null,
@@ -3557,7 +3611,7 @@ function readValidationDescriptions(projectRoot) {
   return readValidationDescriptionMap(raw);
 }
 function readSourceValidationDescriptions(projectRoot) {
-  const rootRaw = readJsonFile(resolve17(projectRoot, "rig", "task-config.json"), {});
+  const rootRaw = readJsonFile(resolve18(projectRoot, "rig", "task-config.json"), {});
   const sourcePath = findSourceTaskConfigPath(projectRoot);
   const sourceRaw = sourcePath ? readJsonFile(sourcePath, {}) : {};
   const rootDescriptions = readValidationDescriptionMap(rootRaw);
@@ -3633,15 +3687,15 @@ function readValidationDescriptionsFromMeta(meta) {
   return meta.validation_descriptions;
 }
 function readLocalSourceTaskStateEnvelope(projectRoot) {
-  const taskStatePath = resolve17(resolveMonorepoRoot2(projectRoot), ".beads", "task-state.json");
+  const taskStatePath = resolve18(resolveMonorepoRoot2(projectRoot), ".beads", "task-state.json");
   return readTaskStateMetadataEnvelope(readJsonFile(taskStatePath, {}));
 }
 function readLocalSourceTaskLifecycleStatus(projectRoot, taskId) {
-  const issuesPath = resolve17(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
-  if (!existsSync17(issuesPath)) {
+  const issuesPath = resolve18(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
+  if (!existsSync18(issuesPath)) {
     return null;
   }
-  for (const line of readFileSync8(issuesPath, "utf8").split(/\r?\n/)) {
+  for (const line of readFileSync9(issuesPath, "utf8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -3666,25 +3720,25 @@ function inferTaskIdFromRuntimePath(path) {
 function artifactDirForId(projectRoot, id) {
   const workspaceDir = process.env.RIG_TASK_WORKSPACE?.trim();
   if (workspaceDir) {
-    const worktreeArtifacts = resolve17(workspaceDir, "artifacts", id);
-    if (existsSync17(worktreeArtifacts) || existsSync17(resolve17(workspaceDir, "artifacts"))) {
+    const worktreeArtifacts = resolve18(workspaceDir, "artifacts", id);
+    if (existsSync18(worktreeArtifacts) || existsSync18(resolve18(workspaceDir, "artifacts"))) {
       return worktreeArtifacts;
     }
   }
   try {
     const paths = resolveHarnessPaths(projectRoot);
-    return resolve17(paths.artifactsDir, id);
+    return resolve18(paths.artifactsDir, id);
   } catch {
-    return resolve17(resolveMonorepoRoot2(projectRoot), "artifacts", id);
+    return resolve18(resolveMonorepoRoot2(projectRoot), "artifacts", id);
   }
 }
 function resolveTaskConfigPath(projectRoot) {
   const paths = resolveHarnessPaths(projectRoot);
-  if (existsSync17(paths.taskConfigPath)) {
+  if (existsSync18(paths.taskConfigPath)) {
     return paths.taskConfigPath;
   }
   for (const candidate of sourceTaskConfigCandidates(projectRoot)) {
-    if (existsSync17(candidate)) {
+    if (existsSync18(candidate)) {
       return candidate;
     }
   }
@@ -3692,7 +3746,7 @@ function resolveTaskConfigPath(projectRoot) {
 }
 function findSourceTaskConfigPath(projectRoot) {
   for (const candidate of sourceTaskConfigCandidates(projectRoot)) {
-    if (existsSync17(candidate)) {
+    if (existsSync18(candidate)) {
       return candidate;
     }
   }
@@ -3705,7 +3759,7 @@ function readAndSyncSourceTaskConfig(projectRoot) {
   const synced = synchronizeTaskConfigWithTracker(projectRoot, raw);
   if (sourcePath && synced.updated) {
     try {
-      writeFileSync6(sourcePath, `${JSON.stringify(synced.config, null, 2)}
+      writeFileSync7(sourcePath, `${JSON.stringify(synced.config, null, 2)}
 `, "utf-8");
     } catch {}
   }
@@ -3757,12 +3811,12 @@ function shouldRefreshAutoSyncedTaskConfigEntry(entry) {
   return !candidate.role;
 }
 function readSourceIssueRecords(projectRoot) {
-  const issuesPath = resolve17(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
-  if (!existsSync17(issuesPath)) {
+  const issuesPath = resolve18(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
+  if (!existsSync18(issuesPath)) {
     return [];
   }
   const records = [];
-  for (const line of readFileSync8(issuesPath, "utf-8").split(/\r?\n/)) {
+  for (const line of readFileSync9(issuesPath, "utf-8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -3818,19 +3872,19 @@ function readConfiguredFileTaskConfig(projectRoot) {
   if (!sourcePath) {
     return {};
   }
-  const directory = resolve17(projectRoot, sourcePath);
-  if (!existsSync17(directory)) {
+  const directory = resolve18(projectRoot, sourcePath);
+  if (!existsSync18(directory)) {
     return {};
   }
   const config = {};
-  for (const name of readdirSync2(directory)) {
+  for (const name of readdirSync3(directory)) {
     if (!FILE_TASK_PATTERN2.test(name))
       continue;
-    const file = resolve17(directory, name);
+    const file = resolve18(directory, name);
     try {
       if (!statSync4(file).isFile())
         continue;
-      const raw = JSON.parse(readFileSync8(file, "utf8"));
+      const raw = JSON.parse(readFileSync9(file, "utf8"));
       if (!raw || typeof raw !== "object" || Array.isArray(raw))
         continue;
       const record = raw;
@@ -3872,10 +3926,10 @@ function firstStringList2(...candidates) {
   return [];
 }
 function readConfiguredFilesTaskSourcePath2(projectRoot) {
-  const jsonPath = resolve17(projectRoot, "rig.config.json");
-  if (existsSync17(jsonPath)) {
+  const jsonPath = resolve18(projectRoot, "rig.config.json");
+  if (existsSync18(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync8(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync9(jsonPath, "utf8"));
       if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
         const taskSource = parsed.taskSource;
         if (taskSource && typeof taskSource === "object" && !Array.isArray(taskSource)) {
@@ -3887,12 +3941,12 @@ function readConfiguredFilesTaskSourcePath2(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve17(projectRoot, "rig.config.ts");
-  if (!existsSync17(tsPath)) {
+  const tsPath = resolve18(projectRoot, "rig.config.ts");
+  if (!existsSync18(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync8(tsPath, "utf8");
+    const source = readFileSync9(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     if (kind !== "files") {
@@ -3906,9 +3960,9 @@ function readConfiguredFilesTaskSourcePath2(projectRoot) {
 function sourceTaskConfigCandidates(projectRoot) {
   const runtimeContext = loadRuntimeContextFromEnv();
   return [
-    runtimeContext?.monorepoMainRoot ? resolve17(runtimeContext.monorepoMainRoot, ".rig", "task-config.json") : "",
-    process.env.MONOREPO_MAIN_ROOT?.trim() ? resolve17(process.env.MONOREPO_MAIN_ROOT.trim(), ".rig", "task-config.json") : "",
-    resolve17(resolveMonorepoRoot2(projectRoot), ".rig", "task-config.json")
+    runtimeContext?.monorepoMainRoot ? resolve18(runtimeContext.monorepoMainRoot, ".rig", "task-config.json") : "",
+    process.env.MONOREPO_MAIN_ROOT?.trim() ? resolve18(process.env.MONOREPO_MAIN_ROOT.trim(), ".rig", "task-config.json") : "",
+    resolve18(resolveMonorepoRoot2(projectRoot), ".rig", "task-config.json")
   ].filter(Boolean);
 }
 
@@ -3917,8 +3971,8 @@ init_layout();
 
 // packages/runtime/src/binary-run.ts
 init_layout();
-import { chmodSync as chmodSync4, cpSync, existsSync as existsSync18, mkdirSync as mkdirSync8, renameSync as renameSync3, rmSync as rmSync7, writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename7, dirname as dirname10, resolve as resolve18 } from "path";
+import { chmodSync as chmodSync4, cpSync, existsSync as existsSync19, mkdirSync as mkdirSync9, renameSync as renameSync3, rmSync as rmSync8, writeFileSync as writeFileSync8 } from "fs";
+import { basename as basename7, dirname as dirname10, resolve as resolve19 } from "path";
 import { fileURLToPath } from "url";
 import { drainMicrotasks, gcAndSweep } from "bun:jsc";
 var runtimeBinaryBuildQueue = Promise.resolve();
@@ -3944,9 +3998,9 @@ async function buildRuntimeBinary(options) {
   });
 }
 async function buildRuntimeBinaryInProcess(options, manifest) {
-  const tempBuildDir = resolve18(dirname10(options.outputPath), `.bun-build-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`);
-  const tempOutputPath = resolve18(tempBuildDir, basename7(options.outputPath));
-  mkdirSync8(tempBuildDir, { recursive: true });
+  const tempBuildDir = resolve19(dirname10(options.outputPath), `.bun-build-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+  const tempOutputPath = resolve19(tempBuildDir, basename7(options.outputPath));
+  mkdirSync9(tempBuildDir, { recursive: true });
   await withTemporaryEnv({
     ...options.env,
     ...options.define ? { RIG_BUILD_CONFIG_JSON: JSON.stringify(options.define) } : {}
@@ -3971,7 +4025,7 @@ async function buildRuntimeBinaryInProcess(options, manifest) {
 `);
       throw new Error(`Failed to build ${options.entrypoint}: ${details || "Bun.build() returned errors"}`);
     }
-    if (!existsSync18(tempOutputPath)) {
+    if (!existsSync19(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}`);
     }
@@ -3986,7 +4040,7 @@ async function buildRuntimeBinaryInProcess(options, manifest) {
       });
     }
   })).finally(() => {
-    rmSync7(tempBuildDir, { recursive: true, force: true });
+    rmSync8(tempBuildDir, { recursive: true, force: true });
   });
 }
 function runBestEffortBuildGc() {
@@ -4003,8 +4057,8 @@ function runtimeBinaryCacheManifestPath(outputPath) {
 function resolveRuntimeBinaryBuildOptions(options) {
   return {
     ...options,
-    entrypoint: resolve18(options.cwd, options.sourcePath),
-    outputPath: resolve18(options.outputPath)
+    entrypoint: resolve19(options.cwd, options.sourcePath),
+    outputPath: resolve19(options.outputPath)
   };
 }
 function shouldUseRuntimeBinaryBuildWorker() {
@@ -4018,7 +4072,7 @@ function shouldUseRuntimeBinaryBuildWorker() {
 }
 async function buildRuntimeBinaryViaWorker(options) {
   const workerSourcePath = resolveRuntimeBinaryBuildWorkerSourcePath(options);
-  if (!workerSourcePath || !existsSync18(workerSourcePath)) {
+  if (!workerSourcePath || !existsSync19(workerSourcePath)) {
     await buildRuntimeBinaryInProcess(options, {
       manifestPath: runtimeBinaryCacheManifestPath(options.outputPath),
       buildKey: createRuntimeBinaryBuildKey({
@@ -4049,13 +4103,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 resolve18(dirname10(outputPath), `.bun-build-worker-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`);
+  return resolve19(dirname10(outputPath), `.bun-build-worker-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`);
 }
 function resolveRuntimeBinaryBuildWorkerSourcePath(options) {
   const envRoots = [
@@ -4064,13 +4118,13 @@ function resolveRuntimeBinaryBuildWorkerSourcePath(options) {
     process.env.PROJECT_RIG_ROOT?.trim()
   ].filter(Boolean);
   for (const root of envRoots) {
-    const candidate = resolve18(root, "packages/runtime/src/binary-build-worker.ts");
-    if (existsSync18(candidate)) {
+    const candidate = resolve19(root, "packages/runtime/src/binary-build-worker.ts");
+    if (existsSync19(candidate)) {
       return candidate;
     }
   }
-  const localCandidate = resolve18(import.meta.dir, "binary-build-worker.ts");
-  return existsSync18(localCandidate) ? localCandidate : null;
+  const localCandidate = resolve19(import.meta.dir, "binary-build-worker.ts");
+  return existsSync19(localCandidate) ? localCandidate : null;
 }
 function resolveRuntimeBinaryBuildWorkerInvocation() {
   const bunPath = Bun.which("bun");
@@ -4106,7 +4160,7 @@ function createRuntimeBinaryBuildKey(input) {
   });
 }
 async function isRuntimeBinaryBuildFresh(input) {
-  if (!existsSync18(input.outputPath) || !existsSync18(input.manifestPath)) {
+  if (!existsSync19(input.outputPath) || !existsSync19(input.manifestPath)) {
     return false;
   }
   let manifest = null;
@@ -4119,7 +4173,7 @@ async function isRuntimeBinaryBuildFresh(input) {
     return false;
   }
   for (const [filePath, expectedDigest] of Object.entries(manifest.inputs || {})) {
-    if (!existsSync18(filePath)) {
+    if (!existsSync19(filePath)) {
       return false;
     }
     if (await sha256File4(filePath) !== expectedDigest) {
@@ -4132,7 +4186,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 || !existsSync18(normalized)) {
+    if (!normalized || !existsSync19(normalized)) {
       continue;
     }
     inputs[normalized] = await sha256File4(normalized);
@@ -4155,7 +4209,7 @@ function normalizeBuildInputPath(cwd, inputPath) {
   if (inputPath.startsWith("<")) {
     return null;
   }
-  return resolve18(cwd, inputPath);
+  return resolve19(cwd, inputPath);
 }
 async function sha256File4(path) {
   const hasher = new Bun.CryptoHasher("sha256");
@@ -4171,8 +4225,8 @@ function sortRecord(value) {
 async function runSerializedRuntimeBinaryBuild(action) {
   const previous = runtimeBinaryBuildQueue;
   let release;
-  runtimeBinaryBuildQueue = new Promise((resolve19) => {
-    release = resolve19;
+  runtimeBinaryBuildQueue = new Promise((resolve20) => {
+    release = resolve20;
   });
   await previous;
   try {
@@ -4217,11 +4271,11 @@ async function withTemporaryCwd(cwd, action) {
 }
 
 // packages/runtime/src/control-plane/runtime/provisioning-env.ts
-import { delimiter, resolve as resolve21 } from "path";
+import { delimiter, resolve as resolve22 } from "path";
 
 // packages/runtime/src/control-plane/runtime/runtime-paths.ts
-import { existsSync as existsSync20, readdirSync as readdirSync4, realpathSync as realpathSync2 } from "fs";
-import { resolve as resolve20 } from "path";
+import { existsSync as existsSync21, readdirSync as readdirSync5, realpathSync as realpathSync2 } from "fs";
+import { resolve as resolve21 } from "path";
 
 // packages/runtime/src/control-plane/runtime/sandbox-utils.ts
 init_utils();
@@ -4238,7 +4292,7 @@ function resolveBunBinaryPath() {
   }
   const home = process.env.HOME?.trim();
   const fallbackCandidates = [
-    home ? resolve20(home, ".bun/bin/bun") : "",
+    home ? resolve21(home, ".bun/bin/bun") : "",
     "/opt/homebrew/bin/bun",
     "/usr/local/bin/bun",
     "/usr/bin/bun"
@@ -4266,8 +4320,8 @@ function resolveClaudeBinaryPath() {
   }
   const home = process.env.HOME?.trim();
   const fallbackCandidates = [
-    home ? resolve20(home, ".local/bin/claude") : "",
-    home ? resolve20(home, ".local/share/claude/local/claude") : "",
+    home ? resolve21(home, ".local/bin/claude") : "",
+    home ? resolve21(home, ".local/share/claude/local/claude") : "",
     "/opt/homebrew/bin/claude",
     "/usr/local/bin/claude",
     "/usr/bin/claude"
@@ -4281,35 +4335,35 @@ function resolveClaudeBinaryPath() {
   throw new Error("claude not found in PATH");
 }
 function resolveBunInstallDir(bunBinaryPath = resolveBunBinaryPath()) {
-  return resolve20(bunBinaryPath, "../..");
+  return resolve21(bunBinaryPath, "../..");
 }
 function resolveClaudeInstallDir() {
   const realPath = resolveClaudeBinaryPath();
-  return resolve20(realPath, "..");
+  return resolve21(realPath, "..");
 }
 function resolveNodeInstallDir() {
   const preferredNode = resolvePreferredNodeBinary();
   if (!preferredNode)
     return null;
   const explicitNode = process.env.RIG_NODE_BIN?.trim();
-  if (explicitNode && resolve20(explicitNode) === resolve20(preferredNode)) {
-    return preferredNode.endsWith("/bin/node") ? resolve20(preferredNode, "../..") : resolve20(preferredNode, "..");
+  if (explicitNode && resolve21(explicitNode) === resolve21(preferredNode)) {
+    return preferredNode.endsWith("/bin/node") ? resolve21(preferredNode, "../..") : resolve21(preferredNode, "..");
   }
   try {
     const realPath = realpathSync2(preferredNode);
     if (realPath.endsWith("/bin/node")) {
-      return resolve20(realPath, "../..");
+      return resolve21(realPath, "../..");
     }
-    return resolve20(realPath, "..");
+    return resolve21(realPath, "..");
   } catch {
-    return resolve20(preferredNode, "..");
+    return resolve21(preferredNode, "..");
   }
 }
 function resolveRuntimeDependencyRoots(runtimeDirs) {
   const roots = [];
   if (process.platform === "darwin") {
     for (const macPath of ["/opt/homebrew", "/opt/homebrew/opt"]) {
-      if (existsSync20(macPath)) {
+      if (existsSync21(macPath)) {
         roots.push(macPath);
       }
     }
@@ -4327,23 +4381,23 @@ function resolvePreferredNodeBinary() {
   const candidates = [];
   const envNode = process.env.RIG_NODE_BIN?.trim();
   if (envNode) {
-    const explicit = resolve20(envNode);
-    if (existsSync20(explicit)) {
+    const explicit = resolve21(envNode);
+    if (existsSync21(explicit)) {
       return explicit;
     }
   }
   const nvmBin = process.env.NVM_BIN?.trim();
   if (nvmBin) {
-    candidates.push(resolve20(nvmBin, "node"));
+    candidates.push(resolve21(nvmBin, "node"));
   }
   const home = process.env.HOME?.trim();
   if (home) {
-    const nvmVersionsDir = resolve20(home, ".nvm/versions/node");
-    if (existsSync20(nvmVersionsDir)) {
+    const nvmVersionsDir = resolve21(home, ".nvm/versions/node");
+    if (existsSync21(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(resolve20(nvmVersionsDir, versionDir, "bin/node"));
+          candidates.push(resolve21(nvmVersionsDir, versionDir, "bin/node"));
         }
       } catch {}
     }
@@ -4352,8 +4406,8 @@ function resolvePreferredNodeBinary() {
   if (whichNode) {
     candidates.push(whichNode);
   }
-  const deduped = uniq(candidates.map((candidate) => resolve20(candidate)));
-  const existing = deduped.filter((candidate) => existsSync20(candidate));
+  const deduped = uniq(candidates.map((candidate) => resolve21(candidate)));
+  const existing = deduped.filter((candidate) => existsSync21(candidate));
   if (existing.length === 0) {
     return null;
   }
@@ -4367,7 +4421,7 @@ function resolvePreferredNodeBinary() {
   return existing[0] ?? null;
 }
 function inferNodeMajor(nodeBinaryPath) {
-  const normalized = resolve20(nodeBinaryPath).replace(/\\/g, "/");
+  const normalized = resolve21(nodeBinaryPath).replace(/\\/g, "/");
   const match = normalized.match(/(?:^|\/)(?:node-)?v?(\d+)\.\d+\.\d+(?:\/|$)/);
   if (!match) {
     return null;
@@ -4379,8 +4433,8 @@ function normalizeExecutablePath(candidate) {
   if (!candidate) {
     return "";
   }
-  const normalized = resolve20(candidate);
-  if (!existsSync20(normalized)) {
+  const normalized = resolve21(candidate);
+  if (!existsSync21(normalized)) {
     return "";
   }
   try {
@@ -4390,7 +4444,7 @@ function normalizeExecutablePath(candidate) {
   }
 }
 function looksLikeRuntimeGateway(candidate) {
-  const normalized = resolve20(candidate).replace(/\\/g, "/");
+  const normalized = resolve21(candidate).replace(/\\/g, "/");
   return normalized.includes("/.rig/bin/") || normalized.endsWith("/rig-shell") || normalized.endsWith("/rig-agent");
 }
 
@@ -4411,7 +4465,7 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
     try {
       return resolveClaudeInstallDir();
     } catch {
-      return resolve21(claudeBinary, "..");
+      return resolve22(claudeBinary, "..");
     }
   })() : "";
   const nodeDir = resolveNodeInstallDir();
@@ -4421,8 +4475,8 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
     `${bunDir}/bin`,
     claudeDir,
     nodeDir ? `${nodeDir}/bin` : "",
-    realHome ? resolve21(realHome, ".local/bin") : "",
-    realHome ? resolve21(realHome, ".cargo/bin") : "",
+    realHome ? resolve22(realHome, ".local/bin") : "",
+    realHome ? resolve22(realHome, ".cargo/bin") : "",
     ...inheritedPath,
     "/usr/local/bin",
     "/usr/local/sbin",
@@ -4451,8 +4505,8 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
 }
 
 // packages/runtime/src/control-plane/runtime/baked-secrets.ts
-import { existsSync as existsSync21, readFileSync as readFileSync9 } from "fs";
-import { resolve as resolve22 } from "path";
+import { existsSync as existsSync22, readFileSync as readFileSync10 } from "fs";
+import { resolve as resolve23 } 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 : "",
@@ -4495,12 +4549,12 @@ function resolveRuntimeSecrets(env, baked = BAKED_RUNTIME_SECRETS) {
   return resolved;
 }
 function loadDotEnvSecrets(projectRoot, env = process.env) {
-  const dotenvPath = resolve22(projectRoot, ".env");
-  if (!existsSync21(dotenvPath)) {
+  const dotenvPath = resolve23(projectRoot, ".env");
+  if (!existsSync22(dotenvPath)) {
     return {};
   }
   const parsed = {};
-  const lines = readFileSync9(dotenvPath, "utf-8").split(/\r?\n/);
+  const lines = readFileSync10(dotenvPath, "utf-8").split(/\r?\n/);
   for (const rawLine of lines) {
     const line = rawLine.trim();
     if (!line || line.startsWith("#")) {
@@ -4857,16 +4911,16 @@ async function taskDeps(projectRoot, taskId) {
   for (const dep of deps) {
     const artifactDir = artifactDirForId(projectRoot, dep);
     console.log(`=== ${dep} ===`);
-    if (!existsSync22(artifactDir)) {
+    if (!existsSync23(artifactDir)) {
       console.log(`  (no artifacts yet)
 `);
       continue;
     }
-    printArtifactSection(resolve23(artifactDir, "decision-log.md"), "--- Decisions ---");
-    printArtifactSection(resolve23(artifactDir, "next-actions.md"), "--- Next Actions (for you) ---");
-    const changedFiles = resolve23(artifactDir, "changed-files.txt");
-    if (existsSync22(changedFiles)) {
-      const lines = readFileSync10(changedFiles, "utf-8").split(/\r?\n/).filter(Boolean);
+    printArtifactSection(resolve24(artifactDir, "decision-log.md"), "--- Decisions ---");
+    printArtifactSection(resolve24(artifactDir, "next-actions.md"), "--- Next Actions (for you) ---");
+    const changedFiles = resolve24(artifactDir, "changed-files.txt");
+    if (existsSync23(changedFiles)) {
+      const lines = readFileSync11(changedFiles, "utf-8").split(/\r?\n/).filter(Boolean);
       console.log(`--- Changed Files (${lines.length}) ---`);
       for (const line of lines) {
         console.log(line);
@@ -4990,12 +5044,12 @@ function printIndented(text) {
   }
 }
 function readLocalBeadsTasks(projectRoot) {
-  const issuesPath = resolve23(resolveMonorepoRoot2(projectRoot), ".beads/issues.jsonl");
-  if (!existsSync22(issuesPath)) {
+  const issuesPath = resolve24(resolveMonorepoRoot2(projectRoot), ".beads/issues.jsonl");
+  if (!existsSync23(issuesPath)) {
     return [];
   }
   const tasks = [];
-  for (const line of readFileSync10(issuesPath, "utf-8").split(/\r?\n/)) {
+  for (const line of readFileSync11(issuesPath, "utf-8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -5108,11 +5162,11 @@ function taskDependencies(projectRoot, taskId, tracker) {
   return [...ids].sort();
 }
 function printArtifactSection(path, header) {
-  if (!existsSync22(path)) {
+  if (!existsSync23(path)) {
     return;
   }
   console.log(header);
-  process.stdout.write(readFileSync10(path, "utf-8"));
+  process.stdout.write(readFileSync11(path, "utf-8"));
   console.log("");
 }
 
@@ -5214,7 +5268,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;
@@ -5226,14 +5280,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,
@@ -5251,17 +5305,17 @@ import {
   chmodSync as chmodSync5,
   copyFileSync as copyFileSync5,
   cpSync as cpSync2,
-  existsSync as existsSync24,
-  mkdirSync as mkdirSync11,
+  existsSync as existsSync25,
+  mkdirSync as mkdirSync12,
   statSync as statSync5,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync10
 } from "fs";
 import { mkdir } from "fs/promises";
-import { basename as basename8, delimiter as delimiter2, resolve as resolve25 } from "path";
+import { basename as basename8, delimiter as delimiter2, resolve as resolve26 } from "path";
 
 // packages/runtime/src/control-plane/runtime/isolation/shared.ts
-import { existsSync as existsSync23, readFileSync as readFileSync11, rmSync as rmSync8 } from "fs";
-import { resolve as resolve24 } from "path";
+import { existsSync as existsSync24, readFileSync as readFileSync12, rmSync as rmSync9 } from "fs";
+import { resolve as resolve25 } from "path";
 import { randomUUID } from "crypto";
 var generatedCredentialFiles = new Set;
 var credentialCleanupRegistered = false;
@@ -5286,7 +5340,7 @@ function resolveHostGitBinary() {
     if (!candidate || isRuntimeGatewayGitPath(candidate)) {
       continue;
     }
-    if (existsSync23(candidate)) {
+    if (existsSync24(candidate)) {
       return candidate;
     }
   }
@@ -5352,7 +5406,7 @@ async function refreshRemoteBranch(repoRoot, remote, branch) {
   }
 }
 async function tryReadGitHead(repoRoot) {
-  if (!existsSync23(resolve24(repoRoot, ".git"))) {
+  if (!existsSync24(resolve25(repoRoot, ".git"))) {
     return;
   }
   const result = await runGitCommand(repoRoot, ["rev-parse", "HEAD"]);
@@ -5363,7 +5417,7 @@ async function tryReadGitHead(repoRoot) {
   return value || undefined;
 }
 async function captureRepoDirtyFiles(repoRoot) {
-  if (!existsSync23(resolve24(repoRoot, ".git"))) {
+  if (!existsSync24(resolve25(repoRoot, ".git"))) {
     return [];
   }
   const files = new Set;
@@ -5399,7 +5453,7 @@ function registerCredentialCleanup(path) {
   const cleanup = () => {
     for (const filePath of generatedCredentialFiles) {
       try {
-        rmSync8(filePath, { force: true });
+        rmSync9(filePath, { force: true });
       } catch {}
     }
     generatedCredentialFiles.clear();
@@ -5454,20 +5508,23 @@ function hashProjectPath(workspaceDir) {
 }
 function resolveGithubCliBinaryPath() {
   const explicit = process.env.RIG_GH_BIN?.trim();
-  if (explicit && existsSync23(explicit)) {
+  if (explicit && existsSync24(explicit) && !isRuntimeGatewayGhPath(explicit)) {
     return explicit;
   }
-  const bunResolved = Bun.which("gh");
-  if (bunResolved && existsSync23(bunResolved)) {
-    return bunResolved;
-  }
-  for (const candidate of ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"]) {
-    if (existsSync23(candidate)) {
+  for (const candidate of ["/usr/bin/gh", "/opt/homebrew/bin/gh", "/usr/local/bin/gh"]) {
+    if (existsSync24(candidate)) {
       return candidate;
     }
   }
+  const bunResolved = Bun.which("gh");
+  if (bunResolved && existsSync24(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) {
@@ -5494,17 +5551,17 @@ function resolveSystemCertBundlePath() {
     "/opt/homebrew/etc/openssl@3/cert.pem"
   ];
   for (const candidate of candidates) {
-    if (candidate && existsSync23(candidate)) {
-      return resolve24(candidate);
+    if (candidate && existsSync24(candidate)) {
+      return resolve25(candidate);
     }
   }
   return "";
 }
 function readKnownHosts(path) {
-  if (!existsSync23(path)) {
+  if (!existsSync24(path)) {
     return new Set;
   }
-  return new Set(readFileSync11(path, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
+  return new Set(readFileSync12(path, "utf-8").split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
 }
 
 // packages/runtime/src/control-plane/runtime/isolation/home.ts
@@ -5515,6 +5572,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(),
+    resolve26(import.meta.dir, "../../../../.."),
+    projectRoot
+  ].filter((value) => Boolean(value));
+  for (const candidate of candidates) {
+    const root = resolve26(candidate);
+    if (existsSync25(resolve26(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);
@@ -5529,7 +5601,7 @@ async function runtimeEnv(projectRoot, runtime) {
     try {
       return resolveClaudeInstallDir();
     } catch {
-      return resolve25(claudeBinaryPath, "..");
+      return resolve26(claudeBinaryPath, "..");
     }
   })() : "";
   const nodeDir = resolveNodeInstallDir();
@@ -5544,8 +5616,8 @@ async function runtimeEnv(projectRoot, runtime) {
     `${bunDir}/bin`,
     claudeDir,
     nodeDir ? `${nodeDir}/bin` : "",
-    realHome ? resolve25(realHome, ".local/bin") : "",
-    realHome ? resolve25(realHome, ".cargo/bin") : "",
+    realHome ? resolve26(realHome, ".local/bin") : "",
+    realHome ? resolve26(realHome, ".cargo/bin") : "",
     ...inheritedPath,
     "/usr/local/bin",
     "/usr/local/sbin",
@@ -5556,18 +5628,22 @@ async function runtimeEnv(projectRoot, runtime) {
     "/usr/sbin",
     "/sbin"
   ].filter(Boolean);
-  const runtimeBash = resolve25(runtime.binDir, "bash");
-  const runtimeRigGit = resolve25(runtime.binDir, runtimeRigGitFileName());
-  const preferredShell = existsSync24(runtimeBash) ? runtimeBash : "/bin/bash";
+  const runtimeBash = resolve26(runtime.binDir, "bash");
+  const runtimeRigGit = resolve26(runtime.binDir, runtimeRigGitFileName());
+  const preferredShell = existsSync25(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,
@@ -5575,30 +5651,30 @@ async function runtimeEnv(projectRoot, runtime) {
     RIG_RUNTIME_MODE: runtime.mode,
     RIG_RUNTIME_HOME: runtime.rootDir,
     RIG_RUNTIME_BIN_DIR: runtime.binDir,
-    ...existsSync24(runtimeRigGit) ? { RIG_NATIVE_GIT_BIN: runtimeRigGit } : {},
+    ...existsSync25(runtimeRigGit) ? { RIG_NATIVE_GIT_BIN: runtimeRigGit } : {},
     RIG_BUN_PATH: bunBinaryPath,
     ...claudeBinaryPath ? { RIG_CLAUDE_PATH: claudeBinaryPath } : {},
-    RIG_AGENT_BIN: resolve25(runtime.binDir, "rig-agent"),
+    RIG_AGENT_BIN: resolve26(runtime.binDir, "rig-agent"),
     RIG_HOOKS_ACTIVE: "1",
     RIG_AUTO_PR_ON_COMPLETE: "1",
-    RIG_POLICY_FILE: resolve25(projectRoot, "rig/policy/policy.json"),
+    RIG_POLICY_FILE: resolve26(projectRoot, "rig/policy/policy.json"),
     RIG_STATE_DIR: runtime.stateDir,
     RIG_LOGS_DIR: runtime.logsDir,
-    RIG_SESSION_FILE: resolve25(runtime.sessionDir, "session.json"),
+    RIG_SESSION_FILE: resolve26(runtime.sessionDir, "session.json"),
     MONOREPO_ROOT: runtime.workspaceDir,
     MONOREPO_MAIN_ROOT: monorepoMainRoot,
-    TS_API_TESTS_DIR: resolve25(runtime.workspaceDir, "TSAPITests"),
+    TS_API_TESTS_DIR: resolve26(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: resolve25(runtime.cacheDir, "python"),
+    PYTHONPYCACHEPREFIX: resolve26(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: resolve25(runtime.homeDir, ".pi", "agent"),
+    PI_CODING_AGENT_DIR: resolve26(runtime.homeDir, ".pi", "agent"),
     [RUNTIME_CONTEXT_ENV]: runtime.contextFile,
     ...nativeRuntimeLibraryPath ? { RIG_NATIVE_RUNTIME_LIB: nativeRuntimeLibraryPath } : {},
     ...hostGhBinary ? { RIG_GH_BIN: hostGhBinary } : {},
@@ -5609,16 +5685,16 @@ async function runtimeEnv(projectRoot, runtime) {
       NODE_EXTRA_CA_CERTS: runtimeCertBundlePath
     } : {}
   };
-  const knownHostsPath = resolve25(runtime.homeDir, ".ssh", "known_hosts");
-  if (existsSync24(knownHostsPath)) {
-    const agentSshKey = resolve25(runtime.homeDir, ".ssh", "rig-agent-key");
+  const knownHostsPath = resolve26(runtime.homeDir, ".ssh", "known_hosts");
+  if (existsSync25(knownHostsPath)) {
+    const agentSshKey = resolve26(runtime.homeDir, ".ssh", "rig-agent-key");
     const sshParts = [
       "ssh",
       `-o UserKnownHostsFile="${knownHostsPath}"`,
       "-o StrictHostKeyChecking=yes",
       "-F /dev/null"
     ];
-    if (existsSync24(agentSshKey)) {
+    if (existsSync25(agentSshKey)) {
       sshParts.splice(1, 0, `-i "${agentSshKey}"`, "-o IdentitiesOnly=yes");
     }
     env.GIT_SSH_COMMAND = sshParts.join(" ");
@@ -5655,7 +5731,7 @@ async function runtimeEnv(projectRoot, runtime) {
   if (!env.GREPTILE_GITHUB_TOKEN && env.GITHUB_TOKEN) {
     env.GREPTILE_GITHUB_TOKEN = env.GITHUB_TOKEN;
   }
-  if (existsSync24(runtime.contextFile)) {
+  if (existsSync25(runtime.contextFile)) {
     const runtimeContext = loadRuntimeContext(runtime.contextFile);
     Object.assign(env, runtimeMemoryEnvFromContext(runtimeContext));
     Object.assign(env, browserEnvFromContext(runtimeContext.browser));
@@ -5684,30 +5760,30 @@ async function provisionRuntimeHome(runtime, options = {}) {
   await mkdir(runtime.cacheDir, { recursive: true });
   await provisionAgentSshKey(runtime.homeDir);
   if (options.provider === "codex") {
-    const hasCodexAuth = await injectCodexAuth(resolve25(runtime.homeDir, ".codex"));
+    const hasCodexAuth = await injectCodexAuth(resolve26(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(resolve25(runtime.homeDir, ".pi", "agent"));
+    const hasPiAuth = await injectPiAgentConfig(resolve26(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 = resolve25(config.workspaceDir, ".claude/settings.json");
-  const hostSettings = resolve25(config.hostProjectRoot, ".claude/settings.json");
-  const projectSettings = existsSync24(workspaceSettings) ? workspaceSettings : hostSettings;
+  mkdirSync12(config.claudeHomeDir, { recursive: true });
+  const workspaceSettings = resolve26(config.workspaceDir, ".claude/settings.json");
+  const hostSettings = resolve26(config.hostProjectRoot, ".claude/settings.json");
+  const projectSettings = existsSync25(workspaceSettings) ? workspaceSettings : hostSettings;
   const runtimeSettings = await loadRuntimeClaudeSettings(projectSettings);
-  if (existsSync24(projectSettings)) {
-    writeFileSync9(resolve25(config.claudeHomeDir, "settings.local.json"), `${JSON.stringify(runtimeSettings, null, 2)}
+  if (existsSync25(projectSettings)) {
+    writeFileSync10(resolve26(config.claudeHomeDir, "settings.local.json"), `${JSON.stringify(runtimeSettings, null, 2)}
 `, "utf-8");
   }
   writeClaudeProjectSettings(config.claudeHomeDir, config.workspaceDir, runtimeSettings);
-  writeFileSync9(resolve25(config.claudeHomeDir, "settings.json"), JSON.stringify({
+  writeFileSync10(resolve26(config.claudeHomeDir, "settings.json"), JSON.stringify({
     permissions: { defaultMode: "bypassPermissions" },
     autoMemoryEnabled: false
   }, null, 2));
@@ -5715,12 +5791,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 = resolve25(process.env.HOME ?? "", ".claude");
-  if (process.env.HOME && existsSync24(resolve25(realClaudeHome, "CLAUDE.md"))) {
-    cpSync2(resolve25(realClaudeHome, "CLAUDE.md"), resolve25(config.claudeHomeDir, "CLAUDE.md"));
+  const realClaudeHome = resolve26(process.env.HOME ?? "", ".claude");
+  if (process.env.HOME && existsSync25(resolve26(realClaudeHome, "CLAUDE.md"))) {
+    cpSync2(resolve26(realClaudeHome, "CLAUDE.md"), resolve26(config.claudeHomeDir, "CLAUDE.md"));
   }
-  if (process.env.HOME && existsSync24(resolve25(realClaudeHome, "agents"))) {
-    cpSync2(resolve25(realClaudeHome, "agents"), resolve25(config.claudeHomeDir, "agents"), { recursive: true });
+  if (process.env.HOME && existsSync25(resolve26(realClaudeHome, "agents"))) {
+    cpSync2(resolve26(realClaudeHome, "agents"), resolve26(config.claudeHomeDir, "agents"), { recursive: true });
   }
   if (process.platform === "darwin" && process.env.HOME) {
     writeClaudeProjectSettings(realClaudeHome, config.workspaceDir, runtimeSettings);
@@ -5731,10 +5807,10 @@ async function materializeRuntimeCertBundle(runtime) {
   if (!sourcePath) {
     return "";
   }
-  const certsDir = resolve25(runtime.rootDir, "certs");
-  const targetPath = resolve25(certsDir, "ca-certificates.pem");
+  const certsDir = resolve26(runtime.rootDir, "certs");
+  const targetPath = resolve26(certsDir, "ca-certificates.pem");
   await mkdir(certsDir, { recursive: true });
-  let shouldCopy = !existsSync24(targetPath);
+  let shouldCopy = !existsSync25(targetPath);
   if (!shouldCopy) {
     try {
       shouldCopy = statSync5(sourcePath).mtimeMs > statSync5(targetPath).mtimeMs;
@@ -5756,7 +5832,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 = resolve25(runtimeRoot, "runtime-secrets.json");
+  const secretsPath = resolve26(runtimeRoot, "runtime-secrets.json");
   const persisted = {};
   for (const key of [
     "GITHUB_TOKEN",
@@ -5775,12 +5851,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 = resolve25(homeDir, ".ssh");
-  if (!existsSync24(sshDir)) {
+  const sshDir = resolve26(homeDir, ".ssh");
+  if (!existsSync25(sshDir)) {
     await mkdir(sshDir, { recursive: true });
   }
   seedKnownHosts(sshDir);
@@ -5788,27 +5864,27 @@ async function provisionAgentSshKey(homeDir) {
   const privateKey = decodeProvisionedSshKey(secrets.GITHUB_SSH_KEY);
   if (!privateKey) {
     const hostKeyPath = resolveHostSshKeyPath(process.env.HOME ?? "");
-    if (!process.env.HOME || !existsSync24(hostKeyPath)) {
+    if (!process.env.HOME || !existsSync25(hostKeyPath)) {
       return;
     }
-    const agentKeyPath2 = resolve25(sshDir, "rig-agent-key");
-    if (!existsSync24(agentKeyPath2)) {
+    const agentKeyPath2 = resolve26(sshDir, "rig-agent-key");
+    if (!existsSync25(agentKeyPath2)) {
       copyFileSync5(hostKeyPath, agentKeyPath2);
       chmodSync5(agentKeyPath2, 384);
     }
     const hostPubPath = `${hostKeyPath}.pub`;
-    if (existsSync24(hostPubPath)) {
+    if (existsSync25(hostPubPath)) {
       const agentPubPath = `${agentKeyPath2}.pub`;
-      if (!existsSync24(agentPubPath)) {
+      if (!existsSync25(agentPubPath)) {
         copyFileSync5(hostPubPath, agentPubPath);
       }
     }
     writeSshConfig(sshDir, agentKeyPath2);
     return;
   }
-  const agentKeyPath = resolve25(sshDir, "rig-agent-key");
-  if (!existsSync24(agentKeyPath)) {
-    writeFileSync9(agentKeyPath, privateKey, { mode: 384 });
+  const agentKeyPath = resolve26(sshDir, "rig-agent-key");
+  if (!existsSync25(agentKeyPath)) {
+    writeFileSync10(agentKeyPath, privateKey, { mode: 384 });
   }
   writeSshConfig(sshDir, agentKeyPath);
 }
@@ -5825,21 +5901,21 @@ function decodeProvisionedSshKey(encodedKey) {
 `;
 }
 function resolveHostSshKeyPath(homeDir) {
-  const sshDir = resolve25(homeDir, ".ssh");
+  const sshDir = resolve26(homeDir, ".ssh");
   const candidates = [
     "rig-agent-key",
     "id_ed25519",
     "id_ecdsa",
     "id_rsa"
-  ].map((name) => resolve25(sshDir, name));
-  return candidates.find((candidate) => existsSync24(candidate)) ?? resolve25(sshDir, "rig-agent-key");
+  ].map((name) => resolve26(sshDir, name));
+  return candidates.find((candidate) => existsSync25(candidate)) ?? resolve26(sshDir, "rig-agent-key");
 }
 function writeSshConfig(sshDir, keyPath) {
-  const configPath = resolve25(sshDir, "config");
-  if (existsSync24(configPath)) {
+  const configPath = resolve26(sshDir, "config");
+  if (existsSync25(configPath)) {
     return;
   }
-  const knownHostsPath = resolve25(sshDir, "known_hosts");
+  const knownHostsPath = resolve26(sshDir, "known_hosts");
   const config = [
     "Host github.com",
     `  IdentityFile ${keyPath}`,
@@ -5849,10 +5925,10 @@ function writeSshConfig(sshDir, keyPath) {
     ""
   ].join(`
 `);
-  writeFileSync9(configPath, config, { mode: 420 });
+  writeFileSync10(configPath, config, { mode: 420 });
 }
 function seedKnownHosts(sshDir) {
-  const knownHostsPath = resolve25(sshDir, "known_hosts");
+  const knownHostsPath = resolve26(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));
@@ -5863,23 +5939,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 = existsSync24(knownHostsPath) ? "" : " \u2014 known_hosts is missing; git SSH operations may fail";
+    const hint = existsSync25(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 = resolve25(claudeHomeDir, "projects", projectHash);
-  mkdirSync11(projectDir, { recursive: true });
-  writeFileSync9(resolve25(projectDir, "settings.json"), `${JSON.stringify(runtimeSettings, null, 2)}
+  const projectDir = resolve26(claudeHomeDir, "projects", projectHash);
+  mkdirSync12(projectDir, { recursive: true });
+  writeFileSync10(resolve26(projectDir, "settings.json"), `${JSON.stringify(runtimeSettings, null, 2)}
 `, "utf-8");
 }
 async function loadRuntimeClaudeSettings(projectSettingsPath) {
-  if (!existsSync24(projectSettingsPath)) {
+  if (!existsSync25(projectSettingsPath)) {
     return {};
   }
   let parsed;
@@ -5925,7 +6001,7 @@ async function loadRuntimeClaudeSettings(projectSettingsPath) {
   return clone;
 }
 async function injectClaudeCredentials(claudeHomeDir, options = {}) {
-  const credentialsPath = resolve25(claudeHomeDir, ".credentials.json");
+  const credentialsPath = resolve26(claudeHomeDir, ".credentials.json");
   const platform = options.platform ?? process.platform;
   if (platform === "darwin") {
     const raw = options.loadKeychainCredentials ? await options.loadKeychainCredentials() : await (async () => {
@@ -5935,16 +6011,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 ? resolve25(options.hostClaudeHome) : process.env.CLAUDE_HOME?.trim() ? resolve25(process.env.CLAUDE_HOME) : process.env.HOME ? resolve25(process.env.HOME, ".claude") : "";
+  const hostClaudeHome = options.hostClaudeHome ? resolve26(options.hostClaudeHome) : process.env.CLAUDE_HOME?.trim() ? resolve26(process.env.CLAUDE_HOME) : process.env.HOME ? resolve26(process.env.HOME, ".claude") : "";
   if (hostClaudeHome) {
-    const realCredentials = resolve25(hostClaudeHome, ".credentials.json");
-    if (existsSync24(realCredentials)) {
+    const realCredentials = resolve26(hostClaudeHome, ".credentials.json");
+    if (existsSync25(realCredentials)) {
       cpSync2(realCredentials, credentialsPath);
       return true;
     }
@@ -5952,36 +6028,36 @@ async function injectClaudeCredentials(claudeHomeDir, options = {}) {
   return false;
 }
 async function injectCodexAuth(codexHomeDir) {
-  mkdirSync11(codexHomeDir, { recursive: true });
-  const hostCodexHome = process.env.CODEX_HOME?.trim() ? resolve25(process.env.CODEX_HOME) : process.env.HOME ? resolve25(process.env.HOME, ".codex") : "";
+  mkdirSync12(codexHomeDir, { recursive: true });
+  const hostCodexHome = process.env.CODEX_HOME?.trim() ? resolve26(process.env.CODEX_HOME) : process.env.HOME ? resolve26(process.env.HOME, ".codex") : "";
   if (!hostCodexHome) {
     return false;
   }
-  const hostAuthPath = resolve25(hostCodexHome, "auth.json");
-  if (!existsSync24(hostAuthPath)) {
+  const hostAuthPath = resolve26(hostCodexHome, "auth.json");
+  if (!existsSync25(hostAuthPath)) {
     return false;
   }
-  const runtimeAuthPath = resolve25(codexHomeDir, "auth.json");
+  const runtimeAuthPath = resolve26(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() ? resolve25(process.env.PI_CODING_AGENT_DIR) : process.env.HOME ? resolve25(process.env.HOME, ".pi", "agent") : "";
+  mkdirSync12(piAgentDir, { recursive: true });
+  const hostPiAgentDir = process.env.PI_CODING_AGENT_DIR?.trim() ? resolve26(process.env.PI_CODING_AGENT_DIR) : process.env.HOME ? resolve26(process.env.HOME, ".pi", "agent") : "";
   if (!hostPiAgentDir) {
     return false;
   }
-  const hostAuthPath = resolve25(hostPiAgentDir, "auth.json");
-  if (!existsSync24(hostAuthPath)) {
+  const hostAuthPath = resolve26(hostPiAgentDir, "auth.json");
+  if (!existsSync25(hostAuthPath)) {
     return false;
   }
-  const runtimeAuthPath = resolve25(piAgentDir, "auth.json");
+  const runtimeAuthPath = resolve26(piAgentDir, "auth.json");
   copyFileSync5(hostAuthPath, runtimeAuthPath);
   chmodSync5(runtimeAuthPath, 384);
-  const hostSettingsPath = resolve25(hostPiAgentDir, "settings.json");
-  if (existsSync24(hostSettingsPath)) {
-    const runtimeSettingsPath = resolve25(piAgentDir, "settings.json");
+  const hostSettingsPath = resolve26(hostPiAgentDir, "settings.json");
+  if (existsSync25(hostSettingsPath)) {
+    const runtimeSettingsPath = resolve26(piAgentDir, "settings.json");
     copyFileSync5(hostSettingsPath, runtimeSettingsPath);
     chmodSync5(runtimeSettingsPath, 384);
   }
@@ -5989,13 +6065,13 @@ async function injectPiAgentConfig(piAgentDir) {
 }
 
 // packages/runtime/src/control-plane/runtime/tooling/claude-router.ts
-import { existsSync as existsSync25, mkdirSync as mkdirSync12, statSync as statSync6, writeFileSync as writeFileSync10 } from "fs";
-import { resolve as resolve26 } from "path";
+import { existsSync as existsSync26, mkdirSync as mkdirSync13, statSync as statSync6, writeFileSync as writeFileSync11 } from "fs";
+import { resolve as resolve27 } from "path";
 var CLAUDE_ROUTER_SERVER_NAME = "rig_runtime_tools";
 function buildRuntimeToolRouterServerConfig(options) {
   return {
     type: "stdio",
-    command: resolve26(options.binDir, "rig-tool-router"),
+    command: resolve27(options.binDir, "rig-tool-router"),
     args: [],
     env: {
       RIG_RUNTIME_CONTEXT_FILE: options.contextFile,
@@ -6004,26 +6080,26 @@ function buildRuntimeToolRouterServerConfig(options) {
   };
 }
 function writeClaudeRuntimeToolRouterConfig(options) {
-  const configPath = resolve26(options.stateDir, "claude-runtime-tools.mcp.json");
-  mkdirSync12(options.stateDir, { recursive: true });
+  const configPath = resolve27(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;
 }
 if (false) {}
 // packages/runtime/src/control-plane/runtime/isolation/discovery.ts
 init_layout();
-import { existsSync as existsSync29 } from "fs";
-import { resolve as resolve30 } from "path";
+import { existsSync as existsSync30 } from "fs";
+import { resolve as resolve31 } from "path";
 
 // packages/runtime/src/control-plane/runtime/isolation/worktree.ts
-import { existsSync as existsSync26, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "fs";
-import { dirname as dirname11, resolve as resolve27 } from "path";
+import { existsSync as existsSync27, mkdirSync as mkdirSync14, rmSync as rmSync10 } from "fs";
+import { dirname as dirname11, resolve as resolve28 } from "path";
 async function resolveMonorepoBaseRef(monorepoRoot) {
   const explicit = process.env.RIG_RUNTIME_BASE_REF?.trim();
   if (explicit) {
@@ -6059,12 +6135,12 @@ function ensureProvisioningHostProjectRootEnv(projectRoot) {
 }
 async function provisionRuntimeWorktree(config) {
   const branch = runtimeBranchName(config.taskId, config.runtimeId);
-  let hasValidWorktree = existsSync26(resolve27(config.workspaceDir, ".git")) && (await runGitCommand(config.workspaceDir, ["rev-parse", "--show-toplevel"])).exitCode === 0;
-  if (existsSync26(config.workspaceDir) && !hasValidWorktree) {
-    rmSync9(config.workspaceDir, { recursive: true, force: true });
+  let hasValidWorktree = existsSync27(resolve28(config.workspaceDir, ".git")) && (await runGitCommand(config.workspaceDir, ["rev-parse", "--show-toplevel"])).exitCode === 0;
+  if (existsSync27(config.workspaceDir) && !hasValidWorktree) {
+    rmSync10(config.workspaceDir, { recursive: true, force: true });
   }
   if (!hasValidWorktree) {
-    mkdirSync13(dirname11(config.workspaceDir), { recursive: true });
+    mkdirSync14(dirname11(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) {
@@ -6246,31 +6322,31 @@ async function preferredBaseRemotes(repoRoot) {
 
 // packages/runtime/src/control-plane/runtime/isolation/toolchain.ts
 import {
-  existsSync as existsSync28,
+  existsSync as existsSync29,
   lstatSync,
-  mkdirSync as mkdirSync15,
-  readdirSync as readdirSync5,
-  readFileSync as readFileSync13,
-  rmSync as rmSync10,
+  mkdirSync as mkdirSync16,
+  readdirSync as readdirSync6,
+  readFileSync as readFileSync14,
+  rmSync as rmSync11,
   statSync as statSync8,
   symlinkSync as symlinkSync4
 } from "fs";
 import { mkdir as mkdir2, writeFile } from "fs/promises";
-import { dirname as dirname13, resolve as resolve29 } from "path";
+import { dirname as dirname13, resolve as resolve30 } from "path";
 
 // packages/runtime/src/control-plane/runtime/tooling/claude-router-binary.ts
-import { chmodSync as chmodSync6, copyFileSync as copyFileSync6, existsSync as existsSync27, mkdirSync as mkdirSync14, statSync as statSync7 } from "fs";
+import { chmodSync as chmodSync6, copyFileSync as copyFileSync6, existsSync as existsSync28, mkdirSync as mkdirSync15, statSync as statSync7 } from "fs";
 import { tmpdir as tmpdir6 } from "os";
-import { dirname as dirname12, resolve as resolve28 } from "path";
-var sharedRouterOutputDir = resolve28(tmpdir6(), "rig-native");
-var sharedRouterOutputPath = resolve28(sharedRouterOutputDir, `rig-tool-router-${process.platform}-${process.arch}${process.platform === "win32" ? ".exe" : ""}`);
+import { dirname as dirname12, resolve as resolve29 } from "path";
+var sharedRouterOutputDir = resolve29(tmpdir6(), "rig-native");
+var sharedRouterOutputPath = resolve29(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 = resolve28(projectRoot, "packages/runtime/src/control-plane/runtime/tooling/claude-router.ts");
-  mkdirSync14(dirname12(outputPath), { recursive: true });
-  const needsBuild = !existsSync27(outputPath) || statSync7(sourcePath).mtimeMs > statSync7(outputPath).mtimeMs;
+  const sourcePath = resolve29(projectRoot, "packages/runtime/src/control-plane/runtime/tooling/claude-router.ts");
+  mkdirSync15(dirname12(outputPath), { recursive: true });
+  const needsBuild = !existsSync28(outputPath) || statSync7(sourcePath).mtimeMs > statSync7(outputPath).mtimeMs;
   if (!needsBuild) {
     return outputPath;
   }
@@ -6284,9 +6360,9 @@ async function ensureClaudeToolRouterBinaryPath(projectRoot, outputPath = shared
 }
 async function materializeClaudeToolRouterBinary(projectRoot, targetDir) {
   const sourcePath = await ensureClaudeToolRouterBinaryPath(projectRoot);
-  const targetPath = resolve28(targetDir, runtimeClaudeToolRouterFileName());
-  mkdirSync14(targetDir, { recursive: true });
-  const needsCopy = !existsSync27(targetPath) || statSync7(sourcePath).mtimeMs > statSync7(targetPath).mtimeMs;
+  const targetPath = resolve29(targetDir, runtimeClaudeToolRouterFileName());
+  mkdirSync15(targetDir, { recursive: true });
+  const needsCopy = !existsSync28(targetPath) || statSync7(sourcePath).mtimeMs > statSync7(targetPath).mtimeMs;
   if (needsCopy) {
     copyFileSync6(sourcePath, targetPath);
     chmodSync6(targetPath, 493);
@@ -6299,48 +6375,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 && existsSync28(resolve29(hostProjectRoot, "packages/runtime/bin/rig-agent.ts"))) {
+  if (hostProjectRoot && existsSync29(resolve30(hostProjectRoot, "packages/runtime/bin/rig-agent.ts"))) {
     return hostProjectRoot;
   }
-  const fromModule = resolve29(import.meta.dir, "../../../../../..");
-  if (existsSync28(resolve29(fromModule, "packages/runtime/bin/rig-agent.ts"))) {
+  const fromModule = resolve30(import.meta.dir, "../../../../../..");
+  if (existsSync29(resolve30(fromModule, "packages/runtime/bin/rig-agent.ts"))) {
     return fromModule;
   }
   return projectRoot;
 }
 function prepareTrackedRuntimePaths(logsDir, stateDir, sessionDir) {
-  for (const path of [logsDir, stateDir, sessionDir, resolve29(sessionDir, "session.json")]) {
+  for (const path of [logsDir, stateDir, sessionDir, resolve30(sessionDir, "session.json")]) {
     removeSymbolicLink(path);
   }
   runtimePrepareTrackedPathsNative({
     logsDir,
     stateDir,
     sessionDir,
-    controlledBashLogFile: resolve29(logsDir, "controlled-bash.jsonl"),
-    eventsFile: resolve29(logsDir, "control-plane.events.jsonl")
+    controlledBashLogFile: resolve30(logsDir, "controlled-bash.jsonl"),
+    eventsFile: resolve30(logsDir, "control-plane.events.jsonl")
   });
 }
 async function initializeRuntimeStateFiles(stateDir, sessionDir, taskId) {
   await mkdir2(stateDir, { recursive: true });
   await mkdir2(sessionDir, { recursive: true });
-  const failedApproachesPath = resolve29(stateDir, "failed_approaches.md");
-  if (!existsSync28(failedApproachesPath)) {
+  const failedApproachesPath = resolve30(stateDir, "failed_approaches.md");
+  if (!existsSync29(failedApproachesPath)) {
     await writeFile(failedApproachesPath, `# Failed Approaches
 
 `);
   }
-  const hookTripsPath = resolve29(stateDir, "hook_trips.log");
-  if (!existsSync28(hookTripsPath)) {
+  const hookTripsPath = resolve30(stateDir, "hook_trips.log");
+  if (!existsSync29(hookTripsPath)) {
     await writeFile(hookTripsPath, "");
   }
-  const sessionFile = resolve29(sessionDir, "session.json");
+  const sessionFile = resolve30(sessionDir, "session.json");
   if (taskId) {
     await writeFile(sessionFile, JSON.stringify({ activeTaskIds: [taskId] }));
   }
 }
 async function resetEphemeralTaskArtifacts(workspaceDir, taskId) {
-  const artifactDir = resolve29(workspaceDir, "artifacts", taskId);
-  const runtimeSnapshotDir = resolve29(artifactDir, "runtime-snapshots");
+  const artifactDir = resolve30(workspaceDir, "artifacts", taskId);
+  const runtimeSnapshotDir = resolve30(artifactDir, "runtime-snapshots");
   let preservedTrackedFiles = false;
   for (const file of [
     "changed-files.txt",
@@ -6356,13 +6432,13 @@ async function resetEphemeralTaskArtifacts(workspaceDir, taskId) {
       preservedTrackedFiles = true;
       continue;
     }
-    rmSync10(resolve29(artifactDir, file), { force: true });
+    rmSync11(resolve30(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.`);
@@ -6395,28 +6471,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", resolve29(options.binDir, "rig"), rigSourceRoot);
-  await buildBinary("packages/runtime/bin/rig-agent.ts", resolve29(options.binDir, "rig-agent"), rigSourceRoot, {
+  await buildBinary("packages/cli/bin/rig.ts", resolve30(options.binDir, "rig"), rigSourceRoot);
+  await buildBinary("packages/runtime/bin/rig-agent.ts", resolve30(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: resolve29(options.binDir, "rig-agent"),
+    AGENT_BINARY_PATH: resolve30(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", resolve29(options.binDir, "controlled-bash"), rigSourceRoot, {
+  await buildBinary("packages/runtime/src/control-plane/controlled-bash.ts", resolve30(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: resolve29(options.workspaceDir, "TSAPITests"),
-    AGENT_RIG_AGENT_BIN: resolve29(options.binDir, "rig-agent")
+    AGENT_TS_API_TESTS_DIR: resolve30(options.workspaceDir, "TSAPITests"),
+    AGENT_RIG_AGENT_BIN: resolve30(options.binDir, "rig-agent")
   });
-  await buildBinary("packages/runtime/bin/rig-browser-tool.ts", resolve29(options.binDir, runtimeBrowserToolBinaryName()), rigSourceRoot);
-  await buildBinary("packages/runtime/src/control-plane/runtime/snapshot/sidecar.ts", resolve29(options.binDir, "snapshot-sidecar"), rigSourceRoot, {
+  await buildBinary("packages/runtime/bin/rig-browser-tool.ts", resolve30(options.binDir, runtimeBrowserToolBinaryName()), rigSourceRoot);
+  await buildBinary("packages/runtime/src/control-plane/runtime/snapshot/sidecar.ts", resolve30(options.binDir, "snapshot-sidecar"), rigSourceRoot, {
     AGENT_PROJECT_ROOT: options.projectRoot,
     AGENT_BUN_PATH: resolveBunBinaryPath()
   });
@@ -6425,15 +6501,15 @@ async function buildRuntimeToolchain(options) {
     AGENT_BUN_PATH: resolveBunBinaryPath()
   };
   for (const hookName of hookNames) {
-    await buildBinary(`packages/runtime/src/control-plane/hooks/${hookName}.ts`, resolve29(runtimeBins.hooksDir, hookName), rigSourceRoot, hookDefines);
+    await buildBinary(`packages/runtime/src/control-plane/hooks/${hookName}.ts`, resolve30(runtimeBins.hooksDir, hookName), rigSourceRoot, hookDefines);
   }
-  const pluginsDir = resolve29(options.projectRoot, "rig/plugins");
-  if (existsSync28(pluginsDir)) {
-    for (const entry of readdirSync5(pluginsDir, { withFileTypes: true })) {
+  const pluginsDir = resolve30(options.projectRoot, "rig/plugins");
+  if (existsSync29(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}`, resolve29(runtimeBins.pluginsDir, match[1]), options.projectRoot);
+      await buildBinary(`rig/plugins/${entry.name}`, resolve30(runtimeBins.pluginsDir, match[1]), options.projectRoot);
     }
   }
   await materializeRigGitBinary(options.binDir);
@@ -6443,8 +6519,8 @@ async function buildRuntimeToolchain(options) {
 }
 async function writeRuntimeManifest(config) {
   const scopeHash = sha256Hex(JSON.stringify(config.scopes));
-  const binarySha256 = sha256Hex(readFileSync13(config.binaryPath));
-  const manifestPath = resolve29(config.runtimeRoot, "manifest.json");
+  const binarySha256 = sha256Hex(readFileSync14(config.binaryPath));
+  const manifestPath = resolve30(config.runtimeRoot, "manifest.json");
   const manifest = {
     runtimeId: config.runtimeId,
     taskId: config.taskId,
@@ -6478,7 +6554,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);
@@ -6504,7 +6580,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) {
@@ -6564,31 +6640,31 @@ function readFileMtimeMs(path) {
 }
 function linkRuntimeDependencyLayers(monorepoRoot, workspaceDir) {
   linkGenericNodeModulesLayers(monorepoRoot, workspaceDir);
-  const sourceNodeModules = resolve29(monorepoRoot, "humoongate", "node_modules");
-  if (!existsSync28(sourceNodeModules)) {} else {
-    const runtimeHumoongate = resolve29(workspaceDir, "humoongate");
-    if (existsSync28(resolve29(runtimeHumoongate, "package.json"))) {
-      const targetNodeModules = resolve29(runtimeHumoongate, "node_modules");
+  const sourceNodeModules = resolve30(monorepoRoot, "humoongate", "node_modules");
+  if (!existsSync29(sourceNodeModules)) {} else {
+    const runtimeHumoongate = resolve30(workspaceDir, "humoongate");
+    if (existsSync29(resolve30(runtimeHumoongate, "package.json"))) {
+      const targetNodeModules = resolve30(runtimeHumoongate, "node_modules");
       runtimeLinkDependencyLayerNative(sourceNodeModules, targetNodeModules);
     }
   }
-  const runtimeHpNext = resolve29(workspaceDir, "microservices", "hp-next-frontend", "app");
-  if (!existsSync28(resolve29(runtimeHpNext, "package.json"))) {
+  const runtimeHpNext = resolve30(workspaceDir, "microservices", "hp-next-frontend", "app");
+  if (!existsSync29(resolve30(runtimeHpNext, "package.json"))) {
     return;
   }
-  const sourceHpNextNodeModules = resolve29(monorepoRoot, "microservices", "hp-next-frontend", "app", "node_modules");
-  const sourceMonorepoNodeModules = resolve29(monorepoRoot, "node_modules");
-  const targetHpNextNodeModules = resolve29(runtimeHpNext, "node_modules");
-  if (existsSync28(sourceHpNextNodeModules)) {
+  const sourceHpNextNodeModules = resolve30(monorepoRoot, "microservices", "hp-next-frontend", "app", "node_modules");
+  const sourceMonorepoNodeModules = resolve30(monorepoRoot, "node_modules");
+  const targetHpNextNodeModules = resolve30(runtimeHpNext, "node_modules");
+  if (existsSync29(sourceHpNextNodeModules)) {
     runtimeLinkDependencyLayerNative(sourceHpNextNodeModules, targetHpNextNodeModules);
     return;
   }
-  if (existsSync28(sourceMonorepoNodeModules)) {
+  if (existsSync29(sourceMonorepoNodeModules)) {
     runtimeLinkDependencyLayerNative(sourceMonorepoNodeModules, targetHpNextNodeModules);
   }
 }
 function linkGenericNodeModulesLayers(monorepoRoot, workspaceDir) {
-  linkNodeModulesLayer(resolve29(monorepoRoot, "node_modules"), resolve29(workspaceDir, "node_modules"));
+  linkNodeModulesLayer(resolve30(monorepoRoot, "node_modules"), resolve30(workspaceDir, "node_modules"));
   for (const relativePackageDir of [
     "apps/native-app/apps/marketing",
     "apps/native-app/apps/web",
@@ -6610,15 +6686,15 @@ function linkGenericNodeModulesLayers(monorepoRoot, workspaceDir) {
     "packages/standard-plugin",
     "packages/validator-kit"
   ]) {
-    const workspacePackageDir = resolve29(workspaceDir, relativePackageDir);
-    if (!existsSync28(resolve29(workspacePackageDir, "package.json"))) {
+    const workspacePackageDir = resolve30(workspaceDir, relativePackageDir);
+    if (!existsSync29(resolve30(workspacePackageDir, "package.json"))) {
       continue;
     }
-    linkNodeModulesLayer(resolve29(monorepoRoot, relativePackageDir, "node_modules"), resolve29(workspacePackageDir, "node_modules"));
+    linkNodeModulesLayer(resolve30(monorepoRoot, relativePackageDir, "node_modules"), resolve30(workspacePackageDir, "node_modules"));
   }
 }
 function linkNodeModulesLayer(sourceDir, targetDir) {
-  if (!existsSync28(sourceDir) || existsSync28(targetDir)) {
+  if (!existsSync29(sourceDir) || existsSync29(targetDir)) {
     return;
   }
   try {
@@ -6627,16 +6703,16 @@ 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(dirname13(targetDir), { recursive: true });
+  mkdirSync16(dirname13(targetDir), { recursive: true });
   symlinkSync4(sourceDir, targetDir, "dir");
 }
 function ensureRuntimeBinTrees(runtimeBinDir) {
-  const hooksDir = resolve29(runtimeBinDir, "hooks");
-  const pluginsDir = resolve29(runtimeBinDir, "plugins");
-  const validatorsDir = resolve29(runtimeBinDir, "validators");
-  mkdirSync15(hooksDir, { recursive: true });
-  mkdirSync15(pluginsDir, { recursive: true });
-  mkdirSync15(validatorsDir, { recursive: true });
+  const hooksDir = resolve30(runtimeBinDir, "hooks");
+  const pluginsDir = resolve30(runtimeBinDir, "plugins");
+  const validatorsDir = resolve30(runtimeBinDir, "validators");
+  mkdirSync16(hooksDir, { recursive: true });
+  mkdirSync16(pluginsDir, { recursive: true });
+  mkdirSync16(validatorsDir, { recursive: true });
   return { hooksDir, pluginsDir, validatorsDir };
 }
 function runtimeWorktreeId(workspaceDir) {
@@ -6645,7 +6721,7 @@ function runtimeWorktreeId(workspaceDir) {
 
 // packages/runtime/src/control-plane/runtime/isolation/discovery.ts
 async function readRuntimeMetadata(metadataPath) {
-  if (!existsSync29(metadataPath)) {
+  if (!existsSync30(metadataPath)) {
     return null;
   }
   try {
@@ -6657,8 +6733,8 @@ async function readRuntimeMetadata(metadataPath) {
 async function listAgentRuntimes(projectRoot) {
   const runtimes = [];
   const monorepoRoot = resolveMonorepoRoot3(projectRoot);
-  const worktreesRoot = resolve30(monorepoRoot, ".worktrees");
-  if (!existsSync29(worktreesRoot)) {
+  const worktreesRoot = resolve31(monorepoRoot, ".worktrees");
+  if (!existsSync30(worktreesRoot)) {
     return [];
   }
   const workspaces = runtimeScanWorktreesNative(worktreesRoot);
@@ -6666,7 +6742,7 @@ async function listAgentRuntimes(projectRoot) {
     let workspacePath = scan.workspaceDir;
     const workspaceLayout = resolveRuntimeWorkspaceLayout(workspacePath);
     const rootDir = scan.runtimeDir || workspaceLayout.runtimeDir;
-    const metadataPath = scan.metadataPath || resolve30(rootDir, "runtime.json");
+    const metadataPath = scan.metadataPath || resolve31(rootDir, "runtime.json");
     const contextFile = scan.contextPath || workspaceLayout.contextPath;
     let mode = "worktree";
     let createdAt = new Date().toISOString();
@@ -6682,7 +6758,7 @@ async function listAgentRuntimes(projectRoot) {
       mode = metadata.mode;
       createdAt = metadata.createdAt;
     }
-    if (existsSync29(contextFile)) {
+    if (existsSync30(contextFile)) {
       try {
         const ctx = loadRuntimeContext(contextFile);
         taskId = ctx.taskId;
@@ -6702,13 +6778,13 @@ async function listAgentRuntimes(projectRoot) {
       mode,
       rootDir,
       workspaceDir: workspacePath,
-      homeDir: resolve30(rootDir, "home"),
-      tmpDir: resolve30(rootDir, "tmp"),
-      cacheDir: resolve30(rootDir, "cache"),
+      homeDir: resolve31(rootDir, "home"),
+      tmpDir: resolve31(rootDir, "tmp"),
+      cacheDir: resolve31(rootDir, "cache"),
       logsDir,
       stateDir,
       sessionDir,
-      claudeHomeDir: resolve30(rootDir, "home", ".claude"),
+      claudeHomeDir: resolve31(rootDir, "home", ".claude"),
       contextFile,
       binDir,
       createdAt
@@ -6722,22 +6798,22 @@ function runtimeRootForCleanup(projectRoot, runtimeId) {
     monorepoRoot = resolveMonorepoRoot3(projectRoot);
   } catch {}
   const workspaceRootCandidate = monorepoRoot ?? projectRoot;
-  const initialWorkspaceDir = resolve30(workspaceRootCandidate, ".worktrees", runtimeWorktreeNameFromRuntimeId(runtimeId));
+  const initialWorkspaceDir = resolve31(workspaceRootCandidate, ".worktrees", runtimeWorktreeNameFromRuntimeId(runtimeId));
   const runtimeRoot = resolveRuntimeWorkspaceLayout(initialWorkspaceDir).runtimeDir;
   return { monorepoRoot, initialWorkspaceDir, runtimeRoot };
 }
 
 // packages/runtime/src/control-plane/runtime/isolation/runner.ts
-import { existsSync as existsSync32, rmSync as rmSync11, writeFileSync as writeFileSync12 } from "fs";
-import { basename as basename9, resolve as resolve34 } from "path";
+import { existsSync as existsSync33, 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 existsSync31 } from "fs";
+import { existsSync as existsSync32 } from "fs";
 
 // packages/runtime/src/control-plane/runtime/guard.ts
 import { optimizeNextInvocation } from "bun:jsc";
-import { existsSync as existsSync30, readFileSync as readFileSync14, statSync as statSync9 } from "fs";
-import { resolve as resolve31 } from "path";
+import { existsSync as existsSync31, readFileSync as readFileSync15, statSync as statSync9 } from "fs";
+import { resolve as resolve32 } from "path";
 
 // packages/runtime/src/control-plane/runtime/guard-types.ts
 var POLICY_VERSION = 1;
@@ -6800,8 +6876,8 @@ function loadPolicy(projectRoot) {
   if (seededPolicyConfig) {
     return seededPolicyConfig;
   }
-  const configPath = resolve31(projectRoot, "rig/policy/policy.json");
-  if (!existsSync30(configPath)) {
+  const configPath = resolve32(projectRoot, "rig/policy/policy.json");
+  if (!existsSync31(configPath)) {
     return defaultPolicy();
   }
   let mtimeMs;
@@ -6815,7 +6891,7 @@ function loadPolicy(projectRoot) {
   }
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync14(configPath, "utf-8"));
+    parsed = JSON.parse(readFileSync15(configPath, "utf-8"));
   } catch {
     return defaultPolicy();
   }
@@ -7031,28 +7107,28 @@ function resolveAction(mode, matched) {
 }
 function resolveAbsolutePath(projectRoot, rawPath) {
   if (rawPath.startsWith("/"))
-    return resolve31(rawPath);
-  return resolve31(projectRoot, rawPath);
+    return resolve32(rawPath);
+  return resolve32(projectRoot, rawPath);
 }
 function isHarnessPath(projectRoot, rawPath) {
   const absPath = resolveAbsolutePath(projectRoot, rawPath);
   const managedRoots = [
-    resolve31(projectRoot, "rig"),
-    resolve31(projectRoot, ".rig"),
-    resolve31(projectRoot, "artifacts")
+    resolve32(projectRoot, "rig"),
+    resolve32(projectRoot, ".rig"),
+    resolve32(projectRoot, "artifacts")
   ];
   return managedRoots.some((root) => absPath === root || absPath.startsWith(root + "/"));
 }
 function isRuntimePath(projectRoot, rawPath, taskWorkspace) {
   const absPath = resolveAbsolutePath(projectRoot, rawPath);
   if (taskWorkspace) {
-    const workspaceRigRoot = resolve31(taskWorkspace, ".rig");
-    const workspaceArtifactsRoot = resolve31(taskWorkspace, "artifacts");
+    const workspaceRigRoot = resolve32(taskWorkspace, ".rig");
+    const workspaceArtifactsRoot = resolve32(taskWorkspace, "artifacts");
     if (absPath === workspaceRigRoot || absPath.startsWith(workspaceRigRoot + "/") || absPath === workspaceArtifactsRoot || absPath.startsWith(workspaceArtifactsRoot + "/")) {
       return true;
     }
   }
-  const runtimeRoot = resolve31(projectRoot, ".rig/runtime/agents");
+  const runtimeRoot = resolve32(projectRoot, ".rig/runtime/agents");
   return absPath === runtimeRoot || absPath.startsWith(runtimeRoot + "/");
 }
 function isTestFile(path) {
@@ -7100,7 +7176,7 @@ function evaluateScope(policy, context, filePath, access) {
     return allowed();
   }
   if (context.taskWorkspace && context.taskWorkspace !== context.projectRoot && filePath.startsWith("/")) {
-    const absPath = resolve31(filePath);
+    const absPath = resolve32(filePath);
     if (!absPath.startsWith(context.taskWorkspace + "/") && !isHarnessPath(context.projectRoot, filePath)) {
       const reason2 = `Absolute path '${filePath}' is outside task runtime boundary. Allowed root: ${context.taskWorkspace}`;
       const matched2 = [{ id: "scope:workspace-boundary", category: "command", reason: reason2 }];
@@ -7425,13 +7501,13 @@ async function resolveBackend(projectRoot, options) {
     depRoots
   };
   const fsContext = {
-    pathExists: (p) => existsSync31(p),
+    pathExists: (p) => existsSync32(p),
     realPath: toRealPath
   };
   if (process.platform === "darwin" && (!requestedBackend || requestedBackend === "macos-seatbelt")) {
     const seatbelt = Bun.which("sandbox-exec");
     probed.push("sandbox-exec");
-    if (seatbelt && existsSync31(seatbelt)) {
+    if (seatbelt && existsSync32(seatbelt)) {
       const SeatbeltBackendClass = loadSeatbeltBackend();
       if (SeatbeltBackendClass) {
         return {
@@ -7552,10 +7628,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();
@@ -7593,19 +7669,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}`);
       }
@@ -7661,8 +7737,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 {
@@ -7692,18 +7768,18 @@ function resolveInternalRuntimeCommand(command) {
 }
 async function cleanupAgentRuntime(options) {
   const { monorepoRoot, initialWorkspaceDir, runtimeRoot } = runtimeRootForCleanup(options.projectRoot, options.id);
-  const metadataPath = resolve34(runtimeRoot, "runtime.json");
-  if (!existsSync32(runtimeRoot)) {
+  const metadataPath = resolve35(runtimeRoot, "runtime.json");
+  if (!existsSync33(runtimeRoot)) {
     return;
   }
   let mode = "worktree";
   let workspaceDir = "";
   const metadata = await readRuntimeMetadata2(metadataPath);
-  const metadataMatchesRequestedRuntime = metadata !== null && metadata.id === options.id && resolve34(metadata.workspaceDir) === resolve34(initialWorkspaceDir);
+  const metadataMatchesRequestedRuntime = metadata !== null && metadata.id === options.id && resolve35(metadata.workspaceDir) === resolve35(initialWorkspaceDir);
   if (metadata && metadataMatchesRequestedRuntime) {
     mode = metadata.mode;
     workspaceDir = metadata.workspaceDir;
-  } else if (existsSync32(initialWorkspaceDir)) {
+  } else if (existsSync33(initialWorkspaceDir)) {
     workspaceDir = initialWorkspaceDir;
   }
   const preservesTaskWorktree = metadataMatchesRequestedRuntime && metadata ? options.id === taskRuntimeId(metadata.taskId) : false;
@@ -7712,7 +7788,7 @@ async function cleanupAgentRuntime(options) {
   } else if (mode === "worktree" && workspaceDir && preservesTaskWorktree) {
     cleanupTaskRuntimeOverlay(workspaceDir);
   }
-  rmSync11(runtimeRoot, { recursive: true, force: true });
+  rmSync12(runtimeRoot, { recursive: true, force: true });
 }
 function cleanupTaskRuntimeOverlay(workspaceDir) {
   const layout = resolveRuntimeWorkspaceLayout(workspaceDir);
@@ -7728,17 +7804,17 @@ function cleanupTaskRuntimeOverlay(workspaceDir) {
     layout.runtimeDir,
     layout.contextPath
   ]) {
-    rmSync11(path, { recursive: true, force: true });
+    rmSync12(path, { recursive: true, force: true });
   }
 }
 function resolveSnapshotSidecarScriptPath() {
   return resolveRuntimeSourceScriptPath("snapshot-sidecar.ts");
 }
 function resolveSnapshotSidecarBinaryPath(binDir) {
-  return resolve34(binDir, "snapshot-sidecar");
+  return resolve35(binDir, "snapshot-sidecar");
 }
 function shouldUseCompiledSnapshotSidecar(binaryPath) {
-  if (!existsSync32(binaryPath)) {
+  if (!existsSync33(binaryPath)) {
     return false;
   }
   const preference = process.env.RIG_USE_COMPILED_SNAPSHOT_SIDECAR?.trim().toLowerCase();
@@ -7753,12 +7829,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 (existsSync32(candidate)) {
+    const candidate = resolve35(root, "packages/runtime/src/control-plane/runtime", fileName);
+    if (existsSync33(candidate)) {
       return candidate;
     }
   }
-  return resolve34(import.meta.dir, "..", fileName);
+  return resolve35(import.meta.dir, "..", fileName);
 }
 function resolveBunCliInvocation() {
   if (process.env.RIG_BUN_PATH?.trim()) {
@@ -7785,7 +7861,7 @@ function resolveBunCliInvocation() {
 async function waitForSnapshotSidecarReady(readyFile, proc, stdoutTextPromise, stderrTextPromise) {
   const deadline = Date.now() + SNAPSHOT_SIDECAR_READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
-    if (existsSync32(readyFile)) {
+    if (existsSync33(readyFile)) {
       return;
     }
     const exitCode = proc.exitCode;
@@ -7798,7 +7874,7 @@ async function waitForSnapshotSidecarReady(readyFile, proc, stdoutTextPromise, s
   throw new Error(`snapshot sidecar did not become ready within ${SNAPSHOT_SIDECAR_READY_TIMEOUT_MS}ms`);
 }
 async function readRuntimeMetadata2(metadataPath) {
-  if (!existsSync32(metadataPath)) {
+  if (!existsSync33(metadataPath)) {
     return null;
   }
   try {
@@ -7813,9 +7889,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 mkdir3(resolve35(workspaceLayout.stateDir, "memory"), { recursive: true });
+    await mkdir3(resolve36(workspaceLayout.stateDir, "memory"), { recursive: true });
     await copyFile(snapshot.dbPath, hydratedPath);
     return {
       canonicalPath: CANONICAL_MEMORY_DB_PATH2,
@@ -7830,12 +7906,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 (!existsSync33(legacyConfigPath)) {
+    if (!existsSync34(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)}`;
@@ -7855,7 +7931,7 @@ async function createRuntimeTaskRecordReader(options) {
       source: "plugin"
     };
   }
-  if (existsSync33(legacyConfigPath)) {
+  if (existsSync34(legacyConfigPath)) {
     const message = "Using source-aware .rig/task-config.json task source compatibility path";
     options.diagnostics?.(message);
     console.warn(message);
@@ -7872,10 +7948,10 @@ async function createRuntimeTaskRecordReader(options) {
   };
 }
 function readConfiguredTaskSourceKindHint(projectRoot) {
-  const jsonPath = resolve35(projectRoot, "rig.config.json");
-  if (existsSync33(jsonPath)) {
+  const jsonPath = resolve36(projectRoot, "rig.config.json");
+  if (existsSync34(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)) {
@@ -7887,12 +7963,12 @@ function readConfiguredTaskSourceKindHint(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve35(projectRoot, "rig.config.ts");
-  if (!existsSync33(tsPath)) {
+  const tsPath = resolve36(projectRoot, "rig.config.ts");
+  if (!existsSync34(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;
@@ -7962,8 +8038,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 mkdir3(resolve35(options.workspaceDir, ".rig"), { recursive: true });
+  const configPath = resolve36(options.workspaceDir, ".rig", "task-config.json");
+  await mkdir3(resolve36(options.workspaceDir, ".rig"), { recursive: true });
   await writeFile2(configPath, `${JSON.stringify({ [options.task.id]: entry }, null, 2)}
 `, "utf-8");
 }
@@ -8027,9 +8103,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 (!existsSync33(resolve35(monorepoRoot, ".git"))) {
+  if (!existsSync34(resolve36(monorepoRoot, ".git"))) {
     throw new Error(`Monorepo root is not a git checkout: ${monorepoRoot}`);
   }
   const taskResolution = await resolveRuntimeTaskRecord({
@@ -8064,7 +8140,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
@@ -8077,10 +8153,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,
@@ -8093,7 +8173,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,
@@ -8109,8 +8189,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
@@ -8121,9 +8201,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,
@@ -8138,10 +8218,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,
@@ -8178,9 +8258,9 @@ async function ensureAgentRuntime(options) {
     workspaceDir,
     taskEntry
   });
-  const sandboxDir = resolve35(runtimeRoot, "sandbox");
+  const sandboxDir = resolve36(runtimeRoot, "sandbox");
   await mkdir3(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",