@gethmy/harness 1.6.0 → 1.7.0

package/dist/index.js

@@ -100,14 +100,13 @@ var init_log = __esm(() => {
   };
 });
 // ../harmony-shared/dist/agentStaleness.js
-var AGENT_HEARTBEAT_LIVENESS_MS, AGENT_MILESTONE_LIVENESS_MS, AGENT_SWEEP_DAEMON_MS, AGENT_SWEEP_INTERACTIVE_MS, AGENT_SWEEP_PAUSED_MS, SWEPT_SESSION_WRITE_GRACE_MS, ACTIVE_STATUSES;
+var AGENT_HEARTBEAT_LIVENESS_MS, AGENT_MILESTONE_LIVENESS_MS, AGENT_SWEEP_DAEMON_MS, AGENT_SWEEP_INTERACTIVE_MS, AGENT_SWEEP_PAUSED_MS, ACTIVE_STATUSES;
 var init_agentStaleness = __esm(() => {
   AGENT_HEARTBEAT_LIVENESS_MS = 5 * 60 * 1000;
   AGENT_MILESTONE_LIVENESS_MS = 30 * 60 * 1000;
   AGENT_SWEEP_DAEMON_MS = 30 * 60 * 1000;
   AGENT_SWEEP_INTERACTIVE_MS = 2 * 60 * 60 * 1000;
   AGENT_SWEEP_PAUSED_MS = 4 * 60 * 60 * 1000;
-  SWEPT_SESSION_WRITE_GRACE_MS = 60 * 60 * 1000;
   ACTIVE_STATUSES = new Set(["working", "blocked", "waiting"]);
 });
 // ../harmony-shared/dist/branchRef.js
@@ -862,6 +861,11 @@ function containedEnv(parentEnv = process.env) {
   }
   return out;
 }
+function heldTestEnvKeysToStrip(parentEnv = process.env) {
+  return [
+    ...new Set([...secretEnvKeysToStrip(parentEnv), ...MODEL_CREDENTIAL_KEYS])
+  ];
+}
 function gitMetadataDenyPaths(worktree) {
   const paths = new Set;
   const dotGit = join(worktree, ".git");
@@ -964,14 +968,20 @@ function implementRunToolPolicy(args) {
     return allow;
   };
 }
