@outerlayer/cli 0.34.0-next.20261028132110 → 0.34.0-next.20261028164329

package/dist/{chunk-TTUI3S6B.js → chunk-WH3FPBPO.js}

@@ -1,33 +1,33 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
 import { sha256OfFile, downloadPinned, VoiceDownloadError } from './chunk-2PGI6RDE.js';
-import { readDefaultBranchHead, cloneRepository, buildRepositoryImage, prepareImageBuild, KEY_PREFIX, TAG_HOST, SHARED_OWNER, SHARED_NAME, metadataFromLabels, writeRecord } from './chunk-S44ZN3CV.js';
-import { FETCHED_DIR, toolsDockerfile, FETCHED_FFMPEG, FETCHED_GH, FETCHED_TINI, FETCHED_HEADLESS_SHELL, FETCHED_PLAYWRIGHT_FFMPEG, FETCHED_VOICE_DIR } from './chunk-7XZQTJOD.js';
+import { readDefaultBranchFiles, readDefaultBranchHead, cloneRepository, buildRepositoryImage, prepareImageBuild, KEY_PREFIX, TAG_HOST, SHARED_OWNER, SHARED_NAME, universalBase, metadataFromLabels, writeRecord } from './chunk-OYQVLQP3.js';
+import { FETCHED_DIR, toolsDockerfile, FETCHED_FFMPEG, FETCHED_GH, FETCHED_TINI, FETCHED_HEADLESS_SHELL, FETCHED_PLAYWRIGHT_FFMPEG, FETCHED_VOICE_DIR } from './chunk-T3XPLCJG.js';
 import { currentCliBuild } from './chunk-OGFGZQA3.js';
-import { runExec, execCapture, waitForAgent } from './chunk-NPTEYMBW.js';
-import { GUEST_CID, linkVsockSockets } from './chunk-DKIZDYUX.js';
-import { retrySend, describeCallFailure, keepStagedContext, controlPlaneTokenFailure, refusalCode, resolveGoverningSource, prefetchGovernedContext, removeStagedContext, stageGovernedContext, pinnedSourceOf, commandWithShim, shimScript, WORKFLOW_PERMISSION_REASON } from './chunk-ZXQEBRCB.js';
-import { runnerImageVersion } from './chunk-ORENXMHA.js';
-import { hasStoredCredential, AGENT_COMMANDS, storeClaudeCredential, credentialFromStdin, isAgentName } from './chunk-UAINHP2C.js';
-import { optionalEgress, runnerCredentialProblem, builtinKind, allowHostProblem, systemClock, emptyEgressCounts, hostAllowed } from './chunk-JDYBPAPP.js';
-import { formatBytes, allocatedBytes } from './chunk-47SFTQA5.js';
-import { NETWORK_HELPER_MEMORY, createDockerHost, builderSpec, runnerLabelValue, RUNNER_LABEL, BUILD_LABEL, prepareRunArgs, networkHelperName, containerRunArgs, HASH_ARGV, parseProgramHash, JUDGE_PROGRAM, mountableHome, homeCopyRunArgs, containerExecArgs, childEnvironment, readDu, JUDGE_DIR, MAX_ITEMS_BYTES, JUDGE_ITEMS, MAX_REPORT_BYTES, JUDGE_REPORT, NETWORK_READY_FILE, spawnRun, identityRunArgs, parseIdentity, networkHelperRunArgs } from './chunk-HA46L5FG.js';
+import { runExec, execCapture, waitForAgent } from './chunk-5W2YSWIW.js';
+import { GUEST_CID, linkVsockSockets } from './chunk-ROQPDCRU.js';
+import { retrySend, describeCallFailure, keepStagedContext, formatDuration, controlPlaneTokenFailure, refusalCode, resolveGoverningSource, prefetchGovernedContext, removeStagedContext, stageGovernedContext, pinnedSourceOf, commandWithShim, shimScript, WORKFLOW_PERMISSION_REASON } from './chunk-DCBFUUDL.js';
+import { runnerImageVersion } from './chunk-UXC3RQLF.js';
+import { hasStoredCredential, AGENT_COMMANDS, storeClaudeCredential, credentialFromStdin, isAgentName } from './chunk-KPEMNHVF.js';
+import { optionalEgress, runnerCredentialProblem, builtinKind, DEFAULT_SETUP_MINUTES, allowHostProblem, DEFAULT_SAVED_STATE_MAX_BYTES, systemClock, emptyEgressCounts, hostAllowed } from './chunk-YF7W7B7Y.js';
+import { DEFAULT_BUILD_DISK, formatBytes, allocatedBytes } from './chunk-RRXS4CWE.js';
+import { parseSize, NETWORK_HELPER_MEMORY, createDockerHost, builderSpec, runnerLabelValue, RUNNER_LABEL, BUILD_LABEL, prepareRunArgs, networkHelperName, containerRunArgs, HASH_ARGV, parseProgramHash, JUDGE_PROGRAM, mountableHome, homeCopyRunArgs, containerExecArgs, childEnvironment, readDu, JUDGE_DIR, MAX_ITEMS_BYTES, JUDGE_ITEMS, MAX_REPORT_BYTES, JUDGE_REPORT, NETWORK_READY_FILE, spawnRun, identityRunArgs, parseIdentity, networkHelperRunArgs, SAVED_STATE_LABEL } from './chunk-P2PNBDUT.js';
 import { RecipeError, DOCKER_FEATURE, universalImagePending, writeSanitizedRecipe, classifyProperties } from './chunk-CM4J53WZ.js';
-import { firecrackerArch, MICROVM_ARCHES, FIRECRACKER_VERSION, hostHelperPinned, CLAUDE_CODE_VERSION, builderDiskPinned, guestAssetsPinned, GUEST_HELPER_SHA256, GUEST_ASSETS_BASE_URL, GUEST_KERNEL_SHA256, JAILER_BINARY_SHA256, FIRECRACKER_BINARY_SHA256, FIRECRACKER_SHA256, GUEST_ASSETS_VERSION, BUILDER_DISK_VERSION, networkHelperPinned, NETWORK_HELPER_SHA256, universalImagePinned, UNIVERSAL_IMAGE, UNIVERSAL_IMAGE_DIGEST, UNIVERSAL_IMAGE_REPOSITORY, UNIVERSAL_IMAGE_SOURCE, FFMPEG_STATIC, FFMPEG_BUILD_TAG, GH_SHA256, GH_VERSION, TINI_SHA256, TINI_VERSION, HEADLESS_SHELL, HEADLESS_SHELL_BASE_URL, PLAYWRIGHT_FFMPEG, PLAYWRIGHT_FFMPEG_BASE_URL, VOICE_PACK_FILES, BUILDER_DISK_SHA256, BUILDER_DISK_BASE_URL, DEFAULT_BASE_IMAGE } from './chunk-D3CT6XQ4.js';
+import { firecrackerArch, MICROVM_ARCHES, FIRECRACKER_VERSION, hostHelperPinned, CLAUDE_CODE_VERSION, builderDiskPinned, guestAssetsPinned, GUEST_HELPER_SHA256, GUEST_ASSETS_BASE_URL, GUEST_KERNEL_SHA256, JAILER_BINARY_SHA256, FIRECRACKER_BINARY_SHA256, FIRECRACKER_SHA256, GUEST_ASSETS_VERSION, BUILDER_DISK_VERSION, networkHelperPinned, NETWORK_HELPER_SHA256, universalImagePinned, UNIVERSAL_IMAGE, FFMPEG_STATIC, FFMPEG_BUILD_TAG, GH_SHA256, GH_VERSION, TINI_SHA256, TINI_VERSION, HEADLESS_SHELL, HEADLESS_SHELL_BASE_URL, PLAYWRIGHT_FFMPEG, PLAYWRIGHT_FFMPEG_BASE_URL, VOICE_PACK_FILES, BUILDER_DISK_SHA256, BUILDER_DISK_BASE_URL, DEFAULT_BASE_IMAGE } from './chunk-D3CT6XQ4.js';
 import { startTimeOf, isSameProcess } from './chunk-JBJTC3UU.js';
