@orkestrel/scaffold 0.0.10 → 0.0.12

package/dist/bin/scaffold.js

@@ -614,8 +614,9 @@ function orkestrelTokenIssue(normalized, catalog) {
 /** Parse a strict command-line argument vector. */
 function parseArguments(argv) {
 	if (argv.some((argument) => !isTerminalText(argument))) throw new ScaffoldError("INVALID", "Command arguments must not contain control characters");
+	const args = argv[0] === "--" ? argv.slice(1) : [...argv];
 	return parseArgs({
-		args: argv[0] === "--" ? argv.slice(1) : [...argv],
+		args,
 		allowPositionals: true,
 		options: {
 			src: { type: "string" },
@@ -873,6 +874,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 {
@@ -947,9 +976,11 @@ var CLI = class {
 	*/
 	#names(host) {
 		const names = attempt(() => {
-			const full = locateHostSource(readHostManifest(host), ".claude/agents/orkestrel.md", host);
+			const manifest = readHostManifest(host);
+			const full = locateHostSource(manifest, ".claude/agents/orkestrel.md", host);
 			if (full === void 0 || !existsSync(full)) return void 0;
-			return catalogNames(readFileText(host, relative(host, full).replaceAll("\\", "/"), "TARGET", "host"));
+			const relative$1 = relative(host, full).replaceAll("\\", "/");
+			return catalogNames(readFileText(host, relative$1, "TARGET", "host"));
 		});
 		return names.success ? names.value : void 0;
 	}
@@ -1216,29 +1247,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 +1282,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 });
@@ -1304,7 +1333,10 @@ var CLI = class {
 				try {
 					const spec = deriveBlueprint(directory);
 					const scaffolding = compiler.compile(spec);
-					if (!scaffolding.plan) throw new ScaffoldError("INVALID", scaffolding.questions.map((question) => question.text).join("; "));
+					if (!scaffolding.plan) {
+						const message = scaffolding.questions.map((question) => question.text).join("; ");
+						throw new ScaffoldError("INVALID", message);
+					}
 					scoped = {
 						...scaffolding.plan,
 						blueprint: {
@@ -1318,8 +1350,9 @@ var CLI = class {
 					compiler.destroy();
 				}
 				const plan = hydratePlan(scoped, host);
+				const paths = plan.artifacts.map((artifact) => artifact.path);
 				const rawAudit = {
-					...diffPlan(plan, readTarget(directory, plan.artifacts.map((artifact) => artifact.path))),
+					...diffPlan(plan, readTarget(directory, paths)),
 					questions
 				};
 				const audit = this.#scan(rawAudit, directory, host, plan.blueprint.service);
@@ -1475,7 +1508,8 @@ var CLI = class {
 		const endParts = current.split(CATALOG_END_MARKER);
 		if (startIndex === -1 || endIndex === -1 || endIndex < startIndex || startParts.length !== 2 || endParts.length !== 2) this.#error(new ScaffoldError("TARGET", `Expected exactly one ordered "${CATALOG_START_MARKER}" / "${CATALOG_END_MARKER}" pair in ${agentPath}`, { path: agentPath }), json);
 		const updated = `${current.slice(0, startIndex + CATALOG_START_MARKER.length)}\n\n${block}\n${current.slice(endIndex)}`;
-		const oldRows = catalogNames(current.slice(startIndex + CATALOG_START_MARKER.length, endIndex)).length;
+		const oldBlock = current.slice(startIndex + CATALOG_START_MARKER.length, endIndex);
+		const oldRows = catalogNames(oldBlock).length;
 		const shrink = entries.length < oldRows ? oldRows - entries.length : void 0;
 		if (updated === current) {
 			if (json) this.#write(catalogResultOf(entries, false));
@@ -1513,7 +1547,8 @@ var CLI = class {
 		}]);
 		const staged = attempt(() => {
 			validateWriteDirectories(transaction);
-			mkdirSync(dirname(resolvePhysicalPath(transaction.stage, CATALOG_AGENT_PATH, "WRITE", "staging")), { recursive: true });
+			const destination = resolvePhysicalPath(transaction.stage, CATALOG_AGENT_PATH, "WRITE", "staging");
+			mkdirSync(dirname(destination), { recursive: true });
 			validateWriteDirectories(transaction);
 			const contained = resolvePhysicalPath(transaction.stage, CATALOG_AGENT_PATH, "WRITE", "staging");
 			writeFileSync(contained, updated, {