-function harmonyMcpServer() {
+function harmonyMcpServer(run) {
   const require2 = createRequire2(import.meta.url);
   const cli = join(dirname2(require2.resolve("@gethmy/mcp")), "cli.js");
   return {
     harmony: {
       type: "stdio",
       command: process.execPath,
-      args: [cli, "serve"]
+      args: [cli, "serve"],
+      ...run ? {
+        env: {
+          HARMONY_AGENT_CARD_ID: run.cardId,
+          HARMONY_AGENT_SESSION_ID: run.agentSessionId
+        }
+      } : {}
     }
   };
 }
@@ -1004,7 +1014,7 @@ function implementRunContainment(args) {
     canUseTool: implementRunToolPolicy(args),
     gateEveryToolCall: true,
     settingSources: args.readOnly === true ? [] : ["project"],
-    mcpServers: harmonyMcpServer(),
+    mcpServers: harmonyMcpServer(args.run),
     strictMcpConfig: true,
     stripEnvKeys: secretEnvKeysToStrip(),
     disallowedTools: [
@@ -1028,7 +1038,7 @@ function implementRunContainmentCliArgs(args) {
     containment.disallowedTools.join(",")
   ];
 }
-var SECRET_ENV_PATTERN, KEEP_ENV_KEYS, ProjectSandboxOverrideError, INERT_PROJECT_SETTING_KEYS, WRITE_TOOL_PATHS, READ_TOOL_PATHS, GIT_NO_HOOKS, IMPLEMENT_ALLOWED_DOMAINS;
+var SECRET_ENV_PATTERN, KEEP_ENV_KEYS, ProjectSandboxOverrideError, INERT_PROJECT_SETTING_KEYS, MODEL_CREDENTIAL_KEYS, WRITE_TOOL_PATHS, READ_TOOL_PATHS, GIT_NO_HOOKS, IMPLEMENT_ALLOWED_DOMAINS;
 var init_run_containment = __esm(() => {
   init_confine_to_repo();
   init_runner();
@@ -1065,6 +1075,11 @@ var init_run_containment = __esm(() => {
     "theme",
     "verbose"
   ]);
+  MODEL_CREDENTIAL_KEYS = [
+    "ANTHROPIC_API_KEY",
+    "ANTHROPIC_AUTH_TOKEN",
+    "CLAUDE_CODE_OAUTH_TOKEN"
+  ];
   WRITE_TOOL_PATHS = {
     Write: ["file_path"],
     Edit: ["file_path"],
@@ -2989,7 +3004,8 @@ import { createHash as createHash2 } from "node:crypto";
 init_log();
 
 // src/oracle.ts
-import { lstatSync, readFileSync as readFileSync2, statSync } from "node:fs";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { lstatSync, readFileSync as readFileSync2, realpathSync as realpathSync2, statSync } from "node:fs";
 import {
   chmod,
   lstat,
@@ -3003,7 +3019,140 @@ import { tmpdir as tmpdir2 } from "node:os";
 import { dirname as dirname3, isAbsolute as isAbsolute3, join as join2, resolve as resolve2, sep as sep2 } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 init_log();
-var TAG5 = "oracle";
+
+// src/repair-sandbox.ts
+init_log();
+import { randomUUID } from "node:crypto";
+import { promisify as promisify2 } from "node:util";
+var TAG5 = "repair-sandbox";
+async function dockerExec(argv, opts) {
+  const { execFile: execFile2 } = await import("node:child_process");
+  return promisify2(execFile2)("docker", argv, {
+    encoding: "utf-8",
+    ...opts
+  });
+}
+var MAX_OUTPUT_BUFFER2 = 20971520;
+var PROBE_TIMEOUT_MS = 1e4;
+var SANDBOX_MOUNT = "/repo";
+var SANDBOX_MEMORY = "4g";
+var SANDBOX_PIDS = "512";
+var dockerProbe = null;
+async function sandboxAvailable() {
+  if (dockerProbe === true)
+    return true;
+  try {
+    await dockerExec(["version", "--format", "{{.Server.Version}}"], {
+      timeout: PROBE_TIMEOUT_MS
+    });
+    dockerProbe = true;
+  } catch {
+    dockerProbe = false;
+  }
+  return dockerProbe;
+}
+function __resetSandboxProbe() {
+  dockerProbe = null;
+}
+async function removeSandboxContainer(name) {
+  try {
+    await dockerExec(["rm", "--force", name], { timeout: PROBE_TIMEOUT_MS });
+    log.info(TAG5, `removed sandbox container ${name}`);
+  } catch {}
+}
+function sandboxRunArgs(image, worktree, command, name, mounts = []) {
+  return [
+    "run",
+    "--rm",
+    ...name ? ["--name", name] : [],
+    "--network=none",
+    ...sandboxHardeningArgs(worktree, mounts),
+    "--entrypoint",
+    command.cmd,
+    image,
+    ...command.args
+  ];
+}
+function sandboxHardeningArgs(worktree, mounts = []) {
+  return [
+    "--cap-drop=ALL",
+    "--security-opt=no-new-privileges",
+    `--memory=${SANDBOX_MEMORY}`,
+    `--pids-limit=${SANDBOX_PIDS}`,
+    ...typeof process.getuid === "function" && typeof process.getgid === "function" ? ["--user", `${process.getuid()}:${process.getgid()}`] : [],
+    "--env",
+    "HOME=/tmp",
+    "--volume",
+    `${worktree}:${SANDBOX_MOUNT}`,
+    ...mounts.flatMap((m) => ["--volume", `${m.host}:${m.container}`]),
+    "--workdir",
+    SANDBOX_MOUNT
+  ];
+}
+var SANDBOX_DEV_SERVER_BIND = "0.0.0.0";
+function devServerContainerName(port) {
+  return `harmony-devserver-${port}`;
+}
+function devServerSandboxArgs(args) {
+  return [
+    "run",
+    "--rm",
+    "--quiet",
+    "--name",
+    args.name,
+    "--publish",
+    `127.0.0.1:${args.port}:${args.port}`,
+    ...sandboxHardeningArgs(args.worktree),
+    "--entrypoint",
+    args.command.cmd,
+    args.image,
+    ...args.command.args
+  ];
+}
+async function runInSandbox(args) {
+  const name = `harmony-repair-${randomUUID()}`;
+  const argv = sandboxRunArgs(args.image, args.worktree, args.command, name);
+  log.info(TAG5, `sandbox: ${args.command.cmd} ${args.command.args.join(" ")} (image ${args.image})`);
+  try {
+    const { stdout } = await dockerExec(argv, {
+      timeout: args.timeoutMs,
+      maxBuffer: MAX_OUTPUT_BUFFER2
+    });
+    return { passed: true, output: stdout ?? "" };
+  } catch (err) {
+    const e = err;
+    const output = `${e.stdout ?? ""}${e.stderr ?? ""}`;
+    if (typeof e.code !== "number") {
+      const timedOut = e.killed === true || e.signal != null;
+      if (timedOut)
+        await removeSandboxContainer(name);
+      return {
+        passed: false,
+        output,
+        sandboxError: timedOut ? `the sandbox timed out after ${args.timeoutMs}ms` : `the sandbox did not run: ${e.message ?? "unknown error"}`
+      };
+    }
+    if (e.code === 125) {
+      return {
+        passed: false,
+        output,
+        sandboxError: `the sandbox could not start (image "${args.image}" missing or unusable)`
+      };
+    }
+    return { passed: false, output };
+  }
+}
+
+// src/oracle.ts
+init_run_containment();
+var TAG6 = "oracle";
+
+class OracleSandboxConfigError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OracleSandboxConfigError";
+  }
+}
 async function resolveContained(repoPath, relativePath) {
   if (isAbsolute3(relativePath)) {
     throw new Error(`refusing to place an oracle at an absolute path: ${relativePath}`);
@@ -3134,12 +3283,24 @@ function gradeOracleRed(summary, exitCode) {
 function argvPath(path) {
   return path.startsWith("./") ? path : `./${path}`;
 }
-async function runHeldOracle(repoPath, oracle, timeoutMs = DEFAULT_METRIC_TIMEOUT_MS) {
+async function runHeldOracle(repoPath, oracle, options = {}) {
+  const heldTestTimeoutMs = options.timeoutMs ?? DEFAULT_METRIC_TIMEOUT_MS;
+  const sandbox = options.sandbox?.image.trim() ? options.sandbox : undefined;
+  if (sandbox && !await sandboxAvailable()) {
+    throw new OracleSandboxConfigError(`the held test is configured to run in "${sandbox.image}" but no container runtime answered — ` + "start Docker or unset verification.sandboxImage to run it on the host");
+  }
   const spec = resolveOracleRunnerSpec(oracle);
   const reportDir = await mkdtemp(join2(tmpdir2(), reportDirPrefix()));
   const reportPath = join2(reportDir, spec.report.file);
   try {
-    return await spawnHeldOracle(spec, repoPath, oracle, reportPath, timeoutMs);
+    return await spawnHeldOracle({
+      spec,
+      repoPath,
+      oracle,
+      reportPath,
+      timeoutMs: sandbox ? heldTestTimeoutMs + SANDBOX_STARTUP_GRACE_MS : heldTestTimeoutMs,
+      sandbox
+    });
   } finally {
     await removeReportDir(reportDir);
   }
@@ -3160,23 +3321,57 @@ function assertUntampered(reportPath) {
     throw new Error(`the oracle report is not owner-writable (mode ${(file.mode & 511).toString(8)}), so the runner could not have written it last — refusing it`);
   }
 }
+function assertConsistentWithExit(summary, exitCode) {
+  if (!summary)
+    return;
+  if (summary.failed > 0 && exitCode === 0) {
+    throw new Error(`the oracle report claims ${summary.failed} of ${summary.total} test(s) failed, but the runner exited 0 — ` + "neither allow-listed runner produces that pair, so the report is not the runner's; refusing it");
+  }
+}
 async function removeReportDir(reportDir) {
   try {
     await chmod(reportDir, 448).catch(() => {});
     await rm(reportDir, { recursive: true, force: true });
   } catch (err) {
-    log.warn(TAG5, `Could not remove the oracle report directory ${reportDir} (${err instanceof Error ? err.message : String(err)}) — it may still hold the runner's report, which carries assertion text for vitest. Remove it by hand.`);
+    log.warn(TAG6, `Could not remove the oracle report directory ${reportDir} (${err instanceof Error ? err.message : String(err)}) — it may still hold the runner's report, which carries assertion text for vitest. Remove it by hand.`);
   }
 }
-async function spawnHeldOracle(spec, repoPath, oracle, reportPath, timeoutMs) {
-  const { command, args: baseArgs } = spec.argv(argvPath(oracle.path));
-  const args = [...baseArgs, ...spec.report.flags(reportPath)];
+var ORACLE_REPORT_MOUNT = "/harmony-oracle-report";
+var DOCKER_SELF_FAILURE_CODES = new Set([125, 126, 127]);
+function heldOracleSandboxArgv(args) {
+  const reportPathInContainer = join2(ORACLE_REPORT_MOUNT, args.reportFile);
+  return {
+    command: "docker",
+    args: sandboxRunArgs(args.image, args.worktree, {
+      cmd: args.runner.command,
+      args: [...args.runner.args, ...args.reportFlags(reportPathInContainer)]
+    }, args.containerName, [{ host: args.reportDir, container: ORACLE_REPORT_MOUNT }]),
+    reportPathInContainer
+  };
+}
+async function spawnHeldOracle(args_) {
+  const { spec, repoPath, oracle, reportPath, timeoutMs, sandbox } = args_;
+  const runner = spec.argv(argvPath(oracle.path));
+  const containerName = sandbox ? `harmony-oracle-${randomUUID2()}` : null;
+  const { command, args } = sandbox ? heldOracleSandboxArgv({
+    image: sandbox.image,
+    worktree: realpathSync2(repoPath),
+    reportDir: realpathSync2(dirname3(reportPath)),
+    reportFile: spec.report.file,
+    runner,
+    reportFlags: spec.report.flags,
+    containerName: containerName ?? undefined
+  }) : {
+    command: runner.command,
+    args: [...runner.args, ...spec.report.flags(reportPath)]
+  };
   return await new Promise((settleOk, settleErr) => {
     let child;
     try {
       child = spawnInGroup(command, args, {
         cwd: repoPath,
-        stdio: ["ignore", "pipe", "pipe"]
+        stdio: ["ignore", "pipe", "pipe"],
+        stripEnvKeys: heldTestEnvKeysToStrip()
       });
     } catch (err) {
       settleErr(err);
@@ -3208,18 +3403,20 @@ ${output}` : output;
       return verdict;
     };
     let report = null;
-    const captureReport = () => {
+    const captureReport = (exitCode) => {
       try {
         assertUntampered(reportPath);
-        report = spec.report.parse(readFileSync2(reportPath, "utf8"));
+        const parsed = spec.report.parse(readFileSync2(reportPath, "utf8"));
+        assertConsistentWithExit(parsed, exitCode);
+        report = parsed;
       } catch (err) {
         report = null;
         const message = err instanceof Error ? err.message : String(err);
         const absent = err instanceof Error && err.code === "ENOENT";
         if (absent) {
-          log.info(TAG5, `No oracle report at ${reportPath} — no verdict.`);
+          log.info(TAG6, `No oracle report at ${reportPath} — no verdict.`);
         } else {
-          log.warn(TAG5, `Refusing the oracle report at ${reportPath}: ${message} — the gate will report no verdict.`);
+          log.warn(TAG6, `Refusing the oracle report at ${reportPath}: ${message} — the gate will report no verdict.`);
         }
       }
     };
@@ -3265,6 +3462,10 @@ ${output}` : output;
         settle(new Error(`the held test was terminated by signal ${signal}`));
         return;
       }
+      if (sandbox && DOCKER_SELF_FAILURE_CODES.has(code)) {
+        settle(new OracleSandboxConfigError(`the held test's sandbox ("${sandbox.image}") exited ${code} without running the runner — ` + "the image is missing, unusable, or does not carry the runner; the motor's local log has docker's own message"));
+        return;
+      }
       settle(null, {
         exitCode: code,
         output: finalOutput(),
@@ -3275,7 +3476,7 @@ ${output}` : output;
     child.once("exit", (code, signal) => {
       if (killing)
         return;
-      captureReport();
+      captureReport(code);
       if (timer)
         clearTimeout(timer);
       reapGroup(pgid);
@@ -3289,7 +3490,9 @@ ${output}` : output;
       terminateGroup(child, {
         sigintTimeoutMs: ORACLE_SIGINT_GRACE_MS,
         sigtermTimeoutMs: ORACLE_SIGTERM_GRACE_MS
-      }).catch(() => {}).then(() => {
+      }).catch(() => {}).then(async () => {
+        if (containerName)
+          await removeSandboxContainer(containerName);
         settle(new Error(`the held test did not finish within ${timeoutMs}ms`));
       });
     }, timeoutMs);
@@ -3297,7 +3500,7 @@ ${output}` : output;
 }
 
 // src/oracle-collector.ts
-var TAG6 = "oracle-collector";
+var TAG7 = "oracle-collector";
 
 class HeldOracleCollector {
   deps;
@@ -3308,7 +3511,7 @@ class HeldOracleCollector {
     const stageId = this.oracleStageId(context);
     if (!stageId) {
       const reason = `No stage downstream of ${context.stageId} declares an \`oracle_passed\` gate, ` + "so there is no held test for this gate to grade. A red gate needs a later stage that runs the same test green.";
-      log.warn(TAG6, `${reason} — blocked (config)`);
+      log.warn(TAG7, `${reason} — blocked (config)`);
       return {
         result: "blocked",
         structured: { reason, ...GATE_CONFIG_ERROR_MARK }
@@ -3316,7 +3519,7 @@ class HeldOracleCollector {
     }
     const oracle = await this.deps.fetchOracle(context.cardId, stageId, this.deps.sessionId);
     if (!oracle) {
-      log.info(TAG6, `No oracle held for stage ${stageId} — blocked`);
+      log.info(TAG7, `No oracle held for stage ${stageId} — blocked`);
       return {
         result: "blocked",
         structured: {
@@ -3333,13 +3536,13 @@ class HeldOracleCollector {
     };
     await this.deps.place(this.deps.repoPath, oracle);
     try {
-      const { exitCode, output, report } = await this.deps.run(this.deps.repoPath, oracle);
+      const { exitCode, output, report } = await this.deps.run(this.deps.repoPath, oracle, { sandbox: this.deps.sandbox });
       const logLine = `Oracle run for ${oracle.path} exited ${exitCode}:
 ${output}`;
       if (exitCode === 0) {
-        log.info(TAG6, logLine);
+        log.info(TAG7, logLine);
       } else {
-        log.warn(TAG6, logLine);
+        log.warn(TAG7, logLine);
       }
       return this.verdict({
         oracle,
@@ -3350,12 +3553,14 @@ ${output}`;
       });
     } catch (err) {
       const message = errText(err);
-      log.warn(TAG6, `Oracle run threw: ${message} — blocked`);
+      const configError2 = err instanceof OracleSandboxConfigError;
+      log.warn(TAG7, `Oracle run threw: ${message} — blocked${configError2 ? " (config)" : ""}`);
       return {
         result: "blocked",
         structured: {
           oracle: { path: oracle.path, ...identity },
-          error: message
+          error: message,
+          ...configError2 ? { reason: message, ...GATE_CONFIG_ERROR_MARK } : {}
         }
       };
     } finally {
@@ -3367,13 +3572,13 @@ ${output}`;
       await this.deps.remove(this.deps.repoPath, oracle);
       return;
     } catch (err) {
-      log.warn(TAG6, `Removing the held test at ${oracle.path} failed (${errText(err)}) — retrying once`);
+      log.warn(TAG7, `Removing the held test at ${oracle.path} failed (${errText(err)}) — retrying once`);
     }
     try {
       await this.deps.remove(this.deps.repoPath, oracle);
-      log.info(TAG6, `Held test at ${oracle.path} removed on the second attempt`);
+      log.info(TAG7, `Held test at ${oracle.path} removed on the second attempt`);
     } catch (err) {
-      log.error(TAG6, `HELD TEST NOT REMOVED: ${oracle.path} is still in ${this.deps.repoPath} after two attempts (${errText(err)}). ` + "It will be auto-committed by the completion path if it is left there — delete it by hand and check whether it reached a commit.");
+      log.error(TAG7, `HELD TEST NOT REMOVED: ${oracle.path} is still in ${this.deps.repoPath} after two attempts (${errText(err)}). ` + "It will be auto-committed by the completion path if it is left there — delete it by hand and check whether it reached a commit.");
     }
   }
 }
@@ -3416,7 +3621,7 @@ class OracleRedCollector extends HeldOracleCollector {
     const graded = gradeOracleRed(report, exitCode);
     const base = { exitCode, path: oracle.path, ...identity };
     if (graded.outcome === "no_verdict") {
-      log.warn(TAG6, `Red gate for ${oracle.path}: ${graded.reason} — blocked`);
+      log.warn(TAG7, `Red gate for ${oracle.path}: ${graded.reason} — blocked`);
       return {
         result: "blocked",
         structured: { oracle: base, reason: graded.reason }
@@ -3448,7 +3653,7 @@ init_log();
 init_run_containment();
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync } from "node:fs";
-var TAG7 = "pm";
+var TAG8 = "pm";
 var cached = null;
 function detectPackageManager() {
   if (cached)
@@ -3470,7 +3675,7 @@ function detectPackageManager() {
   } else {
     cached = "npm";
   }
-  log.info(TAG7, `Detected package manager: ${cached}`);
+  log.info(TAG8, `Detected package manager: ${cached}`);
   return cached;
 }
 function installCommand(ignoreScripts = false) {
@@ -3499,7 +3704,7 @@ function spawnRunArgs(script, ...extra) {
 init_log();
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync3 } from "node:fs";
-var TAG8 = "project-type";
+var TAG9 = "project-type";
 var _cache = new Map;
 function _resetCache() {
   _cache.clear();
@@ -3510,7 +3715,7 @@ function detect(dir) {
     return cached2;
   const result = detectUncached(dir);
   _cache.set(dir, result);
-  log.info(TAG8, `Detected project type in ${dir}: ${result.kind}`);
+  log.info(TAG9, `Detected project type in ${dir}: ${result.kind}`);
   return result;
 }
 function detectUncached(dir) {
@@ -3604,13 +3809,13 @@ function hasNodeTestScript(dir) {
     const pkg = JSON.parse(readFileSync3(`${dir}/package.json`, "utf-8"));
     script = pkg.scripts?.test;
   } catch (err) {
-    log.warn(TAG8, `Could not read package.json in ${dir}: ${err instanceof Error ? err.message : err}`);
+    log.warn(TAG9, `Could not read package.json in ${dir}: ${err instanceof Error ? err.message : err}`);
     return false;
   }
   if (typeof script !== "string" || script.trim().length === 0)
     return false;
   if (NPM_PLACEHOLDER_TEST.test(script)) {
-    log.info(TAG8, `package.json 'test' is the npm placeholder — skipping tests`);
+    log.info(TAG9, `package.json 'test' is the npm placeholder — skipping tests`);
     return false;
   }
   return true;
@@ -3621,7 +3826,7 @@ function firstNodeScript(dir, candidates) {
     const pkg = JSON.parse(readFileSync3(`${dir}/package.json`, "utf-8"));
     scripts = pkg.scripts ?? {};
   } catch (err) {
-    log.warn(TAG8, `Could not read package.json in ${dir}: ${err instanceof Error ? err.message : err}`);
+    log.warn(TAG9, `Could not read package.json in ${dir}: ${err instanceof Error ? err.message : err}`);
     return null;
   }
   for (const name of candidates) {
@@ -3640,7 +3845,7 @@ function xcodeBuildCommand(pt) {
     return null;
   const scheme = resolveXcodeScheme(pt);
   if (!scheme) {
-    log.warn(TAG8, "Could not resolve an Xcode scheme — skipping build (best-effort)");
+    log.warn(TAG9, "Could not resolve an Xcode scheme — skipping build (best-effort)");
     return null;
   }
   const containerFlag = pt.xcodeIsWorkspace ? "-workspace" : "-project";
@@ -3668,108 +3873,11 @@ function resolveXcodeScheme(pt) {
     const schemes = pt.xcodeIsWorkspace ? parsed.workspace?.schemes ?? [] : parsed.project?.schemes ?? [];
     return schemes[0] ?? null;
   } catch (err) {
-    log.warn(TAG8, `xcodebuild -list failed: ${err instanceof Error ? err.message : err}`);
+    log.warn(TAG9, `xcodebuild -list failed: ${err instanceof Error ? err.message : err}`);
     return null;
   }
 }
 
-// src/repair-sandbox.ts
-init_log();
-import { randomUUID } from "node:crypto";
-import { promisify as promisify2 } from "node:util";
-var TAG9 = "repair-sandbox";
-async function dockerExec(argv, opts) {
-  const { execFile: execFile2 } = await import("node:child_process");
-  return promisify2(execFile2)("docker", argv, {
-    encoding: "utf-8",
-    ...opts
-  });
-}
-var MAX_OUTPUT_BUFFER2 = 20971520;
-var PROBE_TIMEOUT_MS = 1e4;
-var SANDBOX_MOUNT = "/repo";
-var SANDBOX_MEMORY = "4g";
-var SANDBOX_PIDS = "512";
-var dockerProbe = null;
-async function sandboxAvailable() {
-  if (dockerProbe === true)
-    return true;
-  try {
-    await dockerExec(["version", "--format", "{{.Server.Version}}"], {
-      timeout: PROBE_TIMEOUT_MS
-    });
-    dockerProbe = true;
-  } catch {
-    dockerProbe = false;
-  }
-  return dockerProbe;
-}
-function __resetSandboxProbe() {
-  dockerProbe = null;
-}
-async function removeContainer(name) {
-  try {
-    await dockerExec(["rm", "--force", name], { timeout: PROBE_TIMEOUT_MS });
-    log.warn(TAG9, `removed the timed-out sandbox container ${name}`);
-  } catch {}
-}
-function sandboxRunArgs(image, worktree, command, name) {
-  return [
-    "run",
-    "--rm",
-    ...name ? ["--name", name] : [],
-    "--network=none",
-    "--cap-drop=ALL",
-    "--security-opt=no-new-privileges",
-    `--memory=${SANDBOX_MEMORY}`,
-    `--pids-limit=${SANDBOX_PIDS}`,
-    ...typeof process.getuid === "function" && typeof process.getgid === "function" ? ["--user", `${process.getuid()}:${process.getgid()}`] : [],
-    "--env",
-    "HOME=/tmp",
-    "--volume",
-    `${worktree}:${SANDBOX_MOUNT}`,
-    "--workdir",
-    SANDBOX_MOUNT,
-    "--entrypoint",
-    command.cmd,
-    image,
-    ...command.args
-  ];
-}
-async function runInSandbox(args) {
-  const name = `harmony-repair-${randomUUID()}`;
-  const argv = sandboxRunArgs(args.image, args.worktree, args.command, name);
-  log.info(TAG9, `sandbox: ${args.command.cmd} ${args.command.args.join(" ")} (image ${args.image})`);
-  try {
-    const { stdout } = await dockerExec(argv, {
-      timeout: args.timeoutMs,
-      maxBuffer: MAX_OUTPUT_BUFFER2
-    });
-    return { passed: true, output: stdout ?? "" };
-  } catch (err) {
-    const e = err;
-    const output = `${e.stdout ?? ""}${e.stderr ?? ""}`;
-    if (typeof e.code !== "number") {
-      const timedOut = e.killed === true || e.signal != null;
-      if (timedOut)
-        await removeContainer(name);
-      return {
-        passed: false,
-        output,
-        sandboxError: timedOut ? `the sandbox timed out after ${args.timeoutMs}ms` : `the sandbox did not run: ${e.message ?? "unknown error"}`
-      };
-    }
-    if (e.code === 125) {
-      return {
-        passed: false,
-        output,
-        sandboxError: `the sandbox could not start (image "${args.image}" missing or unusable)`
-      };
-    }
-    return { passed: false, output };
-  }
-}
-
 // src/revert-guard.ts
 init_log();
 init_run_containment();
@@ -3987,9 +4095,16 @@ async function runDeepReview(worktreePath, config, workerId) {
   }
   const port = config.verification.devServerBasePort + workerId;
   let devServer = null;
+  const launch = devServerLaunch({
+    worktreePath,
+    port,
+    sandbox: verificationSandbox(config)
+  });
   try {
-    const [cmd, args] = spawnRunArgs("dev", "--port", String(port));
-    devServer = spawn2(cmd, args, {
+    if (launch.containerName) {
+      await removeSandboxContainer(launch.containerName);
+    }
+    devServer = spawn2(launch.cmd, launch.args, {
       cwd: worktreePath,
       stdio: ["ignore", "pipe", "pipe"],
       env: containedEnv()
@@ -4052,6 +4167,9 @@ async function runDeepReview(worktreePath, config, workerId) {
     if (devServer && !devServer.killed) {
       devServer.kill("SIGTERM");
     }
+    if (launch.containerName) {
+      await removeSandboxContainer(launch.containerName);
+    }
   }
 }
 function attemptAutoFix(worktreePath, config, errors) {
@@ -4190,6 +4308,24 @@ class DevServerReadinessError extends Error {
     this.name = "DevServerReadinessError";
   }
 }
+function devServerLaunch(args) {
+  const [cmd, runArgs] = spawnRunArgs("dev", "--port", String(args.port), ...args.sandbox ? ["--host", SANDBOX_DEV_SERVER_BIND] : []);
+  if (!args.sandbox)
+    return { cmd, args: runArgs };
+  const containerName = devServerContainerName(args.port);
+  return {
+    cmd: "docker",
+    args: devServerSandboxArgs({
+      image: args.sandbox.image,
+      worktree: args.worktreePath,
+      command: { cmd, args: runArgs },
+      port: args.port,
+      name: containerName
+    }),
+    containerName
+  };
+}
+var DEV_SERVER_READY = /\bready\b/i;
 function waitForDevServer(proc, timeout) {
   return new Promise((resolve3, reject) => {
     let settled = false;
@@ -4219,7 +4355,7 @@ function waitForDevServer(proc, timeout) {
     }, timeout);
     const onData = (data) => {
       const text = data.toString();
-      if (text.includes("ready") || text.includes("localhost") || text.includes("Local:")) {
+      if (DEV_SERVER_READY.test(text) || text.includes("localhost") || text.includes("Local:")) {
         settleResolve();
       }
     };
@@ -5181,7 +5317,7 @@ function branchAheadOfItsRemote(branchName, repoRoot = resolveRepoRoot()) {
     return false;
   }
 }
-async function rescueUnpushedBranch(client, cardId, branchName, repoRoot = resolveRepoRoot()) {
+async function rescueUnpushedBranch(client, cardId, branchName, repoRoot = resolveRepoRoot(), agentSessionId) {
   const { getBranchWebUrl: getBranchWebUrl2, pushBranch: pushBranch2 } = await Promise.resolve().then(() => (init_git_pr(), exports_git_pr));
   try {
     pushBranch2(branchName, repoRoot);
@@ -5194,13 +5330,16 @@ async function rescueUnpushedBranch(client, cardId, branchName, repoRoot = resol
     const url = getBranchWebUrl2(branchName, repoRoot);
     const recover = url ? `View it at ${url} or recover locally: \`git fetch && git checkout ${branchName}\`` : `Recover it locally: \`git fetch && git checkout ${branchName}\``;
     const body = `⚠ Run ended before completion. Committed work was push-rescued to ` + `\`origin/${branchName}\` so it isn't lost. ${recover}`;
-    await client.addComment(cardId, body, { commentType: "message" });
+    await client.addComment(cardId, body, {
+      commentType: "message",
+      ...agentSessionId ? { agentSessionId } : {}
+    });
   } catch (err) {
     log.warn(TAG16, `push-rescue comment failed for ${branchName} (work is still safe on origin): ${err instanceof Error ? err.message : err}`);
   }
   return true;
 }
-async function teardownWorktree(client, cardId, worktreePath, branchName) {
+async function teardownWorktree(client, cardId, worktreePath, branchName, agentSessionId) {
   let skipBranchDelete = false;
   if (branchName && cardId) {
     let repoRoot;
@@ -5211,7 +5350,7 @@ async function teardownWorktree(client, cardId, worktreePath, branchName) {
       return;
     }
     if (branchAheadOfItsRemote(branchName, repoRoot)) {
-      const ok = await rescueUnpushedBranch(client, cardId, branchName, repoRoot);
+      const ok = await rescueUnpushedBranch(client, cardId, branchName, repoRoot, agentSessionId);
       if (!ok) {
         skipBranchDelete = true;
         log.error(TAG16, `Keeping local branch ${branchName} (push-rescue failed) to avoid orphaning its commit`);
@@ -5276,6 +5415,7 @@ export {
   reportFindings,
   renameRemoteBranch,
   removeWorktreeHoldingBranch,
+  removeSandboxContainer,
   remove,
   remoteBranchExists,
   relayAgentEvent,
@@ -5307,6 +5447,8 @@ export {
   implementRunContainmentCliArgs,
   implementRunContainment,
   hostPersistencePaths,
+  heldTestEnvKeysToStrip,
+  heldOracleSandboxArgv,
   harmonyMcpServer,
   gradeOracleRed,
   gitMetadataDenyPaths,
@@ -5329,6 +5471,9 @@ export {
   extractCiReviewRequestedSha,
   extractAzurePrId,
   envKeysDroppedByLaunch,
+  devServerSandboxArgs,
+  devServerLaunch,
+  devServerContainerName,
   detectPackageManager,
   detectGitProvider,
   detect,
@@ -5374,8 +5519,10 @@ export {
   SDK_ALLOWED_TOOLS,
   SANDBOX_STARTUP_GRACE_MS,
   SANDBOX_MOUNT,
+  SANDBOX_DEV_SERVER_BIND,
   ReviewPassedCollector,
   ProjectSandboxOverrideError,
+  OracleSandboxConfigError,
   OracleRedCollector,
   OracleCollector,
   ORACLE_RUNNER_HINTS,