@savvy-web/cli 2.8.2 → 2.9.0

package/cli/index.js

@@ -76,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.8.2" });
+const cli = Command.run(rootCommand, { version: "2.9.0" });
 /**
 * Shared workspace services from `@effected/workspaces`, wired as a
 * self-contained unit and built ONCE (layers memoize by reference).

package/commands/commit/check.js

@@ -2,7 +2,7 @@ import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_M
 import { SECTION_DEF, savvyCommitBlock } from "./init.js";
 import { CheckOutcome, ManagedSection } from "@effected/templates";
 import { VersioningStrategy } from "@effected/workspaces";
-import { ChangesetConfigReader, Commitlint, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
+import { ChangesetConfigReader, Commitlint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem, Option } from "effect";
 
 //#region src/commands/commit/check.ts
@@ -154,6 +154,16 @@ function runCommitCheck() {
 				sectionsHealthy = false;
 				yield* Effect.log(`${BULLET} Hygiene hook: ${hookPath} section not found (run 'savvy init' to add)`);
 			}
+			if (hookPath === ".husky/post-commit") continue;
+			const toolchainStatus = yield* ms.check(hookPath, SavvyToolchainSection.section(savvyToolchainCheck()));
+			if (CheckOutcome.$is("UpToDate")(toolchainStatus)) yield* Effect.log(`${"✓"} Toolchain check: ${hookPath}`);
+			else if (CheckOutcome.$is("Drifted")(toolchainStatus)) {
+				sectionsHealthy = false;
+				yield* Effect.log(`${"⚠"} Toolchain check: ${hookPath} outdated (run 'savvy init' to update)`);
+			} else {
+				sectionsHealthy = false;
+				yield* Effect.log(`${BULLET} Toolchain check: ${hookPath} section not found (run 'savvy init' to add)`);
+			}
 		}
 		if (yield* fs.exists(DCO_FILE_PATH)) yield* Effect.log(`${"✓"} DCO file: ${DCO_FILE_PATH}`);
 		else yield* Effect.log(`${BULLET} No DCO file (signoff not required)`);

package/commands/commit/init.js

@@ -1,6 +1,6 @@
 import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
 import { CommentStyle, ManagedSection, SectionId } from "@effected/templates";
-import { SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene, savvyToolSection } from "@savvy-web/silk-effects";
+import { SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolSection, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
 import { chmod } from "node:fs/promises";
@@ -91,7 +91,9 @@ function runCommitInit(opts) {
 			POST_COMMIT_HOOK_PATH
 		]) {
 			yield* ensureHookFile(hookPath, HYGIENE_HEADER);
-			yield* ms.sync(hookPath, SavvyHooksSection.section(savvyHooksHygiene()));
+			const sections = [SavvyHooksSection.section(savvyHooksHygiene())];
+			if (hookPath !== ".husky/post-commit") sections.push(SavvyToolchainSection.section(savvyToolchainCheck()));
+			yield* ms.syncAll(hookPath, sections);
 			yield* makeExecutable(hookPath);
 			yield* Effect.log(`${"✓"} Synced ${hookPath}`);
 		}

package/commands/lint/biome-version.js

@@ -19,7 +19,7 @@
 *
 * @internal
 */
-const BIOME_VERSION = "2.5.10";
+const BIOME_VERSION = "2.5.11";
 
 //#endregion
 export { BIOME_VERSION };

package/commands/lint/check.js

@@ -1,7 +1,7 @@
 import { BIOME_VERSION } from "./biome-version.js";
 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 { ConfigDiscovery, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem, Option } from "effect";
 import { Jsonc } from "@effected/jsonc";
 import { isDeepStrictEqual } from "node:util";
@@ -196,6 +196,7 @@ function runLintCheck(opts) {
 			Lint.POST_COMMIT_HOOK_PATH
 		];
 		const shellHookStatuses = [];
+		const toolchainStatuses = [];
 		for (const hookPath of shellHookPaths) {
 			if (!(yield* fs.exists(hookPath))) {
 				shellHookStatuses.push({
@@ -220,6 +221,22 @@ function runLintCheck(opts) {
 				sectionsHealthy = false;
 				warnings.push(`${WARNING}  ${hookPath} savvy-hooks section is outdated.\n   Run 'savvy init' to update.`);
 			}
+			if (hookPath === Lint.POST_COMMIT_HOOK_PATH) continue;
+			const toolchainResult = yield* ms.check(hookPath, SavvyToolchainSection.section(savvyToolchainCheck()));
+			const toolchainFound = !CheckOutcome.$is("Absent")(toolchainResult);
+			const toolchainUpToDate = CheckOutcome.$is("UpToDate")(toolchainResult);
+			toolchainStatuses.push({
+				path: hookPath,
+				found: toolchainFound,
+				isUpToDate: toolchainUpToDate
+			});
+			if (!toolchainFound) {
+				sectionsHealthy = false;
+				warnings.push(`${WARNING}  ${hookPath} has no savvy-toolchain section.\n   Run 'savvy init' to add it.`);
+			} else if (!toolchainUpToDate) {
+				sectionsHealthy = false;
+				warnings.push(`${WARNING}  ${hookPath} savvy-toolchain section is outdated.\n   Run 'savvy init' to update.`);
+			}
 		}
 		const biomeSchemaStatus = yield* checkBiomeSchemas().pipe(Effect.catch(() => Effect.succeed({
 			statuses: [],
@@ -259,6 +276,9 @@ function runLintCheck(opts) {
 		for (const status of shellHookStatuses) if (!status.found) yield* Effect.log(`${BULLET} ${status.path}: savvy-hooks section not found`);
 		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)`);
+		for (const status of toolchainStatuses) if (!status.found) yield* Effect.log(`${BULLET} ${status.path}: savvy-toolchain section not found`);
+		else if (status.isUpToDate) yield* Effect.log(`${CHECK_MARK} ${status.path}: savvy-toolchain up-to-date`);
+		else yield* Effect.log(`${WARNING} ${status.path}: savvy-toolchain outdated (run 'savvy init' to update)`);
 		yield* Effect.log("\nTool availability:");
 		const biomeAvailable = yield* td.isAvailable(Tool.named("biome"));
 		const biomeConfig = yield* findConfig(discovery, ["biome.jsonc", "biome.json"]);

package/commands/lint/init.js

@@ -1,7 +1,7 @@
 import { BIOME_VERSION } from "./biome-version.js";
 import { ManagedSection } from "@effected/templates";
 import { WorkspaceDiscovery } from "@effected/workspaces";
-import { BiomeSchemaSync, Lint, SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygiene } from "@savvy-web/silk-effects";
+import { BiomeSchemaSync, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
 import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
@@ -221,7 +221,9 @@ function runLintInit(opts) {
 		]) {
 			yield* ensureHookFile(hookPath, HYGIENE_HEADER);
 			yield* ms.remove(hookPath, Lint.LegacySavvyLintHygieneDef);
-			yield* ms.sync(hookPath, SavvyHooksSection.section(savvyHooksHygiene()));
+			const sections = [SavvyHooksSection.section(savvyHooksHygiene())];
+			if (hookPath !== Lint.POST_COMMIT_HOOK_PATH) sections.push(SavvyToolchainSection.section(savvyToolchainCheck()));
+			yield* ms.syncAll(hookPath, sections);
 			yield* makeExecutable(hookPath);
 			yield* Effect.log(`${CHECK_MARK} Synced ${hookPath}`);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "2.8.2",
+	"version": "2.9.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",
@@ -38,7 +38,7 @@
 		"@effected/templates": "^0.4.0",
 		"@effected/workspaces": "^0.18.3",
 		"@effected/yaml": "^0.12.0",
-		"@savvy-web/silk-effects": "7.2.0",
+		"@savvy-web/silk-effects": "7.3.0",
 		"effect": "4.0.0-rc.109"
 	}
 }