@theholocron/cli 5.0.0-alpha.165 → 5.0.0-alpha.167

package/dist/cli.mjs

@@ -23,7 +23,7 @@ import chalk from "chalk";
 import search from "@inquirer/search";
 import { execFileSync, spawn, spawnSync } from "node:child_process";
 import ora from "ora";
-import { findRootSync, walkFilesSync } from "@theholocron/fs-utils";
+import { findRootSync, isWorkspaceRoot, walkFilesSync } from "@theholocron/fs-utils";
 import { access, copyFile, mkdir, readFile, readdir, rename, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
 import { stringifyJson } from "@theholocron/json-utils";
 import { createHash, randomUUID } from "node:crypto";
@@ -5877,14 +5877,35 @@ async function installSkills({ agent, skills, repoRoot }) {
 	try {
 		skillsRoot = dirname(require.resolve("@theholocron/skills/package.json"));
 	} catch {
-		if (spawnSync("pnpm", [
+		const atWorkspaceRoot = await isWorkspaceRoot(repoRoot);
+		let result = spawnSync("pnpm", [
 			"add",
 			"-D",
+			...atWorkspaceRoot ? ["-w"] : [],
 			"@theholocron/skills"
 		], {
 			cwd: repoRoot,
-			stdio: "inherit"
-		}).status !== 0) throw new Error("failed to auto-install @theholocron/skills");
+			stdio: [
+				"inherit",
+				"inherit",
+				"pipe"
+			],
+			encoding: "utf8"
+		});
+		if (result.status !== 0 && !atWorkspaceRoot && result.stderr?.includes("ERR_PNPM_ADDING_TO_ROOT")) {
+			process.stderr.write(result.stderr);
+			result = spawnSync("pnpm", [
+				"add",
+				"-D",
+				"-w",
+				"@theholocron/skills"
+			], {
+				cwd: repoRoot,
+				stdio: "inherit",
+				encoding: "utf8"
+			});
+		} else if (result.status !== 0 && result.stderr) process.stderr.write(result.stderr);
+		if (result.status !== 0) throw new Error("failed to auto-install @theholocron/skills");
 		try {
 			skillsRoot = dirname(require.resolve("@theholocron/skills/package.json"));
 		} catch {
@@ -6276,7 +6297,7 @@ async function runSetup(input) {
 		}
 		const properties = {};
 		if (effectivePreset && effectivePreset !== "none") properties["holocron_branch_protection_level"] = effectivePreset;
-		const isMonorepo = await access(join(input.context.repoRoot, "pnpm-workspace.yaml")).then(() => true).catch(() => false);
+		const isMonorepo = await isWorkspaceRoot(input.context.repoRoot);
 		properties["monorepo"] = String(isMonorepo);
 		const manual = repo?.properties ?? {};
 		if (manual.lifecycle) properties["lifecycle"] = manual.lifecycle;
@@ -7262,7 +7283,7 @@ async function runSync(input) {
 					const properties = {};
 					const effectivePreset = repo?.protection;
 					if (effectivePreset && effectivePreset !== "none") properties["holocron_branch_protection_level"] = effectivePreset;
-					const isMonorepo = await access(join(gitRoot, "pnpm-workspace.yaml")).then(() => true).catch(() => false);
+					const isMonorepo = await isWorkspaceRoot(gitRoot);
 					properties["monorepo"] = String(isMonorepo);
 					const manual = repo?.properties ?? {};
 					if (manual.lifecycle) properties["lifecycle"] = manual.lifecycle;