@savvy-web/cli 1.6.1 → 2.0.1

package/cli/index.js

@@ -5,15 +5,16 @@ import { commitCommand } from "../commands/commit/index.js";
 import { initCommand } from "../commands/init.js";
 import { lintCommand } from "../commands/lint/index.js";
 import { reposCommand } from "../commands/repos/index.js";
-import { Command } from "@effect/cli";
-import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { BiomeSchemaSyncLive, ChangesetConfigLive, ChangesetConfigReaderLive, Changesets, ConfigDiscoveryLive, ManagedSectionLive, Repos, SilkPublishabilityDetectorLive, ToolDiscoveryLive, VersioningStrategyLive } from "@savvy-web/silk-effects";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
+import { Git } from "@effected/git";
+import { PackageManagerDetector, WorkspaceDiscovery, WorkspaceRoot } from "@effected/workspaces";
+import { BiomeSchemaSyncLive, ChangesetConfigReaderLive, Changesets, ConfigDiscoveryLive, ManagedSectionLive, Repos, SilkPublishabilityDetectorLive, ToolDiscoveryLive, VersioningStrategyLive } from "@savvy-web/silk-effects";
 import { Effect, Layer } from "effect";
-import { PackageManagerDetectorLive, PointInTimeWorkspaceLive, PublishabilityDetectorLive, WorkspaceDiscoveryLive, WorkspaceRootLive } from "workspaces-effect";
+import { Command } from "effect/unstable/cli";
 
 //#region src/cli/index.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
@@ -21,23 +22,30 @@ import { PackageManagerDetectorLive, PointInTimeWorkspaceLive, PublishabilityDet
 * 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:
+* The layer stack wires the silk-effects Lives over their v4 requirement
+* channels:
 *
-* - `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.
+* - `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__`.
 *
@@ -56,99 +64,65 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 	lintCommand,
 	reposCommand
 ]));
-const cli = Command.run(rootCommand, {
-	name: "savvy",
-	version: "1.6.1"
-});
 /**
-* Shared base layer: workspace services, the changeset config reader, and the
-* leaf silk-effects services that depend only on the platform. Built once and
-* `provideMerge`d so the upper services draw from it AND it stays exposed in the
-* final context for the handlers that yield these tags directly.
-*
-* @remarks
-* The workspace services (`WorkspaceRoot`, `WorkspaceDiscovery`,
-* `PackageManagerDetector`) are wired as a self-contained unit:
-* `WorkspaceDiscoveryLive` is provided `WorkspaceRootLive`, and the bare
-* `WorkspaceRootLive` / `PackageManagerDetectorLive` are exposed for the
-* handlers that yield those tags directly. This mirrors the three source CLIs'
-* minimal workspace wiring rather than pulling in the heavier `WorkspacesLive`
-* (which also forks `DependencyGraph` / `PublishabilityDetector` background work).
+* 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" });
+/**
+* Shared workspace services from `@effected/workspaces`, wired as a
+* self-contained unit and built ONCE (layers memoize by reference).
+* `WorkspaceDiscovery.layer()` is root-bound at first use via `WorkspaceRoot`
+* from the CLI's startup cwd — the single-root semantics every downstream
+* consumer (analyzer, deps-regen, publishability) assumes.
 */
-const WorkspaceLive = Layer.mergeAll(WorkspaceRootLive, PackageManagerDetectorLive, WorkspaceDiscoveryLive.pipe(Layer.provide(WorkspaceRootLive)));
+const WorkspaceRootLive = WorkspaceRoot.layer;
+const WorkspaceDiscoveryLive = WorkspaceDiscovery.layer().pipe(Layer.provide(WorkspaceRootLive));
+const WorkspaceLive = Layer.mergeAll(WorkspaceRootLive, PackageManagerDetector.layer, WorkspaceDiscoveryLive);
+/**
+* The typed git service, built once over the platform spawner and shared by
+* every git-consuming layer AND exposed to handlers that yield `Git` directly
+* (commit hooks, `detectGitHubRepo`).
+*/
+const GitLive = Git.layer;
 /**
 * Base layer membership: silk-effects leaf services (`ManagedSection`,
 * `BiomeSchemaSync`, `ConfigDiscovery`, `SilkPublishabilityDetector`) that
 * depend only on the platform, plus the changeset base layers
-* (`WorkspaceLive`, `ChangesetConfigReader`) that `AppLive`'s upper services
-* build upon.
+* (`WorkspaceLive`, `ChangesetConfigReader`, `GitLive`) that `AppLive`'s
+* upper services build upon.
 */
-const BaseLive = Layer.mergeAll(WorkspaceLive, ChangesetConfigReaderLive, ManagedSectionLive, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive);
+const BaseLive = Layer.mergeAll(WorkspaceLive, GitLive, ChangesetConfigReaderLive, ManagedSectionLive, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive);
 /**
-* Merged runtime Layer stack — the union of the three source CLIs' stacks with
-* every inter-layer dependency satisfied.
-*
-* @remarks
-* The upper services depend on members of `BaseLive`:
-* `ToolDiscoveryLive` needs `WorkspaceRoot`, `PackageManagerDetector`, and
-* `CommandExecutor`; `VersioningStrategyLive` needs `ChangesetConfigReader`;
-* `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.ReleasePlannerLive` needs `ConfigInspector`.
-*
 * `ConfigInspectorLive` is built once via {@link Layer.provideMerge}: the merge
 * 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.
-*
-* `Changesets.DepsRegenLive` (the `deps regen`/`deps detect` orchestration
-* 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.
-*
-* `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.
+* `BranchAnalyzerLive`'s v4 requirements are `ConfigInspector |
+* ChildProcessSpawner` (the spawner flows up to `NodeServices.layer`).
 */
 const InspectorAndAnalyzerLive = Changesets.BranchAnalyzerLive.pipe(Layer.provideMerge(Changesets.ReleasePlannerLive), Layer.provideMerge(Changesets.ConfigInspectorLive));
 /**
-* `Changesets.DepsRegen`, fully composed except for the base services
-* (`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(PointInTimeWorkspaceLive.pipe(Layer.provide(WorkspaceLive))), Layer.provide(PublishabilityDetectorLive), Layer.provide(ChangesetConfigLive.pipe(Layer.provide(ChangesetConfigReaderLive))));
-/**
-* `Repos.ReposManager`, provided its `Repos.ReposConfigStoreLive` dependency.
-* Both draw their platform requirements (`FileSystem`, `Path`,
-* `CommandExecutor`) from `NodeContext.layer` below.
+* `Repos.ReposManager`, provided its `Repos.ReposConfigStoreLive` dependency
+* and the shared `Git` service. Platform requirements (`FileSystem`, `Path`)
+* flow up to `NodeServices.layer`.
 */
