@outerlayer/cli 0.19.1 → 0.22.0

package/dist/{chunk-B6SCN5NY.js → chunk-FGW2774C.js}

@@ -1,38 +1,98 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { writeJobFile, readJobFile } from './chunk-SADUQSO4.js';
-import { senderPidfile } from './chunk-JHGEBPLE.js';
-import { DOCKERD_LOG, HELPER_PATH, HELPER_RECORD } from './chunk-XNGMQ27R.js';
-import { installScrubContext } from './chunk-R22NZSGA.js';
-import { AssetError, obtainImage, ensureRootfs, gitRemoteFor, startServicesFor, createBuildDisk, machineConfig, resolveAgentUser, AgentUserError, runBuildSteps, shellQuote, createContainerRuntime, stopContainer, cleanupContainer, outOfMemoryReason, containerSenderCommand, syncInContainer, copyTranscriptsFromContainer, GH_CONFIG_YML, ghHostsYml, ADDED_USER, isLiteralAddress, signalInContainer, deleteBuildDisk, startCheckContainer, lifecycleSteps, lifecycleFailureReason, writeEvalInput, EVAL_INPUT_NAME, copyTranscripts, senderSignalScript, containerJudgeEnvironment, copyJudgeTree } from './chunk-3ZR7Y23Y.js';
-import { childEnvironment } from './chunk-VMJPFQNE.js';
-import { HASH_ARGV, parseProgramHash, JUDGE_PROGRAM, judgeCommand, MAX_REPORT_BYTES, JUDGE_MAX_TURNS, JUDGE_DIR } from './chunk-3UZTIRLF.js';
-import { waitForAgent, vmExecArgs } from './chunk-GGOMT6KF.js';
-import { socketPathProblem, vsockLinks, linkVsockSockets } from './chunk-X5H2WYMB.js';
-import { describeCallFailure, resolveGoverningSource, refusalCode, removeStagedContext, stageGovernedContext, pinnedSourceOf, commandWithShim, logStamp, createRunnerLog, formatDuration, retrySend, formatClock } from './chunk-XZ4H4X5F.js';
-import { WorkCommandError, postJson, isSignatureRefusal, getJson } from './chunk-FBTGMSQF.js';
+import { senderPidfile } from './chunk-ATRIVTRE.js';
+import { DOCKERD_LOG, HELPER_PATH, HELPER_RECORD } from './chunk-UD3EXMKB.js';
+import { installScrubContext } from './chunk-34XORKFD.js';
+import { ADDED_USER, AssetError, obtainImage, ensureRootfs, gitRemoteFor, startServicesFor, createBuildDisk, machineConfig, resolveAgentUser, AgentUserError, runBuildSteps, shellQuote, LEASE_SECONDS, createContainerRuntime, stopContainer, cleanupContainer, outOfMemoryReason, containerSenderCommand, signalInContainer, syncInContainer, copyTranscriptsFromContainer, senderAliveScript, GH_CONFIG_YML, ghHostsYml, isLiteralAddress, deleteBuildDisk, startCheckContainer, lifecycleSteps, lifecycleFailureReason, writeEvalInput, DeliveryFailure, EVAL_INPUT_NAME, copyTranscripts, senderSignalScript, containerJudgeEnvironment, copyJudgeTree } from './chunk-VX74ND77.js';
+import { readBranchHead, fetchCommit, diffBetween } from './chunk-IRBNIRQJ.js';
+import { HASH_ARGV, parseProgramHash, JUDGE_PROGRAM, writeJobFile, readJobFile, COMMAND_DIR, childEnvironment, judgeCommand, JUDGE_MAX_TURNS, MAX_REPORT_BYTES, JUDGE_DIR } from './chunk-WERZMIKA.js';
+import { CLAUDE_CODE_VERSION } from './chunk-3W333NFO.js';
+import { waitForAgent, vmExecArgs } from './chunk-PHHBYAL6.js';
+import { socketPathProblem, vsockLinks, linkVsockSockets } from './chunk-BLW6GPBZ.js';
+import { describeCallFailure, resolveGoverningSource, refusalCode, removeStagedContext, stageGovernedContext, pinnedSourceOf, commandWithShim, logStamp, createRunnerLog, formatDuration, retrySend, formatClock } from './chunk-C3OVGKVJ.js';
+import { WorkCommandError, postJson, isSignatureRefusal, getJson } from './chunk-2HT2XGJX.js';
 import { planArtifactUpload } from './chunk-G3IJ3N6F.js';
-import { isBuiltinContainer, isBuiltinProcess, isBuiltinVm, DEFAULT_CHECK_TIME_LIMIT_MINUTES } from './chunk-P53VEAOF.js';
+import { isBuiltinContainer, isBuiltinProcess, isBuiltinVm, DEFAULT_CHECK_TIME_LIMIT_MINUTES } from './chunk-2CMJLYV6.js';
 import { parseSize } from './chunk-7RQ73DLO.js';
-import { readBranchHead, fetchCommit, diffBetween } from './chunk-3CWUOFV6.js';
-import { CLAUDE_CODE_VERSION } from './chunk-CX22S5BA.js';
 import { isSameProcess, startTimeOf } from './chunk-JBJTC3UU.js';
-import { scrubText } from './chunk-QNLX477Q.js';
-import { resolvePackRoot } from './chunk-NNLA7LLQ.js';
+import { scrubText } from './chunk-AEKSX4EY.js';
 import { readCloudConfig } from './chunk-EABW6AJQ.js';
+import { resolvePackRoot } from './chunk-5OCIHFGE.js';
 import { parsePolicy } from './chunk-WFSUUUAN.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 import { resolveVersion } from './chunk-RA3O54FC.js';
