@savvy-web/cli 3.7.14 → 3.7.15

package/commands/changeset/commands/check.js

@@ -1,6 +1,7 @@
+import { DisplayPath } from "../../../internal/display-path.js";
 import { Report } from "../../../internal/report.js";
 import { Argument, Command } from "effect/cli";
-import { isAbsolute, relative, resolve } from "node:path";
+import { resolve } from "node:path";
 import { CliExit, Doc } from "@effected/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
@@ -38,15 +39,6 @@ const FINDING_COLUMNS = [
 	{ header: "rule" },
 	{ header: "message" }
 ];
-/**
-* A finding's file as the report and the runner show it: relative to the
-* working directory when it lies under it (what a GitHub Actions annotation
-* resolves against the workspace), absolute otherwise.
-*/
-const displayPath = (cwd, file) => {
-	const rel = relative(cwd, file);
-	return rel === "" || rel.startsWith("..") || isAbsolute(rel) ? file : rel;
-};
 /* v8 ignore next */
 const dirArg = Argument.Directory("dir").pipe(Argument.withDefault(".changeset"));
 /**
@@ -89,7 +81,7 @@ function changesetCheckSection(dir) {
 		const cwd = resolve();
 		const blocks = [];
 		for (const [file, fileMessages] of byFile) {
-			const display = displayPath(cwd, file);
+			const display = DisplayPath.under(cwd, file);
 			blocks.push(Doc.section(Doc.file(display), [Doc.table(FINDING_COLUMNS, fileMessages.map((msg) => [
 				`${msg.line}:${msg.column}`,
 				msg.rule,

package/commands/changeset/commands/init.js

@@ -1,7 +1,7 @@
 import { Report } from "../../../internal/report.js";
 import { CommandError } from "../../../internal/command-error.js";
 import { join } from "node:path";
-import { CliDoc, CliExit, Doc } from "@effected/cli";
+import { CliDoc, CliExit, Doc, Fmt } from "@effected/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Data, Effect, Option, Result, Schema } from "effect";
 import { TerminalEnv } from "@effected/env";
@@ -192,7 +192,7 @@ function ensureChangesetDir(root) {
 		},
 		catch: (error) => new InitError({
 			step: ".changeset directory",
-			reason: error instanceof Error ? error.message : String(error)
+			reason: Fmt.describe(error)
 		})
 	});
 }
@@ -234,7 +234,7 @@ function handleConfig(changesetDir, repoSlug, force) {
 		},
 		catch: (error) => new InitError({
 			step: ".changeset/config.json",
-			reason: error instanceof Error ? error.message : String(error)
+			reason: Fmt.describe(error)
 		})
 	});
 }
@@ -330,7 +330,7 @@ function handleBaseMarkdownlint(root) {
 		} catch (error) {
 			return yield* Effect.fail(new InitError({
 				step: "markdownlint config",
-				reason: error instanceof Error ? error.message : String(error)
+				reason: Fmt.describe(error)
 			}));
 		}
 		let parsed = yield* Jsonc.parse(text);
@@ -363,7 +363,7 @@ function handleBaseMarkdownlint(root) {
 		} catch (error) {
 			return yield* Effect.fail(new InitError({
 				step: "markdownlint config",
-				reason: error instanceof Error ? error.message : String(error)
+				reason: Fmt.describe(error)
 			}));
 		}
 		return `Updated ${foundPath}`;
@@ -371,7 +371,7 @@ function handleBaseMarkdownlint(root) {
 		if (error instanceof InitError) return Effect.fail(error);
 		return Effect.fail(new InitError({
 			step: "markdownlint config",
-			reason: error instanceof Error ? error.message : String(error)
+			reason: Fmt.describe(error)
 		}));
 	}));
 }
@@ -411,7 +411,7 @@ function handleChangesetMarkdownlint(changesetDir, root, force) {
 		},
 		catch: (error) => new InitError({
 			step: ".changeset/.markdownlint.json",
-			reason: error instanceof Error ? error.message : String(error)
+			reason: Fmt.describe(error)
 		})
 	});
 }

package/commands/changeset/commands/validate-file.js

@@ -40,7 +40,7 @@ function runValidateFile(filePath) {
 	return Effect.gen(function* () {
 		const result = yield* Effect.try({
 			try: () => ChangesetLinter.validateFile(filePath),
-			catch: (error) => CommandError.from(error instanceof Error ? error : String(error), { message: `could not validate ${filePath}` })
+			catch: (error) => CommandError.from(error, { message: `could not validate ${filePath}` })
 		});
 		if (result.length > 0) {
 			yield* Report.print([Report.verbatim(result.map((msg) => `${msg.file}:${msg.line}:${msg.column} ${msg.rule} ${msg.message}`).join("\n"))]);

package/commands/clean.js

@@ -2,7 +2,7 @@ import { Report } from "../internal/report.js";
 import { CommandError } from "../internal/command-error.js";
 import { Command, Flag } from "effect/cli";
 import { join, sep } from "node:path";
-import { CliInteractive } from "@effected/cli";
+import { CliInteractive, Fmt } from "@effected/cli";
 import { Console, Effect, PubSub } from "effect";
 import { WorkspaceDiscovery } from "@effected/workspaces";
 import { glob, realpath, rm } from "node:fs/promises";
@@ -87,7 +87,7 @@ function removeTargets(targets, dryRun) {
 			}),
 			onFailure: (e) => ({
 				target,
-				reason: e instanceof Error ? e.message : String(e)
+				reason: Fmt.describe(e)
 			})
 		})), { concurrency: REMOVE_CONCURRENCY });
 		return {

package/commands/commit/commitlint-invocation.js

@@ -1,5 +1,28 @@
+import { LocalExec } from "@effected/commands";
+
 // src/commands/commit/commitlint-invocation.ts
 /**
+* Shared, pure builder for the package-manager-aware `commitlint` CLI
+* invocation.
+*
+* @remarks
+* Both commit-message validators shell out to the SAME `commitlint` binary
+* so the real Silk preset stays the single source of truth — they differ only
+* in the trailing mode args:
+*
+* - `savvy commit hook post-commit-verify` replays the most recent commit
+*   (`--last`), AFTER it exists.
+* - `savvy commit lint <file>` validates a candidate message file
+*   (`--edit <file>`), BEFORE it is committed.
+*
+* Keeping the builder pure and package-manager-aware in one place means a
+* change to how `commitlint` is invoked lands for both paths at once. The
+* per-package-manager argv prefix comes from `@effected/commands`'
+* `LocalExec.prefixes`, the kit's single home of that knowledge.
+*
+* @internal
+*/
+/**
 * Build the `commitlint` invocation for the detected package manager.
 *
 * @param pm - The detected package manager.
@@ -15,28 +38,11 @@ function buildCommitlintInvocation(pm, configPath, tail) {
 		configPath,
 		...tail
 	] : ["commitlint", ...tail];
-	switch (pm) {
-		case "pnpm": return {
-			command: "pnpm",
-			args: ["exec", ...base]
-		};
-		case "yarn": return {
-			command: "yarn",
-			args: ["exec", ...base]
-		};
-		case "bun": return {
-			command: "bunx",
-			args: base
-		};
-		case "npm": return {
-			command: "npx",
-			args: [
-				"--no",
-				"--",
-				...base
-			]
-		};
-	}
+	const [command = pm, ...prefixArgs] = LocalExec.prefixes(pm).prefix;
+	return {
+		command,
+		args: [...prefixArgs, ...base]
+	};
 }
 
 export { buildCommitlintInvocation };

package/commands/commit/hooks/post-commit-verify.js

@@ -3,8 +3,8 @@ import { Command } from "effect/cli";
 import { Commitlint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
 import { Git } from "@effected/git";
-import { promisify } from "node:util";
-import { execFile } from "node:child_process";
+import { Run } from "@effected/commands";
+import { ChildProcess } from "effect/process";
 
 // src/commands/commit/hooks/post-commit-verify.ts
 /**
@@ -13,7 +13,6 @@ import { execFile } from "node:child_process";
 *
 * @internal
 */