-const ReposGroupLive = Repos.ReposManagerLive.pipe(Layer.provide(Repos.ReposConfigStoreLive));
-const AppLive = Layer.mergeAll(ToolDiscoveryLive, VersioningStrategyLive, InspectorAndAnalyzerLive, DepsRegenGroupLive, ReposGroupLive).pipe(Layer.provideMerge(BaseLive), Layer.provideMerge(NodeContext.layer));
+const ReposGroupLive = Repos.ReposManagerLive.pipe(Layer.provide(Repos.ReposConfigStoreLive), Layer.provide(GitLive));
+const AppLive = Layer.mergeAll(ToolDiscoveryLive, VersioningStrategyLive, InspectorAndAnalyzerLive, ReposGroupLive).pipe(Layer.provideMerge(BaseLive), Layer.provideMerge(NodeServices.layer));
 /**
 * 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
 */
 function runCli() {
-	const main = Effect.suspend(() => cli(process.argv)).pipe(Effect.provide(AppLive));
-	NodeRuntime.runMain(main);
+	NodeRuntime.runMain(cli.pipe(Effect.provide(AppLive)));
 }
 /* v8 ignore stop */
 

package/commands/changeset/commands/check.js

@@ -1,6 +1,6 @@
-import { Args, Command } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command } from "effect/unstable/cli";
 import { resolve } from "node:path";
 
 //#region src/commands/changeset/commands/check.ts
@@ -27,7 +27,7 @@ import { resolve } from "node:path";
 */
 const { ChangesetLinter } = Changesets;
 /* v8 ignore next */
