@savvy-web/cli 1.1.2 → 1.2.0

package/cli/index.js

@@ -34,7 +34,8 @@ import { PackageManagerDetectorLive, WorkspaceDiscoveryLive, WorkspaceRootLive }
 *   `ConfigDiscoveryLive`, `ToolDiscoveryLive`, and `VersioningStrategyLive`
 *   (provided `ChangesetConfigReaderLive`).
 * - Changesets-namespace services — `Changesets.ConfigInspectorLive` (provided
-*   `ChangesetConfigReaderLive`), `Changesets.WorkspaceSnapshotReaderLive`, and
+*   `ChangesetConfigReaderLive`), `Changesets.WorkspaceSnapshotReaderLive`,
+*   `Changesets.ReleasePlannerLive` (provided `ConfigInspectorLive`), and
 *   `Changesets.BranchAnalyzerLive`, which shares the single `ConfigInspectorLive`
 *   instance built once via `provideMerge`.
 *
@@ -56,7 +57,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 ]));
 const cli = Command.run(rootCommand, {
 	name: "savvy",
-	version: "1.1.2"
+	version: "1.2.0"
 });
 /**
 * Shared base layer: workspace services, the changeset config reader, and the
@@ -93,18 +94,19 @@ const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, Manage
 * `Changesets.ConfigInspectorLive` needs `ChangesetConfigReader`,
 * `WorkspaceDiscovery`, and `FileSystem` (the last for its publishConfig-driven
 * fallback when no explicit `packages` record is configured);
-* `Changesets.BranchAnalyzerLive` needs `ConfigInspector`.
+* `Changesets.BranchAnalyzerLive` needs `ConfigInspector`;
+* `Changesets.ReleasePlannerLive` needs `ConfigInspector`.
 *
 * `ConfigInspectorLive` is built once via {@link Layer.provideMerge}: the merge
-* feeds that single `ConfigInspector` instance into `BranchAnalyzerLive` AND
-* re-exposes it for the surviving `config validate` handler that yields it
-* directly, so it is never constructed twice per run.
+* feeds that single `ConfigInspector` instance into `ReleasePlannerLive` and
+* `BranchAnalyzerLive` AND re-exposes it for the surviving `config validate`
+* handler that yields it directly, so it is never constructed twice per run.
 *
 * `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.ConfigInspectorLive));
+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));
 /**
 * Bootstrap and run the `savvy` CLI application.

package/commands/changeset/commands/version.js

@@ -2,177 +2,44 @@ import { requireValidConfig } from "../utils/config-gate.js";
 import { Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
-import { PackageManagerDetector, WorkspaceDiscovery } from "workspaces-effect";
-import { join, resolve } from "node:path";
-import { existsSync, readFileSync } from "node:fs";
-import { execSync } from "node:child_process";
 
 //#region src/commands/changeset/commands/version.ts
 /**
-* Version command -- orchestrate `changeset version` and changelog transforms.
+* Version command -- natively apply pending changesets and report the result.
 *
-* Detects the package manager, validates the config, runs `changeset version`,
-* discovers all workspace CHANGELOG.md files, transforms each one with the
-* remark pipeline, and updates any configured version files.
-*
-* @remarks
-* The command performs six steps:
-* 1. Detect the package manager (`pnpm`, `npm`, `yarn`, `bun`) via
-*    `PackageManagerDetector` from `workspaces-effect`.
-* 2. **Require a valid `.changeset/config.json` via {@link ConfigInspector}**.
-*    If the config has overlap conflicts, unknown package keys, dual-shape,
-*    or schema errors, refuse to run and exit non-zero — a broken config
-*    means we cannot determine the right versions to write.
-* 3. Run `changeset version` (skipped with `--dry-run`).
-* 4. Discover all CHANGELOG.md files across workspace packages via
-*    `WorkspaceDiscovery` from `workspaces-effect`.
-* 5. Transform each discovered changelog with
-*    {@link ChangelogTransformer.transformFile}.
-* 6. Update version files using the **resolved** {@link InspectedConfig}
-*    via {@link VersionFiles.processResolvedVersionFiles}.
-*
-* @example
-* ```bash
-* savvy changeset version
-* savvy changeset version --dry-run
-* ```
+* Validates the config, then runs {@link ReleasePlanner.apply}, which bumps
+* versions, writes + transforms CHANGELOGs, deletes consumed changesets, and
+* updates configured versionFiles -- all without shelling out to a `changeset`
+* CLI binary.
 *
 * @internal
 */
