@orkestrel/scaffold 0.0.100 → 0.0.102

package/dist/bin/main.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import { align, renderTable, strip, stripControls, width } from "@orkestrel/console";
-import { attempt, isArray, isError, isInstance, isRecord, isString, parseJSON } from "@orkestrel/contract";
-import { AXES, BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, FRAMEWORKS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, HOST_PATHS, INTEGRATION_TEST_PATH, JOURNEY_CONFIG_PATH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, RESERVED_SHEET_NAMES, SERVICE_SETUP_PATH, SHEET_ENTRY_NAME, SHOWCASE_CONFIG_PATH, SHOWCASE_DEV_DEPENDENCIES, SHOWCASE_PAGES_PATH, SKILLS_CONFIG_PATH, STYLES_ENTRY_PATH, ScaffoldError, THEMES_BARREL_PATH, THEMES_ENTRY_PATH, blueprintToConfigArtifacts, blueprintToDevDependencies, blueprintToFaces, blueprintToManifestOverrides, blueprintToProjects, blueprintToScripts, blueprintToSheets, blueprintToTestArtifacts, blueprintToWritableScripts, compareVersions, createBlueprint, extractRangeMajor, extractVersion, isFloorPath, isScaffoldError, isSheetName, manifestToDependencies, manifestToName, nameToGuide, parseExtension, replaceManifestOverrides, replaceManifestScripts, replacePlanRanges } from "../src/core/index.js";
+import { attempt, isArray, isDefined, isError, isInstance, isRecord, isString, parseJSON } from "@orkestrel/contract";
+import { AXES, BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, FRAMEWORKS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, HOST_PATHS, INTEGRATION_TEST_PATH, JOURNEY_CONFIG_PATH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, RESERVED_SHEET_NAMES, SERVICE_SETUP_PATH, SHEET_ENTRY_NAME, SHOWCASE_CONFIG_PATH, SHOWCASE_DEV_DEPENDENCIES, SHOWCASE_PAGES_PATH, SKILLS_CONFIG_PATH, STYLES_ENTRY_PATH, ScaffoldError, THEMES_BARREL_PATH, THEMES_ENTRY_PATH, blueprintToConfigArtifacts, blueprintToDevDependencies, blueprintToFaces, blueprintToManifestOverrides, blueprintToProjects, blueprintToScripts, blueprintToSheets, blueprintToTestArtifacts, blueprintToWritableScripts, compareVersions, createBlueprint, extractRangeMajor, extractVersion, isFloorPath, isScaffoldError, isSheetName, iterateAnswers, manifestToDependencies, manifestToName, nameToGuide, parseExtension, replaceManifestOverrides, replaceManifestScripts, replacePlanRanges } from "../src/core/index.js";
 import { MAX_INVENTORY_PATHS, Materializer, Upstream, filesToHost, isExactCaseFile, isPhysicalDirectory, isWorktree, listFiles, readFileText, readHostFloor, readHostManifest, readSnapshot, resolveContainedPath } from "../src/server/index.js";
-import { createMarkdown, flattenText, isTableNode } from "@orkestrel/markdown";
 import { createSession } from "@orkestrel/process/server";
