@savvy-web/cli 3.0.5 → 3.2.0

package/commands/lint/biome-version.js

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

package/commands/lint/check.js

@@ -1,5 +1,5 @@
 import { BIOME_VERSION } from "./biome-version.js";
-import { ConfigDiscovery, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
+import { ConfigDiscovery, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyOkfBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem, Option } from "effect";
 import { Jsonc } from "@effected/jsonc";
 import { CheckOutcome, ManagedSection } from "@effected/templates";
@@ -160,6 +160,7 @@ function runLintCheck(opts) {
 		let sectionsHealthy = true;
 		let baseStatusLabel = "missing";
 		let lintStatusLabel = "missing";
+		let okfStatusLabel = "missing";
 		let detectedConfigPath = null;
 		if (hasHuskyHook) {
 			const baseResult = yield* ms.check(Lint.HUSKY_HOOK_PATH, SavvyBaseSection.section(savvyBasePreamble()));
@@ -188,7 +189,14 @@ function runLintCheck(opts) {
 					sectionsHealthy = false;
 				}
 			} else sectionsHealthy = false;
-			if (baseStatusLabel !== "up-to-date" || lintStatusLabel !== "up-to-date") warnings.push(`${WARNING}  Your ${Lint.HUSKY_HOOK_PATH} managed sections are out of date.\n   Run 'savvy init' to update (preserves your custom hooks).`);
+			const okfResult = yield* ms.check(Lint.HUSKY_HOOK_PATH, savvyOkfBlock());
+			if (CheckOutcome.$is("Absent")(okfResult)) sectionsHealthy = false;
+			else {
+				const upToDate = CheckOutcome.$is("UpToDate")(okfResult);
+				okfStatusLabel = upToDate ? "up-to-date" : "outdated";
+				if (!upToDate) sectionsHealthy = false;
+			}
+			if (baseStatusLabel !== "up-to-date" || lintStatusLabel !== "up-to-date" || okfStatusLabel !== "up-to-date") warnings.push(`${WARNING}  Your ${Lint.HUSKY_HOOK_PATH} managed sections are out of date.\n   Run 'savvy init' to update (preserves your custom hooks).`);
 		} else {
 			sectionsHealthy = false;
 			warnings.push(`${WARNING}  No husky pre-commit hook found.\n   Run 'savvy init' to create it.`);
@@ -293,6 +301,9 @@ function runLintCheck(opts) {
 			if (lintStatusLabel === "up-to-date") yield* Effect.log(`${CHECK_MARK} Lint section: up-to-date${lintLabel}`);
 			else if (lintStatusLabel === "outdated") yield* Effect.log(`${WARNING} Lint section: outdated (run 'savvy init' to update)`);
 			else yield* Effect.log(`${BULLET} Lint section: not found (run 'savvy init' to add)`);
+			if (okfStatusLabel === "up-to-date") yield* Effect.log(`${CHECK_MARK} OKF section: up-to-date`);
+			else if (okfStatusLabel === "outdated") yield* Effect.log(`${WARNING} OKF section: outdated (run 'savvy init' to update)`);
+			else yield* Effect.log(`${BULLET} OKF section: not found (run 'savvy init' to add)`);
 		}
 		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`);

package/commands/lint/init.js

@@ -1,6 +1,6 @@
 import { BIOME_VERSION } from "./biome-version.js";
 import { dirname, join } from "node:path";
-import { BiomeSchemaSync, LIFECYCLE_SCRIPTS_CONFIG_KEY, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, publishesBuiltLinkDirectory, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
+import { BiomeSchemaSync, LIFECYCLE_SCRIPTS_CONFIG_KEY, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, publishesBuiltLinkDirectory, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyOkfBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
 import { Effect, FileSystem } from "effect";
 import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
 import { WorkspaceDiscovery } from "@effected/workspaces";
@@ -65,11 +65,7 @@ function presetIncludesMarkdown(preset) {
 * @returns Config file content
 */
 function generateConfigContent(preset) {
-	return `/**
- * lint-staged configuration
- * Generated by savvy lint init
- */
-import { Preset } from "@savvy-web/silk/lint";
+	return `import { Preset } from "@savvy-web/silk/lint";
 
 export default Preset.${preset}();
 `;
@@ -254,7 +250,11 @@ 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.syncAll(Lint.HUSKY_HOOK_PATH, [SavvyBaseSection.section(savvyBasePreamble()), Lint.savvyLintBlock(config)]);
+		const preCommitResults = yield* ms.syncAll(Lint.HUSKY_HOOK_PATH, [
+			SavvyBaseSection.section(savvyBasePreamble()),
+			Lint.savvyLintBlock(config),
+			savvyOkfBlock()
+		]);
 		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, installHook] of HYGIENE_HOOKS) {

package/main.js

@@ -22,7 +22,7 @@ import { NodeRuntime } from "@effect/platform-node";
 * 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: "3.0.5" });
+const cli = Command.run(rootCommand, { version: "3.2.0" });
 /**
 * Bootstrap and run the `savvy` CLI application.
 */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "3.0.5",
+	"version": "3.2.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",
@@ -43,7 +43,7 @@
 		"@effected/templates": "^0.6.0",
 		"@effected/workspaces": "^0.22.0",
 		"@effected/yaml": "^0.15.1",
-		"@savvy-web/silk-effects": "8.0.5",
+		"@savvy-web/silk-effects": "8.2.0",
 		"effect": "4.0.0-rc.115"
 	}
 }