@savvy-web/cli 1.3.6 → 1.4.0

package/cli/index.js

@@ -6,9 +6,9 @@ import { initCommand } from "../commands/init.js";
 import { lintCommand } from "../commands/lint/index.js";
 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 { BiomeSchemaSyncLive, ChangesetConfigLive, ChangesetConfigReaderLive, Changesets, ConfigDiscoveryLive, ManagedSectionLive, SilkPublishabilityDetectorLive, ToolDiscoveryLive, VersioningStrategyLive } from "@savvy-web/silk-effects";
 import { Effect, Layer } from "effect";
-import { CatalogResolverLive, LockfileReaderLive, PackageManagerDetectorLive, PublishabilityDetectorLive, WorkspaceDiscoveryLive, WorkspaceRootLive } from "workspaces-effect";
+import { PackageManagerDetectorLive, PointInTimeWorkspaceLive, PublishabilityDetectorLive, WorkspaceDiscoveryLive, WorkspaceRootLive } from "workspaces-effect";
 
 //#region src/cli/index.ts
 /**
@@ -34,10 +34,9 @@ import { CatalogResolverLive, LockfileReaderLive, PackageManagerDetectorLive, Pu
 *   `ConfigDiscoveryLive`, `ToolDiscoveryLive`, and `VersioningStrategyLive`
 *   (provided `ChangesetConfigReaderLive`).
 * - Changesets-namespace services — `Changesets.ConfigInspectorLive` (provided
-*   `ChangesetConfigReaderLive`), `Changesets.WorkspaceSnapshotReaderLive`,
-*   `Changesets.ReleasePlannerLive` (provided `ConfigInspectorLive`), and
-*   `Changesets.BranchAnalyzerLive`, which shares the single `ConfigInspectorLive`
-*   instance built once via `provideMerge`.
+*   `ChangesetConfigReaderLive`), `Changesets.ReleasePlannerLive` (provided
+*   `ConfigInspectorLive`), and `Changesets.BranchAnalyzerLive`, which shares
+*   the single `ConfigInspectorLive` instance built once via `provideMerge`.
 *
 * The CLI version is injected at build time via `process.env.__PACKAGE_VERSION__`.
 *
@@ -57,7 +56,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 ]));
 const cli = Command.run(rootCommand, {
 	name: "savvy",
-	version: "1.3.6"
+	version: "1.4.0"
 });
 /**
 * Shared base layer: workspace services, the changeset config reader, and the
@@ -77,12 +76,12 @@ const cli = Command.run(rootCommand, {
 const WorkspaceLive = Layer.mergeAll(WorkspaceRootLive, PackageManagerDetectorLive, WorkspaceDiscoveryLive.pipe(Layer.provide(WorkspaceRootLive)));
 /**
 * Base layer membership: silk-effects leaf services (`ManagedSection`,
-* `BiomeSchemaSync`, `ConfigDiscovery`, `SilkPublishabilityDetector`,
-* `WorkspaceSnapshotReader`) that depend only on the platform, plus the
-* changeset base layers (`WorkspaceLive`, `ChangesetConfigReader`) that
-* `AppLive`'s upper services build upon.
+* `BiomeSchemaSync`, `ConfigDiscovery`, `SilkPublishabilityDetector`) that
+* depend only on the platform, plus the changeset base layers
+* (`WorkspaceLive`, `ChangesetConfigReader`) that `AppLive`'s upper services
+* build upon.
 */
