@theholocron/cli 5.0.0-alpha.170 → 5.0.0-alpha.172

package/dist/cli.mjs

@@ -5316,6 +5316,35 @@ function resolvePkgRelPath(gitRoot, configFilepath) {
 	if (/[\r\n]/.test(pkgRelPath)) throw new Error(`refusing to use a package path containing a line break: ${JSON.stringify(pkgRelPath)}`);
 	return pkgRelPath;
 }
+/**
+* Two different monorepo packages opting into the same generic task name
+* (e.g. both `apps/sentinel` and some future `apps/other` configuring
+* `delivery.previewDeploy`) would otherwise overwrite each other's
+* `.github/workflows/<task>.yml` on whichever package's write ran last —
+* only one package's behavior would ever actually run in CI, with no
+* signal that the other's was silently dropped (holocron#1026).
+*
+* Shared by both `holocron repo sync` (reads the file straight off local
+* disk) and `holocron repo setup` (reads it through the loaded `Source`
+* capability, which happens to be local disk too for the github plugin
+* today, but the interface doesn't promise that for every provider —
+* holocron#1068). The marker-parsing and error message are identical
+* either way; `readExisting` is how the two callers differ.
+*
+* A file with no marker at all predates this check (or was written before
+* #1026) and is never flagged — only a marker that's present AND disagrees
+* with the current run's own package is a real collision. `readExisting`
+* returning `null` means "nothing there," not "unreadable" — a caller
+* whose underlying read can fail for reasons other than "doesn't exist"
+* (e.g. local fs EISDIR) is expected to let that error propagate out of
+* `readExisting` itself rather than mapping it to `null`.
+*/
+async function assertNoPackageCollision(taskName, pkgRelPath, filename, readExisting) {
+	const existing = await readExisting();
+	if (existing === null) return;
+	const previousPkg = SOURCE_PACKAGE_MARKER.exec(existing)?.[1];
+	if (previousPkg !== void 0 && previousPkg !== pkgRelPath) throw new Error(`task "${taskName}" would overwrite .github/workflows/${filename}, already generated for package "${sanitizeForDisplay(previousPkg)}" — the same task name can't be used by two different packages (holocron#1026). If "${sanitizeForDisplay(previousPkg)}" moved or was renamed to this path, delete .github/workflows/${filename} first and re-run this command; otherwise rename one or give it a different thin-caller filename.`);
+}
 //#endregion
 //#region src/commands/setup/agent-prompts-data.ts
 /**
@@ -6245,6 +6274,7 @@ async function runSetup(input) {
 			if (content === void 0) continue;
 			const step = content.includes("workflows/preview.yml@main") ? `write workflow ${name} (with preview)` : `write workflow ${name}`;
 			steps.push(await runStep("source", step, dryRun, async () => {
+				await assertNoPackageCollision(name, setupPkgRelPath, filename, () => source.readWorkflowFile(filename));
 				await source.writeWorkflowFile(filename, `${thinCallerHeader()}# Source package: ${setupPkgRelPath}\n\n${content}`);
 			}));
 			print(formatStep(steps[steps.length - 1]));
@@ -7627,7 +7657,7 @@ async function runSync(input) {
 					if (content === void 0) continue;
 					const step = `sync workflow ${name}${content.includes("workflows/preview.yml@main") ? " (with preview)" : ""}`;
 					steps.push(await runSyncStep("local", step, dryRun, async () => {
-						await assertNoPackageCollision(gitRoot, filename, name, pkgRelPath);
+						await assertNoPackageCollision(name, pkgRelPath, filename, () => readExistingWorkflowFile(gitRoot, filename));
 						await writeWorkflowFile(gitRoot, filename, `${workflowHeader()}# Source package: ${pkgRelPath}\n\n${content}`);
 					}));
 					print(formatSyncStep(steps[steps.length - 1]));
@@ -7891,31 +7921,14 @@ async function writeWorkflowFile(repoRoot, filename, content) {
 	await writeFile(tmpPath, content, "utf8");
 	await rename(tmpPath, join(dir, filename));
 }
-/**
-* Two different monorepo packages opting into the same generic task name
-* (e.g. both `apps/sentinel` and some future `apps/other` configuring
-* `delivery.previewDeploy`) would otherwise overwrite each other's
-* `.github/workflows/<task>.yml` on whichever package's `holocron repo sync`
-* ran last — only one package's behavior would ever actually run in CI,
-* with no signal that the other's was silently dropped (holocron#1026).
-*
-* A file with no marker at all predates this check (or was written before
-* #1026) and is never flagged — only a marker that's present AND disagrees
-* with the current run's own package is a real collision. Any read error
-* other than "file doesn't exist" propagates rather than being treated as
-* "nothing to collide with" — the file may genuinely be unreadable, not
-* missing.
-*/
-async function assertNoPackageCollision(repoRoot, filename, taskName, pkgRelPath) {
-	let existing;
+/** `assertNoPackageCollision`'s local-disk read, with ENOENT mapped to "nothing there." */
+async function readExistingWorkflowFile(repoRoot, filename) {
 	try {
-		existing = await readFile(join(repoRoot, ".github", "workflows", filename), "utf8");
+		return await readFile(join(repoRoot, ".github", "workflows", filename), "utf8");
 	} catch (err) {
-		if (err.code === "ENOENT") return;
+		if (err.code === "ENOENT") return null;
 		throw err;
 	}
-	const previousPkg = SOURCE_PACKAGE_MARKER.exec(existing)?.[1];
-	if (previousPkg !== void 0 && previousPkg !== pkgRelPath) throw new Error(`task "${taskName}" would overwrite .github/workflows/${filename}, already generated for package "${sanitizeForDisplay(previousPkg)}" — the same task name can't be used by two different packages (holocron#1026). If "${sanitizeForDisplay(previousPkg)}" moved or was renamed to this path, delete .github/workflows/${filename} first and re-run sync; otherwise rename one or give it a different thin-caller filename.`);
 }
 //#endregion
 //#region src/observability/resolve-telemetry/resolve-telemetry.ts