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

package/dist/bin/rig-agent.js

@@ -2,8 +2,8 @@
 // @bun
 
 // packages/runtime/bin/rig-agent.ts
-import { existsSync as existsSync28, mkdirSync as mkdirSync16, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "fs";
-import { dirname as dirname17, resolve as resolve31 } from "path";
+import { existsSync as existsSync29, mkdirSync as mkdirSync17, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
+import { dirname as dirname17, resolve as resolve32 } from "path";
 
 // packages/runtime/src/control-plane/controlled-bash.ts
 import { readFileSync as readFileSync3 } from "fs";
@@ -3616,13 +3616,13 @@ class GeneralCliEventBus {
 }
 
 // packages/runtime/src/control-plane/native/git-ops.ts
-import { existsSync as existsSync22, lstatSync, mkdirSync as mkdirSync10, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname14, isAbsolute as isAbsolute2, resolve as resolve26 } from "path";
+import { existsSync as existsSync23, lstatSync, mkdirSync as mkdirSync11, readFileSync as readFileSync14, writeFileSync as writeFileSync11 } from "fs";
+import { dirname as dirname14, isAbsolute as isAbsolute2, resolve as resolve27 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // packages/runtime/src/control-plane/native/task-ops.ts
-import { appendFileSync, existsSync as existsSync21, mkdirSync as mkdirSync9, readFileSync as readFileSync12, writeFileSync as writeFileSync9 } from "fs";
-import { resolve as resolve25 } from "path";
+import { appendFileSync, existsSync as existsSync22, mkdirSync as mkdirSync10, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
+import { resolve as resolve26 } from "path";
 
 // packages/runtime/src/control-plane/runtime/tooling/shell.ts
 import { tmpdir as tmpdir4 } from "os";
@@ -3983,6 +3983,49 @@ function safeReadJson(path) {
   }
 }
 
+// packages/runtime/src/control-plane/skill-materializer.ts
+import { existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync8, readdirSync, rmSync as rmSync4, writeFileSync as writeFileSync5 } from "fs";
+import { resolve as resolve14 } 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 = resolve14(projectRoot, ".pi", "skills");
+  if (existsSync11(skillsRoot)) {
+    for (const name of readdirSync(skillsRoot)) {
+      const dir = resolve14(skillsRoot, name);
+      if (existsSync11(resolve14(dir, MARKER_FILENAME))) {
+        rmSync4(dir, { recursive: true, force: true });
+      }
+    }
+  }
+  const written = [];
+  for (const { pluginName, skill } of entries) {
+    const sourcePath = resolve14(projectRoot, skill.path);
+    if (!existsSync11(sourcePath)) {
+      console.warn(`[plugin-host] skill "${skill.id}" from plugin "${pluginName}" not materialized: ${sourcePath} does not exist`);
+      continue;
+    }
+    let body;
+    try {
+      await loadSkill(sourcePath);
+      body = readFileSync8(sourcePath, "utf-8");
+    } catch (err) {
+      console.warn(`[plugin-host] skill "${skill.id}" from plugin "${pluginName}" not materialized: ${err instanceof Error ? err.message : err}`);
+      continue;
+    }
+    const dir = resolve14(skillsRoot, skillDirName(skill.id));
+    mkdirSync6(dir, { recursive: true });
+    writeFileSync5(resolve14(dir, "SKILL.md"), body, "utf-8");
+    writeFileSync5(resolve14(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;
@@ -4019,6 +4062,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,
@@ -4032,12 +4086,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 existsSync12, readFileSync as readFileSync9, readdirSync, statSync as statSync3, writeFileSync as writeFileSync5 } from "fs";
-import { basename as basename4, join as join3, resolve as resolve15 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync10, readdirSync as readdirSync2, statSync as statSync3, writeFileSync as writeFileSync6 } from "fs";
+import { basename as basename4, join as join3, resolve as resolve16 } from "path";
 
 // packages/runtime/src/control-plane/tasks/legacy-task-config-source.ts
-import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
-import { resolve as resolve14 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
+import { resolve as resolve15 } from "path";
 
 // packages/runtime/src/control-plane/tasks/task-record-reader.ts
 async function findTaskById(reader, id) {
@@ -4060,7 +4114,7 @@ class LegacyTaskConfigReadError extends Error {
   }
 }
 function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
-  const configPath = options.configPath ?? resolve14(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve15(projectRoot, ".rig", "task-config.json");
   const reader = {
     async listTasks() {
       return readLegacyTaskRecords(projectRoot, configPath);
@@ -4071,8 +4125,8 @@ function createLegacyTaskConfigRecordReader(projectRoot, options = {}) {
   };
   return reader;
 }
-function readLegacyTaskRecords(projectRoot, configPath = resolve14(projectRoot, ".rig", "task-config.json")) {
-  if (!existsSync11(configPath)) {
+function readLegacyTaskRecords(projectRoot, configPath = resolve15(projectRoot, ".rig", "task-config.json")) {
+  if (!existsSync12(configPath)) {
     return [];
   }
   const rawConfig = readLegacyTaskConfigJson(projectRoot, configPath);
@@ -4080,7 +4134,7 @@ function readLegacyTaskRecords(projectRoot, configPath = resolve14(projectRoot,
 }
 function readLegacyTaskConfigJson(projectRoot, configPath) {
   try {
-    const parsed = JSON.parse(readFileSync8(configPath, "utf8"));
+    const parsed = JSON.parse(readFileSync9(configPath, "utf8"));
     if (isPlainRecord(parsed)) {
       return parsed;
     }
@@ -4164,7 +4218,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 ?? resolve15(projectRoot, ".rig", "task-config.json");
+  const configPath = options.configPath ?? resolve16(projectRoot, ".rig", "task-config.json");
   const legacy = createLegacyTaskConfigRecordReader(projectRoot, { configPath });
   const spawnFn = options.spawn ?? spawnSync;
   const ghBinary = options.ghBinary ?? "gh";
@@ -4247,10 +4301,10 @@ function readMaterializedTaskMetadata(entry) {
   return metadata;
 }
 function readConfiguredFilesTaskSourcePath(projectRoot) {
-  const jsonPath = resolve15(projectRoot, "rig.config.json");
-  if (existsSync12(jsonPath)) {
+  const jsonPath = resolve16(projectRoot, "rig.config.json");
+  if (existsSync13(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync9(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync10(jsonPath, "utf8"));
       if (isPlainRecord2(parsed) && isPlainRecord2(parsed.taskSource)) {
         const source = parsed.taskSource;
         return source.kind === "files" && typeof source.path === "string" ? source.path : null;
@@ -4259,12 +4313,12 @@ function readConfiguredFilesTaskSourcePath(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve15(projectRoot, "rig.config.ts");
-  if (!existsSync12(tsPath)) {
+  const tsPath = resolve16(projectRoot, "rig.config.ts");
+  if (!existsSync13(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync9(tsPath, "utf8");
+    const source = readFileSync10(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     if (kind !== "files") {
@@ -4284,10 +4338,10 @@ function readRawTaskEntry(configPath, taskId) {
   return isPlainRecord2(entry) ? entry : null;
 }
 function readRawTaskConfig(configPath) {
-  if (!existsSync12(configPath)) {
+  if (!existsSync13(configPath)) {
     return null;
   }
-  const parsed = JSON.parse(readFileSync9(configPath, "utf8"));
+  const parsed = JSON.parse(readFileSync10(configPath, "utf8"));
   return isPlainRecord2(parsed) ? parsed : null;
 }
 function stripLegacyTaskConfigMetadata2(raw) {
@@ -4295,12 +4349,12 @@ function stripLegacyTaskConfigMetadata2(raw) {
   return tasks;
 }
 function listFileBackedTasks(projectRoot, sourcePath) {
-  const directory = resolve15(projectRoot, sourcePath);
-  if (!existsSync12(directory)) {
+  const directory = resolve16(projectRoot, sourcePath);
+  if (!existsSync13(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, "");
@@ -4311,11 +4365,11 @@ function listFileBackedTasks(projectRoot, sourcePath) {
   return tasks;
 }
 function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
-  const file = findFileBackedTaskFile(resolve15(projectRoot, sourcePath), taskId);
+  const file = findFileBackedTaskFile(resolve16(projectRoot, sourcePath), taskId);
   if (!file) {
     return null;
   }
-  const raw = JSON.parse(readFileSync9(file, "utf8"));
+  const raw = JSON.parse(readFileSync10(file, "utf8"));
   if (!isPlainRecord2(raw)) {
     return null;
   }
@@ -4328,17 +4382,17 @@ function readFileBackedTask(projectRoot, sourcePath, taskId, rawEntry) {
   };
 }
 function findFileBackedTaskFile(directory, taskId) {
-  if (!existsSync12(directory)) {
+  if (!existsSync13(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(readFileSync9(file, "utf8"));
+      const raw = JSON.parse(readFileSync10(file, "utf8"));
       const inferredId = basename4(file).replace(FILE_TASK_PATTERN, "");
       const id = isPlainRecord2(raw) && typeof raw.id === "string" ? raw.id : inferredId;
       if (id === taskId) {
@@ -4421,8 +4475,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() } };
@@ -4498,8 +4552,8 @@ async function readConfiguredTaskSourceTask(projectRoot, taskId) {
 }
 
 // packages/runtime/src/control-plane/native/task-state.ts
-import { existsSync as existsSync16, readFileSync as readFileSync11, readdirSync as readdirSync2, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
-import { basename as basename6, resolve as resolve19 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync12, readdirSync as readdirSync3, statSync as statSync4, writeFileSync as writeFileSync7 } from "fs";
+import { basename as basename6, resolve as resolve20 } from "path";
 
 // packages/runtime/src/control-plane/state-sync/types.ts
 var SUPPORTED_TASK_STATE_SCHEMA_VERSION = 1;
@@ -4607,38 +4661,38 @@ function readTaskStateMetadataEnvelope(raw) {
   };
 }
 // packages/runtime/src/control-plane/state-sync/read.ts
-import { existsSync as existsSync15, readFileSync as readFileSync10 } from "fs";
-import { resolve as resolve18 } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync11 } from "fs";
+import { resolve as resolve19 } from "path";
 
 // packages/runtime/src/control-plane/state-sync/repo.ts
-import { existsSync as existsSync14 } from "fs";
-import { resolve as resolve17 } from "path";
+import { existsSync as existsSync15 } from "fs";
+import { resolve as resolve18 } from "path";
 
 // packages/runtime/src/control-plane/repos/layout.ts
-import { existsSync as existsSync13 } from "fs";
-import { basename as basename5, dirname as dirname11, join as join4, resolve as resolve16 } from "path";
+import { existsSync as existsSync14 } from "fs";
+import { basename as basename5, dirname as dirname11, join as join4, resolve as resolve17 } from "path";
 function resolveRepoStateDir(projectRoot) {
-  const normalizedProjectRoot = resolve16(projectRoot);
+  const normalizedProjectRoot = resolve17(projectRoot);
   const projectParent = dirname11(normalizedProjectRoot);
   if (basename5(projectParent) === ".worktrees") {
     const ownerRoot = dirname11(projectParent);
-    const ownerHasRepoMarkers = existsSync13(resolve16(ownerRoot, ".git")) || existsSync13(resolve16(ownerRoot, ".rig", "state"));
+    const ownerHasRepoMarkers = existsSync14(resolve17(ownerRoot, ".git")) || existsSync14(resolve17(ownerRoot, ".rig", "state"));
     if (ownerHasRepoMarkers) {
-      return resolve16(ownerRoot, ".rig", "state");
+      return resolve17(ownerRoot, ".rig", "state");
     }
   }
-  return resolve16(projectRoot, ".rig", "state");
+  return resolve17(projectRoot, ".rig", "state");
 }
 function resolveManagedRepoLayout(projectRoot, repoId) {
-  const normalizedProjectRoot = resolve16(projectRoot);
+  const normalizedProjectRoot = resolve17(projectRoot);
   const entry = getManagedRepoEntry(repoId);
   const stateDir = resolveRepoStateDir(normalizedProjectRoot);
   const metadataRelativePath = join4("repos", entry.id);
-  const metadataRoot = resolve16(stateDir, metadataRelativePath);
+  const metadataRoot = resolve17(stateDir, metadataRelativePath);
   const runtimeWorkspace = process.env.RIG_TASK_WORKSPACE?.trim();
-  const runsInsideTaskWorktree = runtimeWorkspace && resolve16(runtimeWorkspace) === normalizedProjectRoot || basename5(dirname11(normalizedProjectRoot)) === ".worktrees";
+  const runsInsideTaskWorktree = runtimeWorkspace && resolve17(runtimeWorkspace) === normalizedProjectRoot || basename5(dirname11(normalizedProjectRoot)) === ".worktrees";
   const isPrimaryManagedRepo = listManagedRepoEntries()[0]?.id === repoId;
-  const checkoutRoot = isPrimaryManagedRepo && runsInsideTaskWorktree ? resolveMonorepoRoot(normalizedProjectRoot) : entry.checkoutEnvVar && process.env[entry.checkoutEnvVar]?.trim() ? resolve16(process.env[entry.checkoutEnvVar].trim()) : resolve16(normalizedProjectRoot, entry.alias);
+  const checkoutRoot = isPrimaryManagedRepo && runsInsideTaskWorktree ? resolveMonorepoRoot(normalizedProjectRoot) : entry.checkoutEnvVar && process.env[entry.checkoutEnvVar]?.trim() ? resolve17(process.env[entry.checkoutEnvVar].trim()) : resolve17(normalizedProjectRoot, entry.alias);
   return {
     projectRoot: normalizedProjectRoot,
     repoId: entry.id,
@@ -4646,12 +4700,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: resolve16(checkoutRoot, ".worktrees"),
+    worktreesRoot: resolve17(checkoutRoot, ".worktrees"),
     stateDir,
     metadataRoot,
     metadataRelativePath,
-    mirrorRoot: resolve16(metadataRoot, "mirror.git"),
-    mirrorStatePath: resolve16(metadataRoot, "mirror-state.json"),
+    mirrorRoot: resolve17(metadataRoot, "mirror.git"),
+    mirrorStatePath: resolve17(metadataRoot, "mirror-state.json"),
     mirrorStateRelativePath: join4(metadataRelativePath, "mirror-state.json")
   };
 }
@@ -4673,7 +4727,7 @@ function resolveTrackerRepoPath(projectRoot) {
   const monorepoRoot = resolveMonorepoRoot2(projectRoot);
   try {
     const layout = resolveMonorepoRepoLayout(projectRoot);
-    if (existsSync14(resolve17(layout.mirrorRoot, "HEAD"))) {
+    if (existsSync15(resolve18(layout.mirrorRoot, "HEAD"))) {
       return layout.mirrorRoot;
     }
   } catch {}
@@ -4684,8 +4738,8 @@ function resolveTrackerRepoPath(projectRoot) {
 var DEFAULT_READ_DEPS2 = {
   fetchRef: nativeFetchRef,
   readBlobAtRef: nativeReadBlobAtRef,
-  exists: existsSync15,
-  readFile: (path) => readFileSync10(path, "utf8")
+  exists: existsSync16,
+  readFile: (path) => readFileSync11(path, "utf8")
 };
 function parseIssueStatus(rawStatus) {
   const normalized = normalizeTaskLifecycleStatus(rawStatus);
@@ -4766,12 +4820,12 @@ function shouldPreferLocalTrackerState(options) {
   if (runtimeContextPath) {
     return true;
   }
-  return existsSync15(resolve18(runtimeWorkspace, ".rig", "runtime-context.json"));
+  return existsSync16(resolve19(runtimeWorkspace, ".rig", "runtime-context.json"));
 }
 function readLocalTrackerState(projectRoot, deps) {
   const monorepoRoot = resolveMonorepoRoot2(projectRoot);
-  const issuesPath = resolve18(monorepoRoot, ".beads", "issues.jsonl");
-  const taskStatePath = resolve18(monorepoRoot, ".beads", "task-state.json");
+  const issuesPath = resolve19(monorepoRoot, ".beads", "issues.jsonl");
+  const taskStatePath = resolve19(monorepoRoot, ".beads", "task-state.json");
   return projectSyncedTrackerSnapshot({
     source: "local",
     issuesBaseOid: null,
@@ -4833,7 +4887,7 @@ function readValidationDescriptions(projectRoot) {
   return readValidationDescriptionMap(raw);
 }
 function readSourceValidationDescriptions(projectRoot) {
-  const rootRaw = readJsonFile(resolve19(projectRoot, "rig", "task-config.json"), {});
+  const rootRaw = readJsonFile(resolve20(projectRoot, "rig", "task-config.json"), {});
   const sourcePath = findSourceTaskConfigPath(projectRoot);
   const sourceRaw = sourcePath ? readJsonFile(sourcePath, {}) : {};
   const rootDescriptions = readValidationDescriptionMap(rootRaw);
@@ -4909,15 +4963,15 @@ function readValidationDescriptionsFromMeta(meta) {
   return meta.validation_descriptions;
 }
 function readLocalSourceTaskStateEnvelope(projectRoot) {
-  const taskStatePath = resolve19(resolveMonorepoRoot2(projectRoot), ".beads", "task-state.json");
+  const taskStatePath = resolve20(resolveMonorepoRoot2(projectRoot), ".beads", "task-state.json");
   return readTaskStateMetadataEnvelope(readJsonFile(taskStatePath, {}));
 }
 function readLocalSourceTaskLifecycleStatus(projectRoot, taskId) {
-  const issuesPath = resolve19(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
-  if (!existsSync16(issuesPath)) {
+  const issuesPath = resolve20(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
+  if (!existsSync17(issuesPath)) {
     return null;
   }
-  for (const line of readFileSync11(issuesPath, "utf8").split(/\r?\n/)) {
+  for (const line of readFileSync12(issuesPath, "utf8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -4958,25 +5012,25 @@ function lookupTask(projectRoot, input) {
 function artifactDirForId(projectRoot, id) {
   const workspaceDir = process.env.RIG_TASK_WORKSPACE?.trim();
   if (workspaceDir) {
-    const worktreeArtifacts = resolve19(workspaceDir, "artifacts", id);
-    if (existsSync16(worktreeArtifacts) || existsSync16(resolve19(workspaceDir, "artifacts"))) {
+    const worktreeArtifacts = resolve20(workspaceDir, "artifacts", id);
+    if (existsSync17(worktreeArtifacts) || existsSync17(resolve20(workspaceDir, "artifacts"))) {
       return worktreeArtifacts;
     }
   }
   try {
     const paths = resolveHarnessPaths(projectRoot);
-    return resolve19(paths.artifactsDir, id);
+    return resolve20(paths.artifactsDir, id);
   } catch {
-    return resolve19(resolveMonorepoRoot2(projectRoot), "artifacts", id);
+    return resolve20(resolveMonorepoRoot2(projectRoot), "artifacts", id);
   }
 }
 function resolveTaskConfigPath(projectRoot) {
   const paths = resolveHarnessPaths(projectRoot);
-  if (existsSync16(paths.taskConfigPath)) {
+  if (existsSync17(paths.taskConfigPath)) {
     return paths.taskConfigPath;
   }
   for (const candidate of sourceTaskConfigCandidates(projectRoot)) {
-    if (existsSync16(candidate)) {
+    if (existsSync17(candidate)) {
       return candidate;
     }
   }
@@ -4984,7 +5038,7 @@ function resolveTaskConfigPath(projectRoot) {
 }
 function findSourceTaskConfigPath(projectRoot) {
   for (const candidate of sourceTaskConfigCandidates(projectRoot)) {
-    if (existsSync16(candidate)) {
+    if (existsSync17(candidate)) {
       return candidate;
     }
   }
@@ -4997,7 +5051,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 {}
   }
@@ -5049,12 +5103,12 @@ function shouldRefreshAutoSyncedTaskConfigEntry(entry) {
   return !candidate.role;
 }
 function readSourceIssueRecords(projectRoot) {
-  const issuesPath = resolve19(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
-  if (!existsSync16(issuesPath)) {
+  const issuesPath = resolve20(resolveMonorepoRoot2(projectRoot), ".beads", "issues.jsonl");
+  if (!existsSync17(issuesPath)) {
     return [];
   }
   const records = [];
-  for (const line of readFileSync11(issuesPath, "utf-8").split(/\r?\n/)) {
+  for (const line of readFileSync12(issuesPath, "utf-8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -5110,19 +5164,19 @@ function readConfiguredFileTaskConfig(projectRoot) {
   if (!sourcePath) {
     return {};
   }
-  const directory = resolve19(projectRoot, sourcePath);
-  if (!existsSync16(directory)) {
+  const directory = resolve20(projectRoot, sourcePath);
+  if (!existsSync17(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 = resolve19(directory, name);
+    const file = resolve20(directory, name);
     try {
       if (!statSync4(file).isFile())
         continue;
-      const raw = JSON.parse(readFileSync11(file, "utf8"));
+      const raw = JSON.parse(readFileSync12(file, "utf8"));
       if (!raw || typeof raw !== "object" || Array.isArray(raw))
         continue;
       const record = raw;
@@ -5164,10 +5218,10 @@ function firstStringList2(...candidates) {
   return [];
 }
 function readConfiguredFilesTaskSourcePath2(projectRoot) {
-  const jsonPath = resolve19(projectRoot, "rig.config.json");
-  if (existsSync16(jsonPath)) {
+  const jsonPath = resolve20(projectRoot, "rig.config.json");
+  if (existsSync17(jsonPath)) {
     try {
-      const parsed = JSON.parse(readFileSync11(jsonPath, "utf8"));
+      const parsed = JSON.parse(readFileSync12(jsonPath, "utf8"));
       if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
         const taskSource = parsed.taskSource;
         if (taskSource && typeof taskSource === "object" && !Array.isArray(taskSource)) {
@@ -5179,12 +5233,12 @@ function readConfiguredFilesTaskSourcePath2(projectRoot) {
       return null;
     }
   }
-  const tsPath = resolve19(projectRoot, "rig.config.ts");
-  if (!existsSync16(tsPath)) {
+  const tsPath = resolve20(projectRoot, "rig.config.ts");
+  if (!existsSync17(tsPath)) {
     return null;
   }
   try {
-    const source = readFileSync11(tsPath, "utf8");
+    const source = readFileSync12(tsPath, "utf8");
     const taskSourceBlock = source.match(/taskSource\s*:\s*\{[\s\S]*?\}/m)?.[0] ?? "";
     const kind = taskSourceBlock.match(/kind\s*:\s*["']([^"']+)["']/)?.[1];
     if (kind !== "files") {
@@ -5198,23 +5252,23 @@ function readConfiguredFilesTaskSourcePath2(projectRoot) {
 function sourceTaskConfigCandidates(projectRoot) {
   const runtimeContext = loadRuntimeContextFromEnv();
   return [
-    runtimeContext?.monorepoMainRoot ? resolve19(runtimeContext.monorepoMainRoot, ".rig", "task-config.json") : "",
-    process.env.MONOREPO_MAIN_ROOT?.trim() ? resolve19(process.env.MONOREPO_MAIN_ROOT.trim(), ".rig", "task-config.json") : "",
-    resolve19(resolveMonorepoRoot2(projectRoot), ".rig", "task-config.json")
+    runtimeContext?.monorepoMainRoot ? resolve20(runtimeContext.monorepoMainRoot, ".rig", "task-config.json") : "",
+    process.env.MONOREPO_MAIN_ROOT?.trim() ? resolve20(process.env.MONOREPO_MAIN_ROOT.trim(), ".rig", "task-config.json") : "",
+    resolve20(resolveMonorepoRoot2(projectRoot), ".rig", "task-config.json")
   ].filter(Boolean);
 }
 
 // packages/runtime/src/control-plane/native/validator.ts
-import { existsSync as existsSync20, mkdirSync as mkdirSync8, writeFileSync as writeFileSync8 } from "fs";
-import { resolve as resolve24 } from "path";
+import { existsSync as existsSync21, mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "fs";
+import { resolve as resolve25 } from "path";
 
 // packages/runtime/src/control-plane/native/validator-binaries.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync7, rmSync as rmSync5, statSync as statSync5 } from "fs";
-import { dirname as dirname13, resolve as resolve23 } from "path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync8, rmSync as rmSync6, statSync as statSync5 } from "fs";
+import { dirname as dirname13, resolve as resolve24 } from "path";
 
 // packages/runtime/src/binary-run.ts
-import { chmodSync as chmodSync2, cpSync, existsSync as existsSync17, mkdirSync as mkdirSync6, renameSync as renameSync3, rmSync as rmSync4, writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename7, dirname as dirname12, resolve as resolve20 } from "path";
+import { chmodSync as chmodSync2, cpSync, existsSync as existsSync18, mkdirSync as mkdirSync7, renameSync as renameSync3, rmSync as rmSync5, writeFileSync as writeFileSync8 } from "fs";
+import { basename as basename7, dirname as dirname12, resolve as resolve21 } from "path";
 import { fileURLToPath } from "url";
 import { drainMicrotasks, gcAndSweep } from "bun:jsc";
 var runtimeBinaryBuildQueue = Promise.resolve();
@@ -5240,9 +5294,9 @@ async function buildRuntimeBinary(options) {
   });
 }
 async function buildRuntimeBinaryInProcess(options, manifest) {
-  const tempBuildDir = resolve20(dirname12(options.outputPath), `.bun-build-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`);
-  const tempOutputPath = resolve20(tempBuildDir, basename7(options.outputPath));
-  mkdirSync6(tempBuildDir, { recursive: true });
+  const tempBuildDir = resolve21(dirname12(options.outputPath), `.bun-build-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+  const tempOutputPath = resolve21(tempBuildDir, basename7(options.outputPath));
+  mkdirSync7(tempBuildDir, { recursive: true });
   await withTemporaryEnv({
     ...options.env,
     ...options.define ? { RIG_BUILD_CONFIG_JSON: JSON.stringify(options.define) } : {}
@@ -5267,7 +5321,7 @@ async function buildRuntimeBinaryInProcess(options, manifest) {
 `);
       throw new Error(`Failed to build ${options.entrypoint}: ${details || "Bun.build() returned errors"}`);
     }
-    if (!existsSync17(tempOutputPath)) {
+    if (!existsSync18(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}`);
     }
@@ -5282,7 +5336,7 @@ async function buildRuntimeBinaryInProcess(options, manifest) {
       });
     }
   })).finally(() => {
-    rmSync4(tempBuildDir, { recursive: true, force: true });
+    rmSync5(tempBuildDir, { recursive: true, force: true });
   });
 }
 function runBestEffortBuildGc() {
@@ -5299,8 +5353,8 @@ function runtimeBinaryCacheManifestPath(outputPath) {
 function resolveRuntimeBinaryBuildOptions(options) {
   return {
     ...options,
-    entrypoint: resolve20(options.cwd, options.sourcePath),
-    outputPath: resolve20(options.outputPath)
+    entrypoint: resolve21(options.cwd, options.sourcePath),
+    outputPath: resolve21(options.outputPath)
   };
 }
 function shouldUseRuntimeBinaryBuildWorker() {
@@ -5314,7 +5368,7 @@ function shouldUseRuntimeBinaryBuildWorker() {
 }
 async function buildRuntimeBinaryViaWorker(options) {
   const workerSourcePath = resolveRuntimeBinaryBuildWorkerSourcePath(options);
-  if (!workerSourcePath || !existsSync17(workerSourcePath)) {
+  if (!workerSourcePath || !existsSync18(workerSourcePath)) {
     await buildRuntimeBinaryInProcess(options, {
       manifestPath: runtimeBinaryCacheManifestPath(options.outputPath),
       buildKey: createRuntimeBinaryBuildKey({
@@ -5345,13 +5399,13 @@ async function buildRuntimeBinaryViaWorker(options) {
     new Response(build.stdout).text(),
     new Response(build.stderr).text()
   ]);
-  rmSync4(payloadPath, { force: true });
+  rmSync5(payloadPath, { force: true });
   if (exitCode !== 0) {
     throw new Error(`Failed to build ${options.entrypoint}: ${(stderr || stdout || `worker exited ${exitCode}`).trim()}`);
   }
 }
 function createRuntimeBinaryBuildWorkerPayloadPath(outputPath) {
-  return resolve20(dirname12(outputPath), `.bun-build-worker-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`);
+  return resolve21(dirname12(outputPath), `.bun-build-worker-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`);
 }
 function resolveRuntimeBinaryBuildWorkerSourcePath(options) {
   const envRoots = [
@@ -5360,13 +5414,13 @@ function resolveRuntimeBinaryBuildWorkerSourcePath(options) {
     process.env.PROJECT_RIG_ROOT?.trim()
   ].filter(Boolean);
   for (const root of envRoots) {
-    const candidate = resolve20(root, "packages/runtime/src/binary-build-worker.ts");
-    if (existsSync17(candidate)) {
+    const candidate = resolve21(root, "packages/runtime/src/binary-build-worker.ts");
+    if (existsSync18(candidate)) {
       return candidate;
     }
   }
-  const localCandidate = resolve20(import.meta.dir, "binary-build-worker.ts");
-  return existsSync17(localCandidate) ? localCandidate : null;
+  const localCandidate = resolve21(import.meta.dir, "binary-build-worker.ts");
+  return existsSync18(localCandidate) ? localCandidate : null;
 }
 function resolveRuntimeBinaryBuildWorkerInvocation() {
   const bunPath = Bun.which("bun");
@@ -5402,7 +5456,7 @@ function createRuntimeBinaryBuildKey(input) {
   });
 }
 async function isRuntimeBinaryBuildFresh(input) {
-  if (!existsSync17(input.outputPath) || !existsSync17(input.manifestPath)) {
+  if (!existsSync18(input.outputPath) || !existsSync18(input.manifestPath)) {
     return false;
   }
   let manifest = null;
@@ -5415,7 +5469,7 @@ async function isRuntimeBinaryBuildFresh(input) {
     return false;
   }
   for (const [filePath, expectedDigest] of Object.entries(manifest.inputs || {})) {
-    if (!existsSync17(filePath)) {
+    if (!existsSync18(filePath)) {
       return false;
     }
     if (await sha256File(filePath) !== expectedDigest) {
@@ -5428,7 +5482,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 || !existsSync17(normalized)) {
+    if (!normalized || !existsSync18(normalized)) {
       continue;
     }
     inputs[normalized] = await sha256File(normalized);
@@ -5451,7 +5505,7 @@ function normalizeBuildInputPath(cwd, inputPath) {
   if (inputPath.startsWith("<")) {
     return null;
   }
-  return resolve20(cwd, inputPath);
+  return resolve21(cwd, inputPath);
 }
 async function sha256File(path) {
   const hasher = new Bun.CryptoHasher("sha256");
@@ -5467,8 +5521,8 @@ function sortRecord(value) {
 async function runSerializedRuntimeBinaryBuild(action) {
   const previous = runtimeBinaryBuildQueue;
   let release;
-  runtimeBinaryBuildQueue = new Promise((resolve21) => {
-    release = resolve21;
+  runtimeBinaryBuildQueue = new Promise((resolve22) => {
+    release = resolve22;
   });
   await previous;
   try {
@@ -5513,11 +5567,11 @@ async function withTemporaryCwd(cwd, action) {
 }
 
 // packages/runtime/src/control-plane/runtime/provisioning-env.ts
-import { delimiter, resolve as resolve22 } from "path";
+import { delimiter, resolve as resolve23 } from "path";
 
 // packages/runtime/src/control-plane/runtime/runtime-paths.ts
-import { existsSync as existsSync18, readdirSync as readdirSync3, realpathSync } from "fs";
-import { resolve as resolve21 } from "path";
+import { existsSync as existsSync19, readdirSync as readdirSync4, realpathSync } from "fs";
+import { resolve as resolve22 } from "path";
 
 // packages/runtime/src/control-plane/runtime/sandbox/utils.ts
 function uniq(values) {
@@ -5535,7 +5589,7 @@ function resolveBunBinaryPath() {
   }
   const home = process.env.HOME?.trim();
   const fallbackCandidates = [
-    home ? resolve21(home, ".bun/bin/bun") : "",
+    home ? resolve22(home, ".bun/bin/bun") : "",
     "/opt/homebrew/bin/bun",
     "/usr/local/bin/bun",
     "/usr/bin/bun"
@@ -5563,8 +5617,8 @@ function resolveClaudeBinaryPath() {
   }
   const home = process.env.HOME?.trim();
   const fallbackCandidates = [
-    home ? resolve21(home, ".local/bin/claude") : "",
-    home ? resolve21(home, ".local/share/claude/local/claude") : "",
+    home ? resolve22(home, ".local/bin/claude") : "",
+    home ? resolve22(home, ".local/share/claude/local/claude") : "",
     "/opt/homebrew/bin/claude",
     "/usr/local/bin/claude",
     "/usr/bin/claude"
@@ -5578,51 +5632,51 @@ function resolveClaudeBinaryPath() {
   throw new Error("claude not found in PATH");
 }
 function resolveBunInstallDir(bunBinaryPath = resolveBunBinaryPath()) {
-  return resolve21(bunBinaryPath, "../..");
+  return resolve22(bunBinaryPath, "../..");
 }
 function resolveClaudeInstallDir() {
   const realPath = resolveClaudeBinaryPath();
-  return resolve21(realPath, "..");
+  return resolve22(realPath, "..");
 }
 function resolveNodeInstallDir() {
   const preferredNode = resolvePreferredNodeBinary();
   if (!preferredNode)
     return null;
   const explicitNode = process.env.RIG_NODE_BIN?.trim();
-  if (explicitNode && resolve21(explicitNode) === resolve21(preferredNode)) {
-    return preferredNode.endsWith("/bin/node") ? resolve21(preferredNode, "../..") : resolve21(preferredNode, "..");
+  if (explicitNode && resolve22(explicitNode) === resolve22(preferredNode)) {
+    return preferredNode.endsWith("/bin/node") ? resolve22(preferredNode, "../..") : resolve22(preferredNode, "..");
   }
   try {
     const realPath = realpathSync(preferredNode);
     if (realPath.endsWith("/bin/node")) {
-      return resolve21(realPath, "../..");
+      return resolve22(realPath, "../..");
     }
-    return resolve21(realPath, "..");
+    return resolve22(realPath, "..");
   } catch {
-    return resolve21(preferredNode, "..");
+    return resolve22(preferredNode, "..");
   }
 }
 function resolvePreferredNodeBinary() {
   const candidates = [];
   const envNode = process.env.RIG_NODE_BIN?.trim();
   if (envNode) {
-    const explicit = resolve21(envNode);
-    if (existsSync18(explicit)) {
+    const explicit = resolve22(envNode);
+    if (existsSync19(explicit)) {
       return explicit;
     }
   }
   const nvmBin = process.env.NVM_BIN?.trim();
   if (nvmBin) {
-    candidates.push(resolve21(nvmBin, "node"));
+    candidates.push(resolve22(nvmBin, "node"));
   }
   const home = process.env.HOME?.trim();
   if (home) {
-    const nvmVersionsDir = resolve21(home, ".nvm/versions/node");
-    if (existsSync18(nvmVersionsDir)) {
+    const nvmVersionsDir = resolve22(home, ".nvm/versions/node");
+    if (existsSync19(nvmVersionsDir)) {
       try {
-        const versionDirs = readdirSync3(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 = 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/, "")));
         for (const versionDir of versionDirs) {
-          candidates.push(resolve21(nvmVersionsDir, versionDir, "bin/node"));
+          candidates.push(resolve22(nvmVersionsDir, versionDir, "bin/node"));
         }
       } catch {}
     }
@@ -5631,8 +5685,8 @@ function resolvePreferredNodeBinary() {
   if (whichNode) {
     candidates.push(whichNode);
   }
-  const deduped = uniq(candidates.map((candidate) => resolve21(candidate)));
-  const existing = deduped.filter((candidate) => existsSync18(candidate));
+  const deduped = uniq(candidates.map((candidate) => resolve22(candidate)));
+  const existing = deduped.filter((candidate) => existsSync19(candidate));
   if (existing.length === 0) {
     return null;
   }
@@ -5646,7 +5700,7 @@ function resolvePreferredNodeBinary() {
   return existing[0] ?? null;
 }
 function inferNodeMajor(nodeBinaryPath) {
-  const normalized = resolve21(nodeBinaryPath).replace(/\\/g, "/");
+  const normalized = resolve22(nodeBinaryPath).replace(/\\/g, "/");
   const match = normalized.match(/(?:^|\/)(?:node-)?v?(\d+)\.\d+\.\d+(?:\/|$)/);
   if (!match) {
     return null;
@@ -5658,8 +5712,8 @@ function normalizeExecutablePath(candidate) {
   if (!candidate) {
     return "";
   }
-  const normalized = resolve21(candidate);
-  if (!existsSync18(normalized)) {
+  const normalized = resolve22(candidate);
+  if (!existsSync19(normalized)) {
     return "";
   }
   try {
@@ -5669,7 +5723,7 @@ function normalizeExecutablePath(candidate) {
   }
 }
 function looksLikeRuntimeGateway(candidate) {
-  const normalized = resolve21(candidate).replace(/\\/g, "/");
+  const normalized = resolve22(candidate).replace(/\\/g, "/");
   return normalized.includes("/.rig/bin/") || normalized.endsWith("/rig-shell") || normalized.endsWith("/rig-agent");
 }
 
@@ -5690,7 +5744,7 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
     try {
       return resolveClaudeInstallDir();
     } catch {
-      return resolve22(claudeBinary, "..");
+      return resolve23(claudeBinary, "..");
     }
   })() : "";
   const nodeDir = resolveNodeInstallDir();
@@ -5700,8 +5754,8 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
     `${bunDir}/bin`,
     claudeDir,
     nodeDir ? `${nodeDir}/bin` : "",
-    realHome ? resolve22(realHome, ".local/bin") : "",
-    realHome ? resolve22(realHome, ".cargo/bin") : "",
+    realHome ? resolve23(realHome, ".local/bin") : "",
+    realHome ? resolve23(realHome, ".cargo/bin") : "",
     ...inheritedPath,
     "/usr/local/bin",
     "/usr/local/sbin",
@@ -5732,9 +5786,9 @@ function runtimeProvisioningEnv(baseEnv = process.env) {
 // packages/runtime/src/control-plane/native/validator-binaries.ts
 function resolveValidatorBinaryPath(projectRoot, binaryName, runtimeContext) {
   if (runtimeContext) {
-    return resolve23(runtimeContext.binDir, "validators", binaryName);
+    return resolve24(runtimeContext.binDir, "validators", binaryName);
   }
-  return resolve23(resolveHarnessPaths(projectRoot).binDir, "validators", binaryName);
+  return resolve24(resolveHarnessPaths(projectRoot).binDir, "validators", binaryName);
 }
 async function ensureValidatorBinary(projectRoot, checkId, runtimeContext) {
   const match = checkId.match(/^([a-z][\w-]*):([a-z][\w-]*)$/);
@@ -5749,19 +5803,19 @@ async function ensureValidatorBinary(projectRoot, checkId, runtimeContext) {
   const binaryName = `${category}-${check}`;
   const binaryPath = resolveValidatorBinaryPath(projectRoot, binaryName, runtimeContext);
   const hostProjectRoot = runtimeContext?.hostProjectRoot?.trim() || projectRoot;
-  const sourcePath = resolve23(hostProjectRoot, "packages/runtime/src/control-plane/validators", category, `${check}.ts`);
-  if (!existsSync19(sourcePath)) {
+  const sourcePath = resolve24(hostProjectRoot, "packages/runtime/src/control-plane/validators", category, `${check}.ts`);
+  if (!existsSync20(sourcePath)) {
     return null;
   }
   const sourceMtime = statSync5(sourcePath).mtimeMs;
-  const binaryExists = existsSync19(binaryPath);
+  const binaryExists = existsSync20(binaryPath);
   const binaryMtime = binaryExists ? statSync5(binaryPath).mtimeMs : 0;
   if (!binaryExists || sourceMtime > binaryMtime) {
     if (binaryExists) {
-      rmSync5(binaryPath, { force: true });
-      rmSync5(`${binaryPath}.build-manifest.json`, { force: true });
+      rmSync6(binaryPath, { force: true });
+      rmSync6(`${binaryPath}.build-manifest.json`, { force: true });
     }
-    mkdirSync7(dirname13(binaryPath), { recursive: true });
+    mkdirSync8(dirname13(binaryPath), { recursive: true });
     await buildRuntimeBinary({
       sourcePath: `packages/runtime/src/control-plane/validators/${category}/${check}.ts`,
       outputPath: binaryPath,
@@ -5770,7 +5824,7 @@ async function ensureValidatorBinary(projectRoot, checkId, runtimeContext) {
       env: runtimeProvisioningEnv()
     });
   }
-  return existsSync19(binaryPath) ? binaryPath : null;
+  return existsSync20(binaryPath) ? binaryPath : null;
 }
 
 // packages/runtime/src/control-plane/native/validator.ts
@@ -5807,20 +5861,20 @@ async function readTaskSourceValidation(projectRoot, taskId) {
 function resolveValidationPaths(projectRoot, taskId, runtimeContext) {
   if (runtimeContext) {
     return {
-      taskLogDir: resolve24(runtimeContext.logsDir, taskId),
-      artifactDir: resolve24(runtimeContext.workspaceDir, "artifacts", taskId)
+      taskLogDir: resolve25(runtimeContext.logsDir, taskId),
+      artifactDir: resolve25(runtimeContext.workspaceDir, "artifacts", taskId)
     };
   }
   const paths = resolveHarnessPaths(projectRoot);
   return {
-    taskLogDir: resolve24(paths.logsDir, taskId),
-    artifactDir: resolve24(paths.artifactsDir, taskId)
+    taskLogDir: resolve25(paths.logsDir, taskId),
+    artifactDir: resolve25(paths.artifactsDir, taskId)
   };
 }
 async function runValidatorBinary(projectRoot, taskId, checkId, runtimeContext) {
   const binaryName = checkId.replace(":", "-");
   const binaryPath = await ensureValidatorBinary(projectRoot, checkId, runtimeContext) ?? resolveValidatorBinaryPath(projectRoot, binaryName, runtimeContext);
-  if (!existsSync20(binaryPath)) {
+  if (!existsSync21(binaryPath)) {
     return {
       result: {
         id: checkId,
@@ -5831,7 +5885,7 @@ async function runValidatorBinary(projectRoot, taskId, checkId, runtimeContext)
     };
   }
   const validatorCwd = runtimeContext?.workspaceDir || resolveMonorepoRoot(projectRoot);
-  const runtimeShellPath = runtimeContext ? resolve24(runtimeContext.binDir, "rig-shell") : "";
+  const runtimeShellPath = runtimeContext ? resolve25(runtimeContext.binDir, "rig-shell") : "";
   const monorepoMainRoot = runtimeContext?.monorepoMainRoot || process.env.MONOREPO_MAIN_ROOT?.trim() || resolveMonorepoRoot(projectRoot);
   const validatorEnv = {
     PROJECT_RIG_ROOT: runtimeContext?.hostProjectRoot || projectRoot,
@@ -5846,7 +5900,7 @@ async function runValidatorBinary(projectRoot, taskId, checkId, runtimeContext)
     validatorEnv.RIG_LOGS_DIR = runtimeContext.logsDir;
     validatorEnv.RIG_RUNTIME_BIN_DIR = runtimeContext.binDir;
   }
-  const { exitCode, stdout, stderr } = await runCaptureAsync(runtimeShellPath && existsSync20(runtimeShellPath) ? [runtimeShellPath, "run-binary", binaryPath] : [binaryPath], validatorCwd, validatorEnv);
+  const { exitCode, stdout, stderr } = await runCaptureAsync(runtimeShellPath && existsSync21(runtimeShellPath) ? [runtimeShellPath, "run-binary", binaryPath] : [binaryPath], validatorCwd, validatorEnv);
   try {
     const result = JSON.parse(stdout.trim());
     return { result, exitCode };
@@ -5886,8 +5940,8 @@ async function validateTask(projectRoot, taskId, runtimeContext, registry, optio
   const configuredValidation = stringArray(taskConfig[taskId]?.validation);
   const commands = resolvedContext?.validation?.length ? resolvedContext.validation : configuredValidation.length > 0 ? configuredValidation : sourceValidation.validation;
   const { taskLogDir, artifactDir } = resolveValidationPaths(projectRoot, taskId, resolvedContext);
-  mkdirSync8(taskLogDir, { recursive: true });
-  mkdirSync8(artifactDir, { recursive: true });
+  mkdirSync9(taskLogDir, { recursive: true });
+  mkdirSync9(artifactDir, { recursive: true });
   if (commands.length === 0) {
     const skipped = {
       status: "skipped",
@@ -5896,7 +5950,7 @@ async function validateTask(projectRoot, taskId, runtimeContext, registry, optio
       failed: 0,
       categories: []
     };
-    writeFileSync8(resolve24(artifactDir, "validation-summary.json"), `${JSON.stringify(skipped, null, 2)}
+    writeFileSync9(resolve25(artifactDir, "validation-summary.json"), `${JSON.stringify(skipped, null, 2)}
 `, "utf-8");
     return skipped;
   }
@@ -5931,18 +5985,18 @@ async function validateTask(projectRoot, taskId, runtimeContext, registry, optio
         exit_code: 2,
         duration_seconds: 0
       });
-      const logFile2 = resolve24(taskLogDir, `invalid-entry-validation.log`);
-      mkdirSync8(taskLogDir, { recursive: true });
-      writeFileSync8(logFile2, `=== ${nowIso()} :: ${cmd} ===
+      const logFile2 = resolve25(taskLogDir, `invalid-entry-validation.log`);
+      mkdirSync9(taskLogDir, { recursive: true });
+      writeFileSync9(logFile2, `=== ${nowIso()} :: ${cmd} ===
 Invalid validation entry: not a check-ID. All entries must use format "category:check-name".
 `, "utf-8");
       continue;
     }
     const { result, exitCode } = await dispatchValidator(cmd, effectiveRegistry, validatorCtx, (id) => runValidatorBinary(projectRoot, taskId, id, resolvedContext));
     const durationSeconds = Math.max(0, Math.round((Date.now() - startedAt) / 1000));
-    const logFile = resolve24(taskLogDir, `${cmd.replace(":", "-")}-validation.log`);
-    mkdirSync8(taskLogDir, { recursive: true });
-    writeFileSync8(logFile, `=== ${nowIso()} :: ${cmd} ===
+    const logFile = resolve25(taskLogDir, `${cmd.replace(":", "-")}-validation.log`);
+    mkdirSync9(taskLogDir, { recursive: true });
+    writeFileSync9(logFile, `=== ${nowIso()} :: ${cmd} ===
 ${JSON.stringify(result, null, 2)}
 `, "utf-8");
     if (result.passed) {
@@ -5964,8 +6018,8 @@ ${JSON.stringify(result, null, 2)}
     failed,
     categories
   };
-  mkdirSync8(artifactDir, { recursive: true });
-  writeFileSync8(resolve24(artifactDir, "validation-summary.json"), `${JSON.stringify(summary, null, 2)}
+  mkdirSync9(artifactDir, { recursive: true });
+  writeFileSync9(resolve25(artifactDir, "validation-summary.json"), `${JSON.stringify(summary, null, 2)}
 `, "utf-8");
   return summary;
 }
@@ -6312,16 +6366,16 @@ async function taskDeps(projectRoot, taskId) {
   for (const dep of deps) {
     const artifactDir = artifactDirForId(projectRoot, dep);
     console.log(`=== ${dep} ===`);
-    if (!existsSync21(artifactDir)) {
+    if (!existsSync22(artifactDir)) {
       console.log(`  (no artifacts yet)
 `);
       continue;
     }
-    printArtifactSection(resolve25(artifactDir, "decision-log.md"), "--- Decisions ---");
-    printArtifactSection(resolve25(artifactDir, "next-actions.md"), "--- Next Actions (for you) ---");
-    const changedFiles = resolve25(artifactDir, "changed-files.txt");
-    if (existsSync21(changedFiles)) {
-      const lines = readFileSync12(changedFiles, "utf-8").split(/\r?\n/).filter(Boolean);
+    printArtifactSection(resolve26(artifactDir, "decision-log.md"), "--- Decisions ---");
+    printArtifactSection(resolve26(artifactDir, "next-actions.md"), "--- Next Actions (for you) ---");
+    const changedFiles = resolve26(artifactDir, "changed-files.txt");
+    if (existsSync22(changedFiles)) {
+      const lines = readFileSync13(changedFiles, "utf-8").split(/\r?\n/).filter(Boolean);
       console.log(`--- Changed Files (${lines.length}) ---`);
       for (const line of lines) {
         console.log(line);
@@ -6366,12 +6420,12 @@ function taskRecord(projectRoot, type, text, taskId) {
     throw new Error("No active task.");
   }
   const paths = resolveHarnessPaths(projectRoot);
-  mkdirSync9(paths.stateDir, { recursive: true });
+  mkdirSync10(paths.stateDir, { recursive: true });
   if (type === "decision") {
-    const artifactDir = resolve25(paths.artifactsDir, activeTask);
-    mkdirSync9(artifactDir, { recursive: true });
+    const artifactDir = resolve26(paths.artifactsDir, activeTask);
+    mkdirSync10(artifactDir, { recursive: true });
     const timestamp = nowIso();
-    appendFileSync(resolve25(artifactDir, "decision-log.md"), `
+    appendFileSync(resolve26(artifactDir, "decision-log.md"), `
 ### ${timestamp}
 
 ${text}
@@ -6381,15 +6435,15 @@ ${text}
     return;
   }
   const failedPath = paths.failedApproachesPath;
-  if (!existsSync21(failedPath)) {
-    writeFileSync9(failedPath, `# Failed Approaches Log
+  if (!existsSync22(failedPath)) {
+    writeFileSync10(failedPath, `# Failed Approaches Log
 
 This file records approaches that did not work.
 
 `, "utf-8");
   }
-  const content = readFileSync12(failedPath, "utf-8");
-  const attempts = (content.match(new RegExp(`^## ${escapeRegExp2(activeTask)}\\b`, "gm")) || []).length + 1;
+  const content = readFileSync13(failedPath, "utf-8");
+  const attempts = (content.match(new RegExp(`^## ${escapeRegExp(activeTask)}\\b`, "gm")) || []).length + 1;
   appendFileSync(failedPath, `
 ## ${activeTask} - Attempt ${attempts} (${nowIso()})
 
@@ -6405,40 +6459,40 @@ function taskArtifacts(projectRoot, taskId) {
     throw new Error("No active task.");
   }
   const paths = resolveHarnessPaths(projectRoot);
-  const artifactDir = resolve25(paths.artifactsDir, activeTask);
-  mkdirSync9(artifactDir, { recursive: true });
+  const artifactDir = resolve26(paths.artifactsDir, activeTask);
+  mkdirSync10(artifactDir, { recursive: true });
   const changed = changedFilesForTask(projectRoot, activeTask, true);
-  writeFileSync9(resolve25(artifactDir, "changed-files.txt"), `${changed.join(`
+  writeFileSync10(resolve26(artifactDir, "changed-files.txt"), `${changed.join(`
 `)}
 `, "utf-8");
   console.log(`changed-files.txt: ${changed.length} files`);
-  const taskResultPath = resolve25(artifactDir, "task-result.json");
-  if (!existsSync21(taskResultPath)) {
+  const taskResultPath = resolve26(artifactDir, "task-result.json");
+  if (!existsSync22(taskResultPath)) {
     const template = {
       task_id: activeTask,
       status: "completed",
       summary: "TODO: Write a one-line summary of what you did",
       completed_at: nowIso()
     };
-    writeFileSync9(taskResultPath, `${JSON.stringify(template, null, 2)}
+    writeFileSync10(taskResultPath, `${JSON.stringify(template, null, 2)}
 `, "utf-8");
     console.log("task-result.json: created (update the summary!)");
   } else {
     console.log("task-result.json: already exists");
   }
-  const decisionLogPath = resolve25(artifactDir, "decision-log.md");
-  if (!existsSync21(decisionLogPath)) {
+  const decisionLogPath = resolve26(artifactDir, "decision-log.md");
+  if (!existsSync22(decisionLogPath)) {
     const content = `# Decision Log: ${activeTask}
 
 Record key decisions here using: rig-agent record decision "..."
 `;
-    writeFileSync9(decisionLogPath, content, "utf-8");
+    writeFileSync10(decisionLogPath, content, "utf-8");
     console.log("decision-log.md: created (record your decisions!)");
   } else {
     console.log("decision-log.md: already exists");
   }
-  const nextActionsPath = resolve25(artifactDir, "next-actions.md");
-  if (!existsSync21(nextActionsPath)) {
+  const nextActionsPath = resolve26(artifactDir, "next-actions.md");
+  if (!existsSync22(nextActionsPath)) {
     const content = [
       `# Next Actions: ${activeTask}`,
       "",
@@ -6455,13 +6509,13 @@ Record key decisions here using: rig-agent record decision "..."
       ""
     ].join(`
 `);
-    writeFileSync9(nextActionsPath, content, "utf-8");
+    writeFileSync10(nextActionsPath, content, "utf-8");
     console.log("next-actions.md: created (add recommendations for downstream tasks!)");
   } else {
     console.log("next-actions.md: already exists");
   }
-  const validationSummaryPath = resolve25(artifactDir, "validation-summary.json");
-  if (existsSync21(validationSummaryPath)) {
+  const validationSummaryPath = resolve26(artifactDir, "validation-summary.json");
+  if (existsSync22(validationSummaryPath)) {
     console.log("validation-summary.json: already exists");
   } else {
     console.log("validation-summary.json: not yet created (run: rig-agent validate)");
@@ -6475,8 +6529,8 @@ function taskArtifactDir(projectRoot, taskId) {
     throw new Error("No active task.");
   }
   const paths = resolveHarnessPaths(projectRoot);
-  const artifactDir = resolve25(paths.artifactsDir, activeTask);
-  mkdirSync9(artifactDir, { recursive: true });
+  const artifactDir = resolve26(paths.artifactsDir, activeTask);
+  mkdirSync10(artifactDir, { recursive: true });
   return artifactDir;
 }
 function taskArtifactWrite(projectRoot, filename, content, taskId) {
@@ -6485,10 +6539,10 @@ function taskArtifactWrite(projectRoot, filename, content, taskId) {
     throw new Error("No active task.");
   }
   const paths = resolveHarnessPaths(projectRoot);
-  const artifactDir = resolve25(paths.artifactsDir, activeTask);
-  mkdirSync9(artifactDir, { recursive: true });
-  const targetPath = resolve25(artifactDir, filename);
-  writeFileSync9(targetPath, content, "utf-8");
+  const artifactDir = resolve26(paths.artifactsDir, activeTask);
+  mkdirSync10(artifactDir, { recursive: true });
+  const targetPath = resolve26(artifactDir, filename);
+  writeFileSync10(targetPath, content, "utf-8");
   console.log(`Wrote: ${targetPath}`);
 }
 async function taskValidate(projectRoot, taskId, validatorRegistry) {
@@ -6549,7 +6603,7 @@ function collectTaskChangedFiles(projectRoot, taskId, includeCommitted) {
     [projectRoot, ""],
     [monorepoRepoRoot, ""]
   ]) {
-    if (!existsSync21(resolve25(repo, ".git"))) {
+    if (!existsSync22(resolve26(repo, ".git"))) {
       continue;
     }
     if (includeCommitted && repo === monorepoRepoRoot) {
@@ -6587,8 +6641,8 @@ function filterTaskChangedFiles(projectRoot, taskId, files, scoped) {
 }
 function resolveTaskMonorepoRoot(projectRoot) {
   const runtimeWorkspace = loadRuntimeContextFromEnv()?.workspaceDir || process.env.RIG_TASK_WORKSPACE?.trim();
-  if (runtimeWorkspace && existsSync21(resolve25(runtimeWorkspace, ".git"))) {
-    return resolve25(runtimeWorkspace);
+  if (runtimeWorkspace && existsSync22(resolve26(runtimeWorkspace, ".git"))) {
+    return resolve26(runtimeWorkspace);
   }
   return resolveHarnessPaths(projectRoot).monorepoRoot;
 }
@@ -6616,7 +6670,7 @@ function resolveRuntimeInitialHeadCommit(projectRoot, repo) {
   const runtimeContext = loadRuntimeContextFromEnv();
   if (runtimeContext?.initialHeadCommits?.monorepo?.trim()) {
     const monorepoRoot = resolveTaskMonorepoRoot(projectRoot);
-    if (resolve25(monorepoRoot) === resolve25(repo)) {
+    if (resolve26(monorepoRoot) === resolve26(repo)) {
       return runtimeContext.initialHeadCommits.monorepo.trim();
     }
   }
@@ -6626,7 +6680,7 @@ function resolveMonorepoBaseCommit(projectRoot, repo) {
   const runtimeContext = loadRuntimeContextFromEnv();
   if (runtimeContext?.monorepoBaseCommit?.trim()) {
     const monorepoRoot = resolveTaskMonorepoRoot(projectRoot);
-    if (resolve25(monorepoRoot) === resolve25(repo)) {
+    if (resolve26(monorepoRoot) === resolve26(repo)) {
       return runtimeContext.monorepoBaseCommit.trim();
     }
   }
@@ -6660,7 +6714,7 @@ function resolveRuntimeDirtyBaseline(projectRoot, repo) {
     return new Set;
   }
   const monorepoRoot = resolveTaskMonorepoRoot(projectRoot);
-  const selected = resolve25(repo) === resolve25(monorepoRoot) ? dirtyFiles.monorepo : resolve25(repo) === resolve25(projectRoot) ? dirtyFiles.project : undefined;
+  const selected = resolve26(repo) === resolve26(monorepoRoot) ? dirtyFiles.monorepo : resolve26(repo) === resolve26(projectRoot) ? dirtyFiles.project : undefined;
   return new Set((selected || []).map((file) => normalizeChangedFilePath(file)).filter(Boolean));
 }
 function normalizeChangedFilePath(file) {
@@ -6760,12 +6814,12 @@ function printIndented(text) {
   }
 }
 function readLocalBeadsTasks(projectRoot) {
-  const issuesPath = resolve25(resolveMonorepoRoot2(projectRoot), ".beads/issues.jsonl");
-  if (!existsSync21(issuesPath)) {
+  const issuesPath = resolve26(resolveMonorepoRoot2(projectRoot), ".beads/issues.jsonl");
+  if (!existsSync22(issuesPath)) {
     return [];
   }
   const tasks = [];
-  for (const line of readFileSync12(issuesPath, "utf-8").split(/\r?\n/)) {
+  for (const line of readFileSync13(issuesPath, "utf-8").split(/\r?\n/)) {
     const trimmed = line.trim();
     if (!trimmed) {
       continue;
@@ -6878,14 +6932,14 @@ function taskDependencies(projectRoot, taskId, tracker) {
   return [...ids].sort();
 }
 function printArtifactSection(path, header) {
-  if (!existsSync21(path)) {
+  if (!existsSync22(path)) {
     return;
   }
   console.log(header);
-  process.stdout.write(readFileSync12(path, "utf-8"));
+  process.stdout.write(readFileSync13(path, "utf-8"));
   console.log("");
 }
-function escapeRegExp2(value) {
+function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function changedFilesForTask(projectRoot, taskId, scoped) {
@@ -6914,16 +6968,16 @@ var TASK_ARTIFACT_STAGE_FALLBACK = new Set([
   "task-result.json",
   "validation-summary.json"
 ]);
-function resolveHostRigBinDir(root) {
-  return resolve26(root, ".rig", "bin");
-}
 function isRuntimeGatewayGitPath(candidate) {
   return /\/\.rig\/bin\/git$/.test(candidate.replace(/\\/g, "/"));
 }
+function isRuntimeGatewayGhPath(candidate) {
+  return /\/\.rig\/bin\/gh$/.test(candidate.replace(/\\/g, "/"));
+}
 function resolveOptionalMonorepoRoot(projectRoot) {
   const runtimeWorkspace = process.env.RIG_TASK_WORKSPACE?.trim();
-  if (runtimeWorkspace && existsSync22(resolve26(runtimeWorkspace, ".git"))) {
-    return resolve26(runtimeWorkspace);
+  if (runtimeWorkspace && existsSync23(resolve27(runtimeWorkspace, ".git"))) {
+    return resolve27(runtimeWorkspace);
   }
   try {
     return resolveMonorepoRoot2(projectRoot);
@@ -6948,12 +7002,15 @@ function resolveGitBinary(projectRoot) {
     if (!candidate || isRuntimeGatewayGitPath(candidate)) {
       continue;
     }
-    if (existsSync22(candidate)) {
+    if (existsSync23(candidate)) {
       return candidate;
     }
   }
   return "git";
 }
+function escapeRegExp2(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 function safeCurrentTaskId(projectRoot) {
   try {
     const taskId = currentTaskId(projectRoot);
@@ -7005,11 +7062,11 @@ function gitPreflight(projectRoot, taskId, strict) {
   const expected = resolvedTask ? `rig/${resolveTaskBranchId(projectRoot, resolvedTask)}` : "";
   console.log("=== Git Flow Preflight ===");
   let issues = 0;
-  if (!existsSync22(resolve26(projectRoot, ".git"))) {
+  if (!existsSync23(resolve27(projectRoot, ".git"))) {
     console.log(`ERROR: project root is not a git repo (${projectRoot})`);
     issues += 1;
   }
-  if (monorepoRoot && existsSync22(resolve26(monorepoRoot, ".git"))) {
+  if (monorepoRoot && existsSync23(resolve27(monorepoRoot, ".git"))) {
     const monoBranch = branchName(projectRoot, monorepoRoot);
     if (expected && monoBranch !== expected) {
       console.log(`WARN: monorepo branch is ${monoBranch}, expected ${expected} for task ${resolvedTask}`);
@@ -7043,7 +7100,7 @@ function gitSyncBranch(projectRoot, taskId, targetRepo = "monorepo") {
   }
   const repoRoot = targetRepo === "monorepo" ? resolveOptionalMonorepoRoot(projectRoot) || resolveMonorepoRoot2(projectRoot) : projectRoot;
   const repoLabel = targetRepo === "monorepo" ? "Monorepo" : "Project";
-  if (!existsSync22(resolve26(repoRoot, ".git"))) {
+  if (!existsSync23(resolve27(repoRoot, ".git"))) {
     throw new Error(`${repoLabel} repo not found at ${repoRoot}`);
   }
   const branchId = resolveTaskBranchId(projectRoot, resolvedTask);
@@ -7087,8 +7144,8 @@ function gitCommit(options) {
 function gitSnapshot(projectRoot, taskId, outputPath) {
   const monorepoRoot = resolveOptionalMonorepoRoot(projectRoot);
   const resolvedTask = taskId || safeCurrentTaskId(projectRoot);
-  const output = outputPath || (resolvedTask ? resolveArtifactSnapshot(projectRoot, resolvedTask) : resolve26(resolve26(projectRoot, ".rig", "state"), "git-state.txt"));
-  mkdirSync10(dirname14(output), { recursive: true });
+  const output = outputPath || (resolvedTask ? resolveArtifactSnapshot(projectRoot, resolvedTask) : resolve27(resolve27(projectRoot, ".rig", "state"), "git-state.txt"));
+  mkdirSync11(dirname14(output), { recursive: true });
   const lines = ["# Git Snapshot", `timestamp: ${nowIso()}`];
   if (resolvedTask) {
     lines.push(`task: ${resolvedTask}`);
@@ -7098,7 +7155,7 @@ function gitSnapshot(projectRoot, taskId, outputPath) {
   if (monorepoRoot && monorepoRoot !== projectRoot) {
     lines.push(...snapshotRepo(projectRoot, "monorepo", monorepoRoot));
   }
-  writeFileSync10(output, `${lines.join(`
+  writeFileSync11(output, `${lines.join(`
 `)}
 `, "utf-8");
   return output;
@@ -7122,7 +7179,7 @@ function gitOpenPr(options) {
   } else if (taskId) {
     gitSyncBranch(options.projectRoot, taskId, "project");
   }
-  if (!existsSync22(resolve26(repoRoot, ".git"))) {
+  if (!existsSync23(resolve27(repoRoot, ".git"))) {
     throw new Error(`Repository not available for open-pr target ${target}: ${repoRoot}`);
   }
   const branch = branchName(options.projectRoot, repoRoot);
@@ -7167,10 +7224,11 @@ function gitOpenPr(options) {
     "",
     "## Task",
     `- beads: ${taskId || "n/a"}`,
+    ...defaultPrRunLines(taskId, repoNameWithOwner),
     "",
     "## Review",
     "- Completion verification will run validation, verifier review, and PR policy checks.",
-    "- When repository policy allows it, Rig enables GitHub auto-merge after approval."
+    "- When repository policy allows it, Rig attempts an immediate strict-gated, head-locked merge after approval."
   ].join(`
 `);
   const preCheck = runCapture2(withGhRepo([gh, "pr", "list", "--state", "merged", "--head", branch, "--json", "url,mergedAt", "--jq", ".[0]"], repoNameWithOwner), repoRoot);
@@ -7258,6 +7316,30 @@ function gitOpenPr(options) {
   }
   return result;
 }
+function defaultPrRunLines(taskId, repoNameWithOwner) {
+  const lines = [];
+  const runId = process.env.RIG_SERVER_RUN_ID?.trim();
+  if (runId) {
+    lines.push(`- Run: ${runId}`);
+  }
+  const closeout = defaultPrCloseoutLine(taskId, repoNameWithOwner);
+  if (closeout) {
+    lines.push(`- ${closeout}`);
+  }
+  return lines;
+}
+function defaultPrCloseoutLine(taskId, repoNameWithOwner) {
+  const sourceIssueId = loadRuntimeContextFromEnv()?.sourceTask?.sourceIssueId;
+  if (sourceIssueId) {
+    const match = sourceIssueId.match(/^([^#]+)#(\d+)$/);
+    if (match?.[1] && match[2]) {
+      const sourceRepo = match[1];
+      const issueNumber = match[2];
+      return sourceRepo.toLowerCase() === repoNameWithOwner.toLowerCase() ? `Closes #${issueNumber}` : `Closes ${sourceRepo}#${issueNumber}`;
+    }
+  }
+  return /^\d+$/.test(taskId) ? `Closes #${taskId}` : "";
+}
 function readPrViewState(gh, repoRoot, repoNameWithOwner, prUrl) {
   const view = runCapture2(withGhRepo([
     gh,
@@ -7310,12 +7392,12 @@ function assertPrHasNoGitConflicts(prState, repoLabel, baseRef) {
 }
 function writePrMetadata(projectRoot, taskId, result) {
   const dir = artifactDirForId(projectRoot, taskId);
-  mkdirSync10(dir, { recursive: true });
-  const path = resolve26(dir, "pr-state.json");
+  mkdirSync11(dir, { recursive: true });
+  const path = resolve27(dir, "pr-state.json");
   let prs = {};
-  if (existsSync22(path)) {
+  if (existsSync23(path)) {
     try {
-      const parsed = JSON.parse(readFileSync13(path, "utf-8"));
+      const parsed = JSON.parse(readFileSync14(path, "utf-8"));
       if (parsed && typeof parsed === "object" && parsed.prs && typeof parsed.prs === "object") {
         prs = parsed.prs;
       }
@@ -7331,12 +7413,12 @@ function writePrMetadata(projectRoot, taskId, result) {
     ...primary || {},
     updated_at: nowIso()
   };
-  writeFileSync10(path, `${JSON.stringify(artifact, null, 2)}
+  writeFileSync11(path, `${JSON.stringify(artifact, null, 2)}
 `, "utf-8");
 }
 function resolveArtifactSnapshot(projectRoot, taskId) {
-  const artifactDir = resolve26(resolveHarnessPaths(projectRoot).artifactsDir, taskId);
-  return resolve26(artifactDir, "git-state.txt");
+  const artifactDir = resolve27(resolveHarnessPaths(projectRoot).artifactsDir, taskId);
+  return resolve27(artifactDir, "git-state.txt");
 }
 function ensureFullGitHistory(projectRoot, repoRoot, remoteName = "origin") {
   const shallow = runCapture2(gitCmd(projectRoot, repoRoot, "rev-parse", "--is-shallow-repository"), projectRoot);
@@ -7383,32 +7465,19 @@ function resolveGithubCliBinary(projectRoot) {
   if (explicit) {
     candidates.add(explicit);
   }
+  for (const candidate of ["/usr/bin/gh", "/opt/homebrew/bin/gh", "/usr/local/bin/gh"]) {
+    candidates.add(candidate);
+  }
   const explicitPathEntries = (process.env.PATH || "").split(":").map((entry) => entry.trim()).filter(Boolean);
   for (const entry of explicitPathEntries) {
-    candidates.add(resolve26(entry, "gh"));
-  }
-  const hostProjectRoot = process.env.RIG_HOST_PROJECT_ROOT?.trim();
-  if (hostProjectRoot) {
-    candidates.add(resolve26(resolveHostRigBinDir(hostProjectRoot), "gh"));
-  }
-  candidates.add(resolve26(resolveHostRigBinDir(projectRoot), "gh"));
-  const runtimeContext = loadRuntimeContextFromEnv();
-  if (runtimeContext?.binDir) {
-    candidates.add(resolve26(runtimeContext.binDir, "gh"));
-  }
-  const runtimeHome = process.env.RIG_RUNTIME_HOME?.trim();
-  if (runtimeHome) {
-    candidates.add(resolve26(runtimeHome, "bin", "gh"));
-  }
-  for (const candidate of ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"]) {
-    candidates.add(candidate);
+    candidates.add(resolve27(entry, "gh"));
   }
   const bunResolved = Bun.which("gh");
   if (bunResolved) {
     candidates.add(bunResolved);
   }
   for (const candidate of candidates) {
-    if (candidate && existsSync22(candidate)) {
+    if (candidate && existsSync23(candidate) && !isRuntimeGatewayGhPath(candidate)) {
       return candidate;
     }
   }
@@ -7438,7 +7507,7 @@ function resolveRepoNameWithOwner(projectRoot, repoRoot) {
   return resolveGithubRepoNameWithOwnerFromGitRoot(projectRoot, repoRoot, repoRoot, visited);
 }
 function resolveGithubRepoNameWithOwnerFromGitRoot(projectRoot, gitRoot, cwd, visited) {
-  const normalizedGitRoot = resolve26(gitRoot);
+  const normalizedGitRoot = resolve27(gitRoot);
   if (visited.has(normalizedGitRoot)) {
     return "";
   }
@@ -7510,7 +7579,7 @@ function resolveNetworkRemoteName(projectRoot, repoRoot, repoNameWithOwner) {
   return remotes.includes("origin") ? "origin" : remotes[0];
 }
 function gitQuery(projectRoot, gitRoot, cwd, ...args) {
-  const gitArgs = existsSync22(resolve26(gitRoot, ".git")) ? gitCmd(projectRoot, gitRoot, ...args) : [resolveGitBinary(projectRoot), "--git-dir", gitRoot, ...args];
+  const gitArgs = existsSync23(resolve27(gitRoot, ".git")) ? gitCmd(projectRoot, gitRoot, ...args) : [resolveGitBinary(projectRoot), "--git-dir", gitRoot, ...args];
   return runCapture2(gitArgs, cwd, projectRoot);
 }
 function resolveLocalGitRemoteRoot(remoteUrl, gitRoot) {
@@ -7528,9 +7597,9 @@ function resolveLocalGitRemoteRoot(remoteUrl, gitRoot) {
   } else if (/^[a-z][a-z0-9+.-]*:\/\//i.test(normalized) || /^[^@]+@[^:]+:.+$/.test(normalized)) {
     return "";
   } else if (!isAbsolute2(normalized)) {
-    candidate = resolve26(gitRoot, normalized);
+    candidate = resolve27(gitRoot, normalized);
   }
-  return existsSync22(candidate) ? candidate : "";
+  return existsSync23(candidate) ? candidate : "";
 }
 function normalizeGithubRepoNameWithOwner(value) {
   const normalized = value.trim();
@@ -7561,7 +7630,7 @@ function inferRepositoryDefaultBase(projectRoot, repoRoot, repoNameWithOwner, re
   const remote = remoteName || "origin";
   const symbolic = runCapture2(gitCmd(projectRoot, repoRoot, "symbolic-ref", "--short", `refs/remotes/${remote}/HEAD`), projectRoot);
   if (symbolic.exitCode === 0) {
-    const ref = symbolic.stdout.trim().replace(new RegExp(`^${escapeRegExp(remote)}/`), "");
+    const ref = symbolic.stdout.trim().replace(new RegExp(`^${escapeRegExp2(remote)}/`), "");
     if (ref && ref !== "HEAD") {
       return ref;
     }
@@ -7657,7 +7726,7 @@ function inferReviewerFromChangedFiles(projectRoot, repoRoot, baseRef, branchRef
   return best;
 }
 function snapshotRepo(projectRoot, label, repo) {
-  if (!existsSync22(resolve26(repo, ".git"))) {
+  if (!existsSync23(resolve27(repo, ".git"))) {
     return [`## ${label}`, `repo: ${repo}`, "status: unavailable", ""];
   }
   const status = runCapture2(gitCmd(projectRoot, repo, "status", "--short"), projectRoot).stdout.trim();
@@ -7680,7 +7749,7 @@ function snapshotRepo(projectRoot, label, repo) {
   ];
 }
 function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files, changedFilesManifest) {
-  if (!existsSync22(resolve26(repo, ".git"))) {
+  if (!existsSync23(resolve27(repo, ".git"))) {
     console.log(`Skipping ${label}: repo not available (${repo})`);
     return;
   }
@@ -7712,18 +7781,18 @@ function commitRepo(projectRoot, repo, label, message, allowEmpty, scoped, files
   console.log(`Committed ${label}: ${message}`);
 }
 function readChangedFilesManifest(projectRoot, taskId) {
-  const manifestPath = resolve26(artifactDirForId(projectRoot, taskId), "changed-files.txt");
-  if (!existsSync22(manifestPath)) {
+  const manifestPath = resolve27(artifactDirForId(projectRoot, taskId), "changed-files.txt");
+  if (!existsSync23(manifestPath)) {
     return [];
   }
-  const files = readFileSync13(manifestPath, "utf-8").split(/\r?\n/).map((line) => normalizeChangedFilePath2(line)).filter(Boolean);
+  const files = readFileSync14(manifestPath, "utf-8").split(/\r?\n/).map((line) => normalizeChangedFilePath2(line)).filter(Boolean);
   return [...new Set(files)];
 }
 function refreshChangedFilesManifest(projectRoot, taskId) {
-  const manifestPath = resolve26(artifactDirForId(projectRoot, taskId), "changed-files.txt");
-  mkdirSync10(dirname14(manifestPath), { recursive: true });
+  const manifestPath = resolve27(artifactDirForId(projectRoot, taskId), "changed-files.txt");
+  mkdirSync11(dirname14(manifestPath), { recursive: true });
   const changedFiles = changedFilesForTask(projectRoot, taskId, true);
-  writeFileSync10(manifestPath, `${changedFiles.join(`
+  writeFileSync11(manifestPath, `${changedFiles.join(`
 `)}
 `, "utf-8");
   return manifestPath;
@@ -7836,7 +7905,7 @@ function repoHasPathChange(projectRoot, repoRoot, relativePath) {
   return result.exitCode === 0 && result.stdout.trim().length > 0;
 }
 function stageExcludePathspecs(repoRoot) {
-  const patterns = existsSync22(resolve26(repoRoot, ".rig", "task-config.json")) ? [...TASK_RUNTIME_STAGE_EXCLUDES, ...GENERATED_STAGE_EXCLUDES] : [".rig/**", ...GENERATED_STAGE_EXCLUDES];
+  const patterns = existsSync23(resolve27(repoRoot, ".rig", "task-config.json")) ? [...TASK_RUNTIME_STAGE_EXCLUDES, ...GENERATED_STAGE_EXCLUDES] : [".rig/**", ...GENERATED_STAGE_EXCLUDES];
   return patterns.map((pattern) => `:(glob,exclude)${pattern}`);
 }
 function pathResolvesBeyondSymlink(repoRoot, relativePath) {
@@ -7846,7 +7915,7 @@ function pathResolvesBeyondSymlink(repoRoot, relativePath) {
   }
   let current = repoRoot;
   for (let index = 0;index < parts.length - 1; index += 1) {
-    current = resolve26(current, parts[index]);
+    current = resolve27(current, parts[index]);
     try {
       if (lstatSync(current).isSymbolicLink()) {
         return true;
@@ -7858,7 +7927,7 @@ function pathResolvesBeyondSymlink(repoRoot, relativePath) {
   return false;
 }
 function printRepoStatus(projectRoot, label, repo, expectedBranch) {
-  if (!existsSync22(resolve26(repo, ".git"))) {
+  if (!existsSync23(resolve27(repo, ".git"))) {
     console.log(`${label}: unavailable (${repo})`);
     return;
   }
@@ -7894,7 +7963,7 @@ function resolveTaskBranchId(projectRoot, taskId) {
     }
   } catch {}
   const artifactDir = artifactDirForId(projectRoot, taskId);
-  if (existsSync22(artifactDir)) {
+  if (existsSync23(artifactDir)) {
     return taskId;
   }
   throw new Error(`Unknown task id: ${taskId}`);
@@ -7930,11 +7999,11 @@ function runCapture2(command, cwd, projectRoot = cwd) {
 }
 function runtimeGitEnv(projectRoot) {
   const { ctx, runtimeRoot } = resolveRuntimeMetadata(projectRoot);
-  const runtimeHome = runtimeRoot ? resolve26(runtimeRoot, "home") : "";
-  const runtimeTmp = runtimeRoot ? resolve26(runtimeRoot, "tmp") : "";
-  const runtimeCache = runtimeRoot ? resolve26(runtimeRoot, "cache") : "";
-  const runtimeKnownHosts = runtimeHome ? resolve26(runtimeHome, ".ssh", "known_hosts") : "";
-  const runtimeKey = runtimeHome ? resolve26(runtimeHome, ".ssh", "rig-agent-key") : "";
+  const runtimeHome = runtimeRoot ? resolve27(runtimeRoot, "home") : "";
+  const runtimeTmp = runtimeRoot ? resolve27(runtimeRoot, "tmp") : "";
+  const runtimeCache = runtimeRoot ? resolve27(runtimeRoot, "cache") : "";
+  const runtimeKnownHosts = runtimeHome ? resolve27(runtimeHome, ".ssh", "known_hosts") : "";
+  const runtimeKey = runtimeHome ? resolve27(runtimeHome, ".ssh", "rig-agent-key") : "";
   const env = {};
   if (ctx?.workspaceDir) {
     env.PROJECT_RIG_ROOT = projectRoot;
@@ -7947,14 +8016,14 @@ function runtimeGitEnv(projectRoot) {
   if (runtimeRoot) {
     env.RIG_RUNTIME_HOME = runtimeRoot;
   }
-  if (runtimeHome && existsSync22(runtimeHome)) {
+  if (runtimeHome && existsSync23(runtimeHome)) {
     env.HOME = runtimeHome;
     env.OPENSSL_CONF = ensureRuntimeOpenSslConfig(runtimeHome);
   }
-  if (runtimeTmp && existsSync22(runtimeTmp)) {
+  if (runtimeTmp && existsSync23(runtimeTmp)) {
     env.TMPDIR = runtimeTmp;
   }
-  if (runtimeCache && existsSync22(runtimeCache)) {
+  if (runtimeCache && existsSync23(runtimeCache)) {
     env.XDG_CACHE_HOME = runtimeCache;
   }
   const workspaceSecrets = loadDotEnvSecrets(ctx?.workspaceDir || projectRoot, process.env);
@@ -7998,14 +8067,14 @@ function runtimeGitEnv(projectRoot) {
     env.GH_TOKEN = env.GH_TOKEN || gitHubToken;
     applyGitHubCredentialHelperEnv(env);
   }
-  if (runtimeKnownHosts && existsSync22(runtimeKnownHosts)) {
+  if (runtimeKnownHosts && existsSync23(runtimeKnownHosts)) {
     const sshParts = [
       "ssh",
       `-o UserKnownHostsFile="${runtimeKnownHosts}"`,
       "-o StrictHostKeyChecking=yes",
       "-F /dev/null"
     ];
-    if (runtimeKey && existsSync22(runtimeKey)) {
+    if (runtimeKey && existsSync23(runtimeKey)) {
       sshParts.splice(1, 0, `-i "${runtimeKey}"`, "-o IdentitiesOnly=yes");
     }
     env.GIT_SSH_COMMAND = sshParts.join(" ");
@@ -8026,12 +8095,12 @@ function loadPersistedRuntimeSecrets(runtimeRoot) {
   if (!runtimeRoot) {
     return {};
   }
-  const path = resolve26(runtimeRoot, "runtime-secrets.json");
-  if (!existsSync22(path)) {
+  const path = resolve27(runtimeRoot, "runtime-secrets.json");
+  if (!existsSync23(path)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync13(path, "utf-8"));
+    const parsed = JSON.parse(readFileSync14(path, "utf-8"));
     const entries = Object.entries(parsed).filter((entry) => typeof entry[1] === "string");
     return Object.fromEntries(entries);
   } catch {
@@ -8039,13 +8108,13 @@ function loadPersistedRuntimeSecrets(runtimeRoot) {
   }
 }
 function ensureRuntimeOpenSslConfig(runtimeHome) {
-  const sslDir = resolve26(runtimeHome, ".ssl");
-  const sslConfig = resolve26(sslDir, "openssl.cnf");
-  if (!existsSync22(sslDir)) {
-    mkdirSync10(sslDir, { recursive: true });
+  const sslDir = resolve27(runtimeHome, ".ssl");
+  const sslConfig = resolve27(sslDir, "openssl.cnf");
+  if (!existsSync23(sslDir)) {
+    mkdirSync11(sslDir, { recursive: true });
   }
-  if (!existsSync22(sslConfig)) {
-    writeFileSync10(sslConfig, `# Rig runtime OpenSSL config placeholder
+  if (!existsSync23(sslConfig)) {
+    writeFileSync11(sslConfig, `# Rig runtime OpenSSL config placeholder
 `);
   }
   return sslConfig;
@@ -8063,11 +8132,11 @@ function resolveRuntimeMetadata(projectRoot) {
   if (contextFile) {
     return {
       ctx,
-      runtimeRoot: dirname14(resolve26(contextFile))
+      runtimeRoot: dirname14(resolve27(contextFile))
     };
   }
   const inferredContextFile = findRuntimeContextFile2(projectRoot);
-  if (existsSync22(inferredContextFile)) {
+  if (existsSync23(inferredContextFile)) {
     try {
       ctx = loadRuntimeContext(inferredContextFile);
     } catch {}
@@ -8079,10 +8148,10 @@ function resolveRuntimeMetadata(projectRoot) {
   return { ctx, runtimeRoot: "" };
 }
 function findRuntimeContextFile2(startPath) {
-  let current = resolve26(startPath);
+  let current = resolve27(startPath);
   while (true) {
-    const candidate = resolve26(current, "runtime-context.json");
-    if (existsSync22(candidate)) {
+    const candidate = resolve27(current, "runtime-context.json");
+    if (existsSync23(candidate)) {
       return candidate;
     }
     const parent = dirname14(current);
@@ -8094,7 +8163,7 @@ function findRuntimeContextFile2(startPath) {
 }
 
 // packages/runtime/src/control-plane/native/profile-ops.ts
-import { existsSync as existsSync23, mkdirSync as mkdirSync11, writeFileSync as writeFileSync11 } from "fs";
+import { existsSync as existsSync24, mkdirSync as mkdirSync12, writeFileSync as writeFileSync12 } from "fs";
 var DEFAULTS = {
   model: parseEnvOrDefault(process.env.DEFAULT_AGENT_MODEL, ["claude", "gpt-codex", "pi"], "pi"),
   runtime: parseEnvOrDefault(process.env.DEFAULT_AGENT_RUNTIME, ["claude-code", "codex-app-server", "pi"], "pi"),
@@ -8109,7 +8178,7 @@ function parseEnvOrDefault(value, allowed, fallback) {
   return allowed.includes(value) ? value : fallback;
 }
 async function readProfileFile(path) {
-  if (!existsSync23(path)) {
+  if (!existsSync24(path)) {
     return null;
   }
   try {
@@ -8162,14 +8231,14 @@ async function setProfile(projectRoot, options) {
     plugin = model === "gpt-codex" ? "codex" : model === "pi" ? "pi" : "claude";
   }
   const paths = resolveHarnessPaths(projectRoot);
-  mkdirSync11(paths.stateDir, { recursive: true });
+  mkdirSync12(paths.stateDir, { recursive: true });
   const next = {
     model,
     runtime,
     agent_plugin: plugin,
     updated_at: new Date().toISOString()
   };
-  writeFileSync11(paths.agentProfilePath, `${JSON.stringify(next, null, 2)}
+  writeFileSync12(paths.agentProfilePath, `${JSON.stringify(next, null, 2)}
 `, "utf-8");
   await showProfile(projectRoot, false);
 }
@@ -8205,13 +8274,13 @@ async function setReviewProfile(projectRoot, mode, provider) {
     throw new Error(`Invalid provider: ${resolvedProvider}. Supported: greptile.`);
   }
   const paths = resolveHarnessPaths(projectRoot);
-  mkdirSync11(paths.stateDir, { recursive: true });
+  mkdirSync12(paths.stateDir, { recursive: true });
   const next = {
     mode,
     provider: resolvedProvider,
     updated_at: new Date().toISOString()
   };
-  writeFileSync11(paths.reviewProfilePath, `${JSON.stringify(next, null, 2)}
+  writeFileSync12(paths.reviewProfilePath, `${JSON.stringify(next, null, 2)}
 `, "utf-8");
   await showReviewProfile(projectRoot);
 }
@@ -8249,44 +8318,44 @@ async function loadReviewProfile(path) {
 }
 
 // packages/runtime/src/control-plane/native/repo-ops.ts
-import { existsSync as existsSync27, mkdirSync as mkdirSync15, readFileSync as readFileSync15, readdirSync as readdirSync5, rmSync as rmSync7, writeFileSync as writeFileSync13 } from "fs";
-import { basename as basename8, dirname as dirname16, resolve as resolve30 } from "path";
+import { existsSync as existsSync28, mkdirSync as mkdirSync16, readFileSync as readFileSync16, readdirSync as readdirSync6, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "fs";
+import { basename as basename8, dirname as dirname16, resolve as resolve31 } from "path";
 // packages/runtime/src/control-plane/repos/mirror/bootstrap.ts
-import { existsSync as existsSync25, mkdirSync as mkdirSync13, realpathSync as realpathSync2 } from "fs";
-import { resolve as resolve28 } from "path";
+import { existsSync as existsSync26, mkdirSync as mkdirSync14, realpathSync as realpathSync2 } from "fs";
+import { resolve as resolve29 } from "path";
 
 // packages/runtime/src/control-plane/authority-files.ts
-import { existsSync as existsSync24, mkdirSync as mkdirSync12, readFileSync as readFileSync14, writeFileSync as writeFileSync12, appendFileSync as appendFileSync2, copyFileSync as copyFileSync3, statSync as statSync6, readdirSync as readdirSync4, chmodSync as chmodSync3 } from "fs";
-import { dirname as dirname15, join as join5, relative, resolve as resolve27 } from "path";
+import { existsSync as existsSync25, mkdirSync as mkdirSync13, readFileSync as readFileSync15, writeFileSync as writeFileSync13, appendFileSync as appendFileSync2, copyFileSync as copyFileSync3, statSync as statSync6, readdirSync as readdirSync5, chmodSync as chmodSync3 } from "fs";
+import { dirname as dirname15, join as join5, relative, resolve as resolve28 } from "path";
 import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
 function resolveAuthorityProjectStateDir(projectRoot) {
   const explicit = process.env.RIG_STATE_DIR?.trim();
   if (explicit) {
-    return resolve27(explicit);
+    return resolve28(explicit);
   }
-  return resolve27(resolve27(projectRoot), ".rig", "state");
+  return resolve28(resolve28(projectRoot), ".rig", "state");
 }
 function readJsonAtPath(path, fallback) {
-  if (!existsSync24(path)) {
+  if (!existsSync25(path)) {
     return fallback;
   }
   try {
-    return JSON.parse(readFileSync14(path, "utf-8"));
+    return JSON.parse(readFileSync15(path, "utf-8"));
   } catch {
     return fallback;
   }
 }
 function writeJsonAtPath(path, value) {
-  mkdirSync12(dirname15(path), { recursive: true });
-  writeFileSync12(path, `${JSON.stringify(value, null, 2)}
+  mkdirSync13(dirname15(path), { recursive: true });
+  writeFileSync13(path, `${JSON.stringify(value, null, 2)}
 `, "utf8");
   return path;
 }
 function readAuthorityProjectStateJson(projectRoot, relativePath, fallback) {
-  return readJsonAtPath(resolve27(resolveAuthorityProjectStateDir(projectRoot), relativePath), fallback);
+  return readJsonAtPath(resolve28(resolveAuthorityProjectStateDir(projectRoot), relativePath), fallback);
 }
 function writeAuthorityProjectStateJson(projectRoot, relativePath, value) {
-  return writeJsonAtPath(resolve27(resolveAuthorityProjectStateDir(projectRoot), relativePath), value);
+  return writeJsonAtPath(resolve28(resolveAuthorityProjectStateDir(projectRoot), relativePath), value);
 }
 
 // packages/runtime/src/control-plane/repos/mirror/state.ts
@@ -8346,7 +8415,7 @@ function sameExistingPath(left, right) {
   try {
     return realpathSync2(left) === realpathSync2(right);
   } catch {
-    return resolve28(left) === resolve28(right);
+    return resolve29(left) === resolve29(right);
   }
 }
 function repoLooksUsable(repoRoot, projectRoot) {
@@ -8382,7 +8451,7 @@ function resolveMirrorRemoteUrl(layout) {
       }
     }
   }
-  if (existsSync25(resolve28(layout.checkoutRoot, ".git")) && checkoutLooksUsable(layout)) {
+  if (existsSync26(resolve29(layout.checkoutRoot, ".git")) && checkoutLooksUsable(layout)) {
     const checkoutOrigin = runGit(["git", "-C", layout.checkoutRoot, "remote", "get-url", "origin"], layout.projectRoot);
     if (checkoutOrigin.exitCode === 0) {
       const currentOrigin = checkoutOrigin.stdout.trim();
@@ -8395,9 +8464,9 @@ function resolveMirrorRemoteUrl(layout) {
 }
 function ensureManagedRepoMirror(projectRoot, repoId) {
   const layout = resolveManagedRepoLayout(projectRoot, repoId);
-  mkdirSync13(layout.metadataRoot, { recursive: true });
+  mkdirSync14(layout.metadataRoot, { recursive: true });
   const remoteUrl = resolveMirrorRemoteUrl(layout);
-  if (!existsSync25(resolve28(layout.mirrorRoot, "HEAD"))) {
+  if (!existsSync26(resolve29(layout.mirrorRoot, "HEAD"))) {
     ensureGitSuccess(runGit(["git", "init", "--bare", layout.mirrorRoot], layout.projectRoot), ["git", "init", "--bare", layout.mirrorRoot]);
   }
   const getOrigin = runGit(["git", "--git-dir", layout.mirrorRoot, "remote", "get-url", "origin"], layout.projectRoot);
@@ -8417,8 +8486,8 @@ function ensureManagedRepoMirror(projectRoot, repoId) {
   return layout;
 }
 // packages/runtime/src/control-plane/repos/mirror/refresh.ts
-import { existsSync as existsSync26, mkdirSync as mkdirSync14, realpathSync as realpathSync3, rmSync as rmSync6 } from "fs";
-import { resolve as resolve29 } from "path";
+import { existsSync as existsSync27, mkdirSync as mkdirSync15, realpathSync as realpathSync3, rmSync as rmSync7 } from "fs";
+import { resolve as resolve30 } from "path";
 function nowIso3() {
   return new Date().toISOString();
 }
@@ -8445,7 +8514,7 @@ function sameExistingPath2(left, right) {
   try {
     return realpathSync3(left) === realpathSync3(right);
   } catch {
-    return resolve29(left) === resolve29(right);
+    return resolve30(left) === resolve30(right);
   }
 }
 function ensureMirrorHead(layout) {
@@ -8491,12 +8560,12 @@ function checkoutLooksUsable2(layout) {
   return probe.exitCode === 0 && sameExistingPath2(probe.stdout.trim(), layout.checkoutRoot);
 }
 function ensureCheckoutFromMirror(layout) {
-  mkdirSync14(resolve29(layout.checkoutRoot, ".."), { recursive: true });
-  const gitPath = resolve29(layout.checkoutRoot, ".git");
-  if (existsSync26(layout.checkoutRoot) && (!existsSync26(gitPath) || !checkoutLooksUsable2(layout))) {
-    rmSync6(layout.checkoutRoot, { recursive: true, force: true });
+  mkdirSync15(resolve30(layout.checkoutRoot, ".."), { recursive: true });
+  const gitPath = resolve30(layout.checkoutRoot, ".git");
+  if (existsSync27(layout.checkoutRoot) && (!existsSync27(gitPath) || !checkoutLooksUsable2(layout))) {
+    rmSync7(layout.checkoutRoot, { recursive: true, force: true });
   }
-  if (!existsSync26(gitPath)) {
+  if (!existsSync27(gitPath)) {
     ensureGitSuccess2(runGit2(["git", "clone", layout.mirrorRoot, layout.checkoutRoot], layout.projectRoot), ["git", "clone", layout.mirrorRoot, layout.checkoutRoot]);
   }
   const getOrigin = runGit2(["git", "-C", layout.checkoutRoot, "remote", "get-url", "origin"], layout.projectRoot);
@@ -8597,7 +8666,7 @@ function repoDiscover(projectRoot, taskId) {
 }
 function repoBaseline(projectRoot, refresh = false) {
   const paths = resolveRepoDiscoveryPaths(projectRoot);
-  if (!refresh && existsSync27(paths.baseRepoPinsPath)) {
+  if (!refresh && existsSync28(paths.baseRepoPinsPath)) {
     const baseline = readJsonFile(paths.baseRepoPinsPath, { recorded_at: nowIso(), repos: {} });
     return baseline.repos || {};
   }
@@ -8621,8 +8690,8 @@ function ensureMonorepoReady(projectRoot) {
 }
 function persistBaselinePins(projectRoot, repos) {
   const paths = resolveRepoDiscoveryPaths(projectRoot);
-  mkdirSync15(resolve30(paths.baseRepoPinsPath, ".."), { recursive: true });
-  writeFileSync13(paths.baseRepoPinsPath, `${JSON.stringify({ recorded_at: nowIso(), repos }, null, 2)}
+  mkdirSync16(resolve31(paths.baseRepoPinsPath, ".."), { recursive: true });
+  writeFileSync14(paths.baseRepoPinsPath, `${JSON.stringify({ recorded_at: nowIso(), repos }, null, 2)}
 `, "utf-8");
   return repos;
 }
@@ -8701,28 +8770,28 @@ function readRepoDiscoveryTaskConfig(projectRoot) {
 function resolveRepoDiscoveryPaths(projectRoot) {
   const monorepoRoot = resolveMonorepoRepoLayout(projectRoot).checkoutRoot;
   const explicitHostProjectRoot = (process.env.RIG_HOST_PROJECT_ROOT || "").trim();
-  const normalizedProjectRoot = resolve30(projectRoot);
+  const normalizedProjectRoot = resolve31(projectRoot);
   const hostProjectRoot = explicitHostProjectRoot && shouldUseHostProjectStateRoot(normalizedProjectRoot) ? explicitHostProjectRoot : normalizedProjectRoot;
-  const stateDir = resolve30(hostProjectRoot, ".rig", "state");
+  const stateDir = resolve31(hostProjectRoot, ".rig", "state");
   return {
     monorepoRoot,
-    taskRepoCommitsPath: resolve30(stateDir, "task-repo-commits.json"),
-    baseRepoPinsPath: resolve30(stateDir, "base-repo-pins.json")
+    taskRepoCommitsPath: resolve31(stateDir, "task-repo-commits.json"),
+    baseRepoPinsPath: resolve31(stateDir, "base-repo-pins.json")
   };
 }
 function shouldUseHostProjectStateRoot(projectRoot) {
   const runtimeWorkspace = process.env.RIG_TASK_WORKSPACE?.trim();
-  if (runtimeWorkspace && resolve30(runtimeWorkspace) === projectRoot) {
+  if (runtimeWorkspace && resolve31(runtimeWorkspace) === projectRoot) {
     return true;
   }
   return basename8(dirname16(projectRoot)) === ".worktrees";
 }
 function readPinFromArtifact(projectRoot, depTask, repoKey) {
-  const snapshot = resolve30(artifactDirForId(projectRoot, depTask), "git-state.txt");
-  if (!existsSync27(snapshot)) {
+  const snapshot = resolve31(artifactDirForId(projectRoot, depTask), "git-state.txt");
+  if (!existsSync28(snapshot)) {
     return "";
   }
-  const content = readFileSync15(snapshot, "utf-8");
+  const content = readFileSync16(snapshot, "utf-8");
   const chunk = content.split(/\r?\n/);
   let inSection = false;
   for (const line of chunk) {
@@ -8744,12 +8813,12 @@ function repoPath(projectRoot, key) {
   if (managed) {
     return managed.checkoutRoot;
   }
-  return key.startsWith("/") ? key : resolve30(projectRoot, key);
+  return key.startsWith("/") ? key : resolve31(projectRoot, key);
 }
 function applyPins(projectRoot, pins) {
   for (const [key, commit] of Object.entries(pins)) {
     const path = repoPath(projectRoot, key);
-    if (!existsSync27(resolve30(path, ".git"))) {
+    if (!existsSync28(resolve31(path, ".git"))) {
       throw new Error(`Repo for pin not available: ${key} (${path})`);
     }
     let hasCommit = runGitCapture(["git", "-C", path, "cat-file", "-e", `${commit}^{commit}`], projectRoot).exitCode === 0;
@@ -8778,7 +8847,7 @@ function verifyPins(projectRoot, pins) {
   let ok = true;
   for (const [key, expected] of Object.entries(pins)) {
     const path = repoPath(projectRoot, key);
-    if (!existsSync27(resolve30(path, ".git"))) {
+    if (!existsSync28(resolve31(path, ".git"))) {
       console.error(`ERROR: repo missing during pin verification: ${key}`);
       ok = false;
       continue;
@@ -8803,23 +8872,23 @@ function resolveRuntimeGitEnv() {
       GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND
     };
   }
-  const runtimeRoot = process.env.RIG_RUNTIME_HOME?.trim() || (process.env.RIG_RUNTIME_CONTEXT_FILE?.trim() ? resolve30(process.env.RIG_RUNTIME_CONTEXT_FILE, "..") : inferRuntimeRootFromWorkspace(process.cwd()));
-  const runtimeHome = runtimeRoot ? resolve30(runtimeRoot, "home") : process.env.HOME?.trim() || "";
+  const runtimeRoot = process.env.RIG_RUNTIME_HOME?.trim() || (process.env.RIG_RUNTIME_CONTEXT_FILE?.trim() ? resolve31(process.env.RIG_RUNTIME_CONTEXT_FILE, "..") : inferRuntimeRootFromWorkspace(process.cwd()));
+  const runtimeHome = runtimeRoot ? resolve31(runtimeRoot, "home") : process.env.HOME?.trim() || "";
   if (!runtimeHome) {
     return;
   }
-  const knownHostsPath = resolve30(runtimeHome, ".ssh", "known_hosts");
-  if (!existsSync27(knownHostsPath)) {
+  const knownHostsPath = resolve31(runtimeHome, ".ssh", "known_hosts");
+  if (!existsSync28(knownHostsPath)) {
     return { HOME: runtimeHome };
   }
-  const agentSshKey = resolve30(runtimeHome, ".ssh", "rig-agent-key");
+  const agentSshKey = resolve31(runtimeHome, ".ssh", "rig-agent-key");
   const sshParts = [
     "ssh",
     `-o UserKnownHostsFile="${knownHostsPath}"`,
     "-o StrictHostKeyChecking=yes",
     "-F /dev/null"
   ];
-  if (existsSync27(agentSshKey)) {
+  if (existsSync28(agentSshKey)) {
     sshParts.splice(1, 0, `-i "${agentSshKey}"`, "-o IdentitiesOnly=yes");
   }
   return {
@@ -8829,24 +8898,24 @@ function resolveRuntimeGitEnv() {
 }
 function inferRuntimeRootFromWorkspace(cwd) {
   const contextPath = findRuntimeContextFile3(cwd);
-  if (!contextPath || !existsSync27(contextPath)) {
+  if (!contextPath || !existsSync28(contextPath)) {
     return "";
   }
   try {
     loadRuntimeContext(contextPath);
-    return resolve30(contextPath, "..");
+    return resolve31(contextPath, "..");
   } catch {
     return "";
   }
 }
 function findRuntimeContextFile3(startPath) {
-  let current = resolve30(startPath);
+  let current = resolve31(startPath);
   while (true) {
-    const candidate = resolve30(current, "runtime-context.json");
-    if (existsSync27(candidate)) {
+    const candidate = resolve31(current, "runtime-context.json");
+    if (existsSync28(candidate)) {
       return candidate;
     }
-    const parent = resolve30(current, "..");
+    const parent = resolve31(current, "..");
     if (parent === current) {
       return "";
     }
@@ -8900,7 +8969,7 @@ function getEventBus() {
 }
 function inferRuntimeContext() {
   for (const candidate of runtimeContextCandidates()) {
-    if (!candidate || !existsSync28(candidate)) {
+    if (!candidate || !existsSync29(candidate)) {
       continue;
     }
     try {
@@ -8913,15 +8982,15 @@ function inferRuntimeContext() {
 function runtimeContextCandidates() {
   const cwd = process.cwd();
   const candidates = [
-    resolve31(cwd, "..", "runtime-context.json"),
-    resolve31(cwd, ".rig", "runtime-context.json")
+    resolve32(cwd, "..", "runtime-context.json"),
+    resolve32(cwd, ".rig", "runtime-context.json")
   ];
   const argv1 = process.argv[1]?.trim();
   if (argv1) {
-    candidates.push(resolve31(argv1, "..", "..", "runtime-context.json"));
+    candidates.push(resolve32(argv1, "..", "..", "runtime-context.json"));
   }
   if (BAKED_BINARY_PATH) {
-    candidates.push(resolve31(BAKED_BINARY_PATH, "..", "..", "runtime-context.json"));
+    candidates.push(resolve32(BAKED_BINARY_PATH, "..", "..", "runtime-context.json"));
   }
   return Array.from(new Set(candidates));
 }
@@ -8936,12 +9005,12 @@ 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="
 ];
 function ensureRuntimeKnownHosts(runtimeHome) {
-  const sshDir = resolve31(runtimeHome, ".ssh");
-  const knownHostsPath = resolve31(sshDir, "known_hosts");
-  if (!existsSync28(sshDir)) {
-    mkdirSync16(sshDir, { recursive: true });
+  const sshDir = resolve32(runtimeHome, ".ssh");
+  const knownHostsPath = resolve32(sshDir, "known_hosts");
+  if (!existsSync29(sshDir)) {
+    mkdirSync17(sshDir, { recursive: true });
   }
-  const existing = existsSync28(knownHostsPath) ? readFileSync16(knownHostsPath, "utf-8") : "";
+  const existing = existsSync29(knownHostsPath) ? readFileSync17(knownHostsPath, "utf-8") : "";
   const existingLines = new Set(existing.split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
   const missing = GITHUB_KNOWN_HOSTS.filter((line) => !existingLines.has(line));
   if (missing.length === 0) {
@@ -8951,11 +9020,11 @@ function ensureRuntimeKnownHosts(runtimeHome) {
     for (const line of missing) {
       existingLines.add(line);
     }
-    writeFileSync14(knownHostsPath, `${Array.from(existingLines).join(`
+    writeFileSync15(knownHostsPath, `${Array.from(existingLines).join(`
 `)}
 `, { mode: 420 });
   } catch (err) {
-    const hint = existsSync28(knownHostsPath) ? "" : " \u2014 known_hosts is missing; git SSH operations may fail";
+    const hint = existsSync29(knownHostsPath) ? "" : " \u2014 known_hosts is missing; git SSH operations may fail";
     console.warn(`[rig-agent] Could not update ${knownHostsPath}: ${err instanceof Error ? err.message : String(err)}${hint}`);
   }
   return knownHostsPath;
@@ -8969,13 +9038,13 @@ function hydrateRuntimeProcessEnv(ctx) {
     return;
   }
   process.env.RIG_RUNTIME_CONTEXT_FILE = contextFile;
-  const runtimeRoot = dirname17(resolve31(contextFile));
-  const runtimeHome = resolve31(runtimeRoot, "home");
-  const runtimeTmp = resolve31(runtimeRoot, "tmp");
-  const runtimeCache = resolve31(runtimeRoot, "cache");
-  const runtimeBin = resolve31(runtimeRoot, "bin");
-  const runtimeWorkspaceBin = resolve31(ctx.workspaceDir, ".rig", "bin");
-  const runtimeTools = resolve31(ctx.workspaceDir, "rig", "tools");
+  const runtimeRoot = dirname17(resolve32(contextFile));
+  const runtimeHome = resolve32(runtimeRoot, "home");
+  const runtimeTmp = resolve32(runtimeRoot, "tmp");
+  const runtimeCache = resolve32(runtimeRoot, "cache");
+  const runtimeBin = resolve32(runtimeRoot, "bin");
+  const runtimeWorkspaceBin = resolve32(ctx.workspaceDir, ".rig", "bin");
+  const runtimeTools = resolve32(ctx.workspaceDir, "rig", "tools");
   if (ctx.hostProjectRoot) {
     process.env.PROJECT_RIG_ROOT = ctx.hostProjectRoot;
   }
@@ -8991,13 +9060,13 @@ function hydrateRuntimeProcessEnv(ctx) {
   for (const [key, value] of Object.entries(browserEnvFromContext(ctx.browser))) {
     process.env[key] = value;
   }
-  if (existsSync28(runtimeHome)) {
+  if (existsSync29(runtimeHome)) {
     process.env.HOME = runtimeHome;
   }
-  if (existsSync28(runtimeTmp)) {
+  if (existsSync29(runtimeTmp)) {
     process.env.TMPDIR = runtimeTmp;
   }
-  if (existsSync28(runtimeCache)) {
+  if (existsSync29(runtimeCache)) {
     process.env.XDG_CACHE_HOME = runtimeCache;
   }
   const workspaceSecrets = loadDotEnvSecrets(ctx.workspaceDir, process.env);
@@ -9023,31 +9092,31 @@ function hydrateRuntimeProcessEnv(ctx) {
   const currentPath = process.env.PATH || "";
   const pathEntries = currentPath.split(":").filter(Boolean);
   for (const entry of [runtimeBin, runtimeWorkspaceBin, runtimeTools, "/usr/bin", "/bin", "/usr/sbin", "/sbin"]) {
-    if (existsSync28(entry) && !pathEntries.includes(entry)) {
+    if (existsSync29(entry) && !pathEntries.includes(entry)) {
       pathEntries.unshift(entry);
     }
   }
   process.env.PATH = pathEntries.join(":");
   if (!process.env.RIG_GIT_BIN) {
-    const runtimeGit = resolve31(runtimeBin, "git");
-    process.env.RIG_GIT_BIN = existsSync28(runtimeGit) ? runtimeGit : Bun.which("git") || "/usr/bin/git";
+    const runtimeGit = resolve32(runtimeBin, "git");
+    process.env.RIG_GIT_BIN = existsSync29(runtimeGit) ? runtimeGit : Bun.which("git") || "/usr/bin/git";
   }
   const knownHosts = ensureRuntimeKnownHosts(runtimeHome);
-  const agentKey = resolve31(runtimeHome, ".ssh", "rig-agent-key");
+  const agentKey = resolve32(runtimeHome, ".ssh", "rig-agent-key");
   const sshParts = [
     "ssh",
     `-o UserKnownHostsFile="${knownHosts}"`,
     "-o StrictHostKeyChecking=yes",
     "-F /dev/null"
   ];
-  if (existsSync28(agentKey)) {
+  if (existsSync29(agentKey)) {
     sshParts.splice(1, 0, `-i "${agentKey}"`, "-o IdentitiesOnly=yes");
   }
   process.env.GIT_SSH_COMMAND = sshParts.join(" ");
 }
 function inferRuntimeContextFileFromWorkspace(workspaceDir) {
-  const candidate = resolve31(workspaceDir, "..", "runtime-context.json");
-  return existsSync28(candidate) ? candidate : "";
+  const candidate = resolve32(workspaceDir, "..", "runtime-context.json");
+  return existsSync29(candidate) ? candidate : "";
 }
 async function main() {
   const args = process.argv.slice(2);
@@ -9172,7 +9241,7 @@ async function runAgentCommand(args) {
         const fileIdx = rest.indexOf("--file");
         const inputFile = fileIdx !== -1 ? rest[fileIdx + 1] : undefined;
         if (inputFile) {
-          content = readFileSync16(resolve31(projectRoot, inputFile), "utf-8");
+          content = readFileSync17(resolve32(projectRoot, inputFile), "utf-8");
         } else {
           const chunks = [];
           for await (const chunk of process.stdin) {
@@ -9475,8 +9544,8 @@ WORKFLOW:
 `);
 }
 async function runCompletionVerification(projectRoot) {
-  const hookPath = resolve31(projectRoot, ".rig/bin/hooks/completion-verification");
-  if (!existsSync28(hookPath)) {
+  const hookPath = resolve32(projectRoot, ".rig/bin/hooks/completion-verification");
+  if (!existsSync29(hookPath)) {
     console.error(`[rig-agent] completion-verification hook binary not found: ${hookPath}`);
     return 1;
   }
@@ -9510,7 +9579,7 @@ async function verifyRuntimeManifest() {
   if (!manifestPath) {
     return;
   }
-  if (!existsSync28(manifestPath)) {
+  if (!existsSync29(manifestPath)) {
     throw new Error(`[rig-agent] Runtime manifest missing: ${manifestPath}`);
   }
   let manifest;
@@ -9527,10 +9596,10 @@ async function verifyRuntimeManifest() {
   if (!manifestBinaryPath || !expectedHash) {
     throw new Error(`[rig-agent] Runtime manifest is missing binary hash data (${manifestPath}).`);
   }
-  if (!existsSync28(manifestBinaryPath)) {
+  if (!existsSync29(manifestBinaryPath)) {
     throw new Error(`[rig-agent] Runtime binary not found at ${manifestBinaryPath}.`);
   }
-  const actualHash = sha256Hex(readFileSync16(resolve31(manifestBinaryPath)));
+  const actualHash = sha256Hex(readFileSync17(resolve32(manifestBinaryPath)));
   if (actualHash !== expectedHash) {
     throw new Error(`[rig-agent] Runtime manifest mismatch for binary hash.
 ` + `expected=${expectedHash}