claudekit-cli 4.3.1-dev.16 → 4.3.1-dev.17

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.3.1-dev.16",
-	"generatedAt": "2026-05-26T17:24:46.493Z",
+	"version": "4.3.1-dev.17",
+	"generatedAt": "2026-05-27T03:32:56.469Z",
 	"commands": {
 		"agents": {
 			"name": "agents",
@@ -1188,6 +1188,10 @@
 						{
 							"flags": "--force-overwrite-settings",
 							"description": "Fully replace settings.json instead of selective merge"
+						},
+						{
+							"flags": "--restore-ck-hooks",
+							"description": "Restore CK-managed hook registrations during update self-heal"
 						}
 					]
 				},

package/dist/index.js

@@ -15349,6 +15349,7 @@ var init_commands = __esm(() => {
     dryRun: exports_external.boolean().default(false),
     forceOverwrite: exports_external.boolean().default(false),
     forceOverwriteSettings: exports_external.boolean().default(false),
+    restoreCkHooks: exports_external.boolean().default(false),
     skipSetup: exports_external.boolean().default(false),
     refresh: exports_external.boolean().default(false),
     docsDir: exports_external.string().optional(),
@@ -15891,8 +15892,12 @@ var init_ck_config = __esm(() => {
   CkHooksConfigSchema = exports_external.object({
     "session-init": exports_external.boolean().optional(),
     "subagent-init": exports_external.boolean().optional(),
+    "session-state": exports_external.boolean().optional(),
+    "cook-after-plan-reminder": exports_external.boolean().optional(),
     "descriptive-name": exports_external.boolean().optional(),
     "dev-rules-reminder": exports_external.boolean().optional(),
+    "plan-format-kanban": exports_external.boolean().optional(),
+    "usage-quota-cache-refresh": exports_external.boolean().optional(),
     "usage-context-awareness": exports_external.boolean().optional(),
     "context-tracking": exports_external.boolean().optional(),
     "scout-block": exports_external.boolean().optional(),
@@ -15989,8 +15994,12 @@ var init_ck_config = __esm(() => {
     hooks: {
       "session-init": true,
       "subagent-init": true,
+      "session-state": true,
+      "cook-after-plan-reminder": true,
       "descriptive-name": true,
       "dev-rules-reminder": true,
+      "plan-format-kanban": true,
+      "usage-quota-cache-refresh": true,
       "usage-context-awareness": true,
       "context-tracking": true,
       "scout-block": true,
@@ -16014,8 +16023,12 @@ var init_ck_config = __esm(() => {
   CK_HOOK_NAMES = [
     "session-init",
     "subagent-init",
+    "session-state",
+    "cook-after-plan-reminder",
     "descriptive-name",
     "dev-rules-reminder",
+    "plan-format-kanban",
+    "usage-quota-cache-refresh",
     "usage-context-awareness",
     "context-tracking",
     "scout-block",
@@ -45197,6 +45210,14 @@ var init_open = __esm(() => {
   open_default = open;
 });
 
+// src/shared/json-content.ts
+function stripJsonBom(content) {
+  return content.charCodeAt(0) === 65279 ? content.slice(1) : content;
+}
+function parseJsonContent(content) {
+  return JSON.parse(stripJsonBom(content));
+}
+
 // src/domains/config/config-manager.ts
 import { existsSync as existsSync10 } from "node:fs";
 import { mkdir as mkdir6, readFile as readFile7, rename as rename3, rm as rm3, writeFile as writeFile5 } from "node:fs/promises";
@@ -45225,7 +45246,7 @@ class ConfigManager {
     try {
       if (existsSync10(configFile)) {
         const content = await readFile7(configFile, "utf-8");
-        const data = JSON.parse(content);
+        const data = parseJsonContent(content);
         ConfigManager.config = ConfigSchema.parse(data);
         logger.debug(`Config loaded from ${configFile}`);
         return ConfigManager.config;
@@ -45279,7 +45300,7 @@ class ConfigManager {
     try {
       if (existsSync10(configPath)) {
         const content = await readFile7(configPath, "utf-8");
-        const data = JSON.parse(content);
+        const data = parseJsonContent(content);
         const folders = FoldersConfigSchema.parse(data.paths || data);
         logger.debug(`Project config loaded from ${configPath}`);
         return folders;
@@ -45300,7 +45321,7 @@ class ConfigManager {
       if (existsSync10(configPath)) {
         try {
           const content = await readFile7(configPath, "utf-8");
-          existingConfig = JSON.parse(content);
+          existingConfig = parseJsonContent(content);
         } catch (error) {
           logger.debug(`Could not parse existing config, starting fresh: ${error instanceof Error ? error.message : "Unknown error"}`);
         }
@@ -45475,7 +45496,7 @@ class CkConfigManager {
       if (!existsSync11(configPath))
         return null;
       const content = await readFile8(configPath, "utf-8");
-      const data = normalizeCkConfigInput(JSON.parse(content));
+      const data = normalizeCkConfigInput(parseJsonContent(content));
       return CkConfigSchema.parse(data);
     } catch (error) {
       logger.warning(`Failed to load config from ${configPath}: ${error instanceof Error ? error.message : "Unknown"}`);
@@ -45542,7 +45563,7 @@ class CkConfigManager {
     if (!existingConfig && existsSync11(configPath)) {
       try {
         const content = await readFile8(configPath, "utf-8");
-        const parsed = JSON.parse(content);
+        const parsed = parseJsonContent(content);
         if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
           existingConfig = normalizeCkConfigInput(parsed);
         }
@@ -45794,6 +45815,12 @@ function repairClaudeNodeCommandPath(cmd, root) {
     const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
     return { command, changed: command !== cmd, issue: "raw-relative" };
   }
+  const quotedRelativeMatch = cmd.match(/^(node\s+)["'](?:\.\/)?(\.claude[/\\][^"']+)["'](.*)$/);
+  if (quotedRelativeMatch) {
+    const [, nodePrefix, relativePath, suffix] = quotedRelativeMatch;
+    const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "raw-relative" };
+  }
   const embeddedQuotedMatch = cmd.match(/^(node\s+)"(?:\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)[/\\](\.claude[/\\][^"]+)"(.*)$/);
   if (embeddedQuotedMatch) {
     const [, nodePrefix, relativePath, suffix] = embeddedQuotedMatch;
@@ -50122,6 +50149,16 @@ var init_ck_config_schema = __esm(() => {
             default: true,
             description: "SubagentStart hook - injects context to subagents"
           },
+          "session-state": {
+            type: "boolean",
+            default: true,
+            description: "Stop/SubagentStop/PostToolUse hook - persists session state for handoff and statusline context"
+          },
+          "cook-after-plan-reminder": {
+            type: "boolean",
+            default: true,
+            description: "SubagentStop hook - reminds agents to continue implementation after planning"
+          },
           "descriptive-name": {
             type: "boolean",
             default: true,
@@ -50132,6 +50169,16 @@ var init_ck_config_schema = __esm(() => {
             default: true,
             description: "UserPromptSubmit hook - injects dev rules context"
           },
+          "plan-format-kanban": {
+            type: "boolean",
+            default: true,
+            description: "PostToolUse hook - keeps plan kanban metadata synchronized after edits"
+          },
+          "usage-quota-cache-refresh": {
+            type: "boolean",
+            default: true,
+            description: "Lifecycle hook - refreshes cached usage quota information"
+          },
           "usage-context-awareness": {
             type: "boolean",
             default: true,
@@ -63806,7 +63853,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.3.1-dev.16",
+    version: "4.3.1-dev.17",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -64290,8 +64337,9 @@ var init_package_manager_runner = __esm(() => {
 import { existsSync as existsSync44, readdirSync as readdirSync7 } from "node:fs";
 import { homedir as homedir40 } from "node:os";
 import { basename as basename23, dirname as dirname28, isAbsolute as isAbsolute10, resolve as resolve32, sep as sep11 } from "node:path";
-function pruneZombieEngineerWirings(settings, hookDir) {
+function pruneZombieEngineerWirings(settings, hookDir, preserveCommands = new Set) {
   const pruned = [];
+  const normalizedPreserveCommands = new Set(Array.from(preserveCommands).map((command) => normalizeCommand(command)));
   if (!existsSync44(hookDir)) {
     return { settings, pruned };
   }
@@ -64311,14 +64359,14 @@ function pruneZombieEngineerWirings(settings, hookDir) {
     for (const group of groups) {
       if (!("hooks" in group) || !Array.isArray(group.hooks)) {
         const entry = group;
-        if (shouldPruneEntry(entry, hookDir, pruned)) {
+        if (shouldPruneEntry(entry, hookDir, pruned, normalizedPreserveCommands)) {
           continue;
         }
         keptGroups.push(group);
         continue;
       }
       const keptHooks = group.hooks.filter((h2) => {
-        return !shouldPruneEntry(h2, hookDir, pruned);
+        return !shouldPruneEntry(h2, hookDir, pruned, normalizedPreserveCommands);
       });
       if (keptHooks.length > 0) {
         keptGroups.push({ ...group, hooks: keptHooks });
@@ -64335,13 +64383,16 @@ function pruneZombieEngineerWirings(settings, hookDir) {
   }
   return { settings, pruned };
 }
-function shouldPruneEntry(entry, hookDir, pruned) {
+function shouldPruneEntry(entry, hookDir, pruned, preserveCommands) {
   if (isLegacyDescriptiveNamePrompt(entry)) {
     pruned.push("legacy-descriptive-name-prompt");
     return true;
   }
   if (entry._origin !== "engineer")
     return false;
+  if (entry.command && preserveCommands.has(normalizeCommand(entry.command))) {
+    return false;
+  }
   const filePath = extractHookFilePath(entry.command, hookDir);
   if (!filePath)
     return false;
@@ -64426,7 +64477,9 @@ function extractHookFilePath(command, hookDir) {
   }
   return null;
 }
-var init_zombie_wirings_pruner = () => {};
+var init_zombie_wirings_pruner = __esm(() => {
+  init_command_normalizer();
+});
 
 // src/domains/health-checks/checkers/shared.ts
 function shouldSkipExpensiveOperations2() {
@@ -67391,7 +67444,7 @@ async function readMetadataFile(claudeDir3) {
     return null;
   }
 }
-function buildInitCommand(isGlobal, kit, beta, yes) {
+function buildInitCommand(isGlobal, kit, beta, yes, restoreCkHooks) {
   const parts = ["ck init"];
   if (isGlobal)
     parts.push("-g");
@@ -67399,6 +67452,8 @@ function buildInitCommand(isGlobal, kit, beta, yes) {
     parts.push(`--kit ${kit}`);
   if (yes)
     parts.push("--yes");
+  if (restoreCkHooks)
+    parts.push("--restore-ck-hooks");
   parts.push("--install-skills");
   if (beta)
     parts.push("--beta");
@@ -67480,6 +67535,36 @@ async function promptKitUpdate(beta, yes, deps) {
       logger.verbose("No ClaudeKit installations detected, skipping kit update prompt");
       return;
     }
+    let forceKitReinstall = false;
+    if (hasLocal && setup.project.path) {
+      try {
+        const missingHookDeps = await findMissingHookDepsFn(setup.project.path);
+        if (missingHookDeps.length > 0) {
+          logger.warning(`Detected ${missingHookDeps.length} local missing hook dependency(ies); reinstalling local kit content`);
+          forceKitReinstall = true;
+        }
+      } catch (error) {
+        logger.verbose(`Local hook dependency self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
+      }
+      try {
+        const countMissingHookRefsFn = deps?.countMissingHookFileReferencesFn ?? countMissingHookFileReferences;
+        const missingHookRefs = await countMissingHookRefsFn(dirname29(setup.project.path));
+        if (missingHookRefs > 0) {
+          logger.warning(`Detected ${missingHookRefs} local broken hook registration(s); reinstalling local kit content`);
+          forceKitReinstall = true;
+        }
+      } catch (error) {
+        logger.verbose(`Local hook registration self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
+      }
+      if (forceKitReinstall && selection.isGlobal) {
+        const kit = localKits[0] || selection.kit;
+        selection = {
+          isGlobal: false,
+          kit,
+          promptMessage: `Update local project ClaudeKit content${kit ? ` (${kit})` : ""}?`
+        };
+      }
+    }
     let kitVersion = selection.kit ? selection.isGlobal ? globalMetadata?.kits?.[selection.kit]?.version : localMetadata?.kits?.[selection.kit]?.version : undefined;
     const isBetaInstalled = isBetaVersion(kitVersion);
     const promptMessage = selection.promptMessage;
@@ -67487,7 +67572,7 @@ async function promptKitUpdate(beta, yes, deps) {
       logger.info(`Current kit version: ${selection.kit}@${kitVersion}`);
     }
     let alreadyAtLatest = false;
-    if (yes && selection.kit && kitVersion) {
+    if (yes && selection.kit && kitVersion && !forceKitReinstall) {
       const getTagFn = deps?.getLatestReleaseTagFn ?? fetchLatestReleaseTag;
       const latestTag = await getTagFn(selection.kit, beta || isBetaInstalled);
       if (latestTag && versionsMatch(kitVersion, latestTag)) {
@@ -67503,6 +67588,7 @@ async function promptKitUpdate(beta, yes, deps) {
         if (missingHookDeps.length > 0) {
           logger.warning(`Detected ${missingHookDeps.length} missing hook dependency(ies); reinstalling kit content`);
           alreadyAtLatest = false;
+          forceKitReinstall = true;
         }
       } catch (error) {
         logger.verbose(`Hook dependency self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
@@ -67516,6 +67602,7 @@ async function promptKitUpdate(beta, yes, deps) {
         if (missingHookRefs > 0) {
           logger.warning(`Detected ${missingHookRefs} broken hook registration(s); reinstalling kit content`);
           alreadyAtLatest = false;
+          forceKitReinstall = true;
           if (setup.project.path && selection.isGlobal) {
             selection = {
               isGlobal: false,
@@ -67552,7 +67639,7 @@ async function promptKitUpdate(beta, yes, deps) {
     }
     const useBeta = beta || isBetaInstalled;
     if (yes) {
-      const initCmd = buildInitCommand(selection.isGlobal, selection.kit, useBeta, true);
+      const initCmd = buildInitCommand(selection.isGlobal, selection.kit, useBeta, true, forceKitReinstall);
       logger.info(`Running: ${initCmd}`);
       const s = (deps?.spinnerFn ?? de)();
       s.start("Updating ClaudeKit content...");
@@ -67585,6 +67672,8 @@ async function promptKitUpdate(beta, yes, deps) {
       const args = ["init"];
       if (selection.isGlobal)
         args.push("-g");
+      if (forceKitReinstall)
+        args.push("--restore-ck-hooks");
       args.push("--install-skills");
       if (useBeta)
         args.push("--beta");
@@ -67654,17 +67743,19 @@ async function promptMigrateUpdate(deps) {
     } catch {}
     try {
       const cleanupFn = deps?.cleanupMigratedHooksFn ?? (await Promise.resolve().then(() => (init_migrated_hooks_cleanup(), exports_migrated_hooks_cleanup))).cleanupMigratedHooksForProviders;
-      const cleanupProviders = allProviders.filter((p) => SAFE_PROVIDER_NAME.test(p));
-      const cleanupResults = await cleanupFn(cleanupProviders, { global: isGlobal });
-      const cleanupCount = cleanupResults.reduce((total, result) => total + result.hooksPruned + result.filesRemoved + result.registryEntriesRemoved, 0);
-      if (cleanupCount > 0) {
-        logger.info(`Cleaned up ${cleanupCount} generated-context hook artifact(s)`);
+      const cleanupProviders = allProviders.filter((p) => p !== "claude-code" && SAFE_PROVIDER_NAME.test(p));
+      if (cleanupProviders.length > 0) {
+        const cleanupResults = await cleanupFn(cleanupProviders, { global: isGlobal });
+        const cleanupCount = cleanupResults.reduce((total, result) => total + result.hooksPruned + result.filesRemoved + result.registryEntriesRemoved, 0);
+        if (cleanupCount > 0) {
+          logger.info(`Cleaned up ${cleanupCount} generated-context hook artifact(s)`);
+        }
+        await repairLegacyHookPromptsSafely();
+        await repairHookFileReferencesSafely();
       }
     } catch (error) {
       logger.verbose(`Migrated hook cleanup skipped: ${error instanceof Error ? error.message : "unknown"}`);
     }
-    await repairLegacyHookPromptsSafely();
-    await repairHookFileReferencesSafely();
     const targets = allProviders.filter((p) => p !== "claude-code");
     if (targets.length === 0) {
       logger.verbose("No migration targets detected, skipping migrate step");
@@ -80723,6 +80814,10 @@ var init_init_command_help = __esm(() => {
           {
             flags: "--force-overwrite-settings",
             description: "Fully replace settings.json instead of selective merge"
+          },
+          {
+            flags: "--restore-ck-hooks",
+            description: "Restore CK-managed hook registrations during update self-heal"
           }
         ]
       },
@@ -103373,7 +103468,7 @@ class InstalledSettingsTracker {
     }
     try {
       const content = await readFile50(ckJsonPath, "utf-8");
-      const data = JSON.parse(content);
+      const data = parseJsonContent(content);
       const installed = data.kits?.[this.kitName]?.installedSettings;
       if (installed) {
         return installed;
@@ -103390,7 +103485,7 @@ class InstalledSettingsTracker {
       let data = {};
       if (existsSync66(ckJsonPath)) {
         const content = await readFile50(ckJsonPath, "utf-8");
-        data = JSON.parse(content);
+        data = parseJsonContent(content);
       }
       if (!data.kits) {
         data.kits = {};
@@ -103456,6 +103551,7 @@ class SettingsProcessor {
   installingKit;
   cachedVersion = undefined;
   deletionPatterns = [];
+  restoreCkHooks = false;
   zombiePrunerHookDir = null;
   setGlobalFlag(isGlobal) {
     this.isGlobal = isGlobal;
@@ -103463,6 +103559,9 @@ class SettingsProcessor {
   setForceOverwriteSettings(force) {
     this.forceOverwriteSettings = force;
   }
+  setRestoreCkHooks(restore) {
+    this.restoreCkHooks = restore;
+  }
   setProjectDir(dir) {
     this.projectDir = dir;
     this.initTracker();
@@ -103507,6 +103606,7 @@ class SettingsProcessor {
       } else {
         try {
           const parsedSettings = JSON.parse(transformedSource);
+          await this.applyDisabledHookConfig(parsedSettings);
           this.logHookCommandRepair(this.fixHookCommandPaths(parsedSettings), "fresh install");
           await SettingsMerger.writeSettingsFile(destFile, parsedSettings);
           try {
@@ -103536,6 +103636,7 @@ class SettingsProcessor {
     let sourceSettings;
     try {
       sourceSettings = JSON.parse(transformedSourceContent);
+      await this.applyDisabledHookConfig(sourceSettings);
     } catch {
       logger.warning("Failed to parse source settings.json, falling back to overwrite");
       const formattedContent = this.formatJsonContent(transformedSourceContent);
@@ -103558,10 +103659,15 @@ class SettingsProcessor {
     if (this.tracker) {
       installedSettings = await this.tracker.loadInstalledSettings();
     }
+    const mergeInstalledSettings = this.restoreCkHooks ? { ...installedSettings, hooks: [] } : installedSettings;
     const mergeResult = SettingsMerger.merge(sourceSettings, destSettings, {
-      installedSettings,
+      installedSettings: mergeInstalledSettings,
       sourceKit: this.installingKit
     });
+    await this.applyDisabledHookConfig(mergeResult.merged);
+    if (this.restoreCkHooks) {
+      logger.info("Restored CK hook registrations while respecting .ck.json hook disables");
+    }
     logger.verbose("Settings merge details", {
       hooksAdded: mergeResult.hooksAdded,
       hooksPreserved: mergeResult.hooksPreserved,
@@ -103591,7 +103697,8 @@ class SettingsProcessor {
       logger.info(`Pruned ${hooksPruned} stale hook(s) referencing deleted files`);
     }
     if (this.zombiePrunerHookDir) {
-      const { pruned: zombiePruned } = pruneZombieEngineerWirings(mergeResult.merged, this.zombiePrunerHookDir);
+      const sourceHookCommands = this.collectHookCommands(sourceSettings);
+      const { pruned: zombiePruned } = pruneZombieEngineerWirings(mergeResult.merged, this.zombiePrunerHookDir, sourceHookCommands);
       if (zombiePruned.length > 0) {
         logger.info(`Pruned ${zombiePruned.length} zombie hook entries: ${zombiePruned.join(", ")}`);
       }
@@ -103600,6 +103707,111 @@ class SettingsProcessor {
     logger.success("Merged settings.json (user customizations preserved)");
     await this.injectTeamHooksIfSupported(destFile, mergeResult.merged);
   }
+  async getDisabledHookNames() {
+    if (!this.projectDir) {
+      return new Set;
+    }
+    const disabled = new Set;
+    const addFromConfig = async (configPath) => {
+      const names = await this.readDisabledHookNamesFromConfig(configPath);
+      for (const name2 of names)
+        disabled.add(name2);
+    };
+    try {
+      if (this.isGlobal) {
+        await addFromConfig(join109(this.projectDir, ".ck.json"));
+      } else {
+        await addFromConfig(join109(PathResolver.getGlobalKitDir(), ".ck.json"));
+        await addFromConfig(join109(this.projectDir, ".claude", ".ck.json"));
+      }
+    } catch (error) {
+      logger.debug(`Failed to load .ck.json hook preferences: ${error instanceof Error ? error.message : "unknown"}`);
+    }
+    return disabled;
+  }
+  async readDisabledHookNamesFromConfig(configPath) {
+    if (!await import_fs_extra14.pathExists(configPath))
+      return new Set;
+    const raw2 = parseJsonContent(await import_fs_extra14.readFile(configPath, "utf-8"));
+    const hooks = raw2.hooks;
+    if (!hooks || typeof hooks !== "object")
+      return new Set;
+    return new Set(Object.entries(hooks).filter(([, enabled]) => enabled === false).map(([name2]) => name2));
+  }
+  async applyDisabledHookConfig(settings) {
+    const disabledHooks = await this.getDisabledHookNames();
+    if (disabledHooks.size === 0 || !settings.hooks)
+      return 0;
+    let removed = 0;
+    const hooksRecord = settings.hooks;
+    for (const [eventName, entries] of Object.entries(hooksRecord)) {
+      const filteredEntries = [];
+      for (const entry of entries) {
+        if (Array.isArray(entry.hooks)) {
+          const keptHooks = entry.hooks.filter((hook) => {
+            const command = typeof hook.command === "string" ? hook.command : "";
+            const hookName = this.extractCkHookName(command);
+            if (hookName && disabledHooks.has(hookName)) {
+              removed++;
+              return false;
+            }
+            return true;
+          });
+          if (keptHooks.length > 0) {
+            filteredEntries.push({ ...entry, hooks: keptHooks });
+          }
+        } else {
+          const command = typeof entry.command === "string" ? entry.command : "";
+          const hookName = this.extractCkHookName(command);
+          if (hookName && disabledHooks.has(hookName)) {
+            removed++;
+            continue;
+          }
+          filteredEntries.push(entry);
+        }
+      }
+      if (filteredEntries.length > 0) {
+        hooksRecord[eventName] = filteredEntries;
+      } else {
+        delete hooksRecord[eventName];
+      }
+    }
+    if (Object.keys(hooksRecord).length === 0) {
+      settings.hooks = undefined;
+    }
+    if (removed > 0) {
+      logger.info(`Skipped ${removed} hook registration(s) disabled in .ck.json`);
+    }
+    return removed;
+  }
+  collectHookCommands(settings) {
+    const commands = new Set;
+    if (!settings.hooks)
+      return commands;
+    for (const entries of Object.values(settings.hooks)) {
+      for (const entry of entries) {
+        if ("hooks" in entry && Array.isArray(entry.hooks)) {
+          for (const hook of entry.hooks) {
+            if (typeof hook.command === "string") {
+              commands.add(hook.command);
+            }
+          }
+          continue;
+        }
+        if ("command" in entry && typeof entry.command === "string") {
+          commands.add(entry.command);
+        }
+      }
+    }
+    return commands;
+  }
+  extractCkHookName(command) {
+    if (!command.trim().startsWith("node "))
+      return null;
+    const normalized = command.replace(/\\/g, "/");
+    const match2 = normalized.match(/\/hooks\/([^/"'\s]+)\.(?:cjs|mjs|js)(?:["'\s]|$)/);
+    return match2?.[1] ?? null;
+  }
   migrateDeprecatedMatchers(destSettings, sourceSettings) {
     if (!destSettings.hooks || !sourceSettings.hooks)
       return;
@@ -103992,6 +104204,9 @@ class CopyExecutor {
   setForceOverwriteSettings(force) {
     this.settingsProcessor.setForceOverwriteSettings(force);
   }
+  setRestoreCkHooks(restore) {
+    this.settingsProcessor.setRestoreCkHooks(restore);
+  }
   setDeletions(deletions) {
     this.settingsProcessor.setDeletions(deletions);
   }
@@ -104164,6 +104379,9 @@ class FileMerger {
   setForceOverwriteSettings(force) {
     this.copyExecutor.setForceOverwriteSettings(force);
   }
+  setRestoreCkHooks(restore) {
+    this.copyExecutor.setRestoreCkHooks(restore);
+  }
   setProjectDir(dir) {
     this.copyExecutor.setProjectDir(dir);
   }
@@ -105487,6 +105705,7 @@ async function handleMerge(ctx) {
   }
   merger.setGlobalFlag(ctx.options.global);
   merger.setForceOverwriteSettings(ctx.options.forceOverwriteSettings);
+  merger.setRestoreCkHooks(ctx.options.restoreCkHooks);
   merger.setProjectDir(ctx.resolvedDir);
   merger.setKitName(ctx.kit.name);
   merger.setZombiePrunerHookDir(join120(ctx.claudeDir, "hooks"));
@@ -106974,6 +107193,7 @@ async function resolveOptions(ctx) {
     skipSetup: parsed.skipSetup ?? false,
     forceOverwrite: parsed.forceOverwrite ?? false,
     forceOverwriteSettings: parsed.forceOverwriteSettings ?? false,
+    restoreCkHooks: parsed.restoreCkHooks ?? false,
     dryRun: parsed.dryRun ?? false,
     prefix: parsed.prefix ?? false,
     sync: parsed.sync ?? false,
@@ -108016,7 +108236,7 @@ async function handleSelection(ctx) {
     logger.info("--force has no effect without --yes (the version-match skip only applies in non-interactive mode)");
   }
   const releaseTag = release?.tag_name;
-  if (ctx.options.yes && !ctx.options.fresh && !ctx.options.force && releaseTag && !isOfflineMode && !pendingKits?.length) {
+  if (ctx.options.yes && !ctx.options.fresh && !ctx.options.force && !ctx.options.restoreCkHooks && releaseTag && !isOfflineMode && !pendingKits?.length) {
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
       const claudeDir3 = prefix ? join134(resolvedDir, prefix) : resolvedDir;
@@ -108990,6 +109210,7 @@ function createInitContext(rawOptions, prompts) {
     skipSetup: false,
     forceOverwrite: false,
     forceOverwriteSettings: false,
+    restoreCkHooks: false,
     dryRun: false,
     prefix: false,
     sync: false,
@@ -113083,6 +113304,7 @@ async function handleKitSelection(ctx) {
       dryRun: false,
       forceOverwrite: false,
       forceOverwriteSettings: false,
+      restoreCkHooks: false,
       skipSetup: true,
       refresh: false,
       sync: false,
@@ -116437,7 +116659,7 @@ function registerCommands(cli) {
     }
     await newCommand(options2);
   });
-  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use: engineer, marketing, all, or comma-separated").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove CK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").action(async (options2) => {
+  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use: engineer, marketing, all, or comma-separated").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove CK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--restore-ck-hooks", "Restore CK-managed hook registrations during update self-heal").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").action(async (options2) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }