@savvy-web/cli 1.3.4 → 1.3.6

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Savvy Web Strategy, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/cli/index.js

@@ -8,7 +8,7 @@ import { Command } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
 import { BiomeSchemaSyncLive, ChangesetConfigReaderLive, Changesets, ConfigDiscoveryLive, ManagedSectionLive, SilkPublishabilityDetectorLive, ToolDiscoveryLive, VersioningStrategyLive } from "@savvy-web/silk-effects";
 import { Effect, Layer } from "effect";
-import { PackageManagerDetectorLive, WorkspaceDiscoveryLive, WorkspaceRootLive } from "workspaces-effect";
+import { CatalogResolverLive, LockfileReaderLive, PackageManagerDetectorLive, PublishabilityDetectorLive, WorkspaceDiscoveryLive, WorkspaceRootLive } from "workspaces-effect";
 
 //#region src/cli/index.ts
 /**
@@ -57,7 +57,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 ]));
 const cli = Command.run(rootCommand, {
 	name: "savvy",
-	version: "1.3.4"
+	version: "1.3.6"
 });
 /**
 * Shared base layer: workspace services, the changeset config reader, and the
@@ -102,12 +102,37 @@ const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, Manage
 * `BranchAnalyzerLive` AND re-exposes it for the surviving `config validate`
 * handler that yields it directly, so it is never constructed twice per run.
 *
+* `Changesets.DepsRegenLive` (the `deps regen`/`deps detect` orchestration
+* service) needs `WorkspaceSnapshotReader`, `ConfigInspector`,
+* `WorkspaceDiscovery` (all from `BaseLive`/`InspectorAndAnalyzerLive`),
+* plus `CatalogResolver` and `PublishabilityDetector` from `workspaces-effect`
+* — neither of which the other commands need, so they're composed only for
+* `DepsRegenGroupLive`. `CatalogResolverLive` in turn needs `WorkspaceRoot`,
+* `LockfileReader`, `WorkspaceDiscovery`, `FileSystem`, `Path`; `LockfileReaderLive`
+* (composed via `CatalogLive`) needs `WorkspaceRoot`, `PackageManagerDetector`,
+* `FileSystem`, `Path` — all satisfied by `BaseLive`/`NodeContext.layer` below.
+* `DepsRegenGroupLive` reuses the exact `InspectorAndAnalyzerLive` layer
+* reference (not a fresh copy), so Effect's layer memoization builds that
+* single `ConfigInspector` instance once and shares it here too.
+*
 * `provideMerge(BaseLive)` feeds the remaining deps and re-exposes the base
 * services for handlers that yield them directly. `provideMerge(NodeContext.layer)`
 * supplies `FileSystem`, `Path`, and `CommandExecutor` to everything underneath.
 */
 const InspectorAndAnalyzerLive = Changesets.BranchAnalyzerLive.pipe(Layer.provideMerge(Changesets.ReleasePlannerLive), Layer.provideMerge(Changesets.ConfigInspectorLive));