-import { signerFor } from './chunk-M2ZWWTWZ.js';
-import { runnerDir, buildDir, vsockPath, RUNNER_FILE_MODE } from './chunk-N2PXGQRL.js';
-import { claudeCredential, repositoriesOf, primaryOf, buildEnvironment, JOB_MOUNT, CHECKOUT_DIR, parseIsolation, proxyEnvironment, withProxyWarningHidden, containerLocalAddress, destinationEnvironment, CLAUDE_CREDENTIAL_VARIABLES, builtInEnvironment, withHooksPath, startBuildServices, BUILT_IN_NAMES, AGENT_CREDENTIAL_MISSING, sharedUserEnvironment, headerVariables, authorEnvironment, withTunnelRecord, commitIdentityRecord, RELAY_PORT, repositoryPath, lifecycleWorkdir, checkEnvironment, EVAL_INPUT_DIR } from './chunk-BQXFBI7T.js';
+import { signerFor } from './chunk-KDHYLBRR.js';
+import { RUNNER_FILE_MODE, runnerDir, buildDir, vsockPath } from './chunk-KIGSGZBB.js';
+import { claudeCredential, repositoriesOf, primaryOf, buildEnvironment, JOB_MOUNT, CHECKOUT_DIR, parseIsolation, proxyEnvironment, withProxyWarningHidden, containerLocalAddress, destinationEnvironment, CLAUDE_CREDENTIAL_VARIABLES, builtInEnvironment, withHooksPath, startBuildServices, BUILT_IN_NAMES, AGENT_CREDENTIAL_MISSING, sharedUserEnvironment, headerVariables, authorEnvironment, withTunnelRecord, commitIdentityRecord, RELAY_PORT, repositoryPath, lifecycleWorkdir, checkEnvironment, EVAL_INPUT_DIR } from './chunk-V7MQKOZY.js';
+import { RUNNER_WORDED_REASONS, UNKNOWN_TRACKING_REASON } from './chunk-GISNHSYL.js';
+import { existsSync, statSync, appendFileSync, mkdirSync, chmodSync, writeFileSync, accessSync, constants, openSync, readFileSync, closeSync, rmSync, readdirSync, lstatSync, fstatSync, readSync, realpathSync } from 'fs';
+import { join, isAbsolute, dirname, delimiter, sep } from 'path';
 import { spawn, spawnSync } from 'child_process';
 import { randomBytes, createHash } from 'crypto';
-import { mkdirSync, chmodSync, writeFileSync, appendFileSync, statSync, accessSync, constants, openSync, existsSync, readFileSync, closeSync, rmSync, readdirSync, lstatSync, fstatSync, readSync, realpathSync } from 'fs';
-import { join, isAbsolute, dirname, delimiter, sep } from 'path';
 import { pathToFileURL } from 'url';
 
 createRequire(import.meta.url);
+var PROBE_TIMEOUT_MS = 3e4;
+var PROBE_BYTES = 256 * 1024;
+var PROBE_SCRIPT = `d=${COMMAND_DIR}
+code=$(cat "$d/exit-code" 2>/dev/null | tr -d ' \\r\\n')
+pid=$(cat "$d/command.pid" 2>/dev/null | tr -d ' \\r\\n')
+alive=0
+if [ -n "$pid" ] && grep -qa build-command "/proc/$pid/cmdline" 2>/dev/null; then alive=1; fi
+size=$(wc -c < "$d/command.log" 2>/dev/null || echo 0)
+size=$(echo $size)
+echo "OL-COMMAND exit=$code alive=$alive size=$size"
+n=$((size - $1))
+if [ "$n" -gt "$2" ]; then n=$2; fi
+if [ "$n" -gt 0 ]; then tail -c +$(($1 + 1)) "$d/command.log" | head -c "$n" | base64 | tr -d '\\n'; fi
+echo
+`;
+function probeArgv(offset) {
+  return ["/bin/sh", "-c", PROBE_SCRIPT, "probe", String(offset), String(PROBE_BYTES)];
+}
+function parseProbe(stdout) {
+  const [header = "", body = ""] = stdout.split("\n");
+  const match = /^OL-COMMAND exit=(\d*) alive=([01]) size=(\d+)$/.exec(header);
+  if (match === null) return void 0;
+  return {
+    ...match[1] === "" ? {} : { exitCode: Number(match[1]) },
+    alive: match[2] === "1",
+    size: Number(match[3]),
+    bytes: Buffer.from(body.trim(), "base64")
+  };
+}
+async function probeCommand(runtime, state, offset) {
+  const result = await runtime.host.exec({
+    container: state.container,
+    user: state.agentUser ?? ADDED_USER,
+    env: { literals: {}, passed: {} },
+    argv: probeArgv(offset)
+  }, { timeoutMs: PROBE_TIMEOUT_MS });
+  return result.status === 0 ? parseProbe(result.stdout) : void 0;
+}
+async function copyCommandLogTail(runtime, state, jobDir) {
+  for (let reads = 0; reads < MAX_TAIL_READS; reads++) {
+    const offset = commandLogOffset(jobDir, state.commandLogBase);
+    const probe = await probeCommand(runtime, state, offset);
+    if (probe === void 0) return false;
+    appendCommandLog(jobDir, probe.bytes);
+    if (probe.bytes.length === 0 || offset + probe.bytes.length >= probe.size) return true;
+  }
+  return false;
+}
+var MAX_TAIL_READS = 8;
+function commandLogOffset(jobDir, base) {
+  const path = join(jobDir, "command.log");
+  return existsSync(path) ? Math.max(0, statSync(path).size - (base ?? 0)) : 0;
+}
+function appendCommandLog(jobDir, bytes) {
+  if (bytes.length > 0) appendFileSync(join(jobDir, "command.log"), bytes, { mode: RUNNER_FILE_MODE });
+}
+function judgeProbe(probe, missedBefore) {
+  if (probe.exitCode !== void 0) return { kind: "exited", code: probe.exitCode };
+  if (probe.alive) return { kind: "running" };
+  return missedBefore ? { kind: "lost" } : { kind: "recheck" };
+}
 var DEFAULT_MEMORY = "8g";
 var DEFAULT_DISK = "40g";
 var DEFAULT_CPUS = 4;
@@ -1460,10 +1520,14 @@ async function runHostChecks(input) {
         fetchDiff: deps.fetchDiff ?? ((input2) => diffBetween(input2)),
         log
       });
-      await ready.evalInput.deliver();
     } catch (err) {
       return await failAll(`the checks' input could not be written: ${describeCallFailure(err)}`);
     }
+    try {
+      await ready.evalInput.deliver();
+    } catch (err) {
+      return await failAll(err instanceof DeliveryFailure ? err.message : `the checks' input could not be written: ${describeCallFailure(err)}`);
+    }
     let usable = true;
     for (const check of checks) {
       if (!usable) {
@@ -1569,7 +1633,7 @@ var MAX_TEST_FILE_BYTES = 1024 * 1024;
 var NO_CLAUDE = "the image has no Claude Code for the judge";
 var REPORT_CAPTION = "The host's criteria judge, each criterion judged against the test that cites it";
 async function loadCitationFinder() {
-  return await import(pathToFileURL(join(resolvePackRoot(), "template", "build", "scripts", "criterion-citations.mjs")).href);
+  return await import(pathToFileURL(join(resolvePackRoot(), "maintained", "outerlayer-build", "scripts", "criterion-citations.mjs")).href);
 }
 function testFilesIn(root, isTest, limits = { files: MAX_TEST_FILES, bytes: MAX_TEST_FILE_BYTES }) {
   const files = [];
@@ -1619,7 +1683,7 @@ function criteriaOf(workItem) {
 function environmentFor(input) {
   const { config, job, jobDir, deps } = input;
   if (deps.judgeEnvironment !== void 0) return deps.judgeEnvironment;
-  if (job.container !== void 0) return containerJudgeEnvironment({ runtime: deps.runtime, config, job, jobDir });
+  if (job.container !== void 0) return containerJudgeEnvironment({ runtime: deps.runtime, config, job, jobDir, log: (line) => deps.log.line(`#${job.item} ${line}`) });
   if (job.microvm !== void 0) return microVmJudgeEnvironment({ runtime: deps.runtime, job, jobDir });
   return void 0;
 }
@@ -1757,19 +1821,25 @@ async function runJudge(input) {
     } finally {
       timer.cancel();
     }
-    if (outcome === "timeout") await environment.stop().catch((err) => log.error(`${tag} the judge could not be stopped after its time ran out: ${describeCallFailure(err)}`));
+    let report;
+    const readReport2 = async () => {
+      try {
+        report = await environment.readReport();
+      } catch (err) {
+        log.error(`${tag} the judge's report could not be read: ${describeCallFailure(err)}`);
+      }
+    };
+    if (outcome === "timeout") {
+      await readReport2();
+      await environment.stop().catch((err) => log.error(`${tag} the judge could not be stopped after its time ran out: ${describeCallFailure(err)}`));
+    }
     const decision = decideVerdict({
       run: outcome === "timeout" ? { kind: "timeout" } : { kind: "exited", status: outcome.status, stdout: outcome.stdout, stderr: outcome.stderr },
       criteria,
       citations,
       minutes
     });
-    let report;
-    try {
-      report = await environment.readReport();
-    } catch (err) {
-      log.error(`${tag} the judge's report could not be read: ${describeCallFailure(err)}`);
-    }
+    if (outcome !== "timeout") await readReport2();
     await clear();
     const link = report === void 0 ? void 0 : await uploadReport(check, report, { branch, head });
     await record(check.name, decision.result, decision.reason, { keyTail: decision.limitKey === true ? LIMIT_KEY_TAIL2 : "", link });
@@ -1811,7 +1881,6 @@ async function runJudge(input) {
 }
 
 // src/runner/job.ts
-var LEASE_SECONDS = 900;
 var RENEW_INTERVAL_SECONDS = 300;
 var IDLE_CPU_USEC_PER_MINUTE_FLOOR = 2e6;
 function jobEnv(config, item, itemKey, jobDirPath, baseEnv = process.env, branch, author) {
@@ -2256,6 +2325,10 @@ function leaseExpiry(job, fallback) {
   const base = Date.parse(job.lastRenewAt ?? job.startedAt);
   return new Date((Number.isFinite(base) ? base : fallback.getTime()) + LEASE_SECONDS * 1e3);
 }
+var TEARDOWN_STAGES = ["judge", "checks", "sync", "cleanup", "report"];
+function inTeardown(job) {
+  return job.stage !== void 0 && TEARDOWN_STAGES.includes(job.stage);
+}
 function setStage(job, jobDirPath, stage) {
   job.stage = stage;
   writeJobFile(join(jobDirPath, "job.json"), job);
@@ -2282,7 +2355,13 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
   }
   const build = job.container === void 0 ? void 0 : { state: job.container, runtime: deps.container ?? createContainerRuntime() };
   const vmBuild = job.microvm === void 0 ? void 0 : { state: job.microvm, runtime: deps.container ?? createContainerRuntime() };
-  if (build !== void 0 && job.pid !== void 0 && isGroupAlive(job.pid)) {
+  const commandMayRun = job.pid !== void 0 && isGroupAlive(job.pid) || isContainerTracked(job) && job.exitCode === void 0;
+  if (build !== void 0 && commandMayRun) {
+    if (isContainerTracked(job) && build.state.stopped !== true) {
+      await copyCommandLogTail(build.runtime, build.state, jobDirPath).catch((err) => {
+        log.error(`${tag} copying the end of the command's log failed: ${describeCallFailure(err)} \xB7 continuing`);
+      });
+    }
     await stopContainer(build.runtime, build.state).catch((err) => {
       log.error(`${tag} stopping the container failed: ${describeCallFailure(err)} \xB7 continuing`);
     });
@@ -2292,14 +2371,13 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
     await stopProcessGroup(job.pid);
   }
   if (outcome !== void 0 && job.endStage === void 0) {
-    const TEARDOWN_STAGES = ["judge", "checks", "sync", "cleanup", "report"];
-    const staleTeardownStage = job.stage !== void 0 && TEARDOWN_STAGES.includes(job.stage);
+    const staleTeardownStage = inTeardown(job);
     job.endStage = ending?.stage ?? (staleTeardownStage ? job.exitCode !== void 0 ? "command" : void 0 : job.stage);
     job.endExitCode = ending?.exitCode ?? (outcome === "ok" || outcome === "failed" ? job.exitCode : void 0);
     writeJobFile(jobFilePath, job);
   }
   if (outcome !== void 0 && ending?.reason !== void 0) {
-    job.reason = scrubReason(ending.reason, config);
+    job.reason = RUNNER_WORDED_REASONS.has(ending.reason) ? ending.reason : scrubReason(ending.reason, config);
     writeJobFile(jobFilePath, job);
   }
   const uploadSessions = async (workdir) => {
@@ -2310,7 +2388,7 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
     } else {
       log.line(`${tag} sync started`);
       const startedMs = now().getTime();
-      const sync = build !== void 0 ? await syncInContainer({ config, runtime: build.runtime, job, jobDir: jobDirPath }) : vmBuild !== void 0 ? await syncInMicroVm({ config, runtime: vmBuild.runtime, job, jobDir: jobDirPath }) : job.build?.exec !== void 0 ? await runSyncViaExec(config, job, jobDirPath, spawnFn) : await runSync(config, job.item, job.itemKey, workdir, jobDirPath, spawnFn, job.branch, job.commitIdentity?.author);
+      const sync = build !== void 0 ? await syncInContainer({ config, runtime: build.runtime, job, jobDir: jobDirPath, log: (line) => log.line(`${tag} ${line}`) }) : vmBuild !== void 0 ? await syncInMicroVm({ config, runtime: vmBuild.runtime, job, jobDir: jobDirPath }) : job.build?.exec !== void 0 ? await runSyncViaExec(config, job, jobDirPath, spawnFn) : await runSync(config, job.item, job.itemKey, workdir, jobDirPath, spawnFn, job.branch, job.commitIdentity?.author);
       const took = formatDuration(now().getTime() - startedMs);
       if (sync.ok) log.line(`${tag} sync ok (${took})`);
       else log.error(`${tag} sync failed: ${sync.reason ?? "no reason given"} \xB7 continuing`);
@@ -2338,8 +2416,12 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
   const collectSessions = build !== void 0 ? () => copyTranscriptsFromContainer(build.runtime, build.state) : vmBuild !== void 0 ? () => copyTranscriptsFromMicroVm(vmBuild.runtime, vmBuild.state) : void 0;
   if (job.checkContainer !== void 0 && job.checksRan === true) {
     try {
-      await cleanupContainer(deps.container ?? createContainerRuntime(), job.checkContainer);
+      const runtime = deps.container ?? createContainerRuntime();
+      const again = isContainerTracked(job) && outcome === "ok" && !job.cleanupRan;
+      if (again) await runtime.host.stop(job.checkContainer.container);
+      await cleanupContainer(runtime, job.checkContainer);
       delete job.checkContainer;
+      if (again) job.checksRan = false;
       writeJobFile(jobFilePath, job);
     } catch (err) {
       log.error(`${tag} removing an earlier attempt's check environment failed: ${describeCallFailure(err)} \xB7 continuing`);
@@ -2653,6 +2735,17 @@ function unfinishedJobs(jobsDirPath) {
   }
   return found;
 }
+function isContainerTracked(job) {
+  return job.container?.tracking === "container";
+}
+function listTrackedJobs(jobsDirPath) {
+  return unfinishedJobs(jobsDirPath).flatMap(({ dirPath, job }) => {
+    const tracking = job.container?.tracking;
+    if (tracking === void 0) return [];
+    if (tracking === "container" && inTeardown(job)) return [];
+    return [{ dirPath, job, known: tracking === "container" }];
+  });
+}
 function listAdoptableJobs(jobsDirPath) {
   return unfinishedJobs(jobsDirPath).filter(
     ({ job }) => job.microvm === void 0 && job.pid !== void 0 && job.start !== void 0 && isSameProcess(job.pid, job.start)
@@ -2661,6 +2754,12 @@ function listAdoptableJobs(jobsDirPath) {
 async function recoverLostJobs(jobsDirPath, config, deps) {
   const recovered = [];
   for (const { dirPath, job } of unfinishedJobs(jobsDirPath)) {
+    const tracking = job.container?.tracking;
+    if (tracking !== void 0 && tracking !== "container") {
+      recovered.push(await finishJob(job, dirPath, "interrupted", config, deps, { reason: UNKNOWN_TRACKING_REASON }));
+      continue;
+    }
+    if (tracking === "container" && !inTeardown(job)) continue;
     const alive = job.pid !== void 0 && job.start !== void 0 && isSameProcess(job.pid, job.start);
     if (alive) continue;
     const recorded = outcomeFromExitCode(dirPath);
@@ -2673,6 +2772,7 @@ async function recoverLostJobs(jobsDirPath, config, deps) {
 // src/runner/sender.ts
 var STOP_WAIT_MS = 3e4;
 var POLL_MS = 200;
+var ASK_AGAIN_MS = 1e3;
 var EXIT_REPORT_WAIT_MS = 2e3;
 var exitsLogged = /* @__PURE__ */ new Map();
 var BUILD_HOME = "/build/home";
@@ -2729,6 +2829,31 @@ function launchFor(config, job, jobDir, deps) {
   }
   return { command: process.execPath, args: [deps.cliPath ?? process.argv[1] ?? "outerlayer", "session-sender"], env: hostEnv, cwd: job.workdir ?? jobDir };
 }
+async function restartSender(input) {
+  const { job, deps } = input;
+  const state = job.container;
+  if (state !== void 0 && job.itemKey !== void 0) {
+    const runtime = deps.runtime ?? createContainerRuntime();
+    const pidfile = senderPidfile(BUILD_HOME, Number(job.item));
+    const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+    const running = async () => {
+      const probe = await runtime.host.exec({ container: state.container, user: state.agentUser ?? ADDED_USER, env: { literals: {}, passed: {} }, argv: ["/bin/sh", "-c", senderAliveScript(pidfile)] });
+      return probe.status === 0 && probe.stdout.trim() === "alive";
+    };
+    try {
+      await signalInContainer(runtime, state, pidfile, "TERM");
+      const deadline = (deps.waitMs ?? STOP_WAIT_MS) / POLL_MS;
+      for (let waited = 0; await running() && waited < deadline; waited += 1) await sleep(POLL_MS);
+      if (await running()) {
+        deps.log.error(`#${job.item} the session sender an earlier runner left did not stop in time \xB7 killing it`);
+        await signalInContainer(runtime, state, pidfile, "KILL");
+      }
+    } catch (err) {
+      deps.log.error(`#${job.item} stopping the session sender an earlier runner left failed: ${describeCallFailure(err)} \xB7 continuing`);
+    }
+  }
+  return startSender(input);
+}
 function isLive(sender) {
   if (sender.start !== void 0) return isSameProcess(sender.pid, sender.start);
   try {
@@ -2750,12 +2875,13 @@ function signalHost(sender, signal) {
   }
 }
 async function signalInGuest(runtime, state, pidfile, signal) {
-  await runtime.vm.exec(state.vsockPath, {
+  const { status } = await runtime.vm.exec(state.vsockPath, {
     argv: ["/bin/sh", "-c", senderSignalScript(pidfile, signal)],
     user: state.agentUser ?? ADDED_USER,
     cwd: "/",
     env: { PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" }
   });
+  return status === 0;
 }
 async function exitReported(pid) {
   const logged = exitsLogged.get(pid);
@@ -2777,14 +2903,19 @@ async function stopSender(input) {
   const inContainer = job.container === void 0 ? void 0 : { state: job.container, runtime: deps.runtime ?? createContainerRuntime(), pidfile: senderPidfile(BUILD_HOME, Number(job.item)) };
   const inGuest = job.microvm === void 0 ? void 0 : { state: job.microvm, runtime: deps.runtime ?? createContainerRuntime(), pidfile: senderPidfile(BUILD_HOME, Number(job.item)) };
   const signalInside = async (signal) => {
-    if (inContainer !== void 0) await signalInContainer(inContainer.runtime, inContainer.state, inContainer.pidfile, signal).catch(() => void 0);
-    if (inGuest !== void 0) await signalInGuest(inGuest.runtime, inGuest.state, inGuest.pidfile, signal).catch(() => void 0);
+    if (inContainer !== void 0) return signalInContainer(inContainer.runtime, inContainer.state, inContainer.pidfile, signal).catch(() => void 0);
+    if (inGuest !== void 0) return signalInGuest(inGuest.runtime, inGuest.state, inGuest.pidfile, signal).catch(() => void 0);
+    return void 0;
   };
   try {
-    if (inContainer !== void 0 || inGuest !== void 0) await signalInside("TERM");
+    let reached = true;
+    if (inContainer !== void 0 || inGuest !== void 0) reached = await signalInside("TERM");
     else signalHost(sender, "SIGTERM");
     const deadline = (deps.waitMs ?? STOP_WAIT_MS) / POLL_MS;
-    for (let waited = 0; isLive(sender) && waited < deadline; waited += 1) await sleep(POLL_MS);
+    for (let waited = 0; isLive(sender) && waited < deadline; waited += 1) {
+      await sleep(POLL_MS);
+      if (!reached && (waited + 1) % (ASK_AGAIN_MS / POLL_MS) === 0) reached = await signalInside("TERM");
+    }
     if (isLive(sender)) {
       deps.log.error(`${tag} session sender did not stop in time \xB7 killing it`);
       await signalInside("KILL");
@@ -2796,4 +2927,4 @@ async function stopSender(input) {
   }
 }
 
-export { ALREADY_RELEASED, AttemptLogBook, LEASE_SECONDS, RENEW_INTERVAL_SECONDS, deliverCommitHooks, describeHookEnd, execArgv, execCommandLine, finishJob, hookLimitsFor, hostCommandEnvironment, hostEnvironment, isGroupAlive, isIdle, isTimedOut, isUnfinished, jobEnv, listAdoptableJobs, listenOnBroker, microVmCommandLine, needsRenew, outcomeFromExitCode, provisionEnvironment, provisionMicroVm, provisionProcess, readCpuUsec, readProvisionOut, recoverLostJobs, releaseLease, renewLease, resolveHostBuild, retryFailedReleases, runCommand, runHook, setStage, startHostServices, startSender, stopOrphanedMicroVms, unfinishedJobs, workdirProblem };
+export { ALREADY_RELEASED, AttemptLogBook, EXIT_CODE_FILE, RENEW_INTERVAL_SECONDS, appendCommandLog, commandLogOffset, deliverCommitHooks, describeHookEnd, execArgv, execCommandLine, finishJob, hookLimitsFor, hostCommandEnvironment, hostEnvironment, isContainerTracked, isGroupAlive, isIdle, isTimedOut, isUnfinished, jobEnv, judgeProbe, listAdoptableJobs, listTrackedJobs, listenOnBroker, microVmCommandLine, needsRenew, outcomeFromExitCode, probeCommand, provisionEnvironment, provisionMicroVm, provisionProcess, readCpuUsec, readProvisionOut, recoverLostJobs, releaseLease, renewLease, resolveHostBuild, restartSender, retryFailedReleases, runCommand, runHook, setStage, startHostServices, startSender, stopOrphanedMicroVms, unfinishedJobs, workdirProblem };

package/dist/{chunk-KYS3TQAG.js → chunk-G2WME4RG.js}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
 import { launchRefusalForSession } from './chunk-ESVW4MJY.js';
-import { autoConnect, detectActiveSession } from './chunk-IF2OSI5T.js';
+import { autoConnect, detectActiveSession } from './chunk-QOALB6ZD.js';
 import { acquireSpoolLockAt } from './chunk-G3IJ3N6F.js';
-import { resolveRepoIdentity } from './chunk-QNLX477Q.js';
+import { defaultFetch } from './chunk-VWLOQ6FI.js';
+import { resolveGatewayCredentials, unauthorizedMessage } from './chunk-NTRCK4NH.js';
+import { resolveRepoIdentity } from './chunk-AEKSX4EY.js';
 import { C } from './chunk-ANPNT6PM.js';
 import { launchedItemForSession } from './chunk-T2Q7ISPE.js';
 import { parseTrackerNumber, trackerNumberError } from './chunk-WZBHBH3J.js';
-import { defaultFetch } from './chunk-FVMYKL6L.js';
-import { resolveGatewayCredentials, unauthorizedMessage } from './chunk-NTRCK4NH.js';
 import { StepNameSchema, StepBodySchema } from './chunk-7VUK5RFS.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 import { randomUUID } from 'crypto';

package/dist/{chunk-LRG3ZMZD.js → chunk-G6DZCKA6.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { autoConnect, detectActiveSession } from './chunk-IF2OSI5T.js';
-import { resolveRepoIdentity } from './chunk-QNLX477Q.js';
+import { autoConnect, detectActiveSession } from './chunk-QOALB6ZD.js';
+import { defaultFetch } from './chunk-VWLOQ6FI.js';
+import { unauthorizedMessage, resolveGatewayCredentials } from './chunk-NTRCK4NH.js';
+import { resolveRepoIdentity } from './chunk-AEKSX4EY.js';
 import { C } from './chunk-ANPNT6PM.js';
 import { parseWorkItemEnv } from './chunk-T2Q7ISPE.js';
 import { parseTrackerNumber, trackerNumberError } from './chunk-WZBHBH3J.js';
-import { defaultFetch } from './chunk-FVMYKL6L.js';
-import { unauthorizedMessage, resolveGatewayCredentials } from './chunk-NTRCK4NH.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 
 createRequire(import.meta.url);

package/dist/chunk-GISNHSYL.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+import { createRequire } from 'node:module';
+
+createRequire(import.meta.url);
+
+// src/runner/container/relay-protocol.ts
+var RELAY_USER = "ol-relay";
+var RELAY_ID = 60100;
+var JOIN_DIR = "/run/outerlayer-relay";
+var JOIN_SOCKET = `${JOIN_DIR}/join.sock`;
+var MAX_OPEN_STREAMS = 1024;
+var JOIN_WAIT_MS = 3e4;
+var MAX_MALFORMED_SESSIONS = 5;
+var STREAM_WINDOW = 256 * 1024;
+var SESSION_WINDOW = MAX_OPEN_STREAMS * STREAM_WINDOW;
+var TARGET_TUNNEL = "tunnel";
+var TARGET_GATEWAY = "gateway";
+var TARGET_CLAUDE = "claude";
+var TARGET_LEASE = "lease";
+function destinationTarget(index) {
+  return `destination/${index}`;
+}
+function targetOfPath(path) {
+  if (path === void 0 || !path.startsWith("/")) return void 0;
+  const target = path.slice(1);
+  return /^(tunnel|gateway|claude|lease|destination\/\d{1,4})$/.test(target) ? target : void 0;
+}
+var MALFORMED_REASON = `the build broke its connection to the runner ${MAX_MALFORMED_SESSIONS} times`;
+var UNKNOWN_TRANSPORT_REASON = "the runner cannot tell how this build reaches it";
+var COMMAND_LOST_REASON = "the build's command ended without recording an exit code";
+var CONTAINER_STOPPED_REASON = "the build's container stopped while no runner was managing it";
+var UNKNOWN_TRACKING_REASON = "the runner cannot tell how this build is tracked";
+var RUNNER_WORDED_REASONS = /* @__PURE__ */ new Set([
+  MALFORMED_REASON,
+  UNKNOWN_TRANSPORT_REASON,
+  COMMAND_LOST_REASON,
+  CONTAINER_STOPPED_REASON,
+  UNKNOWN_TRACKING_REASON
+]);
+
+export { COMMAND_LOST_REASON, CONTAINER_STOPPED_REASON, JOIN_DIR, JOIN_SOCKET, JOIN_WAIT_MS, MALFORMED_REASON, MAX_MALFORMED_SESSIONS, MAX_OPEN_STREAMS, RELAY_ID, RELAY_USER, RUNNER_WORDED_REASONS, SESSION_WINDOW, STREAM_WINDOW, TARGET_CLAUDE, TARGET_GATEWAY, TARGET_LEASE, TARGET_TUNNEL, UNKNOWN_TRACKING_REASON, UNKNOWN_TRANSPORT_REASON, destinationTarget, targetOfPath };

package/dist/{chunk-G2YNJIGF.js → chunk-HCVLP7XA.js}

@@ -21,10 +21,19 @@ function rewriteHookCommand(command, dir) {
 function rewriteControlPlanePaths(text, dir) {
   return text.replace(/(?<![\w./~$}:-])(\.outerlayer|\.claude)\//g, (_match, root) => `${dir}/${root}/`);
 }
+function rewriteAgentsFilePaths(text, dir, holds) {
+  return text.replace(/(?<![\w./~$}:-])\.agents\/[\w@+./-]*/g, (match) => {
+    const path = match.replace(/\.+$/, "");
+    if (path.split("/").includes("..") || !holds(path)) return match;
+    return `${dir}/${path}${match.slice(path.length)}`;
+  });
+}
 function hookCommandEscapesControlPlane(command) {
   const remaining = [...PROJECT_DIR_SPELLINGS, ...CONTROL_PLANE_VARIABLE_FORMS].reduce((text, pattern) => text.replace(pattern, " "), command);
   return /\.claude(?:\/|["'\s;|&)]|$)/.test(remaining) || /\$\{?CLAUDE_PROJECT_DIR\}?"?\/\.claude/.test(remaining);
 }
+var GOVERNANCE_VARIABLE = "OUTERLAYER_GOVERNANCE";
+var SUPPORTED_CONTROL_PLANE_LAYOUT = 2;
 var MINIMUM_CLAUDE_VERSION = "2.1.284";
 function versionParts(text) {
   const found = /(\d+)\.(\d+)\.(\d+)/.exec(text);
@@ -41,4 +50,4 @@ var SHIM_SCRIPT = `#!/bin/sh
 exec outerlayer claude "$@"
 `;
 
-export { CONTROL_PLANE_DIR_VARIABLE, MINIMUM_CLAUDE_VERSION, SHIM_SCRIPT, hookCommandEscapesControlPlane, rewriteControlPlanePaths, rewriteHookCommand, versionAtLeast };
+export { CONTROL_PLANE_DIR_VARIABLE, GOVERNANCE_VARIABLE, MINIMUM_CLAUDE_VERSION, SHIM_SCRIPT, SUPPORTED_CONTROL_PLANE_LAYOUT, hookCommandEscapesControlPlane, rewriteAgentsFilePaths, rewriteControlPlanePaths, rewriteHookCommand, versionAtLeast };

package/dist/{chunk-QEFKA2QD.js → chunk-I66MQDXH.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { builtinKind } from './chunk-P53VEAOF.js';
+import { builtinKind } from './chunk-2CMJLYV6.js';
 import { parseSize } from './chunk-7RQ73DLO.js';
-import { runnerDir } from './chunk-N2PXGQRL.js';
+import { runnerDir } from './chunk-KIGSGZBB.js';
 import { dirname } from 'path';
 import { spawnSync } from 'child_process';
 

package/dist/{chunk-3CWUOFV6.js → chunk-IRBNIRQJ.js}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { RecipeError, locateRecipe, readRecipe, assertBuildable, writeSanitizedRecipe, classifyProperties, SANITIZED_NAME } from './chunk-QOZKPLVJ.js';
-import { CLAUDE_CODE_VERSION, NODE_IMAGE, DEFAULT_BASE_IMAGE, TINI_VERSION, GH_VERSION, GH_SHA256, TINI_SHA256 } from './chunk-CX22S5BA.js';
-import { claimPidFile, RunnerAlreadyRunningError, releasePidFile } from './chunk-ECODQ7II.js';
+import { CLAUDE_CODE_VERSION, NODE_IMAGE, DEFAULT_BASE_IMAGE, RecipeError, locateRecipe, readRecipe, assertBuildable, TINI_VERSION, GH_VERSION, writeSanitizedRecipe, classifyProperties, GH_SHA256, TINI_SHA256, SANITIZED_NAME } from './chunk-3W333NFO.js';
+import { claimPidFile, RunnerAlreadyRunningError, releasePidFile } from './chunk-ZFLOGMUC.js';
 import { startTimeOf } from './chunk-JBJTC3UU.js';
-import { RUNNER_DIR_MODE, repoCacheDir, imagesDir, attemptStamp, runnerDir, rootfsPathFor, RUNNER_FILE_MODE } from './chunk-N2PXGQRL.js';
-import { withGitConfig, tokenHeader } from './chunk-BQXFBI7T.js';
+import { RUNNER_DIR_MODE, repoCacheDir, imagesDir, attemptStamp, runnerDir, rootfsPathFor, RUNNER_FILE_MODE } from './chunk-KIGSGZBB.js';
+import { withGitConfig, tokenHeader } from './chunk-V7MQKOZY.js';
+import { RELAY_ID, RELAY_USER } from './chunk-GISNHSYL.js';
 import { mkdirSync, rmSync, existsSync, mkdtempSync, cpSync, readFileSync, writeFileSync, readdirSync, lstatSync, readlinkSync } from 'fs';
 import { tmpdir } from 'os';
 import { dirname, join } from 'path';
@@ -216,10 +216,15 @@ function toolsDockerfile(parts) {
     "COPY --from=recipe /etc/group /tmp/recipe-group",
     `RUN uid=$(awk -F: 'BEGIN{m=1499} $3>=1500 && $3<60000 && $3>m{m=$3} END{print m+1}' /tmp/recipe-passwd) \\`,
     ` && gid=$(awk -F: 'BEGIN{m=1499} $3>=1500 && $3<60000 && $3>m{m=$3} END{print m+1}' /tmp/recipe-group) \\`,
-    " && { grep -v '^ol-agent:' /tmp/recipe-passwd > /out/etc/passwd || true; } \\",
-    " && { grep -v '^ol-agent:' /tmp/recipe-group > /out/etc/group || true; } \\",
+    " && { grep -v -e '^ol-agent:' -e '^ol-relay:' /tmp/recipe-passwd > /out/etc/passwd || true; } \\",
+    " && { grep -v -e '^ol-agent:' -e '^ol-relay:' /tmp/recipe-group > /out/etc/group || true; } \\",
+    // The relay's id is fixed because the runner names it in the container's `--tmpfs` options before the container exists.
+    ` && if awk -F: '$3==${RELAY_ID}{found=1} END{exit !found}' /out/etc/passwd; then echo "uid ${RELAY_ID} is taken by a user of the recipe image, and the relay needs it" >&2; exit 1; fi \\`,
+    ` && if awk -F: '$3==${RELAY_ID}{found=1} END{exit !found}' /out/etc/group; then echo "gid ${RELAY_ID} is taken by a group of the recipe image, and the relay needs it" >&2; exit 1; fi \\`,
     ` && printf '%s\\n' "ol-agent:x:$uid:$gid::/build/home:/bin/sh" >> /out/etc/passwd \\`,
     ` && printf '%s\\n' "ol-agent:x:$gid:" >> /out/etc/group \\`,
+    ` && printf '%s\\n' "${RELAY_USER}:x:${RELAY_ID}:${RELAY_ID}::/nonexistent:/usr/sbin/nologin" >> /out/etc/passwd \\`,
+    ` && printf '%s\\n' "${RELAY_USER}:x:${RELAY_ID}:" >> /out/etc/group \\`,
     " && chmod 0644 /out/etc/passwd /out/etc/group \\",
     " && chmod -R a+rX /out",
     `FROM ${recipeImage}`,

package/dist/{chunk-CG36IONK.js → chunk-JRCSET55.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
 import { sanitizeTerminal } from './chunk-G3IJ3N6F.js';
-import { DEFAULT_DASHBOARD } from './chunk-BM63HB2M.js';
-import { remoteLookupFailed } from './chunk-QNLX477Q.js';
+import { DEFAULT_DASHBOARD } from './chunk-EAQSOE62.js';
 import { resolveGatewayCredentials } from './chunk-NTRCK4NH.js';
 import { writeRepoConnection, findGitDirs, readRepoConnection } from './chunk-BJ3KTMDH.js';
+import { remoteLookupFailed } from './chunk-AEKSX4EY.js';
 import { readCloudConfig } from './chunk-EABW6AJQ.js';
 import { cliInvocation } from './chunk-CRB3POP4.js';
 import { execFileSync } from 'child_process';

package/dist/{chunk-CGGPS7SI.js → chunk-JVB63NIB.js}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { runEmit } from './chunk-5VML45HH.js';
-import { addStdioMcpEntryIfAbsent, addDocsMcpEntryIfAbsent, DOCS_MCP_SERVER_NAME } from './chunk-YVZJ6GKF.js';
-import { installStarterPack } from './chunk-6X4SQ5MY.js';
+import { runEmit } from './chunk-XCRZTXRL.js';
+import { resolveGitCommonDir, defaultGitRunner } from './chunk-KOQELWQ6.js';
+import { addStdioMcpEntryIfAbsent, addDocsMcpEntryIfAbsent, DOCS_MCP_SERVER_NAME } from './chunk-DIB2WLBL.js';
+import { installStarterPack } from './chunk-V7SAQ645.js';
+import { loadTemplateFiles, loadMaintainedFiles, skillDir } from './chunk-5OCIHFGE.js';
 import { C } from './chunk-ANPNT6PM.js';
-import { resolveGitCommonDir, defaultGitRunner } from './chunk-EAEELQVQ.js';
-import { loadTemplateFiles, loadMaintainedFiles, skillDir } from './chunk-NNLA7LLQ.js';
 import { cliInvocation } from './chunk-CRB3POP4.js';
 import { cloneIsGoverned } from './chunk-YQR6E6OV.js';
 import { generatedHeaderSource } from './chunk-WFSUUUAN.js';

package/dist/{chunk-M2ZWWTWZ.js → chunk-KDHYLBRR.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { hostKeyPath, runnerDir, RUNNER_DIR_MODE, RUNNER_FILE_MODE } from './chunk-N2PXGQRL.js';
+import { hostKeyPath, runnerDir, RUNNER_DIR_MODE, RUNNER_FILE_MODE } from './chunk-KIGSGZBB.js';
 import { generateKeyPairSync, createPrivateKey, createPublicKey, sign } from 'crypto';
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
 

package/dist/{chunk-N2PXGQRL.js → chunk-KIGSGZBB.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { BUILD_HOME } from './chunk-BQXFBI7T.js';
+import { BUILD_HOME } from './chunk-V7MQKOZY.js';
 import { join, dirname } from 'path';
 
 createRequire(import.meta.url);

package/dist/{chunk-EAEELQVQ.js → chunk-KOQELWQ6.js}

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { removeRetiredSkills } from './chunk-7UWVLZXD.js';
-import { defaultFetch } from './chunk-FVMYKL6L.js';
+import { removeRetiredSkills } from './chunk-USWVXQIH.js';
+import { defaultFetch } from './chunk-VWLOQ6FI.js';
 import { resolveGatewayCredentials } from './chunk-NTRCK4NH.js';
 import { appendContextProvenance } from './chunk-ZJSNLVCE.js';
-import { loadMaintainedFiles, writeMaintainedFiles } from './chunk-NNLA7LLQ.js';
+import { loadMaintainedFiles, writeMaintainedFiles } from './chunk-5OCIHFGE.js';
 import { cliInvocation } from './chunk-CRB3POP4.js';
 import { writeDegraded, writeSourceCache, SOURCE_CACHE_TTL_RETRY_MS, writeContextManifest, SOURCE_CACHE_TTL_SUCCESS_MS, readSourceCache, isSourceCacheFresh, clearDegraded } from './chunk-YQR6E6OV.js';
 import { normalizeRepoName, parseOuterlayerConfig, classifyTree, emitTree } from './chunk-WFSUUUAN.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
-import { withTokenHeader } from './chunk-BQXFBI7T.js';
+import { withTokenHeader } from './chunk-V7MQKOZY.js';
 import { execFileSync } from 'child_process';
 import { existsSync, mkdirSync, writeFileSync, chmodSync, lstatSync, readFileSync, copyFileSync } from 'fs';
 import { isAbsolute, join, dirname } from 'path';
@@ -437,7 +437,7 @@ function ensureBareCache(git, home, repository, host) {
   }
   return dir;
 }
-var MATERIALIZED_ROOTS = ["AGENTS.md", ".claude", ".outerlayer"];
+var MATERIALIZED_ROOTS = ["AGENTS.md", ".claude", ".outerlayer", ".agents"];
 function listMaterializedFiles(git, cacheRepoDir, sha) {
   const result = git(["ls-tree", "-r", "-z", sha, "--", ...MATERIALIZED_ROOTS], { cwd: cacheRepoDir, timeoutMs: 1e4 });
   if (!result.ok) return [];

package/dist/{chunk-MTP2QEVO.js → chunk-KPBQYEND.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { RUNNER_DIR_MODE, RUNNER_FILE_MODE } from './chunk-N2PXGQRL.js';
+import { RUNNER_DIR_MODE, RUNNER_FILE_MODE } from './chunk-KIGSGZBB.js';
 import { readFileSync, existsSync, rmSync, mkdirSync, writeFileSync, renameSync } from 'fs';
 import { join } from 'path';
 

package/dist/{chunk-VYAL7PUE.js → chunk-LOB2SUM3.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { currentLink } from './chunk-AMFWYESY.js';
+import { currentLink } from './chunk-4NM3I3VV.js';
 import { readFileSync, statSync, chmodSync, mkdirSync, writeFileSync, renameSync, rmSync, existsSync, lstatSync, accessSync, constants, realpathSync } from 'fs';
 import { randomBytes } from 'crypto';
 import { join, dirname, delimiter, resolve } from 'path';