-import { postJson, WorkCommandError, getJson } from './chunk-T664NDNT.js';
+import { postJson, WorkCommandError, getJson } from './chunk-XDAMLX2L.js';
 import { sanitizeTerminal } from './chunk-VEVNGDTP.js';
-import { signerFor } from './chunk-VJQQVTCS.js';
+import { signerFor } from './chunk-5TXQFZHY.js';
 import { sharedSkillNames, skillConflictMessage } from './chunk-FGF52V4V.js';
 import { versionAtLeast, MINIMUM_CLAUDE_VERSION } from './chunk-HCVLP7XA.js';
 import { MIN_SCRUBBED_LITERAL, setCustomScrubbers, setLocalIdentity, setRepoRoot, parseTranscript, scrubDeep, scrubText } from './chunk-GH2HEEOH.js';
 import { orderSessions, extractFacts, sessionsToTimeline } from './chunk-2EEW6FJN.js';
 import { downconvertSession } from './chunk-IXRUVR25.js';
-import { vmAssetsDir, RUNNER_DIR_MODE, rootfsPathFor, diskTemplatesDir, RUNNER_FILE_MODE, buildsDir, buildDir, runnerDir, deliveryDir, ghConfigDir, runnerDirOfBuild, spoolDir, mirrorDir, SHIM_DIR, vsockPath, builderCacheDiskPath, builderConsolePath } from './chunk-2CW2QMSG.js';
-import { claudeCredential, parseIsolation, proxyEnvironment, withProxyWarningHidden, containerLocalAddress, destinationEnvironment, CLAUDE_CREDENTIAL_VARIABLES, builtInEnvironment, withHooksPath, startBuildServices, BUILT_IN_NAMES, checkoutPath, repositoriesOf, primaryOf, RELAY_PORT, repositoryPath, CHECKOUT_DIR, lifecycleWorkdir, buildEnvironment, checkEnvironment, withMiseVariables, AGENT_CREDENTIAL_MISSING, isMiseVariableAllowed, JOB_MOUNT, realFdStorePort } from './chunk-4N7BQBO4.js';
+import { vmAssetsDir, RUNNER_DIR_MODE, rootfsPathFor, diskTemplatesDir, RUNNER_FILE_MODE, buildsDir, buildDir, runnerDir, deliveryDir, ghConfigDir, runnerDirOfBuild, spoolDir, mirrorDir, SHIM_DIR, vsockPath, builderCacheDiskPath, builderConsolePath } from './chunk-S6UM3N4R.js';
+import { claudeCredential, parseIsolation, proxyEnvironment, withProxyWarningHidden, containerLocalAddress, destinationEnvironment, CLAUDE_CREDENTIAL_VARIABLES, builtInEnvironment, withHooksPath, startBuildServices, BUILT_IN_NAMES, checkoutPath, repositoriesOf, primaryOf, RELAY_PORT, repositoryPath, CHECKOUT_DIR, lifecycleWorkdir, buildEnvironment, checkEnvironment, withMiseVariables, isMiseVariableAllowed, JOB_MOUNT, realFdStorePort, AGENT_CREDENTIAL_MISSING } from './chunk-YLPJOUVF.js';
 import { RELAY_USER, RELAY_ID, UNKNOWN_TRANSPORT_REASON, DOCKER_DESKTOP_REASON, MAX_MALFORMED_SESSIONS, MALFORMED_REASON, JOIN_WAIT_MS, MAX_OPEN_STREAMS, STREAM_RESET_RATE, STREAM_RESET_BURST, STREAM_WINDOW, SESSION_WINDOW, targetOfPath } from './chunk-MESOOLF4.js';
 import { spawn, spawnSync } from 'child_process';
-import { mkdirSync, existsSync, readFileSync, mkdtempSync, rmSync, chmodSync, truncateSync, statSync, accessSync, constants, readdirSync, writeFileSync, lstatSync, copyFileSync, renameSync, rmdirSync, unlinkSync, linkSync, openSync, closeSync, cpSync, writeSync, appendFileSync, createWriteStream, createReadStream } from 'fs';
+import { mkdirSync, existsSync, readFileSync, mkdtempSync, rmSync, chmodSync, truncateSync, statSync, accessSync, constants, readdirSync, writeFileSync, renameSync, lstatSync, copyFileSync, rmdirSync, unlinkSync, linkSync, openSync, closeSync, cpSync, writeSync, appendFileSync, createWriteStream, createReadStream } from 'fs';
 import { randomBytes, createHash } from 'crypto';
 import { join, dirname, isAbsolute, relative, resolve, basename } from 'path';
 import { createConnection, connect, createServer as createServer$1, isIP } from 'net';
@@ -186,9 +186,9 @@ async function download(file, url, fetchImpl) {
   if (!response.ok) throw new AssetError(file, `${file} could not be downloaded from ${url}: the server answered ${response.status}`);
   return Buffer.from(await response.arrayBuffer());
 }
-function keptPath(dir, sha256, name) {
-  mkdirSync(join(dir, sha256), { recursive: true, mode: RUNNER_DIR_MODE });
-  return join(dir, sha256, name);
+function keptPath(dir, sha2562, name) {
+  mkdirSync(join(dir, sha2562), { recursive: true, mode: RUNNER_DIR_MODE });
+  return join(dir, sha2562, name);
 }
 async function ensureFile(dir, file, pin, fetchImpl, mode, stops = MICROVM_STOPS) {
   const path = keptPath(dir, pin.sha256, file);
@@ -2392,8 +2392,7 @@ async function buildInBuilder(opts, deps, prepared) {
         claudeCodeVersion: prepared.claudeCodeVersion,
         buildId: opts.cli.buildId,
         guestHelper: true,
-        fetched: true,
-        ...location.kind === "default" ? { universal: true } : {}
+        fetched: true
       })
     );
     inputs = builderInput({ checkoutDir: checkout.dir, toolsDir, toolFilesDir, recipeDir }, archive);
