@savvy-web/cli 2.1.7 → 2.1.9

package/cli/index.js

@@ -6,9 +6,11 @@ import { initCommand } from "../commands/init.js";
 import { lintCommand } from "../commands/lint/index.js";
 import { reposCommand } from "../commands/repos/index.js";
 import { NodeRuntime, NodeServices } from "@effect/platform-node";
+import { ToolDiscovery } from "@effected/commands";
 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 { ManagedSection } from "@effected/templates";
+import { PackageManagerDetector, WorkspaceDiscovery, WorkspaceRoot, Workspaces } from "@effected/workspaces";
+import { BiomeSchemaSyncLive, ChangesetConfigReaderLive, Changesets, ConfigDiscoveryLive, Repos, SilkPublishabilityDetectorLive } from "@savvy-web/silk-effects";
 import { Effect, Layer } from "effect";
 import { Command } from "effect/unstable/cli";
 
@@ -37,8 +39,14 @@ import { Command } from "effect/unstable/cli";
 *   `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`.
+*   `SilkPublishabilityDetectorLive`, `ManagedSection.layer` (from
+*   `@effected/templates`), `BiomeSchemaSyncLive`,
+*   and `ConfigDiscoveryLive`. Tool resolution is the kit's
+*   `ToolDiscovery.layer` over `ChildProcessSpawner` plus a `LocalExec`, which
+*   `Workspaces.localExecLayer()` supplies from the detected package manager.
+*   Versioning classification
+*   is a pure `@effected/workspaces` value operation over `WorkspaceDiscovery`
+*   and the silk `PublishabilityDetector`, so it needs no layer of its own.
 * - Changesets-namespace services — `Changesets.ConfigInspectorLive`,
 *   `Changesets.ReleasePlannerLive`, and `Changesets.BranchAnalyzerLive`
 *   sharing a single `ConfigInspector` via `provideMerge`. `DepsRegen` is NOT
@@ -68,7 +76,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 * 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.1.7" });
+const cli = Command.run(rootCommand, { version: "2.1.9" });
 /**
 * Shared workspace services from `@effected/workspaces`, wired as a
 * self-contained unit and built ONCE (layers memoize by reference).
@@ -86,13 +94,13 @@ const WorkspaceLive = Layer.mergeAll(WorkspaceRootLive, PackageManagerDetector.l
 */
 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
+* Base layer membership: the kit's `ManagedSection` plus the silk-effects leaf
+* services (`BiomeSchemaSync`, `ConfigDiscovery`, `SilkPublishabilityDetector`)
+* that depend only on the platform, plus the changeset base layers
 * (`WorkspaceLive`, `ChangesetConfigReader`, `GitLive`) that `AppLive`'s
 * upper services build upon.
 */
-const BaseLive = Layer.mergeAll(WorkspaceLive, GitLive, ChangesetConfigReaderLive, ManagedSectionLive, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive);
+const BaseLive = Layer.mergeAll(WorkspaceLive, GitLive, ChangesetConfigReaderLive, ManagedSection.layer, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive);
 /**
 * `ConfigInspectorLive` is built once via {@link Layer.provideMerge}: the merge
 * feeds that single `ConfigInspector` instance into `ReleasePlannerLive` and
@@ -108,7 +116,16 @@ const InspectorAndAnalyzerLive = Changesets.BranchAnalyzerLive.pipe(Layer.provid
 * flow up to `NodeServices.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));
+/**
+* `ToolDiscovery` from `@effected/commands`, wired to this workspace. Its
+* `LocalExec` contract — the argv prefix that runs a project-local binary — is
+* implemented by `Workspaces.localExecLayer()`, which reads the detected package
+* manager and the resolved workspace root. Both are already in `WorkspaceLive`,
+* and the layer is bound to a `const` so the single reference memoizes.
+*/
+const LocalExecLive = Workspaces.localExecLayer();
+const ToolDiscoveryGroupLive = ToolDiscovery.layer.pipe(Layer.provide(LocalExecLive), Layer.provide(WorkspaceLive));
+const AppLive = Layer.mergeAll(ToolDiscoveryGroupLive, InspectorAndAnalyzerLive, ReposGroupLive).pipe(Layer.provideMerge(BaseLive), Layer.provideMerge(NodeServices.layer));
 /**
 * Bootstrap and run the `savvy` CLI application.
 *

package/commands/commit/check.js

@@ -1,15 +1,11 @@
 import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
 import { SECTION_DEF, savvyCommitBlock } from "./init.js";
-import { WorkspaceDiscovery } from "@effected/workspaces";
-import { CheckResult, Commitlint, ManagedSection, SavvyBaseSection, SavvyHooksSection, VersioningStrategy, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
-import { Effect, FileSystem } from "effect";
+import { CheckOutcome, ManagedSection } from "@effected/templates";
+import { VersioningStrategy } from "@effected/workspaces";
+import { ChangesetConfigReader, Commitlint, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
+import { Effect, FileSystem, Option } from "effect";
 
 //#region src/commands/commit/check.ts
-/**
-* Check command - validate current commitlint setup.
-*
-* @internal
-*/
 /** Unicode cross symbol. */
 const CROSS_MARK = "✗";
 /** Unicode bullet symbol. */
