fix(hooks): self-heal updates ALL hook types, not just PreToolUse (mksglu#187)

mksglu · claude · mksglu · commit 25868eaf4280 · 2026-03-28T21:47:33.000+03:00
Extend the pretooluse.mjs self-heal to iterate all hook types in
settings.json (SessionStart, PostToolUse, PreCompact, UserPromptSubmit)
instead of only fixing PreToolUse paths. After marketplace auto-update,
all stale context-mode hook paths are now corrected on first tool call.

Previously, SessionStart would fail with "hook error" because its path
still pointed to the deleted old version directory, and the self-heal
only fixed PreToolUse paths.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/hooks/pretooluse.mjs b/hooks/pretooluse.mjs
@@ -87,28 +87,40 @@ try {
       writeFileSync(ipPath, JSON.stringify(ip, null, 2) + "\n", "utf-8");
     }
 
-    // 3. Update hook path + matcher in settings.json
+    // 3. Update hook paths + matcher in settings.json for ALL hook types (#187)
+    //    Previously only fixed PreToolUse — SessionStart, PostToolUse, PreCompact,
+    //    UserPromptSubmit paths remained stale after marketplace auto-update.
     const settingsPath = resolve(homedir(), ".claude", "settings.json");
     try {
       const settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-      const hooks = settings.hooks?.PreToolUse;
-      if (Array.isArray(hooks)) {
-        let changed = false;
-        for (const entry of hooks) {
-          // Fix deprecated Task-only matcher → Agent|Task
-          if (entry.matcher && entry.matcher.includes("Task") && !entry.matcher.includes("Agent")) {
+      const allHooks = settings.hooks || {};
+      let changed = false;
+
+      for (const hookType of Object.keys(allHooks)) {
+        const entries = allHooks[hookType];
+        if (!Array.isArray(entries)) continue;
+
+        for (const entry of entries) {
+          // Fix deprecated Task-only matcher (PreToolUse only)
+          if (hookType === "PreToolUse" && entry.matcher?.includes("Task") && !entry.matcher.includes("Agent")) {
             entry.matcher = entry.matcher.replace("Task", "Agent|Task");
             changed = true;
           }
+          // Rewrite stale context-mode hook paths to point to current version
           for (const h of (entry.hooks || [])) {
-            if (h.command?.includes("pretooluse.mjs") && !h.command.includes(targetDir)) {
-              h.command = "node " + resolve(targetDir, "hooks", "pretooluse.mjs");
-              changed = true;
+            if (h.command && h.command.includes(".mjs") && h.command.includes("context-mode") && !h.command.includes(targetDir)) {
+              // Extract the script filename (e.g., sessionstart.mjs, pretooluse.mjs)
+              const scriptMatch = h.command.match(/([a-z]+\.mjs)\s*"?\s*$/);
+              if (scriptMatch) {
+                h.command = "node " + resolve(targetDir, "hooks", scriptMatch[1]);
+                changed = true;
+              }
             }
           }
         }
-        if (changed) writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
       }
+
+      if (changed) writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
     } catch { /* skip settings update */ }
 
     // Old version dirs are cleaned lazily by sessionstart.mjs (age-gated >1h)
diff --git a/tests/core/cli.test.ts b/tests/core/cli.test.ts
@@ -790,3 +790,32 @@ describe("Hidden temp dirs (#186)", () => {
     expect(EXEC_SOURCE).not.toMatch(/tmpdir\(\),\s*"ctx-mode-"/);
   });
 });
+
+// ── Issue #187 follow-up: self-heal must fix ALL hook types, not just PreToolUse ──
+
+describe("Self-heal covers all hook types (#187)", () => {
+  const PRETOOLUSE_SOURCE = readFileSync(resolve(ROOT, "hooks/pretooluse.mjs"), "utf-8");
+
+  test("pretooluse.mjs self-heal iterates all hook types in settings.json", () => {
+    // Must NOT be scoped to only PreToolUse
+    // Old pattern: settings.hooks?.PreToolUse (only one type)
+    // New pattern: iterates Object.keys(settings.hooks) or similar
+    const selfHealSection = PRETOOLUSE_SOURCE.slice(
+      PRETOOLUSE_SOURCE.indexOf("Update hook path"),
+      PRETOOLUSE_SOURCE.indexOf("lazy cleanup"),
+    );
+    // Must iterate all hook types, not just PreToolUse
+    expect(selfHealSection).not.toContain("hooks?.PreToolUse");
+    expect(selfHealSection).toMatch(/Object\.keys|for\s*\(\s*const\s+\w+\s+(of|in)\s+.*hooks/);
+  });
+
+  test("pretooluse.mjs self-heal fixes all context-mode hook scripts", () => {
+    const selfHealSection = PRETOOLUSE_SOURCE.slice(
+      PRETOOLUSE_SOURCE.indexOf("Update hook path"),
+      PRETOOLUSE_SOURCE.indexOf("lazy cleanup"),
+    );
+    // Must match any .mjs hook script, not just pretooluse.mjs
+    expect(selfHealSection).toMatch(/\.mjs/);
+    expect(selfHealSection).toContain("context-mode");
+  });
+});
