@savvy-web/cli 2.0.1 → 2.1.1

package/cli/index.js

@@ -68,7 +68,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 * CLI application: reads argv from the Stdio service provided by NodeServices.
 * (v4's `Command.run` takes only `version` — the name comes from the root command.)
 */
-const cli = Command.run(rootCommand, { version: "2.0.1" });
+const cli = Command.run(rootCommand, { version: "2.1.1" });
 /**
 * Shared workspace services from `@effected/workspaces`, wired as a
 * self-contained unit and built ONCE (layers memoize by reference).

package/commands/changeset/index.js

@@ -32,6 +32,10 @@ const _changesetCommand = Command.make("changeset").pipe(Command.withSubcommands
 * reference effect's non-exported `Inspectable` module (TS4023). The
 * annotation preserves the exact Error/Requirements channels, so the root
 * layer graph stays compiler-validated.
+*
+* The requirements channel names the subcommands' services rather than `never`:
+* `Command.withSubcommands` propagates each subcommand's requirements up into
+* the group's `R`, which the root assembly discharges via `AppLive`.
 */
 const changesetCommand = _changesetCommand;
 

package/commands/commit/commitlint-invocation.js

@@ -0,0 +1,43 @@
+//#region src/commands/commit/commitlint-invocation.ts
+/**
+* Build the `commitlint` invocation for the detected package manager.
+*
+* @param pm - The detected package manager.
+* @param configPath - Explicit `--config` path, or `null` to let commitlint resolve it.
+* @param tail - The mode args, e.g. `["--last"]` or `["--edit", file]`.
+*
+* @internal
+*/
+function buildCommitlintInvocation(pm, configPath, tail) {
+	const base = configPath ? [
+		"commitlint",
+		"--config",
+		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
+			]
+		};
+	}
+}
+
+//#endregion
+export { buildCommitlintInvocation };

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

@@ -1,3 +1,4 @@
+import { buildCommitlintInvocation } from "../commitlint-invocation.js";
 import { Git } from "@effected/git";
 import { Commitlint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
@@ -28,43 +29,13 @@ function buildPostCommitAdvice(i) {
 	if (i.branchTicketId !== null && !i.bodyHasClosing) lines.push(`Branch implies ticket #${i.branchTicketId} but the commit body has no Closes/Fixes/Resolves trailer for it. If this commit closes #${i.branchTicketId}, amend with: git commit --amend --no-edit --trailer "Closes: #${i.branchTicketId}"`);
 	return lines.length === 0 ? null : lines.join("\n\n");
 }
-function buildCommitlintInvocation(pm, configPath) {
-	const tail = configPath ? [
-		"commitlint",
-		"--config",
-		configPath,
-		"--last"
-	] : ["commitlint", "--last"];
-	switch (pm) {
-		case "pnpm": return {
-			command: "pnpm",
-			args: ["exec", ...tail]
-		};
-		case "yarn": return {
-			command: "yarn",
-			args: ["exec", ...tail]
-		};
-		case "bun": return {
-			command: "bunx",
-			args: tail
-		};
-		case "npm": return {
-			command: "npx",
-			args: [
-				"--no",
-				"--",
-				...tail
-			]
-		};
-	}
-}
 /** The repo root via `@effected/git`, degrading to `process.cwd()` — the prior execFile contract. */
 const getRepoRoot = Effect.gen(function* () {
 	return yield* (yield* Git).repoRoot(process.cwd()).pipe(Effect.catch(() => Effect.succeed(process.cwd())));
 });
 function runCommitlintLast(root) {
 	return (async () => {
-		const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root));
+		const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root), ["--last"]);
 		try {
 			await execFileP(command, args, { cwd: root });
 			return false;
@@ -97,4 +68,4 @@ const postCommitVerifyCommand = Command.make("post-commit-verify", {}, () => Eff
 }).pipe(Effect.provide(Commitlint.HookSilencer))).pipe(Command.withDescription("Verify the most recent commit (commitlint replay + signature + closes trailer)"));
 
 //#endregion
-export { buildCommitlintInvocation, buildPostCommitAdvice, postCommitVerifyCommand };
+export { buildPostCommitAdvice, postCommitVerifyCommand };

package/commands/commit/index.js

@@ -1,11 +1,12 @@
 import { runCommitInit } from "./init.js";
 import { runCommitCheck } from "./check.js";
 import { hookCommand } from "./hook.js";
+import { lintCommand } from "./lint.js";
 import { Command } from "effect/unstable/cli";
 
 //#region src/commands/commit/index.ts
 /* v8 ignore start -- CLI registration; each command tested via exported handler */
