@orkestrel/scaffold 0.0.66 → 0.0.68

package/dist/bin/main.js

@@ -2,7 +2,7 @@
 import { align, renderTable, strip, stripControls, width } from "@orkestrel/console";
 import { attempt, isError, isRecord, isString, parseJSON } from "@orkestrel/contract";
 import { BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, HOST_PATHS, INTEGRATION_TEST_PATH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, SERVICE_SETUP_PATH, SHOWCASE_CONFIG_PATH, ScaffoldError, blueprintToDevDependencies, blueprintToRootVite, blueprintToScripts, blueprintToTestArtifacts, blueprintToWritableScripts, compareVersions, createBlueprint, extractRangeMajor, extractVersion, isFloorPath, isScaffoldError, manifestToDependencies, manifestToName, nameToGuide, replaceManifestScripts, replacePlanRanges } from "../src/core/index.js";
-import { MAX_INVENTORY_PATHS, Materializer, Upstream, filesToHost, isExactCaseFile, isPhysicalDirectory, isWorktree, listFiles, readFileText, readHostFloor, readSnapshot, resolveContainedPath } from "../src/server/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 { parseArgs } from "node:util";
@@ -1005,7 +1005,7 @@ function targetToEnvironments(target, axis) {
 /**
 * Reads the packages a target's catalog table listed before this run.
 *
-* @param target - The target directory holding the catalog agent file.
+* @param target - The target or raw checkout directory, or a verified value host.
 * @returns The package names the table's first column carries, in table order,
 * and no names when the file is absent.
 *
@@ -1021,7 +1021,8 @@ function targetToEnvironments(target, axis) {
 * ```
 */
 function catalogToNames(target) {
-	const text = readFileText(target, CATALOG_AGENT_PATH);
+	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) {
@@ -1473,41 +1474,52 @@ var CLI = class {
 		const [host, ...extra] = command.from ?? [];
 		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 = catalogToNames(target);
-		const fetched = await this.#fetch(target, command.all === true);
-		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;
-		const guides = fetched.mirrors.length === 0 ? void 0 : fetched.mirrors.some((mirror) => mirror.lookup !== "found") ? "floor" : "live";
-		const materializer = new Materializer({ host: host ?? readHostFloor() });
-		let result;
+		const floor = host === void 0 ? readHostFloor() : readHostManifest(host) === void 0 ? host : readHostFloor(host);
+		const materializer = new Materializer({ host: floor });
+		let outcome;
 		try {
-			result = mergeResults(this.#publish(materializer, target, fetched.entries, fetched.mirrors), materializer.declare({
-				pins,
-				scripts: []
-			}, target));
+			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 = {
+				...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 }
+					}
+				};
+			}
 		} finally {
 			materializer.destroy();
 		}
-		const outcome = {
-			...result,
-			entries: fetched.entries,
-			mirrors: fetched.mirrors,
-			dropped: previous.filter((name) => !fetched.entries.some((entry) => entry.name === name)),
-			releases,
-			provenance: {
-				versions: "live",
-				...guides === void 0 ? {} : { guides }
-			}
-		};
 		if (command.json === true) this.#report(outcome);
 		else this.#recount(outcome);
-		return guides === "floor" ? 1 : 0;
+		return outcome.membership === void 0 || outcome.provenance.guides === "floor" ? 1 : 0;
 	}
 	async #replace(command) {
 		const target = command.target ?? ".";
@@ -1568,9 +1580,7 @@ var CLI = class {
 				pins: versions.pins,
 				scripts: declared.scripts
 			}, target),
-			entries: [],
 			mirrors: [],
-			dropped: [],
 			releases: versions.releases,
 			provenance: {
 				...versions.baseline === void 0 ? {} : { versions: versions.baseline },
@@ -1593,6 +1603,8 @@ var CLI = class {
 			const refused = versionsToRefusal(versions);
 			if (refused !== void 0) throw refused;
 			const fetched = await this.#fetch(target, false);
+			if (fetched.entries === void 0) throw new ScaffoldError("FETCH", fetched.note ?? "The catalog membership read did not complete.");
+			const entries = fetched.entries;
 			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";
@@ -1611,9 +1623,12 @@ var CLI = class {
 			if (guides === "floor") floors.push("guides");
 			return {
 				...written,
-				entries: fetched.entries,
+				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,
-				dropped: previous.filter((name) => !fetched.entries.some((entry) => entry.name === name)),
 				releases,
 				provenance,
 				...floors.length === 0 ? {} : { note: `The ${floors.join(", ")} step used the distributed floor after its upstream read did not complete.` }
@@ -1624,9 +1639,7 @@ var CLI = class {
 				written: [],
 				skipped: [],
 				removed: [],
-				entries: [],
 				mirrors: [],
-				dropped: [],
 				releases,
 				provenance,
 				note: `The catalog step did not complete: ${errorToEnvelope(error).error.message}`
@@ -1765,7 +1778,7 @@ var CLI = class {
 			upstream.destroy();
 		}
 	}
-	async #fetch(target, all) {
+	async #fetch(target, all, floor) {
 		const manifest = this.#manifest(target);
 		const own = manifestToName(manifest);
 		const dependencies = manifestToDependencies(manifest);
@@ -1776,11 +1789,20 @@ var CLI = class {
 		].map((dependency) => dependency.name))];
 		const upstream = new Upstream(this.#upstream);
 		try {
-			const entries = await upstream.catalog();
-			const names = (all ? entries.map((entry) => entry.name) : declared).filter((name) => name !== own);
+			let entries;
+			let note;
+			try {
+				entries = await upstream.catalog();
+			} catch (error) {
+				if (floor === void 0) throw error;
+				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 {
-				entries,
-				mirrors: await upstream.fetch(names, readSnapshot(target, names.map(nameToGuide)))
+				...entries === void 0 ? {} : { entries },
+				mirrors,
+				...note === void 0 ? {} : { note }
 			};
 		} finally {
 			upstream.destroy();
@@ -2112,7 +2134,8 @@ var CLI = class {
 	}
 	#recount(result) {
 		this.#say(resultToTally(result));
-		this.#say(`${String(result.entries.length)} published, ${String(result.mirrors.filter((mirror) => mirror.lookup === "found").length)} guide${result.mirrors.length === 1 ? "" : "s"} fetched, ${String(result.dropped.length)} no longer listed.`);
+		if (result.membership !== void 0) this.#say(`${String(result.membership.entries.length)} published, ${String(result.mirrors.filter((mirror) => mirror.lookup === "found").length)} guide${result.mirrors.length === 1 ? "" : "s"} fetched, ${String(result.membership.dropped.length)} no longer listed.`);
+		if (result.note !== void 0) this.#warn(result.note);
 		for (const mirror of result.mirrors) if (mirror.lookup !== "found") this.#warn(`${mirror.name}: ${mirror.note}`);
 	}
 	#report(value) {