-const AppLive = Layer.mergeAll(ToolDiscoveryLive, VersioningStrategyLive, InspectorAndAnalyzerLive).pipe(Layer.provideMerge(BaseLive), Layer.provideMerge(NodeContext.layer));
+/**
+* `CatalogResolver` composed with its own `LockfileReader` dependency. The
+* remaining requirements of both (`WorkspaceRoot`, `WorkspaceDiscovery`,
+* `PackageManagerDetector`, `FileSystem`, `Path`) are left open, satisfied
+* by `BaseLive` / `NodeContext.layer` in `AppLive` below.
+*/
+const CatalogLive = CatalogResolverLive.pipe(Layer.provide(LockfileReaderLive));
+/**
+* `Changesets.DepsRegen`, fully composed except for the base services
+* (`WorkspaceSnapshotReader`, `WorkspaceDiscovery`) supplied by `BaseLive`.
+*/
+const DepsRegenGroupLive = Changesets.DepsRegenLive.pipe(Layer.provide(InspectorAndAnalyzerLive), Layer.provide(CatalogLive), Layer.provide(PublishabilityDetectorLive));
+const AppLive = Layer.mergeAll(ToolDiscoveryLive, VersioningStrategyLive, InspectorAndAnalyzerLive, DepsRegenGroupLive).pipe(Layer.provideMerge(BaseLive), Layer.provideMerge(NodeContext.layer));
 /**
 * Bootstrap and run the `savvy` CLI application.
 *

package/commands/changeset/commands/deps-detect.js

@@ -1,24 +1,21 @@
 import { Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Console, Effect, Option } from "effect";
-import { WorkspaceDiscovery } from "workspaces-effect";
-import { resolve } from "node:path";
 
 //#region src/commands/changeset/commands/deps-detect.ts
 /**
 * `deps detect` command — read-only dependency-diff inspection.
 *
 * @remarks
-* Computes the per-workspace-package dependency changes between two git
-* refs and renders them either as structured JSON (one row per change)
-* or as ready-to-paste CSH005 markdown. No file writes.
+* A thin adapter over {@link Changesets.DepsRegen}: this command calls
+* `plan({ includeDevDeps: true, ... })` — the read-only path, so devDeps
+* stay in the diff and no file is written or deleted — then renders
+* `plan.toWrite`'s diffs either as structured JSON (one row per change) or
+* as ready-to-paste CSH005 markdown. No file writes.
 *
 * Defaults:
 * - `--from` → `git merge-base <baseBranch> HEAD`
 * - `--to`   → working tree (i.e., `HEAD` plus staged + unstaged + untracked).
-*   Passed as the special value
-*   `WORKTREE` to {@link WorkspaceSnapshotReader} — implementations resolve
-*   this against the live working tree rather than `git show`.
 *
 * @example
 * ```bash
@@ -29,7 +26,7 @@ import { resolve } from "node:path";
 *
 * @internal
 */
-const { ConfigInspector, WorkspaceSnapshotReader, computeWorkspaceDependencyDiffs, gitMergeBase, listPublishablePackageNames, serializeDependencyTableToMarkdown, snapshotFromWorktree } = Changesets;
+const { DepsRegen, serializeDependencyTableToMarkdown } = Changesets;
 /* v8 ignore start -- CLI option definitions */
 const fromOption = Options.text("from").pipe(Options.withDescription("Older ref to diff from (defaults to merge-base with base branch)"), Options.optional);
 const toOption = Options.text("to").pipe(Options.withDescription("Newer ref to diff to (defaults to working tree)"), Options.optional);