-const { ChangelogTransformer, ConfigInspector, VersionFileError, VersionFiles } = Changesets;
-/**
-* Map package manager to the correct `changeset version` shell command.
-*
-* @internal
-*/
-function getChangesetVersionCommand(pm) {
-	switch (pm) {
-		case "pnpm": return "pnpm exec changeset version";
-		case "yarn": return "yarn exec changeset version";
-		case "bun": return "bun x changeset version";
-		default: return "npx changeset version";
-	}
-}
 /* v8 ignore start -- CLI option definitions; handler tested via runVersion */
-const dryRunOption = Options.boolean("dry-run").pipe(Options.withAlias("n"), Options.withDescription("Skip changeset version, only transform existing CHANGELOGs"), Options.withDefault(false));
+const dryRunOption = Options.boolean("dry-run").pipe(Options.withAlias("n"), Options.withDescription("Compute and report the release without writing anything"), Options.withDefault(false));
 /* v8 ignore stop */
 /**
-* Run the full version orchestration pipeline.
-*
-* Detects the package manager, validates the config, optionally runs
-* `changeset version`, discovers and transforms all workspace changelogs,
-* and updates version files using the resolved per-package scopes.
-*
-* @param dryRun - When `true`, skip `changeset version` and only transform
-*   existing CHANGELOG files
-* @returns An Effect that performs the versioning pipeline
+* Validate config, then natively apply (or dry-run) the release via
+* {@link ReleasePlanner}.
 *
-* @internal
+* @param dryRun - When `true`, write nothing; only report planned changes.
 */
 function runVersion(dryRun) {
 	return Effect.gen(function* () {
 		const cwd = process.cwd();
-		const pm = (yield* (yield* PackageManagerDetector).detect(cwd).pipe(Effect.catchAll(() => Effect.succeed({
-			type: "npm",
-			version: void 0
-		})))).type;
-		yield* Effect.log(`Detected package manager: ${pm}`);
 		yield* requireValidConfig(cwd);
-		if (!dryRun) {
-			const cmd = getChangesetVersionCommand(pm);
-			yield* Effect.log(`Running: ${cmd}`);
-			yield* Effect.try({
-				try: () => execSync(cmd, {
-					cwd,
-					stdio: "inherit"
-				}),
-				catch: (error) => /* @__PURE__ */ new Error(`changeset version failed: ${error instanceof Error ? error.message : String(error)}`)
-			});
-		} else yield* Effect.log("Dry run: skipping changeset version");
-		const packages = yield* (yield* WorkspaceDiscovery).listPackages().pipe(Effect.catchAll(() => Effect.succeed([])));
-		const changelogs = [];
-		const seen = /* @__PURE__ */ new Set();
-		const resolvedCwd = resolve(cwd);
-		for (const pkg of packages) {
-			const changelogPath = join(pkg.path, "CHANGELOG.md");
-			if (existsSync(changelogPath) && !seen.has(pkg.path)) {
-				seen.add(pkg.path);
-				changelogs.push({
-					name: pkg.name,
-					path: pkg.path,
-					changelogPath
-				});
-			}
-		}
-		if (!seen.has(resolvedCwd)) {
-			const rootChangelog = join(resolvedCwd, "CHANGELOG.md");
-			if (existsSync(rootChangelog)) {
-				let rootName = "root";
-				try {
-					const pkg = JSON.parse(readFileSync(join(resolvedCwd, "package.json"), "utf-8"));
-					if (pkg.name) rootName = pkg.name;
-				} catch {}
-				changelogs.push({
-					name: rootName,
-					path: resolvedCwd,
-					changelogPath: rootChangelog
-				});
-			}
-		}
-		if (changelogs.length === 0) yield* Effect.log("No CHANGELOG.md files found.");
-		else {
-			yield* Effect.log(`Found ${changelogs.length} CHANGELOG.md file(s)`);
-			for (const entry of changelogs) {
-				yield* Effect.try({
-					try: () => ChangelogTransformer.transformFile(entry.changelogPath),
-					catch: (error) => /* @__PURE__ */ new Error(`Failed to transform ${entry.changelogPath}: ${error instanceof Error ? error.message : String(error)}`)
-				});
-				yield* Effect.log(`Transformed ${entry.name} → ${entry.changelogPath}`);
-			}
-		}
-		if (!existsSync(join(resolvedCwd, ".changeset", "config.json"))) return;
-		const scopesWithVersionFiles = (yield* (yield* ConfigInspector).inspect(resolvedCwd)).packages.filter((p) => p.versionFiles.length > 0).map((p) => {
-			const fresh = readPackageVersionFromDisk(p.workspaceDir);
-			return fresh && fresh !== p.version ? {
-				...p,
-				version: fresh
-			} : p;
-		});
-		if (scopesWithVersionFiles.length === 0) return;
-		yield* Effect.log(`Found ${scopesWithVersionFiles.length} package${scopesWithVersionFiles.length === 1 ? "" : "s"} with versionFiles`);
-		const updates = yield* Effect.try({
-			try: () => VersionFiles.processResolvedVersionFiles(scopesWithVersionFiles, dryRun),
-			catch: (error) => {
-				const message = error instanceof Error ? error.message : String(error);
-				return new VersionFileError({
-					filePath: message.match(/Failed to update (.+?):/)?.[1] ?? cwd,
-					reason: message
-				});
-			}
-		});
-		for (const update of updates) {
-			const action = dryRun ? "Would update" : "Updated";
-			yield* Effect.log(`${action} ${update.filePath} → ${update.version}`);
+		const result = yield* (yield* Changesets.ReleasePlanner).apply(cwd, { dryRun });
+		if (result.releases.length === 0) {
+			yield* Effect.log("No pending changesets.");
+			return;
 		}
+		const verb = dryRun ? "Would release" : "Released";
+		for (const r of result.releases) yield* Effect.log(`${verb} ${r.name}: ${r.oldVersion} -> ${r.newVersion} (${r.type})`);
+		if (!dryRun) yield* Effect.log(`Touched ${result.touchedFiles.length} file(s)`);
+		for (const u of result.versionFileUpdates) yield* Effect.log(`${dryRun ? "Would update" : "Updated"} ${u.filePath} -> ${u.version}`);
 	});
 }
-/**
-* Read the `version` field from a workspace package's `package.json` on
-* disk. Used to bypass cached state in `ConfigInspector` and
-* `WorkspaceDiscovery` after `changeset version` has rewritten each
-* workspace's manifest.
-*
-* @internal
-*/
-function readPackageVersionFromDisk(workspaceDir) {
-	try {
-		return JSON.parse(readFileSync(join(workspaceDir, "package.json"), "utf-8")).version ?? null;
-	} catch {
-		return null;
-	}
-}
 /* v8 ignore next 4 -- CLI registration; handler tested via runVersion */
-const versionCommand = Command.make("version", { dryRun: dryRunOption }, ({ dryRun }) => runVersion(dryRun)).pipe(Command.withDescription("Run changeset version and transform all CHANGELOGs"));
+const versionCommand = Command.make("version", { dryRun: dryRunOption }, ({ dryRun }) => runVersion(dryRun)).pipe(Command.withDescription("Apply pending changesets: bump versions and transform CHANGELOGs"));
 
 //#endregion
 export { versionCommand };

package/index.d.ts

@@ -30,7 +30,8 @@ import { JsoncParseError } from "jsonc-effect";
  *   `ConfigDiscoveryLive`, `ToolDiscoveryLive`, and `VersioningStrategyLive`
  *   (provided `ChangesetConfigReaderLive`).
  * - Changesets-namespace services — `Changesets.ConfigInspectorLive` (provided
- *   `ChangesetConfigReaderLive`), `Changesets.WorkspaceSnapshotReaderLive`, and
+ *   `ChangesetConfigReaderLive`), `Changesets.WorkspaceSnapshotReaderLive`,
+ *   `Changesets.ReleasePlannerLive` (provided `ConfigInspectorLive`), and
  *   `Changesets.BranchAnalyzerLive`, which shares the single `ConfigInspectorLive`
  *   instance built once via `provideMerge`.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "1.1.2",
+	"version": "1.2.0",
 	"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,7 +36,7 @@
 		"@effect/platform-node": "^0.107.0",
 		"@effect/rpc": "^0.75.1",
 		"@effect/sql": "^0.51.1",
-		"@savvy-web/silk-effects": "1.3.1",
+		"@savvy-web/silk-effects": "1.4.0",
 		"effect": "^3.21.3",
 		"jsonc-effect": "^0.2.1",
 		"workspaces-effect": "^1.2.0",