claudekit-cli 3.10.0 → 3.10.1

package/dist/index.js

@@ -14677,7 +14677,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "claudekit-cli",
-  version: "3.10.0",
+  version: "3.10.1",
   description: "CLI tool for bootstrapping and updating ClaudeKit projects",
   type: "module",
   repository: {
@@ -27557,30 +27557,75 @@ class SettingsMerger {
     return merged;
   }
   static mergeHookEntries(sourceEntries, destEntries, eventName, result) {
-    const existingCommands = new Set;
-    SettingsMerger.extractCommands(destEntries, existingCommands);
     if (destEntries.length > 0) {
       result.hooksPreserved += destEntries.length;
     }
-    const merged = [...destEntries];
+    const merged = destEntries.map((entry) => SettingsMerger.deepCopyEntry(entry));
+    const matcherIndex = new Map;
+    for (let i = 0;i < merged.length; i++) {
+      const entry = merged[i];
+      if ("matcher" in entry && entry.matcher) {
+        matcherIndex.set(entry.matcher, i);
+      }
+    }
+    const existingCommands = new Set;
+    SettingsMerger.extractCommands(destEntries, existingCommands);
     for (const entry of sourceEntries) {
+      const sourceMatcher = "matcher" in entry ? entry.matcher : undefined;
       const commands = SettingsMerger.getEntryCommands(entry);
-      const isFullyDuplicated = commands.length > 0 && commands.every((cmd) => existingCommands.has(cmd));
-      const duplicateCommands = commands.filter((cmd) => existingCommands.has(cmd));
-      if (duplicateCommands.length > 0) {
-        const summary = duplicateCommands.length === 1 ? `"${SettingsMerger.truncateCommand(duplicateCommands[0])}"` : `${duplicateCommands.length} commands`;
-        result.conflictsDetected.push(`${eventName}: duplicate ${summary}`);
-      }
-      if (!isFullyDuplicated) {
-        merged.push(entry);
-        result.hooksAdded++;
-        for (const cmd of commands) {
-          existingCommands.add(cmd);
+      if (sourceMatcher && matcherIndex.has(sourceMatcher)) {
+        const existingIdx = matcherIndex.get(sourceMatcher);
+        if (existingIdx === undefined)
+          continue;
+        const existingEntry = merged[existingIdx];
+        const newCommands = commands.filter((cmd) => !existingCommands.has(cmd));
+        const duplicateCommands = commands.filter((cmd) => existingCommands.has(cmd));
+        if (duplicateCommands.length > 0) {
+          const summary = duplicateCommands.length === 1 ? `"${SettingsMerger.truncateCommand(duplicateCommands[0])}"` : `${duplicateCommands.length} commands`;
+          result.conflictsDetected.push(`${eventName}: duplicate ${summary}`);
+        }
+        if (newCommands.length > 0 && "hooks" in entry && entry.hooks) {
+          if (!existingEntry.hooks) {
+            existingEntry.hooks = [];
+          }
+          for (const hook of entry.hooks) {
+            if (hook.command && !existingCommands.has(hook.command)) {
+              existingEntry.hooks.push(hook);
+              existingCommands.add(hook.command);
+            }
+          }
+          result.hooksAdded++;
+        }
+      } else {
+        const isFullyDuplicated = commands.length > 0 && commands.every((cmd) => existingCommands.has(cmd));
+        const duplicateCommands = commands.filter((cmd) => existingCommands.has(cmd));
+        if (duplicateCommands.length > 0) {
+          const summary = duplicateCommands.length === 1 ? `"${SettingsMerger.truncateCommand(duplicateCommands[0])}"` : `${duplicateCommands.length} commands`;
+          result.conflictsDetected.push(`${eventName}: duplicate ${summary}`);
+        }
+        if (!isFullyDuplicated) {
+          merged.push(entry);
+          result.hooksAdded++;
+          if (sourceMatcher) {
+            matcherIndex.set(sourceMatcher, merged.length - 1);
+          }
+          for (const cmd of commands) {
+            existingCommands.add(cmd);
+          }
         }
       }
     }
     return merged;
   }
+  static deepCopyEntry(entry) {
+    if ("hooks" in entry) {
+      return {
+        ...entry,
+        hooks: entry.hooks ? [...entry.hooks.map((h2) => ({ ...h2 }))] : undefined
+      };
+    }
+    return { ...entry };
+  }
   static extractCommands(entries, commands) {
     for (const entry of entries) {
       if ("command" in entry && entry.command) {
@@ -33648,7 +33693,7 @@ var import_compare_versions2 = __toESM(require_umd(), 1);
 // package.json
 var package_default2 = {
   name: "claudekit-cli",
-  version: "3.10.0",
+  version: "3.10.1",
   description: "CLI tool for bootstrapping and updating ClaudeKit projects",
   type: "module",
   repository: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "3.10.0",
+	"version": "3.10.1",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {