@savvy-web/cli 2.10.0 → 2.11.1

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.10.0" });
+const cli = Command.run(rootCommand, { version: "2.11.1" });
 /**
 * 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, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolchainCheck } from "@savvy-web/silk-effects";
+import { ChangesetConfigReader, Commitlint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem, Option } from "effect";
 
 //#region src/commands/commit/check.ts
@@ -155,6 +155,16 @@ function runCommitCheck() {
 				yield* Effect.log(`${BULLET} Hygiene hook: ${hookPath} section not found (run 'savvy init' to add)`);
 			}
 			if (hookPath === ".husky/post-commit") continue;
+			const installHook = hookPath === ".husky/post-checkout" ? "post-checkout" : "post-merge";
+			const installStatus = yield* ms.check(hookPath, savvyInstallBlock(installHook));
+			if (CheckOutcome.$is("UpToDate")(installStatus)) yield* Effect.log(`${"✓"} Dependency install: ${hookPath}`);
+			else if (CheckOutcome.$is("Drifted")(installStatus)) {
+				sectionsHealthy = false;
+				yield* Effect.log(`${"⚠"} Dependency install: ${hookPath} outdated (run 'savvy init' to update)`);
+			} else {
+				sectionsHealthy = false;
+				yield* Effect.log(`${BULLET} Dependency install: ${hookPath} section not found (run 'savvy init' to add)`);
+			}
 			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)) {

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, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolSection, savvyToolchainCheck } from "@savvy-web/silk-effects";
+import { SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolSection, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
 import { dirname } from "node:path";
 import { chmod } from "node:fs/promises";
@@ -20,6 +20,17 @@ const SECTION_DEF = SectionId.make({
 });
 /** 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";
+/**
+* The hygiene hooks, each paired with the install variant it should carry.
+*
+* `undefined` means the hook gets hygiene only — post-commit fires on every
+* commit, where neither a drift warning nor an install is worth the noise.
+*/
+const HYGIENE_HOOKS = [
+	[POST_CHECKOUT_HOOK_PATH, "post-checkout"],
+	[POST_MERGE_HOOK_PATH, "post-merge"],
+	[POST_COMMIT_HOOK_PATH, void 0]
+];
 /** Header written when creating a fresh hygiene hook (post-checkout / post-merge / post-commit). */
 const HYGIENE_HEADER = "#!/usr/bin/env sh\n# Managed by savvy-hooks\n# Custom hooks can go above or below the managed section\n\n";
 /**
@@ -85,14 +96,13 @@ function runCommitInit(opts) {
 		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 [
-			POST_CHECKOUT_HOOK_PATH,
-			POST_MERGE_HOOK_PATH,
-			POST_COMMIT_HOOK_PATH
-		]) {
+		for (const [hookPath, installHook] of HYGIENE_HOOKS) {
 			yield* ensureHookFile(hookPath, HYGIENE_HEADER);
 			const sections = [SavvyHooksSection.section(savvyHooksHygiene())];
-			if (hookPath !== ".husky/post-commit") sections.push(SavvyToolchainSection.section(savvyToolchainCheck()));
+			if (installHook !== void 0) {
+				sections.push(SavvyToolchainSection.section(savvyToolchainCheck()));
+				sections.push(savvyInstallBlock(installHook));
+			}
 			yield* ms.syncAll(hookPath, sections);
 			yield* makeExecutable(hookPath);
 			yield* Effect.log(`${"✓"} Synced ${hookPath}`);

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, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolchainCheck } from "@savvy-web/silk-effects";
+import { ConfigDiscovery, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem, Option } from "effect";
 import { Jsonc } from "@effected/jsonc";
 import { isDeepStrictEqual } from "node:util";
@@ -197,6 +197,7 @@ function runLintCheck(opts) {
 		];
 		const shellHookStatuses = [];
 		const toolchainStatuses = [];
+		const installStatuses = [];
 		for (const hookPath of shellHookPaths) {
 			if (!(yield* fs.exists(hookPath))) {
 				shellHookStatuses.push({
@@ -222,6 +223,22 @@ function runLintCheck(opts) {
 				warnings.push(`${WARNING}  ${hookPath} savvy-hooks section is outdated.\n   Run 'savvy init' to update.`);
 			}
 			if (hookPath === Lint.POST_COMMIT_HOOK_PATH) continue;
+			const installHook = hookPath === Lint.POST_CHECKOUT_HOOK_PATH ? "post-checkout" : "post-merge";
+			const installResult = yield* ms.check(hookPath, savvyInstallBlock(installHook));
+			const installFound = !CheckOutcome.$is("Absent")(installResult);
+			const installUpToDate = CheckOutcome.$is("UpToDate")(installResult);
+			installStatuses.push({
+				path: hookPath,
+				found: installFound,
+				isUpToDate: installUpToDate
+			});
+			if (!installFound) {
+				sectionsHealthy = false;
+				warnings.push(`${WARNING}  ${hookPath} has no savvy-install section.\n   Run 'savvy init' to add it.`);
+			} else if (!installUpToDate) {
+				sectionsHealthy = false;
+				warnings.push(`${WARNING}  ${hookPath} savvy-install section is outdated.\n   Run 'savvy init' to update.`);
+			}
 			const toolchainResult = yield* ms.check(hookPath, SavvyToolchainSection.section(savvyToolchainCheck()));
 			const toolchainFound = !CheckOutcome.$is("Absent")(toolchainResult);
 			const toolchainUpToDate = CheckOutcome.$is("UpToDate")(toolchainResult);
@@ -276,6 +293,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 installStatuses) if (!status.found) yield* Effect.log(`${BULLET} ${status.path}: savvy-install section not found`);
+		else if (status.isUpToDate) yield* Effect.log(`${CHECK_MARK} ${status.path}: savvy-install up-to-date`);
+		else yield* Effect.log(`${WARNING} ${status.path}: savvy-install 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)`);

package/commands/lint/init.js

@@ -1,9 +1,9 @@
 import { BIOME_VERSION } from "./biome-version.js";
 import { ManagedSection } from "@effected/templates";
 import { WorkspaceDiscovery } from "@effected/workspaces";
-import { BiomeSchemaSync, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyToolchainCheck } from "@savvy-web/silk-effects";
+import { BiomeSchemaSync, LIFECYCLE_SCRIPTS_CONFIG_KEY, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, publishesBuiltLinkDirectory, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
-import { dirname } from "node:path";
+import { dirname, join } from "node:path";
 import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
 import { chmod } from "node:fs/promises";
 import { isDeepStrictEqual } from "node:util";
@@ -27,6 +27,17 @@ const JSONC_FORMAT = {
 };
 /** Header written when creating a fresh pre-commit hook. */
 const PRE_COMMIT_HEADER = "#!/usr/bin/env sh\n# Pre-commit hook with savvy managed sections\n# Custom hooks can go above, below, or between the managed sections\n\n";
