@orkestrel/scaffold 0.0.46 → 0.0.47

package/dist/bin/main.js

@@ -3,7 +3,7 @@ import { align, renderTable, strip, stripControls, width } from "@orkestrel/cons
 import { attempt, isRecord, isString, parseJSON } from "@orkestrel/contract";
 import { createMarkdown, flattenText, isTableNode } from "@orkestrel/markdown";
 import { executeSync } from "@orkestrel/process/server";
-import { BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, DISTRIBUTION_TEST_PATH, ENVIRONMENTS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, INTEGRATION_TEST_PATH, MAX_MANIFEST_BYTES, SERVICE_SETUP_PATH, SHOWCASE_CONFIG_PATH, ScaffoldError, blueprintToDevDependencies, blueprintToRootVite, blueprintToScripts, createBlueprint, isScaffoldError, manifestToDependencies, manifestToName, nameToGuide } from "../src/core/index.js";
+import { BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, DISTRIBUTION_TEST_PATH, ENVIRONMENTS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, INTEGRATION_TEST_PATH, MAX_MANIFEST_BYTES, SERVICE_SETUP_PATH, SHOWCASE_CONFIG_PATH, ScaffoldError, blueprintToDevDependencies, blueprintToRootVite, blueprintToScripts, compareVersions, createBlueprint, extractRangeMajor, extractVersion, isScaffoldError, manifestToDependencies, manifestToName, nameToGuide, replacePlanRanges } from "../src/core/index.js";
 import { Materializer, Upstream, isExactCaseFile, isPhysicalDirectory, isRepository, listFiles, readFileText, readSnapshot, resolveContainedPath } from "../src/server/index.js";
 import { parseArgs } from "node:util";
 //#region src/bin/constants.ts
