@robmclarty/volley 0.8.0 → 0.9.0

package/dist/index.js

@@ -1,9 +1,10 @@
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { randomUUID } from "node:crypto";
+import { createHmac, randomBytes, randomUUID } from "node:crypto";
 import { spawn, spawnSync } from "node:child_process";
 import { aborted_error, branch, claude_cli_reported, create_engine, fallback, loop, model_call, pipe, retry, run, sequence, step, throughput } from "fascicle";
+import { homedir } from "node:os";
 import { filesystem_logger, tee_logger } from "fascicle/adapters";
 import { lookup } from "node:dns";
 import { Readability } from "@mozilla/readability";
@@ -13,6 +14,31 @@ import TurndownService from "turndown";
 import { Agent, buildConnector, interceptors, request } from "undici";
 import { z } from "zod";
 import pc from "picocolors";
+//#region src/types.ts
+function config_error(message) {
+	return Object.assign(new Error(message), { kind: "config_error" });
+}
+function check_error(message) {
+	return Object.assign(new Error(message), { kind: "check_error" });
+}
+/** Wraps a provider/schema failure with the phase and iteration it hit. */
+function phase_error(phase, iteration, cause) {
+	const detail = cause instanceof Error ? cause.message : String(cause);
+	return Object.assign(/* @__PURE__ */ new Error(`${phase} failed on iteration ${iteration}: ${detail}`), {
+		kind: "phase_error",
+		phase,
+		iteration,
+		cause
+	});
+}
+function error_kind(err) {
+	if (typeof err === "object" && err !== null && "kind" in err) {
+		const kind = err.kind;
+		return typeof kind === "string" ? kind : null;
+	}
+	return null;
+}
+//#endregion
 //#region src/changes.ts
 /**
 * What the builder changed, and whether it touched the gate.
@@ -117,6 +143,29 @@ function capture_baseline(root) {
 	const sha = head.stdout.trim();
 	return sha.length > 0 ? sha : null;
 }
+/**
+* The commit a critique's change is measured from: `rev` (`--baseline`)
+* resolved in `root`, so the change is everything that differs from it,
+* committed or not, untracked files included. With no revision named it's
+* HEAD, so the uncommitted and untracked edits are the change, and, as for a
+* run, null where there's no repository or no commit yet. A named revision
+* that isn't a commit there, or one named where there's no repository, is a
+* config error.
+*/
+function resolve_baseline(root, rev) {
+	if (rev === void 0) return capture_baseline(root);
+	if (!in_git_repo(root)) throw config_error(`--baseline needs the workspace to be a git repository: ${root}`);
+	const resolved = git$1(root, [
+		"rev-parse",
+		"--verify",
+		"--quiet",
+		"--end-of-options",
+		`${rev}^{commit}`
+	]);
+	const sha = resolved.stdout.trim();
+	if (resolved.status !== 0 || sha.length === 0) throw config_error(`--baseline names no commit in ${root}: ${rev}`);
+	return sha;
+}
 /** git's status letters, folded onto the four cases worth naming. Rename and
 * copy both record the destination path — where the content lives now. */
 function change_status(code) {
@@ -153,7 +202,8 @@ function parse_name_status(stdout) {
 function parse_paths(stdout) {
 	return stdout.split("\0").filter((path) => path.length > 0);
 }
-function excluded(path) {
+function excluded(path, excluded_dir) {
+	if (excluded_dir !== null && path.startsWith(`${excluded_dir}/`)) return true;
 	return EXCLUDED_PREFIXES.some((prefix) => path.startsWith(prefix));
 }
 /**
@@ -233,10 +283,11 @@ function collect_changes(options) {
 		path,
 		status: "added"
 	}));
+	const excluded_dir = options.excluded_dir ?? null;
 	const seen = /* @__PURE__ */ new Set();
 	const files = [];
 	for (const change of [...tracked, ...untracked]) {
-		if (excluded(change.path) || seen.has(change.path)) continue;
+		if (excluded(change.path, excluded_dir) || seen.has(change.path)) continue;
 		seen.add(change.path);
 		files.push({
 			...change,
@@ -278,29 +329,23 @@ function resolve_check_runner(check, workspace) {
 	return /(^|\s)checkride(\s|$)/.test(check.trim()) ? "checkride" : "command";
 }
 //#endregion
-//#region src/types.ts
-function config_error(message) {
-	return Object.assign(new Error(message), { kind: "config_error" });
-}
-function check_error(message) {
-	return Object.assign(new Error(message), { kind: "check_error" });
-}
-/** Wraps a provider/schema failure with the phase and iteration it hit. */
-function phase_error(phase, iteration, cause) {
-	const detail = cause instanceof Error ? cause.message : String(cause);
-	return Object.assign(/* @__PURE__ */ new Error(`${phase} failed on iteration ${iteration}: ${detail}`), {
-		kind: "phase_error",
-		phase,
-		iteration,
-		cause
-	});
-}
-function error_kind(err) {
-	if (typeof err === "object" && err !== null && "kind" in err) {
-		const kind = err.kind;
-		return typeof kind === "string" ? kind : null;
-	}
-	return null;
+//#region src/containment.ts
+/**
+* Whether volley is running inside its sandbox container. A leaf, so the
+* config resolution, the preflight, and the run-config signing can all ask
+* without importing one another.
+*/
+/** volley *detects* it is running inside its sandbox container rather than
+* starting the container itself. The signal is the `VOLLEY_CONTAINED=1` marker
+* volley's own image bakes in (`Dockerfile` `ENV`), so a `docker run <hardened
+* flags> <image> volley run …` is recognized as contained out of the box. Kept
+* env-only — no ambient `/.dockerenv` probe — so the safety gate is deterministic
+* and testable, and so a CI job that itself runs in an unrelated container does
+* not silently satisfy the gate; a hand-rolled sandbox must set the marker (or
+* the operator uses `--allow-unsandboxed-builder`). */
+function detect_containment(env) {
+	const value = env["VOLLEY_CONTAINED"];
+	return value === "1" || value === "true";
 }
 //#endregion
 //#region src/engine.ts
@@ -516,6 +561,264 @@ async function dispose_seat_engines(engines) {
 	const distinct = engines.critic === engines.builder ? [engines.builder] : [engines.builder, engines.critic];
 	await Promise.all(distinct.map((engine) => engine.dispose()));
 }
+//#endregion
+//#region src/trust.ts
+/**
+* Which run configs a host-side resume may trust. A resume runs what a run's
+* `config.json` says: its check, a shell command, and its seats, permission
+* mode and prompt included. Inside the sandbox the builder runs arbitrary
+* commands with write access to its own run's state, so a contained run's
+* config is the builder's to rewrite, and resuming it on the host would run
+* whatever the builder left there.
+*
+* So volley on the host signs each config it writes, an HMAC under a key of
+* this machine's that never enters the container, and a host-side resume
+* trusts only a config whose signature holds. Inside the sandbox nothing is
+* signed, since the key isn't there and one made there would be in the
+* builder's reach, so a contained run's config never carries a signature the
+* host accepts, and the builder can't forge one without the key.
+*/
+/** Prefixed to what is signed, so a signature over a run config can't pass for
+* one over anything else under the same key. */
+const DOMAIN = "volley run config v1\n";
+/** Where this machine's key lives: `$XDG_CONFIG_HOME/volley/run-key`, else
+* `~/.config/volley/run-key`, outside every state root, so a container a run
+* root is mounted into still can't read it. A relative `XDG_CONFIG_HOME` is
+* ignored, as the XDG spec says. */
+function trust_key_path(env, home = homedir()) {
+	const xdg = env["XDG_CONFIG_HOME"];
+	const base = xdg !== void 0 && isAbsolute(xdg) ? xdg : join(home, ".config");
+	return join(base, "volley", "run-key");
+}
+function error_code(err) {
+	return err.code;
+}
+/** The key as stored, or null when there is none or it isn't one. */
+function read_key(path) {
+	try {
+		const hex = readFileSync(path, "utf8").trim();
+		return /^[0-9a-f]{64}$/.test(hex) ? Buffer.from(hex, "hex") : null;
+	} catch {
+		return null;
+	}
+}
+/** The key, created on first use: 32 random bytes in a file only its user can
+* read, in a directory only its user can enter. Two runs that start together
+* race to create it; the loser reads the winner's. */
+function machine_key(env) {
+	const path = trust_key_path(env);
+	const existing = read_key(path);
+	if (existing !== null) return existing;
+	try {
+		mkdirSync(dirname(path), {
+			recursive: true,
+			mode: 448
+		});
+		writeFileSync(path, `${randomBytes(32).toString("hex")}\n`, {
+			flag: "wx",
+			mode: 384
+		});
+	} catch (err) {
+		if (error_code(err) !== "EEXIST") return null;
+	}
+	return read_key(path);
+}
+function hmac(key, config_text) {
+	return createHmac("sha256", key).update(DOMAIN).update(config_text).digest("hex");
+}
+/** This machine's signature over a run's `config.json` text, or null where
+* there's none to give: inside the sandbox, or when the key can't be read or
+* created. */
+function sign_config(config_text, env = process.env) {
+	if (detect_containment(env)) return null;
+	const key = machine_key(env);
+	return key === null ? null : hmac(key, config_text);
+}
+//#endregion
+//#region src/workspace.ts
+/**
+* Workspace lifecycle: run-state initialization, stale-run
+* backup rotation, path helpers, and optional git checkpoints.
+*/
+/** A run id names the run's `volley/<run id>` branch and its state directory,
+* so it is held to what both take without quoting: letters, digits, `-`, and
+* `_`, starting with a letter or digit, so it never reads as an option and
+* never climbs out of the directory it names. */
+const RUN_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+/** The root each run's state sits under when `--state-dir` names none:
+* `$XDG_STATE_HOME/volley`, else `<home>/.local/state/volley`. A relative
+* `XDG_STATE_HOME` is ignored, as the XDG spec says. `home` is the host's by
+* default; the sandbox passes its container's to spell the same root inside. */
+function default_state_root(env, home = homedir()) {
+	const xdg = env["XDG_STATE_HOME"];
+	const base = xdg !== void 0 && isAbsolute(xdg) ? xdg : join(home, ".local", "state");
+	return join(base, "volley");
+}
+/** Where a run keeps its config, summary, trajectory, feedback, verdict, and
+* iterations: `<state_dir>/<run_id>/` under its state root, or, in the layout
+* older runs used (`state_dir` null), `<workspace>/.volley/`. */
+function run_state_dir(run) {
+	return run.state_dir === null ? join(run.workspace, ".volley") : join(run.state_dir, run.run_id);
+}
+function state_path(run, ...parts) {
+	return join(run_state_dir(run), ...parts);
+}
+function iteration_dir(run, iteration) {
+	return state_path(run, "iterations", String(iteration).padStart(3, "0"));
+}
+/** A state root that sits inside `root` (the build root), as the path from
+* there in git's `/`-separated vocabulary, or null when it sits outside. A
+* root inside the tree would otherwise pass for the builder's work: listed in
+* the changes the critic reads, and committed by every `--git` checkpoint.
+* The legacy `.volley/` (`state_dir` null) is excluded by name already. */
+function state_root_within(root, state_dir) {
+	if (state_dir === null) return null;
+	const path = relative(resolve(root), resolve(state_dir));
+	if (path === "" || path === ".." || path.startsWith(`..${sep}`) || isAbsolute(path)) return null;
+	return path.split(sep).join("/");
+}
+/** Filesystem-safe timestamp for `.bak.<stamp>` rotation names. Shared by the
+* run-state rotation here and the worktree rotation so both preserve
+* prior state under the same never-destroy naming. */
+function backup_stamp(date = /* @__PURE__ */ new Date()) {
+	return date.toISOString().replace(/[:.]/g, "-");
+}
+/** Fresh-run initialization: rotate a stale state directory aside (a prior
+* `.volley/` becomes `.volley.bak.<stamp>`), then create the directory tree.
+* Under a state root each run has a directory of its own, so only a reused
+* `--run-id` ever finds one to rotate. An empty one is used as it is: that is
+* what a contained run is handed when its run directory is the mount, which
+* can't be renamed. Resume runs skip rotation (`preserve: true`). */
+function initialize_run_state(run, options = {}) {
+	const dir = run_state_dir(run);
+	if (existsSync(dir) && options.preserve !== true && readdirSync(dir).length > 0) renameSync(dir, `${dir}.bak.${backup_stamp()}`);
+	if (run.state_dir !== null && !existsSync(run.state_dir)) mkdirSync(run.state_dir, {
+		recursive: true,
+		mode: 448
+	});
+	mkdirSync(join(dir, "iterations"), { recursive: true });
+}
+/** Beside a run's `config.json`: this machine's signature over it
+* (`./trust.ts`), which a host-side resume checks before it trusts the
+* config. */
+const CONFIG_SIGNATURE = "config.sig";
+/** Record the run's config, signed when volley runs on the host. Returns
+* whether it was signed: inside the sandbox it never is, and on the host only
+* when the machine's key can't be read or created. A signature a reused run
+* directory held from before is removed rather than left to vouch for this
+* config. */
+function write_resolved_config(config, env = process.env) {
+	const record = {
+		version: config.version,
+		run_id: config.run_id,
+		started_at: config.started_at,
+		mode: config.mode,
+		prompt: config.prompt,
+		criteria: config.criteria,
+		check: config.check,
+		check_resolved: config.check_resolved,
+		builder_model: config.builder_model,
+		builder_provider: config.builder_provider,
+		builder_url: config.builder_url,
+		builder_max_steps: config.builder_max_steps,
+		builder_max_tool_calls: config.builder_max_tool_calls,
+		critic_model: config.critic_model,
+		critic_provider: config.critic_provider,
+		critic_url: config.critic_url,
+		builder_permission_mode: config.builder_permission_mode,
+		critic_preset: config.critic_preset,
+		critic_prompt_path: config.critic_prompt_path,
+		max_iterations: config.max_iterations,
+		max_cost_usd: config.max_cost_usd,
+		git_checkpoints: config.git_checkpoints,
+		worktree: config.worktree,
+		discard_worktree: config.discard_worktree,
+		gate_paths: config.gate_paths,
+		fail_on_gate_edit: config.fail_on_gate_edit,
+		sandbox_image: config.sandbox_image,
+		state_dir: config.state_dir,
+		workspace: config.workspace
+	};
+	const text = `${JSON.stringify(record, null, 2)}\n`;
+	writeFileSync(state_path(config, "config.json"), text);
+	const signature = sign_config(text, env);
+	if (signature === null) {
+		rmSync(state_path(config, CONFIG_SIGNATURE), { force: true });
+		return false;
+	}
+	writeFileSync(state_path(config, CONFIG_SIGNATURE), `${signature}\n`);
+	return true;
+}
+/**
+* `--git`: commit everything under `root` after a phase (`git -C <root>`, run
+* here via the spawn `cwd`). `root` is the build root (`build_root`): the
+* workspace on the default path, or the per-run worktree under `--worktree`, so
+* checkpoints land on the worktree branch rather than the workspace's.
+* A checkpoint with nothing to commit is fine; a missing git binary or repo is
+* not. `excluded_dir` (from `state_root_within`) keeps a state root inside the
+* tree out of the commit; `:/` keeps the rest of the staging repo-wide, as a
+* bare `git add -A` is, and `literal` reads the path as written, wildcards and
+* all.
+*/
+function git_checkpoint(root, message, excluded_dir = null) {
+	if (!existsSync(join(root, ".git"))) throw config_error(`git checkpoints require a git repository: ${root}`);
+	const pathspec = excluded_dir === null ? [] : [
+		"--",
+		":/",
+		`:(exclude,literal)${excluded_dir}`
+	];
+	const add = spawnSync("git", [
+		"add",
+		"-A",
+		...pathspec
+	], { cwd: root });
+	if (add.error !== void 0 || add.status !== 0) throw check_error(`git add failed: ${add.stderr?.toString() ?? String(add.error)}`);
+	const commit = spawnSync("git", [
+		"commit",
+		"-m",
+		message,
+		"--no-verify"
+	], { cwd: root });
+	if (commit.error !== void 0) throw check_error(`git commit failed to start: ${String(commit.error)}`);
+	const out = `${commit.stdout?.toString() ?? ""}${commit.stderr?.toString() ?? ""}`;
+	if (commit.status !== 0 && !/nothing (?:added )?to commit/.test(out)) throw check_error(`git commit failed: ${out.trim()}`);
+}
+/**
+* Integration — bring a successful `--worktree --git` run's effects onto the
+* workspace branch. The per-phase checkpoints on `branch` are the raw
+* audit/replay trail; here they collapse into a single squash commit
+* (`git merge --squash` then `commit`) on the workspace's current branch. The
+* shared object store makes this a local, fetch-free merge, and — because the
+* workspace branch never moved during the run (checkpoints went to the phase
+* branch) — it is conflict-free by construction. A run whose phase branch has no
+* new commits integrates to a no-op. Only successful runs integrate; an
+* abandoned run's branch is discarded wholesale by the teardown trio instead.
+*/
+function integrate_worktree(workspace, branch, message) {
+	if (!existsSync(join(workspace, ".git"))) throw config_error(`--worktree integration requires a git repository: ${workspace}`);
+	const squash = spawnSync("git", [
+		"merge",
+		"--squash",
+		branch
+	], {
+		cwd: workspace,
+		encoding: "utf8"
+	});
+	if (squash.error !== void 0) throw check_error(`git merge --squash failed to start: ${String(squash.error)}`);
+	if (squash.status !== 0) throw check_error(`git merge --squash ${branch} failed: ${(squash.stderr || squash.stdout).trim()}`);
+	const commit = spawnSync("git", [
+		"commit",
+		"-m",
+		message,
+		"--no-verify"
+	], {
+		cwd: workspace,
+		encoding: "utf8"
+	});
+	if (commit.error !== void 0) throw check_error(`git commit failed to start: ${String(commit.error)}`);
+	const out = `${commit.stdout ?? ""}${commit.stderr ?? ""}`;
+	if (commit.status !== 0 && !out.includes("nothing to commit")) throw check_error(`git commit failed: ${out.trim()}`);
+}
 const DEFAULT_CRITIC_MODEL = "opus";
 const DEFAULT_CRITIC = "reviewer";
 const DEFAULT_BUILDER_PROVIDER = "claude_cli";
@@ -598,17 +901,49 @@ function resolve_critic(critic, cwd) {
 		critic_prompt_path: path
 	};
 }
-/** `--builder-max-steps` (a merged flag/config value) wins over the
-* `VOLLEY_BUILDER_MAX_STEPS` env var, which wins over the default. Local
-* builder only; ignored by the `claude_cli` arm. */
-function resolve_builder_max_steps(raw, env) {
-	if (raw.builder_max_steps !== void 0) return validate_builder_max_steps(raw.builder_max_steps, raw.builder_max_steps);
-	const env_value = env["VOLLEY_BUILDER_MAX_STEPS"];
-	if (env_value !== void 0 && env_value !== "") return validate_builder_max_steps(Number(env_value), env_value);
-	return 50;
-}
-function validate_builder_max_steps(value, original) {
-	if (!Number.isInteger(value) || value < 1) throw config_error(`--builder-max-steps / VOLLEY_BUILDER_MAX_STEPS must be a positive integer; got: ${String(original)}`);
+/** What only a builder, or the loop around it, uses, with the flag that sets
+* each: a critique has no use for any of them, so naming one is an error
+* rather than something quietly ignored. */
+const CRITIQUE_REFUSED = [
+	["builder_model", "--builder-model"],
+	["builder_provider", "--builder-provider"],
+	["builder_url", "--builder-url"],
+	["builder_max_steps", "--builder-max-steps"],
+	["builder_max_tool_calls", "--builder-max-tool-calls"],
+	["builder_permission_mode", "--builder-permission-mode"],
+	["allow_unsandboxed_builder", "--allow-unsandboxed-builder"],
+	["sandbox_image", "--sandbox-image"],
+	["max_iterations", "--max-iterations"],
+	["max_cost_usd", "--max-cost-usd"],
+	["git_checkpoints", "--git"],
+	["worktree", "--worktree"],
+	["discard_worktree", "--discard-worktree"],
+	["fail_on_gate_edit", "--fail-on-gate-edit"]
+];
+function refuse_builder_settings(raw) {
+	for (const [field, flag] of CRITIQUE_REFUSED) if (raw[field] !== void 0 && raw[field] !== false) throw config_error(`volley critique refuses ${flag} (${field}): a critique runs no builder and no loop`);
+}
+const BUILDER_MAX_STEPS = {
+	flag: "--builder-max-steps",
+	env_var: "VOLLEY_BUILDER_MAX_STEPS",
+	fallback: 50
+};
+const BUILDER_MAX_TOOL_CALLS = {
+	flag: "--builder-max-tool-calls",
+	env_var: "VOLLEY_BUILDER_MAX_TOOL_CALLS",
+	fallback: 1
+};
+/** A builder count's flag or config value wins over its env var, which wins
+* over the default, and either must be a positive integer. Local builder
+* only; ignored by the `claude_cli` arm. */
+function resolve_builder_count(value, env, count) {
+	if (value !== void 0) return positive_count(value, value, count);
+	const env_value = env[count.env_var];
+	if (env_value !== void 0 && env_value !== "") return positive_count(Number(env_value), env_value, count);
+	return count.fallback;
+}
+function positive_count(value, original, count) {
+	if (!Number.isInteger(value) || value < 1) throw config_error(`${count.flag} / ${count.env_var} must be a positive integer; got: ${String(original)}`);
 	return value;
 }
 /** `--sandbox-image` (a merged flag/config value) wins over the
@@ -658,25 +993,36 @@ function resolve_seat_url(seat, value, provider) {
 }
 /** `--state-dir` (`state_dir`): the root each run's state sits under at
 * `<root>/<run_id>/`, resolved against `cwd` so a resumed run finds the same
-* place, or null to keep `<workspace>/.volley/`. An empty value counts as unset,
-* as it does for a seat URL. */
-function resolve_state_dir(value, cwd) {
-	if (value === void 0 || value === null) return null;
+* place. Unset, or empty as a seat URL may be, it's the default root,
+* `$XDG_STATE_HOME/volley`, else `~/.local/state/volley`: outside the
+* workspace, where no check that reads every file can trip over the run's own
+* feedback. */
+function resolve_state_dir(value, cwd, env) {
+	if (value === void 0 || value === null) return default_state_root(env);
 	if (typeof value !== "string") throw config_error(`--state-dir (state_dir) must be a path string; got a ${typeof value}`);
 	const path = value.trim();
-	return path === "" ? null : resolve(cwd, path);
+	return path === "" ? default_state_root(env) : resolve(cwd, path);
 }
-/** volley *detects* it is running inside its sandbox container rather than
-* starting the container itself. The signal is the `VOLLEY_CONTAINED=1` marker
-* volley's own image bakes in (`Dockerfile` `ENV`), so a `docker run <hardened
-* flags> <image> volley run …` is recognized as contained out of the box. Kept
-* env-only — no ambient `/.dockerenv` probe — so the safety gate is deterministic
-* and testable, and so a CI job that itself runs in an unrelated container does
-* not silently satisfy the gate; a hand-rolled sandbox must set the marker (or
-* the operator uses `--allow-unsandboxed-builder`). */
-function detect_containment(env) {
-	const value = env["VOLLEY_CONTAINED"];
-	return value === "1" || value === "true";
+function is_writable_dir(path) {
+	try {
+		if (!statSync(path).isDirectory()) return false;
+		accessSync(path, constants.W_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
+/** The run's state directory must be one volley can write: the directory
+* itself when it's there, as a contained run's mount is, else the nearest
+* directory above it, where volley creates it. Checked before any spend,
+* because otherwise the run dies as it starts on a raw EROFS or EACCES. Inside
+* the sandbox the root filesystem is read-only, so that is what an unmounted
+* run directory looks like, and the message says what to mount. */
+function validate_run_state_dir(dir, contained) {
+	let existing = dir;
+	while (!existsSync(existing) && dirname(existing) !== existing) existing = dirname(existing);
+	if (is_writable_dir(existing)) return;
+	throw config_error(contained ? `run state directory not writable: ${dir}. Inside the sandbox, mount the run's own host directory there (sandbox_run_args run_state, or -v <root>/<run id>:${dir}), created on the host first, and pass volley the same --run-id; or point --state-dir at a writable mount` : `run state directory not writable: ${dir}. Point --state-dir at a directory volley can write`);
 }
 /** Whether a tool-loop builder's commands would reach the host with nothing in
 * between: volley isn't contained, and the operator hasn't opted out with
@@ -684,10 +1030,7 @@ function detect_containment(env) {
 function unguarded_builder(raw, env) {
 	return !detect_containment(env) && !resolve_allow_unsandboxed_builder(raw, env);
 }
-/** A caller's run id names the run's `volley/<run id>` branch, so it is held to
-* what a branch name accepts without quoting: letters, digits, `-`, and `_`,
-* starting with a letter or digit so it never reads as an option. */
-const RUN_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+/** A caller's run id, held to `RUN_ID_PATTERN`; none gets a fresh UUID. */
 function resolve_run_id(run_id) {
 	if (run_id === void 0) return randomUUID();
 	if (!RUN_ID_PATTERN.test(run_id)) throw config_error(`--run-id must be letters, digits, '-', and '_', starting with a letter or digit; got: ${run_id}`);
@@ -699,13 +1042,17 @@ function resolve_run_id(run_id) {
 function resolve_config(raw, options = {}) {
 	const cwd = options.cwd ?? process.cwd();
 	const env = options.env ?? process.env;
-	if (typeof raw.prompt !== "string" || raw.prompt.length === 0) throw config_error("missing required option: --prompt");
+	const critique = options.mode === "critique";
+	if (critique) refuse_builder_settings(raw);
+	const builder_env = critique ? {} : env;
+	const has_prompt = typeof raw.prompt === "string" && raw.prompt.length > 0;
+	if (!has_prompt && !critique) throw config_error("missing required option: --prompt");
 	if (typeof raw.workspace !== "string" || raw.workspace.length === 0) throw config_error("missing required option: --workspace");
 	if (typeof raw.criteria !== "string" || raw.criteria.length === 0) throw config_error("missing required option: --criteria");
 	const workspace = validate_workspace(resolve(cwd, raw.workspace));
-	const prompt = expand_at_file(raw.prompt, cwd);
+	const prompt = has_prompt ? expand_at_file(raw.prompt, cwd) : "";
 	const criteria = expand_at_file(raw.criteria, cwd);
-	const max_iterations = raw.max_iterations ?? 10;
+	const max_iterations = raw.max_iterations ?? (critique ? 1 : 10);
 	if (!Number.isInteger(max_iterations) || max_iterations < 1) throw config_error(`--max-iterations must be a positive integer; got: ${String(raw.max_iterations)}`);
 	const max_cost_usd = raw.max_cost_usd ?? null;
 	if (max_cost_usd !== null && !(typeof max_cost_usd === "number" && max_cost_usd > 0)) throw config_error(`--max-cost-usd must be a positive number; got: ${String(raw.max_cost_usd)}`);
@@ -714,17 +1061,18 @@ function resolve_config(raw, options = {}) {
 	const { critic_preset, critic_prompt_path } = resolve_critic(raw.critic ?? DEFAULT_CRITIC, cwd);
 	const builder_provider = raw.builder_provider ?? DEFAULT_BUILDER_PROVIDER;
 	if (!BUILDER_PROVIDERS.includes(builder_provider)) throw config_error(`--builder-provider must be one of ${BUILDER_PROVIDERS.join(", ")}; got: ${String(raw.builder_provider)}`);
-	const allow_unsandboxed_builder = resolve_allow_unsandboxed_builder(raw, env);
+	const allow_unsandboxed_builder = resolve_allow_unsandboxed_builder(raw, builder_env);
 	const contained = detect_containment(env);
-	if (TOOL_LOOP_BUILDER_PROVIDERS.includes(builder_provider) && options.uncontained_builder !== "ask" && unguarded_builder(raw, env)) throw config_error(`builder-provider '${builder_provider}' runs volley's tool loop with a real bash (write + exec) — refused unless contained. Launch volley inside its sandbox container (docker run <hardened flags> <image> volley run …, which sets VOLLEY_CONTAINED=1), or pass --allow-unsandboxed-builder (VOLLEY_ALLOW_UNSANDBOXED_BUILDER=1) to run uncontained on the host.`);
-	const builder_max_steps = resolve_builder_max_steps(raw, env);
+	if (TOOL_LOOP_BUILDER_PROVIDERS.includes(builder_provider) && options.uncontained_builder !== "ask" && unguarded_builder(raw, builder_env)) throw config_error(`builder-provider '${builder_provider}' runs volley's tool loop with a real bash (write + exec) — refused unless contained. Launch volley inside its sandbox container (docker run <hardened flags> <image> volley run …, which sets VOLLEY_CONTAINED=1), or pass --allow-unsandboxed-builder (VOLLEY_ALLOW_UNSANDBOXED_BUILDER=1) to run uncontained on the host.`);
+	const builder_max_steps = resolve_builder_count(raw.builder_max_steps, builder_env, BUILDER_MAX_STEPS);
+	const builder_max_tool_calls = resolve_builder_count(raw.builder_max_tool_calls, builder_env, BUILDER_MAX_TOOL_CALLS);
 	const critic_provider = raw.critic_provider ?? DEFAULT_CRITIC_PROVIDER;
 	if (!CRITIC_PROVIDERS.includes(critic_provider)) throw config_error(`--critic-provider must be one of ${CRITIC_PROVIDERS.join(", ")}; got: ${String(raw.critic_provider)}`);
 	const builder_url = resolve_seat_url("builder", raw.builder_url, builder_provider);
 	const critic_url = resolve_seat_url("critic", raw.critic_url, critic_provider);
 	if (builder_provider === "openrouter" || critic_provider === "openrouter") openrouter_api_key(env);
 	if (contained) {
-		const claude_roles = [builder_provider === "claude_cli" ? "builder" : null, critic_provider === "claude_cli" ? "critic" : null].filter((role) => role !== null);
+		const claude_roles = [builder_provider === "claude_cli" && !critique ? "builder" : null, critic_provider === "claude_cli" ? "critic" : null].filter((role) => role !== null);
 		const auth_mode = env["VOLLEY_AUTH_MODE"] ?? "auto";
 		if (claude_roles.length > 0 && auth_mode !== "api_key") throw config_error(`claude_cli (${claude_roles.join(", ")}) cannot use its subscription/OAuth token inside a container — it is mangled there. Set VOLLEY_AUTH_MODE=api_key (with ANTHROPIC_API_KEY) to drive Claude contained, or run claude_cli on the host uncontained.`);
 	}
@@ -735,14 +1083,17 @@ function resolve_config(raw, options = {}) {
 	if (discard_worktree && !worktree) throw config_error("--discard-worktree applies only to a --worktree run: there is no worktree to discard");
 	const gate_paths = raw.gate_paths ?? DEFAULT_GATE_PATTERNS;
 	if (!Array.isArray(gate_paths) || gate_paths.some((glob) => typeof glob !== "string")) throw config_error("gate_paths must be an array of glob strings");
-	const sandbox_image = resolve_sandbox_image(raw, env);
-	const state_dir = resolve_state_dir(raw.state_dir, cwd);
+	const sandbox_image = resolve_sandbox_image(raw, builder_env);
+	const state_dir = options.state_dir !== void 0 ? options.state_dir : resolve_state_dir(raw.state_dir, cwd, env);
+	if (state_dir === workspace) throw config_error(`--state-dir (state_dir) can't be the workspace itself: ${workspace}`);
 	const run_id = resolve_run_id(options.run_id);
+	if (state_dir !== null) validate_run_state_dir(join(state_dir, run_id), contained);
 	const check = raw.check ?? "auto";
 	return {
 		version: 2,
 		run_id,
 		started_at: options.started_at ?? (/* @__PURE__ */ new Date()).toISOString(),
+		mode: critique ? "critique" : "run",
 		prompt,
 		criteria,
 		check,
@@ -751,6 +1102,7 @@ function resolve_config(raw, options = {}) {
 		builder_provider,
 		builder_url,
 		builder_max_steps,
+		builder_max_tool_calls,
 		allow_unsandboxed_builder,
 		critic_model: raw.critic_model ?? DEFAULT_CRITIC_MODEL,
 		critic_provider,
@@ -860,7 +1212,7 @@ const IGNORED_DIRS = /* @__PURE__ */ new Set([
 * escape. Returns the absolute path; throws on containment violation. The
 * `workspace` root passed here is the build root, which is the per-run git
 * worktree under `--worktree` (`build_root`), not necessarily the
-* control-plane workspace that holds `.volley/`. */
+* workspace the run was started on. */
 function contain(workspace, rel) {
 	const root = resolve(workspace);
 	const candidate = isAbsolute(rel) ? resolve(rel) : resolve(root, rel);
@@ -899,6 +1251,25 @@ function walk(root, start, limit) {
 	}
 	return out;
 }
+/** The files a read tool's optional `path` covers: the whole tree, the tree
+* under a directory, or the one file it names. A path that doesn't exist
+* throws, so the seat reads why rather than an empty result that looks like
+* "nothing matched". */
+function scoped_files(workspace, path, limit) {
+	const root = resolve(workspace);
+	if (path === void 0) return walk(root, root, limit);
+	const start = contain(workspace, path);
+	let is_dir;
+	try {
+		is_dir = statSync(start).isDirectory();
+	} catch (err) {
+		throw new Error(`no such file or directory: ${path}`, { cause: err });
+	}
+	return is_dir ? walk(root, start, limit) : [{
+		rel: relative(root, start),
+		abs: start
+	}];
+}
 function build_regex(pattern, flags) {
 	try {
 		return new RegExp(pattern, flags);
@@ -910,11 +1281,11 @@ function build_regex(pattern, flags) {
 const read_file_input = z.object({ path: z.string().describe("Workspace-relative path to the file to read.") });
 const search_files_input = z.object({
 	pattern: z.string().describe("JavaScript regular expression to match against each line."),
-	path: z.string().optional().describe("Optional workspace-relative subdirectory to limit the search to."),
+	path: z.string().optional().describe("Optional workspace-relative directory or file to limit the search to."),
 	ignore_case: z.boolean().optional().describe("Case-insensitive match. Default false.")
 });
 const list_files_input = z.object({
-	path: z.string().optional().describe("Optional workspace-relative subdirectory. Default: the workspace root."),
+	path: z.string().optional().describe("Optional workspace-relative directory or file. Default: the workspace root."),
 	contains: z.string().optional().describe("Optional substring filter applied to each relative path.")
 });
 function read_only_tools(workspace) {
@@ -935,9 +1306,8 @@ function read_only_tools(workspace) {
 			input_schema: search_files_input,
 			execute: (raw) => {
 				const input = search_files_input.parse(raw);
-				const start = input.path !== void 0 ? contain(workspace, input.path) : resolve(workspace);
 				const regex = build_regex(input.pattern, input.ignore_case === true ? "i" : "");
-				const files = walk(resolve(workspace), start, LIST_MAX_ENTRIES);
+				const files = scoped_files(workspace, input.path, LIST_MAX_ENTRIES);
 				const hits = [];
 				for (const file of files) {
 					if (hits.length >= 200) break;
@@ -965,8 +1335,7 @@ function read_only_tools(workspace) {
 			input_schema: list_files_input,
 			execute: (raw) => {
 				const input = list_files_input.parse(raw);
-				const start = input.path !== void 0 ? contain(workspace, input.path) : resolve(workspace);
-				let files = walk(resolve(workspace), start, LIST_MAX_ENTRIES).map((f) => f.rel);
+				let files = scoped_files(workspace, input.path, LIST_MAX_ENTRIES).map((f) => f.rel);
 				if (input.contains !== void 0) {
 					const needle = input.contains;
 					files = files.filter((f) => f.includes(needle));
@@ -1500,130 +1869,6 @@ async function prewarm_ollama_model(base_url, model, abort) {
 	} catch {}
 }
 //#endregion
-//#region src/workspace.ts
-/**
-* Workspace lifecycle: run-state initialization, stale-run
-* backup rotation, path helpers, and optional git checkpoints.
-*/
-/** Where a run keeps its config, summary, trajectory, feedback, verdict, and
-* iterations: `<state_dir>/<run_id>/` under a state root, else
-* `<workspace>/.volley/`. */
-function run_state_dir(run) {
-	return run.state_dir === null ? join(run.workspace, ".volley") : join(run.state_dir, run.run_id);
-}
-function state_path(run, ...parts) {
-	return join(run_state_dir(run), ...parts);
-}
-function iteration_dir(run, iteration) {
-	return state_path(run, "iterations", String(iteration).padStart(3, "0"));
-}
-/** Filesystem-safe timestamp for `.bak.<stamp>` rotation names. Shared by the
-* run-state rotation here and the worktree rotation so both preserve
-* prior state under the same never-destroy naming. */
-function backup_stamp(date = /* @__PURE__ */ new Date()) {
-	return date.toISOString().replace(/[:.]/g, "-");
-}
-/** Fresh-run initialization: rotate a stale state directory aside (a prior
-* `.volley/` becomes `.volley.bak.<stamp>`), then create the directory tree.
-* Under a state root each run has a directory of its own, so only a reused
-* `--run-id` ever finds one to rotate. Resume runs skip rotation
-* (`preserve: true`). */
-function initialize_run_state(run, options = {}) {
-	const dir = run_state_dir(run);
-	if (existsSync(dir) && options.preserve !== true) renameSync(dir, `${dir}.bak.${backup_stamp()}`);
-	mkdirSync(join(dir, "iterations"), { recursive: true });
-}
-function write_resolved_config(config) {
-	const record = {
-		version: config.version,
-		run_id: config.run_id,
-		started_at: config.started_at,
-		prompt: config.prompt,
-		criteria: config.criteria,
-		check: config.check,
-		check_resolved: config.check_resolved,
-		builder_model: config.builder_model,
-		builder_provider: config.builder_provider,
-		builder_url: config.builder_url,
-		builder_max_steps: config.builder_max_steps,
-		critic_model: config.critic_model,
-		critic_provider: config.critic_provider,
-		critic_url: config.critic_url,
-		builder_permission_mode: config.builder_permission_mode,
-		critic_preset: config.critic_preset,
-		critic_prompt_path: config.critic_prompt_path,
-		max_iterations: config.max_iterations,
-		max_cost_usd: config.max_cost_usd,
-		git_checkpoints: config.git_checkpoints,
-		worktree: config.worktree,
-		discard_worktree: config.discard_worktree,
-		gate_paths: config.gate_paths,
-		fail_on_gate_edit: config.fail_on_gate_edit,
-		sandbox_image: config.sandbox_image,
-		state_dir: config.state_dir,
-		workspace: config.workspace
-	};
-	writeFileSync(state_path(config, "config.json"), `${JSON.stringify(record, null, 2)}\n`);
-}
-/**
-* `--git`: commit everything under `root` after a phase (`git -C <root>`, run
-* here via the spawn `cwd`). `root` is the build root (`build_root`): the
-* workspace on the default path, or the per-run worktree under `--worktree`, so
-* checkpoints land on the worktree branch rather than the workspace's.
-* A checkpoint with nothing to commit is fine; a missing git binary or repo is
-* not.
-*/
-function git_checkpoint(root, message) {
-	if (!existsSync(join(root, ".git"))) throw config_error(`git checkpoints require a git repository: ${root}`);
-	const add = spawnSync("git", ["add", "-A"], { cwd: root });
-	if (add.error !== void 0 || add.status !== 0) throw check_error(`git add failed: ${add.stderr?.toString() ?? String(add.error)}`);
-	const commit = spawnSync("git", [
-		"commit",
-		"-m",
-		message,
-		"--no-verify"
-	], { cwd: root });
-	if (commit.error !== void 0) throw check_error(`git commit failed to start: ${String(commit.error)}`);
-	const out = `${commit.stdout?.toString() ?? ""}${commit.stderr?.toString() ?? ""}`;
-	if (commit.status !== 0 && !out.includes("nothing to commit")) throw check_error(`git commit failed: ${out.trim()}`);
-}
-/**
-* Integration — bring a successful `--worktree --git` run's effects onto the
-* workspace branch. The per-phase checkpoints on `branch` are the raw
-* audit/replay trail; here they collapse into a single squash commit
-* (`git merge --squash` then `commit`) on the workspace's current branch. The
-* shared object store makes this a local, fetch-free merge, and — because the
-* workspace branch never moved during the run (checkpoints went to the phase
-* branch) — it is conflict-free by construction. A run whose phase branch has no
-* new commits integrates to a no-op. Only successful runs integrate; an
-* abandoned run's branch is discarded wholesale by the teardown trio instead.
-*/
-function integrate_worktree(workspace, branch, message) {
-	if (!existsSync(join(workspace, ".git"))) throw config_error(`--worktree integration requires a git repository: ${workspace}`);
-	const squash = spawnSync("git", [
-		"merge",
-		"--squash",
-		branch
-	], {
-		cwd: workspace,
-		encoding: "utf8"
-	});
-	if (squash.error !== void 0) throw check_error(`git merge --squash failed to start: ${String(squash.error)}`);
-	if (squash.status !== 0) throw check_error(`git merge --squash ${branch} failed: ${(squash.stderr || squash.stdout).trim()}`);
-	const commit = spawnSync("git", [
-		"commit",
-		"-m",
-		message,
-		"--no-verify"
-	], {
-		cwd: workspace,
-		encoding: "utf8"
-	});
-	if (commit.error !== void 0) throw check_error(`git commit failed to start: ${String(commit.error)}`);
-	const out = `${commit.stdout ?? ""}${commit.stderr ?? ""}`;
-	if (commit.status !== 0 && !out.includes("nothing to commit")) throw check_error(`git commit failed: ${out.trim()}`);
-}
-//#endregion
 //#region src/worktree.ts
 /**
 * Git-worktree orchestration: isolate a builder run's
@@ -1656,9 +1901,8 @@ function worktree_branch(run_id) {
 * when `--worktree` is on, else the workspace itself. This is the containment
 * root the builder/critic file tools resolve through `contain()` and the
 * `bash` tool's cwd — re-pointing it moves writes into the worktree without
-* disturbing the workspace. `.volley/` state, the resolved config, and the
-* deterministic check stay under the workspace (the control plane), so only the
-* model-driven effect surface moves.
+* disturbing the workspace. The check, the change report, and the checkpoints
+* follow it there; the run's state stays wherever `state_dir` puts it.
 */
 function build_root(workspace, worktree) {
 	return worktree ? worktree_path(workspace) : workspace;
@@ -1999,12 +2243,27 @@ const HARNESS_APPENDS = {
 	volley: "harness_append_local.md",
 	acp: "harness_append_acp.md"
 };
-function compose_builder_system_local(tool_set = "volley") {
-	return `${[
+/** Step 2 of "Work this way", as both harness appends word it for a builder
+* held to one tool call a turn. */
+const ONE_CALL_A_TURN = "2. Call one tool at a time and read its result before deciding the next\n   call.";
+/** Step 2 for a builder that may make several calls a turn: fascicle runs a
+* turn's calls in order, so a read can't race an edit, but each change or
+* command is still worth reading before the next. */
+function batched_calls(max_tool_calls) {
+	return [
+		`2. Batch independent reads into one turn, up to ${String(max_tool_calls)} calls, but`,
+		"   make one change or command per turn, and read its result before",
+		"   deciding the next call."
+	].join("\n");
+}
+function compose_builder_system_local(tool_set = "volley", max_tool_calls = 1) {
+	const identity = [
 		"You are the builder inside the volley harness: an autonomous agent",
 		"iterating on a workspace until it satisfies a task and its acceptance",
 		"criteria."
-	].join("\n")}\n\n${readFileSync(join(builder_presets_dir(), HARNESS_APPENDS[tool_set]), "utf8").trimEnd()}`;
+	].join("\n");
+	const append = readFileSync(join(builder_presets_dir(), HARNESS_APPENDS[tool_set]), "utf8");
+	return `${identity}\n\n${(max_tool_calls > 1 ? append.replace(ONE_CALL_A_TURN, batched_calls(max_tool_calls)) : append).trimEnd()}`;
 }
 /** The builder system prompt for the active provider: the `claude_cli`
 * prompt (implicit built-in tools, "the current working directory") for the
@@ -2012,7 +2271,7 @@ function compose_builder_system_local(tool_set = "volley") {
 * the seat's tool set for every provider that runs volley's tool loop,
 * `openrouter` included. Mirrors the critic's `resolve_critic_prompt`. */
 function resolve_builder_system(config, tool_set) {
-	return config.builder_provider === "claude_cli" ? compose_builder_system() : compose_builder_system_local(tool_set);
+	return config.builder_provider === "claude_cli" ? compose_builder_system() : compose_builder_system_local(tool_set, config.builder_max_tool_calls);
 }
 const BUILDER_TOOL_CALL_REPAIR_ATTEMPTS = 3;
 /** Per-provider tool wiring for the builder, mirroring `critic_tool_options`.
@@ -2037,7 +2296,7 @@ function builder_tool_options(deps) {
 		max_steps: config.builder_max_steps,
 		tool_error_policy: "feed_back",
 		tool_call_repair_attempts: BUILDER_TOOL_CALL_REPAIR_ATTEMPTS,
-		max_tool_calls_per_step: 1
+		max_tool_calls_per_step: config.builder_max_tool_calls
 	};
 }
 function compose_builder_prompt(input) {
@@ -2222,7 +2481,7 @@ function compose_critic_prompt(input) {
 * Critic invocation: a read-only session (`claude_cli`, or a local or
 * `openrouter` model with volley's read tools) returning a schema-validated
 * structured verdict. The
-* harness — not the critic — writes `.volley/feedback.md` and `.volley/verdict`.
+* harness — not the critic — writes the run's `feedback.md` and `verdict`.
 */
 const CRITIC_ALLOWED_TOOLS = [
 	"Read",
@@ -2230,10 +2489,16 @@ const CRITIC_ALLOWED_TOOLS = [
 	"Glob"
 ];
 const CRITIC_DISALLOWED_TOOLS = "Write,Edit,MultiEdit,NotebookEdit,Bash";
+/** A critic that holds tools isn't constrain-decoded, so nothing stops it
+* answering null for the feedback or the unmet list, as GLM did on approving.
+* Both fields allow null and read it as empty, so that answer is a verdict
+* rather than a schema failure that ends the run. fascicle sends the schema's
+* input side, so the model sees each field as its type or null, still
+* required; `.describe()` comes last so the description stays on the field. */
 const verdict_schema = z.object({
 	verdict: z.enum(["approved", "changes_requested"]),
-	feedback: z.string().describe("Free-form markdown for the builder. Concrete and actionable. Will be passed verbatim into the next iteration."),
-	unmet_criteria: z.array(z.string()).describe("The specific acceptance criteria judged unmet, verbatim. Empty when approved.")
+	feedback: z.string().nullable().transform((feedback) => feedback ?? "").describe("Free-form markdown for the builder. Concrete and actionable. Will be passed verbatim into the next iteration."),
+	unmet_criteria: z.array(z.string()).nullable().transform((unmet) => unmet ?? []).describe("The specific acceptance criteria judged unmet, verbatim. Empty when approved.")
 });
 /** Read-only tool wiring per provider. The claude_cli critic is confined at
 * the CLI permission layer (allowlist + explicit disallow); every other critic,
@@ -2758,6 +3023,46 @@ function rejected_check(runner) {
 	};
 }
 //#endregion
+//#region src/render/format.ts
+/**
+* Display formatting: glyph taxonomy, role colors, truncation.
+* All human output goes to stderr; these helpers only build strings.
+*/
+const GLYPH_TOOL = "🔧";
+const GLYPH_COST = "💰";
+const VERBOSE_TRUNCATE_CHARS = 4e3;
+function paint(role, text, color) {
+	if (!color) return text;
+	switch (role) {
+		case "builder": return pc.cyan(text);
+		case "critic": return pc.yellow(text);
+		case "check": return pc.green(text);
+		case "cost": return pc.magenta(text);
+		case "error": return pc.bold(pc.red(text));
+	}
+}
+function dim(text, color) {
+	return color ? pc.dim(text) : text;
+}
+function truncate(text, max, pointer) {
+	if (text.length <= max) return text;
+	return `${text.slice(0, max)}\n… [truncated at ${String(max)} chars; ${pointer}]`;
+}
+function format_usd(value) {
+	return value === null ? "$?" : `$${value.toFixed(3)}`;
+}
+/** One-line summary of a tool input for the default streaming mode. */
+function summarize_value(value, max = 120) {
+	let text;
+	try {
+		text = typeof value === "string" ? value : JSON.stringify(value) ?? "";
+	} catch {
+		text = String(value);
+	}
+	const flat = text.replace(/\s+/g, " ");
+	return flat.length > max ? `${flat.slice(0, max)}…` : flat;
+}
+//#endregion
 //#region src/iteration.ts
 /**
 * Iteration archiving, run-level summary, and resume-state recovery.
@@ -2848,7 +3153,9 @@ function run_result_from_state(config, state, status, completed_at) {
 		critic_cost_usd: state.critic_cost_usd,
 		check_duration_ms: state.check_duration_ms,
 		final_verdict: state.verdict,
-		salvaged_branch: null
+		salvaged_branch: null,
+		run_state_dir: run_state_dir(config),
+		mode: config.mode
 	};
 }
 //#endregion
@@ -2948,7 +3255,7 @@ function build_run_summary(config, result) {
 	return {
 		...result,
 		comparison: {
-			builder_transport: transport_of(config.builder_provider),
+			builder_transport: config.mode === "critique" ? null : transport_of(config.builder_provider),
 			critic_transport: transport_of(config.critic_provider),
 			iterations_to_converge: result.status === "success" ? result.iterations_completed : null,
 			wall_clock_ms,
@@ -3023,7 +3330,16 @@ function report_changes(config, renderer, changes) {
 	if (changes.gate_edits.length === 0) return;
 	const hidden = changes.gate_edits.length - LISTED_GATE_EDITS;
 	const listed = changes.gate_edits.slice(0, LISTED_GATE_EDITS).join(", ");
-	renderer.warn(`gate edit: the builder changed ${String(changes.gate_edits.length)} file(s) that decide whether its work passes — ${listed}${hidden > 0 ? ` (+${String(hidden)} more)` : ""}. A green check proves less when the builder can edit the gate; the critic is told about this and the run summary records it.` + (config.fail_on_gate_edit ? " This run will end without success (--fail-on-gate-edit, exit 8)." : ""));
+	const [who, whose, edits] = config.mode === "critique" ? [
+		"the change under review touches",
+		"whether it passes",
+		"the change edits"
+	] : [
+		"the builder changed",
+		"whether its work passes",
+		"the builder can edit"
+	];
+	renderer.warn(`gate edit: ${who} ${String(changes.gate_edits.length)} file(s) that decide ${whose} — ${listed}${hidden > 0 ? ` (+${String(hidden)} more)` : ""}. A green check proves less when ${edits} the gate; the critic is told about this and the run summary records it.` + (config.fail_on_gate_edit ? " This run will end without success (--fail-on-gate-edit, exit 8)." : ""));
 }
 /** Run the configured check, checkride or a command, with the environment
 * the caller set for it, else volley's own. */
@@ -3077,6 +3393,22 @@ function next_iteration(s) {
 		unmet_criteria: []
 	};
 }
+/** What changed in the build root since the baseline, reported as it's
+* measured: the count, and a warning for any gate edit. A run measures the
+* builder's work this way after every build, and a critique measures the
+* change under review the same way, so the critic is shown one shape either
+* way. */
+function measure_changes(deps, root) {
+	const { config, renderer } = deps;
+	const changes = collect_changes({
+		root,
+		baseline: deps.baseline,
+		gate_patterns: config.gate_paths,
+		excluded_dir: state_root_within(root, config.state_dir)
+	});
+	report_changes(config, renderer, changes);
+	return changes;
+}
 /** `build`: one builder session edits the build root, then volley measures what
 * it changed and, under `--git`, checkpoints it. */
 async function build_phase(deps, builder, s, ctx) {
@@ -3095,18 +3427,28 @@ async function build_phase(deps, builder, s, ctx) {
 	renderer.phase_end(built.iteration, "builder", true);
 	renderer.cost_line(built.iteration, "builder", built.builder?.cost_usd ?? null, built.total_cost_usd);
 	if (built.cost_warned && !s.cost_warned) renderer.warn("cost unavailable for this phase; recording null (run totals sum what is known)");
-	const changes = collect_changes({
-		root: build_root(config.workspace, config.worktree),
-		baseline: deps.baseline,
-		gate_patterns: config.gate_paths
-	});
-	report_changes(config, renderer, changes);
-	if (config.git_checkpoints) git_checkpoint(build_root(config.workspace, config.worktree), `volley iter ${String(built.iteration)}: build`);
+	const root = build_root(config.workspace, config.worktree);
+	const changes = measure_changes(deps, root);
+	if (config.git_checkpoints) git_checkpoint(root, `volley iter ${String(built.iteration)}: build`, state_root_within(root, config.state_dir));
 	return {
 		...built,
 		changes
 	};
 }
+/** `measure`: a critique's one round opens, and the change under review is
+* measured from the baseline, as a run measures the builder's work. */
+function measure_phase(deps, s, ctx) {
+	const next = next_iteration(s);
+	emit(ctx, {
+		volley: "round_start",
+		round: next.iteration
+	});
+	const root = build_root(deps.config.workspace, deps.config.worktree);
+	return {
+		...next,
+		changes: measure_changes(deps, root)
+	};
+}
 /** `skip_verify`: the build alone crossed the cost cap, so the check is recorded
 * as skipped and no critic is called — a doomed iteration spends nothing more.
 * The loop guard then halts the run on the cap. */
@@ -3220,7 +3562,10 @@ function record_phase(deps, s) {
 	const { config } = deps;
 	archive_iteration(config, s);
 	write_run_summary(config, run_result_from_state(config, s, "running", null));
-	if (config.git_checkpoints) git_checkpoint(build_root(config.workspace, config.worktree), `volley iter ${String(s.iteration)}: critique (${s.verdict ?? "skipped"})`);
+	if (config.git_checkpoints) {
+		const root = build_root(config.workspace, config.worktree);
+		git_checkpoint(root, `volley iter ${String(s.iteration)}: critique (${s.verdict ?? "skipped"})`, state_root_within(root, config.state_dir));
+	}
 	return s;
 }
 //#endregion
@@ -3232,6 +3577,11 @@ function record_phase(deps, s) {
 * around the flow (workspace setup, the worktree lifecycle, `run`, the final
 * summary) in `./orchestrator.ts`.
 *
+* A critique (`build_critique_flow`) is one round over a change already made,
+* so it has no builder, no loop, and no guard: `measure`, which opens the
+* round and measures the change from its baseline, then the same `check`,
+* `critique`, and `record` a run's round ends with.
+*
 * fascicle's `describe.diagram` draws the tree below from the flow itself, and
 * `test/unit/flow_diagram.test.ts` holds it to the code: change a row by changing
 * its step's `description`, then paste `pnpm diagram --prefix ' *   '` over it.
@@ -3275,6 +3625,24 @@ function build_critic(deps) {
 		project: with_fallback_cause
 	});
 }
+/** The steps a run and a critique share, built one way for both. */
+function check_step(deps) {
+	return step("check", (s, ctx) => check_phase(deps, s, ctx), { description: "the deterministic gate: checkride, a command, or none" });
+}
+function critique_step(deps, seat) {
+	const critic = build_critic({
+		...seat,
+		config: deps.config,
+		on_chunk: deps.renderer.critic_chunk
+	});
+	return step("critique", (s, ctx) => critique_phase(deps, critic, s, ctx), {
+		description: "the read-only critic's verdict and feedback",
+		arm: critic
+	});
+}
+function record_step(deps) {
+	return step("record", (s) => record_phase(deps, s), { description: "archive the iteration and rewrite the run summary" });
+}
 function build_flow(deps, resume_from) {
 	const { config, renderer } = deps;
 	const builder = make_builder_step({
@@ -3283,22 +3651,14 @@ function build_flow(deps, resume_from) {
 		on_chunk: renderer.builder_chunk,
 		bash_executor: deps.bash_executor
 	});
-	const critic = build_critic({
-		...deps.seats.critic,
-		config,
-		on_chunk: renderer.critic_chunk
-	});
 	const build = step("build", (s, ctx) => build_phase(deps, builder, s, ctx), {
 		description: "open the iteration, run the builder, measure the change",
 		arm: builder
 	});
 	const skip_verify = step("skip_verify", (s) => skip_verify_phase(deps, s), { description: "record the check as skipped and call no critic" });
-	const check = step("check", (s, ctx) => check_phase(deps, s, ctx), { description: "the deterministic gate: checkride, a command, or none" });
-	const critique = step("critique", (s, ctx) => critique_phase(deps, critic, s, ctx), {
-		description: "the read-only critic's verdict and feedback",
-		arm: critic
-	});
-	const record = step("record", (s) => record_phase(deps, s), { description: "archive the iteration and rewrite the run summary" });
+	const check = check_step(deps);
+	const critique = critique_step(deps, deps.seats.critic);
+	const record = record_step(deps);
 	const verify = branch({
 		name: "verify",
 		description: "did the build alone cross the cost cap?",
@@ -3324,6 +3684,19 @@ function build_flow(deps, resume_from) {
 		max_rounds: remaining_iterations(config, resume_from)
 	});
 }
+/** A critique: one round over a change already made. `measure` opens it and
+* measures the change from the baseline, then the check, the critic, and the
+* record, as in a run's round. No loop and no guard: there is nothing to
+* iterate on, and the caller reads the outcome off the final state. */
+function build_critique_flow(deps) {
+	const measure = step("measure", (s, ctx) => measure_phase(deps, s, ctx), { description: "open the round and measure the change under review" });
+	return sequence([
+		measure,
+		check_step(deps),
+		critique_step(deps, deps.critic),
+		record_step(deps)
+	], { name: "critique_run" });
+}
 //#endregion
 //#region src/orchestrator.ts
 /**
@@ -3340,13 +3713,19 @@ function build_flow(deps, resume_from) {
 *   │  ├─ run_loop                      run the flow (streamed when a sink is given), then the final summary
 *   │  └─ integrate                     a successful --worktree --git run only
 *   └─ report a kept checkout, or a salvaged branch (re-stamping the summary)
+*
+*   run_critique
+*   ├─ resolve the baseline              --baseline, else HEAD; a bad revision exits 5
+*   ├─ initialize the run's state
+*   └─ run the critique flow             one round on the critic's engine alone, then the final summary
 */
 async function run_volley(config, deps, resume_from = null) {
 	const { renderer } = deps;
 	if (resume_from === null) {
 		initialize_run_state(config);
-		write_resolved_config(config);
+		if (!write_resolved_config(config) && !detect_containment(process.env)) renderer.warn(`could not sign this run's config with this machine's key (${trust_key_path(process.env)}), so resuming it here will need --trust-config`);
 	} else initialize_run_state(config, { preserve: true });
+	renderer.info(`state: ${run_state_dir(config)}`);
 	report_worktree_fate(config, renderer);
 	const branch = worktree_branch(config.run_id);
 	const fate = worktree_fate(config);
@@ -3464,57 +3843,61 @@ function finalize_failed_run(config, err) {
 		const summary_path = state_path(config, "summary.json");
 		write_run_summary(config, {
 			...existsSync(summary_path) ? JSON.parse(readFileSync(summary_path, "utf8")) : run_result_from_state(config, initial_state(), status, null),
+			run_state_dir: run_state_dir(config),
 			status,
 			completed_at: (/* @__PURE__ */ new Date()).toISOString()
 		});
 	} catch {}
 }
-//#endregion
-//#region src/render/format.ts
 /**
-* Display formatting: glyph taxonomy, role colors, truncation.
-* All human output goes to stderr; these helpers only build strings.
+* `volley critique`: the check and the critic, once, over a change already
+* made. No builder is constructed, and the engine serves the critic's seat
+* alone, so a critic can be measured on fixed, labeled changes without paying
+* for builder turns. It writes the state a one-round run does, with the mode
+* recorded, and ends `success` on approval over a green check, else
+* `rejected`.
 */
-const GLYPH_TOOL = "🔧";
-const GLYPH_COST = "💰";
-const VERBOSE_TRUNCATE_CHARS = 4e3;
-function paint(role, text, color) {
-	if (!color) return text;
-	switch (role) {
-		case "builder": return pc.cyan(text);
-		case "critic": return pc.yellow(text);
-		case "check": return pc.green(text);
-		case "cost": return pc.magenta(text);
-		case "error": return pc.bold(pc.red(text));
-	}
-}
-function dim(text, color) {
-	return color ? pc.dim(text) : text;
-}
-function truncate(text, max, pointer) {
-	if (text.length <= max) return text;
-	return `${text.slice(0, max)}\n… [truncated at ${String(max)} chars; ${pointer}]`;
-}
-function format_usd(value) {
-	return value === null ? "$?" : `$${value.toFixed(3)}`;
-}
-/** One-line summary of a tool input for the default streaming mode. */
-function summarize_value(value, max = 120) {
-	let text;
+async function run_critique(config, deps) {
+	if (config.mode !== "critique") throw config_error("run_critique needs a config resolved with mode 'critique'");
+	const { renderer } = deps;
+	const baseline = resolve_baseline(config.workspace, deps.baseline);
+	initialize_run_state(config);
+	write_resolved_config(config);
+	renderer.info(`state: ${run_state_dir(config)}`);
+	renderer.info(baseline === null ? "baseline: none (not a git repository, or no commit yet); the critic reviews the tree" : `baseline: ${baseline}`);
+	const engine = deps.engine ?? create_volley_engine({
+		workspace: config.workspace,
+		critic_provider: config.critic_provider,
+		critic_url: config.critic_url
+	});
+	const flow = build_critique_flow({
+		config,
+		renderer,
+		baseline,
+		critic: {
+			...deps.critic,
+			engine
+		},
+		...deps.check !== void 0 ? { check: deps.check } : {}
+	});
 	try {
-		text = typeof value === "string" ? value : JSON.stringify(value) ?? "";
-	} catch {
-		text = String(value);
+		const value = await execute_flow(config, deps, flow, initial_state());
+		const result = run_result_from_state(config, value, value.check?.ok === true && value.verdict === "approved" ? "success" : "rejected", (/* @__PURE__ */ new Date()).toISOString());
+		write_run_summary(config, result);
+		return result;
+	} catch (err) {
+		finalize_failed_run(config, err);
+		throw err;
+	} finally {
+		await engine.dispose();
 	}
-	const flat = text.replace(/\s+/g, " ");
-	return flat.length > max ? `${flat.slice(0, max)}…` : flat;
 }
 //#endregion
 //#region src/render/renderer.ts
 function create_renderer(options) {
 	const write = options.write ?? ((text) => process.stderr.write(text));
 	const { mode, color } = options;
-	const see_trajectory = `see ${options.trajectory_path ?? ".volley/trajectory.jsonl"}`;
+	const see_trajectory = `see ${options.trajectory_path ?? "the run's trajectory.jsonl"}`;
 	const silent = mode === "json";
 	const streaming = mode === "default" || mode === "verbose";
 	let mid_line = false;
@@ -3592,6 +3975,7 @@ function create_renderer(options) {
 			line(`iterations: ${String(result.iterations_completed)} | verdict: ${result.final_verdict ?? "n/a"}`);
 			line(paint("cost", `${GLYPH_COST} total: ${format_usd(result.total_cost_usd)} (builder ${format_usd(result.builder_cost_usd)}, critic ${format_usd(result.critic_cost_usd)})`, color));
 			line(`tokens: ${String(result.total_usage.input_tokens)} in / ${String(result.total_usage.output_tokens)} out`);
+			line(`state: ${result.run_state_dir}`);
 		}
 	};
 }
@@ -3613,7 +3997,7 @@ function summarize_output(output) {
 * volley detects it is already contained. The create/`exec`/reap/teardown
 * lifecycle and the `docker exec` bash executor were retired; what
 * remains here is the *spec* — pure, daemon-free flag-builders the blessed
-* examples and the `--dry-run` preflight render into the `docker run` line,
+* examples and a parent harness render into the `docker run` line,
 * unit-testable without a daemon.
 *
 * Inside that container volley's `bash` is the local `host_bash_executor`
@@ -3638,6 +4022,13 @@ const SANDBOX_WORKDIR = "/workspace";
 * otherwise unset) and its `.cache` is a tmpfs so the read-only rootfs does not
 * brick tools that scribble there. */
 const SANDBOX_HOME = "/home/node";
+/** Where volley inside the container keeps each run's state when no
+* `--state-dir` names a root: the default root under the pinned `HOME`, since
+* the image sets no `XDG_STATE_HOME`. `sandbox_run_args`'s `run_state` binds one
+* run's host directory at that run's directory under it, so the state outlives
+* the `--rm` container. Exported so a harness can map a contained run's
+* `run_state_dir` back to the directory it mounted. */
+const SANDBOX_STATE_ROOT = default_state_root({}, SANDBOX_HOME);
 /** The host spelling of the Docker gateway (Linux-portable; Docker Desktop
 * already provides it). It is both the `--add-host` target for the allowlist
 * bridge and the value the example injects as `VOLLEY_MODEL_HOST` so the
@@ -3669,7 +4060,7 @@ function network_run_args(network, network_name) {
 /**
 * The hardened `docker run` argv that launches volley inside its container.
 * Pure and exported so the flag set is unit-testable without a
-* daemon and the blessed examples / `--dry-run` preflight can render it.
+* daemon and the blessed examples and a parent harness can render it.
 *
 * A one-shot, foreground `--rm` container — the whole run *is* this
 * container (an earlier design ran a detached `-d … sleep infinity` daemon volley
@@ -3681,6 +4072,25 @@ function network_run_args(network, network_name) {
 * the image entrypoint (the opt-in real-docker isolation test runs a raw `sh`
 * this way).
 *
+* `run_state` binds the run's own state directory on the host,
+* `<root>/<run_id>/`, at `<SANDBOX_STATE_ROOT>/<run_id>/`, where volley inside
+* keeps that run's state when no `--state-dir` names a root, so it outlives the
+* container at the path a run on the host would use. Only the one directory
+* is mounted, never the root: the builder inside runs arbitrary commands, so
+* it can rewrite its own run's state but can't read another run's trajectory
+* or plant a check in another run's config. Its own run's state is still the
+* builder's to rewrite, config.json included, so a host-side resume refuses
+* that config, which volley signs only outside the sandbox (`./trust.ts`), and
+* a directory holding a symlink: resume a contained run inside the container,
+* with the same mount. Create the
+* directory on the host first, empty (Docker on Linux makes a missing bind
+* source owned by root, which the container's user can't write), and pass the
+* same id to volley as `--run-id`. Keep it outside `build_root`, so the check
+* never reads it, and pass no `XDG_STATE_HOME` in `env`, which would move the
+* root off the mount. Omit it and no state is mounted: a contained run keeping
+* its state under the default root then stops before spending (exit 5),
+* since the read-only root filesystem leaves it nowhere to write.
+*
 * `store_volume` mounts the named volume as the pnpm store; omit it and no store
 * is mounted. A store is shared by every run that mounts it, so a caller that
 * installs dependencies in a separate container first can keep the builder's
@@ -3690,7 +4100,7 @@ function network_run_args(network, network_name) {
 * Never emits `--privileged` and refuses `--user 0`: volley must not hand
 * the sandbox root or full capabilities. Everything writable under the
 * `--read-only` rootfs is an explicit tmpfs or volume; the bind-mounted worktree
-* is the one host-visible write path.
+* and, when one is named, the state root are the host-visible write paths.
 */
 function sandbox_run_args(options) {
 	if (options.uid === 0) throw config_error("refusing to start the builder sandbox as root (uid 0)");
@@ -3699,6 +4109,7 @@ function sandbox_run_args(options) {
 	const entrypoint = options.entrypoint !== void 0 && options.entrypoint !== null ? ["--entrypoint", options.entrypoint] : [];
 	const env = (options.env ?? []).flatMap(([key, value]) => ["-e", `${key}=${value}`]);
 	const labels = (options.labels ?? []).flatMap(([key, value]) => ["--label", `${key}=${value}`]);
+	const state = options.run_state !== void 0 && options.run_state !== null ? ["-v", run_state_mount(options.run_state)] : [];
 	const store = options.store_volume !== void 0 && options.store_volume !== null ? ["-v", `${options.store_volume}:${SANDBOX_HOME}/.local/share/pnpm/store`] : [];
 	return [
 		"run",
@@ -3732,6 +4143,7 @@ function sandbox_run_args(options) {
 		...env,
 		"-v",
 		`${resolve(options.build_root)}:${SANDBOX_WORKDIR}`,
+		...state,
 		...store,
 		"-w",
 		SANDBOX_WORKDIR,
@@ -3740,6 +4152,13 @@ function sandbox_run_args(options) {
 		...options.command ?? []
 	];
 }
+/** The `-v` value for one run's state directory. The run id becomes a path on
+* both sides, so it is held to volley's own `--run-id` rule, which keeps it to
+* one directory name. */
+function run_state_mount(run_state) {
+	if (!RUN_ID_PATTERN.test(run_state.run_id)) throw config_error(`run_state.run_id must be letters, digits, '-', and '_', starting with a letter or digit; got: ${run_state.run_id}`);
+	return `${join(resolve(run_state.root), run_state.run_id)}:${SANDBOX_STATE_ROOT}/${run_state.run_id}`;
+}
 //#endregion
 //#region src/exit_codes.ts
 /**
@@ -3757,7 +4176,8 @@ const EXIT_INTERRUPTED = 130;
 function exit_code_for_status(status) {
 	switch (status) {
 		case "success": return 0;
-		case "budget_exhausted": return 2;
+		case "budget_exhausted":
+		case "rejected": return 2;
 		case "cost_cap_reached": return 7;
 		case "gate_edit_blocked": return 8;
 		case "interrupted": return 130;
@@ -3792,6 +4212,6 @@ function exit_code_for_error(err) {
 	return 3;
 }
 //#endregion
-export { EXIT_BUDGET_EXHAUSTED, EXIT_BUILDER_ERROR, EXIT_CHECK_ERROR, EXIT_CONFIG_ERROR, EXIT_COST_CAP, EXIT_CRITIC_ERROR, EXIT_INTERRUPTED, EXIT_SUCCESS, SANDBOX_NETWORK_NAME, SANDBOX_NETWORK_SUBNET, create_renderer, exit_code_for_error, exit_code_for_status, expand_at_file, gate, initial_state, load_config_file, network_run_args, resolve_config, run_volley, sandbox_run_args, status_of, verdict_schema };
+export { EXIT_BUDGET_EXHAUSTED, EXIT_BUILDER_ERROR, EXIT_CHECK_ERROR, EXIT_CONFIG_ERROR, EXIT_COST_CAP, EXIT_CRITIC_ERROR, EXIT_INTERRUPTED, EXIT_SUCCESS, SANDBOX_NETWORK_NAME, SANDBOX_NETWORK_SUBNET, SANDBOX_STATE_ROOT, create_renderer, default_state_root, exit_code_for_error, exit_code_for_status, expand_at_file, gate, initial_state, load_config_file, network_run_args, resolve_config, run_critique, run_volley, sandbox_run_args, status_of, verdict_schema };
 
 //# sourceMappingURL=index.js.map