@theholocron/cli 5.0.0-alpha.145 → 5.0.0-alpha.147

package/dist/cli.mjs

@@ -17,9 +17,12 @@ import { errorMessage } from "@theholocron/misc-utils";
 import { createLogger, isCI, parseLogLevel, resolveAxiomFromEnv } from "@theholocron/observability/logger";
 import chalk from "chalk";
 import ora from "ora";
-import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
+import { execFileSync, spawn, spawnSync } from "node:child_process";
+import { stringifyJson } from "@theholocron/json-utils";
+import { readGitRemote, updateGitignore } from "@theholocron/git-utils";
 import { access, copyFile, mkdir, readFile, readdir, rename, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
+import { findRootSync } from "@theholocron/fs-utils";
 import { generateReadme } from "@theholocron/components-doc/markdown";
 import { getClients, getConfigs, getDocs, getPlugins, getSkills, getThemes, getUtils } from "@theholocron/registry-doc";
 import { createGitHubClient } from "@theholocron/github-client";
@@ -27,7 +30,6 @@ import { PostHogSink } from "@theholocron/observability/analytics";
 import { SentrySink } from "@theholocron/observability/errors";
 import load from "@commitlint/load";
 import lint from "@commitlint/lint";
-import { promisify } from "node:util";
 import { ConfigFileError, loadConfigFile } from "@theholocron/datapad";
 import search from "@inquirer/search";
 //#region src/env.ts
@@ -2275,19 +2277,21 @@ async function runNew(input) {
 	const filesPatched = patchFiles(repoDir, variants, input.description, input.homepage, input.runtimeEnvironment, print, readFn, writeFn, walkFn);
 	print(`  ${filesPatched.length} file${filesPatched.length === 1 ? "" : "s"} patched`);
 	if (input.description !== void 0 || input.homepage !== void 0) try {
-		const pkg = JSON.parse(readFn(pkgJsonPath));
+		const raw = readFn(pkgJsonPath);
+		const pkg = JSON.parse(raw);
 		if (input.description !== void 0) pkg["description"] = input.description;
 		if (input.homepage !== void 0) pkg["homepage"] = input.homepage;
-		writeFn(pkgJsonPath, JSON.stringify(pkg, null, 2) + "\n");
+		writeFn(pkgJsonPath, stringifyJson(pkg, { like: raw }));
 		print(`  ✓ package.json (description/homepage)`);
 	} catch {}
 	const displayName = input.name.split("-").map(cap).join(" ");
 	const rootTsconfigPath = path.join(repoDir, "tsconfig.json");
 	try {
-		const tsconfig = JSON.parse(readFn(rootTsconfigPath));
+		const rawTsconfig = readFn(rootTsconfigPath);
+		const tsconfig = JSON.parse(rawTsconfig);
 		if (typeof tsconfig["display"] === "string") {
 			tsconfig["display"] = displayName;
-			writeFn(rootTsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
+			writeFn(rootTsconfigPath, stringifyJson(tsconfig, { like: rawTsconfig }));
 			print(`  ✓ tsconfig.json (display)`);
 		}
 	} catch {}
@@ -2407,8 +2411,10 @@ async function runNpmBumpVersions(input) {
 	}, "npm bump-versions: start");
 	function bumpFile(absPath, label) {
 		let pkg;
+		let raw;
 		try {
-			pkg = JSON.parse(readFile(absPath));
+			raw = readFile(absPath);
+			pkg = JSON.parse(raw);
 		} catch {
 			print(`  ✗ could not parse ${label}`);
 			return;
@@ -2416,7 +2422,7 @@ async function runNpmBumpVersions(input) {
 		const old = pkg.version;
 		if (!dryRun) {
 			pkg.version = version;
-			writeFile(absPath, JSON.stringify(pkg, null, 2) + "\n");
+			writeFile(absPath, stringifyJson(pkg, { like: raw }));
 		}
 		print(`  ${dryRun ? "~" : "✓"} ${label}: ${old} → ${version}`);
 		bumped.push(label);
@@ -4154,13 +4160,11 @@ function namesInWorkspaceDir(cwd, dirName) {
 	});
 }
 async function resolveRepoName(cwd, exec) {
-	const result = await exec("git", [
-		"remote",
-		"get-url",
-		"origin"
-	], { cwd });
-	if (result.exitCode !== 0) return "unknown";
-	return /[/:]([^/:]+?)(?:\.git)?$/.exec(result.stdout.trim())?.[1] ?? "unknown";
+	return (await readGitRemote(cwd, { exec: async (args, options) => {
+		const result = await exec("git", args, options);
+		if (result.exitCode !== 0) throw new Error(`git ${args.join(" ")} exited ${result.exitCode}`);
+		return result.stdout;
+	} }))?.repo ?? "unknown";
 }
 function printNextSteps(print, env, packageNames, repoName) {
 	print("");
@@ -4710,7 +4714,7 @@ var alexrc_default = { allow: [
 //#region src/templates/configs/alexjs/create-config.ts
 const { workflowHeader: workflowHeader$9 } = createHeader({ source: "packages/cli/src/templates/configs/alexjs/create-config.ts" });
 function createRcConfig() {
-	return JSON.stringify(alexrc_default, null, 2) + "\n";
+	return stringifyJson(alexrc_default);
 }
 function createIgnoreConfig$1() {
 	return `${workflowHeader$9()}${alexignore_default}`;
@@ -4794,7 +4798,7 @@ var editorconfig_checker_default = {
 * buys nothing.
 */
 function createConfig$4() {
-	return JSON.stringify(editorconfig_checker_default, null, 2) + "\n";
+	return stringifyJson(editorconfig_checker_default);
 }
 //#endregion
 //#region src/templates/configs/pre-commit/pre-commit
@@ -5264,21 +5268,11 @@ async function installAgentPrompts({ repoRoot }) {
 	const promptsDir = join(repoRoot, AGENTS_PROMPTS_ROOT);
 	await mkdir(promptsDir, { recursive: true });
 	for (const [filename, content] of Object.entries(AGENT_PROMPTS)) await writeFile(join(promptsDir, filename), content, "utf8");
-	const gitignorePath = join(repoRoot, ".gitignore");
-	const existing = await readFile(gitignorePath, "utf8").catch(() => "");
-	const block = [
-		PROMPTS_GITIGNORE_START,
-		`/${AGENTS_PROMPTS_ROOT}/`,
-		PROMPTS_GITIGNORE_END
-	].join("\n");
-	let updated;
-	if (existing.includes(PROMPTS_GITIGNORE_START)) {
-		const start = existing.indexOf(PROMPTS_GITIGNORE_START);
-		const end = existing.indexOf(PROMPTS_GITIGNORE_END, start);
-		const afterBlock = end !== -1 ? existing.slice(end + 41) : "\n";
-		updated = existing.slice(0, start) + block + afterBlock;
-	} else updated = (existing.trimEnd() ? existing.trimEnd() + "\n\n" : "") + block + "\n";
-	await writeFile(gitignorePath, updated, "utf8");
+	await updateGitignore(join(repoRoot, ".gitignore"), {
+		start: PROMPTS_GITIGNORE_START,
+		end: PROMPTS_GITIGNORE_END,
+		lines: [`/${AGENTS_PROMPTS_ROOT}/`]
+	});
 	return `wrote ${Object.keys(AGENT_PROMPTS).length} prompt files to ${AGENTS_PROMPTS_ROOT}/`;
 }
 //#endregion
@@ -5548,8 +5542,7 @@ async function installSkills({ agent, skills, repoRoot }) {
 		}
 	}
 	const gitignorePath = join(repoRoot, ".gitignore");
-	const existingContent = await readFile(gitignorePath, "utf8").catch(() => "");
-	const previouslyInstalled = parsePreviousSkills(existingContent, symlinkFn);
+	const previouslyInstalled = parsePreviousSkills(await readFile(gitignorePath, "utf8").catch(() => ""), symlinkFn);
 	const currentSet = new Set(skills);
 	const stale = previouslyInstalled.filter((n) => !currentSet.has(n));
 	for (const name of stale) {
@@ -5609,7 +5602,7 @@ async function installSkills({ agent, skills, repoRoot }) {
 			}
 		}
 	}
-	if (installed.length > 0 || stale.length > 0 || missing.length > 0 || externalFailed.length > 0) await updateSkillsGitignore(gitignorePath, existingContent, [
+	if (installed.length > 0 || stale.length > 0 || missing.length > 0 || externalFailed.length > 0) await updateSkillsGitignore(gitignorePath, [
 		...installed,
 		...missing,
 		...externalFailed
@@ -5621,14 +5614,24 @@ async function installSkills({ agent, skills, repoRoot }) {
 	if (missing.length > 0) parts.push(`unknown: ${missing.join(", ")}`);
 	return parts.join("; ");
 }
+/**
+* The skill names a previous `holocron setup` recorded in the `.gitignore`
+* managed block. A block missing its end marker (hand-edited, truncated) runs
+* only to the next blank line — the same rule `updateGitignore` uses to
+* replace it — so user-written ignore rules further down are never mistaken
+* for installed skills and pruned.
+*/
 function parsePreviousSkills(gitignoreContent, symlinkFn) {
-	if (!gitignoreContent.includes(GITIGNORE_BLOCK_START)) return [];
 	const startIdx = gitignoreContent.indexOf(GITIGNORE_BLOCK_START);
+	if (startIdx === -1) return [];
 	const endIdx = gitignoreContent.indexOf(GITIGNORE_BLOCK_END, startIdx);
-	const block = endIdx !== -1 ? gitignoreContent.slice(startIdx, endIdx) : gitignoreContent.slice(startIdx);
+	const blankAt = /\r?\n[ \t]*\r?\n/.exec(gitignoreContent.slice(startIdx));
+	const blankIdx = blankAt ? startIdx + blankAt.index : -1;
+	const blockEnd = endIdx !== -1 && (blankIdx === -1 || endIdx < blankIdx) ? endIdx : blankIdx === -1 ? gitignoreContent.length : blankIdx;
+	const block = gitignoreContent.slice(startIdx, blockEnd);
 	const placeholder = "__placeholder__";
 	const symlinkPrefix = `/${symlinkFn(placeholder)}`.replace(placeholder, "");
-	return block.split("\n").filter((line) => line.startsWith(symlinkPrefix)).map((line) => line.slice(symlinkPrefix.length));
+	return block.split(/\r?\n/).filter((line) => line.startsWith(symlinkPrefix)).map((line) => line.slice(symlinkPrefix.length));
 }
 async function copyDirRecursive(src, dest) {
 	await mkdir(dest, { recursive: true });
@@ -5640,21 +5643,12 @@ async function copyDirRecursive(src, dest) {
 		else await copyFile(srcPath, destPath);
 	}
 }
-async function updateSkillsGitignore(gitignorePath, existingContent, skills, symlinkFn) {
-	const entries = [`/${AGENTS_SKILLS_ROOT}/`, ...skills.map((n) => `/${symlinkFn(n)}`)];
-	const block = [
-		GITIGNORE_BLOCK_START,
-		...entries,
-		GITIGNORE_BLOCK_END
-	].join("\n");
-	let content;
-	if (existingContent.includes(GITIGNORE_BLOCK_START)) {
-		const start = existingContent.indexOf(GITIGNORE_BLOCK_START);
-		const end = existingContent.indexOf(GITIGNORE_BLOCK_END, start);
-		const afterBlock = end !== -1 ? existingContent.slice(end + 40) : "\n";
-		content = existingContent.slice(0, start) + block + afterBlock;
-	} else content = (existingContent.trimEnd() ? existingContent.trimEnd() + "\n\n" : "") + block + "\n";
-	await writeFile(gitignorePath, content, "utf8");
+async function updateSkillsGitignore(gitignorePath, skills, symlinkFn) {
+	await updateGitignore(gitignorePath, {
+		start: GITIGNORE_BLOCK_START,
+		end: GITIGNORE_BLOCK_END,
+		lines: [`/${AGENTS_SKILLS_ROOT}/`, ...skills.map((n) => `/${symlinkFn(n)}`)]
+	});
 }
 //#endregion
 //#region src/commands/setup/run-setup.ts
@@ -6359,7 +6353,7 @@ async function ensurePrepareScript(repoRoot) {
 	if (/(^|[\s&|;])husky($|[\s&|;])/.test(current)) return false;
 	scripts.prepare = current ? `${current} && husky` : "husky";
 	pkg.scripts = scripts;
-	await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+	await writeFile(pkgPath, stringifyJson(pkg, { like: content }), "utf8");
 	return true;
 }
 //#endregion
@@ -6462,55 +6456,6 @@ function runSkillsUpdate(input) {
 	return { status: exitCode === 0 ? "ok" : "fail" };
 }
 //#endregion
-//#region src/utils/find-git-root.ts
-/**
-* Walks up from `startDir` looking for a `.git` entry — a directory for a
-* normal checkout, a file for a worktree/submodule (contains a `gitdir:`
-* pointer, never followed here; its presence is enough to mark the root).
-*
-* `--cwd` picks which `holocron.config.ts` to load, which is NOT
-* necessarily the git repository root — a monorepo subpackage (e.g.
-* `packages/sentinel`) has its own config but no `.git` of its own.
-* Anything inherently repo-wide (`.github/workflows`, `.github/CODEOWNERS`,
-* `turbo.json`, "is this repo a monorepo") must resolve against the real
-* root, not `--cwd`, or it silently writes into a GitHub-invisible nested
-* `.github/` instead (holocron#1014).
-*
-* Falls back to the resolved start dir when no `.git` is found walking all
-* the way to the filesystem root — soft-skip, not a hard failure; every
-* caller already treats `--cwd` itself as the root today, so an
-* unexpected non-git checkout just keeps today's behavior.
-*
-* Resolves `startDir` to an absolute, symlink-free path before walking:
-* a relative `--cwd` (e.g. `"packages/sentinel"`) would otherwise hit
-* `dirname`'s fixed point at `"."` after only two steps, far short of the
-* real root, and a `--cwd` reached through a symlink would walk the
-* symlink's own lexical ancestors instead of the physical directory
-* tree its target actually lives in — in both cases landing on the
-* wrong directory, not genuinely "no `.git` found anywhere."
-*
-* `realpathSync` itself throws when `startDir` doesn't exist on disk at
-* all (a real possibility in tests, which often use a synthetic path
-* like `"/tmp/test"` that's never actually created) — caught and treated
-* the same as "no `.git` found," since this function's whole contract is
-* soft-skip, never a hard failure.
-*/
-function findGitRoot(startDir) {
-	let resolvedStart;
-	try {
-		resolvedStart = realpathSync(startDir);
-	} catch {
-		return startDir;
-	}
-	let dir = resolvedStart;
-	for (;;) {
-		if (existsSync(`${dir}/.git`)) return dir;
-		const parent = dirname(dir);
-		if (parent === dir) return resolvedStart;
-		dir = parent;
-	}
-}
-//#endregion
 //#region src/commands/sync-readme.ts
 const MARKER_INSTALL_START = "<!-- holocron:installation -->";
 const MARKER_INSTALL_END = "<!-- /holocron:installation -->";
@@ -6917,7 +6862,10 @@ async function runSync(input) {
 	const dryRun = input.context.dryRun ?? false;
 	const requestedSteps = input.steps;
 	const steps = [];
-	const gitRoot = findGitRoot(input.context.repoRoot);
+	const gitRoot = findRootSync(input.context.repoRoot, ".git", {
+		fallback: "start",
+		realpath: true
+	});
 	let resolvedRepoRoot;
 	try {
 		resolvedRepoRoot = realpathSync(input.context.repoRoot);
@@ -7365,7 +7313,7 @@ async function writePackageJsonField(repoRoot, field, value) {
 	}
 	const pkg = JSON.parse(content);
 	pkg[field] = value;
-	await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+	await writeFile(pkgPath, stringifyJson(pkg, { like: content }), "utf8");
 	return true;
 }
 /**
@@ -7407,7 +7355,7 @@ async function mergePackageJsonScripts(repoRoot, desired, turboEligible) {
 	}
 	if (changed.length === 0) return [];
 	pkg.scripts = scripts;
-	await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+	await writeFile(pkgPath, stringifyJson(pkg, { like: content }), "utf8");
 	return changed.sort();
 }
 /**
@@ -8146,7 +8094,7 @@ function patchPackageJson(content, from, to) {
 			changed = true;
 		}
 	}
-	return changed ? JSON.stringify(pkg, null, 2) + "\n" : null;
+	return changed ? stringifyJson(pkg, { like: content }) : null;
 }
 function patchYaml(content, from, to) {
 	const updated = content.replace(/node-version:\s+['"]?(\d+)['"]?/g, (match, ver) => ver === String(from) ? match.replace(String(from), String(to)) : match);
@@ -8369,7 +8317,6 @@ async function lintCommitMsgFile(filePath, cwd = process.cwd()) {
 * Probe order is TS-first (`.ts` → `.js` → `.mjs` → `.cjs` → `.json`) —
 * see ADR-0010 / issue #75 / #81.
 */
-const execFileAsync = promisify(execFile);
 /**
 * Read + parse + resolve `holocron.config.*` starting from the given
 * directory, walking up through ancestors to the nearest `.git` boundary
@@ -8395,10 +8342,10 @@ async function deriveDefaults(configDir, raw) {
 	const result = { ...raw };
 	if (!result.name) result.name = await readPackageJsonName(configDir) ?? basename(configDir);
 	if (result.repo && !result.repo.name) {
-		const repoName = await readGitRemote(configDir);
-		if (repoName) result.repo = {
+		const remote = await readGitRemote(configDir);
+		if (remote?.host === "github.com") result.repo = {
 			...result.repo,
-			name: repoName
+			name: remote.slug
 		};
 	}
 	const manifest = await loadTasksConfig(configDir);
@@ -8418,24 +8365,6 @@ async function readPackageJsonName(dir) {
 		return;
 	}
 }
-async function readGitRemote(dir) {
-	try {
-		const { stdout } = await execFileAsync("git", [
-			"remote",
-			"get-url",
-			"origin"
-		], { cwd: dir });
-		return parseGitRemoteUrl(stdout.trim());
-	} catch {
-		return;
-	}
-}
-function parseGitRemoteUrl(url) {
-	const httpsMatch = url.match(/github\.com\/([^/]+\/[^/]+?)(?:\.git)?$/);
-	if (httpsMatch) return httpsMatch[1];
-	const sshMatch = url.match(/github\.com:([^/]+\/[^/]+?)(?:\.git)?$/);
-	if (sshMatch) return sshMatch[1];
-}
 //#endregion
 //#region src/interactive-menu.ts
 /**