@@ -70,16 +66,23 @@ function extractConfigPathFromManaged(managedContent) {
 	return match ? match[1] : null;
 }
 /**
-* Detect the release format using silk-effects versioning service.
+* Detect the release format from the workspace's versioning strategy.
+*
+* @remarks
+* `VersioningStrategy.detect` (from `@effected/workspaces`) enumerates the
+* workspace and asks the ambient `PublishabilityDetector` which packages
+* publish — the CLI provides silk's own detector, so the "private plus
+* publishConfig.access is publishable" convention is applied by that layer
+* rather than by a filter written here. Fixed groups are a changesets concept,
+* so they are read from the changeset config and handed in as a plain argument.
 *
 * @returns Effect yielding the release format string
 */
 const detectReleaseFormat = Effect.gen(function* () {
-	const versioning = yield* VersioningStrategy;
-	const discovery = yield* WorkspaceDiscovery;
-	const publishableNames = (yield* Effect.catch(discovery.listPackages(), () => Effect.succeed([]))).filter((pkg) => !pkg.private || pkg.publishConfig?.access !== void 0).map((pkg) => pkg.name);
-	const result = yield* Effect.catch(versioning.detect(publishableNames, process.cwd()), () => Effect.succeed({ type: "single" }));
-	return STRATEGY_TO_FORMAT[result.type] ?? "semver";
+	const configReader = yield* ChangesetConfigReader;
+	const fixedGroups = (yield* Effect.catch(configReader.read(process.cwd()), () => Effect.succeed(null)))?.fixed ?? [];
+	const strategy = yield* Effect.catch(VersioningStrategy.detect({ fixedGroups }), () => Effect.succeed(VersioningStrategy.classify({ packages: [] })));
+	return STRATEGY_TO_FORMAT[strategy.type] ?? "semver";
 });
 /**
 * Run the check validation pipeline.
@@ -104,9 +107,9 @@ function runCommitCheck() {
 		else yield* Effect.log(`${CROSS_MARK} No husky commit-msg hook found`);
 		let sectionsHealthy = true;
 		if (hasHuskyHook) {
-			const baseStatus = yield* ms.check(HUSKY_HOOK_PATH, SavvyBaseSection.block(savvyBasePreamble()));
-			if (CheckResult.$is("Found")(baseStatus) && baseStatus.isUpToDate) yield* Effect.log(`${"✓"} Base section: up-to-date`);
-			else if (CheckResult.$is("Found")(baseStatus)) {
+			const baseStatus = yield* ms.check(HUSKY_HOOK_PATH, SavvyBaseSection.section(savvyBasePreamble()));
+			if (CheckOutcome.$is("UpToDate")(baseStatus)) yield* Effect.log(`${"✓"} Base section: up-to-date`);
+			else if (CheckOutcome.$is("Drifted")(baseStatus)) {
 				sectionsHealthy = false;
 				yield* Effect.log(`${"⚠"} Base section: outdated (run 'savvy init' to update)`);
 			} else {
@@ -114,11 +117,11 @@ function runCommitCheck() {
 				yield* Effect.log(`${BULLET} Base section: not found (run 'savvy init' to add)`);
 			}
 			const block = yield* ms.read(HUSKY_HOOK_PATH, SECTION_DEF);
-			if (block) {
-				const configPath = extractConfigPathFromManaged(block.content);
+			if (Option.isSome(block)) {
+				const configPath = extractConfigPathFromManaged(block.value.content);
 				if (configPath) {
 					const status = yield* ms.check(HUSKY_HOOK_PATH, savvyCommitBlock(configPath));
-					if (CheckResult.$is("Found")(status) && status.isUpToDate) yield* Effect.log(`${"✓"} Commit section: up-to-date`);
+					if (CheckOutcome.$is("UpToDate")(status)) yield* Effect.log(`${"✓"} Commit section: up-to-date`);
 					else {
 						sectionsHealthy = false;
 						yield* Effect.log(`${"⚠"} Commit section: outdated (run 'savvy init' to update)`);
@@ -142,9 +145,9 @@ function runCommitCheck() {
 				yield* Effect.log(`${BULLET} Hygiene hook: ${hookPath} not found (run 'savvy init' to add)`);
 				continue;
 			}
-			const hygieneStatus = yield* ms.check(hookPath, SavvyHooksSection.block(savvyHooksHygiene()));
-			if (CheckResult.$is("Found")(hygieneStatus) && hygieneStatus.isUpToDate) yield* Effect.log(`${"✓"} Hygiene hook: ${hookPath}`);
-			else if (CheckResult.$is("Found")(hygieneStatus)) {
+			const hygieneStatus = yield* ms.check(hookPath, SavvyHooksSection.section(savvyHooksHygiene()));
+			if (CheckOutcome.$is("UpToDate")(hygieneStatus)) yield* Effect.log(`${"✓"} Hygiene hook: ${hookPath}`);
+			else if (CheckOutcome.$is("Drifted")(hygieneStatus)) {
 				sectionsHealthy = false;
 				yield* Effect.log(`${"⚠"} Hygiene hook: ${hookPath} outdated (run 'savvy init' to update)`);
 			} else {

package/commands/commit/init.js

@@ -1,5 +1,6 @@
 import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
-import { ManagedSection, SavvyBaseSection, SavvyHooksSection, SectionDefinition, savvyBasePreamble, savvyHooksHygiene, savvyToolSection } from "@savvy-web/silk-effects";
+import { CommentStyle, ManagedSection, SectionId } from "@effected/templates";
+import { SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene, savvyToolSection } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
 import { chmod } from "node:fs/promises";
@@ -13,7 +14,10 @@ import { chmod } from "node:fs/promises";
 /** Executable file permission mode. */
 const EXECUTABLE_MODE = 493;
 /** Section definition for the savvy-commit tool section (identity for read/check/remove). */