@@ -2415,6 +2414,7 @@ async function buildInBuilder(opts, deps, prepared) {
     const described = JSON.parse(result);
     const imageConfig = parseImageConfig(JSON.stringify(described.config));
     const labels = described.config.Labels ?? {};
+    const base = universalBase(location, labels);
     mkdirSync(recordDir, { recursive: true, mode: RUNNER_DIR_MODE });
     const fd = openSync(partial, "w", 384);
     let received = 0;
@@ -2444,7 +2444,7 @@ async function buildInBuilder(opts, deps, prepared) {
       sourceCommit: checkout.commit,
       defaultBranch: checkout.defaultBranch,
       recipe: location.kind === "default" ? "default" : location.path,
-      ...location.kind === "default" ? { base: { reference: `${UNIVERSAL_IMAGE_REPOSITORY}:${UNIVERSAL_IMAGE_SOURCE}`, digest: UNIVERSAL_IMAGE_DIGEST } } : {},
+      ...base === void 0 ? {} : { base },
       recipeKey: prepared.recipeKey,
       toolsKey: prepared.toolsKey,
       imageId: `${ROOT_DISK_ID_PREFIX}${rKey}-${tKey}`,
@@ -2847,8 +2847,8 @@ function needsBuildSkill(queue, command) {
 }
 function missingBuildSkillReason(governed, lookupFailure) {
   const checked = governed === void 0 ? BUILD_SKILL_PATHS.join(" and ") : `${BUILD_SKILL_PATHS.join(", ")} and the governed context from ${governed.repository}@${governed.commit.slice(0, 7)}`;
-  const lookup2 = lookupFailure === void 0 ? "" : `, and the lookup of the governing repository failed (${lookupFailure})`;
-  return `the build has no \`build\` skill, so /build would load nothing${lookup2}: checked ${checked}`;
+  const lookup3 = lookupFailure === void 0 ? "" : `, and the lookup of the governing repository failed (${lookupFailure})`;
+  return `the build has no \`build\` skill, so /build would load nothing${lookup3}: checked ${checked}`;
 }
 function cloneHasBuildSkill(checkout) {
   return BUILD_SKILL_PATHS.some((path) => existsSync(join(checkout, path)));
@@ -2989,6 +2989,22 @@ var MANIFESTS = {
   "build.gradle": "java",
   "build.gradle.kts": "java"
 };
+var VERSION_FILES = [
+  ".nvmrc",
+  ".node-version",
+  ".python-version",
+  ".ruby-version",
+  ".java-version",
+  ".go-version",
+  ".tool-versions",
+  "mise.toml",
+  ".mise.toml",
+  ".config/mise.toml",
+  ".config/mise/config.toml",
+  "go.mod",
+  "rust-toolchain.toml",
+  "rust-toolchain"
+];
 var IMAGE_CONFIG = "/etc/mise/config.toml";
 var RUST_PIN_FILES = ["rust-toolchain.toml", "rust-toolchain"];
 var REFUSALS_NAMED2 = 3;
@@ -3127,6 +3143,128 @@ function ranRuntimeStep(state) {
   return state?.unpinnedRuntimes !== void 0;
 }
 
+// src/runner/setup-scripts.ts
+var SETUP_SCRIPT = ".outerlayer/setup.sh";
+var RUN_SCRIPT = 'if [ -x "$1" ]; then exec "$1"; else exec /bin/sh "$1"; fi';
+function tailOf(result) {
+  const lines = `${result.stdout}
+${result.stderr}`.split("\n").map((line2) => line2.trimEnd()).filter((line2) => line2 !== "");
+  return lines.slice(-20).join(" | ");
+}
+function failureReason(entry, input, result) {
+  const tail = tailOf(result);
+  const printed = tail === "" ? "it printed nothing" : `the last lines it printed: ${tail}`;
+  if (result.timedOut === true) {
+    return `setup_timed_out: ${SETUP_SCRIPT} in ${entry.repository} ran past runner.build.setupMinutes (${input.limitMinutes} ${input.limitMinutes === 1 ? "minute" : "minutes"}); ${printed}`;
+  }
+  return `setup_failed: ${SETUP_SCRIPT} in ${entry.repository} failed (exit ${result.status}); ${printed}`;
+}
+async function runSetupScripts(input) {
+  const { exec, log, tag } = input;
+  const ran = [];
+  const missing = [];
+  for (const entry of input.repositories) {
+    if (input.aborted()) return { ok: false, reason: "", aborted: true };
+    const path = checkoutPath(entry);
+    const probe = await exec(["test", "-f", SETUP_SCRIPT], path, { quiet: true });
+    if (probe.status === 1) {
+      missing.push(entry.repository);
+      continue;
+    }
+    if (probe.status !== 0) return { ok: false, reason: `setup_failed: checking for ${SETUP_SCRIPT} in ${entry.repository} failed (exit ${probe.status})` };
+    log.line(`${tag} setup ${entry.repository}: running ${SETUP_SCRIPT}`);
+    const started = Date.now();
+    const result = await exec(["sh", "-c", RUN_SCRIPT, "setup", SETUP_SCRIPT], path, { timeoutMs: input.timeoutMs });
+    if (result.status !== 0 || result.timedOut === true) return { ok: false, reason: failureReason(entry, input, result) };
+    log.line(`${tag} setup ${entry.repository}: ${SETUP_SCRIPT} passed in ${formatDuration(Date.now() - started)}`);
+    ran.push(entry.repository);
+  }
+  return { ok: true, ran, missing };
+}
+function keepMissingSetupScripts(state, steps) {
+  if (steps.missingSetupScripts !== void 0) state.missingSetupScripts = steps.missingSetupScripts;
+}
+
+// src/runner/saved-state/key.ts
+function sha256(text) {
+  return createHash("sha256").update(text).digest("hex");
+}
+function keyFilePaths() {
+  return [SETUP_SCRIPT, ...VERSION_FILES];
+}
+function significant(path, content) {
+  if (path !== "go.mod") return content;
+  return content.split("\n").filter((line2) => /^\s*(go|toolchain)\s/.test(line2)).map((line2) => line2.trim()).join("\n");
+}
+function hashOf(path, content) {
+  return content === null || content === void 0 ? "absent" : sha256(`present:${significant(path, content)}`);
+}
+function stateKey(input) {
+  const baseKey = sha256(JSON.stringify({ version: 1, factory: input.factory, repositories: input.repositories.map((entry) => entry.repository), imageDigest: input.imageDigest, diskBytes: input.diskBytes }));
+  const fileHashes = {};
+  for (const entry of input.repositories) {
+    for (const path of keyFilePaths()) fileHashes[`${entry.repository}:${path}`] = hashOf(path, entry.files[path]);
+  }
+  return { baseKey, key: sha256(JSON.stringify([baseKey, fileHashes])), fileHashes };
+}
+function changedFiles(saved, current) {
+  const names = /* @__PURE__ */ new Set([...Object.keys(saved), ...Object.keys(current)]);
+  return [...names].filter((name) => (saved[name] ?? "absent") !== (current[name] ?? "absent"));
+}
+
+// src/runner/saved-state/select.ts
+var SAVED_STATE_MAX_AGE_MS = 7 * 864e5;
+var INCOMPLETE_GRACE_MS = 36e5;
+function savedAtOf(record) {
+  return Date.parse(record.savedAt);
+}
+function oldestFirst(records) {
+  return [...records].sort((a, b) => savedAtOf(a) - savedAtOf(b));
+}
+function newestFirst(records) {
+  return oldestFirst(records).reverse();
+}
+function lookup2(records, key, nowMs) {
+  const complete = newestFirst(records.filter((record) => record.complete));
+  const same = complete.filter((record) => record.key === key.key);
+  const fresh = same.find((record) => nowMs - savedAtOf(record) < SAVED_STATE_MAX_AGE_MS);
+  if (fresh !== void 0) return { kind: "usable", record: fresh, ageMs: nowMs - savedAtOf(fresh) };
+  if (same[0] !== void 0) return { kind: "expired", record: same[0], ageMs: nowMs - savedAtOf(same[0]) };
+  const near = complete.find((record) => record.baseKey === key.baseKey);
+  if (near !== void 0) return { kind: "changed", record: near, files: changedFiles(near.fileHashes, key.fileHashes) };
+  return { kind: "none" };
+}
+function savingRefusedBecause(input) {
+  if (!input.universalImage) return "its image comes from a devcontainer file";
+  if (input.managed) return "this runner is managed";
+  if (input.savedStateMax === "off") return "runner.housekeeping.savedStateMax is off";
+  return void 0;
+}
+function checkoutNotAtDefaultHead(checkouts) {
+  for (const entry of checkouts) {
+    if (entry.keyCommit === void 0) return `${entry.repository}: the host did not read its default branch`;
+    if (entry.startCommit !== entry.keyCommit) return `${entry.repository}: its default branch moved after the host read the key's files`;
+    if (entry.head !== entry.startCommit) return `${entry.repository}: its branch already holds commits`;
+  }
+  return void 0;
+}
+function selectExpired(records, nowMs) {
+  return records.filter((record) => nowMs - savedAtOf(record) >= SAVED_STATE_MAX_AGE_MS);
+}
+function selectToFit(records, maxBytes) {
+  let total = records.reduce((sum, record) => sum + record.bytes, 0);
+  const selected = [];
+  for (const record of oldestFirst(records)) {
+    if (total <= maxBytes) break;
+    selected.push(record);
+    total -= record.bytes;
+  }
+  return selected;
+}
+function selectStaleIncomplete(records, nowMs) {
+  return records.filter((record) => !record.complete && nowMs - savedAtOf(record) >= INCOMPLETE_GRACE_MS);
+}
+
 // src/runner/build-steps.ts
 var aborted = () => ({ ok: false, reason: "", aborted: true });
 function gitErrorLine(text) {
@@ -3192,13 +3330,24 @@ async function deliver(input, staged) {
   if (recorded.status !== 0) return { ok: false, reason: failure("recording the delivery failed", recorded) };
   return { ok: true };
 }
-async function checkOut(input, entry) {
+async function checkOut(input, entry, restored) {
   const { exec, log, tag } = input;
   const path = checkoutPath(entry);
-  const clone = await exec(["git", "clone", "--filter=blob:none", "--single-branch", `https://github.com/${entry.repository}.git`, path], "/build/work");
-  if (clone.status !== 0) {
-    const detail = gitErrorLine(clone.stderr);
-    return { ok: false, reason: `the clone of ${entry.repository} failed (exit ${clone.status})${detail === "" ? "" : `: ${detail}`}` };
+  const failed = (reason) => ({ ok: false, reason, ...restored ? { restoreFailed: true } : {} });
+  if (restored) {
+    for (const argv of [["git", "reset", "--hard", "-q"], ["git", "clean", "-fdq"]]) {
+      const cleaned = await exec(argv, path, { quiet: true });
+      if (cleaned.status !== 0) {
+        const detail = gitErrorLine(cleaned.stderr);
+        return failed(`the saved checkout of ${entry.repository} could not be cleaned (${argv[1]} exit ${cleaned.status})${detail === "" ? "" : `: ${detail}`}`);
+      }
+    }
+  } else {
+    const clone = await exec(["git", "clone", "--filter=blob:none", "--single-branch", `https://github.com/${entry.repository}.git`, path], "/build/work");
+    if (clone.status !== 0) {
+      const detail = gitErrorLine(clone.stderr);
+      return { ok: false, reason: `the clone of ${entry.repository} failed (exit ${clone.status})${detail === "" ? "" : `: ${detail}`}` };
+    }
   }
   try {
     const prepared = await prepareBranch({
@@ -3210,9 +3359,12 @@ async function checkOut(input, entry) {
       }
     });
     log.line(`${tag} ${entry.primary ? "" : `${entry.repository} `}on ${prepared.branch} at ${prepared.head.slice(0, 8)}`);
-    return { ok: true, startCommit: prepared.startCommit };
+    return { ok: true, head: prepared.head, startCommit: prepared.startCommit };
   } catch (err) {
-    if (err instanceof BranchPrepareError) return { ok: false, reason: entry.primary ? err.message : `${entry.repository}: ${err.message}` };
+    if (err instanceof BranchPrepareError) {
+      const reason = entry.primary ? err.message : `${entry.repository}: ${err.message}`;
+      return failed(restored ? `the saved checkout of ${entry.repository} could not be switched to ${entry.branch}: ${err.message}` : reason);
+    }
     throw err;
   }
 }
@@ -3235,24 +3387,29 @@ async function runBuildSteps(input) {
   const primary = primaryOf(repositories) ?? { repository, branch: input.branch, primary: true };
   const rewrite = await exec(["git", "config", "--global", `url.http://127.0.0.1:${RELAY_PORT}/github.com/.insteadOf`, "https://github.com/"], "/build/work");
   if (rewrite.status !== 0) return { ok: false, reason: `configuring the build's git remote failed (exit ${rewrite.status})` };
-  const first = await checkOut(input, { ...primary, primary: true });
+  const restored = input.setup?.restored === true;
+  const heads = [];
+  const keyCommits = input.setup?.keyCommits ?? {};
+  const first = await checkOut(input, { ...primary, primary: true }, restored);
   if (!first.ok) return first;
   startCommit = first.startCommit;
-  if (repositories.length > 1) {
+  heads.push({ repository: primary.repository, head: first.head, startCommit: first.startCommit, keyCommit: keyCommits[primary.repository] });
+  if (repositories.length > 1 && !restored) {
     const linkPath = repositoryPath(primary.repository);
     const linked = await exec(["sh", "-c", 'mkdir -p "$(dirname "$1")" && ln -s "$2" "$1"', "link", linkPath, CHECKOUT_DIR], "/build/work");
     if (linked.status !== 0) return { ok: false, reason: `linking ${primary.repository} at ${linkPath} failed (exit ${linked.status})` };
   }
   for (const entry of repositories.filter((candidate) => candidate.repository !== primary.repository)) {
     if (input.aborted()) return aborted();
-    const checked = await checkOut(input, { ...entry, primary: false });
+    const checked = await checkOut(input, { ...entry, primary: false }, restored);
     if (!checked.ok) return checked;
+    heads.push({ repository: entry.repository, head: checked.head, startCommit: checked.startCommit, keyCommit: keyCommits[entry.repository] });
   }
   if (input.governing !== void 0) await noteIgnoredDevcontainers(input, repositories, input.governing.repository);
+  const ordered = [{ ...primary, primary: true }, ...repositories.filter((candidate) => candidate.repository !== primary.repository).map((entry) => ({ ...entry, primary: false }))];
   let unpinnedRuntimes;
   let miseVariables;
   if (input.runtimes !== void 0) {
-    const ordered = [{ ...primary, primary: true }, ...repositories.filter((candidate) => candidate.repository !== primary.repository).map((entry) => ({ ...entry, primary: false }))];
     const chosen = await provisionRuntimes({ repositories: ordered, exec, log, tag, refusals: input.runtimes.refusals, aborted: input.aborted });
     if (!chosen.ok) return chosen.aborted === true ? aborted() : { ok: false, reason: chosen.reason };
     unpinnedRuntimes = chosen.unpinned;
@@ -3267,6 +3424,25 @@ async function runBuildSteps(input) {
     if (ran.status !== 0) return { ok: false, reason: lifecycleFailureReason(step, ran.status) };
   }
   if (input.aborted()) return aborted();
+  let missingSetupScripts;
+  let savedState = false;
+  if (input.setup !== void 0) {
+    const { setup } = input;
+    const ran = await runSetupScripts({ repositories: ordered, exec: commandExec, log, tag, timeoutMs: setup.timeoutMs, limitMinutes: setup.limitMinutes, aborted: input.aborted });
+    if (!ran.ok) return ran.aborted === true ? aborted() : { ok: false, reason: ran.reason };
+    missingSetupScripts = ran.missing;
+    if (setup.saveState !== void 0 && setup.restored !== true && ran.ran.length > 0) {
+      const notAtHead = checkoutNotAtDefaultHead(heads);
+      if (notAtHead !== void 0) {
+        log.line(`${tag} this build saves no state: ${notAtHead}`);
+      } else {
+        const saved = await setup.saveState();
+        if (saved.ok) savedState = true;
+        else log.line(`${tag} the build's state could not be saved: ${saved.reason}`);
+      }
+    }
+    if (input.aborted()) return aborted();
+  }
   const staged = await input.stageContext();
   if (staged.kind === "refused") return { ok: false, reason: staged.reason };
   let controlPlane;
@@ -3308,9 +3484,324 @@ async function runBuildSteps(input) {
     startCommit,
     ...controlPlane === void 0 ? {} : { controlPlane },
     ...unpinnedRuntimes === void 0 ? {} : { unpinnedRuntimes },
+    ...missingSetupScripts === void 0 ? {} : { missingSetupScripts },
+    ...savedState ? { savedState: true } : {},
     ...miseVariables === void 0 ? {} : { miseVariables }
   };
 }
+function savedStatesDir(runnerDirPath) {
+  return join(runnerDirPath, "saved-states");
+}
+function writeRecord2(dir, record) {
+  mkdirSync(dir, { recursive: true, mode: RUNNER_DIR_MODE });
+  const target = join(dir, `${record.id}.json`);
+  const partial = `${target}.partial`;
+  writeFileSync(partial, `${JSON.stringify(record, null, 2)}
+`, { mode: RUNNER_FILE_MODE });
+  renameSync(partial, target);
+}
+function isRecord(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const r = value;
+  return typeof r.id === "string" && (r.kind === "volume" || r.kind === "tar") && typeof r.savedAt === "string" && Number.isFinite(Date.parse(r.savedAt)) && typeof r.bytes === "number" && typeof r.baseKey === "string" && typeof r.key === "string" && typeof r.fileHashes === "object" && r.fileHashes !== null && typeof r.complete === "boolean";
+}
+function readRecords(dir) {
+  let names;
+  try {
+    names = readdirSync(dir);
+  } catch {
+    return [];
+  }
+  const records = [];
+  for (const name of names) {
+    if (!name.endsWith(".json")) continue;
+    try {
+      const parsed = JSON.parse(readFileSync(join(dir, name), "utf8"));
+      if (isRecord(parsed)) records.push(parsed);
+    } catch {
+    }
+  }
+  return records;
+}
+function deleteRecord(dir, id) {
+  rmSync(join(dir, `${id}.json`), { force: true });
+}
+
+// src/runner/saved-state/plan.ts
+function savedStateBase(report) {
+  const digest = report.recipe === "default" ? report.base?.digest : void 0;
+  return digest === void 0 ? void 0 : { digest };
+}
+function savedStateMaxOf(config) {
+  return config.housekeeping?.savedStateMax ?? DEFAULT_SAVED_STATE_MAX_BYTES;
+}
+async function planSavedState(input) {
+  const { config, runtime, log } = input;
+  const refused2 = savingRefusedBecause({ universalImage: input.base !== void 0, managed: config.managed === true, savedStateMax: savedStateMaxOf(config) });
+  if (refused2 !== void 0 || input.base === void 0) {
+    const why = refused2 ?? "its image comes from a devcontainer file";
+    log(`this build saves no state: ${why}`);
+    return { keyCommits: {}, noSave: why };
+  }
+  const root = runnerDir(config.configPath);
+  const repositories = [];
+  const keyCommits = {};
+  for (const entry of input.repositories) {
+    let token;
+    try {
+      token = entry.primary ? await input.tokens.token("read") : await input.tokens.token("read", entry.repository);
+    } catch (err) {
+      return unread(`the read token for ${entry.repository} could not be had: ${describeCallFailure(err)}`, log);
+    }
+    const [owner = "", name = ""] = entry.repository.split("/");
+    const read = await runtime.readKeyFiles({
+      remote: runtime.remoteFor?.(entry.repository) ?? `${runtime.github.gitUrl}/${entry.repository}.git`,
+      dir: join(root, "key-files", owner, name),
+      paths: keyFilePaths(),
+      token
+    });
+    if (!read.ok) return unread(read.reason, log);
+    keyCommits[entry.repository] = read.commit;
+    repositories.push({ repository: entry.repository, commit: read.commit, files: read.files });
+  }
+  const key = stateKey({
+    factory: config.appId,
+    repositories,
+    imageDigest: input.base.digest,
+    diskBytes: parseSize(config.build?.disk ?? DEFAULT_BUILD_DISK) ?? 0
+  });
+  const found = lookup2(readRecords(savedStatesDir(root)), key, input.now.getTime());
+  if (found.kind === "usable" && input.allowRestore) {
+    log(`starting from saved state ${found.record.id}, saved ${formatDuration(found.ageMs)} ago`);
+    return { key, keyCommits, restore: { record: found.record, ageMs: found.ageMs } };
+  }
+  if (found.kind === "expired") {
+    log(`saved state ${found.record.id} is ${formatDuration(found.ageMs)} old, past the limit of ${SAVED_STATE_MAX_AGE_MS / 864e5} days; starting from a fresh disk`);
+  } else if (found.kind === "changed") {
+    log(`the setup script or version files changed on the default branch since saved state ${found.record.id}: ${found.files.join(", ")}; starting from a fresh disk`);
+  } else if (found.kind === "none") {
+    log("no saved state matches this build's key; starting from a fresh disk");
+  }
+  return { key, keyCommits };
+}
+function unread(reason, log) {
+  log(`this build starts from no saved state and saves none: ${reason}`);
+  return { keyCommits: {}, noSave: `its key files could not be read: ${reason}` };
+}
+async function removeSavedState(record, deps) {
+  if (record.kind === "volume" && record.volume !== void 0) {
+    const result = await deps.removeVolume(record.volume);
+    if (result !== void 0 && result.status !== 0) {
+      const line2 = (result.stderr ?? "").trim().split("\n").filter((text) => text.trim() !== "").at(-1);
+      throw new Error(`Docker could not remove volume ${record.volume} (exit ${result.status}${line2 === void 0 ? "" : `: ${line2}`})`);
+    }
+  }
+  if (record.kind === "tar" && record.path !== void 0) {
+    rmSync(`${record.path}.partial`, { force: true });
+    rmSync(record.path, { force: true });
+  }
+  deleteRecord(deps.dir, record.id);
+}
+async function removeOldestUntil(input) {
+  const removed = [];
+  for (const record of oldestFirst(input.records)) {
+    if (input.enough()) break;
+    try {
+      await removeSavedState(record, input.deps);
+      removed.push(record);
+      input.log(`removed saved state ${record.id} from ${record.savedAt}`);
+    } catch (err) {
+      input.log(`could not remove saved state ${record.id}: ${describeCallFailure(err)}`);
+    }
+  }
+  return removed;
+}
+async function removeSuperseded(input) {
+  for (const old of input.records.filter((record) => record.complete && record.key === input.made.key && record.id !== input.made.id && Date.parse(record.savedAt) < Date.parse(input.made.savedAt))) {
+    try {
+      await removeSavedState(old, input.deps);
+      input.log(`removed saved state ${old.id}, saved state ${input.made.id} replaces it`);
+    } catch (err) {
+      input.log(`could not remove saved state ${old.id}: ${describeCallFailure(err)}`);
+    }
+  }
+}
+
+// src/runner/saved-state/provision.ts
+var isRetryFresh = (value) => typeof value === "object" && value !== null && "retryFresh" in value;
+async function provisionWithFreshFallback(input) {
+  const first = await input.attempt(true);
+  if (!isRetryFresh(first)) return first;
+  input.log(`${first.reason}; provisioning the build again from a fresh disk`);
+  return await input.attempt(false);
+}
+function clockOf(now) {
+  return now ?? (() => /* @__PURE__ */ new Date());
+}
+function taggedLog(log, tag) {
+  return (line2) => log.line(`${tag} ${line2}`);
+}
+function uidFromProbe(probe) {
+  const uid = Number(probe.stdout);
+  return probe.status === 0 && Number.isInteger(uid) ? uid : null;
+}
+function agentUidOf(probe) {
+  return uidFromProbe(probe) ?? void 0;
+}
+function userIdChangedReason(savedUid, agentUid) {
+  if (savedUid === void 0 || agentUid === savedUid) return void 0;
+  return `the build user's id is ${agentUid ?? "unknown"} and it was ${savedUid} when the state was saved`;
+}
+function setupInputFor(input) {
+  const minutes = input.setupMinutes ?? DEFAULT_SETUP_MINUTES;
+  return {
+    timeoutMs: minutes * 6e4,
+    limitMinutes: minutes,
+    restored: input.plan.restore !== void 0,
+    keyCommits: input.plan.keyCommits,
+    // A plan has a key exactly when the build may save a state. A build that starts from one is not asked to save.
+    ...input.plan.key === void 0 ? {} : { saveState: input.saveState }
+  };
+}
+async function saveAndPrune(input) {
+  const made = await input.save();
+  if (!made.ok) return made;
+  input.log(`saved state ${made.record.id}`);
+  await removeSuperseded({ made: made.record, records: readRecords(input.dir), deps: { dir: input.dir, removeVolume: input.removeVolume }, log: input.log });
+  return { ok: true };
+}
+async function discardUnusableState(input) {
+  try {
+    await removeSavedState(input.record, { dir: input.dir, removeVolume: input.removeVolume });
+  } catch (err) {
+    input.onError(`could not remove saved state ${input.record.id}: ${describeCallFailure(err)}`);
+  }
+  return { retryFresh: true, reason: `saved state ${input.record.id} could not be used: ${input.reason}` };
+}
+function settleFailedSteps(steps, on) {
+  return steps.restoreFailed === true ? on.giveUp(steps.reason) : on.bail(steps.reason, steps.aborted === true);
+}
+var SAVED_FOLDERS = ["home", "work"];
+function stopProcessesScript() {
+  return [
+    "me=$$; uid=$(id -u); n=0; pass=0",
+    "while [ $pass -lt 25 ]; do",
+    '  left=""',
+    "  for p in /proc/[0-9]*; do",
+    "    pid=${p##*/}",
+    '    [ "$pid" = "$me" ] && continue',
+    `    info=$(sed -n -e 's/^State:[[:space:]]*\\(.\\).*/S=\\1/p' -e 's/^Uid:[[:space:]]*\\([0-9]*\\).*/U=\\1/p' "$p/status" 2>/dev/null) || continue`,
+    '    case "$info" in *"S=Z"*) continue ;; esac',
+    // The uid is the last line of `info`, so a match at its end cannot be the longer id 10000 for 1000.
+    '    case "$info" in *"U=$uid") left="$left $pid" ;; esac',
+    "  done",
+    '  [ -z "$left" ] && break',
+    '  for pid in $left; do kill -KILL "$pid" 2>/dev/null && n=$((n+1)); done',
+    "  pass=$((pass+1))",
+    "  sleep 0.2",
+    "done",
+    '[ -z "$left" ] || { echo "$left are still running" >&2; exit 1; }',
+    'echo "stopped $n"'
+  ].join("\n");
+}
+var HELPER_FLAGS = [
+  "--rm",
+  "--network",
+  "none",
+  "--cap-drop",
+  "ALL",
+  "--cap-add",
+  "CHOWN",
+  "--cap-add",
+  "DAC_OVERRIDE",
+  "--cap-add",
+  "DAC_READ_SEARCH",
+  "--cap-add",
+  "FOWNER",
+  "--security-opt",
+  "no-new-privileges",
+  "--read-only",
+  "--user",
+  "0",
+  "--pids-limit",
+  "256"
+];
+function helperArgs(input) {
+  return [
+    ...HELPER_FLAGS,
+    "--label",
+    `${RUNNER_LABEL}=${input.runnerId}`,
+    "--mount",
+    `type=volume,src=${input.from},dst=/from,readonly`,
+    "--mount",
+    `type=volume,src=${input.to},dst=/to`,
+    "--entrypoint",
+    "sh",
+    input.image,
+    "-c",
+    input.script
+  ];
+}
+var SAVE_SCRIPT = `set -e; cp -a ${SAVED_FOLDERS.map((name) => `/from/${name}`).join(" ")} /to/; du -sk /to | cut -f1`;
+var RESTORE_SCRIPT = `set -e; cp -a ${SAVED_FOLDERS.map((name) => `/from/${name}`).join(" ")} /to/`;
+function failureText(result) {
+  const line2 = result.stderr.trim().split("\n").at(-1) ?? "";
+  return `exit ${result.status}${line2 === "" ? "" : `: ${line2}`}`;
+}
+async function saveContainerState(input) {
+  const { host } = input;
+  const id = randomBytes(6).toString("hex");
+  const volume = `outerlayer-saved-${id}`;
+  const record = {
+    id,
+    kind: "volume",
+    volume,
+    savedAt: input.now.toISOString(),
+    bytes: 0,
+    baseKey: input.key.baseKey,
+    key: input.key.key,
+    fileHashes: input.key.fileHashes,
+    ...input.agentUid === void 0 ? {} : { agentUid: input.agentUid },
+    complete: false
+  };
+  const discard = async (reason) => {
+    const removed = await host.removeVolume(volume).catch((err) => ({ status: -1, stderr: describeCallFailure(err) }));
+    if (removed.status !== 0) {
+      input.log(`the volume ${volume} could not be removed (${failureText({ status: removed.status, stderr: removed.stderr })}); its record stays so a later pass retries`);
+      return { ok: false, reason };
+    }
+    deleteRecord(input.dir, id);
+    return { ok: false, reason };
+  };
+  try {
+    const noEnv = { literals: {}, passed: {} };
+    const stopped = await host.exec({ container: input.container, user: input.agentUser, env: noEnv, argv: ["sh", "-c", stopProcessesScript()] });
+    if (stopped.status !== 0) return { ok: false, reason: `the build's processes could not be stopped (${failureText(stopped)})` };
+    input.log(`${stopped.stdout.trim() || "stopped 0"} process${stopped.stdout.trim() === "stopped 1" ? "" : "es"} before saving the state`);
+    const flushed = await host.exec({ container: input.container, user: input.agentUser, env: noEnv, argv: ["sync"] });
+    if (flushed.status !== 0) return { ok: false, reason: `the build's disk could not be flushed (${failureText(flushed)})` };
+    writeRecord2(input.dir, record);
+    const created = await host.createVolume(volume, { [SAVED_STATE_LABEL]: id, [RUNNER_LABEL]: input.runnerId });
+    if (created.status !== 0) return await discard(`the volume for the saved state could not be made (${failureText(created)})`);
+    const copied = await host.run(helperArgs({ image: input.image, from: input.buildVolume, to: volume, script: SAVE_SCRIPT, runnerId: input.runnerId }), { logPath: input.logPath });
+    if (copied.status !== 0) return await discard(`the copy into the saved state failed (${failureText(copied)})`);
+    const kilobytes = Number(copied.stdout.trim().split("\n").at(-1));
+    const done = { ...record, bytes: Number.isFinite(kilobytes) ? kilobytes * 1024 : 0, complete: true };
+    writeRecord2(input.dir, done);
+    return { ok: true, record: done };
+  } catch (err) {
+    return await discard(`the state could not be saved: ${describeCallFailure(err)}`);
+  }
+}
+async function restoreContainerState(input) {
+  try {
+    const copied = await input.host.run(helperArgs({ image: input.image, from: input.savedVolume, to: input.targetVolume, script: RESTORE_SCRIPT, runnerId: input.runnerId }), { logPath: input.logPath });
+    if (copied.status !== 0) return { ok: false, reason: `the saved volume could not be copied (${failureText(copied)})` };
+    return { ok: true };
+  } catch (err) {
+    return { ok: false, reason: `the saved volume could not be copied: ${describeCallFailure(err)}` };
+  }
+}
 var EVAL_INPUT_NAME = "eval-input";
 var TRANSCRIPT_ROOT = "/build/home/.claude/projects";
 var MAX_TRANSCRIPT_BYTES = 7 * 1024 * 1024;
@@ -4601,6 +5092,7 @@ function createContainerRuntime(opts = {}) {
     github: { gitUrl: opts.github?.gitUrl ?? "https://github.com", apiUrl: opts.github?.apiUrl ?? "https://api.github.com" },
     remoteFor,
     readHead: opts.readHead ?? readDefaultBranchHead,
+    readKeyFiles: opts.readKeyFiles ?? readDefaultBranchFiles,
     clone: opts.clone ?? ((input) => cloneRepository(input.remote, input.dest)),
     destinationOptions: opts.destinationOptions,
     claudeUpstream: opts.claudeUpstream,
@@ -4763,6 +5255,12 @@ async function controlPlaneReadToken(tokens, controlPlane) {
   }
 }
 async function provisionContainer(input) {
+  return provisionWithFreshFallback({
+    attempt: (allowRestore) => provisionContainerOnce(input, allowRestore),
+    log: (line2) => input.log.line(`#${input.item.number} ${line2}`)
+  });
+}
+async function provisionContainerOnce(input, allowRestore) {
   const { config, runtime, item, itemKey, jobDir, log, tokens } = input;
   const { host } = runtime;
   const tag = `#${item.number}`;
@@ -4821,6 +5319,18 @@ async function provisionContainer(input) {
   if (!obtained.ok) return obtained.aborted === true ? { ok: false, reason: obtained.reason, aborted: true } : fail(obtained.reason);
   const built = obtained.built;
   const { report } = built;
+  const tagged = taggedLog(log, tag);
+  const plan = await planSavedState({
+    config,
+    repositories,
+    base: savedStateBase(report),
+    runtime,
+    tokens,
+    now: clockOf(input.now)(),
+    allowRestore,
+    log: tagged
+  });
+  const savedStatesPath = savedStatesDir(runnerDir(config.configPath));
   const buildId = randomBytes(6).toString("hex");
   const name = `outerlayer-build-${buildId}`;
   const buildDir2 = buildDir(config.configPath, buildId);
@@ -4877,6 +5387,16 @@ async function provisionContainer(input) {
     return aborted2 ? { ok: false, reason: "ended before provision finished", aborted: true } : fail(reason);
   };
   const dockerFailed = (what, result) => bail(`${what} failed (exit ${result.status})${said(result.stderr)}`);
+  const giveUpState = async (reason) => {
+    await bail(reason);
+    return discardUnusableState({
+      record: plan.restore.record,
+      reason,
+      dir: savedStatesPath,
+      removeVolume: (volume2) => host.removeVolume(volume2),
+      onError: (line2) => log.error(`${tag} ${line2}`)
+    });
+  };
   if (input.aborted()) return bail("", true);
   mkdirSync(buildDir2, { recursive: true });
   const ghDir = ghConfigDir(buildDir2);
@@ -4928,6 +5448,10 @@ async function provisionContainer(input) {
   };
   const prepared = await host.run(prepareRunArgs(runInput), { logPath });
   if (prepared.status !== 0) return dockerFailed("preparing the build's volume", prepared);
+  if (plan.restore !== void 0) {
+    const restored = await restoreContainerState({ host, image: report.imageId, savedVolume: plan.restore.record.volume, targetVolume: name, runnerId, logPath });
+    if (!restored.ok) return giveUpState(restored.reason);
+  }
   const imageConfig = await host.imageConfig(report.imageId);
   const resolved = await resolveBuildUser(runtime, runInput, { remoteUser: report.apply.remoteUser, imageUser: imageConfig.user }, logPath);
   if (!resolved.ok) return bail(resolved.reason);
@@ -4953,6 +5477,10 @@ async function provisionContainer(input) {
     delivered: readToken,
     onFailure: (reason) => log.error(`${tag} ${reason}`)
   });
+  const agentUidProbe = await host.exec({ container: name, user: ADDED_USER, env: NO_ENV, argv: ["id", "-u", agentUser] });
+  const agentUid = agentUidOf(agentUidProbe);
+  const changed = userIdChangedReason(plan.restore?.record.agentUid, agentUid);
+  if (changed !== void 0) return giveUpState(changed);
   const tools = await host.exec({ container: name, user: ADDED_USER, env: NO_ENV, argv: ["cat", "/opt/outerlayer/tools.json"] });
   const agentVersion = agentVersionOf(tools.status === 0 ? tools.stdout : "");
   environment.agentVersion = agentVersion;
@@ -4960,7 +5488,29 @@ async function provisionContainer(input) {
   const hashed = program.status === 0 ? parseProgramHash(program.stdout) : void 0;
   if (hashed !== void 0) state.judgeProgram = { path: JUDGE_PROGRAM, sha256: hashed };
   input.save(state, environment);
-  const exec = (argv, workdir, opts) => host.exec({ container: name, user: agentUser, workdir, env: withMiseVariables(env, opts?.variables), argv }, opts?.quiet === true ? void 0 : { logPath });
+  const exec = async (argv, workdir, opts) => {
+    const ran = await host.exec({ container: name, user: agentUser, workdir, env: withMiseVariables(env, opts?.variables), argv }, { ...opts?.quiet === true ? {} : { logPath }, ...opts?.timeoutMs === void 0 ? {} : { timeoutMs: opts.timeoutMs } });
+    return endedAtLimit(ran) ? { ...ran, timedOut: true } : ran;
+  };
+  const saveState = () => saveAndPrune({
+    save: () => saveContainerState({
+      host,
+      image: report.imageId,
+      container: name,
+      agentUser,
+      agentUid,
+      buildVolume: name,
+      runnerId,
+      dir: savedStatesPath,
+      key: plan.key,
+      now: clockOf(input.now)(),
+      logPath,
+      log: tagged
+    }),
+    dir: savedStatesPath,
+    removeVolume: (volume2) => host.removeVolume(volume2),
+    log: tagged
+  });
   const steps = await runBuildSteps({
     repository,
     branch: primary.branch,
@@ -4992,18 +5542,23 @@ async function provisionContainer(input) {
     removeStagedContext: () => removeStagedContext(buildDir2),
     keepIn: jobDir,
     ...input.requireBuildSkill === true ? { requireBuildSkill: true } : {},
-    // A repository with no devcontainer file builds on the universal image, whose runtimes the build chooses and installs.
-    ...runtimeStepInput(report, services)
+    // A build on the universal image, or on an image built from it, chooses and installs its runtimes.
+    ...runtimeStepInput(report, services),
+    setup: setupInputFor({ setupMinutes: config.build?.setupMinutes, plan, saveState })
   });
-  if (!steps.ok) return bail(steps.reason, steps.aborted === true);
+  if (!steps.ok) return settleFailedSteps(steps, { giveUp: giveUpState, bail });
   state.startCommit = steps.startCommit;
   keepRuntimeStep(state, steps);
+  keepMissingSetupScripts(state, steps);
   if (steps.controlPlane !== void 0) environment.controlPlane = steps.controlPlane;
   return { ok: true, workdir: CHECKOUT_DIR, state, environment };
 }
+function endedAtLimit(result) {
+  return result.status === 124 && /no answer within \d+s/.test(result.stderr);
+}
 async function resolveBuildUser(runtime, runInput, named, logPath) {
   const lookups = /* @__PURE__ */ new Map();
-  const lookup2 = async (user2) => {
+  const lookup3 = async (user2) => {
     const known = lookups.get(user2);
     if (known !== void 0) return known;
     const ran = await runtime.host.run(identityRunArgs({ ...runInput, user: ADDED_USER }, user2));
@@ -5017,8 +5572,8 @@ async function resolveBuildUser(runtime, runInput, named, logPath) {
   let user;
   let home;
   try {
-    user = await resolveAgentUser({ ...named, probe: async (name) => (await lookup2(name))?.uid ?? null });
-    home = user === ADDED_USER ? void 0 : mountableHome((await lookup2(user))?.home);
+    user = await resolveAgentUser({ ...named, probe: async (name) => (await lookup3(name))?.uid ?? null });
+    home = user === ADDED_USER ? void 0 : mountableHome((await lookup3(user))?.home);
   } catch (err) {
     if (err instanceof AgentUserError) return { ok: false, reason: err.message };
     throw err;
@@ -5055,6 +5610,7 @@ function containerCommandExec(input) {
     hostEnv: input.runtime.hostEnv,
     containerEnv: state.containerEnv ?? {},
     unpinnedRuntimes: state.unpinnedRuntimes,
+    missingSetupScripts: state.missingSetupScripts,
     miseVariables: state.miseVariables,
     builtIns: state.builtIns === true,
     identity: input.job.commitIdentity
@@ -5080,6 +5636,7 @@ function containerSenderCommand(input) {
     hostEnv: input.runtime.hostEnv,
     containerEnv: state.containerEnv ?? {},
     unpinnedRuntimes: state.unpinnedRuntimes,
+    missingSetupScripts: state.missingSetupScripts,
     miseVariables: state.miseVariables,
     builtIns: state.builtIns === true,
     identity: input.job.commitIdentity
@@ -5220,6 +5777,7 @@ async function runCliInContainer(input, argv, logName) {
       hostEnv: runtime.hostEnv,
       containerEnv: state.containerEnv ?? {},
       unpinnedRuntimes: state.unpinnedRuntimes,
+      missingSetupScripts: state.missingSetupScripts,
       miseVariables: state.miseVariables,
       builtIns: state.builtIns === true,
       identity: job.commitIdentity
@@ -5321,8 +5879,8 @@ function containerJudgeEnvironment(input) {
     },
     hashProgram: async () => {
       const ran = await runtime.host.exec({ container: state.container, user: ADDED_USER, env: NO_ENV, argv: [...HASH_ARGV] });
-      const sha256 = ran.status === 0 ? parseProgramHash(ran.stdout) : void 0;
-      return sha256 === void 0 ? { ok: false, reason: firstLine4(ran.stderr) || `the hash could not be taken (exit ${ran.status})` } : { ok: true, sha256 };
+      const sha2562 = ran.status === 0 ? parseProgramHash(ran.stdout) : void 0;
+      return sha2562 === void 0 ? { ok: false, reason: firstLine4(ran.stderr) || `the hash could not be taken (exit ${ran.status})` } : { ok: true, sha256: sha2562 };
     },
     prepare: async (files, tree) => {
       if (filesAreCopied(state)) {
@@ -5605,4 +6163,4 @@ function describeMachineDocker(machine) {
   return `Docker Engine ${version ?? "of no known version"}, older than the ${MIN_ENGINE_MAJOR} that container builds need`;
 }
 
-export { ADDED_USER, ADOPTED_FETCH_RETRY_WINDOW_MS, AgentUserError, AssetError, DeliveryFailure, EVAL_INPUT_NAME, GH_CONFIG_YML, HELPER_ENV, LEASE_SECONDS, MANAGED_UNJAILED_REASON, MIN_ENGINE_MAJOR, PLACEHOLDER_MARKER, PROOFS_LOG, RECORD_PROOFS_ARGV, ROOT_DISK_ID_PREFIX, RunnerInitError, attemptNote, claimPermissionProblem, claudeCredentialCheck, cleanupContainer, closeHostBuild, containerCommandExec, containerJudgeEnvironment, containerSenderCommand, copyJudgeTree, copyTranscripts, copyTranscriptsFromContainer, createBuildDisk, createContainerRuntime, createLeaseChannel, currentSkillCommand, decideHostBuildSkill, deleteBuildDisk, deliverContainerHooks, deliverExecMaven, describeMachineDocker, detectMachine, dropManagedBuildSettings, dropManagedClaudeKey, ensureFirecrackerAndJailer, ensureNetworkReady, ensureRootfs, ensureTunnel, execArgv, execCommandLine, fetchManagedBuildSettings, fetchManagedClaudeKey, filesAreCopied, firstLine4 as firstLine, formerSkillProblem, formerSkillQueues, ghHostsYml, gitRemoteFor, hasClaudeCredential, helperFirecrackerNote, helperSocketPath, holdManagedBuildSettings, holdManagedClaudeKey, hostCommandEnvironment, hostEnvironment, isPlaceholderCommand, keepGhConfigCurrent, keepRuntimeStep, leaseExpiresAtMs, leaseTimeLeftMs, lifecycleFailureReason, lifecycleSteps, listenOnBroker, machineConfig, makeBuildsDirPrivate, managedBuildSettingValues, managedBuildSettingsFor, managedClaudeKeyFor, managedClaudeKeyValues, managedMachineLimits, measureDisk, microVmArchSupported, microVmAssetsPinned, missingPermissionFix, missingPermissionOf, needsBuildSkill, needsClaudeCredential, obtainImage, outOfMemoryReason, parseCpuList, permissionModeProblem, permissionModeProblems, placeholderProblem, placeholderQueues, prepareBranch, prepareRunnerInit, probeHelper, provisionContainer, provisionEnvironment, provisionRuntimes, ranRuntimeStep, reachDockerStep, readConfigObject, recordProofsInContainer, resolveAgentUser, resolveHostBuild, runBuildSteps, runRunnerInit, runWithSpawn, runtimeStepInput, said, senderAliveScript, senderSignalScript, setUpRunnerCgroup, shellQuote, signalInContainer, startCheckContainer, startHostServices, startJailedInto, startServicesFor, stopContainer, stopJailed, stoppedHelperReason, supportsContainerBuilds, supportsMicroVmBuilds, sweepImageBuilders, syncInContainer, withFactoryHosts, withTunnelLog, writeEvalInput, writeRunnerInit };
+export { ADDED_USER, ADOPTED_FETCH_RETRY_WINDOW_MS, AgentUserError, AssetError, DeliveryFailure, EVAL_INPUT_NAME, GH_CONFIG_YML, HELPER_ENV, LEASE_SECONDS, MANAGED_UNJAILED_REASON, MIN_ENGINE_MAJOR, PLACEHOLDER_MARKER, PROOFS_LOG, RECORD_PROOFS_ARGV, ROOT_DISK_ID_PREFIX, RunnerInitError, agentUidOf, attemptNote, claimPermissionProblem, claudeCredentialCheck, cleanupContainer, clockOf, closeHostBuild, containerCommandExec, containerJudgeEnvironment, containerSenderCommand, copyJudgeTree, copyTranscripts, copyTranscriptsFromContainer, createBuildDisk, createContainerRuntime, createLeaseChannel, currentSkillCommand, decideHostBuildSkill, deleteBuildDisk, deleteRecord, deliverContainerHooks, deliverExecMaven, describeMachineDocker, detectMachine, discardUnusableState, dropManagedBuildSettings, dropManagedClaudeKey, ensureFirecrackerAndJailer, ensureNetworkReady, ensureRootfs, ensureTunnel, execArgv, execCommandLine, fetchManagedBuildSettings, fetchManagedClaudeKey, filesAreCopied, firstLine4 as firstLine, formerSkillProblem, formerSkillQueues, ghHostsYml, gitRemoteFor, hasClaudeCredential, helperFirecrackerNote, helperSocketPath, holdManagedBuildSettings, holdManagedClaudeKey, hostCommandEnvironment, hostEnvironment, isPlaceholderCommand, keepGhConfigCurrent, keepMissingSetupScripts, keepRuntimeStep, leaseExpiresAtMs, leaseTimeLeftMs, lifecycleFailureReason, lifecycleSteps, listenOnBroker, machineConfig, makeBuildsDirPrivate, managedBuildSettingValues, managedBuildSettingsFor, managedClaudeKeyFor, managedClaudeKeyValues, managedMachineLimits, measureDisk, microVmArchSupported, microVmAssetsPinned, missingPermissionFix, missingPermissionOf, needsBuildSkill, needsClaudeCredential, obtainImage, outOfMemoryReason, parseCpuList, permissionModeProblem, permissionModeProblems, placeholderProblem, placeholderQueues, planSavedState, prepareBranch, prepareRunnerInit, probeHelper, provisionContainer, provisionEnvironment, provisionRuntimes, provisionWithFreshFallback, ranRuntimeStep, reachDockerStep, readConfigObject, readRecords, recordProofsInContainer, removeOldestUntil, removeSavedState, resolveAgentUser, resolveHostBuild, runBuildSteps, runRunnerInit, runWithSpawn, runtimeStepInput, said, saveAndPrune, savedStateBase, savedStatesDir, selectExpired, selectStaleIncomplete, selectToFit, senderAliveScript, senderSignalScript, setUpRunnerCgroup, settleFailedSteps, setupInputFor, shellQuote, signalInContainer, startCheckContainer, startHostServices, startJailedInto, startServicesFor, stopContainer, stopJailed, stoppedHelperReason, supportsContainerBuilds, supportsMicroVmBuilds, sweepImageBuilders, syncInContainer, taggedLog, uidFromProbe, userIdChangedReason, withFactoryHosts, withTunnelLog, writeEvalInput, writeRecord2 as writeRecord, writeRunnerInit };