anpord 0.1.26 → 0.1.28

package/dist/bin.cjs

@@ -1,22 +1,23 @@
 #!/usr/bin/env node
 const require_eval_judges = require("./eval-judges-CO0ds-HQ.cjs");
-const require_api_mocks = require("./api-mocks-CMB0IJFX.cjs");
-const require_errors = require("./errors-ZfXkocHp.cjs");
-const require_compiler = require("./compiler-s8dJGvE6.cjs");
+const require_api_mocks = require("./api-mocks-BsUGpsim.cjs");
+const require_errors = require("./errors-D1L76YFH.cjs");
+const require_compiler = require("./compiler-DKWUVkxB.cjs");
 const require_eval_turns = require("./eval-turns-B9dd8Vfb.cjs");
+const require_sandbox_env = require("./sandbox-env-B8cLIcku.cjs");
 let effect = require("effect");
 let _effect_platform = require("@effect/platform");
 let node_fs_promises = require("node:fs/promises");
+let node_path = require("node:path");
 let _effect_cli = require("@effect/cli");
 let _effect_platform_node = require("@effect/platform-node");
 let yaml = require("yaml");
-let node_path = require("node:path");
 let node_fs = require("node:fs");
 let node_os = require("node:os");
 let node_child_process = require("node:child_process");
 let node_crypto = require("node:crypto");
 //#region package.json