-const _commitCommand = Command.make("commit").pipe(Command.withSubcommands([hookCommand]), Command.withDescription("Commit standards: config, checks, and Claude hook handlers"));
+const _commitCommand = Command.make("commit").pipe(Command.withSubcommands([hookCommand, lintCommand]), Command.withDescription("Commit standards: config, checks, and Claude hook handlers"));
 /**
 * The `savvy commit` command group for use in Task B7 root assembly.
 *

package/commands/commit/lint.js

@@ -0,0 +1,85 @@
+import { buildCommitlintInvocation } from "./commitlint-invocation.js";
+import { Git } from "@effected/git";
+import { Commitlint } from "@savvy-web/silk-effects";
+import { Effect } from "effect";
+import { Argument, CliError, Command } from "effect/unstable/cli";
+import { promisify } from "node:util";
+import { execFile } from "node:child_process";
+
+//#region src/commands/commit/lint.ts
+/**
+* `savvy commit lint <file>` — validate a CANDIDATE commit-message file
+* against the real Silk commitlint preset BEFORE committing.
+*
+* @remarks
+* Answers "would this message pass?" by running the same rule engine the
+* husky `commit-msg` hook enforces (`commitlint --edit <file>`), rather than
+* the advisory heuristics behind `hook pre-commit-message`. Exits non-zero
+* when commitlint rejects the message and 0 when it passes; commitlint's own
+* stdout/stderr is surfaced verbatim so the user sees the actual violations.
+*
+* @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())));
+});
+/**
+* Run `commitlint --edit <file>` and capture its output.
+*
+* 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.
+*
+* @internal
+*/
+function runCommitlintEdit(root, file) {
+	return (async () => {
+		const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root), ["--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)
+			};
+		}
+	})();
+}
+/**
+* Validate a candidate commit-message file against the Silk commitlint preset.
+*
+* Surfaces commitlint's own output, then fails the effect (non-zero exit) when
+* the message is rejected so callers — the `commit-create` skill script, CI,
+* or a human — get an honest pass/fail signal before `git commit` runs.
+*
+* @param file - Path to the candidate commit-message file.
+* @returns An Effect that runs commitlint and fails on rejection.
+*
+* @internal
+*/
+function runCommitLint(file) {
+	return Effect.gen(function* () {
+		const root = yield* getRepoRoot;
+		const { passed, stdout, stderr } = yield* Effect.promise(() => runCommitlintEdit(root, 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` }));
+		yield* Effect.log("Commit message passes the Silk commitlint preset.");
+	});
+}
+/* v8 ignore next */
+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"));
+
+//#endregion
+export { lintCommand, runCommitLint };

package/commands/lint/fmt.js

@@ -2,7 +2,7 @@ import { Lint } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
 import { Argument, Command } from "effect/unstable/cli";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { Yaml, YamlStringifyOptions } from "@effected/yaml";
+import { Yaml } from "@effected/yaml";
 
 //#region src/commands/lint/fmt.ts
 /**
@@ -15,11 +15,6 @@ import { Yaml, YamlStringifyOptions } from "@effected/yaml";
 *
 * @internal
 */
-/** Default YAML stringify options matching PnpmWorkspace handler (plain scalars = the v3 singleQuote:false posture). */
-const YAML_STRINGIFY_OPTIONS = YamlStringifyOptions.make({
-	indent: 2,
-	lineWidth: 0
-});
 /** Repeated file path arguments. */
 const filesArg = Argument.file("files", { mustExist: true }).pipe(Argument.variadic());
 /** Sort package.json files with sort-package-json. */
@@ -37,7 +32,7 @@ const pnpmWorkspaceCommand = Command.make("pnpm-workspace", {}, () => Effect.gen
 	const content = readFileSync(filepath, "utf-8");
 	const parsed = yield* Yaml.parse(content);
 	const sorted = Lint.PnpmWorkspace.sortContent(parsed);
-	writeFileSync(filepath, yield* Yaml.stringify(sorted, YAML_STRINGIFY_OPTIONS), "utf-8");
+	writeFileSync(filepath, yield* Effect.promise(() => Lint.PnpmWorkspace.formatContent(sorted, filepath)), "utf-8");
 }));
 /** Format YAML files with Prettier. */
 const yamlCommand = Command.make("yaml", { files: filesArg }, ({ files }) => Effect.gen(function* () {

package/commands/repos/index.js

@@ -24,6 +24,10 @@ const _reposCommand = Command.make("repos").pipe(Command.withSubcommands([
 * reference effect's non-exported `Inspectable` module (TS4023). The
 * annotation preserves the exact Error/Requirements channels, so the root
 * layer graph stays compiler-validated.
+*
+* The requirements channel names `Repos.ReposManager` rather than `never`:
+* `Command.withSubcommands` propagates each subcommand's requirements up into
+* the group's `R`, which the root assembly discharges via `AppLive`.
 */
 const reposCommand = _reposCommand;
 

package/index.d.ts

@@ -1,6 +1,7 @@
 import { BiomeSchemaSync, Changesets, ConfigDiscovery, ManagedSection, Repos, SectionParseError, SectionWriteError, ToolDiscovery, VersioningStrategy } from "@savvy-web/silk-effects";
-import { Cause, Effect, FileSystem } from "effect";
+import { Cause, Effect, FileSystem, Path } from "effect";
 import { Command } from "effect/unstable/cli";
+import { ChildProcessSpawner } from "effect/unstable/process";
 import { Git } from "@effected/git";
 import { WorkspaceDiscovery, WorkspaceRoot } from "@effected/workspaces";
 import { PlatformError } from "effect/PlatformError";
@@ -102,8 +103,12 @@ declare function runChangesetInit(opts: {
  * reference effect's non-exported `Inspectable` module (TS4023). The
  * annotation preserves the exact Error/Requirements channels, so the root
  * layer graph stays compiler-validated.
+ *
+ * The requirements channel names the subcommands' services rather than `never`:
+ * `Command.withSubcommands` propagates each subcommand's requirements up into
+ * the group's `R`, which the root assembly discharges via `AppLive`.
  */
-declare const changesetCommand: Command.Command<"changeset", Record<string, never>, Record<string, never>, Changesets.ConfigurationError | Error | Changesets.ReleasePlanError | Cause.UnknownError | Changesets.DepsRegenPlanError, never>;
+declare const changesetCommand: Command.Command<"changeset", Record<string, never>, Record<string, never>, Changesets.ConfigurationError | Error | Changesets.ReleasePlanError | Cause.UnknownError | Changesets.DepsRegenPlanError, ChildProcessSpawner.ChildProcessSpawner | Changesets.ConfigInspector | FileSystem.FileSystem | Path.Path | Changesets.ReleasePlanner>;
 //#endregion
 //#region src/commands/check.d.ts
 /**
@@ -175,7 +180,7 @@ declare function runCommitInit(opts: {
  * errors from Effect's internal types. Task B7 should import and use this directly
  * as `Command.withSubcommands([commitCommand])` — the cast is for declaration emit only.
  */
-declare const commitCommand: Command.Command<"commit", {}, {}, never, never>;
+declare const commitCommand: Command.Command<"commit", {}, {}, import("effect/unstable/cli/CliError").UserError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("@effected/git").Git>;
 //#endregion
 //#region src/commands/init.d.ts
 /**
@@ -251,7 +256,7 @@ declare function runLintInit(opts: {
  * errors from Effect's internal types. Task B7 should import and use this directly
  * as `Command.withSubcommands([lintCommand])` — the cast is for declaration emit only.
  */
-declare const lintCommand: Command.Command<"lint", {}, {}, import("@effected/yaml").YamlParseError | import("@effected/yaml").YamlStringifyError, never>;
+declare const lintCommand: Command.Command<"lint", {}, {}, import("@effected/yaml").YamlParseError, never>;
 //#endregion
 //#region src/commands/repos/commands/status.d.ts
 /**
@@ -280,8 +285,12 @@ declare const runReposSync: (cwd: string) => Effect.Effect<void, never, Repos.Re
  * reference effect's non-exported `Inspectable` module (TS4023). The
  * annotation preserves the exact Error/Requirements channels, so the root
  * layer graph stays compiler-validated.
+ *
+ * The requirements channel names `Repos.ReposManager` rather than `never`:
+ * `Command.withSubcommands` propagates each subcommand's requirements up into
+ * the group's `R`, which the root assembly discharges via `AppLive`.
  */
-declare const reposCommand: Command.Command<"repos", Record<string, never>, Record<string, never>, Repos.GitSubmoduleError, never>;
+declare const reposCommand: Command.Command<"repos", Record<string, never>, Record<string, never>, Repos.GitSubmoduleError, Repos.ReposManager>;
 //#endregion
 export { changesetCommand, checkCommand, commitCommand, initCommand, lintCommand, reposCommand, runChangesetCheck, runChangesetInit, runCheck, runCli, runCommitCheck, runCommitInit, runInit, runLintCheck, runLintInit, runReposStatus, runReposSync };
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "2.0.1",
+	"version": "2.1.1",
 	"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",
@@ -31,12 +31,12 @@
 		"savvy": "bin/savvy.js"
 	},
 	"dependencies": {
-		"@effect/platform-node": "4.0.0-beta.98",
-		"@effected/git": "^0.4.0",
-		"@effected/jsonc": "^0.2.0",
-		"@effected/workspaces": "^0.3.1",
-		"@effected/yaml": "^0.3.0",
-		"@savvy-web/silk-effects": "4.0.1",
-		"effect": "4.0.0-beta.98"
+		"@effect/platform-node": "4.0.0-beta.99",
+		"@effected/git": "^0.4.1",
+		"@effected/jsonc": "^0.4.0",
+		"@effected/workspaces": "^0.4.1",
+		"@effected/yaml": "^0.4.0",
+		"@savvy-web/silk-effects": "4.1.0",
+		"effect": "4.0.0-beta.99"
 	}
 }