@orkestrel/scaffold 0.0.10 → 0.0.11

package/dist/bin/scaffold.js

@@ -873,6 +873,34 @@ var CLI = class {
 		const full = diffPlan(compiled, readTarget(target, compiled.artifacts.map((artifact) => artifact.path)));
 		return full.drifted + full.missing + full.foreign;
 	}
+	/** Compile and audit the selected repair ownership boundary for one structural snapshot. */
+	#prepareRepair(spec, target, host, generated, json) {
+		const [compiled] = this.#compile(spec, json);
+		const scoped = {
+			...compiled,
+			blueprint: {
+				...compiled.blueprint,
+				overrides: []
+			},
+			artifacts: compiled.artifacts.filter((artifact) => artifact.origin === "host" || generated && artifact.origin === "computed" && artifact.path !== "package.json")
+		};
+		let plan;
+		try {
+			plan = hydratePlan(scoped, host);
+		} catch (error) {
+			this.#error(error, json);
+		}
+		try {
+			const audit = diffPlan(plan, readTarget(target, plan.artifacts.map((artifact) => artifact.path)));
+			return [
+				compiled,
+				plan,
+				audit
+			];
+		} catch (error) {
+			this.#error(error, json);
+		}
+	}
 	/** Reject a cancelled prompt (ctrl-c) with the shared `CANCELLED_MESSAGE` — exit 1, nothing written. */
 	async #guard(promise) {
 		try {
@@ -1216,29 +1244,12 @@ var CLI = class {
 		} catch (error) {
 			this.#error(error, json);
 		}
-		const [compiled] = this.#compile(spec, json);
 		const generated = values.generated === true;
-		const scoped = {
-			...compiled,
-			blueprint: {
-				...compiled.blueprint,
-				overrides: []
-			},
-			artifacts: compiled.artifacts.filter((artifact) => artifact.origin === "host" || generated && artifact.origin === "computed" && artifact.path !== "package.json")
-		};
 		const host = values.from?.[0] ?? hostRoot();
-		let plan;
-		try {
-			plan = hydratePlan(scoped, host);
-		} catch (error) {
-			this.#error(error, json);
-		}
-		let audit;
-		try {
-			audit = diffPlan(plan, readTarget(target, plan.artifacts.map((artifact) => artifact.path)));
-		} catch (error) {
-			this.#error(error, json);
-		}
+		const prepared = this.#prepareRepair(spec, target, host, generated, json);
+		const compiled = prepared[0];
+		let plan = prepared[1];
+		let audit = prepared[2];
 		if (!json) {
 			this.#reporter.line(generated ? REPAIR_GENERATED_SCOPE : REPAIR_SCOPE);
 			this.#reporter.section("Audit");
@@ -1268,6 +1279,21 @@ var CLI = class {
 		if (values.prune && !json) if (prunePaths.length === 0) this.#reporter.line(PRUNE_EMPTY);
 		else for (const line of prunePreview(prunePaths)) this.#reporter.line(line);
 		const doPrune = prunePaths.length > 0 && await this.#prune(terminal, pruneConfirmMessage(prunePaths.length), values, json);
+		let currentGlobal;
+		try {
+			currentGlobal = deriveBlueprint(target).global;
+		} catch (error) {
+			this.#error(error, json);
+		}
+		if (currentGlobal !== spec.global) {
+			spec = {
+				...spec,
+				global: currentGlobal
+			};
+			const refreshed = this.#prepareRepair(spec, target, host, generated, json);
+			plan = refreshed[1];
+			audit = refreshed[2];
+		}
 		const spinner = this.#spinner("repairing", json);
 		spinner?.start();
 		const materializer = createMaterializer({ host });