@chanom/cli 0.4.1 → 0.4.3

package/dist/index.js

@@ -4,7 +4,7 @@ import { Cause, Chunk, Data, Effect, Layer, LogLevel, Logger, Option, Stream } f
 import * as clack from "@clack/prompts";
 import pc from "picocolors";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-//#region ../internal/src/domain/package-manager.ts
+// ../internal/src/domain/package-manager.ts
 /** How to run a locally installed binary with each package manager. */
 const PM_EXEC = {
 	pnpm: ["pnpm", "exec"],
@@ -37,8 +37,7 @@ function parsePmUserAgent(agent) {
 function resolvePm(hints) {
 	return parsePmField(hints.packageManagerField) ?? parsePmUserAgent(hints.userAgent) ?? hints.fallback ?? "pnpm";
 }
-//#endregion
-//#region ../internal/src/domain/vscode.ts
+// ../internal/src/domain/vscode.ts
 /** Keys VS Code reads as a per-language override, e.g. `[typescript]`. */
 const LANGUAGES = [
 	"markdown",
@@ -109,8 +108,7 @@ function planExtensions(current, wanted) {
 		added
 	};
 }
-//#endregion
-//#region ../internal/src/services/command-runner.ts
+// ../internal/src/services/command-runner.ts
 const collectText = (stream) => stream.pipe(Stream.decodeText(), Stream.mkString);
 /**
 * Low-level process execution. Everything that shells out (git, package
@@ -146,8 +144,7 @@ var CommandRunner = class extends Effect.Service()("internal/CommandRunner", { e
 		execInherit
 	};
 }) }) {};
-//#endregion
-//#region ../internal/src/services/git.ts
+// ../internal/src/services/git.ts
 /** Git operations, built on top of {@link CommandRunner}. */
 var Git = class extends Effect.Service()("internal/Git", { effect: Effect.gen(function* () {
 	const runner = yield* CommandRunner;
@@ -196,8 +193,7 @@ var Git = class extends Effect.Service()("internal/Git", { effect: Effect.gen(fu
 		readGitignore: (cwd) => fs.readFileString(path.join(cwd, ".gitignore"))
 	};
 }) }) {};
-//#endregion
-//#region ../internal/src/services/prompter.ts
+// ../internal/src/services/prompter.ts
 var Cancelled = class extends Data.TaggedError("Cancelled") {};
 const guardCancel = (make) => Effect.promise(make).pipe(Effect.filterOrFail((result) => typeof result !== "symbol", () => new Cancelled()));
 /**
@@ -283,17 +279,15 @@ function skillLink(skill) {
 		target: `../../${SKILLS_ROOT}/${skill.name}`
 	};
 }
-//#endregion
-//#region src/bundled-versions.ts
+// src/bundled-versions.ts
 const bundledVersions = {
-	oxlint: "1.73.0",
-	oxlintTsgolint: "0.24.0",
-	oxfmt: "0.58.0",
+	oxlint: "1.89.0",
+	oxlintTsgolint: "7.0.2005",
+	oxfmt: "0.74.0",
 	knip: "6.26.0",
-	devConfig: "0.0.3"
+	devConfig: "0.0.5"
 };
-//#endregion
-//#region src/domain/pkg.ts
+// src/domain/pkg.ts
 var PkgNotFound = class extends Data.TaggedError("PkgNotFound") {};
 var PkgInvalid = class extends Data.TaggedError("PkgInvalid") {};
 function isEsm(pkg) {
@@ -309,8 +303,7 @@ function getMismatchedPackage(pkg, name, version) {
 	const installed = pkg.dependencies?.[name] ?? pkg.devDependencies?.[name];
 	return installed !== void 0 && stripRangePrefix(installed) === version ? void 0 : `${name}@${version}`;
 }
-//#endregion
-//#region src/domain/package-manager.ts
+// src/domain/package-manager.ts
 /**
 * Extra `add` flags needed when installing at a workspace root: pnpm and yarn
 * classic refuse root installs without `-w` / `-W`. npm, bun, and yarn berry
@@ -324,13 +317,13 @@ function workspaceRootFlags(pm, hints) {
 		case "bun": return [];
 	}
 }
-//#endregion
-//#region src/services/package-installer.ts
+// src/services/package-installer.ts
 var InstallFailed = class extends Data.TaggedError("InstallFailed") {};
 /**
 * Installs npm packages with the detected package manager, adding the
 * workspace-root flag (pnpm `-w`, yarn classic `-W`) when the target
-* directory is a workspace root.
+* directory is a workspace root. Output is captured rather than inherited so
+* the caller's spinner is not redrawn over the package manager's own progress.
 */
 var PackageInstaller = class extends Effect.Service()("cli/PackageInstaller", { effect: Effect.gen(function* () {
 	const runner = yield* CommandRunner;
@@ -343,15 +336,17 @@ var PackageInstaller = class extends Effect.Service()("cli/PackageInstaller", {
 		hasWorkspacesField: hasWorkspacesField(cwd),
 		hasYarnBerryConfig: has(cwd, ".yarnrc.yml")
 	}, { concurrency: 3 });
-	return { installDev: (pm, cwd, packages) => workspaceHints(cwd).pipe(Effect.flatMap((hints) => runner.execInherit(pm, [
+	return { installDev: (pm, cwd, packages) => workspaceHints(cwd).pipe(Effect.flatMap((hints) => runner.capture(pm, [
 		"add",
 		"-D",
 		...workspaceRootFlags(pm, hints),
 		...packages
-	], cwd)), Effect.filterOrFail((code) => code === 0, () => new InstallFailed({ pm })), Effect.asVoid) };
+	], cwd)), Effect.filterOrFail((result) => result.exitCode === 0, (result) => new InstallFailed({
+		pm,
+		output: [result.stdout, result.stderr].filter(Boolean).join("\n")
+	})), Effect.asVoid) };
 }) }) {};
-//#endregion
-//#region src/utils/detect-pm.ts
+// src/utils/detect-pm.ts
 const detectPm = (cwd, userAgent = process.env["npm_config_user_agent"], fallback = "pnpm") => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const pkgPath = (yield* Path.Path).join(cwd, "package.json");
@@ -361,8 +356,7 @@ const detectPm = (cwd, userAgent = process.env["npm_config_user_agent"], fallbac
 		fallback
 	});
 });
-//#endregion
-//#region src/utils/pkg-file.ts
+// src/utils/pkg-file.ts
 const readPkg = (cwd) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const pkgPath = (yield* Path.Path).join(cwd, "package.json");
@@ -379,8 +373,7 @@ const readPkg = (cwd) => Effect.gen(function* () {
 const writePkg = (pkgPath, pkg) => Effect.gen(function* () {
 	yield* (yield* FileSystem.FileSystem).writeFileString(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 });
-//#endregion
-//#region src/domain/setup.ts
+// src/domain/setup.ts
 const SETUP_FILE_CANDIDATES = {
 	oxlint: [
 		"oxlint.config.js",
@@ -450,8 +443,7 @@ function configFlag(configFile) {
 	const extension = configFile.slice(configFile.lastIndexOf(".") + 1);
 	return AUTO_DISCOVERED.has(extension) ? "" : ` -c ${configFile}`;
 }
-//#endregion
-//#region src/utils/detect-setup.ts
+// src/utils/detect-setup.ts
 /** Finds an existing config file for the given tool, if any. */
 const detectSetupFile = (type, cwd) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
@@ -462,8 +454,7 @@ const detectSetupFile = (type, cwd) => Effect.gen(function* () {
 	}
 	return Option.none();
 });
-//#endregion
-//#region src/commands/add-commitlint/logic.ts
+// src/commands/add-commitlint/logic.ts
 function getPackages$5(pkg) {
 	const missing = [];
 	if (!isPackageInstalled(pkg, "@commitlint/cli")) missing.push("@commitlint/cli");
@@ -479,8 +470,7 @@ function commitMsgHook(pm) {
 		"$1"
 	].join(" ") + "\n";
 }
-//#endregion
-//#region src/commands/add-commitlint/index.ts
+// src/commands/add-commitlint/index.ts
 const apply$7 = Effect.fn("add-commitlint.apply")(function* (cwd, pm) {
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -495,13 +485,11 @@ const apply$7 = Effect.fn("add-commitlint.apply")(function* (cwd, pm) {
 		else yield* fs.writeFileString(hookPath, commitMsgHook(pm));
 	}
 });
-//#endregion
-//#region src/commands/add-husky/logic.ts
+// src/commands/add-husky/logic.ts
 function getPackages$4(pkg) {
 	return isPackageInstalled(pkg, "husky") ? [] : ["husky"];
 }
-//#endregion
-//#region src/commands/add-husky/index.ts
+// src/commands/add-husky/index.ts
 var HuskyInitFailed = class extends Data.TaggedError("HuskyInitFailed") {};
 const apply$6 = Effect.fn("add-husky.apply")(function* (cwd, pm) {
 	const fs = yield* FileSystem.FileSystem;
@@ -521,8 +509,7 @@ const apply$6 = Effect.fn("add-husky.apply")(function* (cwd, pm) {
 	], cwd);
 	if (exitCode !== 0) return yield* new HuskyInitFailed({ exitCode });
 });
-//#endregion
-//#region src/domain/scripts.ts
+// src/domain/scripts.ts
 /**
 * Merges `wanted` scripts into `current` without overwriting anything the user
 * already has. Returns the merged scripts plus which keys were added or skipped.
@@ -542,8 +529,7 @@ function planScripts(current, wanted) {
 		skipped
 	};
 }
-//#endregion
-//#region src/commands/add-knip/logic.ts
+// src/commands/add-knip/logic.ts
 function getPackages$3(pkg, versions) {
 	return isPackageInstalled(pkg, "knip") ? [] : [`knip@${versions.knip}`, `@chanom/dev-config@${versions.devConfig}`];
 }
@@ -556,8 +542,7 @@ function configFile$2(esm) {
 function getScriptPlan$2(scripts) {
 	return planScripts(scripts, { knip: "knip" });
 }
-//#endregion
-//#region src/commands/add-knip/index.ts
+// src/commands/add-knip/index.ts
 /** Returns a copy of `pkg` with missing scripts added; the caller owns writing package.json. */
 const apply$5 = Effect.fn("add-knip.apply")(function* (cwd, esm, pkg) {
 	const fs = yield* FileSystem.FileSystem;
@@ -576,8 +561,7 @@ const apply$5 = Effect.fn("add-knip.apply")(function* (cwd, esm, pkg) {
 		scripts: plan.scripts
 	};
 });
-//#endregion
-//#region src/commands/add-lint-staged/logic.ts
+// src/commands/add-lint-staged/logic.ts
 function getPackages$2(pkg) {
 	return isPackageInstalled(pkg, "lint-staged") ? [] : ["lint-staged"];
 }
@@ -594,8 +578,7 @@ function buildConfig(linters, formatters, configFiles) {
 	}
 	return config;
 }
-//#endregion
-//#region src/commands/add-lint-staged/index.ts
+// src/commands/add-lint-staged/index.ts
 /**
 * Config file each tool will run against: an existing one when `add-oxlint` /
 * `add-oxfmt` skipped writing, otherwise the name they scaffold. lint-staged
@@ -637,8 +620,7 @@ const apply$4 = Effect.fn("add-lint-staged.apply")(function* (cwd, esm, linters
 		else yield* fs.writeFileString(hookPath, "lint-staged\n");
 	}
 });
-//#endregion
-//#region src/commands/add-oxfmt/logic.ts
+// src/commands/add-oxfmt/logic.ts
 function getPackages$1(pkg, versions) {
 	return [getMismatchedPackage(pkg, "oxfmt", versions.oxfmt), getMismatchedPackage(pkg, "@chanom/dev-config", versions.devConfig)].filter((p) => p !== void 0);
 }
@@ -655,8 +637,7 @@ function getScriptPlan$1(scripts, configFile) {
 		"format:check": `oxfmt --check${config}`
 	});
 }
-//#endregion
-//#region src/commands/add-oxfmt/index.ts
+// src/commands/add-oxfmt/index.ts
 /** Returns a copy of `pkg` with missing scripts added; the caller owns writing package.json. */
 const apply$3 = Effect.fn("add-oxfmt.apply")(function* (cwd, esm, pkg) {
 	const fs = yield* FileSystem.FileSystem;
@@ -679,8 +660,7 @@ const apply$3 = Effect.fn("add-oxfmt.apply")(function* (cwd, esm, pkg) {
 		scripts: plan.scripts
 	};
 });
-//#endregion
-//#region src/commands/add-oxlint/logic.ts
+// src/commands/add-oxlint/logic.ts
 function getPackages(pkg, versions) {
 	return [
 		getMismatchedPackage(pkg, "oxlint", versions.oxlint),
@@ -701,8 +681,7 @@ function getScriptPlan(scripts, configFile) {
 		"lint:fix": `oxlint --fix${config}`
 	});
 }
-//#endregion
-//#region src/commands/add-oxlint/index.ts
+// src/commands/add-oxlint/index.ts
 /** Returns a copy of `pkg` with missing scripts added; the caller owns writing package.json. */
 const apply$2 = Effect.fn("add-oxlint.apply")(function* (cwd, esm, pkg) {
 	const fs = yield* FileSystem.FileSystem;
@@ -725,8 +704,7 @@ const apply$2 = Effect.fn("add-oxlint.apply")(function* (cwd, esm, pkg) {
 		scripts: plan.scripts
 	};
 });
-//#endregion
-//#region src/commands/add-skills/logic.ts
+// src/commands/add-skills/logic.ts
 /**
 * Splits the skill's files by whether they are already on disk. Existing files
 * always win: a user who has edited the standards to fit their project keeps
@@ -742,8 +720,7 @@ function planSkillFiles(files, exists) {
 		skipped
 	};
 }
-//#endregion
-//#region src/commands/add-skills/index.ts
+// src/commands/add-skills/index.ts
 /**
 * Links `.claude/skills/<name>` at the real directory under `.agents/skills/`.
 * Anything already at the link path - a link the user already has, or a real
@@ -783,8 +760,7 @@ const apply$1 = Effect.fn("add-skills.apply")(function* (cwd) {
 	}
 	for (const skill of SKILLS) yield* linkSkill(cwd, skillLink(skill));
 });
-//#endregion
-//#region src/commands/add-vscode/index.ts
+// src/commands/add-vscode/index.ts
 const writeJson = Effect.fn("add-vscode.writeJson")(function* (filePath, value) {
 	yield* (yield* FileSystem.FileSystem).writeFileString(filePath, JSON.stringify(value, null, 2) + "\n");
 });
@@ -847,8 +823,7 @@ const apply = Effect.fn("add-vscode.apply")(function* (cwd, oxfmtConfigPath) {
 	yield* applySettings(vscodeDir, oxfmtConfigPath);
 	yield* applyExtensions(vscodeDir);
 });
-//#endregion
-//#region src/commands/brew/logic.ts
+// src/commands/brew/logic.ts
 /** Deduplicated list of packages to install for the chosen toppings and sweetness. */
 function planPackages(pkg, toppings, sweetness, versions) {
 	const packages = [];
@@ -896,8 +871,7 @@ function selectedLinters(toppings) {
 function selectedFormatters(toppings) {
 	return toppings.filter((t) => t === "oxfmt");
 }
-//#endregion
-//#region src/commands/brew/index.ts
+// src/commands/brew/index.ts
 var NotAtRepoRoot = class extends Data.TaggedError("NotAtRepoRoot") {};
 const ensureGitRepo = Effect.fn("brew.ensureGitRepo")(function* (cwd) {
 	const git = yield* Git;
@@ -1061,13 +1035,13 @@ const brew = (cwd = process.cwd()) => Effect.gen(function* () {
 	yield* Effect.logDebug(`planned packages: ${packages.length > 0 ? packages.join(", ") : "(none)"}`);
 	yield* installPackages(pm, cwd, packages);
 	const { pkg: installedPkg } = yield* readPkg(cwd);
-	yield* persistScripts(pkgPath, installedPkg, yield* applyToppings(cwd, isEsm(installedPkg), installedPkg, toppings));
+	const updated = yield* applyToppings(cwd, isEsm(installedPkg), installedPkg, toppings);
+	yield* persistScripts(pkgPath, installedPkg, updated);
 	yield* setupCommitGate(cwd, pm, isEsm(installedPkg), toppings, sweetness);
 	yield* commitChanges(cwd);
 	yield* prompter.outro(pc.green(`Your Chanom with ${toppings.join(", ")} toppings and ${sweetness} sweetness is ready! Enjoy! 🧋`));
 });
-//#endregion
-//#region src/cli.ts
+// src/cli.ts
 var UnknownCommand = class extends Data.TaggedError("UnknownCommand") {};
 const commands = { brew };
 const dispatch = (name, cwd) => Effect.gen(function* () {
@@ -1101,13 +1075,12 @@ const run = (name, cwd = process.cwd(), options = {}) => {
 		UnknownCommand: (e) => reportError(`Unknown command: ${e.command ?? "(none)"}\nAvailable commands: ${Object.keys(commands).join(", ")}`),
 		PkgNotFound: (e) => reportError(`No package.json found in ${e.cwd}. Run this inside a project.`),
 		PkgInvalid: (e) => reportError(`Could not parse ${e.pkgPath}. Is it valid JSON?`),
-		InstallFailed: (e) => reportError(`Package installation with ${e.pm} failed.`),
+		InstallFailed: (e) => reportError([`Package installation with ${e.pm} failed.`, e.output].filter(Boolean).join("\n")),
 		HuskyInitFailed: (e) => reportError(`\`husky init\` failed (exit code ${e.exitCode}).`),
 		NotAtRepoRoot: (e) => reportError(`Git hooks must be set up at the repository root: ${e.root}\nRun \`chanom brew\` there, or choose light sweetness.`)
 	}))).pipe(Logger.withMinimumLogLevel(debug ? LogLevel.Debug : LogLevel.Info));
 };
-//#endregion
-//#region src/index.ts
+// src/index.ts
 const args = process.argv.slice(2);
 const debug = args.includes("--debug");
 const command = args.find((arg) => !arg.startsWith("--"));
@@ -1121,5 +1094,4 @@ NodeRuntime.runMain(program, {
 	disableErrorReporting: true,
 	disablePrettyLogger: true
 });
-//#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chanom/cli",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "",
   "keywords": [],
   "repository": {
@@ -29,10 +29,10 @@
     "@tsconfig/node-ts": "23.6.4",
     "@types/node": "26.0.1",
     "@vitest/coverage-v8": "3.2.6",
-    "tsdown": "0.22.3",
-    "typescript": "6.0.3",
+    "tsdown": "0.23.1",
+    "typescript": "7.0.2",
     "vitest": "3.2.6",
-    "@chanom/dev-config": "0.0.3",
+    "@chanom/dev-config": "0.0.5",
     "@chanom/internal": "0.0.0"
   },
   "scripts": {