+import { createMarkdown, flattenText, isTableNode } from "@orkestrel/markdown";
 import { readdirSync } from "node:fs";
 import { normalize } from "node:path";
 import { parseArgs } from "node:util";
 var package_default = {
 	name: "@orkestrel/scaffold",
-	version: "0.0.100",
+	version: "0.0.102",
 	description: "Scaffold workspaces with commands: new, audit, repair, catalog, and overwrite.",
 	keywords: [
 		"audit",
@@ -114,7 +114,7 @@ var package_default = {
 		"@orkestrel/guide": "^0.0.24",
 		"@orkestrel/html": "^0.0.12",
 		"@orkestrel/probe": "^0.0.23",
-		"@orkestrel/test": "^0.0.25",
+		"@orkestrel/test": "^0.0.26",
 		"@types/node": "^26.6.4",
 		"@vitest/browser-playwright": "^4.1.11",
 		"oxfmt": "^0.72.0",
@@ -643,34 +643,28 @@ function auditToExit(audit) {
 */
 function manifestToWritableDependencies(manifest, blueprint) {
 	const declared = manifestToDependencies(manifest);
-	const runtime = [...dependenciesToFleet(declared.runtime)];
-	const development = [...dependenciesToFleet(declared.development)];
 	const parsed = parseJSON(manifest);
 	if (!isRecord(parsed)) return {
-		runtime,
-		development
+		runtime: dependenciesToFleet(declared.runtime),
+		development: dependenciesToFleet(declared.development)
 	};
 	const runtimeRecord = isRecord(parsed.dependencies) ? parsed.dependencies : {};
 	const developmentRecord = isRecord(parsed.devDependencies) ? parsed.devDependencies : {};
-	for (const name of Object.keys(blueprintToDevDependencies(blueprint)).sort()) {
-		if (name.startsWith("@orkestrel/")) continue;
-		const runtimeRange = runtimeRecord[name];
-		if (isString(runtimeRange)) {
-			runtime.push({
-				name,
-				range: runtimeRange
-			});
-			if (!(blueprint.showcase && blueprint.app.includes("browser") && Object.hasOwn(SHOWCASE_DEV_DEPENDENCIES, name))) continue;
-		}
-		const developmentRange = developmentRecord[name];
-		if (isString(developmentRange)) development.push({
+	const rows = Object.keys(blueprintToDevDependencies(blueprint)).sort().filter((name) => !name.startsWith("@orkestrel/")).map((name) => ({
+		name,
+		runtimeRange: runtimeRecord[name],
+		developmentRange: developmentRecord[name],
+		dual: blueprint.showcase && blueprint.app.includes("browser") && Object.hasOwn(SHOWCASE_DEV_DEPENDENCIES, name)
+	}));
+	return {
+		runtime: [...dependenciesToFleet(declared.runtime), ...rows.flatMap(({ name, runtimeRange }) => isString(runtimeRange) ? [{
+			name,
+			range: runtimeRange
+		}] : [])],
+		development: [...dependenciesToFleet(declared.development), ...rows.flatMap(({ name, runtimeRange, developmentRange, dual }) => isString(runtimeRange) && !dual || !isString(developmentRange) ? [] : [{
 			name,
 			range: developmentRange
-		});
-	}
-	return {
-		runtime,
-		development
+		}])]
 	};
 }
 /**
@@ -787,12 +781,8 @@ function manifestToWritableScripts(manifest, blueprint) {
 	const steps = declared.split("&&").map((step) => step.trim());
 	const expected = planned.split("&&").map((step) => step.trim());
 	if (steps.length >= expected.length) return writable;
-	let cursor = 0;
-	for (const step of steps) {
-		while (cursor < expected.length && expected[cursor] !== step) cursor += 1;
-		if (cursor === expected.length) return writable;
-		cursor += 1;
-	}
+	const resumed = expected.values();
+	if (!steps.every((step) => resumed.some((entry) => entry === step))) return writable;
 	const supplied = new Set(writable.map(({ name }) => name));
 	for (const step of expected) {
 		if (steps.includes(step)) continue;
@@ -822,17 +812,15 @@ function dependenciesToFleet(dependencies) {
 * no concrete version.
 */
 function dependenciesToFloors(dependencies) {
-	const releases = [];
-	for (const dependency of dependencies) {
+	const floors = [...iterateAnswers(dependencies, (dependency) => {
 		const version = dependency.range.startsWith("^") || dependency.range.startsWith("~") ? dependency.range.slice(1) : dependency.range;
-		if (extractVersion(version) === void 0) return void 0;
-		releases.push({
+		return extractVersion(version) === void 0 ? void 0 : {
 			...dependency,
 			lookup: "found",
 			latest: version
-		});
-	}
-	return releases;
+		};
+	})];
+	return floors.every(isDefined) ? floors : void 0;
 }
 /**
 * Reads the exit code registry release evidence earns.
@@ -851,27 +839,24 @@ function releasesToExit(releases) {
 * @returns One non-blocking question for each stale floor and each crossed major.
 */
 function releasesToQuestions(releases, served = releases) {
-	const questions = [];
-	for (const release of releases) {
-		if (release.name.startsWith("@orkestrel/")) continue;
+	return Iterator.from(releases).flatMap((release) => {
+		if (release.name.startsWith("@orkestrel/")) return [];
 		const declared = extractRangeMajor(release.range);
 		const current = release.lookup === "found" ? release.latest : void 0;
 		const resolved = current === void 0 ? void 0 : extractVersion(current);
 		const floor = extractVersion(release.range.startsWith("^") || release.range.startsWith("~") ? release.range.slice(1) : release.range);
-		if (declared !== void 0 && current !== void 0 && resolved !== void 0 && floor !== void 0 && resolved[0] === declared && compareVersions(current, floor.join(".")) > 0) questions.push({
+		const alternate = served.find((candidate) => candidate.name === release.name);
+		const published = release.major ?? (alternate?.lookup === "found" ? extractVersion(alternate.latest)?.[0] : void 0);
+		return [...declared !== void 0 && current !== void 0 && resolved !== void 0 && floor !== void 0 && resolved[0] === declared && compareVersions(current, floor.join(".")) > 0 ? [{
 			field: "dependencies",
 			message: `${release.name} declares the floor ${release.range}, while the registry serves ${current} within major ${String(declared)}.`,
 			blocking: false
-		});
-		const alternate = served.find((candidate) => candidate.name === release.name);
-		const published = release.major ?? (alternate?.lookup === "found" ? extractVersion(alternate.latest)?.[0] : void 0);
-		if (declared !== void 0 && published !== void 0 && declared < published) questions.push({
+		}] : [], ...declared !== void 0 && published !== void 0 && declared < published ? [{
 			field: "dependencies",
 			message: `${release.name} declares major ${String(declared)}, while the registry serves major ${String(published)}.`,
 			blocking: false
-		});
-	}
-	return questions;
+		}] : []];
+	}).toArray();
 }
 /**
 * Projects an audit into the human summary of its outcome.
@@ -1122,17 +1107,16 @@ function releasesToPins(releases, declared) {
 	const refused = releases.filter((release) => release.lookup !== "found");
 	if (refused.length > 0) throw new ScaffoldError("FETCH", `The registry named no release for ${refused.map((release) => release.name).join(", ")}.`, { names: refused.length });
 	const dependencies = [...declared.runtime, ...declared.development];
-	const pins = [];
-	for (let index = 0; index < releases.length; index += 1) {
+	const pins = Array.from(releases.keys(), (index) => {
 		const release = releases[index];
 		const dependency = dependencies[index];
 		if (release === void 0 || dependency === void 0) throw new ScaffoldError("FETCH", "The release answer has no matching declaration.");
 		if (release.lookup !== "found") throw new ScaffoldError("FETCH", `The registry named no release for ${release.name}.`);
-		pins.push({
+		return {
 			name: dependency.name,
 			range: `^${release.latest}`
-		});
-	}
+		};
+	});
 	if (pins.length !== dependencies.length) throw new ScaffoldError("FETCH", "The release answer does not match the declaration set.");
 	return {
 		runtime: pins.slice(0, declared.runtime.length),
@@ -1140,6 +1124,60 @@ function releasesToPins(releases, declared) {
 	};
 }
 /**
+* Scans a shell command for the words and operators it splits into.
+*
+* @param script - The shell command text to split.
+* @returns The words and the `&&`, `||`, `;`, `|`, `&`, `(`, and `)` operators in command order, or
+* `undefined` when a quote is never closed or the command ends in a backslash.
+*
+* @remarks
+* Quotes group a word without hiding it and a backslash outside single quotes escapes the next
+* character, so the word value carries neither. A `$`, a backtick, or a `%` that no backslash
+* escapes and no single quote encloses marks its word unresolved, because a shell expansion
+* decides what the word names. Operators are always resolved.
+*
+* @example
+* ```ts
+* import { scanScriptTokens } from './helpers.js'
+*
+* scanScriptTokens('vitest run --project "src:core"')?.map((token) => token.value)
+* // ['vitest', 'run', '--project', 'src:core']
+* ```
+*/
+function scanScriptTokens(script) {
+	const matches = Array.from(script.matchAll(/(?<space>\s+)|(?<operator>&&|\|\||[;&|()])|(?<word>(?:[^\s;&|()"'\\]|\\[\s\S]|"(?:\\[\s\S]|[^"\\])*"|'[^']*')+)|[\s\S]/g), ({ groups }) => groups ?? {});
+	if (matches.some(({ space, operator, word }) => space === void 0 && operator === void 0 && word === void 0)) return;
+	return matches.flatMap(({ space, operator, word }) => {
+		if (space !== void 0) return [];
+		if (operator !== void 0) return [{
+			value: operator,
+			resolved: true
+		}];
+		const parts = Array.from((word ?? "").matchAll(/\\([\s\S])|"((?:\\[\s\S]|[^"\\])*)"|'([^']*)'|([\s\S])/g), ([, escaped, double, single, plain]) => {
+			if (escaped !== void 0) return {
+				text: escaped,
+				resolved: true
+			};
+			if (single !== void 0) return {
+				text: single,
+				resolved: true
+			};
+			if (double !== void 0) return {
+				text: double.replaceAll(/\\([\s\S])/g, "$1"),
+				resolved: Array.from(double.matchAll(/\\[\s\S]|[$`%]/g)).every((found) => found[0].startsWith("\\"))
+			};
+			return {
+				text: plain ?? "",
+				resolved: plain === void 0 || !"$`%".includes(plain)
+			};
+		});
+		return [{
+			value: parts.map((part) => part.text).join(""),
+			resolved: parts.every((part) => part.resolved)
+		}];
+	});
+}
+/**
 * Reads the literal Vitest projects, configuration paths, and npm run scripts a shell command names.
 *
 * @param script - The manifest script text to read.
@@ -1163,95 +1201,21 @@ function releasesToPins(releases, declared) {
 * ```
 */
 function scriptToInvocations(script, wrappers = /* @__PURE__ */ new Map()) {
-	const tokens = [];
-	let value = "";
-	let resolved = true;
-	let started = false;
-	let quote;
-	for (let index = 0; index < script.length; index += 1) {
-		const character = script[index];
-		if (character === void 0) return void 0;
-		if (quote === void 0) {
-			if (/\s/.test(character)) {
-				if (started) tokens.push({
-					value,
-					resolved
-				});
-				value = "";
-				resolved = true;
-				started = false;
-				continue;
-			}
-			if (";&|()".includes(character)) {
-				if (started) tokens.push({
-					value,
-					resolved
-				});
-				const paired = script[index + 1] === character && (character === "&" || character === "|");
-				tokens.push({
-					value: paired ? `${character}${character}` : character,
-					resolved: true
-				});
-				value = "";
-				resolved = true;
-				started = false;
-				if (paired) index += 1;
-				continue;
-			}
-			if (character === "\"" || character === "'") {
-				quote = character;
-				started = true;
-				continue;
-			}
-			if (character === "\\") {
-				const escaped = script[index + 1];
-				if (escaped === void 0) return void 0;
-				value += escaped;
-				started = true;
-				index += 1;
-				continue;
-			}
-			if (character === "$" || character === "`" || character === "%") resolved = false;
-			value += character;
-			started = true;
-			continue;
-		}
-		if (character === quote) {
-			quote = void 0;
-			continue;
-		}
-		if (character === "\\" && quote === "\"") {
-			const escaped = script[index + 1];
-			if (escaped === void 0) return void 0;
-			value += escaped;
-			index += 1;
-			continue;
-		}
-		if (quote === "\"" && (character === "$" || character === "`" || character === "%")) resolved = false;
-		value += character;
-		started = true;
-	}
-	if (quote !== void 0) return void 0;
-	if (started) tokens.push({
-		value,
-		resolved
-	});
-	const projects = [];
-	const configs = [];
-	const scripts = [];
+	const tokens = scanScriptTokens(script);
+	if (tokens === void 0) return void 0;
 	const configurations = new Map([...wrappers].map(([path, project]) => [normalize(path), project]));
-	let testing = false;
-	for (let index = 0; index < tokens.length; index += 1) {
-		const token = tokens[index];
-		if (token === void 0) return void 0;
-		if (index === 0 || [
+	const steps = [];
+	for (const [index, token] of tokens.entries()) {
+		const previous = steps.at(-1);
+		if (previous !== void 0 && index <= previous.through) continue;
+		const running = index === 0 || [
 			"&&",
 			"||",
 			";",
 			"|",
 			"&",
 			"("
-		].includes(tokens[index - 1]?.value ?? "")) testing = token.resolved && token.value === "vitest" && tokens[index + 1]?.value === "run";
+		].includes(tokens[index - 1]?.value ?? "") ? token.resolved && token.value === "vitest" && tokens[index + 1]?.value === "run" : previous?.running ?? false;
 		if (token.value === "npm" && tokens[index + 1]?.value === "run") {
 			const name = tokens[index + 2];
 			if (name === void 0 || !name.resolved || name.value.length === 0 || [
@@ -1263,8 +1227,13 @@ function scriptToInvocations(script, wrappers = /* @__PURE__ */ new Map()) {
 				"(",
 				")"
 			].includes(name.value)) return void 0;
-			scripts.push(name.value);
-			index += 2;
+			steps.push({
+				projects: [],
+				configs: [],
+				scripts: [name.value],
+				through: index + 2,
+				running
+			});
 			continue;
 		}
 		if (token.value === "--project" || token.value === "--config" || token.value === "-c") {
@@ -1278,28 +1247,88 @@ function scriptToInvocations(script, wrappers = /* @__PURE__ */ new Map()) {
 				"(",
 				")"
 			].includes(project.value)) return void 0;
-			const names = token.value === "--project" ? projects : configs;
-			names.push(project.value);
-			const face = testing && names === configs ? configurations.get(normalize(project.value)) : void 0;
-			if (face !== void 0) projects.push(face);
-			index += 1;
+			const named = token.value === "--project";
+			const face = running && !named ? configurations.get(normalize(project.value)) : void 0;
+			steps.push({
+				projects: [...named ? [project.value] : [], ...face === void 0 ? [] : [face]],
+				configs: named ? [] : [project.value],
+				scripts: [],
+				through: index + 1,
+				running
+			});
 			continue;
 		}
 		if (token.value.startsWith("--project=") || token.value.startsWith("--config=")) {
 			const project = token.value.slice(token.value.indexOf("=") + 1);
 			if (!token.resolved || project.length === 0) return void 0;
-			const names = token.value.startsWith("--project=") ? projects : configs;
-			names.push(project);
-			const face = testing && names === configs ? configurations.get(normalize(project)) : void 0;
-			if (face !== void 0) projects.push(face);
+			const named = token.value.startsWith("--project=");
+			const face = running && !named ? configurations.get(normalize(project)) : void 0;
+			steps.push({
+				projects: [...named ? [project] : [], ...face === void 0 ? [] : [face]],
+				configs: named ? [] : [project],
+				scripts: [],
+				through: index,
+				running
+			});
 			continue;
 		}
 		if (!token.resolved && /--project|--config/.test(token.value)) return void 0;
+		steps.push({
+			projects: [],
+			configs: [],
+			scripts: [],
+			through: index,
+			running
+		});
 	}
 	return {
-		projects,
-		configs,
-		scripts
+		projects: steps.flatMap(({ projects }) => projects),
+		configs: steps.flatMap(({ configs }) => configs),
+		scripts: steps.flatMap(({ scripts }) => scripts)
+	};
+}
+/**
+* Collects the scripts, Vitest projects, and unreadable scripts one gate reaches through `npm run`.
+*
+* @param gate - The script name the walk starts at.
+* @param scripts - The manifest's scripts by name; a value that is not a string names no command.
+* @param wrappers - Planned wrapper paths mapped to the face projects they run.
+* @returns The script names the walk visited, the Vitest projects those scripts name, and the
+* visited scripts whose command cannot be read literally.
+*
+* @remarks
+* The walk is breadth first and reads each script once, so a cycle ends where it closes. A script
+* the manifest does not declare as a string is visited and names nothing. The projects and the
+* unreadable names derive from one log of the reads, never from sets the walk fills.
+*
+* @example
+* ```ts
+* import { collectScriptChain } from './helpers.js'
+*
+* collectScriptChain('test', { test: 'npm run test:src', 'test:src': 'vitest run --project src:core' }, new Map())
+* // { visited: Set { 'test', 'test:src' }, projects: Set { 'src:core' }, unreadable: Set {} }
+* ```
+*/
+function collectScriptChain(gate, scripts, wrappers) {
+	const queue = [gate];
+	const visited = /* @__PURE__ */ new Set();
+	const reads = [];
+	for (const name of queue) {
+		if (visited.has(name)) continue;
+		visited.add(name);
+		const script = scripts[name];
+		if (!isString(script)) continue;
+		const invoked = scriptToInvocations(script, wrappers);
+		reads.push({
+			name,
+			invoked
+		});
+		for (const called of invoked?.scripts ?? []) if (!visited.has(called)) queue.push(called);
+	}
+	return {
+		visited,
+		projects: new Set(reads.flatMap(({ invoked }) => invoked?.projects ?? [])),
+		unreadable: new Set(reads.flatMap(({ name, invoked }) => invoked === void 0 ? [name] : []))
 	};
 }
 /**
@@ -1350,42 +1379,36 @@ function targetToFacts(target) {
 * @throws `ScaffoldError` when sheet markers name an invalid or case-colliding face, or the directory cannot be read.
 */
 function targetToExtensions(target) {
-	const extensions = [];
-	for (const name of FRAMEWORKS) {
+	const browsers = FRAMEWORKS.flatMap((name) => {
 		const axes = AXES.filter((axis) => {
 			const path = resolveContainedPath(target, `${axis}/${name}`);
 			return path !== void 0 && isPhysicalDirectory(path);
 		});
-		if (axes.length > 0) extensions.push({
+		return axes.length > 0 ? [{
 			surface: "browser",
 			name,
 			axes
-		});
-	}
+		}] : [];
+	});
 	const source = resolveContainedPath(target, "src");
-	if (source === void 0 || !isPhysicalDirectory(source)) return extensions;
+	if (source === void 0 || !isPhysicalDirectory(source)) return browsers;
 	const entries = readdirSync(source, { withFileTypes: true });
 	if (entries.length > MAX_INVENTORY_PATHS) throw new ScaffoldError("TARGET", "The source directory exceeds the inventory limit.");
-	const names = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const entry of entries) {
-		if (!entry.isDirectory() || RESERVED_SHEET_NAMES.includes(entry.name)) continue;
+	const faces = entries.filter((entry) => {
+		if (!entry.isDirectory() || RESERVED_SHEET_NAMES.includes(entry.name)) return false;
 		const sheet = resolveContainedPath(target, `src/${entry.name}/index.scss`);
 		const marker = resolveContainedPath(target, `src/${entry.name}/${SHEET_ENTRY_NAME}`);
-		if (sheet === void 0 || marker === void 0 || !isExactCaseFile(sheet) || !isExactCaseFile(marker)) continue;
-		const folded = entry.name.toLowerCase();
-		if (seen.has(folded)) throw new ScaffoldError("TARGET", `Case-colliding sheet face '${entry.name}'.`);
-		seen.add(folded);
-		names.push(entry.name);
-	}
-	for (const name of names.sort()) {
+		return sheet !== void 0 && marker !== void 0 && isExactCaseFile(sheet) && isExactCaseFile(marker);
+	});
+	const colliding = faces.find((face, index) => faces.findIndex((other) => other.name.toLowerCase() === face.name.toLowerCase()) < index);
+	if (colliding !== void 0) throw new ScaffoldError("TARGET", `Case-colliding sheet face '${colliding.name}'.`);
+	return [...browsers, ...faces.map((face) => face.name).sort().map((name) => {
 		if (!isSheetName(name)) throw new ScaffoldError("TARGET", `Invalid sheet face '${name}'.`);
-		extensions.push({
+		return {
 			surface: "styles",
 			name
-		});
-	}
-	return extensions;
+		};
+	})];
 }
 /**
 * Reads a creation extension list and assigns its selected browser axes.
@@ -1397,24 +1420,19 @@ function targetToExtensions(target) {
 */
 function selectionToExtensions(selection, axes, styles) {
 	if (selection === void 0) return [];
-	const extensions = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const entry of selection.split(",")) {
+	return selection.split(",").map((entry, index, entries) => {
 		const extension = parseExtension(entry);
-		if (extension === void 0 || seen.has(entry)) throw new UsageError(`'--extend' refuses '${entry}': use distinct supported surface:name entries.`);
-		seen.add(entry);
+		if (extension === void 0 || entries.indexOf(entry) < index) throw new UsageError(`'--extend' refuses '${entry}': use distinct supported surface:name entries.`);
 		if (extension.surface === "browser") {
 			if (axes.length === 0) throw new UsageError("A browser extension requires browser in --src or --app.");
-			extensions.push({
+			return {
 				...extension,
 				axes
-			});
-		} else {
-			if (!styles) throw new UsageError("A styles extension requires --styles.");
-			extensions.push(extension);
+			};
 		}
-	}
-	return extensions;
+		if (!styles) throw new UsageError("A styles extension requires --styles.");
+		return extension;
+	});
 }
 /**
 * Reads the packages a target's catalog table listed before this run.
@@ -1438,118 +1456,10 @@ function catalogToNames(target) {
 	const hex = isString(target) ? void 0 : target.bytes[CATALOG_AGENT_PATH];
 	const text = isString(target) ? readFileText(target, CATALOG_AGENT_PATH) : hex === void 0 ? void 0 : Buffer.from(hex, "hex").toString("utf8");
 	if (text === void 0) return [];
-	const names = [];
-	for (const table of createMarkdown(text).filter(isTableNode)) for (const row of table.rows) {
-		const [cell] = row;
-		if (cell === void 0) continue;
-		const name = cell.map(flattenText).join("").trim();
-		if (DEPENDENCY_NAME_PATTERN.test(name)) names.push(name);
-	}
-	return names;
-}
-/**
-* Collects the complete NUL-delimited records from one raw git output chunk.
-*
-* @param records - The complete records retained in arrival order.
-* @param pending - The mutable cell carrying the unfinished record between chunks.
-* @param decoder - The streaming UTF-8 decoder shared by the query.
-* @param controller - The query controller aborted on a bound refusal.
-* @param target - The repository the query addresses.
-* @param chunk - The next owned output bytes.
-* @returns Nothing.
-*/
-function collectGitRecords(records, pending, decoder, controller, target, chunk) {
-	if (controller.signal.aborted) return;
-	const parts = `${pending[0] ?? ""}${decoder.decode(chunk, { stream: true })}`.split("\0");
-	pending[0] = parts.pop() ?? "";
-	for (const record of parts) {
-		if (record.length === 0) continue;
-		if (records.length >= MAX_INVENTORY_PATHS) {
-			refuseGitRecords(controller, target, `The git query for target at ${target} exceeded the working-tree inventory limit.`);
-			return;
-		}
-		records.push(record);
-	}
-	if ((pending[0] ?? "").length > MAX_PATH_LENGTH + 3) refuseGitRecords(controller, target, `The git query for target at ${target} returned an unfinished record beyond the supported path limit.`);
-}
-/**
-* Aborts a git query with its first target refusal.
-*
-* @param controller - The query controller whose reason retains the refusal.
-* @param target - The repository the query addresses.
-* @param message - The refusal message.
-* @returns Nothing.
-*/
-function refuseGitRecords(controller, target, message) {
-	if (!controller.signal.aborted) controller.abort(new ScaffoldError("TARGET", message, { target }));
-}
-/**
-* Reads one git query as its NUL-separated records.
-*
-* @param target - The repository the query runs in.
-* @param args - The git arguments, without the program name.
-* @returns The non-empty records git wrote, in git's own order.
-* @throws `ScaffoldError('TARGET', …)` when the query fails or its output is
-* incomplete or outside the working-tree inventory bounds.
-*
-* @remarks
-* Git is asked rather than reimplemented, because the tracked set and the dirty
-* set are git's own answers and nothing else can give them. The raw session
-* streams complete NUL-delimited records without retaining the whole query as a
-* manifest-sized text buffer. Its initial hooks are installed before the eager
-* spawn, so no output or child fault can precede its observer.
-*
-* @example
-* ```ts
-* import { readGitRecords } from './helpers.js'
-*
-* await readGitRecords('./packages/router', ['ls-files', '-z']) // ['package.json', 'src/core/index.ts']
-* ```
-*/
-async function readGitRecords(target, args) {
-	const records = [];
-	const pending = [""];
-	const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
-	const controller = new AbortController();
-	let session;
-	try {
-		session = createSession({
-			command: {
-				file: "git",
-				arguments: [
-					"-C",
-					target,
-					...args
-				]
-			},
-			workspace: ".",
-			signal: controller.signal,
-			on: {
-				stdout: collectGitRecords.bind(void 0, records, pending, decoder, controller, target),
-				error: refuseGitRecords.bind(void 0, controller, target, `The git query for target at ${target} failed before it completed.`)
-			},
-			error: refuseGitRecords.bind(void 0, controller, target, `The git query for target at ${target} failed while reading its output.`)
-		});
-		const exit = await session.exit;
-		pending[0] = `${pending[0] ?? ""}${decoder.decode()}`;
-		if (controller.signal.aborted) throw controller.signal.reason;
-		if (exit.signal !== null) throw new ScaffoldError("TARGET", `The git query for target at ${target} ended from signal ${exit.signal}.`, {
-			target,
-			signal: exit.signal
-		});
-		if (exit.code !== 0) throw new ScaffoldError("TARGET", `The git query for target at ${target} failed with exit code ${String(exit.code)}.`, {
-			target,
-			code: exit.code
-		});
-		if (!exit.drained) throw new ScaffoldError("TARGET", `The git query for target at ${target} ended before its output drained.`, { target });
-		if ((pending[0] ?? "").length > 0) throw new ScaffoldError("TARGET", `The git query for target at ${target} returned an incomplete record.`, { target });
-		return records;
-	} catch (error) {
-		if (isScaffoldError(error)) throw error;
-		throw new ScaffoldError("TARGET", `The git query for target at ${target} could not start.`, { target });
-	} finally {
-		if (session !== void 0) await session.destroy();
-	}
+	return createMarkdown(text).filter(isTableNode).flatMap((table) => table.rows.flatMap(([cell]) => {
+		const name = cell?.map(flattenText).join("").trim();
+		return name !== void 0 && DEPENDENCY_NAME_PATTERN.test(name) ? [name] : [];
+	}));
 }
 /**
 * Reads the environments a comma-separated selection names.
@@ -1665,6 +1575,158 @@ function mergeResults(first, second) {
 function resultToTally(result) {
 	return `${String(result.written.length)} written, ${String(result.skipped.length)} unchanged, ${String(result.removed.length)} removed in ${result.target}.`;
 }
+/**
+* Splits decoded git output into its complete records and its unfinished tail.
+*
+* @param text - The decoded output, led by the tail the previous chunk left.
+* @returns The non-empty records ended by a NUL, and the text after the last NUL.
+*
+* @example
+* ```ts
+* import { splitGitRecords } from './helpers.js'
+*
+* splitGitRecords('alpha\0\0br') // { records: ['alpha'], pending: 'br' }
+* ```
+*/
+function splitGitRecords(text) {
+	const parts = text.split("\0");
+	return {
+		records: parts.slice(0, -1).filter((record) => record.length > 0),
+		pending: parts.at(-1) ?? ""
+	};
+}
+/**
+* Finds the refusal one git output chunk earns.
+*
+* @param target - The repository the query runs in.
+* @param count - The records collected before the chunk.
+* @param chunk - The next split output.
+* @returns The inventory message when the records pass the working-tree inventory limit, else the
+* unfinished-record message when the tail passes the supported path limit, else `undefined`.
+*
+* @example
+* ```ts
+* import { findGitRefusal } from './helpers.js'
+*
+* findGitRefusal('./packages/router', 0, { records: ['package.json'], pending: '' }) // undefined
+* ```
+*/
+function findGitRefusal(target, count, chunk) {
+	if (count + chunk.records.length > MAX_INVENTORY_PATHS) return `The git query for target at ${target} exceeded the working-tree inventory limit.`;
+	return chunk.pending.length > MAX_PATH_LENGTH + 3 ? `The git query for target at ${target} returned an unfinished record beyond the supported path limit.` : void 0;
+}
+//#endregion
+//#region src/bin/GitQuery.ts
+/**
+* Represents one git query read as its NUL-separated records.
+*
+* @remarks
+* Git is asked rather than reimplemented, because the tracked set and the dirty set are git's own
+* answers and nothing else can give them. The raw session streams complete NUL-delimited records
+* without retaining the whole query as a manifest-sized text buffer. Its hooks are installed
+* before the eager spawn, so no output or child fault can precede its observer.
+*
+* A query is created for one run: the unfinished record, the retained records, and the abort
+* signal all belong to that run, and a second `read` is refused rather than reset. Only `read`
+* drives the intake, so no caller feeds a run its output.
+*
+* @example
+* ```ts
+* import { GitQuery } from './GitQuery.js'
+*
+* await new GitQuery('./packages/router', ['ls-files', '-z']).read()
+* // ['package.json', 'src/core/index.ts']
+* ```
+*/
+var GitQuery = class {
+	#target;
+	#args;
+	#records = [];
+	#decoder = new TextDecoder("utf-8", { ignoreBOM: true });
+	#controller = new AbortController();
+	#pending = "";
+	#started = false;
+	/**
+	* Creates a query over one repository.
+	*
+	* @param target - The repository the query runs in.
+	* @param args - The git arguments, without the program name.
+	*/
+	constructor(target, args) {
+		this.#target = target;
+		this.#args = [...args];
+	}
+	/**
+	* Runs the query and reads its records.
+	*
+	* @returns The non-empty records git wrote, in git's own order.
+	* @throws {@link ScaffoldError} coded `TARGET` when the query fails, cannot start, or its output
+	* is incomplete or outside the working-tree inventory bounds, and `INVALID` when the query
+	* already ran.
+	*/
+	async read() {
+		if (this.#started) throw new ScaffoldError("INVALID", "A git query reads once.");
+		this.#started = true;
+		const target = this.#target;
+		const created = attempt(() => createSession({
+			command: {
+				file: "git",
+				arguments: [
+					"-C",
+					target,
+					...this.#args
+				]
+			},
+			workspace: ".",
+			signal: this.#controller.signal,
+			on: {
+				stdout: (chunk) => this.#collect(chunk),
+				error: () => this.#refuse(`The git query for target at ${target} failed before it completed.`)
+			},
+			error: () => this.#refuse(`The git query for target at ${target} failed while reading its output.`)
+		}));
+		if (!created.success) {
+			if (isScaffoldError(created.error)) throw created.error;
+			throw new ScaffoldError("TARGET", `The git query for target at ${target} could not start.`, { target });
+		}
+		const session = created.value;
+		try {
+			const exit = await session.exit;
+			this.#pending = `${this.#pending}${this.#decoder.decode()}`;
+			if (this.#controller.signal.aborted) throw this.#controller.signal.reason;
+			if (exit.signal !== null) throw new ScaffoldError("TARGET", `The git query for target at ${target} ended from signal ${exit.signal}.`, {
+				target,
+				signal: exit.signal
+			});
+			if (exit.code !== 0) throw new ScaffoldError("TARGET", `The git query for target at ${target} failed with exit code ${String(exit.code)}.`, {
+				target,
+				code: exit.code
+			});
+			if (!exit.drained) throw new ScaffoldError("TARGET", `The git query for target at ${target} ended before its output drained.`, { target });
+			if (this.#pending.length > 0) throw new ScaffoldError("TARGET", `The git query for target at ${target} returned an incomplete record.`, { target });
+			return [...this.#records];
+		} catch (error) {
+			if (isScaffoldError(error)) throw error;
+			throw new ScaffoldError("TARGET", `The git query for target at ${target} could not start.`, { target });
+		} finally {
+			await session.destroy();
+		}
+	}
+	#collect(bytes) {
+		if (this.#controller.signal.aborted) return;
+		const chunk = splitGitRecords(`${this.#pending}${this.#decoder.decode(bytes, { stream: true })}`);
+		const refusal = findGitRefusal(this.#target, this.#records.length, chunk);
+		if (refusal !== void 0) {
+			this.#refuse(refusal);
+			return;
+		}
+		for (const record of chunk.records) this.#records.push(record);
+		this.#pending = chunk.pending;
+	}
+	#refuse(message) {
+		if (!this.#controller.signal.aborted) this.#controller.abort(new ScaffoldError("TARGET", message, { target: this.#target }));
+	}
+};
 //#endregion
 //#region src/bin/CLI.ts
 /**
@@ -1904,50 +1966,50 @@ var CLI = class {
 		const previous = catalogToNames(target);
 		const floor = host === void 0 ? readHostFloor() : readHostManifest(host) === void 0 ? host : readHostFloor(host);
 		const materializer = new Materializer({ host: floor });
-		let outcome;
+		const outcome = await this.#assemble(command, target, floor, materializer, previous);
+		if (command.json === true) this.#report(outcome);
+		else this.#recount(outcome);
+		return outcome.membership === void 0 || outcome.provenance.guides === "floor" ? 1 : 0;
+	}
+	async #assemble(command, target, floor, materializer, previous) {
 		try {
 			const fetched = await this.#fetch(target, command.all === true, floor);
 			const guides = fetched.mirrors.length === 0 ? void 0 : fetched.mirrors.some((mirror) => mirror.lookup !== "found") ? "floor" : "live";
-			if (fetched.entries === void 0) outcome = {
+			if (fetched.entries === void 0) return {
 				...materializer.mirror(fetched.mirrors, target),
 				mirrors: fetched.mirrors,
 				provenance: { ...guides === void 0 ? {} : { guides } },
 				...fetched.note === void 0 ? {} : { note: fetched.note }
 			};
-			else {
-				const entries = fetched.entries;
-				const declarations = manifestToDependencies(this.#manifest(target));
-				const writable = {
-					runtime: dependenciesToFleet(declarations.runtime),
-					development: dependenciesToFleet(declarations.development)
-				};
-				const releases = entriesToReleases([...writable.runtime, ...writable.development], fetched.entries);
-				const pins = releasesToPins(releases, writable);
-				const refusal = fetchToRefusal(fetched.entries, fetched.mirrors);
-				if (refusal !== void 0) throw refusal;
-				outcome = {
-					...mergeResults(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare({
-						pins,
-						scripts: []
-					}, target)),
-					membership: {
-						entries,
-						dropped: previous.filter((name) => !entries.some((entry) => entry.name === name)),
-						releases
-					},
-					mirrors: fetched.mirrors,
-					provenance: {
-						versions: "live",
-						...guides === void 0 ? {} : { guides }
-					}
-				};
-			}
+			const entries = fetched.entries;
+			const declarations = manifestToDependencies(this.#manifest(target));
+			const writable = {
+				runtime: dependenciesToFleet(declarations.runtime),
+				development: dependenciesToFleet(declarations.development)
+			};
+			const releases = entriesToReleases([...writable.runtime, ...writable.development], fetched.entries);
+			const pins = releasesToPins(releases, writable);
+			const refusal = fetchToRefusal(fetched.entries, fetched.mirrors);
+			if (refusal !== void 0) throw refusal;
+			return {
+				...mergeResults(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare({
+					pins,
+					scripts: []
+				}, target)),
+				membership: {
+					entries,
+					dropped: previous.filter((name) => !entries.some((entry) => entry.name === name)),
+					releases
+				},
+				mirrors: fetched.mirrors,
+				provenance: {
+					versions: "live",
+					...guides === void 0 ? {} : { guides }
+				}
+			};
 		} finally {
 			materializer.destroy();
 		}
-		if (command.json === true) this.#report(outcome);
-		else this.#recount(outcome);
-		return outcome.membership === void 0 || outcome.provenance.guides === "floor" ? 1 : 0;
 	}
 	async #replace(command) {
 		const target = command.target ?? ".";
@@ -2047,15 +2109,18 @@ var CLI = class {
 	}
 	async #reconcile(materializer, target, declared, host, hostForced, blueprint) {
 		const previous = catalogToNames(target);
-		let releases = [];
-		let provenance = { ...host === void 0 ? {} : { host } };
 		try {
 			const versions = await this.#versions(declared.pins, false, blueprint);
-			releases = versions.releases;
-			provenance = {
-				...versions.baseline === void 0 ? {} : { versions: versions.baseline },
-				...host === void 0 ? {} : { host }
-			};
+			return await this.#confirm(materializer, target, declared, {
+				baseline: host,
+				forced: hostForced
+			}, versions, previous);
+		} catch (error) {
+			return this.#unfinished(target, [], { ...host === void 0 ? {} : { host } }, error);
+		}
+	}
+	async #confirm(materializer, target, declared, host, versions, previous) {
+		try {
 			const refused = versionsToRefusal(versions);
 			if (refused !== void 0) throw refused;
 			const fetched = await this.#fetch(target, false);
@@ -2064,44 +2129,53 @@ var CLI = class {
 			const incomplete = fetchToRefusal(fetched.entries, fetched.mirrors);
 			if (incomplete !== void 0) throw incomplete;
 			const guides = fetched.mirrors.length === 0 ? void 0 : fetched.mirrors.some((mirror) => mirror.lookup === "failed") ? "floor" : "live";
-			provenance = {
+			const provenance = {
 				...versions.baseline === void 0 ? {} : { versions: versions.baseline },
 				...guides === void 0 ? {} : { guides },
-				...host === void 0 ? {} : { host }
-			};
-			const written = mergeResults(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare({
-				...declared,
-				pins: versions.pins
-			}, target));
-			const floors = [];
-			if (hostForced) floors.push("host");
-			if (versions.forced) floors.push("versions");
-			if (guides === "floor") floors.push("guides");
-			return {
-				...written,
-				membership: {
-					entries,
-					dropped: previous.filter((name) => !entries.some((entry) => entry.name === name)),
-					releases: entriesToReleases([...dependenciesToFleet(declared.pins.runtime), ...dependenciesToFleet(declared.pins.development)], entries)
-				},
-				mirrors: fetched.mirrors,
-				releases,
-				provenance,
-				...floors.length === 0 ? {} : { note: `The ${floors.join(", ")} step used the distributed floor after its upstream read did not complete.` }
+				...host.baseline === void 0 ? {} : { host: host.baseline }
 			};
+			const landed = attempt(() => {
+				const written = mergeResults(this.#publish(materializer, target, entries, fetched.mirrors), materializer.declare({
+					...declared,
+					pins: versions.pins
+				}, target));
+				const floors = [];
+				if (host.forced) floors.push("host");
+				if (versions.forced) floors.push("versions");
+				if (guides === "floor") floors.push("guides");
+				return {
+					...written,
+					membership: {
+						entries,
+						dropped: previous.filter((name) => !entries.some((entry) => entry.name === name)),
+						releases: entriesToReleases([...dependenciesToFleet(declared.pins.runtime), ...dependenciesToFleet(declared.pins.development)], entries)
+					},
+					mirrors: fetched.mirrors,
+					releases: versions.releases,
+					provenance,
+					...floors.length === 0 ? {} : { note: `The ${floors.join(", ")} step used the distributed floor after its upstream read did not complete.` }
+				};
+			});
+			return landed.success ? landed.value : this.#unfinished(target, versions.releases, provenance, landed.error);
 		} catch (error) {
-			return {
-				target,
-				written: [],
-				skipped: [],
-				removed: [],
-				mirrors: [],
-				releases,
-				provenance,
-				note: `The catalog step did not complete: ${errorToEnvelope(error).error.message}`
-			};
+			return this.#unfinished(target, versions.releases, {
+				...versions.baseline === void 0 ? {} : { versions: versions.baseline },
+				...host.baseline === void 0 ? {} : { host: host.baseline }
+			}, error);
 		}
 	}
+	#unfinished(target, releases, provenance, error) {
+		return {
+			target,
+			written: [],
+			skipped: [],
+			removed: [],
+			mirrors: [],
+			releases,
+			provenance,
+			note: `The catalog step did not complete: ${errorToEnvelope(error).error.message}`
+		};
+	}
 	async #host(from, target, offline) {
 		if (from !== void 0) return {
 			materializer: new Materializer({ host: from }),
@@ -2264,14 +2338,10 @@ var CLI = class {
 		].map((dependency) => dependency.name))];
 		const upstream = new Upstream(this.#upstream);
 		try {
-			let entries;
-			let note;
-			try {
-				entries = await upstream.catalog();
-			} catch (error) {
+			const { entries, note } = await upstream.catalog().then((entries) => ({ entries }), (error) => {
 				if (floor === void 0) throw error;
-				note = `The catalog membership read did not complete; performed a guide-only refresh: ${errorToEnvelope(error).error.message}`;
-			}
+				return { note: `The catalog membership read did not complete; performed a guide-only refresh: ${errorToEnvelope(error).error.message}` };
+			});
 			const names = (all ? entries === void 0 ? catalogToNames(floor ?? target) : entries.map((entry) => entry.name) : declared).filter((name) => name !== own);
 			const mirrors = await upstream.fetch(names, readSnapshot(target, names.map(nameToGuide)));
 			return {
@@ -2323,12 +2393,18 @@ var CLI = class {
 		const global = resolveContainedPath(target, GLOBAL_SETUP_PATH);
 		const journey = resolveContainedPath(target, JOURNEY_CONFIG_PATH);
 		const skills = resolveContainedPath(target, SKILLS_CONFIG_PATH);
-		const setup = /* @__PURE__ */ new Set();
-		if (tests !== void 0) for (const path of listFiles(tests)) {
-			if (path.includes("/") || !path.startsWith("setup") || !path.endsWith(".test.ts")) continue;
+		const files = tests === void 0 ? [] : listFiles(tests);
+		const studies = files.some((path) => {
+			if (tests === void 0 || !path.startsWith("studies/") || !path.endsWith(".test.ts")) return false;
+			if (path.split("/").some((segment) => segment === "node_modules" || segment === ".git")) return false;
+			const study = resolveContainedPath(tests, path);
+			return study !== void 0 && isExactCaseFile(study);
+		});
+		const setup = new Set(files.flatMap((path) => {
+			if (tests === void 0 || path.includes("/") || !path.startsWith("setup") || !path.endsWith(".test.ts")) return [];
 			const proof = resolveContainedPath(tests, path);
-			if (proof !== void 0 && isExactCaseFile(proof)) setup.add(path === "setupBrowser.test.ts" || path === "setupStyles.test.ts" ? "browser" : "node");
-		}
+			return proof !== void 0 && isExactCaseFile(proof) ? [path === "setupBrowser.test.ts" || path === "setupStyles.test.ts" ? "browser" : "node"] : [];
+		}));
 		return createBlueprint(declared.slice(declared.lastIndexOf("/") + 1), {
 			...targetToFacts(target),
 			extensions: targetToExtensions(target),
@@ -2341,6 +2417,7 @@ var CLI = class {
 			integration: integration !== void 0 && isExactCaseFile(integration),
 			conformance: conformance !== void 0 && isExactCaseFile(conformance),
 			service: service !== void 0 && isExactCaseFile(service),
+			studies,
 			global: global !== void 0 && isExactCaseFile(global),
 			journey: journey !== void 0 && isExactCaseFile(journey),
 			skills: skills !== void 0 && isExactCaseFile(skills)
@@ -2355,18 +2432,9 @@ var CLI = class {
 		const scripts = isRecord(parsed) && isRecord(parsed.scripts) ? parsed.scripts : {};
 		const gates = !isRecord(parsed) || parsed.private !== true ? ["test", "prepublishOnly"] : ["test"];
 		const gateNames = gates.join(" or ");
-		const absent = /* @__PURE__ */ new Set();
-		let unresolved = false;
-		for (const script of Object.values(scripts)) {
-			if (!isString(script) || !script.includes("vitest")) continue;
-			const invoked = scriptToInvocations(script);
-			if (invoked === void 0) {
-				unresolved = true;
-				continue;
-			}
-			for (const project of invoked.projects) if (!planned.has(project)) absent.add(project);
-		}
-		const projects = [...absent].sort();
+		const readings = Object.values(scripts).filter((script) => isString(script) && script.includes("vitest")).map((script) => scriptToInvocations(script));
+		const unresolved = readings.some((invocations) => invocations === void 0);
+		const projects = [...new Set(readings.flatMap((invocations) => invocations?.projects ?? []).filter((project) => !planned.has(project)))].sort();
 		if (unresolved) return {
 			field: "projects",
 			message: `The manifest at ${target} contains a Vitest project expression that cannot be resolved statically.${projects.length === 0 ? "" : ` It also names projects the planned vite.config.ts does not register: ${projects.join(", ")}.`} ${writing ? "The configs group is blocked. Replace the expression with a literal --project value before selecting configs, or exclude configs from --groups." : "Replace it with a literal --project value before relying on the planned configuration."}`,
@@ -2381,17 +2449,13 @@ var CLI = class {
 		};
 		if (!writing) {
 			const paths = new Set(blueprintToConfigArtifacts(blueprint).map((artifact) => resolveContainedPath(target, artifact.path)));
-			const configurations = [];
-			for (const [name, script] of Object.entries(scripts)) {
-				if (!name.startsWith("test:") || !isString(script) || !script.includes("vitest")) continue;
-				const invoked = scriptToInvocations(script);
-				if (invoked === void 0) continue;
-				for (const config of invoked.configs) {
+			const configurations = Object.entries(scripts).flatMap(([name, script]) => {
+				if (!name.startsWith("test:") || !isString(script) || !script.includes("vitest")) return [];
+				return (scriptToInvocations(script)?.configs ?? []).flatMap((config) => {
 					const path = resolveContainedPath(target, config);
-					if (path !== void 0 && (paths.has(path) || isExactCaseFile(path))) continue;
-					configurations.push(`${name} --config ${config}`);
-				}
-			}
+					return path !== void 0 && (paths.has(path) || isExactCaseFile(path)) ? [] : [`${name} --config ${config}`];
+				});
+			});
 			if (configurations.length > 0) return {
 				field: "projects",
 				message: `The manifest at ${target} names a Vitest configuration the plan does not emit and the target does not hold: ${configurations.join(", ")}. Add the configuration, or remove the script that names it and its invocation from the test chain.`,
@@ -2400,48 +2464,23 @@ var CLI = class {
 			};
 		}
 		const expected = blueprintToScripts(blueprint);
-		const expectedLines = /* @__PURE__ */ new Map();
-		for (const [name, script] of Object.entries(expected)) {
-			if (!name.startsWith("test:")) continue;
-			const invoked = scriptToInvocations(script);
-			if (invoked === void 0) continue;
-			for (const project of invoked.projects) {
-				if (project === "probe") continue;
+		const expectedLines = new Map(Object.entries(expected).flatMap(([name, script]) => {
+			if (!name.startsWith("test:")) return [];
+			return (scriptToInvocations(script)?.projects ?? []).flatMap((project) => {
 				const direct = `test:${project}`;
 				const command = expected[direct];
-				if (command !== void 0) expectedLines.set(project, `"${direct}": ${JSON.stringify(command)},`);
-			}
-		}
+				return project === "probe" || command === void 0 ? [] : [[project, `"${direct}": ${JSON.stringify(command)},`]];
+			});
+		}));
 		const faces = /* @__PURE__ */ new Set([...blueprintToSheets(blueprint).map((name) => `src:${name}`), ...blueprintToFaces(blueprint).flatMap(({ name, axes }) => axes.map((axis) => `${axis}:${name}`))]);
-		const wrappers = /* @__PURE__ */ new Map();
-		for (const artifact of blueprintToConfigArtifacts(blueprint)) {
+		const wrappers = new Map(blueprintToConfigArtifacts(blueprint).flatMap((artifact) => {
 			const match = /^configs\/(src|app)\/vite\.([^.]+)\.config\.ts$/u.exec(artifact.path);
-			if (match === null) continue;
-			const project = `${match[1]}:${match[2]}`;
-			if (faces.has(project)) wrappers.set(artifact.path, project);
-		}
-		const reachable = /* @__PURE__ */ new Set();
-		const chains = /* @__PURE__ */ new Map();
-		for (const gate of gates) {
-			const visited = /* @__PURE__ */ new Set();
-			chains.set(gate, visited);
-			const pending = [gate];
-			while (pending.length > 0) {
-				const name = pending.shift();
-				if (name === void 0 || visited.has(name)) continue;
-				visited.add(name);
-				const script = scripts[name];
-				if (!isString(script)) continue;
-				const invoked = scriptToInvocations(script, wrappers);
-				if (invoked === void 0) {
-					unresolved = true;
-					continue;
-				}
-				for (const project of invoked.projects) reachable.add(project);
-				for (const called of invoked.scripts) if (!visited.has(called)) pending.push(called);
-			}
-		}
-		if (unresolved) return {
+			const project = match === null ? void 0 : `${match[1]}:${match[2]}`;
+			return project !== void 0 && faces.has(project) ? [[artifact.path, project]] : [];
+		}));
+		const chains = new Map(gates.map((gate) => [gate, collectScriptChain(gate, scripts, wrappers)]));
+		const reachable = new Set([...chains.values()].flatMap((chain) => [...chain.projects]));
+		if (new Set([...chains.values()].flatMap((chain) => [...chain.unreadable])).size > 0) return {
 			field: "projects",
 			message: `The manifest at ${target} contains a ${gateNames} chain that cannot be resolved statically. ${writing ? "The configs group is blocked. Replace it with literal npm run script names before selecting configs, or exclude configs from --groups." : "Replace it with literal npm run script names before relying on the planned configuration."}`,
 			blocking: false,
@@ -2449,7 +2488,7 @@ var CLI = class {
 		};
 		const ungated = [...expectedLines].filter(([project]) => !reachable.has(project)).sort(([left], [right]) => left.localeCompare(right)).filter(([project]) => isString(scripts[`test:${project}`]));
 		if (ungated.length === 0) {
-			if (!writing && expected["test:journey"] !== void 0 && !chains.get("test")?.has("test:journey")) return {
+			if (!writing && expected["test:journey"] !== void 0 && !chains.get("test")?.visited.has("test:journey")) return {
 				field: "projects",
 				message: `The manifest at ${target} does not invoke npm run test:journey from its test chain. Add npm run test:journey after npm run test:app.`,
 				blocking: false,
@@ -2643,13 +2682,13 @@ var CLI = class {
 		return manifest;
 	}
 	async #worktree(target) {
-		const tracked = await readGitRecords(target, ["ls-files", "-z"]);
-		const dirty = (await readGitRecords(target, [
+		const tracked = await new GitQuery(target, ["ls-files", "-z"]).read();
+		const dirty = (await new GitQuery(target, [
 			"status",
 			"--porcelain=v1",
 			"--untracked-files=all",
 			"-z"
-		])).map((record) => record.length > 3 && record[2] === " " ? record.slice(3) : record);
+		]).read()).map((record) => record.length > 3 && record[2] === " " ? record.slice(3) : record);
 		const state = {
 			tracked,
 			dirty