@tommy-ca/lazypi 0.10.3 → 0.10.4

package/bin/lazypi.mjs

@@ -185,7 +185,7 @@ function matchesSelector(pkg, selectors) {
 	return selectors.some((name) => name === pkg.category || name === pkg.id);
 }
 
-function resolveSelection(flags) {
+export function resolveSelection(flags) {
 	if (flags.only) {
 		if (!validateSelectors(flags.only, "--only")) return null;
 		return new Set(PACKAGES.filter((p) => matchesSelector(p, flags.only)).map((p) => p.id));
@@ -253,9 +253,47 @@ export function buildSpawnOptions(options = {}, _platformName = platform()) {
 	return { ...options };
 }
 
+function isWindowsCmdOrBat(resolved, platformName = platform()) {
+	return platformName === "win32" && /\.(cmd|bat)$/i.test(String(resolved));
+}
+
+const CMD_QUOTE_RE = /[\s&|<>^%!"()]/;
+
+export function quoteCmdArg(value, { always = false } = {}) {
+	const text = String(value);
+	if (!always && text !== "" && !CMD_QUOTE_RE.test(text)) return text;
+	return `"${text.replaceAll("%", "%%").replaceAll('"', '""')}"`;
+}
+
+export function windowsComSpec(env = process.env) {
+	const comspec = env.ComSpec;
+	if (comspec && /(^|[\\/])cmd\.exe$/i.test(comspec)) return comspec;
+	const root = env.SystemRoot || "C:\\Windows";
+	return `${root}\\System32\\cmd.exe`;
+}
+
+export function pickWindowsWhereHit(stdout) {
+	const lines = String(stdout ?? "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+	return lines.find((line) => /\.(cmd|bat|exe|com)$/i.test(line)) ?? lines[0] ?? null;
+}
+
+export function windowsSpawnArgv(resolved, args = [], platformName = platform()) {
+	if (isWindowsCmdOrBat(resolved, platformName)) {
+		return {
+			command: windowsComSpec(),
+			args: ["/d", "/s", "/c", "call", quoteCmdArg(resolved, { always: true }), ...args.map((arg) => quoteCmdArg(arg))],
+		};
+	}
+	return { command: resolved, args: [...args] };
+}
+
 function spawnCommand(command, args = [], options = {}) {
 	const resolved = command === "pi" || command === "npm" ? commandPath(command) ?? command : command;
-	return spawnSync(resolved, args, buildSpawnOptions(options));
+	const spawned = windowsSpawnArgv(resolved, args);
+	const spawnOptions = isWindowsCmdOrBat(resolved)
+		? { ...buildSpawnOptions(options), shell: false, windowsVerbatimArguments: true }
+		: buildSpawnOptions(options);
+	return spawnSync(spawned.command, spawned.args, spawnOptions);
 }
 
 function hasCmd(name) {
@@ -355,6 +393,7 @@ function commandPath(name) {
 	const command = platform() === "win32" ? "where" : "which";
 	const probe = spawnSync(command, [name], buildSpawnOptions({ encoding: "utf8" }));
 	if (probe.status !== 0) return null;
+	if (platform() === "win32") return pickWindowsWhereHit(probe.stdout);
 	const first = String(probe.stdout ?? "").split(/\r?\n/).map((line) => line.trim()).find(Boolean);
 	return first || null;
 }
@@ -766,6 +805,11 @@ function cmdStatus(flags) {
 	);
 
 	printHeader(`Installed from LazyPi catalog (${installed.length}/${PACKAGES.length}):`);
+	const coreTotal = PACKAGES.filter((pkg) => pkg.category === "core").length;
+	const optionalTotal = PACKAGES.filter((pkg) => pkg.category === "optional").length;
+	const coreInstalled = installed.filter((pkg) => pkg.category === "core").length;
+	const optionalInstalled = installed.filter((pkg) => pkg.category === "optional").length;
+	console.log(dim(`  core ${coreInstalled}/${coreTotal}, optional ${optionalInstalled}/${optionalTotal}`));
 	if (installed.length === 0) console.log(dim("  none"));
 	for (const pkg of installed) {
 		const installedSource = [...sources].find((src) => sourcesMatch(pkg.source, src)) ?? pkg.source;
@@ -822,7 +866,7 @@ function cmdDoctor(flags) {
 	let problems = 0;
 	let warnings = 0;
 	const pass = (msg) => console.log(`  ${green("✓")} ${msg}`);
-	const warn = (msg, { fatal = true } = {}) => {
+	const warn = (msg, { fatal = false } = {}) => {
 		console.log(`  ${yellow("!")} ${msg}`);
 		if (fatal) problems++;
 		else warnings++;
@@ -860,7 +904,10 @@ function cmdDoctor(flags) {
 	else if (error) fail(`${path} is not valid JSON — ${error}`);
 	else {
 		pass(`${path} is readable`);
-		const unpinnedGit = [...sources].filter((src) => /^git:github\.com\/[^/@]+\/[^@\s]+$/.test(src));
+		const unpinnedGit = [...sources].filter((src) => {
+			if (!/^git:github\.com\/[^/@]+\/[^@\s]+$/.test(src)) return false;
+			return !PACKAGES.some((pkg) => sourcesMatch(pkg.source, src) || isLegacySourceForPackage(pkg, src));
+		});
 		for (const src of unpinnedGit) warn(`${src} is an unpinned git head — pin it to a commit for reproducible installs`, { fatal: false });
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tommy-ca/lazypi",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Opinionated one-shot installer for a full-featured Pi coding agent setup.",
   "license": "MIT",
   "repository": {