@@ -111,7 +111,8 @@ var OPTION_SUMMARY = Object.freeze({
 	"--dirty": "delete from a tree carrying uncommitted changes",
 	"--from <path>": "read the data root from a local path instead of the bundled one; catalog alone accepts it more than once",
 	"--target <path>": "the directory the verb operates on; the working directory when absent",
-	"--json": "emit one machine-readable value instead of a report"
+	"--json": "emit one machine-readable value instead of a report",
+	ORKESTREL_SCAFFOLD_REGISTRY: "the registry base mapped to upstream.registry.base"
 });
 /**
 * The options each verb takes, in usage order, frozen.
@@ -434,6 +435,77 @@ function auditToExit(audit) {
 	return blocked || drifted ? 1 : 0;
 }
 /**
+* Read the fleet rows and planned foreign tools a target manifest declares.
+*
+* @param manifest - The target manifest text.
+* @param blueprint - The workspace shape that supplies the planned tool set.
+* @returns The declared fleet rows followed by declared planned foreign rows.
+*/
+function manifestToPlannedDependencies(manifest, blueprint) {
+	const dependencies = [...dependenciesToFleet(manifestToDependencies(manifest))];
+	const parsed = parseJSON(manifest);
+	if (!isRecord(parsed)) return dependencies;
+	const runtime = isRecord(parsed.dependencies) ? parsed.dependencies : {};
+	const development = isRecord(parsed.devDependencies) ? parsed.devDependencies : {};
+	for (const name of Object.keys(blueprintToDevDependencies(blueprint)).sort()) {
+		if (name.startsWith("@orkestrel/")) continue;
+		const range = runtime[name] ?? development[name];
+		if (isString(range)) dependencies.push({
+			name,
+			range
+		});
+	}
+	return dependencies;
+}
+/**
+* Keep only dependencies published by the Orkestrel fleet.
+*
+* @param dependencies - The declared dependencies to inspect.
+* @returns The fleet declarations in their original order.
+*/
+function dependenciesToFleet(dependencies) {
+	return dependencies.filter((dependency) => dependency.name.startsWith("@orkestrel/"));
+}
+/**
+* Read the exit code registry release evidence earns.
+*
+* @param releases - The release verdicts to measure.
+* @returns `EXIT_DRIFT` for a failed lookup or an exact fleet mismatch; `EXIT_CLEAN` otherwise.
+*/
+function releasesToExit(releases) {
+	return releases.some((release) => release.lookup !== "found" || release.name.startsWith("@orkestrel/") && release.range !== `^${release.latest}`) ? 1 : 0;
+}
+/**
+* Project foreign floor and supported-major drift into audit questions.
+*
+* @param releases - The release verdicts to measure.
+* @param served - Alternate release verdicts used to detect a newer served major.
+* @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;
+		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({
+			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({
+			field: "dependencies",
+			message: `${release.name} declares major ${String(declared)}, while the registry serves major ${String(published)}.`,
+			blocking: false
+		});
+	}
+	return questions;
+}
+/**
 * Project an audit into the human summary of its outcome.
 *
 * @param audit - The comparison to summarize.
@@ -602,12 +674,20 @@ var CLI = class CLI {
 			app: this.#environments(command.app, "app"),
 			bin: command.bin === true,
 			setup: false,
-			dependencies: await this.#resolve(this.#packages(command.dependencies))
+			dependencies: this.#packages(command.dependencies).map((name) => ({
+				name,
+				range: "^0.0.0"
+			}))
 		});
 		const plan = this.#compile(blueprint);
+		const manifest = plan.artifacts.find((artifact) => artifact.path === "package.json" && artifact.origin !== "host");
+		if (manifest === void 0 || manifest.origin === "host") throw new ScaffoldError("BLOCKED", "The compiled plan carries no replaceable manifest.");
+		const releases = await this.#lookup(dependenciesToFleet(manifestToDependencies(manifest.content)));
+		const resolved = replacePlanRanges(plan, this.#pin(releases));
+		if (resolved === void 0) throw new ScaffoldError("BLOCKED", "The compiled plan ranges could not be replaced.");
 		const materializer = new Materializer(command.from === void 0 ? void 0 : { host: command.from });
 		try {
-			const result = materializer.materialize(plan, target);
+			const result = materializer.materialize(resolved, target);
 			if (command.json === true) this.#report(result);
 			else {
 				this.#say(`Scaffolded ${blueprint.name} into ${result.target}.`);
@@ -618,10 +698,13 @@ var CLI = class CLI {
 			materializer.destroy();
 		}
 	}
-	#inspect(command) {
+	async #inspect(command) {
 		const target = command.target ?? ".";
+		const manifest = this.#manifest(target);
 		const blueprint = this.#derive(target);
-		const questions = this.#targetQuestions(target, blueprint);
+		const declared = manifestToPlannedDependencies(manifest, blueprint);
+		const releases = await this.#lookup(declared);
+		const questions = [...this.#targetQuestions(target, blueprint), ...releasesToQuestions(releases)];
 		const materializer = new Materializer(command.from === void 0 ? void 0 : { host: command.from });
 		try {
 			const [measured] = this.#survey(materializer, blueprint, target, this.#groups(command.groups));
@@ -629,14 +712,21 @@ var CLI = class CLI {
 				...measured,
 				questions: [...measured.questions, ...questions]
 			};
-			if (command.json === true) this.#report(audit);
-			else this.#present(audit);
-			return auditToExit(audit);
+			const outcome = {
+				...audit,
+				releases
+			};
+			if (command.json === true) this.#report(outcome);
+			else {
+				this.#present(audit);
+				this.#reportReleases(releases);
+			}
+			return Math.max(auditToExit(audit), releasesToExit(releases));
 		} finally {
 			materializer.destroy();
 		}
 	}
-	#restore(command) {
+	async #restore(command) {
 		const target = command.target ?? ".";
 		const groups = this.#groups(command.groups);
 		const blueprint = this.#derive(target);
@@ -649,11 +739,14 @@ var CLI = class CLI {
 				else this.#present(audit);
 				return 1;
 			}
-			const result = materializer.repair(plan, audit, target);
-			const [terminal] = this.#survey(materializer, blueprint, target, groups);
+			const releases = await this.#lookup(manifestToPlannedDependencies(this.#manifest(target), blueprint));
+			const pins = this.#pin(releases);
+			const result = this.#merge(materializer.repair(plan, audit, target), materializer.declare(pins, target));
+			const [terminal] = this.#survey(materializer, this.#derive(target), target, groups);
 			const outcome = {
 				...result,
-				audit: terminal
+				audit: terminal,
+				releases
 			};
 			if (command.json === true) this.#report(outcome);
 			else {
@@ -672,10 +765,13 @@ var CLI = class CLI {
 		if (extra.length > 0) this.#warn(`Read the data root from ${String(host)}. The other ${String(extra.length)} local root${extra.length === 1 ? "" : "s"} named by --from reach nothing this run does.`);
 		const previous = this.#previous(target);
 		const fetched = await this.#fetch(target, command.all === true);
+		const releases = this.#catalogReleases(dependenciesToFleet(manifestToDependencies(this.#manifest(target))), fetched.entries);
+		const pins = this.#pin(releases);
+		this.#assertFetched(fetched.entries, fetched.mirrors);
 		const materializer = new Materializer(host === void 0 ? void 0 : { host });
 		let result;
 		try {
-			result = this.#publish(materializer, target, fetched.entries, fetched.mirrors);
+			result = this.#merge(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare(pins, target));
 		} finally {
 			materializer.destroy();
 		}
@@ -683,11 +779,12 @@ var CLI = class CLI {
 			...result,
 			entries: fetched.entries,
 			mirrors: fetched.mirrors,
-			dropped: previous.filter((name) => !fetched.entries.some((entry) => entry.name === name))
+			dropped: previous.filter((name) => !fetched.entries.some((entry) => entry.name === name)),
+			releases
 		};
 		if (command.json === true) this.#report(outcome);
 		else this.#recount(outcome);
-		return fetched.mirrors.some((mirror) => mirror.lookup === "failed") ? 1 : 0;
+		return 0;
 	}
 	async #replace(command) {
 		const target = command.target ?? ".";
@@ -713,7 +810,7 @@ var CLI = class CLI {
 				dirty: []
 			} : repository, target);
 			const offline = this.#merge(repaired, removed);
-			const online = await this.#reconcile(materializer, target, blueprint.dependencies);
+			const online = await this.#reconcile(materializer, target, manifestToPlannedDependencies(this.#manifest(target), blueprint));
 			const [terminal] = this.#survey(materializer, blueprint, target, groups);
 			const outcome = {
 				...online,
@@ -735,11 +832,14 @@ var CLI = class CLI {
 	}
 	async #reconcile(materializer, target, declared) {
 		const previous = this.#previous(target);
+		let releases = [];
 		try {
-			const releases = await this.#lookup(declared);
+			releases = await this.#lookup(declared);
+			const pins = this.#pin(releases);
 			const fetched = await this.#fetch(target, false);
+			this.#assertFetched(fetched.entries, fetched.mirrors);
 			return {
-				...this.#merge(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare(this.#pin(releases), target)),
+				...this.#merge(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare(pins, target)),
 				entries: fetched.entries,
 				mirrors: fetched.mirrors,
 				dropped: previous.filter((name) => !fetched.entries.some((entry) => entry.name === name)),
@@ -754,15 +854,34 @@ var CLI = class CLI {
 				entries: [],
 				mirrors: [],
 				dropped: [],
-				releases: [],
+				releases,
 				note: `The catalog step did not complete: ${errorToEnvelope(error).error.message}`
 			};
 		}
 	}
 	async #lookup(declared) {
+		if (declared.length === 0) return [];
 		const upstream = new Upstream(this.#upstream);
 		try {
-			return await upstream.lookup(declared);
+			return (await upstream.lookup(declared.map((dependency) => {
+				const major = extractRangeMajor(dependency.range);
+				return {
+					name: dependency.name,
+					range: dependency.name.startsWith("@orkestrel/") ? "*" : major === void 0 ? dependency.range : `^${String(major)}`
+				};
+			}))).map((release, index) => {
+				const dependency = declared[index];
+				if (dependency === void 0) return {
+					name: release.name,
+					range: release.range,
+					lookup: "failed",
+					note: "the release answer has no matching declaration"
+				};
+				return {
+					...release,
+					range: dependency.range
+				};
+			});
 		} finally {
 			upstream.destroy();
 		}
@@ -786,13 +905,36 @@ var CLI = class CLI {
 	#publish(materializer, target, entries, mirrors) {
 		return this.#merge(materializer.mirror(mirrors, target), materializer.catalog(entries, target));
 	}
+	#catalogReleases(declared, entries) {
+		return declared.map((dependency) => {
+			const entry = entries.find((candidate) => candidate.name === dependency.name);
+			if (entry?.lookup === "found") return {
+				...dependency,
+				lookup: "found",
+				latest: entry.version
+			};
+			return {
+				...dependency,
+				lookup: entry?.lookup ?? "missing",
+				note: entry?.note ?? "the organization catalog does not list the declared package"
+			};
+		});
+	}
+	#assertFetched(entries, mirrors) {
+		const failed = [...entries.filter((entry) => entry.lookup !== "found").map((entry) => entry.name), ...mirrors.filter((mirror) => mirror.lookup !== "found").map((mirror) => mirror.name)];
+		if (failed.length === 0) return;
+		throw new ScaffoldError("FETCH", `Upstream produced no complete catalog answer for ${failed.join(", ")}.`, { names: failed.length });
+	}
 	#pin(releases) {
-		const pinned = [];
-		for (const release of releases) if (release.lookup === "found") pinned.push({
-			name: release.name,
-			range: `^${release.latest}`
+		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 });
+		return releases.map((release) => {
+			if (release.lookup !== "found") throw new ScaffoldError("FETCH", `The registry named no release for ${release.name}.`);
+			return {
+				name: release.name,
+				range: `^${release.latest}`
+			};
 		});
-		return pinned;
 	}
 	#compile(blueprint, groups) {
 		const compiler = new Compiler();
@@ -1004,7 +1146,7 @@ var CLI = class CLI {
 		const expected = blueprintToScripts(blueprint);
 		const expectedLines = /* @__PURE__ */ new Map();
 		for (const [name, script] of Object.entries(expected)) {
-			if (!name.startsWith("test:") || name === "test:probe") continue;
+			if (!name.startsWith("test:")) continue;
 			const invoked = this.#invocations(script);
 			if (invoked === void 0) continue;
 			for (const project of invoked.projects) {
@@ -1165,22 +1307,6 @@ var CLI = class CLI {
 		if (refused.length > 0) throw new UsageError(`'--deps' does not take ${refused.join(", ")}. Every name is a published @orkestrel package.`);
 		return requested;
 	}
-	async #resolve(names) {
-		if (names.length === 0) return [];
-		const upstream = new Upstream(this.#upstream);
-		let releases;
-		try {
-			releases = await upstream.lookup(names.map((name) => ({
-				name,
-				range: "*"
-			})));
-		} finally {
-			upstream.destroy();
-		}
-		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 });
-		return this.#pin(releases);
-	}
 	#merge(first, second) {
 		return {
 			target: first.target,
@@ -1209,6 +1335,15 @@ var CLI = class CLI {
 		}
 		this.#say(auditToSummary(audit));
 	}
+	#reportReleases(releases) {
+		for (const release of releases) {
+			if (release.lookup !== "found") {
+				this.#warn(`${release.name}: ${release.note}`);
+				continue;
+			}
+			if (release.name.startsWith("@orkestrel/") && release.range !== `^${release.latest}`) this.#warn(`${release.name}: ${release.range} differs from ^${release.latest}.`);
+		}
+	}
 	#reportReplacements(before, after) {
 		const terminal = new Map(after.findings.map((finding) => [finding.path, finding]));
 		for (const finding of before.findings) {
@@ -1258,7 +1393,7 @@ process.stdout.on("error", (error) => {
 	if ("code" in error && error.code === "EPIPE") return;
 	throw error;
 });
-process.exitCode = await new CLI().execute(process.argv.slice(2));
+process.exitCode = await new CLI(process.env.ORKESTREL_SCAFFOLD_REGISTRY === void 0 ? void 0 : { upstream: { registry: { base: process.env.ORKESTREL_SCAFFOLD_REGISTRY } } }).execute(process.argv.slice(2));
 //#endregion
 
 //# sourceMappingURL=main.js.map