@wipcomputer/wip-ldm-os 0.4.73-alpha.17 → 0.4.73-alpha.18

package/lib/deploy.mjs

@@ -812,7 +812,28 @@ function registerMCP(repoPath, door, toolName) {
   }
 }
 
-function installClaudeCodeHook(repoPath, door) {
+/**
+ * Install Claude Code hook(s) for an extension.
+ *
+ * Accepts either a single door object (legacy) or an array of door objects
+ * (new in 2026-04-05 for wip-branch-guard 1.9.73 which registers on both
+ * PreToolUse and SessionStart). Normalizes to an array and installs each
+ * door independently.
+ *
+ * Returns true if at least one door installed successfully.
+ */
+function installClaudeCodeHook(repoPath, doorOrDoors) {
+  const doors = Array.isArray(doorOrDoors) ? doorOrDoors : [doorOrDoors];
+  let anyOk = false;
+  for (const door of doors) {
+    if (installClaudeCodeHookEvent(repoPath, door)) {
+      anyOk = true;
+    }
+  }
+  return anyOk;
+}
+
+function installClaudeCodeHookEvent(repoPath, door) {
   const settingsPath = join(HOME, '.claude', 'settings.json');
   let settings = readJSON(settingsPath);
 
@@ -826,6 +847,8 @@ function installClaudeCodeHook(repoPath, door) {
   const installedGuard = join(extDir, 'guard.mjs');
 
   // Deploy guard.mjs to ~/.ldm/extensions/{toolName}/ (#85: always update, not just when missing)
+  // Idempotent across multi-door invocations: two doors on the same repo
+  // will both trigger this copy, which is a filesystem no-op after the first.
   const srcGuard = join(repoPath, 'guard.mjs');
   if (existsSync(srcGuard)) {
     try {
@@ -843,21 +866,30 @@ function installClaudeCodeHook(repoPath, door) {
     ? `node ${installedGuard}`
     : (door.command || `node "${srcGuard}"`);
 
+  const event = door.event || 'PreToolUse';
+
   if (DRY_RUN) {
-    ok(`Claude Code: would add ${door.event || 'PreToolUse'} hook (dry run)`);
+    ok(`Claude Code: would add ${event} hook (dry run)`);
     return true;
   }
 
   if (!settings.hooks) settings.hooks = {};
-  const event = door.event || 'PreToolUse';
   if (!settings.hooks[event]) settings.hooks[event] = [];
 
-  const existingIdx = settings.hooks[event].findIndex(entry =>
-    entry.hooks?.some(h => {
+  // Match existing entries by the guard command path + the matcher, so that
+  // a single extension registering on multiple events (each with its own
+  // matcher) creates one entry per event rather than all entries colliding
+  // on the same hook slot. Before this change the existing-entry check was
+  // per-extension, not per-extension-per-event.
+  const doorMatcher = door.matcher || undefined;
+  const existingIdx = settings.hooks[event].findIndex(entry => {
+    const sameMatcher = (entry.matcher || undefined) === doorMatcher;
+    if (!sameMatcher) return false;
+    return entry.hooks?.some(h => {
       const cmd = h.command || '';
       return cmd.includes(`/${toolName}/`) || cmd === hookCommand;
-    })
-  );
+    });
+  });
 
   if (existingIdx !== -1) {
     const existingCmd = settings.hooks[event][existingIdx].hooks?.[0]?.command || '';
@@ -878,7 +910,7 @@ function installClaudeCodeHook(repoPath, door) {
   }
 
   settings.hooks[event].push({
-    matcher: door.matcher || undefined,
+    matcher: doorMatcher,
     hooks: [{
       type: 'command',
       command: hookCommand,

package/lib/detect.mjs

@@ -53,16 +53,27 @@ export function detectInterfaces(repoPath) {
     interfaces.skill = { path: join(repoPath, 'SKILL.md') };
   }
 
-  // 6. Claude Code Hook: guard.mjs or claudeCode.hook in package.json
-  if (pkg?.claudeCode?.hook) {
-    interfaces.claudeCodeHook = pkg.claudeCode.hook;
+  // 6. Claude Code Hook: guard.mjs or claudeCode.hook(s) in package.json
+  //
+  // Supports three shapes:
+  //   - Legacy singular: pkg.claudeCode.hook = { event, matcher, ... }
+  //   - New plural array: pkg.claudeCode.hooks = [{ event, matcher, ... }, ...]
+  //     (one extension can register on multiple events, e.g. both PreToolUse
+  //     and SessionStart. Added 2026-04-05 for wip-branch-guard 1.9.73.)
+  //   - Implicit: a bare guard.mjs file with no package.json declaration.
+  //
+  // Normalized to an array internally so deploy.mjs has one code path.
+  if (Array.isArray(pkg?.claudeCode?.hooks)) {
+    interfaces.claudeCodeHook = pkg.claudeCode.hooks;
+  } else if (pkg?.claudeCode?.hook) {
+    interfaces.claudeCodeHook = [pkg.claudeCode.hook];
   } else if (existsSync(join(repoPath, 'guard.mjs'))) {
-    interfaces.claudeCodeHook = {
+    interfaces.claudeCodeHook = [{
       event: 'PreToolUse',
       matcher: 'Edit|Write',
       command: `node "${join(repoPath, 'guard.mjs')}"`,
       timeout: 5,
-    };
+    }];
   }
 
   // 7. Claude Code Plugin: .claude-plugin/plugin.json
@@ -93,7 +104,10 @@ export function describeInterfaces(interfaces) {
   if (interfaces.mcp) lines.push(`MCP Server: ${interfaces.mcp.file}`);
   if (interfaces.openclaw) lines.push(`OpenClaw Plugin: ${interfaces.openclaw.config?.name || 'detected'}`);
   if (interfaces.skill) lines.push(`Skill: SKILL.md`);
-  if (interfaces.claudeCodeHook) lines.push(`Claude Code Hook: ${interfaces.claudeCodeHook.event || 'PreToolUse'}`);
+  if (interfaces.claudeCodeHook) {
+    const events = interfaces.claudeCodeHook.map(h => h.event || 'PreToolUse');
+    lines.push(`Claude Code Hook: ${events.join(', ')}`);
+  }
   if (interfaces.claudeCodePlugin) lines.push(`Claude Code Plugin: ${interfaces.claudeCodePlugin.manifest?.name || 'detected'}`);
 
   return `${names.length} interface(s): ${names.join(', ')}\n${lines.map(l => `  ${l}`).join('\n')}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wipcomputer/wip-ldm-os",
-  "version": "0.4.73-alpha.17",
+  "version": "0.4.73-alpha.18",
   "type": "module",
   "description": "LDM OS: identity, memory, and sovereignty infrastructure for AI agents",
   "engines": {