@@ -61,27 +58,16 @@ function renderMarkdownBlocks(diffs) {
 */
 function runDepsDetect(cwd, from, to, pkg, json, markdown) {
 	return Effect.gen(function* () {
-		const reader = yield* WorkspaceSnapshotReader;
-		const resolvedCwd = resolve(cwd);
-		let fromRef = Option.getOrUndefined(from);
-		if (!fromRef) fromRef = yield* gitMergeBase(resolvedCwd, (yield* (yield* ConfigInspector).inspect(resolvedCwd).pipe(Effect.catchTag("ConfigurationError", () => Effect.succeed({ baseBranch: "main" })))).baseBranch).pipe(Effect.catchTag("GitError", (err) => {
+		const diffs = (yield* (yield* DepsRegen).plan({
+			cwd,
+			includeDevDeps: true,
+			...Option.isSome(pkg) ? { package: pkg.value } : {},
+			...Option.isSome(from) ? { from: from.value } : {},
+			...Option.isSome(to) ? { to: to.value } : {}
+		}).pipe(Effect.catchTag("GitError", (err) => {
 			process.exitCode = 1;
 			return Effect.fail(err);
-		}));
-		const toRef = Option.getOrUndefined(to);
-		let diffs = computeWorkspaceDependencyDiffs(yield* reader.snapshotAt(resolvedCwd, fromRef).pipe(Effect.catchTag("GitError", (err) => {
-			process.exitCode = 1;
-			return Effect.fail(err);
-		})), toRef ? yield* reader.snapshotAt(resolvedCwd, toRef).pipe(Effect.catchTag("GitError", (err) => {
-			process.exitCode = 1;
-			return Effect.fail(err);
-		})) : snapshotFromWorktree(resolvedCwd));
-		const targetPkg = Option.getOrUndefined(pkg);
-		if (targetPkg) diffs = diffs.filter((d) => d.package === targetPkg);
-		else {
-			const publishable = yield* listPublishablePackageNames(yield* (yield* WorkspaceDiscovery).listPackages(resolvedCwd).pipe(Effect.catchAll(() => Effect.succeed([]))));
-			diffs = diffs.filter((d) => publishable.has(d.package));
-		}
+		}))).toWrite.map((entry) => entry.diff);
 		if (markdown && !json) {
 			yield* Effect.log(renderMarkdownBlocks(diffs));
 			return;

package/commands/changeset/commands/deps-regen.js

@@ -1,9 +1,6 @@
 import { Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Console, Effect, Option } from "effect";
-import { WorkspaceDiscovery } from "workspaces-effect";
-import { join, resolve } from "node:path";
-import { existsSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from "node:fs";
 
 //#region src/commands/changeset/commands/deps-regen.ts
 /**
@@ -12,7 +9,14 @@ import { existsSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from
 * cumulative dep diff from base to working tree.
 *
 * @remarks
-* **The single-package-per-changeset rule.** This command enforces our
+* This is a thin adapter over {@link Changesets.DepsRegen}: the plan/execute
+* orchestration (pure-dependency-changeset detection, protocol-specifier
+* resolution, filename generation, and the filesystem writes themselves)
+* lives in `@savvy-web/silk-effects`. This command only translates CLI
+* options into a `plan()` call, conditionally applies the plan via
+* `execute()`, and renders the resulting {@link RegenPlan}.
+*
+* **The single-package-per-changeset rule.** The service enforces our
 * convention that each `.changeset/*.md` file lists exactly one package
 * in its frontmatter. `@changesets/cli` technically supports multi-package
 * frontmatter, but our agent (and this command) always produces single-
@@ -28,18 +32,9 @@ import { existsSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from
 * Anything else (multi-package frontmatter, additional sections, comments,
 * `### Sub-headings`, etc.) is treated as "mixed" and left untouched.
 * That's the safe default — if a human authored something idiosyncratic,
-* we don't clobber it.
-*
-* **The algorithm:**
-*
-* 1. Compute dep diff from `merge-base(baseBranch, HEAD)` to working
-*    tree, grouped by workspace package.
-* 2. Find every pure-dependency changeset (strict definition).
-* 3. Delete every one of them — even those for packages with no current
-*    dep changes (their changeset is stale by definition).
-* 4. Write a fresh `<adjective>-<noun>-<verb>.md` per workspace package
-*    that has current dep changes: single-package frontmatter, `patch`
-*    bump, one `## Dependencies` section, one CSH005 table.
+* we don't clobber it. `devDependency` rows are dropped by the service
+* (the regen default) and protocol specifiers (`catalog:`/`workspace:`)
+* are resolved to concrete versions.
 *
 * @example
 * ```bash
@@ -50,7 +45,7 @@ import { existsSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from
 *
 * @internal
 */
-const { ConfigInspector, WorkspaceSnapshotReader, computeWorkspaceDependencyDiffs, gitMergeBase, listPublishablePackageNames, serializeDependencyTableToMarkdown, snapshotFromWorktree } = Changesets;
+const { DepsRegen } = Changesets;
 /* v8 ignore start -- CLI option definitions */
 const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Project root (defaults to the current working directory)"), Options.withDefault("."));
 const baseOption = Options.text("base").pipe(Options.withDescription("Override the base branch (defaults to config baseBranch)"), Options.optional);
@@ -58,141 +53,6 @@ const packageOption = Options.text("package").pipe(Options.withDescription("Rest
 const dryRunOption = Options.boolean("dry-run").pipe(Options.withDescription("Print the plan without writing or deleting"), Options.withDefault(false));
 const jsonOption = Options.boolean("json").pipe(Options.withDescription("Emit a structured plan as JSON"), Options.withDefault(false));
 /* v8 ignore stop */
-const ADJECTIVES = [
-	"brave",
-	"clever",
-	"swift",
-	"silver",
-	"lucky",
-	"happy",
-	"calm",
-	"bright",
-	"quiet",
-	"wild"
-];
-const NOUNS = [
-	"dogs",
-	"cats",
-	"wolves",
-	"foxes",
-	"cups",
-	"ships",
-	"trees",
-	"owls",
-	"cranes",
-	"hills"
-];
-const VERBS = [
-	"laugh",
-	"dream",
-	"fly",
-	"sing",
-	"dance",
-	"wander",
-	"soar",
-	"rest",
-	"leap",
-	"ponder"
-];
-function pickRandomTriplet() {
-	return `${ADJECTIVES[Math.floor(Math.random() * ADJECTIVES.length)]}-${NOUNS[Math.floor(Math.random() * NOUNS.length)]}-${VERBS[Math.floor(Math.random() * VERBS.length)]}`;
-}
-/**
-* Pick a `<adjective>-<noun>-<verb>` filename slug that does not collide
-* with an existing `.changeset/*.md`. The triplet space is 1,000
-* combinations, so a busy repo can plausibly exhaust it across runs;
-* fall back to a timestamp suffix after 20 unlucky picks.
-*
-* @internal
-*/
-function randomFilename(changesetDir) {
-	for (let i = 0; i < 20; i++) {
-		const candidate = pickRandomTriplet();
-		if (!existsSync(join(changesetDir, `${candidate}.md`))) return candidate;
-	}
-	return `${pickRandomTriplet()}-${Date.now()}`;
-}
-/**
-* Strict detection of "pure dependency changesets" per the documented
-* rules: single-package frontmatter, single `## Dependencies` heading,
-* no other body content beyond that section.
-*
-* @internal
-*/
-function isPureDependencyChangeset(content) {
-	const fmMatch = content.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
-	if (!fmMatch) return {
-		isPure: false,
-		package: null
-	};
-	const frontmatter = fmMatch[1];
-	const body = (fmMatch[2] ?? "").trim();
-	const fmLines = frontmatter.split(/\r?\n/).filter((l) => l.trim().length > 0 && !/^\s*#/.test(l));
-	if (fmLines.length !== 1) return {
-		isPure: false,
-		package: null
-	};
-	const pkgMatch = fmLines[0].match(/^\s*["']?([^"':\s]+)["']?\s*:\s*([a-z]+)\s*$/);
-	if (!pkgMatch) return {
-		isPure: false,
-		package: null
-	};
-	const pkg = pkgMatch[1];
-	const bodyTrimmed = body.replace(/^\s+/, "");
-	if (!/^## Dependencies\b/.test(bodyTrimmed)) return {
-		isPure: false,
-		package: null
-	};
-	if ((bodyTrimmed.match(/^## /gm) ?? []).length !== 1) return {
-		isPure: false,
-		package: null
-	};
-	if (/^# /m.test(bodyTrimmed)) return {
-		isPure: false,
-		package: null
-	};
-	return {
-		isPure: true,
-		package: pkg
-	};
-}
-function listChangesetFiles(changesetDir) {
-	if (!existsSync(changesetDir)) return [];
-	return readdirSync(changesetDir).filter((f) => f.endsWith(".md") && f !== "README.md").map((f) => join(changesetDir, f));
-}
-function findPureDependencyChangesets(changesetDir) {
-	const result = [];
-	for (const file of listChangesetFiles(changesetDir)) {
-		let content;
-		try {
-			content = readFileSync(file, "utf8");
-		} catch {
-			continue;
-		}
-		const detection = isPureDependencyChangeset(content);
-		if (detection.isPure && detection.package) result.push({
-			file,
-			package: detection.package
-		});
-	}
-	return result;
-}
-function findMixedDependencyChangesets(changesetDir) {
-	const result = [];
-	for (const file of listChangesetFiles(changesetDir)) {
-		let content;
-		try {
-			content = readFileSync(file, "utf8");
-		} catch {
-			continue;
-		}
-		if (/^## Dependencies\b/m.test(content) && !isPureDependencyChangeset(content).isPure) result.push(file);
-	}
-	return result;
-}
-function renderChangesetContent(diff) {
-	return `${`---\n"${diff.package}": patch\n---`}\n\n## Dependencies\n\n${serializeDependencyTableToMarkdown([...diff.rows])}\n`;
-}
 /**
 * Handler exported for direct invocation in tests.
 *
@@ -200,47 +60,16 @@ function renderChangesetContent(diff) {
 */
 function runDepsRegen(cwd, base, pkg, dryRun, json) {
 	return Effect.gen(function* () {
-		const resolvedCwd = resolve(cwd);
-		const changesetDir = join(resolvedCwd, ".changeset");
-		const reader = yield* WorkspaceSnapshotReader;
-		let baseBranch = Option.getOrUndefined(base);
-		if (!baseBranch) baseBranch = (yield* (yield* ConfigInspector).inspect(resolvedCwd).pipe(Effect.catchTag("ConfigurationError", () => Effect.succeed({ baseBranch: "main" })))).baseBranch;
-		const mergeBase = yield* gitMergeBase(resolvedCwd, baseBranch).pipe(Effect.catchTag("GitError", (err) => {
-			process.exitCode = 1;
-			return Effect.fail(err);
-		}));
-		let diffs = computeWorkspaceDependencyDiffs(yield* reader.snapshotAt(resolvedCwd, mergeBase).pipe(Effect.catchTag("GitError", (err) => {
+		const service = yield* DepsRegen;
+		const plan = yield* service.plan({
+			cwd,
+			...Option.isSome(base) ? { base: base.value } : {},
+			...Option.isSome(pkg) ? { package: pkg.value } : {}
+		}).pipe(Effect.catchTag("GitError", (err) => {
 			process.exitCode = 1;
 			return Effect.fail(err);
-		})), snapshotFromWorktree(resolvedCwd));
-		const targetPkg = Option.getOrUndefined(pkg);
-		const publishable = yield* listPublishablePackageNames(yield* (yield* WorkspaceDiscovery).listPackages(resolvedCwd).pipe(Effect.catchAll(() => Effect.succeed([]))));
-		if (targetPkg) diffs = diffs.filter((d) => d.package === targetPkg);
-		else diffs = diffs.filter((d) => publishable.has(d.package));
-		const existingPure = findPureDependencyChangesets(changesetDir);
-		const skippedMixed = findMixedDependencyChangesets(changesetDir);
-		const toDelete = targetPkg ? existingPure.filter((p) => p.package === targetPkg) : existingPure.filter((p) => publishable.has(p.package));
-		const toWrite = diffs.map((diff) => ({
-			file: join(changesetDir, `${randomFilename(changesetDir)}.md`),
-			package: diff.package,
-			diff
 		}));
-		const plan = {
-			toDelete,
-			toWrite,
-			skippedMixed
-		};
-		if (dryRun) {
-			if (json) yield* Console.log(JSON.stringify(plan, null, 2));
-			else yield* renderHumanPlan(plan);
-			return;
-		}
-		for (const entry of toDelete) try {
-			unlinkSync(entry.file);
-		} catch (error) {
-			yield* Effect.logWarning(`Failed to delete ${entry.file}: ${error instanceof Error ? error.message : String(error)}`);
-		}
-		for (const entry of toWrite) writeFileSync(entry.file, renderChangesetContent(entry.diff));
+		if (!dryRun) yield* service.execute(plan);
 		if (json) yield* Console.log(JSON.stringify(plan, null, 2));
 		else yield* renderHumanPlan(plan);
 	});
@@ -274,4 +103,4 @@ const depsRegenCommand = Command.make("regen", {
 }, ({ cwd, base, package: pkg, dryRun, json }) => runDepsRegen(cwd, base, pkg, dryRun, json)).pipe(Command.withDescription("Delete pure dependency changesets and regenerate them from the current diff"));
 
 //#endregion
-export { depsRegenCommand, isPureDependencyChangeset, runDepsRegen };
+export { depsRegenCommand, runDepsRegen };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "1.3.4",
+	"version": "1.3.6",
 	"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",
@@ -36,9 +36,9 @@
 		"@effect/platform-node": "^0.107.0",
 		"@effect/rpc": "^0.75.1",
 		"@effect/sql": "^0.51.1",
-		"@savvy-web/silk-effects": "1.5.1",
+		"@savvy-web/silk-effects": "1.6.0",
 		"effect": "^3.21.4",
-		"jsonc-effect": "^0.2.1",
+		"jsonc-effect": "^0.3.0",
 		"workspaces-effect": "^1.2.0",
 		"yaml": "^2.9.0"
 	}