@theholocron/cli 5.0.0-alpha.31 → 5.0.0-alpha.33

package/dist/cli.mjs

@@ -5348,13 +5348,20 @@ async function runSetup(input) {
 					await source.writeRepoFile("turbo.json", content);
 				}));
 				print(formatStep(steps[steps.length - 1]));
-				const rootPkg = await readFile(join(input.context.repoRoot, "package.json"), "utf8").then((raw) => JSON.parse(raw)).catch(() => null);
+				const rootPkgRaw = await readFile(join(input.context.repoRoot, "package.json"), "utf8").catch(() => null);
+				const rootPkg = rootPkgRaw ? JSON.parse(rootPkgRaw) : null;
 				const workspaceYaml = await readFile(join(input.context.repoRoot, "pnpm-workspace.yaml"), "utf8").catch(() => "");
 				const rootScripts = Object.keys(rootPkg?.scripts ?? {});
 				const workspaceFix = astromechTurbo.ensureRootWorkspaceMember(workspaceYaml, rootScripts);
 				if (workspaceFix.changed) steps.push(await runStep("source", "fix pnpm-workspace.yaml (root workspace member, #692)", dryRun, async () => {
 					await source.writeRepoFile("pnpm-workspace.yaml", workspaceFix.content);
 				}));
+				if (rootPkgRaw) {
+					const depFix = astromechTurbo.ensureTurboDependency(rootPkgRaw, workspaceFix.content);
+					if (depFix.changed) steps.push(await runStep("source", "add turbo devDependency", dryRun, async () => {
+						await source.writeRepoFile("package.json", depFix.content);
+					}));
+				}
 			}
 			print(formatStep(steps[steps.length - 1]));
 		}
@@ -6574,13 +6581,16 @@ async function runSync(input) {
 		} else {
 			const tasksConfig = { tasks: config.tasks };
 			if (config.holocronScript !== void 0) tasksConfig.holocronScript = config.holocronScript;
-			const desired = createAstromech({
+			const astromechScripts = createAstromech({
 				cwd: input.context.repoRoot,
 				config: tasksConfig,
 				logger
-			}).packageScripts();
+			});
+			const desired = astromechScripts.packageScripts();
+			const turboContent = astromechScripts.turboConfig();
+			const turboEligible = new Set(turboContent ? Object.keys(JSON.parse(turboContent).tasks) : []);
 			steps.push(await runSyncStep("local", "sync scripts", dryRun, async () => {
-				const changed = await mergePackageJsonScripts(input.context.repoRoot, desired);
+				const changed = await mergePackageJsonScripts(input.context.repoRoot, desired, turboEligible);
 				if (changed === null) return "no package.json";
 				if (changed.length === 0) return `${Object.keys(desired).length} scripts already current`;
 				return `${changed.join(", ")} set`;
@@ -6607,7 +6617,8 @@ async function runSync(input) {
 					await writeFile(join(input.context.repoRoot, "turbo.json"), content, "utf8");
 				}));
 				print(formatSyncStep(steps[steps.length - 1]));
-				const rootPkg = await readFile(join(input.context.repoRoot, "package.json"), "utf8").then((raw) => JSON.parse(raw)).catch(() => null);
+				const rootPkgRaw = await readFile(join(input.context.repoRoot, "package.json"), "utf8").catch(() => null);
+				const rootPkg = rootPkgRaw ? JSON.parse(rootPkgRaw) : null;
 				const workspaceYaml = await readFile(join(input.context.repoRoot, "pnpm-workspace.yaml"), "utf8").catch(() => "");
 				const rootScripts = Object.keys(rootPkg?.scripts ?? {});
 				const workspaceFix = astromechTurbo.ensureRootWorkspaceMember(workspaceYaml, rootScripts);
@@ -6617,6 +6628,15 @@ async function runSync(input) {
 					}));
 					print(formatSyncStep(steps[steps.length - 1]));
 				}
+				if (rootPkgRaw) {
+					const depFix = astromechTurbo.ensureTurboDependency(rootPkgRaw, workspaceFix.content);
+					if (depFix.changed) {
+						steps.push(await runSyncStep("local", "add turbo devDependency", dryRun, async () => {
+							await writeFile(join(input.context.repoRoot, "package.json"), depFix.content, "utf8");
+						}));
+						print(formatSyncStep(steps[steps.length - 1]));
+					}
+				}
 			}
 		}
 		if (stepName === "wiki") {
@@ -6700,8 +6720,21 @@ async function writePackageJsonField(repoRoot, field, value) {
 * Merge `desired` script entries into `package.json#scripts` — sets only the
 * listed keys, never touches the rest. Returns the sorted list of keys that
 * drifted (empty when all current), or `null` when there is no `package.json`.
+*
+* `turboEligible` (#747): task names `turbo.json` fans out — the same set
+* {@link EnsureRootWorkspaceMemberResult} above already keys off. For those
+* only, an *existing* script that isn't the generated `holocron run <task>
+* --` wrapper is left untouched: root may genuinely be a directly-buildable
+* package (not an orchestrator) with its own real command (`tsc --noEmit`,
+* `vitest run`, …) for that task. Overwriting it would silently discard the
+* real command and, once `turbo.json` exists and root is a real workspace
+* member (#692), reintroduce infinite recursion — `turbo run <task>` →
+* root's own `<task>` script → the wrapper → `holocron run <task>` sees
+* `turbo.json` still defines the task → `turbo run <task>` again, forever.
+* Every other key (non-turbo tasks, `holocron`, `prepare`, …) has no
+* legitimate direct-command alternative and stays fully generator-owned.
 */
-async function mergePackageJsonScripts(repoRoot, desired) {
+async function mergePackageJsonScripts(repoRoot, desired, turboEligible) {
 	const pkgPath = join(repoRoot, "package.json");
 	let content;
 	try {
@@ -6712,15 +6745,31 @@ async function mergePackageJsonScripts(repoRoot, desired) {
 	const pkg = JSON.parse(content);
 	const scripts = pkg.scripts ?? {};
 	const changed = [];
-	for (const [name, command] of Object.entries(desired)) if (scripts[name] !== command) {
-		scripts[name] = command;
-		changed.push(name);
+	for (const [name, command] of Object.entries(desired)) {
+		const existing = scripts[name];
+		if (turboEligible.has(name) && existing !== void 0 && !isGeneratedRunWrapper(existing, name)) continue;
+		if (existing !== command) {
+			scripts[name] = command;
+			changed.push(name);
+		}
 	}
 	if (changed.length === 0) return [];
 	pkg.scripts = scripts;
 	await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
 	return changed.sort();
 }
+/**
+* Matches the exact shape `packageScripts()` generates for `taskName` —
+* `<bin> run <taskName> --`, `<bin>` normally `holocron` but substitutable
+* (`holocronScript`, itself allowed to be multi-word, e.g. `"node
+packages/cli/dist/cli.mjs"` — see its own test). Checking the *suffix*
+* rather than the whole string means an old wrapper survives a
+* `holocronScript` rename intact — it's still recognized as a wrapper (safe
+* to update to the new one), not mistaken for a real command.
+*/
+function isGeneratedRunWrapper(command, taskName) {
+	return command.endsWith(` run ${taskName} --`);
+}
 const README_DESC_START = "<!-- holocron:description -->";
 const README_DESC_END = "<!-- /holocron:description -->";
 async function updateReadmeDescription(repoRoot, description) {