-const execFileP = promisify(execFile);
 function buildPostCommitAdvice(i) {
 	const lines = [];
 	if (i.commitlintFailed) lines.push("The commit you just created fails commitlint validation. Run pnpm exec commitlint --last to see the violations, then fix with git commit --amend.");
@@ -33,25 +32,28 @@ function buildPostCommitAdvice(i) {
 const getRepoRoot = Effect.gen(function* () {
 	return yield* (yield* Git).repoRoot(process.cwd()).pipe(Effect.catch(() => Effect.succeed(process.cwd())));
 });
+/**
+* Replay commitlint against the most recent commit; `true` means it FAILED.
+*
+* A launcher that never starts counts as a failure too — `Run.succeeds`
+* collapses it to `false`, the prior execFile catch's contract.
+*
+* @internal
+*/
 function runCommitlintLast(root) {
-	return (async () => {
-		const pm = await Commitlint.detectPackageManager(root);
-		const configPath = await Commitlint.readCommitlintConfigPath(root);
+	return Effect.gen(function* () {
+		const pm = yield* Effect.promise(() => Commitlint.detectPackageManager(root));
+		const configPath = yield* Effect.promise(() => Commitlint.readCommitlintConfigPath(root));
 		const { command, args } = buildCommitlintInvocation(pm, configPath, ["--last"]);
-		try {
-			await execFileP(command, args, { cwd: root });
-			return false;
-		} catch {
-			return true;
-		}
-	})();
+		return !(yield* Run.succeeds(ChildProcess.make(command, args, { cwd: root })));
+	});
 }
 const postCommitVerifyCommand = Command.make("post-commit-verify", {}, () => Effect.gen(function* () {
 	const git = yield* Git;
 	const branch = yield* Commitlint.readBranchInfo();
 	const signing = yield* Commitlint.readSigningDiagnostic();
 	const root = yield* getRepoRoot;
-	const commitlintFailed = yield* Effect.promise(() => runCommitlintLast(root));
+	const commitlintFailed = yield* runCommitlintLast(root);
 	const lastCommit = yield* git.commitInfo(root).pipe(Effect.catch(() => Effect.succeed({
 		signatureStatus: "N",
 		message: ""
@@ -69,4 +71,4 @@ const postCommitVerifyCommand = Command.make("post-commit-verify", {}, () => Eff
 	if (advice !== null) yield* Effect.sync(() => process.stdout.write(`${JSON.stringify(Commitlint.postToolUseAdvise(advice))}\n`));
 }).pipe(Effect.provide(Commitlint.HookSilencer))).pipe(Command.withDescription("Verify the most recent commit (commitlint replay + signature + closes trailer)"));
 
-export { buildPostCommitAdvice, postCommitVerifyCommand };
+export { buildPostCommitAdvice, postCommitVerifyCommand, runCommitlintLast };

package/commands/commit/lint.js

@@ -4,8 +4,8 @@ import { Argument, CliError, Command } from "effect/cli";
 import { Commitlint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
 import { Git } from "@effected/git";
-import { promisify } from "node:util";
-import { execFile } from "node:child_process";
+import { Run } from "@effected/commands";
+import { ChildProcess } from "effect/process";
 
 // src/commands/commit/lint.ts
 /**
@@ -21,7 +21,6 @@ import { execFile } from "node:child_process";
 *
 * @internal
 */
-const execFileP = promisify(execFile);
 /** The repo root via `@effected/git`, degrading to `process.cwd()`. */
 const getRepoRoot = Effect.gen(function* () {
 	return yield* (yield* Git).repoRoot(process.cwd()).pipe(Effect.catch(() => Effect.succeed(process.cwd())));
@@ -31,31 +30,27 @@ const getRepoRoot = Effect.gen(function* () {
 *
 * A zero exit resolves to `passed: true`; a non-zero exit (commitlint's way
 * of signalling violations) resolves to `passed: false` with the captured
-* diagnostics — the promise never rejects.
+* diagnostics. A run that never starts (the launcher is missing) or whose
+* output is unusable also resolves to `passed: false`, its message standing
+* in for stderr — the effect never fails.
 *
 * @internal
 */
 function runCommitlintEdit(root, file) {
-	return (async () => {
-		const pm = await Commitlint.detectPackageManager(root);
-		const configPath = await Commitlint.readCommitlintConfigPath(root);
+	return Effect.gen(function* () {
+		const pm = yield* Effect.promise(() => Commitlint.detectPackageManager(root));
+		const configPath = yield* Effect.promise(() => Commitlint.readCommitlintConfigPath(root));
 		const { command, args } = buildCommitlintInvocation(pm, configPath, ["--edit", file]);
-		try {
-			const { stdout, stderr } = await execFileP(command, args, { cwd: root });
-			return {
-				passed: true,
-				stdout,
-				stderr
-			};
-		} catch (error) {
-			const e = error;
-			return {
-				passed: false,
-				stdout: e.stdout ?? "",
-				stderr: e.stderr ?? e.message ?? String(error)
-			};
-		}
-	})();
+		return yield* Run.collect(ChildProcess.make(command, args, { cwd: root })).pipe(Effect.map((output) => ({
+			passed: output.exitCode === 0,
+			stdout: output.stdout,
+			stderr: output.stderr
+		})), Effect.catch((error) => Effect.succeed({
+			passed: false,
+			stdout: "",
+			stderr: error.message
+		})));
+	});
 }
 /**
 * Validate a candidate commit-message file against the Silk commitlint preset.
@@ -71,8 +66,7 @@ function runCommitlintEdit(root, file) {
 */
 function runCommitLint(file) {
 	return Effect.gen(function* () {
-		const root = yield* getRepoRoot;
-		const { passed, stdout, stderr } = yield* Effect.promise(() => runCommitlintEdit(root, file));
+		const { passed, stdout, stderr } = yield* runCommitlintEdit(yield* getRepoRoot, file);
 		if (stdout.length > 0) yield* Effect.sync(() => process.stdout.write(stdout));
 		if (stderr.length > 0) yield* Effect.sync(() => process.stderr.write(stderr));
 		if (!passed) return yield* Effect.fail(new CliError.UserError({ cause: `Commit message at ${file} failed commitlint validation` }));
@@ -84,4 +78,4 @@ const fileArg = Argument.File("file", { mustExist: true });
 /* v8 ignore next 3 -- CLI registration; handler tested via runCommitLint */
 const lintCommand = Command.make("lint", { file: fileArg }, ({ file }) => runCommitLint(file)).pipe(Command.withDescription("Validate a candidate commit-message file against the Silk commitlint preset"));
 
-export { lintCommand, runCommitLint };
+export { lintCommand, runCommitLint, runCommitlintEdit };

package/commands/lint/text.js

@@ -1,8 +1,9 @@
+import { DisplayPath } from "../../internal/display-path.js";
 import { Report } from "../../internal/report.js";
 import { Argument, Command, Flag } from "effect/cli";
 import { CliExit, Doc } from "@effected/cli";
 import { Lint } from "@savvy-web/silk-effects";
-import { Effect, Path } from "effect";
+import { Effect } from "effect";
 
 // src/commands/lint/text.ts
 /**
@@ -44,7 +45,6 @@ const stagedFlag = Flag.Boolean("staged").pipe(Flag.withDescription("Read each f
 * @internal
 */
 const runLintText = (files, options = {}) => Effect.gen(function* () {
-	const path = yield* Path.Path;
 	const cwd = options.cwd ?? ".";
 	const staged = options.staged ?? false;
 	const targets = files.length > 0 ? files : yield* Lint.TextFiles.listTracked(cwd, { staged });
@@ -57,15 +57,10 @@ const runLintText = (files, options = {}) => Effect.gen(function* () {
 		yield* Report.print([Report.ok(`${targets.length} ${targets.length === 1 ? "file is" : "files are"} grep-visible text`)]);
 		return findings;
 	}
-	const root = path.resolve(cwd);
-	const annotationPath = (file) => {
-		const relative = path.relative(root, path.resolve(file));
-		return relative.startsWith("..") || path.isAbsolute(relative) ? file : relative;
-	};
 	const failedFiles = (/* @__PURE__ */ new Set([...findings.map((finding) => finding.path), ...unreadable.map((error) => error.path)])).size;
 	yield* Report.print([...findings.flatMap((finding) => [Report.fail(`${finding.location}  ${finding.message}`), Doc.annotation({
 		level: "error",
-		file: annotationPath(finding.path),
+		file: DisplayPath.under(cwd, finding.path),
 		line: finding.line,
 		col: finding.column,
 		title: "grep-invisible text"

package/internal/display-path.js

@@ -0,0 +1,28 @@
+import { isAbsolute, relative, resolve, sep } from "node:path";
+
+// src/internal/display-path.ts
+/**
+* How a reported file path is shown.
+*
+* @packageDocumentation
+*/
+/**
+* The one rule for showing a finding's file in a report or a GitHub Actions
+* annotation.
+*
+* @internal
+*/
+var DisplayPath = class {
+	constructor() {}
+	/**
+	* `file` relative to `cwd` when it lies strictly under it (what a GitHub
+	* Actions annotation resolves against the workspace), else `file` exactly
+	* as given — a path outside `cwd`, on another drive, or `cwd` itself.
+	*/
+	static under = (cwd, file) => {
+		const rel = relative(resolve(cwd), resolve(file));
+		return rel === "" || rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel) ? file : rel;
+	};
+};
+
+export { DisplayPath };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "3.7.14",
+	"version": "3.7.15",
 	"private": false,
 	"description": "The savvy CLI — unified commit, changeset, and lint commands for the Silk Suite",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/cli",
@@ -37,20 +37,20 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "^4.0.6",
-		"@effected/cli": "^0.22.2",
-		"@effected/commands": "^0.16.0",
-		"@effected/config-file": "^0.20.1",
-		"@effected/engine": "^0.8.0",
-		"@effected/env": "^0.5.0",
-		"@effected/git": "^0.25.1",
-		"@effected/glob": "^0.14.0",
-		"@effected/jsonc": "^0.20.0",
+		"@effected/cli": "^0.23.0",
+		"@effected/commands": "^0.17.0",
+		"@effected/config-file": "^0.21.0",
+		"@effected/engine": "^0.9.0",
+		"@effected/env": "^0.6.0",
+		"@effected/git": "^0.26.0",
+		"@effected/glob": "^0.15.0",
+		"@effected/jsonc": "^0.20.1",
 		"@effected/templates": "^0.14.1",
 		"@effected/toml": "^0.16.0",
-		"@effected/walker": "^0.20.1",
-		"@effected/workspaces": "^0.39.0",
+		"@effected/walker": "^0.21.0",
+		"@effected/workspaces": "^0.39.1",
 		"@effected/yaml": "^0.25.1",
-		"@savvy-web/silk-effects": "^10.1.0",
+		"@savvy-web/silk-effects": "^10.2.0",
 		"effect": "^4.0.6",
 		"ink": "^8.0.0",
 		"react": "^19.3.1"

package/version.js

@@ -7,6 +7,6 @@
 * @packageDocumentation
 */
 /** @internal */
-const CLI_VERSION = "3.7.14";
+const CLI_VERSION = "3.7.15";
 
 export { CLI_VERSION };