-const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, ManagedSectionLive, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive, Changesets.WorkspaceSnapshotReaderLive);
+const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, ManagedSectionLive, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive);
 /**
 * Merged runtime Layer stack — the union of the three source CLIs' stacks with
 * every inter-layer dependency satisfied.
@@ -103,14 +102,15 @@ const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, Manage
 * 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.
+* service) needs `ConfigInspector`, `WorkspaceDiscovery` (from
+* `BaseLive`/`InspectorAndAnalyzerLive`), plus `PointInTimeWorkspace` and
+* `PublishabilityDetector` from `workspaces-effect`, and `ChangesetConfig`
+* (provided its own `ChangesetConfigReaderLive`, since `Layer.mergeAll` does
+* not cross-feed sibling layers) — none of which the other commands need, so
+* they're composed only for `DepsRegenGroupLive`. `PointInTimeWorkspaceLive`
+* in turn needs `WorkspaceRoot`, `WorkspaceDiscovery`, `CommandExecutor`,
+* `FileSystem`, `Path` — the workspace pair supplied by `WorkspaceLive`, the
+* platform trio by `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.
@@ -121,17 +121,13 @@ const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, Manage
 */
 const InspectorAndAnalyzerLive = Changesets.BranchAnalyzerLive.pipe(Layer.provideMerge(Changesets.ReleasePlannerLive), Layer.provideMerge(Changesets.ConfigInspectorLive));
 /**
-* `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`.
+* (`WorkspaceDiscovery`, platform layers) supplied by `BaseLive` /
+* `NodeContext.layer`. `PointInTimeWorkspaceLive` is provided `WorkspaceLive`
+* so its `WorkspaceRoot`/`WorkspaceDiscovery` requirements resolve; the
+* remaining `CommandExecutor`/`FileSystem`/`Path` flow up to `NodeContext.layer`.
 */
-const DepsRegenGroupLive = Changesets.DepsRegenLive.pipe(Layer.provide(InspectorAndAnalyzerLive), Layer.provide(CatalogLive), Layer.provide(PublishabilityDetectorLive));
+const DepsRegenGroupLive = Changesets.DepsRegenLive.pipe(Layer.provide(InspectorAndAnalyzerLive), Layer.provide(PointInTimeWorkspaceLive.pipe(Layer.provide(WorkspaceLive))), Layer.provide(PublishabilityDetectorLive), Layer.provide(ChangesetConfigLive.pipe(Layer.provide(ChangesetConfigReaderLive))));
 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

@@ -64,9 +64,15 @@ function runDepsDetect(cwd, from, to, pkg, json, markdown) {
 			...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);
+		}).pipe(Effect.catchTags({
+			GitError: (err) => {
+				process.exitCode = 1;
+				return Effect.fail(err);
+			},
+			GitReadError: (err) => {
+				process.exitCode = 1;
+				return Effect.fail(err);
+			}
 		}))).toWrite.map((entry) => entry.diff);
 		if (markdown && !json) {
 			yield* Effect.log(renderMarkdownBlocks(diffs));

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

@@ -65,9 +65,15 @@ function runDepsRegen(cwd, base, pkg, dryRun, json) {
 			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);
+		}).pipe(Effect.catchTags({
+			GitError: (err) => {
+				process.exitCode = 1;
+				return Effect.fail(err);
+			},
+			GitReadError: (err) => {
+				process.exitCode = 1;
+				return Effect.fail(err);
+			}
 		}));
 		if (!dryRun) yield* service.execute(plan);
 		if (json) yield* Console.log(JSON.stringify(plan, null, 2));

package/index.d.ts

@@ -30,10 +30,9 @@ import { JsoncParseError } from "jsonc-effect";
  *   `ConfigDiscoveryLive`, `ToolDiscoveryLive`, and `VersioningStrategyLive`
  *   (provided `ChangesetConfigReaderLive`).
  * - Changesets-namespace services — `Changesets.ConfigInspectorLive` (provided
- *   `ChangesetConfigReaderLive`), `Changesets.WorkspaceSnapshotReaderLive`,
- *   `Changesets.ReleasePlannerLive` (provided `ConfigInspectorLive`), and
- *   `Changesets.BranchAnalyzerLive`, which shares the single `ConfigInspectorLive`
- *   instance built once via `provideMerge`.
+ *   `ChangesetConfigReaderLive`), `Changesets.ReleasePlannerLive` (provided
+ *   `ConfigInspectorLive`), and `Changesets.BranchAnalyzerLive`, which shares
+ *   the single `ConfigInspectorLive` instance built once via `provideMerge`.
  *
  * The CLI version is injected at build time via `process.env.__PACKAGE_VERSION__`.
  *

package/package.json

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