jun-claude-code 0.5.0 → 0.5.1

package/dist/__tests__/merge-settings.test.js

@@ -403,6 +403,98 @@ function writeJson(filePath, data) {
         (0, vitest_1.expect)(result.hooks.PreToolUse[0].matcher).toBe('Bash');
         (0, vitest_1.expect)(result.hooks.PreToolUse[1].matcher).toBe('Write');
     });
+    (0, vitest_1.it)('should skip source group when dest group contains all source commands plus extras', () => {
+        const sourceSettings = {
+            hooks: {
+                UserPromptSubmit: [
+                    {
+                        hooks: [
+                            { type: 'command', command: 'skill-forced.sh' },
+                            { type: 'command', command: 'workflow-enforced.sh' },
+                        ],
+                    },
+                ],
+            },
+        };
+        writeJson(path.join(sourceDir, 'settings.json'), sourceSettings);
+        // Dest has the same commands PLUS an extra custom hook (peon-ping)
+        const destSettings = {
+            hooks: {
+                UserPromptSubmit: [
+                    {
+                        hooks: [
+                            { type: 'command', command: 'peon.sh' },
+                            { type: 'command', command: 'skill-forced.sh' },
+                            { type: 'command', command: 'workflow-enforced.sh' },
+                        ],
+                    },
+                ],
+            },
+        };
+        writeJson(path.join(destDir, 'settings.json'), destSettings);
+        (0, copy_1.mergeSettingsJson)(sourceDir, destDir);
+        const result = readJson(path.join(destDir, 'settings.json'));
+        // Should remain 1 group, not duplicate
+        (0, vitest_1.expect)(result.hooks.UserPromptSubmit).toHaveLength(1);
+        (0, vitest_1.expect)(result.hooks.UserPromptSubmit[0].hooks).toHaveLength(3);
+    });
+    (0, vitest_1.it)('should skip source group when dest has commands split across multiple groups', () => {
+        const sourceSettings = {
+            hooks: {
+                UserPromptSubmit: [
+                    {
+                        hooks: [
+                            { type: 'command', command: 'skill-forced.sh' },
+                            { type: 'command', command: 'workflow-enforced.sh' },
+                        ],
+                    },
+                ],
+            },
+        };
+        writeJson(path.join(sourceDir, 'settings.json'), sourceSettings);
+        // Dest has the same commands spread across separate groups
+        const destSettings = {
+            hooks: {
+                UserPromptSubmit: [
+                    { hooks: [{ type: 'command', command: 'skill-forced.sh' }] },
+                    { hooks: [{ type: 'command', command: 'workflow-enforced.sh' }] },
+                ],
+            },
+        };
+        writeJson(path.join(destDir, 'settings.json'), destSettings);
+        (0, copy_1.mergeSettingsJson)(sourceDir, destDir);
+        const result = readJson(path.join(destDir, 'settings.json'));
+        // Should remain 2 groups, source group not duplicated
+        (0, vitest_1.expect)(result.hooks.UserPromptSubmit).toHaveLength(2);
+    });
+    (0, vitest_1.it)('should add source group when dest only has some of its commands', () => {
+        const sourceSettings = {
+            hooks: {
+                UserPromptSubmit: [
+                    {
+                        hooks: [
+                            { type: 'command', command: 'skill-forced.sh' },
+                            { type: 'command', command: 'new-hook.sh' },
+                        ],
+                    },
+                ],
+            },
+        };
+        writeJson(path.join(sourceDir, 'settings.json'), sourceSettings);
+        // Dest has only one of the two source commands
+        const destSettings = {
+            hooks: {
+                UserPromptSubmit: [
+                    { hooks: [{ type: 'command', command: 'skill-forced.sh' }] },
+                ],
+            },
+        };
+        writeJson(path.join(destDir, 'settings.json'), destSettings);
+        (0, copy_1.mergeSettingsJson)(sourceDir, destDir);
+        const result = readJson(path.join(destDir, 'settings.json'));
+        // Source group should be added since new-hook.sh is missing
+        (0, vitest_1.expect)(result.hooks.UserPromptSubmit).toHaveLength(2);
+    });
     (0, vitest_1.it)('should dedup when dest has .claude/ paths and source has ~/.claude/ paths', () => {
         const sourceSettings = {
             hooks: {

package/dist/copy.js

@@ -43,7 +43,6 @@ const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
 const crypto = __importStar(require("crypto"));
 const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("./utils");
 /**
  * Prompt user for confirmation using readline
  */
@@ -202,13 +201,49 @@ function mergeSettingsJson(sourceDir, destDir, options) {
             destHooks[event] = [];
         }
         const destEntries = destHooks[event];
-        // Build a Set of command keys from existing entries for fast duplicate detection
-        const existingKeys = new Set(destEntries.map((entry) => (0, utils_1.getHookKey)(entry)));
+        // Collect all individual commands from dest entries, grouped by matcher
+        const destCommandsByMatcher = new Map();
+        for (const entry of destEntries) {
+            const matcher = entry.matcher || '';
+            if (!destCommandsByMatcher.has(matcher)) {
+                destCommandsByMatcher.set(matcher, new Set());
+            }
+            const cmds = destCommandsByMatcher.get(matcher);
+            if (entry.hooks && Array.isArray(entry.hooks)) {
+                for (const h of entry.hooks) {
+                    if (h.command)
+                        cmds.add(h.command);
+                }
+            }
+            else if (entry.command) {
+                cmds.add(entry.command);
+            }
+        }
         for (const entry of sourceEntries) {
-            const key = (0, utils_1.getHookKey)(entry);
-            if (!existingKeys.has(key)) {
+            const matcher = entry.matcher || '';
+            const existingCmds = destCommandsByMatcher.get(matcher) || new Set();
+            // Extract all commands from this source entry
+            const sourceCommands = [];
+            if (entry.hooks && Array.isArray(entry.hooks)) {
+                for (const h of entry.hooks) {
+                    if (h.command)
+                        sourceCommands.push(h.command);
+                }
+            }
+            else if (entry.command) {
+                sourceCommands.push(entry.command);
+            }
+            // Skip if all source commands already exist in dest for the same matcher
+            const allExist = sourceCommands.length > 0 && sourceCommands.every((cmd) => existingCmds.has(cmd));
+            if (!allExist) {
                 destEntries.push(entry);
-                existingKeys.add(key);
+                // Track newly added commands for subsequent source entries
+                if (!destCommandsByMatcher.has(matcher)) {
+                    destCommandsByMatcher.set(matcher, existingCmds);
+                }
+                for (const cmd of sourceCommands) {
+                    existingCmds.add(cmd);
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jun-claude-code",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Claude Code configuration template - copy .claude settings to your project",
   "main": "dist/index.js",
   "bin": "dist/cli.js",