@sdsrs/code-graph 0.8.1 → 0.8.3

package/README.md

@@ -146,6 +146,23 @@ Then reconnect the MCP server in Claude Code with `/mcp`.
 
 > **Note:** Auto-update is disabled in the source repo directory (dev mode). Use manual update when developing the plugin itself.
 
+#### Invited-memory mode (quieter prompts)
+
+By default, every user prompt the plugin deems code-related gets a small context injection from `code-graph` CLI output. If you'd rather rely on MEMORY.md + explicit tool calls, opt into invited-memory mode:
+
+1. Adopt the plugin contract into your project's memory index (idempotent, self-heals):
+   ```bash
+   code-graph-mcp adopt
+   ```
+   This writes `plugin_code_graph_mcp.md` (decision rules) into `~/.claude/projects/<slug>/memory/` and links it from `MEMORY.md` inside a sentinel block. Run `code-graph-mcp unadopt` to remove.
+2. Set the activation env var in `~/.claude/settings.json`:
+   ```json
+   {
+     "env": { "CODE_GRAPH_QUIET_HOOKS": "1" }
+   }
+   ```
+3. Restart Claude Code. Session startup skips the project-map injection, UserPromptSubmit stops auto-injecting context, and the MCP `instructions` become a short pointer to the MEMORY.md file.
+
 ### Option 2: Claude Code MCP Server Only
 
 Register as an MCP server without the plugin features:

package/claude-plugin/.claude-plugin/plugin.json

@@ -4,7 +4,7 @@
   "author": {
     "name": "sdsrs"
   },
-  "version": "0.8.1",
+  "version": "0.8.3",
   "keywords": [
     "code-graph",
     "ast",

package/claude-plugin/hooks/hooks.json

@@ -1,5 +1,54 @@
 {
-  "description": "code-graph-mcp hooks",
-  "_note": "Hooks are registered to ~/.claude/settings.json by scripts/lifecycle.js. This file is intentionally empty to prevent double-firing — Claude Code would otherwise load hooks from both the plugin cache copy AND settings.json, causing each hook to run twice per event.",
-  "hooks": {}
+  "description": "code-graph-mcp hooks — loaded directly by Claude Code from the plugin cache.",
+  "_note": "Authoritative source. settings.json is no longer used for hook registration as of v0.8.3 — session-init.js actively removes any legacy code-graph entries it finds there. Paths use ${CLAUDE_PLUGIN_ROOT} so they follow version directory updates automatically.",
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "startup|clear|compact",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/session-init.js\"",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": "tool == \"Edit\"",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/pre-edit-guide.js\"",
+            "timeout": 4
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "tool == \"Write\" || tool == \"Edit\"",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/incremental-index.js\"",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/user-prompt-context.js\"",
+            "timeout": 5
+          }
+        ]
+      }
+    ]
+  }
 }

package/claude-plugin/scripts/adopt.js

@@ -13,8 +13,11 @@ const INDEX_LINE = '- [code-graph-mcp](plugin_code_graph_mcp.md) — "谁调 X /
 const TEMPLATE_PATH = path.resolve(__dirname, '..', 'templates', 'plugin_code_graph_mcp.md');
 const TARGET_NAME = 'plugin_code_graph_mcp.md';
 
+// Claude Code slug convention: every non-alphanumeric-non-hyphen char → `-`.
+// `/mnt/data_ssd/dev/proj` → `-mnt-data-ssd-dev-proj`
+// `/home/sds/.claude/x`   → `-home-sds--claude-x`  (double-dash from `/.`)
 function memoryDir(cwd = process.cwd(), home = os.homedir()) {
-  const slug = cwd.replace(/\//g, '-');
+  const slug = cwd.replace(/[^a-zA-Z0-9-]/g, '-');
   return path.join(home, '.claude', 'projects', slug, 'memory');
 }
 

package/claude-plugin/scripts/adopt.test.js

@@ -26,6 +26,24 @@ test('memoryDir slugifies cwd path', () => {
   assert.strictEqual(dir, '/home/alice/.claude/projects/-home-alice-proj/memory');
 });
 
+test('memoryDir replaces underscores and dots (Claude Code slug convention)', () => {
+  // Real-world bug: /mnt/data_ssd/... needs data-ssd slug, not data_ssd
+  assert.strictEqual(
+    memoryDir('/mnt/data_ssd/dev/projects/code-graph-mcp', '/home/u'),
+    '/home/u/.claude/projects/-mnt-data-ssd-dev-projects-code-graph-mcp/memory'
+  );
+  // Hidden dirs: /home/sds/.claude/x → -home-sds--claude-x (double-dash)
+  assert.strictEqual(
+    memoryDir('/home/sds/.claude/x', '/home/sds'),
+    '/home/sds/.claude/projects/-home-sds--claude-x/memory'
+  );
+  // Preserves case and hyphens
+  assert.strictEqual(
+    memoryDir('/Users/Alice/my-Project_v2.1', '/'),
+    '/.claude/projects/-Users-Alice-my-Project-v2-1/memory'
+  );
+});
+
 test('adopt writes template and appends sentinel block when index absent', () => {
   const sb = makeSandbox();
   try {

package/claude-plugin/scripts/doctor.js

@@ -7,7 +7,7 @@ const os = require('os');
 const { readBinaryVersion, isDevMode, getNewestMtime } = require('./version-utils');
 const {
   getPluginVersion, readJson, healthCheck, CACHE_DIR,
-  findStalePluginHooksJson, clearStalePluginCacheHooks,
+  removeHooksFromSettings, isOurHookEntry, writeJsonAtomic,
 } = require('./lifecycle');
 const { findBinary, clearCache: clearBinaryCache } = require('./find-binary');
 
@@ -166,24 +166,40 @@ function runDiagnostics() {
     });
   }
 
-  // 7. Plugin cache hooks.json sanity — non-empty copies cause every hook to fire twice
+  // 7. Legacy hooks in settings.json — v0.8.2 and earlier wrote hooks there;
+  //    cache/<ver>/hooks/hooks.json is now authoritative. Duplicates cause
+  //    every hook to fire twice until settings.json is cleaned.
   try {
-    const stale = findStalePluginHooksJson();
-    if (stale.length === 0) {
-      results.push({ name: 'Plugin cache', status: 'ok', detail: 'no stale hooks.json' });
+    const SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+    const settings = readJson(SETTINGS_PATH) || {};
+    const legacyCount = countLegacyHookEntries(settings);
+    if (legacyCount === 0) {
+      results.push({ name: 'Legacy hooks', status: 'ok', detail: 'settings.json is clean' });
     } else {
       results.push({
-        name: 'Plugin cache',
+        name: 'Legacy hooks',
         status: 'warn',
-        detail: `${stale.length} stale hooks.json (hooks fire twice per event)`,
-        fixId: 'hooks-cache-stale',
+        detail: `${legacyCount} entries in settings.json (fire twice per event)`,
+        fixId: 'legacy-hooks-in-settings',
       });
     }
-  } catch { /* lifecycle probe failed — skip */ }
+  } catch { /* probe failed — skip */ }
 
   return results;
 }
 
+function countLegacyHookEntries(settings) {
+  if (!settings || !settings.hooks) return 0;
+  let count = 0;
+  for (const entries of Object.values(settings.hooks)) {
+    if (!Array.isArray(entries)) continue;
+    for (const entry of entries) {
+      if (isOurHookEntry(entry)) count++;
+    }
+  }
+  return count;
+}
+
 // ── Report Formatting ─────────────────────────────────────
 
 const STATUS_ICONS = { ok: '\u2705', warn: '\u26a0\ufe0f', error: '\u274c', skip: '\u2796' };
@@ -339,12 +355,17 @@ function runRepairs(results) {
         break;
       }
 
-      case 'hooks-cache-stale': {
-        console.log('\n  Clearing stale plugin cache hooks.json...');
-        const cleared = clearStalePluginCacheHooks();
-        console.log(`  \u2705 Cleared ${cleared.length} file(s) — restart Claude Code to apply`);
-        for (const p of cleared) console.log(`     - ${p}`);
-        fixed++;
+      case 'legacy-hooks-in-settings': {
+        console.log('\n  Removing legacy code-graph hooks from settings.json...');
+        const SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+        const settings = readJson(SETTINGS_PATH) || {};
+        if (removeHooksFromSettings(settings)) {
+          writeJsonAtomic(SETTINGS_PATH, settings);
+          console.log('  \u2705 settings.json cleaned — restart Claude Code to apply');
+          fixed++;
+        } else {
+          console.log('  \u2796 No legacy entries found');
+        }
         break;
       }
 

package/claude-plugin/scripts/lifecycle.js

@@ -220,92 +220,12 @@ function migrateOldPluginIds(settings) {
   return changed;
 }
 
-// --- Plugin-cache hooks.json guard ---
-// Claude Code loads hooks from TWO places: settings.json AND the plugin cache
-// at ~/.claude/plugins/cache/<mp>/<plugin>/<ver>/hooks/hooks.json. If both have
-// our hooks, every event fires twice. We register to settings.json (reliable),
-// so cache copies must stay empty. Auto-updates can re-populate cache hooks.json
-// from the marketplace source — this scan+clear runs on every install/update and
-// every SessionStart (via session-init.js) as a second layer of defense.
-
-const EMPTY_HOOKS_STUB = Object.freeze({
-  description: 'code-graph-mcp hooks',
-  _note: 'Hooks are registered to ~/.claude/settings.json by lifecycle.js. Cleared automatically to prevent double-firing.',
-  hooks: {},
-});
-
-function isOurPluginMarketplace(mpDir) {
-  try {
-    const meta = readJson(path.join(mpDir, '.claude-plugin', 'marketplace.json'));
-    if (meta && meta.name === MARKETPLACE_NAME) return true;
-  } catch { /* fallthrough */ }
-  return path.basename(mpDir) === MARKETPLACE_NAME;
-}
-
-function scanPluginHooksJsonCopies() {
-  const HOME = os.homedir();
-  const paths = [];
-
-  // Marketplace source (git-cloned by Claude Code on install)
-  const mpRoot = path.join(HOME, '.claude', 'plugins', 'marketplaces');
-  try {
-    for (const name of fs.readdirSync(mpRoot)) {
-      const mpDir = path.join(mpRoot, name);
-      try { if (!fs.statSync(mpDir).isDirectory()) continue; } catch { continue; }
-      if (!isOurPluginMarketplace(mpDir)) continue;
-      const p = path.join(mpDir, 'claude-plugin', 'hooks', 'hooks.json');
-      if (fs.existsSync(p)) paths.push(p);
-    }
-  } catch { /* no marketplaces dir */ }
-
-  // Cache (what Claude Code actually loads at runtime), per plugin + per version
-  const cacheRoot = path.join(HOME, '.claude', 'plugins', 'cache', MARKETPLACE_NAME);
-  try {
-    for (const pluginName of fs.readdirSync(cacheRoot)) {
-      const pluginDir = path.join(cacheRoot, pluginName);
-      try { if (!fs.statSync(pluginDir).isDirectory()) continue; } catch { continue; }
-      for (const ver of fs.readdirSync(pluginDir)) {
-        const verDir = path.join(pluginDir, ver);
-        try { if (!fs.statSync(verDir).isDirectory()) continue; } catch { continue; }
-        const p = path.join(verDir, 'hooks', 'hooks.json');
-        if (fs.existsSync(p)) paths.push(p);
-      }
-    }
-  } catch { /* no cache dir */ }
-
-  return paths;
-}
-
-function findStalePluginHooksJson() {
-  const stale = [];
-  for (const p of scanPluginHooksJsonCopies()) {
-    try {
-      const cur = readJson(p);
-      if (cur && cur.hooks && typeof cur.hooks === 'object' && Object.keys(cur.hooks).length > 0) {
-        stale.push(p);
-      }
-    } catch { /* unreadable — skip */ }
-  }
-  return stale;
-}
-
-function clearStalePluginCacheHooks() {
-  const cleared = [];
-  const stamp = new Date().toISOString();
-  for (const p of findStalePluginHooksJson()) {
-    try {
-      const stub = { ...EMPTY_HOOKS_STUB, _note: `${EMPTY_HOOKS_STUB._note} (cleared ${stamp})` };
-      writeJsonAtomic(p, stub);
-      cleared.push(p);
-    } catch { /* write failure — skip */ }
-  }
-  return cleared;
-}
-
-// --- Hook Registration ---
-// Plugin system's hooks.json auto-loading is unreliable (observed across GSD,
-// superpowers, code-graph-mcp). Write hooks directly to settings.json instead.
-// Same strategy as claude-mem-lite. hooks.json is kept empty to prevent double-firing.
+// --- Hook identity ---
+// Claude Code loads hooks from cache/<mp>/<plugin>/<ver>/hooks/hooks.json —
+// that file is the authoritative source. Any entries matching our hooks
+// inside settings.json are legacy migration debris (v0.8.2 and earlier wrote
+// there) and must be stripped on every install/update/session-init so events
+// don't fire twice.
 
 const OUR_HOOK_SCRIPTS = ['session-init.js', 'incremental-index.js', 'user-prompt-context.js', 'pre-edit-guide.js'];
 const OUR_DESCRIPTIONS = [
@@ -317,69 +237,15 @@ const OUR_DESCRIPTIONS = [
 
 function isOurHookEntry(entry) {
   if (!entry || !entry.hooks) return false;
-  // Primary: match by description (immune to path pollution)
+  // Primary: match by description (legacy v0.7.x/0.8.x registrations).
   if (entry.description && OUR_DESCRIPTIONS.includes(entry.description)) return true;
-  // Fallback: match by script name + 'code-graph' in path
+  // Fallback: match by script name + 'code-graph' in path.
   return entry.hooks.some(h =>
     h.command && OUR_HOOK_SCRIPTS.some(s => h.command.includes(s)) &&
     h.command.includes('code-graph')
   );
 }
 
-function hookCommand(scriptName) {
-  return `node ${JSON.stringify(path.join(PLUGIN_ROOT, 'scripts', scriptName))}`;
-}
-
-function getHookDefinitions() {
-  return {
-    SessionStart: [{
-      matcher: 'startup|clear|compact',
-      hooks: [{ type: 'command', command: hookCommand('session-init.js'), timeout: 5 }],
-      description: 'StatusLine self-heal, lifecycle sync, project map injection',
-    }],
-    PreToolUse: [{
-      matcher: 'tool == "Edit"',
-      hooks: [{ type: 'command', command: hookCommand('pre-edit-guide.js'), timeout: 4 }],
-      description: 'Auto-inject impact analysis when editing functions with 2+ callers',
-    }],
-    PostToolUse: [{
-      matcher: 'tool == "Write" || tool == "Edit"',
-      hooks: [{ type: 'command', command: hookCommand('incremental-index.js'), timeout: 10 }],
-      description: 'Auto-update code graph index after file edits',
-    }],
-    UserPromptSubmit: [{
-      matcher: '',
-      hooks: [{ type: 'command', command: hookCommand('user-prompt-context.js'), timeout: 5 }],
-      description: 'Inject code-graph structural context based on user intent',
-    }],
-  };
-}
-
-function registerHooksToSettings(settings) {
-  if (!settings.hooks) settings.hooks = {};
-  const defs = getHookDefinitions();
-  let changed = false;
-
-  for (const [event, newEntries] of Object.entries(defs)) {
-    if (!settings.hooks[event]) settings.hooks[event] = [];
-
-    // First, remove ALL existing entries that match ours (cleans up duplicates
-    // from prior PLUGIN_ROOT pollution where isOurHookEntry couldn't match,
-    // causing infinite re-adds each session).
-    const beforeLen = settings.hooks[event].length;
-    settings.hooks[event] = settings.hooks[event].filter(e => !isOurHookEntry(e));
-    if (settings.hooks[event].length !== beforeLen) changed = true;
-
-    // Then add our entries fresh with correct paths
-    for (const newEntry of newEntries) {
-      settings.hooks[event].push(newEntry);
-      changed = true;
-    }
-  }
-
-  return changed;
-}
-
 function removeHooksFromSettings(settings) {
   if (!settings.hooks) return false;
   let changed = false;
@@ -434,10 +300,11 @@ function install() {
   // Register code-graph provider
   registerStatuslineProvider('code-graph', codeGraphStatuslineCommand(), false);
 
-  // 2. Hooks — register to settings.json (hooks.json auto-loading unreliable)
-  if (registerHooksToSettings(settings)) {
-    settingsChanged = true;
-  }
+  // 2. Hooks — cache/<ver>/hooks/hooks.json is authoritative. Strip any legacy
+  //    entries from settings.json that v0.8.2 or earlier registered, so events
+  //    don't fire twice.
+  const legacyHooksRemoved = removeHooksFromSettings(settings);
+  if (legacyHooksRemoved) settingsChanged = true;
 
   // NOTE: enabledPlugins is managed by Claude Code's plugin system, not by lifecycle.
   // Do NOT add enabledPlugins entries here — it causes phantom plugin entries
@@ -448,17 +315,13 @@ function install() {
     writeJsonAtomic(SETTINGS_PATH, settings);
   }
 
-  // 3b. Clear cache/marketplace hooks.json copies after settings.json is authoritative,
-  //     so next session only fires hooks from settings.json (no double-firing).
-  const clearedHookCopies = clearStalePluginCacheHooks();
-
   // 4. Write manifest with version
   manifest.version = version;
   manifest.installedAt = manifest.installedAt || new Date().toISOString();
   manifest.updatedAt = new Date().toISOString();
   writeManifest(manifest);
 
-  return { version, settingsChanged, statusLineClaimed: manifest.config.statusLine, clearedHookCopies };
+  return { version, settingsChanged, statusLineClaimed: manifest.config.statusLine, legacyHooksRemoved };
 }
 
 // --- Uninstall (clean all config) ---
@@ -549,10 +412,10 @@ function update() {
   // 2. Update code-graph provider in registry
   registerStatuslineProvider('code-graph', codeGraphStatuslineCommand(), false);
 
-  // 3. Hooks — update command paths
-  if (registerHooksToSettings(settings)) {
-    settingsChanged = true;
-  }
+  // 3. Hooks — strip any legacy entries from settings.json. cache hooks.json
+  //    is the new authoritative source and always has the up-to-date paths.
+  const legacyHooksRemoved = removeHooksFromSettings(settings);
+  if (legacyHooksRemoved) settingsChanged = true;
 
   // NOTE: enabledPlugins is managed by Claude Code's plugin system, not by lifecycle.
 
@@ -561,10 +424,6 @@ function update() {
     writeJsonAtomic(SETTINGS_PATH, settings);
   }
 
-  // 4b. Clear cache/marketplace hooks.json copies after settings.json is updated.
-  //     Auto-update can re-populate cache from marketplace source; stamp it out.
-  const clearedHookCopies = clearStalePluginCacheHooks();
-
   // 5. Clear update-check cache (force re-check after update)
   const updateCache = path.join(CACHE_DIR, 'update-check');
   try { fs.unlinkSync(updateCache); } catch { /* ok */ }
@@ -574,10 +433,12 @@ function update() {
   manifest.updatedAt = new Date().toISOString();
   writeManifest(manifest);
 
-  // 7. Clean up old cached versions (keep latest 3)
+  // 7. Clean up old cached versions (keep latest 3). Claude Code only fires
+  //    hooks from the active version (per installed_plugins.json), so older
+  //    cache dirs are inert disk clutter, not correctness risks.
   cleanupOldCacheVersions(3);
 
-  return { oldVersion, version, settingsChanged, clearedHookCopies };
+  return { oldVersion, version, settingsChanged, legacyHooksRemoved };
 }
 
 /**
@@ -673,8 +534,7 @@ module.exports = {
   readManifest, readJson, writeJsonAtomic,
   readRegistry, writeRegistry,
   getPluginVersion, cleanupOldCacheVersions,
-  registerHooksToSettings, removeHooksFromSettings, getHookDefinitions,
-  scanPluginHooksJsonCopies, findStalePluginHooksJson, clearStalePluginCacheHooks,
+  removeHooksFromSettings, isOurHookEntry,
   PLUGIN_ID, OLD_PLUGIN_IDS, MARKETPLACE_NAME, CACHE_DIR, REGISTRY_FILE,
 };
 
@@ -687,6 +547,7 @@ if (require.main === module) {
   } else if (cmd === 'uninstall') {
     const r = uninstall();
     console.log(`Uninstalled | settings cleaned=${r.settingsChanged}`);
+    console.log('  Note: also run `/plugin uninstall code-graph-mcp` inside Claude Code to sync its UI state.');
   } else if (cmd === 'update') {
     const r = update();
     console.log(`Updated ${r.oldVersion} → ${r.version} | settings=${r.settingsChanged}`);

package/claude-plugin/scripts/lifecycle.test.js

@@ -96,80 +96,102 @@ test('cleanupDisabledStatusline also heals orphaned statusline after uninstall',
   assert.equal(fs.existsSync(registryPath), false);
 });
 
-function nonEmptyHooksJson() {
+function legacyHooksFromPlugin() {
   return {
-    hooks: {
-      SessionStart: [{
-        matcher: 'startup',
-        hooks: [{ type: 'command', command: 'node "/plugin/session-init.js"' }],
-      }],
-    },
+    SessionStart: [{
+      matcher: 'startup|clear|compact',
+      description: 'StatusLine self-heal, lifecycle sync, project map injection',
+      hooks: [{ type: 'command', command: 'node "/stale/cache/0.8.2/claude-plugin/scripts/session-init.js"', timeout: 5 }],
+    }],
+    PostToolUse: [{
+      matcher: 'tool == "Write" || tool == "Edit"',
+      description: 'Auto-update code graph index after file edits',
+      hooks: [{ type: 'command', command: 'node "/stale/code-graph/incremental-index.js"', timeout: 10 }],
+    }],
   };
 }
 
-test('findStalePluginHooksJson detects non-empty cache and marketplace copies', () => {
-  const homeDir = mkHome();
-  const mpHooks = path.join(homeDir, '.claude', 'plugins', 'marketplaces', 'code-graph-mcp', 'claude-plugin', 'hooks', 'hooks.json');
-  const mpManifest = path.join(homeDir, '.claude', 'plugins', 'marketplaces', 'code-graph-mcp', '.claude-plugin', 'marketplace.json');
-  const cacheHooks = path.join(homeDir, '.claude', 'plugins', 'cache', 'code-graph-mcp', 'code-graph-mcp', '0.7.17', 'hooks', 'hooks.json');
-
-  writeJson(mpManifest, { name: 'code-graph-mcp' });
-  writeJson(mpHooks, nonEmptyHooksJson());
-  writeJson(cacheHooks, nonEmptyHooksJson());
-
+test('isOurHookEntry matches legacy description-tagged entries', () => {
+  const entry = legacyHooksFromPlugin().SessionStart[0];
   const out = execFileSync(process.execPath, ['-e', `
-    const { findStalePluginHooksJson } = require(${JSON.stringify(lifecyclePath)});
-    process.stdout.write(JSON.stringify(findStalePluginHooksJson()));
-  `], { env: { ...process.env, HOME: homeDir } }).toString();
-
-  const stale = JSON.parse(out).sort();
-  assert.equal(stale.length, 2);
-  assert.ok(stale.some(p => p === mpHooks));
-  assert.ok(stale.some(p => p === cacheHooks));
+    const { isOurHookEntry } = require(${JSON.stringify(lifecyclePath)});
+    process.stdout.write(JSON.stringify(isOurHookEntry(${JSON.stringify(entry)})));
+  `]).toString();
+  assert.equal(JSON.parse(out), true);
 });
 
-test('clearStalePluginCacheHooks empties non-empty hooks.json copies', () => {
-  const homeDir = mkHome();
-  const cacheHooks = path.join(homeDir, '.claude', 'plugins', 'cache', 'code-graph-mcp', 'code-graph-mcp', '0.7.17', 'hooks', 'hooks.json');
-  writeJson(cacheHooks, nonEmptyHooksJson());
-
+test('isOurHookEntry matches script-name + path fallback (missing description)', () => {
+  const entry = {
+    matcher: 'tool == "Edit"',
+    hooks: [{ type: 'command', command: 'node "/cache/code-graph-mcp/scripts/pre-edit-guide.js"' }],
+  };
   const out = execFileSync(process.execPath, ['-e', `
-    const { clearStalePluginCacheHooks } = require(${JSON.stringify(lifecyclePath)});
-    process.stdout.write(JSON.stringify(clearStalePluginCacheHooks()));
-  `], { env: { ...process.env, HOME: homeDir } }).toString();
-
-  const cleared = JSON.parse(out);
-  assert.deepEqual(cleared, [cacheHooks]);
+    const { isOurHookEntry } = require(${JSON.stringify(lifecyclePath)});
+    process.stdout.write(JSON.stringify(isOurHookEntry(${JSON.stringify(entry)})));
+  `]).toString();
+  assert.equal(JSON.parse(out), true);
+});
 
-  const payload = JSON.parse(fs.readFileSync(cacheHooks, 'utf8'));
-  assert.deepEqual(payload.hooks, {});
-  assert.ok(payload._note && payload._note.includes('cleared'));
+test('isOurHookEntry leaves unrelated entries alone', () => {
+  const entry = {
+    matcher: 'startup',
+    description: 'some other plugin hook',
+    hooks: [{ type: 'command', command: 'node /some/other/script.js' }],
+  };
+  const out = execFileSync(process.execPath, ['-e', `
+    const { isOurHookEntry } = require(${JSON.stringify(lifecyclePath)});
+    process.stdout.write(JSON.stringify(isOurHookEntry(${JSON.stringify(entry)})));
+  `]).toString();
+  assert.equal(JSON.parse(out), false);
 });
 
-test('clearStalePluginCacheHooks is idempotent and skips already-empty copies', () => {
-  const homeDir = mkHome();
-  const cacheHooks = path.join(homeDir, '.claude', 'plugins', 'cache', 'code-graph-mcp', 'code-graph-mcp', '0.7.17', 'hooks', 'hooks.json');
-  writeJson(cacheHooks, { hooks: {} });
+test('removeHooksFromSettings strips our entries but keeps unrelated hooks', () => {
+  const settings = {
+    hooks: {
+      SessionStart: [
+        legacyHooksFromPlugin().SessionStart[0],
+        {
+          matcher: 'startup',
+          description: 'some other plugin hook',
+          hooks: [{ type: 'command', command: 'node /some/other/script.js' }],
+        },
+      ],
+      PostToolUse: [legacyHooksFromPlugin().PostToolUse[0]],
+    },
+  };
 
   const out = execFileSync(process.execPath, ['-e', `
-    const { clearStalePluginCacheHooks } = require(${JSON.stringify(lifecyclePath)});
-    process.stdout.write(JSON.stringify(clearStalePluginCacheHooks()));
-  `], { env: { ...process.env, HOME: homeDir } }).toString();
-
-  assert.deepEqual(JSON.parse(out), []);
+    const { removeHooksFromSettings } = require(${JSON.stringify(lifecyclePath)});
+    const s = ${JSON.stringify(settings)};
+    const changed = removeHooksFromSettings(s);
+    process.stdout.write(JSON.stringify({ changed, s }));
+  `]).toString();
+
+  const { changed, s } = JSON.parse(out);
+  assert.equal(changed, true);
+  // Only the unrelated SessionStart entry remains; PostToolUse removed entirely.
+  assert.equal(s.hooks.SessionStart.length, 1);
+  assert.equal(s.hooks.SessionStart[0].description, 'some other plugin hook');
+  assert.ok(!s.hooks.PostToolUse, 'empty event key should be deleted');
 });
 
-test('scanPluginHooksJsonCopies ignores unrelated marketplaces', () => {
+test('install() removes legacy code-graph hooks from settings.json without re-registering', () => {
   const homeDir = mkHome();
-  const otherMp = path.join(homeDir, '.claude', 'plugins', 'marketplaces', 'some-other-plugin', 'claude-plugin', 'hooks', 'hooks.json');
-  const otherManifest = path.join(homeDir, '.claude', 'plugins', 'marketplaces', 'some-other-plugin', '.claude-plugin', 'marketplace.json');
-  writeJson(otherManifest, { name: 'some-other-plugin' });
-  writeJson(otherMp, nonEmptyHooksJson());
+  const settingsPath = path.join(homeDir, '.claude', 'settings.json');
+  writeJson(settingsPath, {
+    statusLine: { type: 'command', command: 'echo previous-status' },
+    hooks: legacyHooksFromPlugin(),
+  });
 
-  const out = execFileSync(process.execPath, ['-e', `
-    const { scanPluginHooksJsonCopies } = require(${JSON.stringify(lifecyclePath)});
-    process.stdout.write(JSON.stringify(scanPluginHooksJsonCopies()));
-  `], { env: { ...process.env, HOME: homeDir } }).toString();
+  execFileSync(process.execPath, [lifecyclePath, 'install'], {
+    env: { ...process.env, HOME: homeDir },
+  });
 
-  assert.deepEqual(JSON.parse(out), []);
+  const after = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+  // No code-graph hook entries should remain — cache hooks.json is authoritative now.
+  const serialized = JSON.stringify(after.hooks || {});
+  assert.ok(!serialized.includes('code-graph'), 'settings.json must not retain code-graph hook entries');
+  assert.ok(!serialized.includes('session-init.js'), 'settings.json must not retain session-init.js paths');
+  // StatusLine composite is still registered (only channel available).
+  assert.match(after.statusLine.command, /statusline-composite/);
 });

package/claude-plugin/scripts/session-init.js

@@ -7,7 +7,6 @@ const fs = require('fs');
 const {
   install, update, readManifest, getPluginVersion, checkScopeConflict,
   cleanupDisabledStatusline, isPluginInactive, readJson, CACHE_DIR,
-  clearStalePluginCacheHooks, findStalePluginHooksJson,
 } = require('./lifecycle');
 const { readBinaryVersion, isDevMode, getNewestMtime } = require('./version-utils');
 
@@ -227,30 +226,6 @@ function consistencyCheck(binary) {
   return issues;
 }
 
-/**
- * Self-heal: Claude Code auto-update can re-populate cache hooks.json from the
- * marketplace source, which would double-fire every hook we registered to
- * settings.json. If our hooks are already in settings.json (install has run),
- * any non-empty cache/marketplace hooks.json is stale — clear it.
- * Gated on settings.json registration so pure plugin-only users (no install
- * script run; cache hooks.json is their only registration) are not broken.
- */
-function healStaleCacheHooks() {
-  try {
-    const settings = readJson(path.join(os.homedir(), '.claude', 'settings.json')) || {};
-    const manifest = readManifest();
-    if (!manifest || !manifest.version) return { checked: false, cleared: 0 };
-    const serialized = JSON.stringify(settings.hooks || {});
-    if (!serialized.includes('code-graph')) return { checked: false, cleared: 0 };
-    const stale = findStalePluginHooksJson();
-    if (stale.length === 0) return { checked: true, cleared: 0 };
-    const cleared = clearStalePluginCacheHooks();
-    return { checked: true, cleared: cleared.length };
-  } catch {
-    return { checked: false, cleared: 0 };
-  }
-}
-
 function runSessionInit() {
   if (isPluginInactive()) {
     cleanupDisabledStatusline();
@@ -267,11 +242,6 @@ function runSessionInit() {
 
   const lifecycle = syncLifecycleConfig();
 
-  // Self-heal stale plugin cache hooks.json (prevents double-firing after auto-update).
-  // syncLifecycleConfig's install/update path already clears; this catches the
-  // 'noop' case where version matches but cache was re-populated externally.
-  const cacheHookHeal = healStaleCacheHooks();
-
   // Verify binary availability — catch issues early with actionable diagnostics
   const binaryCheck = verifyBinary();
 
@@ -285,7 +255,7 @@ function runSessionInit() {
     ? consistencyCheck(binaryCheck.binary)
     : [];
   return {
-    inactive: false, lifecycle, cacheHookHeal,
+    inactive: false, lifecycle,
     autoUpdateLaunched, indexFreshness, mapInjected, binaryCheck, consistencyIssues,
     quietHooks,
   };
@@ -327,7 +297,6 @@ module.exports = {
   injectProjectMap,
   verifyBinary,
   consistencyCheck,
-  healStaleCacheHooks,
   runSessionInit,
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "MCP server that indexes codebases into an AST knowledge graph with semantic search, call graph traversal, and HTTP route tracing",
   "license": "MIT",
   "repository": {
@@ -34,10 +34,10 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "@sdsrs/code-graph-linux-x64": "0.8.1",
-    "@sdsrs/code-graph-linux-arm64": "0.8.1",
-    "@sdsrs/code-graph-darwin-x64": "0.8.1",
-    "@sdsrs/code-graph-darwin-arm64": "0.8.1",
-    "@sdsrs/code-graph-win32-x64": "0.8.1"
+    "@sdsrs/code-graph-linux-x64": "0.8.3",
+    "@sdsrs/code-graph-linux-arm64": "0.8.3",
+    "@sdsrs/code-graph-darwin-x64": "0.8.3",
+    "@sdsrs/code-graph-darwin-arm64": "0.8.3",
+    "@sdsrs/code-graph-win32-x64": "0.8.3"
   }
 }