+/**
+* The hygiene hooks, each paired with the install variant it should carry.
+*
+* `undefined` means the hook gets hygiene only — post-commit fires on every
+* commit, where neither a drift warning nor an install is worth the noise.
+*/
+const HYGIENE_HOOKS = [
+	[Lint.POST_CHECKOUT_HOOK_PATH, "post-checkout"],
+	[Lint.POST_MERGE_HOOK_PATH, "post-merge"],
+	[Lint.POST_COMMIT_HOOK_PATH, void 0]
+];
 /** Header written when creating a fresh hygiene hook (post-checkout / post-merge / post-commit). */
 const HYGIENE_HEADER = "#!/usr/bin/env sh\n# Managed by savvy-hooks\n# Custom hooks can go above or below the managed section\n\n";
 /**
@@ -148,6 +159,38 @@ function biomeConfigRoots() {
 	});
 }
 /**
+* Point out that this workspace needs lifecycle scripts, and how to allow them.
+*
+* @remarks
+* The `savvy-install` hook block skips lifecycle scripts unless the LOCAL git
+* config key authorizes them. A workspace publishing through built link
+* directories cannot survive that default — its own workspace links resolve
+* through directories a `prepare` script produces — so it has to be told.
+*
+* This reports and does not set. Enabling scripts means every later hook-time
+* install may execute code from whatever revision was just checked out, which is
+* a trust decision belonging to the person who owns the checkout, not to a
+* command they ran to write some config files. Setting it for them silently
+* would give back most of what reading the flag from local config bought.
+*
+* Every failure reads as "say nothing": an unreadable or malformed manifest
+* cannot make the notice wrong, only absent.
+*/
+function noticeLifecycleScripts() {
+	return Effect.gen(function* () {
+		const fs = yield* FileSystem.FileSystem;
+		const roots = yield* biomeConfigRoots();
+		for (const root of roots) {
+			const manifest = yield* fs.readFileString(join(root, "package.json")).pipe(Effect.map((raw) => JSON.parse(raw)), Effect.catch(() => Effect.succeed(void 0)));
+			if (publishesBuiltLinkDirectory(manifest)) {
+				yield* Effect.log(`${WARNING} This workspace publishes through built link directories, so a hook-time install must run lifecycle scripts.`);
+				yield* Effect.log(`   Allow them with: git config --local ${LIFECYCLE_SCRIPTS_CONFIG_KEY} true`);
+				return;
+			}
+		}
+	});
+}
+/**
 * Find and sync biome config `$schema` URLs to match the pinned {@link BIOME_VERSION}.
 *
 * @remarks
@@ -214,19 +257,19 @@ function runLintInit(opts) {
 		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 [
-			Lint.POST_CHECKOUT_HOOK_PATH,
-			Lint.POST_MERGE_HOOK_PATH,
-			Lint.POST_COMMIT_HOOK_PATH
-		]) {
+		if (presetIncludesShellScripts(preset)) for (const [hookPath, installHook] of HYGIENE_HOOKS) {
 			yield* ensureHookFile(hookPath, HYGIENE_HEADER);
 			yield* ms.remove(hookPath, Lint.LegacySavvyLintHygieneDef);
 			const sections = [SavvyHooksSection.section(savvyHooksHygiene())];
-			if (hookPath !== Lint.POST_COMMIT_HOOK_PATH) sections.push(SavvyToolchainSection.section(savvyToolchainCheck()));
+			if (installHook !== void 0) {
+				sections.push(SavvyToolchainSection.section(savvyToolchainCheck()));
+				sections.push(savvyInstallBlock(installHook));
+			}
 			yield* ms.syncAll(hookPath, sections);
 			yield* makeExecutable(hookPath);
 			yield* Effect.log(`${CHECK_MARK} Synced ${hookPath}`);
 		}
+		if (presetIncludesShellScripts(preset)) yield* noticeLifecycleScripts();
 		if (presetIncludesMarkdown(preset)) yield* writeMarkdownlintConfig(fs, preset, force);
 		yield* syncBiomeSchemas();
 		if ((yield* fs.exists(config)) && !force) yield* Effect.log(`${WARNING} ${config} already exists (use --force to overwrite)`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "2.10.0",
+	"version": "2.11.1",
 	"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",
@@ -31,14 +31,14 @@
 		"savvy": "bin/savvy.js"
 	},
 	"dependencies": {
-		"@effect/platform-node": "4.0.0-rc.109",
-		"@effected/commands": "^0.5.0",
-		"@effected/git": "^0.10.0",
-		"@effected/jsonc": "^0.8.1",
-		"@effected/templates": "^0.4.0",
-		"@effected/workspaces": "^0.19.0",
-		"@effected/yaml": "^0.12.0",
-		"@savvy-web/silk-effects": "7.4.0",
-		"effect": "4.0.0-rc.109"
+		"@effect/platform-node": "4.0.0-rc.112",
+		"@effected/commands": "^0.6.1",
+		"@effected/git": "^0.12.0",
+		"@effected/jsonc": "^0.9.0",
+		"@effected/templates": "^0.5.0",
+		"@effected/workspaces": "^0.20.1",
+		"@effected/yaml": "^0.14.0",
+		"@savvy-web/silk-effects": "7.5.1",
+		"effect": "4.0.0-rc.112"
 	}
 }