-var version$1 = "0.1.26";
+var version$1 = "0.1.28";
 //#endregion
 //#region ../template/src/extract.ts
 /** Reads escapes too, so text the renderer leaves literal is never reported as
@@ -81,7 +82,7 @@ const add = _effect_cli.Command.make("add", {
 		onSome: (wanted) => found.authMethods.find((entry) => entry.id === wanted)
 	});
 	if (method === void 0) return yield* note(`${integration} has no auth method called ${effect.Option.getOrElse(wantedMethod, () => "")}.`);
-	if (method.kind === "device") return yield* note(`${integration} signs in through a browser. Connect it at https://www.anpord.com/settings/connections.`);
+	if (method.kind === "device") return yield* note(`${integration} signs in through a browser. Connect it at ${require_errors.WEB_ORIGIN}/settings/connections.`);
 	const values = {};
 	for (const field of method.fields) values[field.name] = yield* readSecret(field.label);
 	const created = yield* api.connectors.add({ payload: {
@@ -639,6 +640,190 @@ const buildGithubCheck = (outcomes, webUrl) => {
 	};
 };
 //#endregion
+//#region src/cli/labelled-row.ts
+const LABEL_WIDTH = 9;
+const labelled = (label, value, paint) => `  ${paint.dim(label.padEnd(LABEL_WIDTH))}${value}`;
+const continued$1 = (value) => `  ${" ".repeat(LABEL_WIDTH)}${value}`;
+//#endregion
+//#region src/cli/paint.ts
+const ESCAPE = String.fromCharCode(27);
+const SHADES = {
+	blue: {
+		fallback: 111,
+		rgb: [
+			122,
+			162,
+			247
+		]
+	},
+	cyan: {
+		fallback: 80,
+		rgb: [
+			108,
+			196,
+			207
+		]
+	},
+	dim: {
+		fallback: 243,
+		rgb: [
+			118,
+			125,
+			135
+		]
+	},
+	green: {
+		fallback: 114,
+		rgb: [
+			108,
+			194,
+			135
+		]
+	},
+	lavender: {
+		fallback: 146,
+		rgb: [
+			170,
+			160,
+			204
+		]
+	},
+	magenta: {
+		fallback: 141,
+		rgb: [
+			182,
+			156,
+			246
+		]
+	},
+	red: {
+		fallback: 167,
+		rgb: [
+			229,
+			104,
+			107
+		]
+	},
+	rose: {
+		fallback: 181,
+		rgb: [
+			204,
+			158,
+			172
+		]
+	},
+	sand: {
+		fallback: 180,
+		rgb: [
+			200,
+			176,
+			138
+		]
+	},
+	slate: {
+		fallback: 110,
+		rgb: [
+			138,
+			164,
+			204
+		]
+	},
+	teal: {
+		fallback: 109,
+		rgb: [
+			128,
+			184,
+			178
+		]
+	},
+	yellow: {
+		fallback: 179,
+		rgb: [
+			217,
+			165,
+			91
+		]
+	}
+};
+const TRUE_COLOUR = /* @__PURE__ */ new Set(["truecolor", "24bit"]);
+const wrap = (code) => (text) => `${ESCAPE}[${code}m${text}${ESCAPE}[0m`;
+const shadeCode = ({ fallback, rgb }, trueColour) => trueColour ? `38;2;${rgb.join(";")}` : `38;5;${fallback}`;
+const unpainted = (text) => text;
+const colouredWith = (trueColour) => Object.fromEntries([["bold", wrap("1")], ...Object.entries(SHADES).map(([name, shade]) => [name, wrap(shadeCode(shade, trueColour))])]);
+const MONOCHROME = Object.fromEntries(["bold", ...Object.keys(SHADES)].map((name) => [name, unpainted]));
+const paletteFor = (colour) => colour ? colouredWith(TRUE_COLOUR.has(process.env.COLORTERM ?? "")) : MONOCHROME;
+//#endregion
+//#region src/cli/text-wrap.ts
+const NARROWEST$1 = 20;
+const LEADING_SPACE = /^\s*/;
+const WORDS = /\s+/;
+const TAB = /\t/g;
+const CARRIAGE = /\r\n?/g;
+const wrapLine = (line, width) => {
+	if (line.length <= width) return [line];
+	const indent = LEADING_SPACE.exec(line)?.[0] ?? "";
+	const lines = [];
+	let current = "";
+	for (const word of line.trim().split(WORDS)) {
+		const next = current === "" ? `${indent}${word}` : `${current} ${word}`;
+		if (next.length > width && current !== "") {
+			lines.push(current);
+			current = `${indent}${word}`;
+		} else current = next;
+	}
+	lines.push(current);
+	return lines;
+};
+const wrapText = (text, width) => {
+	const kept = [];
+	for (const line of text.replace(CARRIAGE, "\n").replace(TAB, "  ").split("\n")) {
+		const trimmed = line.trimEnd();
+		if (trimmed !== "" || kept.length > 0 && kept.at(-1) !== "") kept.push(trimmed);
+	}
+	while (kept.at(-1) === "") kept.pop();
+	return kept.flatMap((line) => line === "" ? [""] : wrapLine(line, Math.max(NARROWEST$1, width)));
+};
+//#endregion
+//#region src/cli/transcript-writer.ts
+const PLAIN = {
+	colour: false,
+	width: 80
+};
+const NARROWEST = 40;
+const UNKNOWN_WIDTH = 100;
+const MARGIN = "  ";
+const INDENT = "  ";
+const WHITESPACE$1 = /\s+/g;
+const terminalStyle = (colour) => colour && process.env.NO_COLOR === void 0 ? {
+	colour: true,
+	width: Math.max(NARROWEST, process.stderr.columns ?? UNKNOWN_WIDTH)
+} : PLAIN;
+const stderrStyle = () => terminalStyle(process.stderr.isTTY === true);
+const flat = (text) => text.replace(WHITESPACE$1, " ").trim();
+const clipped$1 = (text, width) => text.length > width ? `${text.slice(0, Math.max(1, width - 1))}…` : text;
+const writerFor = (style) => {
+	const paint = paletteFor(style.colour);
+	const room = Math.max(1, style.width - 2 - 2);
+	const line = (text) => `${MARGIN}${text}`;
+	const nested = (text, depth = 1) => line(`${INDENT.repeat(depth)}${text}`);
+	const indented = (text, depth, tone = (row) => row) => wrapText(text, room - 2 * (depth - 1)).map((row) => row === "" ? "" : nested(tone(row), depth));
+	const header = ({ caseName, ordinal, variant }) => line(`${paint.bold(caseName)}  ${paint.dim(variant)}${ordinal === null ? "" : paint.dim(` · trial ${ordinal}`)}`);
+	const heading = (glyph, label, tone) => line(tone(`${glyph} ${paint.bold(label)}`));
+	const branch = (text) => nested(`${paint.dim("├")} ${text}`);
+	const close = (text) => nested(`${paint.dim("└")} ${text}`);
+	return {
+		branch,
+		close,
+		header,
+		heading,
+		indented,
+		line,
+		nested,
+		paint,
+		room
+	};
+};
+//#endregion
 //#region src/cli/eval-report.ts
 const reportJson = effect.Schema.encodeSync(effect.Schema.parseJson(effect.Schema.Array(SuiteOutcome)));
 const appendSummary = (text) => effect.Effect.gen(function* () {
@@ -647,7 +832,8 @@ const appendSummary = (text) => effect.Effect.gen(function* () {
 });
 const reportStarted = (label, id) => effect.Effect.gen(function* () {
 	const url = batchUrl(yield* require_errors.webUrlConfig, id);
-	yield* note(`${label}: ${url}`);
+	const paint = paletteFor(stderrStyle().colour);
+	yield* note(labelled("Watch", `${url}  ${paint.dim(label)}`, paint));
 	yield* appendSummary(`[Batch ${id}](${url}) started.`);
 });
 const writeReport = (outcomes, path) => effect.Effect.gen(function* () {
@@ -758,20 +944,19 @@ const CONCERN_REASONS = {
 //#region src/cli/eval-usage.ts
 const THOUSAND = 1e3;
 const MILLION = 1e6;
-const CENT$1 = .01;
-const batchUsage = (batch) => {
+const sumUsage = (readings, totalOf, usd) => {
 	const concerns = /* @__PURE__ */ new Set();
 	let inputTokens = 0;
 	let outputTokens = 0;
 	let totalTokens = 0;
-	for (const trial of batch.runs.flatMap((run) => run.trials)) {
-		if (!trial.usage) continue;
-		inputTokens += trial.usage.inputTokens;
-		outputTokens += trial.usage.outputTokens;
-		totalTokens += trial.usage.totalTokens;
+	for (const reading of readings) {
+		if (!reading.usage) continue;
+		inputTokens += reading.usage.inputTokens;
+		outputTokens += reading.usage.outputTokens;
+		totalTokens += totalOf(reading.usage);
 		for (const concern of usageConcerns({
-			turns: trial.commands,
-			usage: trial.usage
+			turns: reading.commands,
+			usage: reading.usage
 		})) concerns.add(concern);
 	}
 	return {
@@ -779,42 +964,20 @@ const batchUsage = (batch) => {
 		inputTokens,
 		outputTokens,
 		totalTokens,
-		usd: batch.costs?.estimatedEquivalentUsd ?? null
+		usd
 	};
 };
+const batchUsage = (batch) => sumUsage(batch.runs.flatMap((run) => run.trials), (usage) => usage.totalTokens, batch.costs?.estimatedEquivalentUsd ?? null);
 const formatTokens = (value) => {
 	if (value >= MILLION) return `${(value / MILLION).toFixed(1)}M`;
 	return value >= THOUSAND ? `${Math.round(value / THOUSAND)}k` : String(value);
 };
-const formatUsd = (value) => value < CENT$1 ? "<$0.01" : `$${value.toFixed(2)}`;
+const formatUsd = (value) => value < .01 ? "<$0.01" : `$${value.toFixed(2)}`;
 const usageLines = (usage) => {
 	if (usage.totalTokens === 0) return [];
 	const spend = usage.usd === null ? "" : `, ${formatUsd(usage.usd)} est.`;
 	return [`${formatTokens(usage.totalTokens)} tokens (${formatTokens(usage.inputTokens)} in, ${formatTokens(usage.outputTokens)} out)${spend}`, ...usage.concerns.map((concern) => CONCERN_REASONS[concern])];
 };
-const localUsage = (cases, costs) => {
-	const concerns = /* @__PURE__ */ new Set();
-	let inputTokens = 0;
-	let outputTokens = 0;
-	let totalTokens = 0;
-	for (const one of cases) {
-		if (!one.usage) continue;
-		inputTokens += one.usage.inputTokens;
-		outputTokens += one.usage.outputTokens;
-		totalTokens += one.usage.inputTokens + one.usage.outputTokens;
-		for (const concern of usageConcerns({
-			turns: one.commands,
-			usage: one.usage
-		})) concerns.add(concern);
-	}
-	return {
-		concerns: [...concerns],
-		inputTokens,
-		outputTokens,
-		totalTokens,
-		usd: costs?.estimatedEquivalentUsd ?? null
-	};
-};
 const PAYERS = [
 	"model",
 	"user",
@@ -824,7 +987,16 @@ const breakdownLine = (costs) => {
 	const parts = PAYERS.flatMap((component) => costs?.components.filter((part) => part.component === component).map(({ usd }) => `${require_errors.COST_COMPONENT_LABELS[component]} ${usd === null ? "not priced" : formatUsd(usd)}`) ?? []);
 	return parts.length > 1 ? [parts.join(", ")] : [];
 };
-const localUsageLines = (cases, costs = null) => [...usageLines(localUsage(cases, costs)), ...breakdownLine(costs)].map((line) => `  ${line}`);
+const localUsage = (cases, costs = null) => {
+	const [spend, ...concerns] = usageLines(sumUsage(cases, (usage) => usage.inputTokens + usage.outputTokens, costs?.estimatedEquivalentUsd ?? null));
+	return spend === void 0 ? {
+		concerns: [],
+		lines: []
+	} : {
+		concerns,
+		lines: [spend, ...breakdownLine(costs)]
+	};
+};
 //#endregion
 //#region ../schema/src/domain/shell-word.ts
 const ESCAPED_IN_DOUBLE = /* @__PURE__ */ new Set([
@@ -921,117 +1093,153 @@ const callSubjectOf = (input) => {
 	return firstText(SUBJECT_KEYS.map((key) => fields[key])) ?? firstText(Object.values(fields));
 };
 //#endregion
-//#region src/cli/paint.ts
-const ESCAPE = String.fromCharCode(27);
-const tint = (code) => (text) => `${ESCAPE}[${code}m${text}${ESCAPE}[0m`;
-const unpainted = (text) => text;
-const COLOURED = {
-	blue: tint(34),
-	bold: tint(1),
-	cyan: tint(36),
-	dim: tint(2),
-	green: tint(32),
-	magenta: tint(35),
-	red: tint(31),
-	yellow: tint(33)
-};
-const MONOCHROME = {
-	blue: unpainted,
-	bold: unpainted,
-	cyan: unpainted,
-	dim: unpainted,
-	green: unpainted,
-	magenta: unpainted,
-	red: unpainted,
-	yellow: unpainted
-};
-const paletteFor = (colour) => colour ? COLOURED : MONOCHROME;
-//#endregion
-//#region src/cli/text-wrap.ts
-const NARROWEST$1 = 20;
-const LEADING_SPACE = /^\s*/;
-const WORDS = /\s+/;
-const TAB = /\t/g;
-const CARRIAGE = /\r\n?/g;
-const wrapLine = (line, width) => {
-	if (line.length <= width) return [line];
-	const indent = LEADING_SPACE.exec(line)?.[0] ?? "";
-	const lines = [];
-	let current = "";
-	for (const word of line.trim().split(WORDS)) {
-		const next = current === "" ? `${indent}${word}` : `${current} ${word}`;
-		if (next.length > width && current !== "") {
-			lines.push(current);
-			current = `${indent}${word}`;
-		} else current = next;
+//#region ../schema/src/domain/step-title.ts
+const describeStep = (entry) => {
+	switch (entry._tag) {
+		case "command": return describeCommand(entry.command);
+		case "fileChange": return describeFiles("wrote", "Wrote", entry.paths);
+		case "toolCall": return {
+			target: callSubjectOf(entry.input),
+			title: `Called ${entry.name}`,
+			verb: "called"
+		};
+		case "message": return {
+			target: null,
+			title: summarizeMessage(entry.text),
+			verb: entry.role === "user" ? "you" : "agent"
+		};
+		default: return entry;
 	}
-	lines.push(current);
-	return lines;
 };
-const wrapText = (text, width) => {
-	const kept = [];
-	for (const line of text.replace(CARRIAGE, "\n").replace(TAB, "  ").split("\n")) {
-		const trimmed = line.trimEnd();
-		if (trimmed !== "" || kept.length > 0 && kept.at(-1) !== "") kept.push(trimmed);
+const describeCommand = (command) => {
+	const segments = splitSegments(commandText(command));
+	const [first] = segments;
+	if (first === void 0) return {
+		target: null,
+		title: "Ran a command",
+		verb: "ran"
+	};
+	const written = segments.flatMap(redirectTargetOf);
+	if (written.length > 0) return describeFiles("wrote", "Wrote", written);
+	if (segments.every((words) => READERS.has(words[0] ?? ""))) {
+		const files = segments.flatMap((words) => operandsOf(words).at(-1) ?? []);
+		return files.length > 0 ? describeFiles("read", "Read", files) : describeRun(first);
 	}
-	while (kept.at(-1) === "") kept.pop();
-	return kept.flatMap((line) => line === "" ? [""] : wrapLine(line, Math.max(NARROWEST$1, width)));
-};
-//#endregion
-//#region src/cli/transcript-writer.ts
-const PLAIN = {
-	colour: false,
-	width: 80
-};
-const NARROWEST = 40;
-const UNKNOWN_WIDTH = 100;
-const MARGIN = 2;
-const RAIL_WIDTH = 2;
-const INDENT = "  ";
+	return SEARCHERS.has(first[0] ?? "") ? describeSearch(first) : describeRun(first);
+};
+const plainText = (text) => text.replace(MARKUP, "").replace(WHITESPACE, " ").trim();
+const summarizeMessage = (text) => {
+	const plain = plainText(text);
+	return SENTENCE.exec(plain)?.[1] ?? plain;
+};
+const READERS = /* @__PURE__ */ new Set([
+	"bat",
+	"cat",
+	"head",
+	"less",
+	"nl",
+	"sed",
+	"tail"
+]);
+const SEARCHERS = /* @__PURE__ */ new Set([
+	"ag",
+	"fd",
+	"find",
+	"grep",
+	"ls",
+	"rg",
+	"tree"
+]);
+const RUNNERS = /* @__PURE__ */ new Set([
+	"bunx",
+	"npx",
+	"pnpx"
+]);
+const SCRIPT_RUNNERS = /* @__PURE__ */ new Set([
+	"bun",
+	"npm",
+	"pnpm",
+	"yarn"
+]);
+const TOKEN$1 = /'[^']*'|"[^"]*"|&&|\|\||[|;]|[^\s|;&]+/g;
+const SEPARATORS = /* @__PURE__ */ new Set([
+	"&&",
+	"||",
+	";"
+]);
+const QUOTES = /^['"]|['"]$/g;
+const MARKUP = /[*`#>_]+/g;
+const SENTENCE = /^(.+?[.!?])(?:\s|$)/;
 const WHITESPACE = /\s+/g;
-const terminalStyle = (colour) => colour && process.env.NO_COLOR === void 0 ? {
-	colour: true,
-	width: Math.max(NARROWEST, process.stderr.columns ?? UNKNOWN_WIDTH)
-} : PLAIN;
-const flat = (text) => text.replace(WHITESPACE, " ").trim();
-const clipped$1 = (text, width) => text.length > width ? `${text.slice(0, Math.max(1, width - 1))}…` : text;
-const writerFor = (style) => {
-	const paint = paletteFor(style.colour);
-	const room = Math.max(1, style.width - MARGIN - RAIL_WIDTH);
-	const rail = paint.dim("│");
-	const blank = `  ${rail}`;
-	const line = (text) => `  ${rail} ${text}`;
-	const indented = (text, depth, tone = (row) => row) => wrapText(text, room - 2 * depth).map((row) => row === "" ? blank : line(`${INDENT.repeat(depth)}${tone(row)}`));
-	const header = ({ caseName, ordinal, variant }) => {
-		const facts = [variant, ordinal === null ? "" : `trial ${ordinal}`].filter((fact) => fact !== "").map((fact) => ` · ${fact}`).join("");
-		return `  ${paint.dim("┌")} ${paint.bold(caseName)}${paint.dim(facts)}`;
+const splitSegments = (script) => {
+	const segments = [[]];
+	let piped = false;
+	for (const token of script.match(TOKEN$1) ?? []) if (SEPARATORS.has(token)) {
+		segments.push([]);
+		piped = false;
+	} else if (token === "|") piped = true;
+	else if (!piped) segments.at(-1)?.push(token.replace(QUOTES, ""));
+	return segments.filter((words) => words.length > 0);
+};
+const REDIRECT = /^>>?/;
+const DISCARDED = "/dev/null";
+const targetAt = (words, index) => {
+	const word = words[index] ?? "";
+	if (word === ">" || word === ">>") return words[index + 1];
+	return REDIRECT.test(word) ? word.replace(REDIRECT, "") : void 0;
+};
+const redirectTargetOf = (words) => words.flatMap((_, index) => {
+	const target = targetAt(words, index);
+	return target === void 0 || target === "" || target === DISCARDED ? [] : [target];
+});
+const operandsOf = (words) => words.slice(1).filter((word) => !word.startsWith("-"));
+const baseName = (path) => path.split("/").at(-1) ?? path;
+const describeFiles = (verb, word, paths) => {
+	const files = paths.map(baseName);
+	const [only] = files;
+	return {
+		target: files.join(", "),
+		title: files.length === 1 && only !== void 0 ? `${word} ${only}` : `${word} ${files.length} files`,
+		verb
 	};
-	const heading = (label, tone) => [blank, line(paint.bold(tone(label)))];
-	const close = (text) => `  ${paint.dim("└")} ${text}`;
+};
+const describeSearch = (words) => {
+	const [program] = words;
+	const operands = operandsOf(words);
+	if (program === "ls" || program === "tree" || words.includes("--files")) return {
+		target: program === "ls" ? operands[0] ?? null : null,
+		title: "Listed files",
+		verb: "searched"
+	};
+	const [pattern, where = null] = operands;
 	return {
-		blank,
-		close,
-		header,
-		heading,
-		indented,
-		line,
-		paint,
-		room
+		target: where,
+		title: pattern === void 0 ? "Searched files" : `Searched for ${pattern}`,
+		verb: "searched"
 	};
 };
-//#endregion
-//#region src/cli/transcript-step.ts
-const GLYPH_WIDTH = 2;
-const stepLine = (step, { line, paint, room }) => {
-	const width = room - GLYPH_WIDTH;
-	if (step._tag === "command") {
-		const failed = step.exitCode !== null && step.exitCode !== 0;
-		return line(`${paint.yellow("$")} ${paint.dim(clipped$1(flat(commandText(step.command)), width))}${failed ? paint.red(` exit ${step.exitCode}`) : ""}`);
+const describeRun = (words) => {
+	const [program = "command", first, second] = words;
+	const operands = operandsOf(words);
+	if (RUNNERS.has(program) && first !== void 0) {
+		const tool = [first, operands[1]].filter(Boolean).join(" ");
+		return {
+			target: tool,
+			title: `Ran ${tool}`,
+			verb: "ran"
+		};
 	}
-	if (step._tag === "fileChange") return line(`${paint.green("+")} ${paint.dim(clipped$1(`wrote ${step.paths.join(", ")}`, width))}`);
-	const subject = callSubjectOf(step.input);
-	const detail = subject === null ? "" : ` ${paint.dim(clipped$1(flat(subject), Math.max(1, width - step.name.length - 1)))}`;
-	return line(`${paint.blue("●")} ${step.name}${detail}${step.error === void 0 ? "" : paint.red(" failed")}`);
+	if (SCRIPT_RUNNERS.has(program) && first === "run" && second !== void 0) return {
+		target: second,
+		title: `Ran the ${second} script`,
+		verb: "ran"
+	};
+	const tool = program === "git" && first !== void 0 ? `git ${first}` : program;
+	return {
+		target: tool,
+		title: `Ran ${tool}`,
+		verb: "ran"
+	};
 };
 //#endregion
 //#region src/cli/duration.ts
@@ -1047,9 +1255,55 @@ const formatDuration = (ms) => {
 	return `${Math.floor(seconds / MINUTE$1)}m${String(seconds % MINUTE$1).padStart(2, "0")}s`;
 };
 //#endregion
+//#region src/cli/transcript-step.ts
+const BRANCH_WIDTH = 2;
+const VERB_WIDTH = 7;
+const NOTABLE_MS = 1e3;
+const GAP = "  ";
+const VERB_TONES = {
+	ran: "sand",
+	read: "slate",
+	search: "teal",
+	wrote: "rose"
+};
+const unless = (text, tone) => text === "" ? "" : tone(text);
+const tookBetween = (startedAt, finishedAt) => startedAt === null || startedAt === void 0 || finishedAt === null ? null : Math.max(0, finishedAt - startedAt);
+const commandParts = (step) => {
+	const title = describeCommand(step.command);
+	return {
+		detail: title.verb === "read" || title.verb === "wrote" ? title.target ?? title.title : flat(commandText(step.command)),
+		failure: step.exitCode !== null && step.exitCode !== 0 ? `exit ${step.exitCode}` : null,
+		tookMs: tookBetween(step.startedAtMillis, step.finishedAtMillis),
+		verb: title.verb === "searched" ? "search" : title.verb
+	};
+};
+const partsOf = (step) => {
+	if (step._tag === "command") return commandParts(step);
+	if (step._tag === "fileChange") return {
+		detail: describeStep(step).target ?? "",
+		failure: null,
+		tookMs: null,
+		verb: "wrote"
+	};
+	return {
+		detail: flat(callSubjectOf(step.input) ?? ""),
+		failure: step.error === void 0 ? null : "failed",
+		tookMs: tookBetween(step.startedAtMillis, step.finishedAtMillis),
+		verb: step.name
+	};
+};
+const stepLine = (step, { branch, paint, room }) => {
+	const { detail, failure, tookMs, verb } = partsOf(step);
+	const took = tookMs === null || tookMs < NOTABLE_MS ? "" : `${GAP}${formatDuration(tookMs)}`;
+	const failed = failure === null ? "" : `${GAP}✗ ${failure}`;
+	const label = verb.padEnd(VERB_WIDTH);
+	const width = room - BRANCH_WIDTH - label.length - 1 - took.length - failed.length;
+	return branch(`${(failure === null ? paint[VERB_TONES[verb] ?? "lavender"] : paint.red)(label)} ${clipped$1(detail, Math.max(1, width))}${unless(took, paint.dim)}${unless(failed, paint.red)}`);
+};
+//#endregion
 //#region src/cli/transcript-turn.ts
-const CENT = .01;
 const openedTurn = (previous, startedAt) => ({
+	answering: false,
 	costUsd: null,
 	endedAt: null,
 	number: (previous?.number ?? 0) + 1,
@@ -1070,7 +1324,7 @@ const repliedTurn = (previous, reply) => {
 const durationOf = (turn) => turn.startedAt === null || turn.endedAt === null ? null : formatDuration(Math.max(0, turn.endedAt - turn.startedAt));
 const costOf = (turn) => {
 	if (turn.costUsd === null) return null;
-	return turn.costUsd > 0 && turn.costUsd < CENT ? "<$0.01" : `$${turn.costUsd.toFixed(2)}`;
+	return turn.costUsd > 0 && turn.costUsd < .01 ? "<$0.01" : `$${turn.costUsd.toFixed(2)}`;
 };
 const turnFacts = (turn) => [
 	`turn ${turn.number}`,
@@ -1087,11 +1341,19 @@ const validationSummary = (validation) => {
 };
 //#endregion
 //#region src/cli/outcome-mark.ts
-const outcomeMark = (status, paint) => {
-	if (status === "passed") return paint.green(`✓ ${status}`);
-	if (status === "failed") return paint.red(`✗ ${status}`);
-	return status === "void" || status === "timed out" ? paint.yellow(`○ ${status}`) : paint.dim(status);
+const GLYPHS = {
+	failed: "✗",
+	passed: "✓",
+	"timed out": "○",
+	void: "○"
+};
+const outcomeTone = (status, paint) => {
+	if (status === "passed") return paint.green;
+	if (status === "failed") return paint.red;
+	return status in GLYPHS ? paint.yellow : paint.dim;
 };
+const outcomeGlyph = (status, paint) => outcomeTone(status, paint)(GLYPHS[status] ?? "·");
+const outcomeMark = (status, paint) => outcomeTone(status, paint)(status in GLYPHS ? `${GLYPHS[status]} ${status}` : status);
 //#endregion
 //#region src/cli/transcript-verdict.ts
 const SUMMARY_LINES = 3;
@@ -1109,39 +1371,30 @@ const checksOf = (verdict) => {
 		summary: null
 	}));
 };
-const markOf = (status, paint) => {
-	if (status === "passed") return paint.green("✓");
-	if (status === "failed" || status === "error") return paint.red(status === "error" ? "!" : "✗");
-	return paint.dim(status === "skipped" ? "–" : "·");
-};
+const failing = (check) => check.status === "failed" || check.status === "error";
 const checkLines = (check, write) => {
 	const timing = check.durationMs === null ? "" : write.paint.dim(` · ${formatDuration(check.durationMs)}`);
-	const tone = check.status === "passed" ? write.paint.dim : (row) => row;
-	const summary = check.summary === null || check.summary === check.name ? [] : write.indented(check.summary, 3, tone).slice(0, SUMMARY_LINES);
-	return [write.line(`  ${markOf(check.status, write.paint)} ${check.name}${timing}`), ...summary];
+	const mark = write.paint.red(check.status === "error" ? "!" : "✗");
+	const summary = check.summary === null || check.summary === check.name ? [] : write.indented(check.summary, 2).slice(0, SUMMARY_LINES);
+	return [write.nested(`${mark} ${check.name}${timing}`), ...summary];
 };
 const outcomeOf$1 = (verdict, paint) => {
 	const mark = outcomeMark(verdict.status, paint);
 	if (verdict.status !== "void" && verdict.status !== "timed out") return mark;
 	const why = verdict.failure ?? (verdict.voidFields.length === 0 ? "not scored" : verdict.voidFields.join(", "));
-	return `${mark}${paint.yellow(` · ${why}`)}`;
+	return `${mark}${paint.dim(` · ${why}`)}`;
 };
 const verdictLines = (verdict, write) => {
 	const checks = checksOf(verdict);
 	const passed = checks.filter((check) => check.status === "passed").length;
 	const tally = checks.length === 0 ? "" : write.paint.dim(` · ${passed} of ${checks.length} checks passed`);
-	return [
-		...checks.length === 0 ? [] : [...write.heading("checks", write.paint.blue), ...checks.flatMap((check) => checkLines(check, write))],
-		write.blank,
-		write.close(`${outcomeOf$1(verdict, write.paint)}${tally}`)
-	];
+	return [write.line(`${outcomeOf$1(verdict, write.paint)}${tally}`), ...checks.filter(failing).flatMap((check) => checkLines(check, write))];
 };
 //#endregion
 //#region src/cli/transcript.ts
 const EMPTY_TRANSCRIPT = {
 	closed: /* @__PURE__ */ new Set(),
 	current: null,
-	printed: false,
 	turns: /* @__PURE__ */ new Map()
 };
 var Draft = class {
@@ -1150,29 +1403,41 @@ var Draft = class {
 	lines = [];
 	turns;
 	write;
-	printed;
 	constructor(transcript, style) {
 		this.closed = new Set(transcript.closed);
 		this.current = transcript.current;
-		this.printed = transcript.printed;
 		this.turns = new Map(transcript.turns);
 		this.write = writerFor(style);
 	}
 	enter(speaker) {
 		if (speaker.key !== this.current) {
-			if (this.printed || this.lines.length > 0) this.lines.push("");
-			this.lines.push(this.write.header(speaker));
+			this.lines.push("", this.write.header(speaker));
 			this.current = speaker.key;
 		}
 	}
-	say(label, tone, text) {
-		this.lines.push(...this.write.heading(label, tone), ...this.write.indented(text, 1));
+	asUser(key, text, startedAt) {
+		const { heading, indented, paint } = this.write;
+		this.closeTurn(key);
+		this.turns.set(key, openedTurn(this.turns.get(key), startedAt));
+		this.lines.push("", heading("❯", "User", paint.blue), ...indented(text, 1));
+	}
+	asAgent(key) {
+		const turn = this.turns.get(key) ?? openedTurn(void 0, null);
+		if (!turn.answering) {
+			const { heading, paint } = this.write;
+			this.lines.push(heading("◆", "Agent", paint.magenta));
+		}
+		this.turns.set(key, {
+			...turn,
+			answering: true
+		});
 	}
 	closeTurn(key) {
 		const turn = this.turns.get(key);
 		if (turn?.open === true) {
-			const { blank, line, paint } = this.write;
-			this.lines.push(blank, line(turn.replied ? `${paint.green("✓")} ${paint.dim(turnFacts(turn))}` : paint.dim(`· ${turnFacts(turn)} · no reply`)));
+			const { close, nested, paint } = this.write;
+			const facts = turn.replied ? turnFacts(turn) : `${turnFacts(turn)} · no reply`;
+			this.lines.push(turn.answering ? close(paint.dim(facts)) : nested(paint.dim(facts)));
 			this.turns.set(key, {
 				...turn,
 				open: false
@@ -1185,7 +1450,6 @@ var Draft = class {
 			transcript: {
 				closed: this.closed,
 				current: this.current,
-				printed: this.printed || this.lines.length > 0,
 				turns: this.turns
 			}
 		};
@@ -1193,20 +1457,19 @@ var Draft = class {
 };
 const transcribe = (transcript, spoken, style) => {
 	const draft = new Draft(transcript, style);
-	const { paint } = draft.write;
 	for (const { entry, speaker } of spoken) {
 		draft.enter(speaker);
-		if (entry._tag !== "message") draft.lines.push(stepLine(entry, draft.write));
-		else if (entry.role === "user") {
-			draft.closeTurn(speaker.key);
-			draft.turns.set(speaker.key, openedTurn(draft.turns.get(speaker.key), entry.finishedAtMillis ?? null));
-			draft.say("user", paint.cyan, entry.text);
-		} else {
+		if (entry._tag !== "message") {
+			draft.asAgent(speaker.key);
+			draft.lines.push(stepLine(entry, draft.write));
+		} else if (entry.role === "user") draft.asUser(speaker.key, entry.text, entry.finishedAtMillis ?? null);
+		else {
+			draft.asAgent(speaker.key);
 			draft.turns.set(speaker.key, repliedTurn(draft.turns.get(speaker.key), {
 				costUsd: entry.usage?.costUsd ?? null,
 				finishedAtMillis: entry.finishedAtMillis ?? null
 			}));
-			draft.say("agent", paint.magenta, entry.text);
+			draft.lines.push(...draft.write.indented(entry.text, 1));
 		}
 	}
 	return draft.done();
@@ -1216,7 +1479,7 @@ const settle = (transcript, settled, style) => {
 	for (const { speaker, verdict } of settled) if (!draft.closed.has(speaker.key)) {
 		draft.enter(speaker);
 		draft.closeTurn(speaker.key);
-		draft.lines.push(...verdictLines(verdict, draft.write));
+		draft.lines.push("", ...verdictLines(verdict, draft.write));
 		draft.closed.add(speaker.key);
 		draft.current = null;
 	}
@@ -1236,12 +1499,7 @@ const makeTranscriber = (style) => effect.Effect.map(effect.Ref.make(EMPTY_TRANS
 });
 //#endregion
 //#region src/cli/batch-progress.ts
-const DIM = "\x1B[2m";
-const BOLD = "\x1B[1m";
-const GREEN = "\x1B[32m";
-const RED = "\x1B[31m";
-const YELLOW = "\x1B[33m";
-const RESET = "\x1B[0m";
+const { bold, dim, green, red, yellow } = paletteFor(true);
 const DONE$1 = "●";
 const RUNNING = "◐";
 const FILLED = "▰";
@@ -1249,31 +1507,30 @@ const HOLLOW = "▱";
 const PERCENT = 100;
 const SECONDS = 1e3;
 const MINUTE = 60;
-const paint = (colour, text) => `${colour}${text}${RESET}`;
 const formatElapsed = (ms) => {
 	const total = Math.floor(ms / SECONDS);
 	const minutes = Math.floor(total / MINUTE);
 	return minutes === 0 ? `${total}s` : `${minutes}m${String(total % MINUTE).padStart(2, "0")}s`;
 };
 const formatStatus = (run) => {
-	if (run.status === "finished") return paint(GREEN, DONE$1);
-	return run.status === "failed" ? paint(RED, DONE$1) : paint(YELLOW, RUNNING);
+	if (run.status === "finished") return green(DONE$1);
+	return run.status === "failed" ? red(DONE$1) : yellow(RUNNING);
 };
 const formatTrialProgress = (run, trials) => {
 	const settled = run.trials.filter((trial) => trial.status !== "queued" && trial.status !== "running").length;
-	return `${FILLED.repeat(settled)}${paint(DIM, HOLLOW.repeat(Math.max(0, trials - settled)))}`;
+	return `${FILLED.repeat(settled)}${dim(HOLLOW.repeat(Math.max(0, trials - settled)))}`;
 };
 const formatPassRate = (run) => {
 	const rate = run.distribution.passRate;
-	if (run.distribution.scored === 0) return paint(DIM, "—");
+	if (run.distribution.scored === 0) return dim("—");
 	const shown = `${Math.round(rate * PERCENT)}%`;
-	return paint(rate === 1 ? GREEN : RED, shown);
+	return (rate === 1 ? green : red)(shown);
 };
 const formatActivity = (run) => {
 	const running = run.trials.find((trial) => trial.status === "running");
 	if (running === void 0) return [];
 	const counts = [`${running.commands} cmd`, ...running.filesChanged.length === 0 ? [] : [`${running.filesChanged.length} files`]].join(", ");
-	return [paint(DIM, `      ${counts}`)];
+	return [dim(`      ${counts}`)];
 };
 const widest = (batch) => batch.runs.reduce((width, run) => Math.max(width, formatVariant(run.variant).length), 0);
 const byCase = (batch) => Map.groupBy(batch.runs, (run) => run.case.id).values();
@@ -1281,7 +1538,7 @@ const formatBatch = (batch, trials, elapsedMs) => {
 	const width = widest(batch);
 	const lines = [];
 	for (const runs of byCase(batch)) {
-		lines.push(`  ${BOLD}${runs[0]?.case.name ?? ""}${RESET}`);
+		lines.push(`  ${bold(runs[0]?.case.name ?? "")}`);
 		for (const run of runs) {
 			lines.push(`    ${formatStatus(run)} ${formatVariant(run.variant).padEnd(width)}  ${formatTrialProgress(run, trials)}  ${formatPassRate(run)}`);
 			lines.push(...formatActivity(run));
@@ -1290,8 +1547,8 @@ const formatBatch = (batch, trials, elapsedMs) => {
 	}
 	const usage = batchUsage(batch);
 	const [spend, ...concerns] = usageLines(usage);
-	lines.push(paint(DIM, spend === void 0 ? `  ${formatElapsed(elapsedMs)} elapsed` : `  ${formatElapsed(elapsedMs)} elapsed  ·  ${spend}`));
-	for (const concern of concerns) lines.push(paint(YELLOW, `  ${concern}`));
+	lines.push(dim(spend === void 0 ? `  ${formatElapsed(elapsedMs)} elapsed` : `  ${formatElapsed(elapsedMs)} elapsed  ·  ${spend}`));
+	for (const concern of concerns) lines.push(yellow(`  ${concern}`));
 	return lines;
 };
 const up = (rows) => `[${rows}A`;
@@ -1374,7 +1631,7 @@ const followBatch = (id, api) => effect.Stream.unwrap(effect.Effect.gen(function
 const TICK = 1e3;
 const FLOOR_POLL = 15e3;
 const running = (batch) => batch.status === "running";
-const settledIn = (batch) => batch.runs.flatMap((run) => run.trials).filter((trial) => trial.status !== "queued" && trial.status !== "running").length;
+const settledIn = (batch) => batch.runs.flatMap((run) => run.trials).filter((trial) => require_errors.isSettledTrial(trial.status)).length;
 var EvalWaitTimeout = class extends effect.Data.TaggedError("EvalWaitTimeout") {
 	get message() {
 		return `Timed out after ${this.seconds}s waiting for ${this.batchId}. The batch was not cancelled.`;
@@ -1412,15 +1669,15 @@ const waitForBatch = (id, watcher, timeoutSeconds) => effect.Effect.gen(function
 }), effect.Effect.withSpan("Cli.waitForBatch", { attributes: { batchId: id } }));
 //#endregion
 //#region src/cli/open-browser.ts
-const BROWSER = "ANPORD_BROWSER";
-const opened = (url) => {
-	const chosen = process.env[BROWSER];
+const browserConfig = effect.Config.string("ANPORD_BROWSER").pipe(effect.Config.option, effect.Config.map(effect.Option.getOrUndefined));
+const opened = (url, chosen) => {
 	if (process.platform === "darwin") return chosen === void 0 ? _effect_platform.Command.make("open", url) : _effect_platform.Command.make("open", "-a", chosen, url);
 	return process.platform === "win32" ? _effect_platform.Command.make("start", url) : _effect_platform.Command.make(chosen ?? "xdg-open", url);
 };
 const openBrowser = (url) => effect.Effect.gen(function* () {
-	if (process.env[BROWSER] === "none") return;
-	yield* (yield* _effect_platform.CommandExecutor.CommandExecutor).exitCode(opened(url));
+	const chosen = yield* browserConfig;
+	if (chosen === "none") return;
+	yield* (yield* _effect_platform.CommandExecutor.CommandExecutor).exitCode(opened(url, chosen));
 }).pipe(effect.Effect.ignore);
 //#endregion
 //#region src/cli/batch-outcome.ts
@@ -2743,13 +3000,12 @@ const decodeGeminiLine = (line, at) => {
 //#endregion
 //#region ../eval/src/adapters/harness/opencode-config.ts
 const CONFIG_VARIABLE = "OPENCODE_CONFIG_CONTENT";
-const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const decodeJson$1 = effect.Schema.decodeUnknownOption(effect.Schema.parseJson());
-const parsed = (value) => decodeJson$1(value).pipe(effect.Option.filter(isObject), effect.Option.getOrElse(() => ({})));
+const parsed = (value) => decodeJson$1(value).pipe(effect.Option.filter(effect.Predicate.isRecord), effect.Option.getOrElse(() => ({})));
 const stringsOf = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
 const merged = (base, extra) => Object.fromEntries([...Object.entries(base), ...Object.entries(extra).map(([key, value]) => {
 	const current = base[key];
-	return [key, isObject(current) && isObject(value) ? merged(current, value) : value];
+	return [key, effect.Predicate.isRecord(current) && effect.Predicate.isRecord(value) ? merged(current, value) : value];
 })]);
 const opencodeConfigContent = (env, systemPromptPath) => {
 	const own = parsed(env[CONFIG_VARIABLE]);
@@ -3218,20 +3474,28 @@ const localCache = (store, staging) => ({
 //#endregion
 //#region ../eval/src/adapters/sandbox/local-detached.ts
 const call$1 = providerCall("local");
+const KILLED = 137;
 const read$1 = (path) => effect.Effect.tryPromise(() => (0, node_fs_promises.readFile)(path, "utf8")).pipe(effect.Effect.orElseSucceed(() => ""));
 const localDetached = (root, path, env) => {
 	const runs = (0, node_path.join)(root, ".anpord-runs");
 	const fileOf = (id, suffix) => (0, node_path.join)(runs, `${id}.${suffix}`);
+	const exits = /* @__PURE__ */ new Map();
+	const closedWith = /* @__PURE__ */ new Map();
 	return {
-		progress: (started) => effect.Effect.all([
-			read$1(fileOf(started.id, "out")),
-			read$1(fileOf(started.id, "err")),
-			read$1(fileOf(started.id, "exit"))
-		], { concurrency: "unbounded" }).pipe(effect.Effect.map(([stdout, stderr, status]) => ({
-			exitCode: status.trim() === "" ? null : Number(status.trim()),
-			stderr,
-			stdout
-		}))),
+		progress: (started) => effect.Effect.gen(function* () {
+			const closed = closedWith.get(started.id);
+			const status = (yield* read$1(fileOf(started.id, "exit"))).trim();
+			const [stdout, stderr] = yield* effect.Effect.all([read$1(fileOf(started.id, "out")), read$1(fileOf(started.id, "err"))], { concurrency: "unbounded" });
+			return {
+				exitCode: status === "" ? closed ?? null : Number(status),
+				stderr,
+				stdout
+			};
+		}),
+		settled: (started) => {
+			const exit = exits.get(started.id);
+			return exit === void 0 ? effect.Effect.never : effect.Effect.promise(() => exit);
+		},
 		start: (command, options) => effect.Effect.gen(function* () {
 			const id = `run-${yield* effect.Random.nextIntBetween(0, 1e6)}`;
 			const [out, err, exit] = [
@@ -3240,7 +3504,7 @@ const localDetached = (root, path, env) => {
 				"exit"
 			].map((suffix) => JSON.stringify(fileOf(id, suffix)));
 			yield* call$1(() => (0, node_fs_promises.mkdir)(runs, { recursive: true }));
-			yield* effect.Effect.try({
+			const child = yield* effect.Effect.try({
 				catch: unavailableFor("local"),
 				try: () => (0, node_child_process.spawn)(`{ ${command} ; } > ${out} 2> ${err}; printf %s $? > ${exit}`, {
 					cwd: options?.cwd ?? root,
@@ -3252,8 +3516,13 @@ const localDetached = (root, path, env) => {
 					},
 					shell: "/bin/bash",
 					stdio: "ignore"
-				}).unref()
+				})
 			});
+			exits.set(id, new Promise((resolve) => child.once("close", (code) => {
+				closedWith.set(id, code ?? KILLED);
+				resolve();
+			})));
+			child.unref();
 			return {
 				id,
 				session: id
@@ -3514,6 +3783,9 @@ const stepResultsOf = (script, output) => {
 };
 const withoutMarks = (output) => output.replace(MARK_LINES, "");
 //#endregion
+//#region ../eval/src/adapters/scorers/scorer-timeout.ts
+const SCORER_TIMEOUT_MS = 3e5;
+//#endregion
 //#region ../eval/src/adapters/scorers/shell-pipeline.ts
 const isUnguardedPipeline = (command) => {
 	let quote = null;
@@ -3693,10 +3965,7 @@ const executeValidation = (input) => effect.Effect.gen(function* () {
 //#region ../eval/src/domain/answer-file.ts
 const ANSWER_PATH = (home) => `${home}/.anpord-answer.txt`;
 const TRANSCRIPT_PATH = (home) => `${home}/.anpord-transcript.txt`;
-const ANSWER_ENV = "ANPORD_ANSWER_FILE";
-const TRANSCRIPT_ENV = "ANPORD_TRANSCRIPT_FILE";
 const TURNS_PATH = (home) => `${home}/.anpord-turns.json`;
-const TURNS_ENV = "ANPORD_TURNS_FILE";
 //#endregion
 //#region ../eval/src/domain/journal.ts
 const commandsIn = (events) => events.filter((event) => event._tag === "Command").length;
@@ -3726,9 +3995,9 @@ const writeAnswer = (sandbox, events, turns) => effect.Effect.all([
 	sandbox.writeFile(TURNS_PATH(sandbox.home), JSON.stringify(turns))
 ], { discard: true });
 const answerEnv = (sandbox) => ({
-	[ANSWER_ENV]: ANSWER_PATH(sandbox.home),
-	[TRANSCRIPT_ENV]: TRANSCRIPT_PATH(sandbox.home),
-	[TURNS_ENV]: TURNS_PATH(sandbox.home)
+	[require_sandbox_env.ANSWER_ENV]: ANSWER_PATH(sandbox.home),
+	[require_sandbox_env.TRANSCRIPT_ENV]: TRANSCRIPT_PATH(sandbox.home),
+	[require_sandbox_env.TURNS_ENV]: TURNS_PATH(sandbox.home)
 });
 const resultStatus = (passed) => passed ? "passed" : "failed";
 const processError = (execution) => {
@@ -3795,7 +4064,7 @@ const scoreCommand = (request) => effect.Effect.gen(function* () {
 				...request.env,
 				...answerEnv(request.sandbox)
 			},
-			timeoutMs: 3e5
+			timeoutMs: SCORER_TIMEOUT_MS
 		},
 		records: [record],
 		observe: request.onValidation,
@@ -3905,11 +4174,11 @@ const scoreValidator = (request) => effect.Effect.gen(function* () {
 		command: `node ${shellQuote(path)}`,
 		options: {
 			cwd: request.workspace,
-			timeoutMs: 3e5,
+			timeoutMs: SCORER_TIMEOUT_MS,
 			env: {
 				...request.env,
 				...answerEnv(request.sandbox),
-				ANPORD_PREPARE_VALUE: JSON.stringify(request.prepared ?? {})
+				[require_sandbox_env.PREPARE_VALUE_ENV]: JSON.stringify(request.prepared ?? {})
 			}
 		},
 		records,
@@ -4893,7 +5162,6 @@ const runProfileInstall = (input) => {
 };
 //#endregion
 //#region ../eval/src/domain/prepare-output.ts
-const MARKER = "ANPORD_PREPARE_RESULT=";
 const PREPARED_LIMIT = 16e3;
 const CARRIED_LIMIT = PREPARED_LIMIT * 2;
 const LINE_BREAK = /[\r\n]/;
@@ -4907,9 +5175,9 @@ const NOTHING_STREAMED = {
 	stdout: ""
 };
 const readPrepareValue = (output) => {
-	const line = output.split("\n").findLast((entry) => entry.startsWith(MARKER));
+	const line = output.split("\n").findLast((entry) => entry.startsWith(require_sandbox_env.PREPARE_RESULT_MARKER));
 	if (line === void 0) return effect.Either.left("it printed no result, so its output was cut off");
-	const encoded = line.slice(22);
+	const encoded = line.slice(require_sandbox_env.PREPARE_RESULT_MARKER.length);
 	if (encoded.length > PREPARED_LIMIT) return effect.Either.left(`it returned ${encoded.length} characters and the limit is ${PREPARED_LIMIT}. Return a summary and keep large data in files`);
 	return decodeJson(encoded).pipe(effect.Either.mapLeft(() => "its result was not valid JSON"), effect.Either.flatMap((value) => effect.Either.mapLeft(decodeObject(value), () => "it returned something other than an object")));
 };
@@ -4923,14 +5191,14 @@ const completeLines = (text) => {
 const shownPrepareOutput = (carried, arrived, known) => {
 	const stdout = completeLines(carried.stdout + arrived.stdout);
 	const stderr = completeLines(carried.stderr + arrived.stderr);
-	return [require_api_mocks.redactSecrets([...stdout.lines, ...stderr.lines].filter((line) => !line.includes(MARKER)).join("\n"), known).slice(-400).trim(), {
+	return [require_api_mocks.redactSecrets([...stdout.lines, ...stderr.lines].filter((line) => !line.includes(require_sandbox_env.PREPARE_RESULT_MARKER)).join("\n"), known).slice(-400).trim(), {
 		stderr: stderr.carry,
 		stdout: stdout.carry
 	}];
 };
 //#endregion
 //#region ../eval/src/services/polled-command.ts
-const FIRST_CHECK_MS = 5e3;
+const FIRST_CHECK_MS = 500;
 const SLOWEST_CHECK_MS = 3e4;
 const WIDENING = 1.5;
 const CHECK_RETRY = effect.Schedule.exponential("200 millis").pipe(effect.Schedule.compose(effect.Schedule.recurs(3)));
@@ -4950,7 +5218,7 @@ const pollUntilDone = (input) => effect.Effect.gen(function* () {
 	}, {
 		body: () => effect.Effect.gen(function* () {
 			const millis = yield* effect.Ref.getAndUpdate(gap, (current) => Math.min(Math.round(current * WIDENING), SLOWEST_CHECK_MS));
-			yield* input.suspender.waitFor(effect.Duration.millis(millis));
+			yield* effect.Effect.raceFirst(input.suspender.waitFor(effect.Duration.millis(millis)), input.resumable.settled(started));
 			const progress = yield* check;
 			yield* report(progress);
 			return {
@@ -4972,9 +5240,8 @@ const pollUntilDone = (input) => effect.Effect.gen(function* () {
 });
 //#endregion
 //#region ../eval/src/services/long-command.ts
-const DEFAULT_TIMEOUT_MS = 12e4;
 const runLongCommand = (sandbox, command, options) => effect.Effect.gen(function* () {
-	const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+	const timeoutMs = options?.timeoutMs ?? 12e4;
 	const exec = {
 		cwd: options?.cwd,
 		env: options?.env,
@@ -5016,7 +5283,7 @@ const runPrepare = (input) => effect.Effect.scoped(effect.Effect.gen(function* (
 		mounted: effect.Option.isSome(cache)
 	}));
 	const env = {
-		...restored ? { ANPORD_CACHE_RESTORED: "1" } : {},
+		...restored ? { [require_sandbox_env.CACHE_RESTORED_ENV]: "1" } : {},
 		...input.forwarded
 	};
 	const carried = yield* effect.Ref.make(NOTHING_STREAMED);
@@ -5099,7 +5366,7 @@ const prepareWorkspace = (input) => effect.Effect.gen(function* () {
 		sandbox: input.sandbox,
 		version: input.harnessVersion
 	});
-	yield* runCommand(input.sandbox, `mkdir -p ${input.workspace}`, { timeoutMs: 6e4 });
+	yield* runCommand(input.sandbox, `mkdir -p ${input.workspace}`, { timeoutMs: MKDIR_TIMEOUT_MS });
 	yield* materialiseStage(input, "home");
 	yield* materialise(input);
 	yield* materialiseStage(input, "workspace");
@@ -5734,7 +6001,7 @@ const runVariant = (request, variant, transcript, options) => effect.Effect.gen(
 	return yield* effect.Effect.forEach(request.cases.flatMap((subject) => ordinals.map((ordinal) => [subject, ordinal])), ([subject, ordinal]) => attempt(subject, ordinal), { concurrency: 1 });
 }).pipe(effect.Effect.provide(options.credentials === void 0 || options.credentials.size === 0 ? EvalLocalLive : evalLocalWith(credentialResolverFrom(options.credentials))), effect.Effect.scoped);
 const runLocally = (request, options = {}) => effect.Effect.gen(function* () {
-	const transcript = yield* makeTranscriber(terminalStyle(process.stderr.isTTY === true));
+	const transcript = yield* makeTranscriber(stderrStyle());
 	return (yield* effect.Effect.forEach(request.variants, (variant) => runVariant(request, variant, transcript, options), { concurrency: 1 })).flat();
 }).pipe(effect.Effect.withConfigProvider(localConfig));
 //#endregion
@@ -5869,32 +6136,44 @@ const runStoredCase = (caseId, variants, options, save) => effect.Effect.gen(fun
 //#endregion
 //#region src/cli/local-report.ts
 const STATUSES = [
-	"passed",
 	"failed",
+	"timed out",
 	"void",
-	"timed out"
+	"passed"
 ];
-const trialName = (one, numbered) => `${one.name} on ${one.variant}${numbered ? `, trial ${one.ordinal}` : ""}`;
-const tallyOf = (cases) => STATUSES.flatMap((status) => {
-	const count = cases.filter((one) => one.status === status).length;
-	return count === 0 ? [] : [`${count} ${status}`];
-}).join(", ");
-const summaryLines = (label, cases, costs, link, paint = paletteFor(false)) => {
+const trialName = (one, numbered) => numbered ? `${one.name} #${one.ordinal}` : one.name;
+const tallyOf = (cases, paint) => {
+	return `${STATUSES.flatMap((status) => {
+		const count = cases.filter((one) => one.status === status).length;
+		return count === 0 ? [] : [outcomeTone(status, paint)(`${count} ${status}`)];
+	}).join(paint.dim(" | "))} ${paint.dim(`(${cases.length})`)}`;
+};
+const trialLines = (cases, paint) => {
 	const numbered = cases.some((one) => one.ordinal > 1);
-	const statusWidth = Math.max(...cases.map((one) => one.status.length), 0);
-	const nameWidth = Math.max(...cases.map((one) => trialName(one, numbered).length), 0);
-	const reasonIndent = " ".repeat(statusWidth + 6);
-	return [
-		`${paint.bold(label)}: ${[`${cases.length} ${cases.length === 1 ? "trial" : "trials"} on this machine`, tallyOf(cases)].filter((part) => part !== "").join(", ")}`,
-		...cases.flatMap((one) => [`  ${outcomeMark(one.status, paint)}${" ".repeat(statusWidth - one.status.length)}  ${trialName(one, numbered).padEnd(nameWidth)}  ${paint.dim(formatDuration(one.durationMs))}`, ...one.reason === null ? [] : [`${reasonIndent}${one.reason}`]]),
-		...localUsageLines(cases, costs),
-		...effect.Option.match(link, {
-			onNone: () => [],
-			onSome: (url) => [`  Results: ${url}`]
-		})
+	const nameWidth = Math.max(...cases.map((one) => trialName(one, numbered).length));
+	const variantWidth = Math.max(...cases.map((one) => one.variant.length));
+	return cases.flatMap((one) => [`  ${outcomeGlyph(one.status, paint)} ${trialName(one, numbered).padEnd(nameWidth)}  ${paint.dim(one.variant.padEnd(variantWidth))}  ${paint.dim(formatDuration(one.durationMs))}`, ...one.reason === null ? [] : [`    ${outcomeTone(one.status, paint)(one.status)} ${paint.dim(`· ${one.reason}`)}`]]);
+};
+const usageRows = (cases, costs, paint) => {
+	const { concerns, lines } = localUsage(cases, costs);
+	const [first, ...rest] = lines;
+	return first === void 0 ? [] : [
+		labelled("Usage", first, paint),
+		...rest.map(continued$1),
+		...concerns.map((concern) => continued$1(paint.yellow(`⚠ ${concern}`)))
 	];
 };
-const reportLocal = (label, cases, costs, link) => note(["", ...summaryLines(label, cases, costs, link, paletteFor(terminalStyle(process.stderr.isTTY === true).colour))].join("\n"));
+const summaryLines = (label, cases, costs, link, paint = paletteFor(false)) => [
+	...cases.length === 0 ? [] : [...trialLines(cases, paint), ""],
+	labelled("Suite", label, paint),
+	labelled("Trials", cases.length === 0 ? "none ran" : tallyOf(cases, paint), paint),
+	...usageRows(cases, costs, paint),
+	...effect.Option.match(link, {
+		onNone: () => [],
+		onSome: (url) => [labelled("Results", url, paint)]
+	})
+];
+const reportLocal = (label, cases, costs, link) => note(["", ...summaryLines(label, cases, costs, link, paletteFor(stderrStyle().colour))].join("\n"));
 const localProblems = (label, cases) => {
 	const missed = cases.filter((one) => one.status !== "passed").length;
 	return missed === 0 ? [] : [`${label}: ${missed} of ${cases.length} trials did not pass.`];
@@ -6036,7 +6315,7 @@ const whoami = _effect_cli.Command.make("whoami", { asJson: asJson$2 }, ({ asJso
 	if (wantsJson) return yield* json(found);
 	return yield* effect.Effect.forEach(whoamiLines(found), row);
 })).pipe(_effect_cli.Command.withDescription("Show the organization and key ANPORD_API_KEY acts for"));
-const announceOrganization = require_errors.AnpordApi.pipe(effect.Effect.flatMap((api) => api.auth.whoami({ payload: {} })), effect.Effect.flatMap(({ organization }) => note(`Runs land in ${organization.name} (${organization.slug}).`)), effect.Effect.ignore);
+const announceOrganization = require_errors.AnpordApi.pipe(effect.Effect.flatMap((api) => api.auth.whoami({ payload: {} })), effect.Effect.flatMap(({ organization }) => note(labelled("Org", `${organization.name} (${organization.slug})`, paletteFor(stderrStyle().colour)))), effect.Effect.ignore);
 //#endregion
 //#region src/cli/suite-local.ts
 var LocalTimeout = class extends effect.Data.TaggedError("LocalTimeout") {
@@ -6246,7 +6525,7 @@ const commandsWith = (prompts) => [
 const commands = commandsWith(false);
 //#endregion
 //#region src/cli/failure.ts
-const MISSING_KEY = "Set ANPORD_API_KEY to an API key from https://www.anpord.com/settings/keys";
+const MISSING_KEY = `Set ANPORD_API_KEY to an API key from ${require_errors.WEB_ORIGIN}/settings/keys`;
 const EXIT_GATE_FAILED = 2;
 const tagOf = (error) => typeof error === "object" && error !== null && "_tag" in error ? error._tag : void 0;
 const describe = (error) => {