-const dirArg = Args.directory({ name: "dir" }).pipe(Args.withDefault(".changeset"));
+const dirArg = Argument.directory("dir").pipe(Argument.withDefault(".changeset"));
 /**
 * Run the check validation pipeline on all changeset files in `dir`.
 *

package/commands/changeset/commands/config-validate.js

@@ -1,6 +1,6 @@
-import { Args, Command } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command } from "effect/unstable/cli";
 import { resolve } from "node:path";
 
 //#region src/commands/changeset/commands/config-validate.ts
@@ -26,7 +26,7 @@ import { resolve } from "node:path";
 */
 const { ConfigInspector } = Changesets;
 /* v8 ignore next */
-const dirArg = Args.directory({ name: "dir" }).pipe(Args.withDefault("."));
+const dirArg = Argument.directory("dir").pipe(Argument.withDefault("."));
 /**
 * Run validation. Logs a one-line OK on success; logs the error and sets
 * `process.exitCode = 1` on failure.

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

@@ -1,6 +1,7 @@
-import { Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Console, Effect, Option } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+import { resolve } from "node:path";
 
 //#region src/commands/changeset/commands/deps-detect.ts
 /**
@@ -28,12 +29,12 @@ import { Console, Effect, Option } from "effect";
 */
 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);
-const cwdOption = Options.directory("cwd").pipe(Options.withDescription("Project root (defaults to the current working directory)"), Options.withDefault("."));
-const packageOption = Options.text("package").pipe(Options.withDescription("Restrict output to a single workspace package"), Options.optional);
-const jsonOption = Options.boolean("json").pipe(Options.withDescription("Emit JSON (default)"), Options.withDefault(false));
-const markdownOption = Options.boolean("markdown").pipe(Options.withDescription("Emit one CSH005 markdown block per workspace package"), Options.withDefault(false));
+const fromOption = Flag.string("from").pipe(Flag.withDescription("Older ref to diff from (defaults to merge-base with base branch)"), Flag.optional);
+const toOption = Flag.string("to").pipe(Flag.withDescription("Newer ref to diff to (defaults to working tree)"), Flag.optional);
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Project root (defaults to the current working directory)"), Flag.withDefault("."));
+const packageOption = Flag.string("package").pipe(Flag.withDescription("Restrict output to a single workspace package"), Flag.optional);
+const jsonOption = Flag.boolean("json").pipe(Flag.withDescription("Emit JSON (default)"), Flag.withDefault(false));
+const markdownOption = Flag.boolean("markdown").pipe(Flag.withDescription("Emit one CSH005 markdown block per workspace package"), Flag.withDefault(false));
 /* v8 ignore stop */
 /**
 * Render a per-workspace diff as markdown — one frontmatter+section block
@@ -64,16 +65,9 @@ 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.catchTags({
-			GitError: (err) => {
-				process.exitCode = 1;
-				return Effect.fail(err);
-			},
-			GitReadError: (err) => {
-				process.exitCode = 1;
-				return Effect.fail(err);
-			}
-		}))).toWrite.map((entry) => entry.diff);
+		}).pipe(Effect.tapError(() => Effect.sync(() => {
+			process.exitCode = 1;
+		})))).toWrite.map((entry) => entry.diff);
 		if (markdown && !json) {
 			yield* Effect.log(renderMarkdownBlocks(diffs));
 			return;
@@ -89,7 +83,7 @@ const depsDetectCommand = Command.make("detect", {
 	package: packageOption,
 	json: jsonOption,
 	markdown: markdownOption
-}, ({ from, to, cwd, package: pkg, json, markdown }) => runDepsDetect(cwd, from, to, pkg, json, markdown)).pipe(Command.withDescription("Compute the dependency diff between two refs"));
+}, ({ from, to, cwd, package: pkg, json, markdown }) => runDepsDetect(cwd, from, to, pkg, json, markdown).pipe(Effect.provide(Changesets.makeDepsRegenDefault({ cwd: resolve(cwd) })))).pipe(Command.withDescription("Compute the dependency diff between two refs"));
 
 //#endregion
 export { depsDetectCommand, renderMarkdownBlocks, runDepsDetect };

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

@@ -1,6 +1,7 @@
-import { Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Console, Effect, Option } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+import { resolve } from "node:path";
 
 //#region src/commands/changeset/commands/deps-regen.ts
 /**
@@ -47,11 +48,11 @@ import { Console, Effect, Option } from "effect";
 */
 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);
-const packageOption = Options.text("package").pipe(Options.withDescription("Restrict regeneration to a single workspace package"), Options.optional);
-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));
+const cwdOption = Flag.directory("cwd").pipe(Flag.withDescription("Project root (defaults to the current working directory)"), Flag.withDefault("."));
+const baseOption = Flag.string("base").pipe(Flag.withDescription("Override the base branch (defaults to config baseBranch)"), Flag.optional);
+const packageOption = Flag.string("package").pipe(Flag.withDescription("Restrict regeneration to a single workspace package"), Flag.optional);
+const dryRunOption = Flag.boolean("dry-run").pipe(Flag.withDescription("Print the plan without writing or deleting"), Flag.withDefault(false));
+const jsonOption = Flag.boolean("json").pipe(Flag.withDescription("Emit a structured plan as JSON"), Flag.withDefault(false));
 /* v8 ignore stop */
 /**
 * Handler exported for direct invocation in tests.
@@ -65,16 +66,9 @@ function runDepsRegen(cwd, base, pkg, dryRun, json) {
 			cwd,
 			...Option.isSome(base) ? { base: base.value } : {},
 			...Option.isSome(pkg) ? { package: pkg.value } : {}
-		}).pipe(Effect.catchTags({
-			GitError: (err) => {
-				process.exitCode = 1;
-				return Effect.fail(err);
-			},
-			GitReadError: (err) => {
-				process.exitCode = 1;
-				return Effect.fail(err);
-			}
-		}));
+		}).pipe(Effect.tapError(() => Effect.sync(() => {
+			process.exitCode = 1;
+		})));
 		if (!dryRun) yield* service.execute(plan);
 		if (json) yield* Console.log(JSON.stringify(plan, null, 2));
 		else yield* renderHumanPlan(plan);
@@ -99,14 +93,14 @@ function renderHumanPlan(plan) {
 		}
 	});
 }
-/* v8 ignore next 8 */
+/* v8 ignore next 12 */
 const depsRegenCommand = Command.make("regen", {
 	cwd: cwdOption,
 	base: baseOption,
 	package: packageOption,
 	dryRun: dryRunOption,
 	json: jsonOption
-}, ({ 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"));
+}, ({ cwd, base, package: pkg, dryRun, json }) => runDepsRegen(cwd, base, pkg, dryRun, json).pipe(Effect.provide(Changesets.makeDepsRegenDefault({ cwd: resolve(cwd) })))).pipe(Command.withDescription("Delete pure dependency changesets and regenerate them from the current diff"));
 
 //#endregion
 export { depsRegenCommand, runDepsRegen };

package/commands/changeset/commands/init.js

@@ -1,10 +1,10 @@
+import { Git } from "@effected/git";
+import { WorkspaceRoot } from "@effected/workspaces";
 import { Changesets } from "@savvy-web/silk-effects";
-import { Data, Effect, Schema } from "effect";
-import { WorkspaceRoot } from "workspaces-effect";
+import { Data, Effect, Option, Result, Schema } from "effect";
 import { join } from "node:path";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { execSync } from "node:child_process";
-import { applyEdits, modify, parse } from "jsonc-effect";
+import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
 
 //#region src/commands/changeset/commands/init.ts
 /**
@@ -117,17 +117,15 @@ var InitError = class extends InitErrorBase {
 * @internal
 */
 function detectGitHubRepo(cwd) {
-	try {
-		const url = execSync("git remote get-url origin", {
-			cwd,
-			encoding: "utf-8"
-		}).trim();
-		const https = url.match(/github\.com\/([^/]+)\/([^/.]+)/);
+	return Effect.gen(function* () {
+		const url = yield* (yield* Git).remoteUrl(cwd).pipe(Effect.catch(() => Effect.succeed(Option.none())));
+		if (Option.isNone(url)) return null;
+		const https = url.value.match(/github\.com\/([^/]+)\/([^/.]+)/);
 		if (https) return `${https[1]}/${https[2]}`;
-		const ssh = url.match(/github\.com:([^/]+)\/([^/.]+)/);
+		const ssh = url.value.match(/github\.com:([^/]+)\/([^/.]+)/);
 		if (ssh) return `${ssh[1]}/${ssh[2]}`;
-	} catch {}
-	return null;
+		return null;
+	});
 }
 /**
 * Formatting options for `jsonc-effect` modify operations.
@@ -152,7 +150,7 @@ const JSONC_FORMAT = {
 * @internal
 */
 function resolveWorkspaceRoot(cwd) {
-	return WorkspaceRoot.pipe(Effect.flatMap((wr) => wr.find(cwd)), Effect.catchAll(() => Effect.succeed(cwd)));
+	return WorkspaceRoot.pipe(Effect.flatMap((wr) => wr.find(cwd)), Effect.catch(() => Effect.succeed(cwd)));
 }
 /**
 * Find the first existing markdownlint config file from candidate paths.
@@ -331,30 +329,30 @@ function handleBaseMarkdownlint(root) {
 				reason: error instanceof Error ? error.message : String(error)
 			}));
 		}
-		let parsed = yield* parse(text);
+		let parsed = yield* Jsonc.parse(text);
 		const currentRules = Array.isArray(parsed.customRules) ? parsed.customRules : null;
 		if (currentRules === null) {
-			const edits = yield* modify(text, ["customRules"], [CUSTOM_RULES_ENTRY], { formattingOptions: JSONC_FORMAT });
-			text = yield* applyEdits(text, edits);
+			const edits = yield* JsoncModifier.modify(text, ["customRules"], [CUSTOM_RULES_ENTRY], { formattingOptions: JSONC_FORMAT });
+			text = JsoncEdit.applyAll(text, edits);
 		} else {
 			const desired = currentRules.filter((r) => r !== LEGACY_CUSTOM_RULES_ENTRY && r !== CUSTOM_RULES_ENTRY);
 			desired.push(CUSTOM_RULES_ENTRY);
 			if (desired.length !== currentRules.length || desired.some((r, i) => r !== currentRules[i])) {
-				const edits = yield* modify(text, ["customRules"], desired, { formattingOptions: JSONC_FORMAT });
-				text = yield* applyEdits(text, edits);
+				const edits = yield* JsoncModifier.modify(text, ["customRules"], desired, { formattingOptions: JSONC_FORMAT });
+				text = JsoncEdit.applyAll(text, edits);
 			}
 		}
-		parsed = yield* parse(text);
+		parsed = yield* Jsonc.parse(text);
 		const currentConfig = parsed.config;
 		if (typeof currentConfig !== "object" || currentConfig === null) {
-			const edits = yield* modify(text, ["config"], {}, { formattingOptions: JSONC_FORMAT });
-			text = yield* applyEdits(text, edits);
+			const edits = yield* JsoncModifier.modify(text, ["config"], {}, { formattingOptions: JSONC_FORMAT });
+			text = JsoncEdit.applyAll(text, edits);
 		}
-		parsed = yield* parse(text);
+		parsed = yield* Jsonc.parse(text);
 		const config = parsed.config;
 		for (const rule of RULE_NAMES) if (!(rule in config)) {
-			const edits = yield* modify(text, ["config", rule], false, { formattingOptions: JSONC_FORMAT });
-			text = yield* applyEdits(text, edits);
+			const edits = yield* JsoncModifier.modify(text, ["config", rule], false, { formattingOptions: JSONC_FORMAT });
+			text = JsoncEdit.applyAll(text, edits);
 		}
 		try {
 			writeFileSync(fullPath, text);
@@ -365,7 +363,7 @@ function handleBaseMarkdownlint(root) {
 			}));
 		}
 		return `Updated ${foundPath}`;
-	}).pipe(Effect.catchAll((error) => {
+	}).pipe(Effect.catch((error) => {
 		if (error instanceof InitError) return Effect.fail(error);
 		return Effect.fail(new InitError({
 			step: "markdownlint config",
@@ -465,7 +463,8 @@ function checkConfig(changesetDir, repoSlug) {
 		});
 		const options = Array.isArray(changelog) ? changelog[1] : void 0;
 		if (options && typeof options === "object" && "versionFiles" in options) {
-			if (Schema.decodeUnknownEither(LegacyVersionFilesSchema)(options.versionFiles)._tag === "Left") issues.push({
+			const result = Schema.decodeUnknownResult(LegacyVersionFilesSchema)(options.versionFiles);
+			if (Result.isFailure(result)) issues.push({
 				file: ".changeset/config.json",
 				message: "versionFiles config is invalid"
 			});
@@ -499,7 +498,7 @@ function checkBaseMarkdownlint(root) {
 	}];
 	try {
 		const raw = readFileSync(join(root, foundPath), "utf-8");
-		const parsed = Effect.runSync(parse(raw));
+		const parsed = Effect.runSync(Jsonc.parse(raw));
 		const issues = [];
 		if (!Array.isArray(parsed.customRules) || !parsed.customRules.some((r) => ACCEPTED_CUSTOM_RULES_ENTRIES.includes(r))) issues.push({
 			file: foundPath,
@@ -567,7 +566,7 @@ function runChangesetInit(opts) {
 	const { force, quiet, skipMarkdownlint, check } = opts;
 	return Effect.gen(function* () {
 		const root = yield* resolveWorkspaceRoot(process.cwd());
-		const repo = detectGitHubRepo(root);
+		const repo = yield* detectGitHubRepo(root);
 		if (!repo && !quiet) yield* Effect.log("Warning: could not detect GitHub repo from git remote, using placeholder");
 		const repoSlug = repo ?? "owner/repo";
 		if (check) {
@@ -589,26 +588,26 @@ function runChangesetInit(opts) {
 		const changesetDir = yield* ensureChangesetDir(root);
 		yield* Effect.log("Ensured .changeset/ directory");
 		const errors = [];
-		const configResult = yield* handleConfig(changesetDir, repoSlug, force).pipe(Effect.either);
-		if (configResult._tag === "Right") {
-			yield* Effect.log(configResult.right);
+		const configResult = yield* handleConfig(changesetDir, repoSlug, force).pipe(Effect.result);
+		if (Result.isSuccess(configResult)) {
+			yield* Effect.log(configResult.success);
 			if (!quiet) yield* warnIfLegacyVersionFiles(changesetDir);
-		} else errors.push(configResult.left);
+		} else errors.push(configResult.failure);
 		if (!skipMarkdownlint) {
-			const baseResult = yield* handleBaseMarkdownlint(root).pipe(Effect.either);
-			if (baseResult._tag === "Right") yield* Effect.log(baseResult.right);
-			else errors.push(baseResult.left);
+			const baseResult = yield* handleBaseMarkdownlint(root).pipe(Effect.result);
+			if (Result.isSuccess(baseResult)) yield* Effect.log(baseResult.success);
+			else errors.push(baseResult.failure);
 		}
-		const mdlintResult = yield* handleChangesetMarkdownlint(changesetDir, root, force).pipe(Effect.either);
-		if (mdlintResult._tag === "Right") yield* Effect.log(mdlintResult.right);
-		else errors.push(mdlintResult.left);
+		const mdlintResult = yield* handleChangesetMarkdownlint(changesetDir, root, force).pipe(Effect.result);
+		if (Result.isSuccess(mdlintResult)) yield* Effect.log(mdlintResult.success);
+		else errors.push(mdlintResult.failure);
 		if (errors.length > 0) {
 			for (const err of errors) yield* Effect.logError(err.message);
 			if (!quiet) process.exitCode = 1;
 			return;
 		}
 		yield* Effect.log("Init complete.");
-	}).pipe(Effect.catchAll((error) => Effect.gen(function* () {
+	}).pipe(Effect.catch((error) => Effect.gen(function* () {
 		if (!quiet) {
 			yield* Effect.logError(error instanceof InitError ? error.message : `Init failed: ${String(error)}`);
 			process.exitCode = 1;

package/commands/changeset/commands/lint.js

@@ -1,6 +1,6 @@
-import { Args, Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Console, Effect } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 import { resolve } from "node:path";
 
 //#region src/commands/changeset/commands/lint.ts
@@ -28,8 +28,8 @@ import { resolve } from "node:path";
 */
 const { ChangesetLinter } = Changesets;
 /* v8 ignore start -- CLI option definitions; handler tested via runLint */
-const dirArg = Args.directory({ name: "dir" }).pipe(Args.withDefault(".changeset"));
-const quietOption = Options.boolean("quiet").pipe(Options.withAlias("q"), Options.withDescription("Only output errors, no summary"), Options.withDefault(false));
+const dirArg = Argument.directory("dir").pipe(Argument.withDefault(".changeset"));
+const quietOption = Flag.boolean("quiet").pipe(Flag.withAlias("q"), Flag.withDescription("Only output errors, no summary"), Flag.withDefault(false));
 /* v8 ignore stop */
 /**
 * Run machine-readable lint validation on all changeset files in `dir`.

package/commands/changeset/commands/transform.js

@@ -1,7 +1,7 @@
 import { requireValidConfig } from "../utils/config-gate.js";
-import { Args, Command, Options } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 import { dirname, resolve } from "node:path";
 import { readFileSync, writeFileSync } from "node:fs";
 
@@ -38,9 +38,9 @@ import { readFileSync, writeFileSync } from "node:fs";
 */
 const { ChangelogTransformer } = Changesets;
 /* v8 ignore start -- CLI option definitions; handler tested via runTransform */
-const fileArg = Args.file({ name: "file" }).pipe(Args.withDefault("CHANGELOG.md"));
-const dryRunOption = Options.boolean("dry-run").pipe(Options.withAlias("n"), Options.withDescription("Print transformed output instead of writing"), Options.withDefault(false));
-const checkOption = Options.boolean("check").pipe(Options.withAlias("c"), Options.withDescription("Exit 1 if file would change (for CI)"), Options.withDefault(false));
+const fileArg = Argument.file("file").pipe(Argument.withDefault("CHANGELOG.md"));
+const dryRunOption = Flag.boolean("dry-run").pipe(Flag.withAlias("n"), Flag.withDescription("Print transformed output instead of writing"), Flag.withDefault(false));
+const checkOption = Flag.boolean("check").pipe(Flag.withAlias("c"), Flag.withDescription("Exit 1 if file would change (for CI)"), Flag.withDefault(false));
 /* v8 ignore stop */
 /**
 * Run the remark transform pipeline on a single changelog file.

package/commands/changeset/commands/validate-file.js

@@ -1,6 +1,6 @@
-import { Args, Command } from "@effect/cli";
 import { Changesets } from "@savvy-web/silk-effects";
 import { Effect } from "effect";
+import { Argument, Command } from "effect/unstable/cli";
 
 //#region src/commands/changeset/commands/validate-file.ts
 /**
@@ -19,7 +19,7 @@ import { Effect } from "effect";
 */
 const { ChangesetLinter } = Changesets;
 /* v8 ignore next */
-const fileArg = Args.file({ name: "file" });
+const fileArg = Argument.file("file");
 /**
 * Run lint validation on a single changeset file.
 *
@@ -34,7 +34,7 @@ const fileArg = Args.file({ name: "file" });
 */
 function runValidateFile(filePath) {
 	return Effect.gen(function* () {
-		const result = yield* Effect.try(() => ChangesetLinter.validateFile(filePath)).pipe(Effect.catchAll((error) => Effect.gen(function* () {
+		const result = yield* Effect.try(() => ChangesetLinter.validateFile(filePath)).pipe(Effect.catch((error) => Effect.gen(function* () {
 			yield* Effect.log(`Error: ${error instanceof Error ? error.message : String(error)}`);
 			process.exitCode = 1;
 			return null;

package/commands/changeset/commands/version.js

@@ -1,7 +1,7 @@
 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 { Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/changeset/commands/version.ts
 /**
@@ -15,7 +15,7 @@ import { Effect } from "effect";
 * @internal
 */
 /* v8 ignore start -- CLI option definitions; handler tested via runVersion */
-const dryRunOption = Options.boolean("dry-run").pipe(Options.withAlias("n"), Options.withDescription("Compute and report the release without writing anything"), Options.withDefault(false));
+const dryRunOption = Flag.boolean("dry-run").pipe(Flag.withAlias("n"), Flag.withDescription("Compute and report the release without writing anything"), Flag.withDefault(false));
 /* v8 ignore stop */
 /**
 * Validate config, then natively apply (or dry-run) the release via