-const SECTION_DEF = SectionDefinition.make({ toolName: "savvy-commit" });
+const SECTION_DEF = SectionId.make({
+	key: "SAVVY-COMMIT",
+	commentStyle: CommentStyle.hash
+});
 /** Header written when creating a fresh commit-msg hook. */
 const COMMIT_MSG_HEADER = "#!/usr/bin/env sh\n# Commit-msg hook with savvy managed sections\n# Custom hooks can go above, below, or between the managed sections\n\n";
 /** Header written when creating a fresh hygiene hook (post-checkout / post-merge / post-commit). */
@@ -78,7 +82,7 @@ function runCommitInit(opts) {
 		yield* fs.makeDirectory(".husky", { recursive: true });
 		if (force) yield* fs.writeFileString(HUSKY_HOOK_PATH, COMMIT_MSG_HEADER);
 		else yield* ensureHookFile(HUSKY_HOOK_PATH, COMMIT_MSG_HEADER);
-		const commitResults = yield* ms.syncMany(HUSKY_HOOK_PATH, [SavvyBaseSection.block(savvyBasePreamble()), savvyCommitBlock(config)]);
+		const commitResults = yield* ms.syncAll(HUSKY_HOOK_PATH, [SavvyBaseSection.section(savvyBasePreamble()), savvyCommitBlock(config)]);
 		yield* makeExecutable(HUSKY_HOOK_PATH);
 		yield* Effect.log(`${"✓"} ${force ? "Replaced" : "Synced"} ${HUSKY_HOOK_PATH} (${commitResults.map((r) => r._tag).join(", ")})`);
 		for (const hookPath of [
@@ -87,7 +91,7 @@ function runCommitInit(opts) {
 			POST_COMMIT_HOOK_PATH
 		]) {
 			yield* ensureHookFile(hookPath, HYGIENE_HEADER);
-			yield* ms.sync(hookPath, SavvyHooksSection.block(savvyHooksHygiene()));
+			yield* ms.sync(hookPath, SavvyHooksSection.section(savvyHooksHygiene()));
 			yield* makeExecutable(hookPath);
 			yield* Effect.log(`${"✓"} Synced ${hookPath}`);
 		}

package/commands/lint/check.js

@@ -1,6 +1,8 @@
 import { BIOME_VERSION } from "./biome-version.js";
-import { CheckResult, ConfigDiscovery, Lint, ManagedSection, SavvyBaseSection, SavvyHooksSection, ToolDefinition, ToolDiscovery, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
-import { Effect, FileSystem } from "effect";
+import { Tool, ToolDiscovery } from "@effected/commands";
+import { CheckOutcome, ManagedSection } from "@effected/templates";
+import { ConfigDiscovery, Lint, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
+import { Effect, FileSystem, Option } from "effect";
 import { Jsonc } from "@effected/jsonc";
 import { isDeepStrictEqual } from "node:util";
 
@@ -156,23 +158,26 @@ function runLintCheck(opts) {
 		let lintStatusLabel = "missing";
 		let detectedConfigPath = null;
 		if (hasHuskyHook) {
-			const baseResult = yield* ms.check(Lint.HUSKY_HOOK_PATH, SavvyBaseSection.block(savvyBasePreamble()));
-			if (CheckResult.$is("Found")(baseResult)) {
-				baseStatusLabel = baseResult.isUpToDate ? "up-to-date" : "outdated";
-				if (!baseResult.isUpToDate) sectionsHealthy = false;
-			} else sectionsHealthy = false;
+			const baseResult = yield* ms.check(Lint.HUSKY_HOOK_PATH, SavvyBaseSection.section(savvyBasePreamble()));
+			if (CheckOutcome.$is("Absent")(baseResult)) sectionsHealthy = false;
+			else {
+				const upToDate = CheckOutcome.$is("UpToDate")(baseResult);
+				baseStatusLabel = upToDate ? "up-to-date" : "outdated";
+				if (!upToDate) sectionsHealthy = false;
+			}
 			const existing = yield* ms.read(Lint.HUSKY_HOOK_PATH, Lint.SavvyLintSectionDef);
-			if (existing) {
-				const configPath = extractConfigPathFromManaged(existing.content);
+			if (Option.isSome(existing)) {
+				const configPath = extractConfigPathFromManaged(existing.value.content);
 				detectedConfigPath = configPath;
 				if (configPath) {
 					const lintResult = yield* ms.check(Lint.HUSKY_HOOK_PATH, Lint.savvyLintBlock(configPath));
-					if (CheckResult.$is("Found")(lintResult)) {
-						lintStatusLabel = lintResult.isUpToDate ? "up-to-date" : "outdated";
-						if (!lintResult.isUpToDate) sectionsHealthy = false;
-					} else {
+					if (CheckOutcome.$is("Absent")(lintResult)) {
 						lintStatusLabel = "outdated";
 						sectionsHealthy = false;
+					} else {
+						const upToDate = CheckOutcome.$is("UpToDate")(lintResult);
+						lintStatusLabel = upToDate ? "up-to-date" : "outdated";
+						if (!upToDate) sectionsHealthy = false;
 					}
 				} else {
 					lintStatusLabel = "outdated";
@@ -200,9 +205,9 @@ function runLintCheck(opts) {
 				});
 				continue;
 			}
-			const hygieneResult = yield* ms.check(hookPath, SavvyHooksSection.block(savvyHooksHygiene()));
-			const found = CheckResult.$is("Found")(hygieneResult);
-			const isUpToDate = CheckResult.$is("Found")(hygieneResult) && hygieneResult.isUpToDate;
+			const hygieneResult = yield* ms.check(hookPath, SavvyHooksSection.section(savvyHooksHygiene()));
+			const found = !CheckOutcome.$is("Absent")(hygieneResult);
+			const isUpToDate = CheckOutcome.$is("UpToDate")(hygieneResult);
 			shellHookStatuses.push({
 				path: hookPath,
 				found,
@@ -255,13 +260,13 @@ function runLintCheck(opts) {
 		else if (status.isUpToDate) yield* Effect.log(`${CHECK_MARK} ${status.path}: up-to-date`);
 		else yield* Effect.log(`${WARNING} ${status.path}: outdated (run 'savvy init' to update)`);
 		yield* Effect.log("\nTool availability:");
-		const biomeAvailable = yield* td.isAvailable(ToolDefinition.make({ name: "biome" }));
+		const biomeAvailable = yield* td.isAvailable(Tool.named("biome"));
 		const biomeConfig = yield* findConfig(discovery, ["biome.jsonc", "biome.json"]);
 		if (biomeAvailable) {
 			const configInfo = biomeConfig ? ` (config: ${biomeConfig})` : "";
 			yield* Effect.log(`  ${CHECK_MARK} Biome${configInfo}`);
 		} else yield* Effect.log(`  ${BULLET} Biome: not installed`);
-		const markdownAvailable = yield* td.isAvailable(ToolDefinition.make({ name: "markdownlint-cli2" }));
+		const markdownAvailable = yield* td.isAvailable(Tool.named("markdownlint-cli2"));
 		const markdownConfig = yield* findConfig(discovery, [
 			".markdownlint-cli2.jsonc",
 			".markdownlint-cli2.json",
@@ -275,8 +280,8 @@ function runLintCheck(opts) {
 			const configInfo = markdownConfig ? ` (config: ${markdownConfig})` : "";
 			yield* Effect.log(`  ${CHECK_MARK} markdownlint-cli2${configInfo}`);
 		} else yield* Effect.log(`  ${BULLET} markdownlint-cli2: not installed`);
-		const tsgoAvailable = yield* td.isAvailable(ToolDefinition.make({ name: "tsgo" }));
-		const tscAvailable = yield* td.isAvailable(ToolDefinition.make({ name: "tsc" }));
+		const tsgoAvailable = yield* td.isAvailable(Tool.named("tsgo"));
+		const tscAvailable = yield* td.isAvailable(Tool.named("tsc"));
 		if (tsgoAvailable) yield* Effect.log(`  ${CHECK_MARK} TypeScript (tsgo)`);
 		else if (tscAvailable) yield* Effect.log(`  ${CHECK_MARK} TypeScript (tsc)`);
 		else yield* Effect.log(`  ${BULLET} TypeScript: not installed`);

package/commands/lint/init.js

@@ -1,5 +1,6 @@
 import { BIOME_VERSION } from "./biome-version.js";
-import { BiomeSchemaSync, Lint, ManagedSection, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
+import { ManagedSection } from "@effected/templates";
+import { BiomeSchemaSync, Lint, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
 import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
@@ -161,7 +162,7 @@ function runLintInit(opts) {
 		yield* fs.makeDirectory(".husky", { recursive: true });
 		if (force) yield* fs.writeFileString(Lint.HUSKY_HOOK_PATH, PRE_COMMIT_HEADER);
 		else yield* ensureHookFile(Lint.HUSKY_HOOK_PATH, PRE_COMMIT_HEADER);
-		const preCommitResults = yield* ms.syncMany(Lint.HUSKY_HOOK_PATH, [SavvyBaseSection.block(savvyBasePreamble()), Lint.savvyLintBlock(config)]);
+		const preCommitResults = yield* ms.syncAll(Lint.HUSKY_HOOK_PATH, [SavvyBaseSection.section(savvyBasePreamble()), Lint.savvyLintBlock(config)]);
 		yield* makeExecutable(Lint.HUSKY_HOOK_PATH);
 		yield* Effect.log(`${CHECK_MARK} ${force ? "Replaced" : "Synced"} ${Lint.HUSKY_HOOK_PATH} (${preCommitResults.map((r) => r._tag).join(", ")})`);
 		if (presetIncludesShellScripts(preset)) for (const hookPath of [
@@ -171,7 +172,7 @@ function runLintInit(opts) {
 		]) {
 			yield* ensureHookFile(hookPath, HYGIENE_HEADER);
 			yield* ms.remove(hookPath, Lint.LegacySavvyLintHygieneDef);
-			yield* ms.sync(hookPath, SavvyHooksSection.block(savvyHooksHygiene()));
+			yield* ms.sync(hookPath, SavvyHooksSection.section(savvyHooksHygiene()));
 			yield* makeExecutable(hookPath);
 			yield* Effect.log(`${CHECK_MARK} Synced ${hookPath}`);
 		}

package/index.d.ts

@@ -1,10 +1,12 @@
-import { BiomeSchemaSync, Changesets, ConfigDiscovery, ManagedSection, Repos, SectionParseError, SectionWriteError, ToolDiscovery, VersioningStrategy } from "@savvy-web/silk-effects";
+import { BiomeSchemaSync, ChangesetConfigReader, Changesets, ConfigDiscovery, Repos } from "@savvy-web/silk-effects";
 import { Cause, Effect, FileSystem, Path } from "effect";
 import { Command } from "effect/unstable/cli";
 import { ChildProcessSpawner } from "effect/unstable/process";
 import { Git } from "@effected/git";
-import { WorkspaceDiscovery, WorkspaceRoot } from "@effected/workspaces";
+import { PublishabilityDetector, WorkspaceDiscovery, WorkspaceRoot } from "@effected/workspaces";
+import { ManagedSection, SectionFileError, SectionParseError, SectionRenderError } from "@effected/templates";
 import { PlatformError } from "effect/PlatformError";
+import { ToolDiscovery } from "@effected/commands";
 import { JsoncParseError } from "@effected/jsonc";
 //#region src/cli/index.d.ts
 /**
@@ -31,8 +33,14 @@ import { JsoncParseError } from "@effected/jsonc";
  *   `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`.
+ *   `SilkPublishabilityDetectorLive`, `ManagedSection.layer` (from
+ *   `@effected/templates`), `BiomeSchemaSyncLive`,
+ *   and `ConfigDiscoveryLive`. Tool resolution is the kit's
+ *   `ToolDiscovery.layer` over `ChildProcessSpawner` plus a `LocalExec`, which
+ *   `Workspaces.localExecLayer()` supplies from the detected package manager.
+ *   Versioning classification
+ *   is a pure `@effected/workspaces` value operation over `WorkspaceDiscovery`
+ *   and the silk `PublishabilityDetector`, so it needs no layer of its own.
  * - Changesets-namespace services — `Changesets.ConfigInspectorLive`,
  *   `Changesets.ReleasePlannerLive`, and `Changesets.BranchAnalyzerLive`
  *   sharing a single `ConfigInspector` via `provideMerge`. `DepsRegen` is NOT
@@ -139,7 +147,7 @@ declare function runCheck<EChangeset, RChangeset, ECommit, RCommit, ELint, RLint
 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>;
+}, {}, Error | import("@effected/jsonc").JsoncParseError | import("effect/PlatformError").PlatformError | import("@effected/templates").SectionFileError | import("@effected/templates").SectionParseError, import("@savvy-web/silk-effects").ChangesetConfigReader | import("@savvy-web/silk-effects").ConfigDiscovery | import("effect/FileSystem").FileSystem | import("@effected/templates").ManagedSection | import("@effected/workspaces").PublishabilityDetector | import("@effected/commands").ToolDiscovery | import("@effected/workspaces").WorkspaceDiscovery>;
 //#endregion
 //#region src/commands/commit/check.d.ts
 /**
@@ -152,7 +160,7 @@ declare const checkCommand: Command.Command<"check", {
  *
  * @internal
  */
-declare function runCommitCheck(): Effect.Effect<void, SectionParseError | PlatformError, ManagedSection | FileSystem.FileSystem | VersioningStrategy | WorkspaceDiscovery>;
+declare function runCommitCheck(): Effect.Effect<void, SectionParseError | SectionFileError | PlatformError, ManagedSection | FileSystem.FileSystem | ChangesetConfigReader | PublishabilityDetector | WorkspaceDiscovery>;
 //#endregion
 //#region src/commands/commit/init.d.ts
 /**
@@ -169,7 +177,7 @@ declare function runCommitCheck(): Effect.Effect<void, SectionParseError | Platf
 declare function runCommitInit(opts: {
   force: boolean;
   config: string;
-}): Effect.Effect<void, Error | SectionWriteError | PlatformError, ManagedSection | FileSystem.FileSystem>;
+}): Effect.Effect<void, Error | SectionParseError | SectionRenderError | SectionFileError | PlatformError, ManagedSection | FileSystem.FileSystem>;
 //#endregion
 //#region src/commands/commit/index.d.ts
 /**
@@ -211,7 +219,7 @@ declare const initCommand: Command.Command<"init", {
   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>;
+}, {}, Error | import("effect/PlatformError").PlatformError | import("@effected/templates").SectionFileError | import("@effected/templates").SectionParseError | import("@effected/templates").SectionRenderError, import("@savvy-web/silk-effects").BiomeSchemaSync | import("effect/FileSystem").FileSystem | import("@effected/git").Git | import("@effected/templates").ManagedSection | import("@effected/workspaces").WorkspaceRoot>;
 //#endregion
 //#region src/commands/lint/check.d.ts
 /**
@@ -227,7 +235,7 @@ declare const initCommand: Command.Command<"init", {
  */
 declare function runLintCheck(opts: {
   quiet: boolean;
-}): Effect.Effect<void, JsoncParseError | SectionParseError | PlatformError, ManagedSection | FileSystem.FileSystem | ToolDiscovery | ConfigDiscovery>;
+}): Effect.Effect<void, JsoncParseError | SectionParseError | SectionFileError | PlatformError, ManagedSection | FileSystem.FileSystem | ToolDiscovery | ConfigDiscovery>;
 //#endregion
 //#region src/commands/lint/init.d.ts
 /**
@@ -245,7 +253,7 @@ declare function runLintInit(opts: {
   force: boolean;
   config: string;
   preset: "minimal" | "standard" | "silk";
-}): Effect.Effect<void, Error | SectionWriteError | PlatformError, ManagedSection | FileSystem.FileSystem | BiomeSchemaSync>;
+}): Effect.Effect<void, Error | SectionParseError | SectionRenderError | SectionFileError | PlatformError, ManagedSection | FileSystem.FileSystem | BiomeSchemaSync>;
 //#endregion
 //#region src/commands/lint/index.d.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "2.1.7",
+	"version": "2.1.9",
 	"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",
@@ -32,11 +32,13 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "4.0.0-beta.101",
-		"@effected/git": "^0.4.2",
+		"@effected/commands": "^0.1.0",
+		"@effected/git": "^0.5.0",
 		"@effected/jsonc": "^0.5.1",
-		"@effected/workspaces": "^0.7.0",
-		"@effected/yaml": "^0.5.1",
-		"@savvy-web/silk-effects": "4.2.5",
+		"@effected/templates": "^0.1.0",
+		"@effected/workspaces": "^0.9.0",
+		"@effected/yaml": "^0.6.0",
+		"@savvy-web/silk-effects": "5.0.0",
 		"effect": "4.0.0-beta.101"
 	}
 }