@orkestrel/scaffold 0.0.88 → 0.0.90

package/dist/host/agents/skills/orkestrel-harden/scripts/discovery.ts

@@ -1,17 +1,23 @@
-// Census of test discovery: which projects the gates reach, what each collects, and where a suite
-// skips. Run from the checkout root:
+// Let Vitest select each gate's tests, then compare its identities with each config/mode universe.
+// Run from the checkout root:
 //   node .agents/skills/orkestrel-harden/scripts/discovery.ts [--config vite.config.ts] [--projects a,b] [--json]
-// The script follows every root script chain in package.json (a script no other script invokes) to
-// the `--project` names its Vitest scripts gate and the test files its `node` scripts run, runs
-// `vitest list --json` once through the local vitest entry to read what each project collects, and
-// reads every collected file for `.skip(`, `.todo(`, `.skipIf(`, `.runIf(`, `retry:`, and
-// `timeout:`. It flags a collected project no root chain reaches, a named project that collects
-// nothing, and a test file under tests/ that no project collects and no root script runs directly.
-// A project with no test file and no gate is outside the census. Exit 0 with no flag, 3 with one, 2 when Vitest cannot list, 64 on
-// usage.
+// Follow root npm script chains and forwarded arguments. Collect an unfiltered full listing for
+// each config/mode/root/dir, including the base config. Pass gate arguments verbatim except the
+// reporter, output-file, coverage, color, cache, silent, UI, watch, run-mode, inspector, and
+// standalone options;
+// use filesOnly for file selection and full collection for name, tag, line, and shard selection.
+// Compare file/project/name/line/column identities without renaming projects. With --projects,
+// ask Vitest for the reporting scope. Preserve duplicate names within a listing and merge across units.
+// Ignore bench, list, mergeReports, listTags, and clearCache invocations as gates. Flag partly ungated rows, empty chained projects,
+// and undiscovered files under tests/. Report marker counts and empty standalone workbenches.
+// Retry when test files change during collection; refuse another change during that retry.
+// Exit 0 with no flag, 3 with a flag, 2 for missing Vitest, unsupported related commands,
+// CLI/help/argument/listing/output failures, repeated test-file changes, or filesystem/JSON errors;
+// exit 64 on usage.
 import { spawnSync } from 'node:child_process'
-import { existsSync, readFileSync } from 'node:fs'
-import { relative, resolve } from 'node:path'
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { basename, join, relative, resolve } from 'node:path'
 import {
 	listFiles,
 	readMissingFlags,
@@ -20,22 +26,74 @@ import {
 
 const VITEST = 'node_modules/vitest/vitest.mjs'
 const MARKERS: readonly string[] = ['.skip(', '.todo(', '.skipIf(', '.runIf(', 'retry:', 'timeout:']
+const OMITTED = new Set([
+	'reporter',
+	'outputFile',
+	'coverage',
+	'color',
+	'cache',
+	'silent',
+	'ui',
+	'watch',
+	'run',
+	'inspect',
+	'inspectBrk',
+	'standalone',
+])
+// Bounds one listing, so an option that waits for input exits 2 naming its gate instead of
+// hanging the census.
+const LISTING_TIMEOUT = 600_000
+
+interface Option {
+	readonly name: string
+	readonly argument: string | undefined
+}
 
 interface Collected {
 	readonly file: string
 	readonly projectName: string
+	readonly name: string | undefined
+	readonly line: number | undefined
+	readonly column: number | undefined
+	readonly gate?: string | undefined
 }
 
 interface Gates {
-	readonly projects: ReadonlyMap<string, string>
+	readonly units: readonly Gate[]
 	readonly files: ReadonlyMap<string, string>
 }
 
+interface Unit {
+	readonly config: string | undefined
+	readonly mode: string | undefined
+	readonly root?: string | undefined
+	readonly dir?: string | undefined
+}
+
+interface Gate extends Unit {
+	readonly projects: readonly string[]
+	readonly chain: string
+	readonly args: readonly string[]
+	readonly full: boolean
+}
+
+interface Listing extends Unit {
+	readonly collected: readonly Collected[]
+	readonly empty: readonly string[]
+}
+
+interface Invocation {
+	readonly name: string
+	readonly args: readonly string[]
+	readonly ancestors: readonly string[]
+}
+
 interface Project {
 	readonly name: string
 	readonly gate: string | undefined
 	readonly files: number
 	readonly tests: number
+	readonly units?: readonly Unit[]
 }
 
 interface Census {
@@ -44,6 +102,110 @@ interface Census {
 	readonly markers: Readonly<Record<string, number>>
 }
 
+function readCLIOptions(): ReadonlyMap<string, Option> {
+	const help = spawnSync(process.execPath, [VITEST, 'list', '--help', '--expand-help'], {
+		encoding: 'utf8',
+		windowsHide: true,
+	})
+	if (help.status !== 0) throw new Error(help.stderr || 'Cannot read Vitest CLI options')
+	const options = new Map<string, Option>()
+	for (const line of help.stdout.split(/\r\n|\n/u)) {
+		const match = /^\s+(?:(-\w), )?--([\w.-]+)(?: ([<[][^\n]*?[>\]]))?\s{2}/u.exec(line)
+		const name = match?.[2]
+		if (name === undefined) continue
+		const option = { name: name.replace(/^no-/u, ''), argument: match?.[3] }
+		options.set(`--${name}`, option)
+		if (name.startsWith('no-')) options.set(`--${name.slice(3)}`, option)
+		options.set(`--${name.replace(/[A-Z]/gu, (letter) => `-${letter.toLowerCase()}`)}`, option)
+		if (match?.[1] !== undefined) options.set(match[1], option)
+	}
+	return options
+}
+
+function findRunner(command: readonly string[]): number {
+	let index = 0
+	const executable = basename(command[0] ?? '').replace(/\.(?:exe|cmd)$/u, '')
+	if (executable === 'npm') {
+		if (command[1] !== 'exec') return -1
+		index = 2
+	} else if (executable === 'node' || executable === 'npx') index = 1
+	if (index > 0) {
+		while (command[index]?.startsWith('-')) {
+			const option = command[index]
+			if (['-e', '--eval', '-p', '--print', '-c', '--check'].includes(option ?? '')) return -1
+			index += [
+				'-r',
+				'--require',
+				'--import',
+				'--loader',
+				'--experimental-loader',
+				'--max-old-space-size',
+				'--max_old_space_size',
+				'-p',
+				'--package',
+			].includes(option ?? '')
+				? 2
+				: 1
+		}
+	}
+	return ['vitest', 'vitest.mjs', 'vitest.js'].includes(
+		basename(command[index] ?? '').replace(/\.cmd$/u, ''),
+	)
+		? index
+		: -1
+}
+
+function readSelection(
+	argv: readonly string[],
+	options: ReadonlyMap<string, Option>,
+): readonly string[] {
+	const selected: string[] = []
+	for (let index = 0; index < argv.length; index++) {
+		const token = argv[index]
+		if (token === undefined) continue
+		if (token === '--') {
+			selected.push(...argv.slice(index))
+			break
+		}
+		if (!token.startsWith('-')) {
+			selected.push(token)
+			continue
+		}
+		const equals = token.indexOf('=')
+		const flag = equals < 0 ? token : token.slice(0, equals)
+		const positive = flag.replace(/^--no-/u, '--')
+		const option = options.get(positive) ?? options.get(positive.split('.').slice(0, 1).join('.'))
+		if (option === undefined || !OMITTED.has(option.name.split('.')[0] ?? '')) {
+			selected.push(token)
+			continue
+		}
+		const next = argv[index + 1]
+		if (
+			!flag.startsWith('--no-') &&
+			equals < 0 &&
+			next !== undefined &&
+			!next.startsWith('-') &&
+			(option.argument !== undefined || next === 'true' || next === 'false')
+		)
+			index++
+	}
+	return selected
+}
+
+function readArguments(argv: readonly string[], names: readonly string[]): readonly string[] {
+	const values: string[] = []
+	for (let index = 0; index < argv.length; index++) {
+		const token = argv[index]
+		if (token === '--') break
+		if (token === undefined) continue
+		const equals = token.indexOf('=')
+		if (!names.includes(equals < 0 ? token : token.slice(0, equals))) continue
+		const value = equals < 0 ? argv[index + 1] : token.slice(equals + 1)
+		if (value !== undefined && !value.startsWith('-')) values.push(value)
+	}
+	return values
+}
+
 function readScripts(): Readonly<Record<string, string>> {
 	const parsed: unknown = JSON.parse(readFileSync('package.json', 'utf8'))
 	if (typeof parsed !== 'object' || parsed === null) return {}
@@ -55,74 +217,207 @@ function readScripts(): Readonly<Record<string, string>> {
 	return record
 }
 
-function listInvocations(text: string): readonly string[] {
-	return [...text.matchAll(/npm run ([A-Za-z0-9:_-]+)/gu)].flatMap((match) =>
-		match[1] === undefined ? [] : [match[1]],
-	)
+function readCommands(text: string): ReadonlyArray<readonly string[]> {
+	const commands: string[][] = []
+	let command: string[] = []
+	for (const match of text.matchAll(/(?:[^\s"';&|]+|"[^"]*"|'[^']*')+|[;&|]+/gu)) {
+		if (/^[;&|]+$/u.test(match[0])) {
+			commands.push(command)
+			command = []
+		} else {
+			command.push(match[0].replace(/["']/gu, ''))
+		}
+	}
+	commands.push(command)
+	return commands
+}
+
+function listInvocations(commands: ReadonlyArray<readonly string[]>): readonly Invocation[] {
+	const invoked: Invocation[] = []
+	for (const command of commands) {
+		const index = command.indexOf('npm')
+		const name = command[index + 2]
+		if (index < 0 || command[index + 1] !== 'run' || name === undefined) continue
+		const separator = command.indexOf('--', index + 3)
+		invoked.push({ name, args: separator < 0 ? [] : command.slice(separator + 1), ancestors: [] })
+	}
+	return invoked
 }
 
-function readGates(scripts: Readonly<Record<string, string>>): Gates {
-	const invoked = new Set(Object.values(scripts).flatMap(listInvocations))
-	const projects = new Map<string, string>()
+function readGates(
+	scripts: Readonly<Record<string, string>>,
+	config: string,
+	options: ReadonlyMap<string, Option>,
+): Gates {
+	const commands = Object.fromEntries(
+		Object.entries(scripts).map(([name, text]) => [name, readCommands(text)]),
+	)
+	const invoked = new Set(
+		Object.values(commands)
+			.flatMap(listInvocations)
+			.map((entry) => entry.name),
+	)
+	const units: Gate[] = []
 	const files = new Map<string, string>()
 	for (const root of Object.keys(scripts).filter((name) => !invoked.has(name))) {
 		const visited = new Set<string>()
-		const pending = [root]
+		const pending: Invocation[] = [{ name: root, args: [], ancestors: [] }]
 		while (pending.length > 0) {
-			const name = pending.pop()
-			if (name === undefined || visited.has(name)) continue
-			visited.add(name)
-			const text = scripts[name]
-			if (text === undefined) continue
-			pending.push(...listInvocations(text))
+			const invocation = pending.pop()
+			if (invocation === undefined) continue
+			const { name, args, ancestors } = invocation
+			const key = JSON.stringify([name, args])
+			if (visited.has(key) || ancestors.includes(name)) continue
+			visited.add(key)
+			const script = commands[name]
+			if (script === undefined) continue
+			const expanded = script.map((command, index) =>
+				index === script.length - 1 ? [...command, ...args] : command,
+			)
+			pending.push(
+				...listInvocations(expanded).map((entry) => ({
+					...entry,
+					ancestors: [...ancestors, name],
+				})),
+			)
 			const gate = root === name ? name : `${root} > ${name}`
-			if (/\bvitest\b/u.test(text)) {
-				for (const match of text.matchAll(/--project[= ]([A-Za-z0-9:_-]+)/gu)) {
-					if (match[1] !== undefined && !projects.has(match[1])) projects.set(match[1], gate)
+			for (const command of expanded) {
+				const index = findRunner(command)
+				if (index >= 0) {
+					const verb = command[index + 1]
+					if (verb === 'list' || verb === 'bench') continue
+					const tokens = command.slice(
+						index + (['run', 'watch', 'dev'].includes(verb ?? '') ? 2 : 1),
+					)
+					const separator = tokens.indexOf('--')
+					const before = separator < 0 ? tokens : tokens.slice(0, separator)
+					if (
+						before.some(
+							(token, position) =>
+								/^(?:--mergeReports|--merge-reports|--listTags|--list-tags|--clearCache|--clear-cache)(?:=|$)/u.test(
+									token,
+								) &&
+								!token.endsWith('=false') &&
+								before[position + 1] !== 'false',
+						)
+					)
+						continue
+					if (verb === 'related')
+						throw new Error(`${gate}: Vitest list exposes no related command or --related option`)
+					const flags = readSelection(tokens, options)
+					const mode = readArguments(flags, ['--mode'])[0]
+					const directory = readArguments(flags, ['--root', '-r'])[0]
+					const dir = readArguments(flags, ['--dir'])[0]
+					const configured = readArguments(flags, ['--config', '-c'])[0]
+					const path =
+						configured ?? (directory === undefined && dir === undefined ? config : undefined)
+					units.push({
+						config:
+							path === undefined
+								? undefined
+								: relative(process.cwd(), resolve(path)).split('\\').join('/'),
+						mode: mode === 'test' ? undefined : mode,
+						...(directory === undefined ? {} : { root: directory }),
+						...(dir === undefined ? {} : { dir }),
+						projects: readArguments(flags, ['--project']),
+						chain: gate,
+						args:
+							configured === undefined && path !== undefined ? ['--config', path, ...flags] : flags,
+						full: before.some(
+							(flag) =>
+								/^(?:-t|--testNamePattern|--test-name-pattern|--tagsFilter|--tags-filter|--shard|--(?:no-)?allowOnly|--(?:no-)?allow-only|--(?:no-)?strictTags|--(?:no-)?strict-tags)(?:=|$)/u.test(
+									flag,
+								) || /:\d+(?:-\d+)?$/u.test(flag),
+						),
+					})
+					continue
+				}
+				for (const argument of command) {
+					if (
+						/^(?:tests|src|app)\/[A-Za-z0-9_./-]+\.test\.[cm]?ts$/u.test(argument) &&
+						!files.has(argument)
+					)
+						files.set(argument, gate)
 				}
-			}
-			for (const match of text.matchAll(
-				/(?:^|\s)((?:tests|src|app)\/[A-Za-z0-9_./-]+\.test\.[cm]?ts)\b/gu,
-			)) {
-				if (match[1] !== undefined && !files.has(match[1])) files.set(match[1], gate)
 			}
 		}
 	}
-	return { projects, files }
+	return { units, files }
 }
 
-function listCollected(config: string): readonly Collected[] | undefined {
-	const result = spawnSync(process.execPath, [VITEST, 'list', '--config', config, '--json'], {
-		encoding: 'utf8',
-		maxBuffer: 64 * 1024 * 1024,
-		windowsHide: true,
-	})
-	const start = result.stdout.indexOf('[')
-	if (result.status !== 0 || start === -1) {
-		const diagnostic = result.stderr || result.error?.message || result.stdout
-		console.error(
-			diagnostic
-				.split(/\r\n|\n/u)
-				.filter((line) => line.trim() !== '')
-				.slice(0, 12)
-				.join('\n'),
+function listCollected(
+	args: readonly string[],
+	full: boolean,
+	cache: Map<string, readonly Collected[]>,
+): readonly Collected[] | undefined {
+	const parameters = [...(full ? ['--includeTaskLocation'] : ['--filesOnly']), ...args]
+	const key = JSON.stringify(parameters)
+	const cached = cache.get(key)
+	if (cached !== undefined) return cached
+	const directory = mkdtempSync(join(tmpdir(), 'discovery-'))
+	const listing = join(directory, 'listing.json')
+	try {
+		const result = spawnSync(
+			process.execPath,
+			[VITEST, 'list', `--json=${listing}`, ...parameters],
+			{
+				encoding: 'utf8',
+				maxBuffer: 64 * 1024 * 1024,
+				timeout: LISTING_TIMEOUT,
+				windowsHide: true,
+			},
 		)
-		return undefined
-	}
-	const parsed: unknown = JSON.parse(result.stdout.slice(start))
-	if (!Array.isArray(parsed)) return undefined
-	const collected: Collected[] = []
-	for (const entry of parsed) {
-		if (typeof entry !== 'object' || entry === null) continue
-		const record = Object.fromEntries(Object.entries(entry))
-		if (typeof record.file === 'string' && typeof record.projectName === 'string') {
-			collected.push({
-				file: relative(process.cwd(), record.file).split('\\').join('/'),
-				projectName: record.projectName,
-			})
+		if (
+			args.includes('--project') &&
+			result.status === 1 &&
+			result.stderr.includes('No projects matched the filter "')
+		) {
+			cache.set(key, [])
+			return []
 		}
+		if (result.status !== 0 || !existsSync(listing)) {
+			const diagnostic = result.stderr || result.error?.message || result.stdout
+			console.error(
+				diagnostic
+					.split(/\r\n|\n/u)
+					.filter((line) => line.trim() !== '')
+					.slice(0, 12)
+					.join('\n'),
+			)
+			return undefined
+		}
+		const parsed: unknown = JSON.parse(readFileSync(listing, 'utf8'))
+		if (!Array.isArray(parsed)) return undefined
+		const collected: Collected[] = []
+		for (const entry of parsed) {
+			if (typeof entry !== 'object' || entry === null) continue
+			const record = Object.fromEntries(Object.entries(entry))
+			const location =
+				typeof record.location === 'object' && record.location !== null
+					? Object.fromEntries(Object.entries(record.location))
+					: {}
+			if (
+				typeof record.file === 'string' &&
+				(record.projectName === undefined || typeof record.projectName === 'string') &&
+				(!full || typeof record.name === 'string')
+			) {
+				collected.push({
+					file: relative(process.cwd(), record.file).split('\\').join('/'),
+					projectName: record.projectName ?? '',
+					name: typeof record.name === 'string' ? record.name : undefined,
+					line: typeof location.line === 'number' ? location.line : undefined,
+					column: typeof location.column === 'number' ? location.column : undefined,
+				})
+			}
+		}
+		cache.set(key, collected)
+		return collected
+	} catch (error) {
+		console.error(error instanceof Error ? error.message : String(error))
+		return undefined
+	} finally {
+		rmSync(directory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 })
 	}
-	return collected
 }
 
 function listTestFiles(directory: string): readonly string[] {
@@ -142,6 +437,185 @@ function countMarkers(file: string): Readonly<Record<string, number>> {
 	return counts
 }
 
+function collectListings(
+	config: string,
+	named: readonly string[],
+	gates: Gates,
+): readonly Listing[] | undefined {
+	const units: Unit[] = [{ config, mode: undefined }]
+	for (const gate of gates.units) {
+		if (
+			!units.some(
+				(unit) =>
+					unit.config === gate.config &&
+					unit.mode === gate.mode &&
+					unit.root === gate.root &&
+					unit.dir === gate.dir,
+			)
+		) {
+			units.push({
+				config: gate.config,
+				mode: gate.mode,
+				...(gate.root === undefined ? {} : { root: gate.root }),
+				...(gate.dir === undefined ? {} : { dir: gate.dir }),
+			})
+		}
+	}
+	const listings: Listing[] = []
+	const populated = new Set<string>()
+	const cache = new Map<string, readonly Collected[]>()
+	for (const unit of units) {
+		const reached = gates.units.filter(
+			(gate) =>
+				gate.config === unit.config &&
+				gate.mode === unit.mode &&
+				gate.root === unit.root &&
+				gate.dir === unit.dir,
+		)
+		const parameters = readUnitArguments(unit)
+		const collected = listCollected(parameters, true, cache)
+		if (collected === undefined) return undefined
+		const scope =
+			named.length === 0
+				? undefined
+				: listCollected(
+						[...parameters, ...named.flatMap((name) => ['--project', name])],
+						false,
+						cache,
+					)
+		if (named.length > 0 && scope === undefined) return undefined
+		const selected: Array<{ readonly gate: Gate; readonly identities: ReadonlySet<string> }> = []
+		for (const gate of reached) {
+			const selection =
+				JSON.stringify(gate.args) === JSON.stringify(parameters)
+					? collected
+					: listCollected(gate.args, gate.full, cache)
+			if (selection === undefined) {
+				console.error(`discovery: gate ${gate.chain}: vitest list refused ${gate.args.join(' ')}`)
+				return undefined
+			}
+			selected.push({
+				gate,
+				identities: new Set(
+					selection.map((entry) =>
+						JSON.stringify([
+							entry.file,
+							entry.projectName,
+							...(gate.full ? [entry.name, entry.line, entry.column] : []),
+						]),
+					),
+				),
+			})
+		}
+		const empty: string[] = []
+		for (const project of new Set([...reached.flatMap((gate) => gate.projects), ...named])) {
+			if (project.includes('*') || project.startsWith('!')) continue
+			if (
+				selected.some(
+					({ gate, identities }) =>
+						gate.projects.length === 1 && gate.projects[0] === project && identities.size > 0,
+				)
+			) {
+				populated.add(project)
+				continue
+			}
+			const selection = listCollected([...parameters, '--project', project], false, cache)
+			if (selection === undefined) return undefined
+			if (selection.length > 0) populated.add(project)
+			else if (
+				(reached.some((gate) => gate.projects.includes(project)) || named.includes(project)) &&
+				(named.length === 0 || named.includes(project))
+			)
+				empty.push(project)
+		}
+		listings.push({
+			...unit,
+			collected: collected
+				.filter(
+					(entry) =>
+						scope === undefined ||
+						scope.some(
+							(chosen) => chosen.file === entry.file && chosen.projectName === entry.projectName,
+						),
+				)
+				.map((entry) => ({
+					...entry,
+					gate: selected.find(({ gate, identities }) =>
+						identities.has(
+							JSON.stringify([
+								entry.file,
+								entry.projectName,
+								...(gate.full ? [entry.name, entry.line, entry.column] : []),
+							]),
+						),
+					)?.gate.chain,
+				})),
+			empty,
+		})
+	}
+	const candidates = new Set(listings.flatMap((listing) => listing.empty))
+	for (const name of candidates) {
+		if (populated.has(name)) continue
+		for (const unit of units) {
+			const selection = listCollected([...readUnitArguments(unit), '--project', name], false, cache)
+			if (selection === undefined) return undefined
+			if (selection.length > 0) populated.add(name)
+		}
+	}
+	return listings.map((listing) => ({
+		...listing,
+		empty: listing.empty.filter((name) => !populated.has(name)),
+	}))
+}
+
+function readUnitArguments(unit: Unit): readonly string[] {
+	return [
+		...(unit.config === undefined ? [] : ['--config', unit.config]),
+		...(unit.mode === undefined ? [] : ['--mode', unit.mode]),
+		...(unit.root === undefined ? [] : ['--root', unit.root]),
+		...(unit.dir === undefined ? [] : ['--dir', unit.dir]),
+	]
+}
+
+function mergeCollected(listings: readonly Listing[]): readonly Collected[] {
+	const collected = new Map<string, Collected>()
+	for (const listing of listings) {
+		const occurrences = new Map<string, number>()
+		for (const entry of listing.collected) {
+			const identity = JSON.stringify([
+				entry.file,
+				entry.projectName,
+				entry.name,
+				entry.line,
+				entry.column,
+			])
+			const occurrence = (occurrences.get(identity) ?? 0) + 1
+			occurrences.set(identity, occurrence)
+			const key = JSON.stringify([identity, occurrence])
+			collected.set(key, { ...entry, gate: entry.gate ?? collected.get(key)?.gate })
+		}
+	}
+	return [...collected.values()]
+}
+
+function readSnapshot(gates: Gates): string {
+	const bases = [
+		process.cwd(),
+		...gates.units.flatMap((gate) =>
+			[gate.root, gate.dir].filter((path) => path !== undefined).map((path) => resolve(path)),
+		),
+	]
+	const roots = new Set(bases.flatMap((base) => [base, join(base, 'tmp/probes')]))
+	const files = new Map<string, number>()
+	for (const root of roots) {
+		if (!existsSync(root)) continue
+		for (const file of listFiles(root)) {
+			if (/\.test\.[cm]?[jt]sx?$/u.test(file.path)) files.set(file.path, file.modified)
+		}
+	}
+	return JSON.stringify([...files].sort(([left], [right]) => left.localeCompare(right)))
+}
+
 function main(argv: readonly string[]): number {
 	const missing = readMissingFlags(argv, ['--config', '--projects'])
 	if (missing.length > 0) {
@@ -157,39 +631,71 @@ function main(argv: readonly string[]): number {
 		console.error(`discovery: ${VITEST} is missing; run npm ci first`)
 		return 2
 	}
-	const gates = readGates(readScripts())
-	const collected = listCollected(config)
-	if (collected === undefined) {
+	const canonical = relative(process.cwd(), resolve(config)).split('\\').join('/')
+	const gates = readGates(readScripts(), canonical, readCLIOptions())
+	const named = (readOption(argv, '--projects') ?? '').split(',').filter((name) => name !== '')
+	let listings: readonly Listing[] | undefined
+	for (let attempt = 0; attempt < 2; attempt++) {
+		const before = readSnapshot(gates)
+		listings = collectListings(canonical, named, gates)
+		if (before === readSnapshot(gates)) break
+		listings = undefined
+		if (attempt === 1) throw new Error('Test files changed during both census attempts')
+	}
+	if (listings === undefined) {
 		console.error('discovery: vitest list failed')
 		return 2
 	}
-	const named = (readOption(argv, '--projects') ?? '').split(',').filter((name) => name !== '')
-	const names = new Set<string>([
-		...gates.projects.keys(),
-		...collected.map((entry) => entry.projectName),
-		...named,
-	])
+	const collected = mergeCollected(listings)
+	const known = listings.flatMap((listing) => listing.empty)
+	const names = new Set<string>([...known, ...collected.map((entry) => entry.projectName)])
 	const projects: Project[] = [...names].sort().map((name) => {
 		const mine = collected.filter((entry) => entry.projectName === name)
-		const fileGate = mine
-			.map((entry) => gates.files.get(entry.file))
-			.find((gate) => gate !== undefined)
+		const units = listings.filter((listing) =>
+			listing.collected.some((entry) => entry.projectName === name),
+		)
+		const chains = mine.map((entry) => entry.gate ?? gates.files.get(entry.file))
+		const gate =
+			mine.length === 0
+				? (
+						gates.units.find(
+							(unit) => unit.projects.includes(name) && unit.chain.includes(' > '),
+						) ?? gates.units.find((unit) => unit.projects.includes(name))
+					)?.chain
+				: chains.every((chain) => chain !== undefined)
+					? chains[0]
+					: undefined
 		return {
 			name,
-			gate: gates.projects.get(name) ?? fileGate,
+			gate,
 			files: new Set(mine.map((entry) => entry.file)).size,
 			tests: mine.length,
+			...(units.some(
+				(unit) =>
+					unit.config !== canonical ||
+					unit.mode !== undefined ||
+					unit.root !== undefined ||
+					unit.dir !== undefined,
+			)
+				? {
+						units: units.map((unit) => ({
+							config: unit.config,
+							mode: unit.mode,
+							...(unit.root === undefined ? {} : { root: unit.root }),
+							...(unit.dir === undefined ? {} : { dir: unit.dir }),
+						})),
+					}
+				: {}),
 		}
 	})
 	const collectedFiles = new Set(collected.map((entry) => entry.file))
-	const undiscovered = listTestFiles('tests')
+	const undiscovered = (named.length === 0 ? listTestFiles('tests') : [])
 		.filter((file) => !collectedFiles.has(file) && !gates.files.has(file))
 		.sort()
 	const ungated = projects
 		.filter((project) => project.gate === undefined && project.tests > 0)
 		.map((project) => project.name)
-	// A project no chain reaches is a workbench (the `probe` project collects `tmp/probes/**`), so an
-	// empty one is reported, never flagged.
+	// An empty project no chain containing ` > ` names is a workbench, reported without a flag.
 	const empty = projects
 		.filter((project) => project.tests === 0 && project.gate?.includes(' > ') === true)
 		.map((project) => project.name)
@@ -220,7 +726,7 @@ function main(argv: readonly string[]): number {
 			console.log(`discovery: ${name} collects tests but no root script chain reaches it`)
 		for (const name of empty) console.log(`discovery: ${name} collects nothing`)
 		for (const name of workbenches)
-			console.log(`discovery: ${name} is a workbench no chain runs; it collects nothing`)
+			console.log(`discovery: ${name} is an empty workbench; no chain containing " > " names it`)
 		for (const file of undiscovered) console.log(`discovery: ${file} is collected by no project`)
 		for (const entry of census) {
 			const marks = Object.entries(entry.markers)
@@ -234,4 +740,9 @@ function main(argv: readonly string[]): number {
 	return flagged ? 3 : 0
 }
 
-process.exitCode = main(process.argv.slice(2))
+try {
+	process.exitCode = main(process.argv.slice(2))
+} catch (error) {
+	console.error(`discovery: ${error instanceof Error ? error.message : String(error)}`)
+	process.exitCode = 2
+}