@agent-delivery-harness/cli 0.7.4 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-delivery-harness/cli",
-  "version": "0.7.4",
+  "version": "0.8.1",
   "type": "module",
   "description": "Delivery harness CLI: admit, prepare, review-context, submit-evidence, gate, record, verify, check",
   "license": "FSL-1.1-ALv2",
@@ -13,7 +13,7 @@
     "node": ">=22.6.0"
   },
   "dependencies": {
-    "@agent-delivery-harness/kernel": "0.7.4"
+    "@agent-delivery-harness/kernel": "0.8.1"
   },
   "exports": {
     ".": "./src/index.ts"

package/src/boundary.ts

@@ -63,7 +63,7 @@ import {
   type ProviderRailInvocationResult,
   type ProviderRailSession,
 } from "./provider-rails.ts";
-import { beginCommandObservation, type CommandObservation } from "./command-activity.ts";
+import { beginCommandObservation, observeCandidateCaptures, type CommandObservation } from "./command-activity.ts";
 
 // ── Exit codes ───────────────────────────────────────────────────────────────
 
@@ -91,7 +91,9 @@ export class CliInterruption extends Error {
  * the typed blockers to render; `usage` is an argument or invocation error.
  */
 export type CommandResult =
-  | { readonly kind: "ok"; readonly summary?: string; readonly digest?: string; readonly preparation?: RunPreparationObservation }
+  | { readonly kind: "ok"; readonly summary?: string; readonly digest?: string; readonly preparation?: RunPreparationObservation;
+      /** The command did not do its work, so no completion of it goes in the run's journal. */
+      readonly unobserved?: true }
   | { readonly kind: "blocked"; readonly blockers: readonly Blocker[] }
   | { readonly kind: "usage"; readonly message: string };
 
@@ -136,12 +138,17 @@ export interface CommandContext {
   }) => Promise<ProviderRailInvocationResult | undefined>;
   /** Emits one line of operator-facing output to stdout. */
   readonly write: (text: string) => void;
+  /** Emits one line of operator-facing output to stderr, leaving stdout as it is. */
+  readonly writeError: (text: string) => void;
   /** Classifies the execution context from this invocation's env + TTY. */
   classifyContext(): ExecutionContext;
 }
 
 export interface CommandDescriptor {
   readonly name: string;
+  /** Opt in to progress from this command's fresh captures. Other descriptors
+   * retain the boundary's eager capture; this flag grants no candidate reuse. */
+  readonly capturesCandidate?: boolean;
   /** The blocker `source.id` this command stamps on failures it raises itself. */
   readonly sourceId: string;
   readonly summary: string;
@@ -426,7 +433,7 @@ export async function runCliBoundary(
     ? await beginCommandObservation(runtime.cwd, descriptor.name) : undefined;
   let completed: Extract<CommandResult, { kind: "ok" }> | undefined;
   const code = await runConfiguredCommand(descriptor, args, runtime, value => { completed = value; }, observation);
-  await observation?.finish(code, Date.now() - startedAt, completed?.digest, completed?.preparation);
+  if (!completed?.unobserved) await observation?.finish(code, Date.now() - startedAt, completed?.digest, completed?.preparation);
   return code;
 }
 
@@ -491,11 +498,14 @@ async function runConfiguredCommand(
 
     let wiringPromise: Promise<RepoWiring> | undefined;
     const wire = (): Promise<RepoWiring> => {
-      wiringPromise ??= wireRepo(runtime.cwd, config);
+      wiringPromise ??= wireRepo(runtime.cwd, config).then(wiring =>
+        descriptor.capturesCandidate && observation?.needsCandidate
+          ? { ...wiring, captureCandidate: observeCandidateCaptures(wiring.captureCandidate, observation) }
+          : wiring);
       return wiringPromise;
     };
 
-    if (observation?.needsCandidate) {
+    if (observation?.needsCandidate && !descriptor.capturesCandidate) {
       try {
         const capture = await (await wire()).captureCandidate();
         if (capture.ok) await observation.start(capture.candidate.treeSha);
@@ -579,6 +589,7 @@ async function runConfiguredCommand(
         }
       },
       write: (text) => runtime.stdout(`${text}\n`),
+      writeError: (text) => runtime.stderr(`${text}\n`),
       classifyContext: () =>
         classifyExecutionContext({
           config,

package/src/check-snapshot.ts

@@ -1,9 +1,9 @@
 /** Private execution tree. Never shares writable source, objects, index or dependencies. */
 import { spawn } from "node:child_process";
-import { mkdir, mkdtemp, realpath, rename, rm } from "node:fs/promises";
+import { chmod, lstat, mkdir, mkdtemp, realpath, rename, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { createExecPort, type ExecOutcome } from "@agent-delivery-harness/kernel";
+import { candidateTreeSourceReader, capturePhysicalSource, createExecPort, isPhysicalSourceDefinition, physicalSourceOutputOverlap, type CandidateCommandRunner, type PhysicalSourceDefinition, type ExecOutcome } from "@agent-delivery-harness/kernel";
 
 import { snapshotInventoryWorker } from "./snapshot-inventory-worker.ts";
 
@@ -12,14 +12,20 @@ export class CheckSnapshotError extends Error {
   readonly code: string;
   constructor(code: string, message: string) { super(message); this.code = code; }
 }
+export type SnapshotPhase = "materialization" | "baseline-inventory" | "dependencies" | "post-dependency-inventory" | "clone" | "verification";
+/** Copy-on-write cloning: APFS `clonefile(2)` on macOS, a reflink copy on Linux. */
+export type CloneMethod = "clonefile" | "reflink";
 export interface SnapshotRequest {
   readonly rootDir: string;
   readonly candidate: { readonly treeSha: string; readonly headSha: string; readonly base: { readonly ref: string; readonly tipSha: string; readonly mergeBaseSha: string } };
   readonly outputs: readonly string[];
   readonly gitContext?: "full" | "none";
+  readonly physicalSource?: PhysicalSourceDefinition;
   readonly environment: Readonly<Record<string, string>>;
   readonly dependencies?: { readonly command: readonly [string, ...string[]]; readonly timeoutMs: number };
   readonly onDependencyResult?: (result: ExecOutcome, durationMs: number) => void;
+  /** Best-effort phase timing only; never admission evidence. */
+  readonly onPhase?: (phase: SnapshotPhase, durationMs: number) => void;
   readonly signal?: AbortSignal;
 }
 export interface CheckSnapshot {
@@ -27,9 +33,76 @@ export interface CheckSnapshot {
   readonly rootDir: string;
   readonly environment: Readonly<Record<string, string>>;
   readonly dependencyDigest: string;
-  verify(options?: { readonly timeoutMs: number }): Promise<void>;
+  /** False when the setup wrote this tree's own absolute path into one of its files: a clone would
+   * still read and write this tree through that path, so each worker builds its own instead. */
+  readonly clonable: boolean;
+  /** What `verify` checks when given `unchanged`: Git's index and untracked listing, or (finite snapshots, which have no Git) the full inventory. */
+  readonly reusedVerification: "index" | "inventory";
+  /** `outputs` narrows the writable paths to one profile's within a snapshot shared by several.
+   * `unchanged` verifies a reused tree that a full verification already accepted after its last
+   * command: untracked paths may exist only where the setup left them or inside `allowed`. */
+  verify(options?: { readonly timeoutMs?: number; readonly outputs?: readonly string[]; readonly unchanged?: { readonly allowed: readonly string[] } }): Promise<void>;
+  /** A private copy-on-write tree of this one, which stays untouched. The clone's own phases go to `onPhase`. */
+  clone(method: CloneMethod, onPhase?: (phase: SnapshotPhase, durationMs: number) => void): Promise<CheckSnapshot>;
   cleanup(): Promise<void>;
 }
+/** A materialized tree: the work tree, the Git-none control directory, and the directories cleanup removes. */
+interface PrivateTree { readonly rootDir: string; readonly privateControl?: string; readonly owned: readonly string[] }
+const nulSeparated = (text: string) => text.split("\0").filter(Boolean);
+/** A listed path (a directory ends in a slash) lies at or below a declared output. As in the
+ * inventory, an output without a trailing slash that is a directory covers what is inside it. */
+function withinOutputs(entry: string, outputs: readonly string[]): boolean {
+  return outputs.some(output => { const root = output.replace(/\/$/, ""); return entry === root || entry.startsWith(`${root}/`); });
+}
+function phaseMeter(onPhase?: (phase: SnapshotPhase, durationMs: number) => void) {
+  return async <T>(phase: SnapshotPhase, operation: () => Promise<T>): Promise<T> => {
+    const started = performance.now();
+    try { return await operation(); } finally { try { onPhase?.(phase, performance.now() - started); } catch { /* Timing cannot change admission. */ } }
+  };
+}
+async function removeTrees(directories: readonly string[]): Promise<void> {
+  const removed = await Promise.allSettled(directories.map(dir => rm(dir, { recursive: true, force: true })));
+  if (removed.some(result => result.status === "rejected")) throw new CheckSnapshotError("check_snapshot_cleanup_failed", "Cannot remove the owned execution snapshot after retaining evidence.");
+}
+/** One copy-on-write clone of a directory tree into a path that must not exist yet. On macOS
+ * `clonefileat(2)` (syscall 462) clones the hierarchy in one call; `cp -c` clones file by file
+ * and silently copies where cloning is unsupported. */
+async function cloneTree(method: CloneMethod, source: string, destination: string, deadline: number, signal?: AbortSignal): Promise<void> {
+  const [command, args] = method === "clonefile"
+    ? ["/usr/bin/perl", ["-e", "syscall(462, -2, $ARGV[0], -2, $ARGV[1], 0) == 0 or exit 1", source, destination]] as const
+    : ["cp", ["-a", "--reflink=always", "--", source, destination]] as const;
+  const result = await snapshotProcess(command, [...args], path.dirname(destination), { PATH: "/usr/bin:/bin" }, deadline, signal);
+  if (result.code !== 0) throw new CheckSnapshotError("check_snapshot_unavailable", "The warm snapshot could not be cloned.");
+}
+let cloneProbe: Promise<CloneMethod | undefined> | undefined;
+/** The copy-on-write method the temporary directory supports, probed once per process; undefined where none does. */
+export function snapshotCloneMethod(): Promise<CloneMethod | undefined> {
+  return cloneProbe ??= (async () => {
+    const method: CloneMethod | undefined = process.platform === "darwin" ? "clonefile" : process.platform === "linux" ? "reflink" : undefined;
+    if (!method) return undefined;
+    const probe = await mkdtemp(path.join(tmpdir(), "delivery-clone-probe-"));
+    try {
+      await mkdir(path.join(probe, "source")); await writeFile(path.join(probe, "source", "probe"), "probe");
+      await cloneTree(method, path.join(probe, "source"), path.join(probe, "clone"), performance.now() + 30_000);
+      return method;
+    } catch { return undefined; } finally { await rm(probe, { recursive: true, force: true }).catch(() => undefined); }
+  })();
+}
+async function cloneSnapshot(tree: PrivateTree, method: CloneMethod, signal: AbortSignal | undefined, onPhase: SnapshotRequest["onPhase"], open: (tree: PrivateTree, onPhase?: SnapshotRequest["onPhase"]) => CheckSnapshot): Promise<CheckSnapshot> {
+  return phaseMeter(onPhase)("clone", async () => {
+    const parent = await realpath(await mkdtemp(path.join(tmpdir(), "delivery-check-clone-")));
+    const cloned: PrivateTree = { rootDir: path.join(parent, "tree"), ...(tree.privateControl ? { privateControl: path.join(parent, "control") } : {}), owned: [parent] };
+    try {
+      const deadline = performance.now() + SNAPSHOT_TIMEOUT_MS;
+      await cloneTree(method, tree.rootDir, cloned.rootDir, deadline, signal);
+      if (tree.privateControl) await cloneTree(method, tree.privateControl, cloned.privateControl!, deadline, signal);
+    } catch (error) {
+      await rm(parent, { recursive: true, force: true }).catch(() => undefined);
+      throw error instanceof CheckSnapshotError ? error : new CheckSnapshotError("check_snapshot_unavailable", "The warm snapshot could not be cloned.");
+    }
+    return open(cloned, onPhase);
+  });
+}
 function inside(root: string, target: string): boolean {
   const relative = path.relative(root, target);
   return relative !== ".." && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative);
@@ -37,7 +110,7 @@ function inside(root: string, target: string): boolean {
 /** Kill the owned read-only process and await close before callers may clean up.
  * AbortSignal is handled here: child_process's early AbortError event is not
  * proof that the process has stopped touching the snapshot. */
-async function snapshotProcess(command: string, args: string[], cwd: string, env: Readonly<Record<string, string>>, deadline: number, signal?: AbortSignal): Promise<{ code: number | null; stdout: string }> {
+async function snapshotProcess(command: string, args: string[], cwd: string, env: Readonly<Record<string, string>>, deadline: number, signal?: AbortSignal, limit = 64 * 1024): Promise<{ code: number | null; stdout: string }> {
   if (signal?.aborted) throw new CheckSnapshotError("check_snapshot_interrupted", "Snapshot verification was interrupted.");
   const remaining = deadline - performance.now();
   if (remaining <= 0) throw new CheckSnapshotError("check_snapshot_timeout", "Snapshot verification exceeded its deadline.");
@@ -54,7 +127,7 @@ async function snapshotProcess(command: string, args: string[], cwd: string, env
     if (signal?.aborted) abort();
     child.stdout.on("data", (bytes: Buffer) => {
       size += bytes.length;
-      if (size > 64 * 1024) stop("check_snapshot_unavailable", "Snapshot verifier output exceeded its limit.");
+      if (size > limit) stop("check_snapshot_unavailable", "Snapshot verifier output exceeded its limit.");
       else stdout += bytes.toString();
     });
     child.stderr.on("data", () => {}); // Drain; never expose private paths or source bytes.
@@ -67,18 +140,55 @@ async function snapshotProcess(command: string, args: string[], cwd: string, env
   });
 }
 /** The inventory's blocking filesystem operations live only in a killable process. */
-export async function snapshotInventory(root: string, outputs: readonly string[], excludeDependencies = false, deadline = performance.now() + SNAPSHOT_TIMEOUT_MS, signal?: AbortSignal, forbidGit = false): Promise<string> {
+export async function snapshotInventory(root: string, outputs: readonly string[], excludeDependencies = false, deadline = performance.now() + SNAPSHOT_TIMEOUT_MS, signal?: AbortSignal, forbidGit = false, absentInputs: readonly string[] = []): Promise<string> {
+  return (await snapshotDigests(root, outputs, excludeDependencies, deadline, signal, forbidGit, false, absentInputs)).digest;
+}
+async function snapshotDigests(root: string, outputs: readonly string[], excludeDependencies: boolean, deadline: number, signal?: AbortSignal, forbidGit = false, includeSource = false, absentInputs: readonly string[] = [], selfReferences: readonly string[] = []): Promise<{ digest: string; sourceDigest?: string; selfReferenced: boolean }> {
   const result = await snapshotProcess(process.execPath, ["--input-type=module", "--eval", snapshotInventoryWorker], root,
-    { PATH: process.env["PATH"] ?? "/usr/bin:/bin", DELIVERY_SNAPSHOT_REQUEST: JSON.stringify({ root, outputs, excludeDependencies, forbidGit }) }, deadline, signal);
-  let parsed: { code?: string; digest?: string };
+    { PATH: process.env["PATH"] ?? "/usr/bin:/bin", DELIVERY_SNAPSHOT_REQUEST: JSON.stringify({ root, outputs, excludeDependencies, forbidGit, includeSource, absentInputs, selfReferences }) }, deadline, signal);
+  let parsed: { code?: string; digest?: string; sourceDigest?: string; selfReferenced?: boolean };
   try { parsed = JSON.parse(result.stdout); } catch { throw new CheckSnapshotError("check_snapshot_unavailable", "Snapshot inventory returned no valid result."); }
-  if (result.code !== 0 || !/^[a-f0-9]{64}$/.test(parsed.digest ?? "")) throw new CheckSnapshotError(["check_snapshot_escape", "check_snapshot_drift"].includes(parsed.code ?? "") ? parsed.code! : "check_snapshot_unavailable", "Snapshot inventory could not verify private bytes and links.");
-  return parsed.digest!;
+  if (result.code !== 0 || !/^[a-f0-9]{64}$/.test(parsed.digest ?? "") || (includeSource && !/^[a-f0-9]{64}$/.test(parsed.sourceDigest ?? ""))) throw new CheckSnapshotError(["check_snapshot_escape", "check_snapshot_drift"].includes(parsed.code ?? "") ? parsed.code! : "check_snapshot_unavailable", "Snapshot inventory could not verify private bytes and links.");
+  if (selfReferences.length && typeof parsed.selfReferenced !== "boolean") throw new CheckSnapshotError("check_snapshot_unavailable", "Snapshot inventory returned no valid result.");
+  return { digest: parsed.digest!, ...(includeSource ? { sourceDigest: parsed.sourceDigest! } : {}), selfReferenced: parsed.selfReferenced === true };
+}
+/** The spellings of a tree's absolute paths a setup could write: as created under the temporary directory and resolved. */
+function selfReferences(...created: (string | undefined)[]): string[] {
+  return [...new Set(created.flatMap(dir => dir === undefined ? [] : [dir, path.join(tmpdir(), path.basename(dir))]))];
 }
 export function executionPath(root: string, value: string): string {
   return value.split(path.delimiter).filter(p => p && path.isAbsolute(p) && !inside(root, p) && !p.split(path.sep).includes("node_modules")).join(path.delimiter) || "/usr/bin:/bin";
 }
+/** The commit depth a materialization fetch needs, or undefined for the source's whole history.
+ * A tip lies at most `merge-base..tip` commits plus one above the merge-base on any path, so
+ * that depth from both tips keeps every commit a merge-base, ancestry or three-dot read walks.
+ * That holds only while the merge-base is the sole commit those ranges stand on: a side branch
+ * forked below it would arrive cut off from it and read as a second merge-base. */
+async function materializationDepth(input: SnapshotRequest, git: (...args: string[]) => Promise<string>): Promise<number | undefined> {
+  if (input.gitContext === "none") return 1;
+  const { headSha, base } = input.candidate;
+  try {
+    // Reading the author's repository only; the fetch below still transfers object bytes.
+    // A tip above the merge-base stands on it alone exactly when it is the range's one boundary
+    // commit, which also makes it an ancestor of that tip and so fetched through it.
+    for (const tip of [headSha, base.tipSha]) {
+      const boundary = (await git("-C", input.rootDir, "rev-list", "--boundary", `${base.mergeBaseSha}..${tip}`))
+        .split("\n").filter(line => line.startsWith("-"));
+      if (tip !== base.mergeBaseSha && boundary.join("\n") !== `-${base.mergeBaseSha}`) return undefined;
+    }
+    const counts = await Promise.all([headSha, base.tipSha].map(tip => git("-C", input.rootDir, "rev-list", "--count", `${base.mergeBaseSha}..${tip}`)));
+    const longest = Math.max(...counts.map(Number));
+    return Number.isSafeInteger(longest) && longest >= 0 ? longest + 1 : undefined;
+  } catch { return undefined; }
+}
+
 export async function createCheckSnapshot(input: SnapshotRequest): Promise<CheckSnapshot> {
+  if (input.physicalSource !== undefined) return createFiniteCheckSnapshot(input);
+  const report = (phase: SnapshotPhase, started: number) => {
+    try { input.onPhase?.(phase, performance.now() - started); } catch { /* Timing cannot change admission. */ }
+  };
+  const measured = phaseMeter(input.onPhase);
+  const materializationStarted = performance.now();
   const rootDir = await realpath(await mkdtemp(path.join(tmpdir(), "delivery-check-")));
   const cleanEnv = { ...input.environment, PATH: executionPath(input.rootDir, input.environment["PATH"] ?? process.env["PATH"] ?? "/usr/bin:/bin"), GIT_CONFIG_NOSYSTEM: "1", GIT_CONFIG_GLOBAL: "/dev/null", GIT_TERMINAL_PROMPT: "0", GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z", GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z" };
   let privateControl: string | undefined;
@@ -99,17 +209,23 @@ export async function createCheckSnapshot(input: SnapshotRequest): Promise<Check
       return result.stdout.trim();
     } finally { clearTimeout(timer); input.signal?.removeEventListener("abort", abort); }
   };
-  const cleanup = async () => {
-    const removed = await Promise.allSettled([rootDir, ...(privateControl ? [privateControl] : [])].map(dir => rm(dir, { recursive: true, force: true })));
-    if (removed.some(result => result.status === "rejected")) throw new CheckSnapshotError("check_snapshot_cleanup_failed", "Cannot remove the owned execution snapshot after retaining evidence.");
-  };
+  const cleanup = () => removeTrees([rootDir, ...(privateControl ? [privateControl] : [])]);
   try {
     await git("init", "-q");
     // Fetch transfers object bytes; unlike worktrees/alternates/local clones it
     // cannot create writable links back to the author's Git metadata.
     // Accept the source's shallow boundary in this private repository. Without
     // it, fetch can reject objects or succeed while dropping required grafts.
-    await git("fetch", "--update-shallow", "--no-tags", "--no-write-fetch-head", input.rootDir, input.candidate.headSha, input.candidate.base.tipSha, input.candidate.treeSha);
+    // Fetch only the history a check can read (V26-3284): none past the pinned
+    // commits without Git, and with Git the commits from the merge-base to each
+    // tip, which merge-base, ancestry and three-dot diffs need. A distance the
+    // source cannot measure keeps today's whole-history fetch.
+    const depth = await materializationDepth(input, git);
+    // Within a bounded full history the merge-base is already fetched from both
+    // tips; asked for by itself it would deepen past itself by the same depth.
+    const mergeBase = input.gitContext !== "none" && depth !== undefined ? [] : [input.candidate.base.mergeBaseSha];
+    await git("fetch", "--update-shallow", ...(depth === undefined ? [] : ["--depth", String(depth)]), "--no-tags", "--no-write-fetch-head", input.rootDir,
+      input.candidate.headSha, input.candidate.base.tipSha, ...mergeBase, input.candidate.treeSha);
     await git("update-ref", "HEAD", input.candidate.headSha);
     await git("read-tree", input.candidate.treeSha);
     await git("checkout-index", "--all", "--force");
@@ -129,39 +245,184 @@ export async function createCheckSnapshot(input: SnapshotRequest): Promise<Check
       await rename(path.join(rootDir, ".git"), gitDirectory);
     }
     const controlRoot = privateControl ?? path.join(rootDir, ".git");
-    const inventory = (outputs: readonly string[], sourceOnly = false, deadline = performance.now() + SNAPSHOT_TIMEOUT_MS) => snapshotInventory(rootDir, outputs, sourceOnly, deadline, input.signal, input.gitContext === "none");
-    const sourceDigest = await inventory(input.outputs, true);
-    const environment: Record<string, string> = { ...input.environment, PATH: `${path.join(rootDir, "node_modules/.bin")}${path.delimiter}${cleanEnv["PATH"]}`, HOME: path.join(controlRoot, "home"), TMPDIR: path.join(controlRoot, "tmp"), GIT_CEILING_DIRECTORIES: path.dirname(rootDir),
+    const inventory = (root: string, outputs: readonly string[], sourceOnly = false, deadline = performance.now() + SNAPSHOT_TIMEOUT_MS) => snapshotInventory(root, outputs, sourceOnly, deadline, input.signal, input.gitContext === "none");
+    report("materialization", materializationStarted);
+    // Setup needs a source baseline only when a dependency command can mutate it.
+    const baseline = await measured("baseline-inventory", () => inventory(rootDir, input.outputs, Boolean(input.dependencies)));
+    let dependencyDigest = baseline, clonable = true;
+    const environmentFor = (root: string, control: string): Record<string, string> => ({ ...input.environment, PATH: `${path.join(root, "node_modules/.bin")}${path.delimiter}${cleanEnv["PATH"]}`, HOME: path.join(control, "home"), TMPDIR: path.join(control, "tmp"), GIT_CEILING_DIRECTORIES: path.dirname(root),
       ...(input.gitContext === "none" ? {} : {
-      DELIVERY_CHECK_BASE_REF: baseRef, DELIVERY_CHECK_CANDIDATE_REF: candidateRef, DELIVERY_CHECK_ORIGIN_HEAD: input.candidate.headSha, DELIVERY_CHECK_ORIGIN_TREE: input.candidate.treeSha, DELIVERY_CHECK_MERGE_BASE: input.candidate.base.mergeBaseSha }) };
+      DELIVERY_CHECK_BASE_REF: baseRef, DELIVERY_CHECK_CANDIDATE_REF: candidateRef, DELIVERY_CHECK_ORIGIN_HEAD: input.candidate.headSha, DELIVERY_CHECK_ORIGIN_TREE: input.candidate.treeSha, DELIVERY_CHECK_MERGE_BASE: input.candidate.base.mergeBaseSha }) });
+    const environment = environmentFor(rootDir, controlRoot);
     await mkdir(environment["HOME"]!, { recursive: true }); await mkdir(environment["TMPDIR"]!, { recursive: true });
     if (input.dependencies) {
       const started = performance.now();
-      const result = await createExecPort().run({ command: input.dependencies.command[0], args: input.dependencies.command.slice(1), cwd: rootDir, env: environment, timeoutMs: input.dependencies.timeoutMs, maxBuffer: 1024 * 1024, ...(input.signal ? { signal: input.signal } : {}) });
+      const result = await measured("dependencies", () => createExecPort().run({ command: input.dependencies!.command[0], args: input.dependencies!.command.slice(1), cwd: rootDir, env: environment, timeoutMs: input.dependencies!.timeoutMs, maxBuffer: 1024 * 1024, ...(input.signal ? { signal: input.signal } : {}) }));
       input.onDependencyResult?.(result, Math.round(performance.now() - started));
       if (result.code !== 0 || input.signal?.aborted) throw new CheckSnapshotError("check_dependency_failed", "Private dependency installation did not complete successfully.");
+      // Both digests use the same tuples from one safety walk, hashing each
+      // immutable file once. Source comparison still excludes node_modules.
+      const installed = await measured("post-dependency-inventory", () => snapshotDigests(rootDir, input.outputs, false, performance.now() + SNAPSHOT_TIMEOUT_MS, input.signal, input.gitContext === "none", true, [], selfReferences(rootDir, privateControl)));
+      if (baseline !== installed.sourceDigest) throw new CheckSnapshotError("check_snapshot_drift", "Dependency setup changed prepared source bytes.");
+      dependencyDigest = installed.digest;
+      clonable = !installed.selfReferenced;
     }
-    if (sourceDigest !== await inventory(input.outputs, true)) throw new CheckSnapshotError("check_snapshot_drift", "Dependency setup changed prepared source bytes.");
-    const dependencyDigest = await inventory(input.outputs);
-    // The second digest covers both source and installed dependency bytes and
-    // all links. It intentionally excludes only declared mutable output paths.
-    const verify = async (options?: { readonly timeoutMs: number }) => {
-      const timeoutMs = options?.timeoutMs ?? SNAPSHOT_TIMEOUT_MS;
-      if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > SNAPSHOT_TIMEOUT_MS) throw new CheckSnapshotError("check_snapshot_timeout", "Snapshot deadline must be positive and cannot exceed five minutes.");
-      const deadline = performance.now() + timeoutMs;
-      // The worker also checks file-only Git metadata, so lstat cannot stall the parent.
-      const verifyGit = async (...args: string[]) => {
-        const result = await snapshotProcess("git", gitDirectory ? [`--git-dir=${gitDirectory}`, `--work-tree=${rootDir}`, ...args] : args, rootDir, cleanEnv, deadline, input.signal);
-        if (result.code !== 0) throw new CheckSnapshotError("check_snapshot_unavailable", "Snapshot Git identity could not be read.");
-        return result.stdout.trim();
+    // Explicit directories and settings: a full-Git command can edit .git/config, and core.worktree,
+    // core.fileMode=false, a sparse checkout or an fsmonitor hook would otherwise hide changes from
+    // verification (and the hook would run inside it).
+    const treeGit = (tree: PrivateTree, deadline: number, accepted: readonly number[] = [0], limit?: number) => {
+      const gitDir = tree.privateControl ? path.join(tree.privateControl, "repository") : path.join(tree.rootDir, ".git");
+      return async (...args: string[]) => {
+        const result = await snapshotProcess("git", [`--git-dir=${gitDir}`, `--work-tree=${tree.rootDir}`, "-c", "core.fileMode=true", "-c", "core.sparseCheckout=false", "-c", "core.symlinks=true", "-c", "core.fsmonitor=false", ...args], tree.rootDir, cleanEnv, deadline, input.signal, limit);
+        if (!accepted.includes(result.code ?? -1)) throw new CheckSnapshotError("check_snapshot_unavailable", "Snapshot Git identity could not be read.");
+        return result.stdout;
       };
-      await inventory([], false, deadline);
-      if (await verifyGit("write-tree") !== input.candidate.treeSha || await verifyGit("rev-parse", "HEAD") !== candidateCommit || await verifyGit("rev-parse", `${candidateRef}^{tree}`) !== input.candidate.treeSha || await verifyGit("rev-parse", baseRef) !== input.candidate.base.tipSha || dependencyDigest !== await inventory(input.outputs, false, deadline)) throw new CheckSnapshotError("check_snapshot_drift", "Execution changed the private source, dependencies or pinned Git context.");
     };
-    return { rootDir, commandRoot: path.join(controlRoot, "commands"), environment, dependencyDigest, verify, cleanup };
+    // Untracked entries the setup left, with each wholly untracked directory
+    // (an installed dependency tree) collapsed to one entry. Exclude rules are
+    // not read: a command could write one to hide its own files.
+    const others = ["ls-files", "--others", "--directory", "--no-empty-directory", "-z"];
+    const setupEntries = new Set(nulSeparated(await treeGit({ rootDir, ...(privateControl ? { privateControl } : {}), owned: [] }, performance.now() + SNAPSHOT_TIMEOUT_MS)(...others)));
+    const reusedVerification = "index" as const;
+    const open = (tree: PrivateTree, onPhase?: SnapshotRequest["onPhase"]): CheckSnapshot => {
+      const control = tree.privateControl ?? path.join(tree.rootDir, ".git");
+      const verify: CheckSnapshot["verify"] = async (options = {}) => phaseMeter(onPhase)("verification", async () => {
+        const timeoutMs = options.timeoutMs ?? SNAPSHOT_TIMEOUT_MS;
+        if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > SNAPSHOT_TIMEOUT_MS) throw new CheckSnapshotError("check_snapshot_timeout", "Snapshot deadline must be positive and cannot exceed five minutes.");
+        const deadline = performance.now() + timeoutMs;
+        // The worker also checks file-only Git metadata, so lstat cannot stall the parent.
+        const verifyGit = treeGit(tree, deadline);
+        if (options.unchanged && reusedVerification === "index") {
+          // A reused tree passed a full inventory after its last command. Before
+          // the next one it must still match the index: no tracked edit, and no
+          // untracked entry the setup did not leave outside the allowed outputs.
+          const allowed = options.unchanged.allowed;
+          // A clone has new inodes, so the refresh rehashes; 1 means a tracked file differs, which
+          // diff-files names. Every entry must be a plain cached one ("H"): an assume-unchanged
+          // (lowercase) or skip-worktree ("S") flag would hide an edit from both.
+          await treeGit(tree, deadline, [0, 1])("update-index", "-q", "--refresh");
+          if (nulSeparated(await treeGit(tree, deadline, [0], 128 * 1024 * 1024)("ls-files", "-v", "-z")).some(entry => !entry.startsWith("H ")))
+            throw new CheckSnapshotError("check_snapshot_drift", "A reused snapshot's index hides a tracked path.");
+          if (input.gitContext === "none" && await lstat(path.join(tree.rootDir, ".git")).then(() => true, (error: NodeJS.ErrnoException) => error.code === "ENOENT" ? false : Promise.reject(new CheckSnapshotError("check_snapshot_unavailable", "Snapshot Git absence could not be read."))))
+            throw new CheckSnapshotError("check_snapshot_drift", "A file-only snapshot gained Git metadata.");
+          if (nulSeparated(await verifyGit("diff-files", "--name-only", "-z")).length) throw new CheckSnapshotError("check_snapshot_drift", "A reused snapshot changed tracked source.");
+          for (const entry of nulSeparated(await verifyGit(...others))) {
+            if (setupEntries.has(entry) || withinOutputs(entry, allowed)) continue;
+            // A collapsed directory is looked into only when an allowed output lies inside it.
+            if (!entry.endsWith("/") || !allowed.some(output => output.startsWith(entry))) throw new CheckSnapshotError("check_snapshot_drift", "A reused snapshot gained an undeclared untracked path.");
+            if (nulSeparated(await verifyGit("ls-files", "--others", "-z", "--", `:(literal)${entry}`)).some(file => !withinOutputs(file, allowed))) throw new CheckSnapshotError("check_snapshot_drift", "A reused snapshot gained an undeclared untracked path.");
+          }
+        } else {
+          // One worker checks every non-Git link/type and hashes only immutable bytes.
+          // Finish safety validation before Git reads, under the same owned deadline.
+          if (await inventory(tree.rootDir, options.outputs ?? input.outputs, false, deadline) !== dependencyDigest) throw new CheckSnapshotError("check_snapshot_drift", "Execution changed the private source, dependencies or pinned Git context.");
+        }
+        const indexTree = (await verifyGit("write-tree")).trim();
+        const identities = (await verifyGit("rev-parse", "HEAD", `${candidateRef}^{tree}`, baseRef)).trim().split("\n");
+        if (indexTree !== input.candidate.treeSha || identities.length !== 3 || identities[0] !== candidateCommit || identities[1] !== input.candidate.treeSha || identities[2] !== input.candidate.base.tipSha) throw new CheckSnapshotError("check_snapshot_drift", "Execution changed the private source, dependencies or pinned Git context.");
+      });
+      return { rootDir: tree.rootDir, commandRoot: path.join(control, "commands"), environment: environmentFor(tree.rootDir, control), dependencyDigest, clonable, reusedVerification, verify,
+        clone: (method, onClonePhase) => cloneSnapshot(tree, method, input.signal, onClonePhase, open), cleanup: () => removeTrees(tree.owned) };
+    };
+    return open({ rootDir, ...(privateControl ? { privateControl } : {}), owned: [rootDir, ...(privateControl ? [privateControl] : [])] }, input.onPhase);
   } catch (error) {
     await cleanup();
     if (error instanceof CheckSnapshotError) throw error;
     throw new CheckSnapshotError("check_snapshot_unavailable", "The exact prepared Git tree could not be materialized privately.");
   }
 }
+
+/** Opt-in file-only execution; legacy snapshots above retain complete Git semantics. */
+function finiteSourceReaderRunner(input: SnapshotRequest): CandidateCommandRunner {
+  const deadline = performance.now() + SNAPSHOT_TIMEOUT_MS;
+  // Logical source bounds belong to capturePhysicalSource, including repeated
+  // blobs. Reserve separate bounded transport room for listings/size responses;
+  // protocol overhead must not consume the supported 64 MiB of source bytes.
+  const transportLimit = 128 * 1024 * 1024;
+  let transportBytes = 0;
+  return async (command, options) => {
+    if (input.signal?.aborted) throw new CheckSnapshotError("check_snapshot_interrupted", "Finite source capture was cancelled.");
+    const remaining = deadline - performance.now();
+    if (remaining <= 0) throw new CheckSnapshotError("check_snapshot_timeout", "Finite source capture exceeded its deadline.");
+    return await new Promise((resolve, reject) => {
+      const child = spawn(command[0]!, command.slice(1), { cwd: options.cwd,
+        env: { PATH: executionPath(input.rootDir, input.environment["PATH"] ?? process.env["PATH"] ?? "/usr/bin:/bin"), GIT_CONFIG_NOSYSTEM: "1", GIT_CONFIG_GLOBAL: "/dev/null", GIT_TERMINAL_PROMPT: "0", GIT_OPTIONAL_LOCKS: "0" },
+        stdio: [options.stdin === undefined ? "ignore" : "pipe", "pipe", "pipe"] });
+      let failure: CheckSnapshotError | undefined;
+      const chunks: Buffer[] = [];
+      const stop = (code: string) => { failure ??= new CheckSnapshotError(code, "Finite source reader did not complete safely."); child.kill("SIGKILL"); };
+      const abort = () => stop("check_snapshot_interrupted"), timer = setTimeout(() => stop("check_snapshot_timeout"), remaining);
+      input.signal?.addEventListener("abort", abort, { once: true });
+      if (input.signal?.aborted) abort();
+      child.stdout!.on("data", (chunk: Buffer) => { transportBytes += chunk.length; if (transportBytes > transportLimit) stop("check_snapshot_unavailable"); else chunks.push(chunk); });
+      child.stderr!.on("data", () => {});
+      child.once("error", () => { failure ??= new CheckSnapshotError("check_snapshot_unavailable", "Finite source reader failed to start."); });
+      child.stdin?.once("error", () => stop("check_snapshot_unavailable"));
+      child.stdin?.end(options.stdin);
+      child.once("close", code => {
+        clearTimeout(timer); input.signal?.removeEventListener("abort", abort);
+        if (failure) reject(failure);
+        else { const bytes = Buffer.concat(chunks); resolve({ exitCode: code ?? -1, stdout: bytes.toString("utf8"), stderr: "", ...(options.captureBytes ? { stdoutBase64: bytes.toString("base64") } : {}) }); }
+      });
+    });
+  };
+}
+async function createFiniteCheckSnapshot(input: SnapshotRequest): Promise<CheckSnapshot> {
+  const materializationStarted = performance.now();
+  const source = input.physicalSource!;
+  if (input.gitContext !== "none" || !isPhysicalSourceDefinition(source) || physicalSourceOutputOverlap(source, input.outputs))
+    throw new CheckSnapshotError("check_physical_source_invalid", "Finite source requires Git-none and absences disjoint from all mutable outputs.");
+  let captured: Awaited<ReturnType<typeof capturePhysicalSource>>;
+  try { captured = await capturePhysicalSource(source, await candidateTreeSourceReader(input.rootDir, input.candidate.treeSha, finiteSourceReaderRunner(input))); }
+  catch (error) { if (error instanceof CheckSnapshotError) throw error; throw new CheckSnapshotError("check_physical_source_invalid", "Finite source inputs are missing, linked or unsupported in the candidate."); }
+  const rootDir = await realpath(await mkdtemp(path.join(tmpdir(), "delivery-check-")));
+  let control: string | undefined;
+  const cleanup = () => removeTrees([rootDir, ...(control ? [control] : [])]);
+  const measured = phaseMeter(input.onPhase);
+  const inventory = async (root: string, outputs: readonly string[], sourceOnly = false, deadline?: number) => {
+    if (physicalSourceOutputOverlap(source, outputs)) throw new CheckSnapshotError("check_physical_source_invalid", "Mutable output overlaps a required absence.");
+    return snapshotInventory(root, outputs, sourceOnly, deadline, input.signal, true, source.absentInputs);
+  };
+  try {
+    control = await realpath(await mkdtemp(path.join(tmpdir(), "delivery-check-control-")));
+    for (const file of captured.files) {
+      await mkdir(path.dirname(path.join(rootDir, file.file)), { recursive: true });
+      await writeFile(path.join(rootDir, file.file), file.bytes, { flag: "wx" });
+      await chmod(path.join(rootDir, file.file), file.mode === "100755" ? 0o755 : 0o644);
+    }
+    try { input.onPhase?.("materialization", performance.now() - materializationStarted); } catch { /* Best-effort observation. */ }
+    const cleanPath = executionPath(input.rootDir, input.environment["PATH"] ?? process.env["PATH"] ?? "/usr/bin:/bin");
+    const environmentFor = (root: string, controlDir: string) => ({ ...input.environment, PATH: `${path.join(root, "node_modules/.bin")}${path.delimiter}${cleanPath}`,
+      HOME: path.join(controlDir, "home"), TMPDIR: path.join(controlDir, "tmp"), GIT_CEILING_DIRECTORIES: path.dirname(root) });
+    const environment = environmentFor(rootDir, control);
+    await mkdir(environment.HOME, { recursive: true }); await mkdir(environment.TMPDIR, { recursive: true });
+    const baseline = await measured("baseline-inventory", () => inventory(rootDir, input.outputs, Boolean(input.dependencies)));
+    if (input.dependencies) {
+      const start = performance.now();
+      const result = await measured("dependencies", () => createExecPort().run({ command: input.dependencies!.command[0], args: input.dependencies!.command.slice(1), cwd: rootDir,
+        env: environment, timeoutMs: input.dependencies!.timeoutMs, maxBuffer: 1024 * 1024, ...(input.signal ? { signal: input.signal } : {}) }));
+      input.onDependencyResult?.(result, Math.round(performance.now() - start));
+      if (result.code !== 0 || input.signal?.aborted) throw new CheckSnapshotError("check_dependency_failed", "Private finite dependency installation failed.");
+    }
+    const installed = input.dependencies ? await measured("post-dependency-inventory", () =>
+      snapshotDigests(rootDir, input.outputs, false, performance.now() + SNAPSHOT_TIMEOUT_MS, input.signal, true, true, source.absentInputs, selfReferences(rootDir, control))) : { digest: baseline, sourceDigest: baseline, selfReferenced: false };
+    if (baseline !== installed.sourceDigest) throw new CheckSnapshotError("check_snapshot_drift", "Dependency setup changed finite source bytes or modes.");
+    // Without Git there is no index to compare, so a reused finite tree is verified by its full inventory.
+    const open = (tree: PrivateTree, onPhase?: SnapshotRequest["onPhase"]): CheckSnapshot => {
+      const controlDir = tree.privateControl!;
+      const verify: CheckSnapshot["verify"] = async (options = {}) => phaseMeter(onPhase)("verification", async () => {
+        const timeout = options.timeoutMs ?? SNAPSHOT_TIMEOUT_MS;
+        if (!Number.isFinite(timeout) || timeout <= 0 || timeout > SNAPSHOT_TIMEOUT_MS) throw new CheckSnapshotError("check_snapshot_timeout", "Invalid finite verification deadline.");
+        if (await inventory(tree.rootDir, options.outputs ?? input.outputs, false, performance.now() + timeout) !== installed.digest)
+          throw new CheckSnapshotError("check_snapshot_drift", "Finite source or installed dependencies changed.");
+      });
+      return { rootDir: tree.rootDir, commandRoot: path.join(controlDir, "commands"), environment: environmentFor(tree.rootDir, controlDir), dependencyDigest: installed.digest, clonable: !installed.selfReferenced, reusedVerification: "inventory", verify,
+        clone: (method, onClonePhase) => cloneSnapshot(tree, method, input.signal, onClonePhase, open), cleanup: () => removeTrees(tree.owned) };
+    };
+    return open({ rootDir, privateControl: control, owned: [rootDir, control] }, input.onPhase);
+  } catch (error) {
+    await cleanup();
+    if (error instanceof CheckSnapshotError) throw error;
+    throw new CheckSnapshotError("check_snapshot_unavailable", "Finite source could not be materialized or verified.");
+  }
+}

package/src/command-activity.ts

@@ -1,6 +1,6 @@
 /** Best-effort CLI observations. No caller uses these results for admission. */
 import { randomUUID } from "node:crypto";
-import type { RunEventKind, RunPreparationObservation, WaiverPrompt } from "@agent-delivery-harness/kernel";
+import type { CaptureCandidate, RunEventKind, RunPreparationObservation, WaiverPrompt } from "@agent-delivery-harness/kernel";
 import { buildRunEvent, resolveRunSurface } from "./run-surface.ts";
 
 export interface CommandObservation {
@@ -12,6 +12,20 @@ export interface CommandObservation {
 const absent: CommandObservation = { needsCandidate: false, start: async () => {}, prompt: prompt => prompt, finish: async () => {} };
 function outcome(code: number) { return code === 0 ? "ok" : code === 2 ? "usage" : code === 130 ? "interrupted" : "policy"; }
 
+/** Observe the first successful command capture; never reuse or replace a result. */
+export function observeCandidateCaptures(capture: CaptureCandidate, observation: CommandObservation): CaptureCandidate {
+  let start: Promise<void> | undefined;
+  return async () => {
+    const result = await capture();
+    if (result.ok) {
+      start ??= Promise.resolve().then(() => observation.start(result.candidate.treeSha))
+        .catch(() => { /* Progress reporting never changes capture or command outcomes. */ });
+      await start;
+    }
+    return result;
+  };
+}
+
 /** Pin the current run once, so a pointer change cannot split an invocation. */
 export async function beginCommandObservation(cwd: string, command: string): Promise<CommandObservation> {
   try {

package/src/commands/admit.ts

@@ -13,9 +13,9 @@ import path from "node:path";
 
 import { commandBlocker, type CommandContext, type CommandDescriptor, type CommandResult } from "../boundary.ts";
 import { emitReviewEvidence, OutcomeError } from "../review-evidence.ts";
-import { gateCommand } from "./gate.ts";
+import { runGate } from "./gate.ts";
 import { prepareCommand } from "./prepare.ts";
-import { recordCommand } from "./record.ts";
+import { writeRecord } from "./record.ts";
 import { reviewContextCommand } from "./review-context.ts";
 import { submitEvidenceCommand } from "./submit-evidence.ts";
 
@@ -52,6 +52,7 @@ function invalidOutcome(message: string): CommandResult {
 }
 
 export const admitCommand: CommandDescriptor = {
+  capturesCandidate: true,
   name: "admit",
   sourceId: "delivery-harness.cli.admit",
   summary: "Prepare and admit a concluded review outcome through the tracked record write.",
@@ -97,10 +98,10 @@ export const admitCommand: CommandDescriptor = {
     const stoppedAfterSubmission = report(context, "submitted", submitted);
     if (stoppedAfterSubmission !== undefined) return stoppedAfterSubmission;
 
-    const gated = await gateCommand.run(withArgs(context, []));
+    const gated = await runGate(withArgs(context, []));
     const stoppedAfterGate = report(context, "gate", gated);
     if (stoppedAfterGate !== undefined) return stoppedAfterGate;
 
-    return recordCommand.run(withArgs(context, []));
+    return writeRecord(withArgs(context, []));
   },
 };

package/src/commands/emit-review-evidence.ts

@@ -4,6 +4,7 @@ import { commandBlocker, type CommandDescriptor } from "../boundary.ts";
 import { emitReviewEvidence, OutcomeError } from "../review-evidence.ts";
 
 export const emitReviewEvidenceCommand: CommandDescriptor = {
+  capturesCandidate: true,
   name: "emit-review-evidence",
   sourceId: "delivery-harness.cli.emit-review-evidence",
   summary: "Bind concluded review outcomes to their original prepared context.",