@savvy-web/cli 1.6.1 → 2.0.0

package/commands/repos/commands/sync.js

@@ -1,6 +1,6 @@
-import { Command, Options } from "@effect/cli";
 import { Repos } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/repos/commands/sync.ts
 /**
@@ -24,7 +24,7 @@ import { Effect } from "effect";
 * @internal
 */
 /* v8 ignore start -- CLI option definitions */
-const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Repo root to sync"), Options.withDefault("."));
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Repo root to sync"), Flag.withDefault("."));
 /* v8 ignore stop */
 /**
 * Sync handler; exported for tests.

package/commands/repos/index.js

@@ -3,7 +3,7 @@ import { noteCommand, runReposNote } from "./commands/note.js";
 import { pinCommand, runReposPin } from "./commands/pin.js";
 import { runReposStatus, statusCommand } from "./commands/status.js";
 import { runReposSync, syncCommand } from "./commands/sync.js";
-import { Command } from "@effect/cli";
+import { Command } from "effect/unstable/cli";
 
 //#region src/commands/repos/index.ts
 /* v8 ignore start -- CLI registration; each command tested via exported handler */
@@ -18,9 +18,12 @@ const _reposCommand = Command.make("repos").pipe(Command.withSubcommands([
 * The `savvy repos` command group.
 *
 * @remarks
-* Typed as `unknown` at the export boundary to avoid TypeScript declaration-emit
-* errors from Effect's internal types (TS4023), matching the `changesetCommand`
-* export pattern.
+* Annotated with the exact five-parameter `Command.Command` instantiation
+* (verified against the inferred type): the bare inferred type additionally
+* prints the structural `subcommands` tree, whose inline command types
+* reference effect's non-exported `Inspectable` module (TS4023). The
+* annotation preserves the exact Error/Requirements channels, so the root
+* layer graph stays compiler-validated.
 */
 const reposCommand = _reposCommand;
 

package/index.d.ts

@@ -1,13 +1,13 @@
-import { Command } from "@effect/cli";
-import { Effect } from "effect";
-import { WorkspaceDiscovery, WorkspaceRoot } from "workspaces-effect";
-import { FileSystem } from "@effect/platform";
-import { PlatformError } from "@effect/platform/Error";
-import { BiomeSchemaSync, ConfigDiscovery, ManagedSection, Repos, SectionParseError, SectionWriteError, ToolDiscovery, VersioningStrategy } from "@savvy-web/silk-effects";
-import { JsoncParseError } from "jsonc-effect";
+import { BiomeSchemaSync, Changesets, ConfigDiscovery, ManagedSection, Repos, SectionParseError, SectionWriteError, ToolDiscovery, VersioningStrategy } from "@savvy-web/silk-effects";
+import { Cause, Effect, FileSystem } from "effect";
+import { Command } from "effect/unstable/cli";
+import { Git } from "@effected/git";
+import { WorkspaceDiscovery, WorkspaceRoot } from "@effected/workspaces";
+import { PlatformError } from "effect/PlatformError";
+import { JsoncParseError } from "@effected/jsonc";
 //#region src/cli/index.d.ts
 /**
- * Root `savvy` CLI entry point using `@effect/cli`.
+ * Root `savvy` CLI entry point using `effect/unstable/cli`.
  *
  * @remarks
  * Assembles the five Phase-B command pieces — the `init` and `check` top-level
@@ -15,23 +15,30 @@ import { JsoncParseError } from "jsonc-effect";
  * single `savvy` root command, then provides the merged runtime Layer stack
  * that satisfies every command's service requirements.
  *
- * The layer stack is the union of the three standalone CLIs' stacks
- * (`@savvy-web/changesets`, `@savvy-web/commitlint`, `@savvy-web/lint-staged`),
- * with each service's transitive dependencies wired:
- *
- * - `NodeContext.layer` — `FileSystem`, `Path`, and `CommandExecutor`, consumed
- *   by every config reader, workspace service, and tool-discovery layer.
- * - Workspace services — `WorkspaceRootLive`, `PackageManagerDetectorLive`, and
- *   `WorkspaceDiscoveryLive` (provided `WorkspaceRootLive`), the minimal hand-wired
- *   trio shared by the three source CLIs.
+ * The layer stack wires the silk-effects Lives over their v4 requirement
+ * channels:
+ *
+ * - `NodeServices.layer` — `FileSystem`, `Path`, `ChildProcessSpawner`, `Stdio`,
+ *   and `Terminal`, consumed by every config reader, workspace service, git
+ *   layer, and the CLI framework itself.
+ * - `Git.layer` (from `@effected/git`) — the typed git service backing
+ *   `BranchAnalyzer`, `ReposManager`, the commit hooks
+ *   (`readBranchInfo` / `readSigningDiagnostic`), and `detectGitHubRepo`.
+ * - Workspace services from `@effected/workspaces` — `WorkspaceRoot.layer`,
+ *   `PackageManagerDetector.layer`, and a single root-bound
+ *   `WorkspaceDiscovery.layer()` (the kit resolves the root through
+ *   `WorkspaceRoot` from `process.cwd()` lazily on first use, so the CLI's
+ *   startup cwd is the discovery root).
  * - Flat silk-effects services — `ChangesetConfigReaderLive`,
  *   `SilkPublishabilityDetectorLive`, `ManagedSectionLive`, `BiomeSchemaSyncLive`,
- *   `ConfigDiscoveryLive`, `ToolDiscoveryLive`, and `VersioningStrategyLive`
- *   (provided `ChangesetConfigReaderLive`).
- * - Changesets-namespace services — `Changesets.ConfigInspectorLive` (provided
- *   `ChangesetConfigReaderLive`), `Changesets.ReleasePlannerLive` (provided
- *   `ConfigInspectorLive`), and `Changesets.BranchAnalyzerLive`, which shares
- *   the single `ConfigInspectorLive` instance built once via `provideMerge`.
+ *   `ConfigDiscoveryLive`, `ToolDiscoveryLive`, and `VersioningStrategyLive`.
+ * - Changesets-namespace services — `Changesets.ConfigInspectorLive`,
+ *   `Changesets.ReleasePlannerLive`, and `Changesets.BranchAnalyzerLive`
+ *   sharing a single `ConfigInspector` via `provideMerge`. `DepsRegen` is NOT
+ *   part of AppLive: its graph is root-bound at layer build, so the deps
+ *   commands compose `Changesets.makeDepsRegenDefault({ cwd })` per invocation
+ *   against their parsed `--cwd` (platform services flow up to
+ *   `NodeServices.layer` here).
  *
  * The CLI version is injected at build time via `process.env.__PACKAGE_VERSION__`.
  *
@@ -41,8 +48,11 @@ import { JsoncParseError } from "jsonc-effect";
  * Bootstrap and run the `savvy` CLI application.
  *
  * @remarks
- * Builds an Effect from the parsed `process.argv`, provides the merged layer
- * stack, and hands execution to `NodeRuntime.runMain`.
+ * `Command.run` returns an Effect reading `process.argv` from the Stdio
+ * service; the merged layer stack is provided and execution handed to
+ * `NodeRuntime.runMain`, whose default reporting covers defects (the v3
+ * `Cause.defects` wrapper is gone). No type casts: the layer graph is
+ * validated by the compiler.
  *
  * @internal
  */
@@ -79,18 +89,21 @@ declare function runChangesetInit(opts: {
   quiet: boolean;
   skipMarkdownlint: boolean;
   check: boolean;
-}): Effect.Effect<void, never, WorkspaceRoot>;
+}): Effect.Effect<void, never, WorkspaceRoot | Git>;
 //#endregion
 //#region src/commands/changeset/index.d.ts
 /**
  * The `savvy changeset` command group for use in Task B7 root assembly.
  *
  * @remarks
- * Typed as `unknown` at the export boundary to avoid TypeScript declaration-emit
- * errors from Effect's internal types. Task B7 should import and use this via
- * `Command.withSubcommands([changesetCommand as never])` or re-infer the type.
+ * Annotated with the exact five-parameter `Command.Command` instantiation
+ * (verified against the inferred type): the bare inferred type additionally
+ * prints the structural `subcommands` tree, whose inline command types
+ * reference effect's non-exported `Inspectable` module (TS4023). The
+ * annotation preserves the exact Error/Requirements channels, so the root
+ * layer graph stays compiler-validated.
  */
-declare const changesetCommand: Command.Command<"changeset", any, any, any>;
+declare const changesetCommand: Command.Command<"changeset", Record<string, never>, Record<string, never>, Changesets.ConfigurationError | Error | Changesets.ReleasePlanError | Cause.UnknownError | Changesets.DepsRegenPlanError, never>;
 //#endregion
 //#region src/commands/check.d.ts
 /**
@@ -118,7 +131,10 @@ declare function runCheck<EChangeset, RChangeset, ECommit, RCommit, ELint, RLint
  * errors from Effect's internal types. Task B7 should use this via
  * `Command.withSubcommands([checkCommand as never])` or re-infer the type.
  */
-declare const checkCommand: Command.Command<"check", any, any, any>;
+declare const checkCommand: Command.Command<"check", {
+  readonly changesetDir: string;
+  readonly quiet: boolean;
+}, {}, Error | import("@effected/jsonc").JsoncParseError | import("effect/PlatformError").PlatformError | import("@savvy-web/silk-effects").SectionParseError, import("@savvy-web/silk-effects").ConfigDiscovery | import("effect/FileSystem").FileSystem | import("@savvy-web/silk-effects").ManagedSection | import("@savvy-web/silk-effects").ToolDiscovery | import("@savvy-web/silk-effects").VersioningStrategy | import("@effected/workspaces").WorkspaceDiscovery>;
 //#endregion
 //#region src/commands/commit/check.d.ts
 /**
@@ -159,7 +175,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", any, any, any>;
+declare const commitCommand: Command.Command<"commit", {}, {}, never, never>;
 //#endregion
 //#region src/commands/init.d.ts
 /**
@@ -185,7 +201,12 @@ declare function runInit<EChangeset, RChangeset, ECommit, RCommit, ELint, RLint>
  * errors from Effect's internal types. Task B7 should use this via
  * `Command.withSubcommands([initCommand as never])` or re-infer the type.
  */
-declare const initCommand: Command.Command<"init", any, any, any>;
+declare const initCommand: Command.Command<"init", {
+  readonly force: boolean;
+  readonly commitConfig: string;
+  readonly lintConfig: string;
+  readonly lintPreset: "minimal" | "silk" | "standard";
+}, {}, Error | import("effect/PlatformError").PlatformError | import("@savvy-web/silk-effects").SectionWriteError, import("@savvy-web/silk-effects").BiomeSchemaSync | import("effect/FileSystem").FileSystem | import("@effected/git").Git | import("@savvy-web/silk-effects").ManagedSection | import("@effected/workspaces").WorkspaceRoot>;
 //#endregion
 //#region src/commands/lint/check.d.ts
 /**
@@ -230,7 +251,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", any, any, any>;
+declare const lintCommand: Command.Command<"lint", {}, {}, import("@effected/yaml").YamlParseError | import("@effected/yaml").YamlStringifyError, never>;
 //#endregion
 //#region src/commands/repos/commands/status.d.ts
 /**
@@ -253,11 +274,14 @@ declare const runReposSync: (cwd: string) => Effect.Effect<void, never, Repos.Re
  * The `savvy repos` command group.
  *
  * @remarks
- * Typed as `unknown` at the export boundary to avoid TypeScript declaration-emit
- * errors from Effect's internal types (TS4023), matching the `changesetCommand`
- * export pattern.
+ * Annotated with the exact five-parameter `Command.Command` instantiation
+ * (verified against the inferred type): the bare inferred type additionally
+ * prints the structural `subcommands` tree, whose inline command types
+ * reference effect's non-exported `Inspectable` module (TS4023). The
+ * annotation preserves the exact Error/Requirements channels, so the root
+ * layer graph stays compiler-validated.
  */
-declare const reposCommand: Command.Command<"repos", any, any, any>;
+declare const reposCommand: Command.Command<"repos", Record<string, never>, Record<string, never>, Repos.GitSubmoduleError, never>;
 //#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": "1.6.1",
+	"version": "2.0.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",
@@ -22,7 +22,8 @@
 	"exports": {
 		".": {
 			"types": "./index.d.ts",
-			"import": "./index.js"
+			"import": "./index.js",
+			"default": "./index.js"
 		},
 		"./package.json": "./package.json"
 	},
@@ -30,21 +31,12 @@
 		"savvy": "bin/savvy.js"
 	},
 	"dependencies": {
-		"@effect/cli": "^0.75.2",
-		"@effect/cluster": "^0.59.0",
-		"@effect/experimental": "^0.60.0",
-		"@effect/platform": "^0.96.2",
-		"@effect/platform-node": "^0.107.0",
-		"@effect/printer": "^0.49.0",
-		"@effect/printer-ansi": "^0.49.0",
-		"@effect/rpc": "^0.75.1",
-		"@effect/sql": "^0.51.1",
-		"@effect/typeclass": "^0.40.0",
-		"@effect/workflow": "^0.18.2",
-		"@savvy-web/silk-effects": "3.3.1",
-		"effect": "^3.21.4",
-		"jsonc-effect": "^0.3.1",
-		"workspaces-effect": "^2.1.0",
-		"yaml": "^2.9.0"
+		"@effect/platform-node": "4.0.0-beta.98",
+		"@effected/git": "^0.3.0",
+		"@effected/jsonc": "^0.2.0",
+		"@effected/workspaces": "^0.3.0",
+		"@effected/yaml": "^0.2.0",
+		"@savvy-web/silk-effects": "4.0.0",
+		"effect": "4.0.0-beta.98"
 	}
 }