@sdsrs/code-graph 0.29.0 → 0.31.0

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

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

package/claude-plugin/scripts/adopt.js

@@ -269,9 +269,14 @@ 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 `/.`)
+//
+// `home` is the OS home dir (default `os.homedir()`). When `CLAUDE_CONFIG_DIR`
+// is set it overrides `home/.claude`, so multi-account users (personal vs work)
+// land in the directory Claude Code itself is using for `projects/`.
 function memoryDir(cwd = process.cwd(), home = os.homedir()) {
   const slug = cwd.replace(/[^a-zA-Z0-9-]/g, '-');
-  return path.join(home, '.claude', 'projects', slug, 'memory');
+  const claudeDir = process.env.CLAUDE_CONFIG_DIR || path.join(home, '.claude');
+  return path.join(claudeDir, 'projects', slug, 'memory');
 }
 
 function escapeRegex(s) {
@@ -421,9 +426,17 @@ function needsRefresh({ cwd, home, templatePath } = {}) {
 // 检测脚本是否从 Claude Code 插件 cache 运行。
 // 走 __dirname 而非 CLAUDE_PLUGIN_ROOT — 后者在多插件共存时会互相污染
 // （见 feedback_plugin_env_isolation.md）。
+// 默认匹配 `.claude/plugins/` 路径；CLAUDE_CONFIG_DIR 自定义目录时
+// 走 startsWith(CLAUDE_CONFIG_DIR/plugins/) 兜底。
 function isPluginModeInstall(scriptPath = __dirname) {
   const sep = path.sep;
-  return scriptPath.includes(`${sep}.claude${sep}plugins${sep}`);
+  if (scriptPath.includes(`${sep}.claude${sep}plugins${sep}`)) return true;
+  const envDir = process.env.CLAUDE_CONFIG_DIR;
+  if (envDir) {
+    const marker = path.join(envDir, 'plugins') + sep;
+    if (scriptPath.startsWith(marker)) return true;
+  }
+  return false;
 }
 
 // C' 上下文感知默认（v0.9.0）：插件模式下首次 SessionStart 静默 adopt。

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

@@ -278,6 +278,44 @@ test('isPluginModeInstall rejects npx cache paths', () => {
   assert.strictEqual(isPluginModeInstall(npxPath), false);
 });
 
+test('memoryDir honors CLAUDE_CONFIG_DIR override (multi-account isolation)', () => {
+  const prev = process.env.CLAUDE_CONFIG_DIR;
+  process.env.CLAUDE_CONFIG_DIR = '/home/alice/work-claude';
+  try {
+    // home arg is irrelevant when env var is set — projects live under the
+    // configured claude dir, not home/.claude.
+    assert.strictEqual(
+      memoryDir('/home/alice/proj', '/home/alice'),
+      '/home/alice/work-claude/projects/-home-alice-proj/memory'
+    );
+  } finally {
+    if (prev === undefined) delete process.env.CLAUDE_CONFIG_DIR;
+    else process.env.CLAUDE_CONFIG_DIR = prev;
+  }
+});
+
+test('isPluginModeInstall recognizes CLAUDE_CONFIG_DIR/plugins/... paths', () => {
+  const prev = process.env.CLAUDE_CONFIG_DIR;
+  process.env.CLAUDE_CONFIG_DIR = '/home/alice/work-claude';
+  try {
+    const pluginPath = '/home/alice/work-claude/plugins/cache/code-graph-mcp@0.31.0/scripts';
+    assert.strictEqual(isPluginModeInstall(pluginPath), true);
+    // Legacy ~/.claude/plugins/ path still works even with env var set.
+    assert.strictEqual(
+      isPluginModeInstall('/home/user/.claude/plugins/cache/code-graph-mcp/scripts'),
+      true
+    );
+    // Unrelated path under same prefix is still rejected.
+    assert.strictEqual(
+      isPluginModeInstall('/home/alice/work-claude/projects/foo/memory'),
+      false
+    );
+  } finally {
+    if (prev === undefined) delete process.env.CLAUDE_CONFIG_DIR;
+    else process.env.CLAUDE_CONFIG_DIR = prev;
+  }
+});
+
 test('maybeAutoAdopt skips when CODE_GRAPH_NO_AUTO_ADOPT=1', () => {
   const sb = makeSandbox();
   try {

package/claude-plugin/scripts/auto-update.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const https = require('https');
 const path = require('path');
 const os = require('os');
-const { CACHE_DIR, PLUGIN_ID, MARKETPLACE_NAME, readManifest, readJson, writeJsonAtomic } = require('./lifecycle');
+const { CACHE_DIR, PLUGIN_ID, MARKETPLACE_NAME, readManifest, readJson, writeJsonAtomic, installedPluginsPath, pluginsCacheDir } = require('./lifecycle');
 const { clearCache: clearBinaryCache } = require('./find-binary');
 const { readBinaryVersion, isDevMode } = require('./version-utils');
 
@@ -272,7 +272,7 @@ async function downloadAndInstall(latest) {
 
     const pluginSrc = path.join(tmpDir, 'claude-plugin');
     const pluginDst = path.join(
-      os.homedir(), '.claude', 'plugins', 'cache', MARKETPLACE_NAME, 'code-graph-mcp', latest.version
+      pluginsCacheDir(), MARKETPLACE_NAME, 'code-graph-mcp', latest.version
     );
 
     if (fs.existsSync(pluginSrc) && getExtractedPluginVersion(pluginSrc) === latest.version) {
@@ -282,7 +282,7 @@ async function downloadAndInstall(latest) {
     }
 
     // Update installed_plugins.json to point to new version
-    const installedPath = path.join(os.homedir(), '.claude', 'plugins', 'installed_plugins.json');
+    const installedPath = installedPluginsPath();
     try {
       const installed = readJson(installedPath);
       if (installed && installed.plugins && installed.plugins[PLUGIN_ID]) {

package/claude-plugin/scripts/claude-config.js

@@ -0,0 +1,21 @@
+'use strict';
+const path = require('path');
+const os = require('os');
+
+// Resolve Claude Code's config directory. Honors CLAUDE_CONFIG_DIR — when set
+// (commonly used to keep multiple accounts isolated, e.g. personal vs work),
+// Claude Code reads `settings.json`, `plugins/`, `projects/`, etc. from there
+// instead of `~/.claude/`. Our plugin must follow the same override so its
+// hook registrations, statusline, adoption files, and cache cleanup land in
+// the directory Claude Code is actually using.
+//
+// Read fresh on every call so per-process env mutation (tests, child procs
+// spawned with a different env) takes effect immediately. Unlike
+// CLAUDE_PLUGIN_ROOT (which leaks across plugins — see
+// feedback_plugin_env_isolation.md), CLAUDE_CONFIG_DIR is user-set and
+// process-wide, so reading it is safe.
+function claudeHome() {
+  return process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+}
+
+module.exports = { claudeHome };

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

@@ -0,0 +1,58 @@
+'use strict';
+const test = require('node:test');
+const assert = require('node:assert');
+const path = require('path');
+const os = require('os');
+const { claudeHome } = require('./claude-config');
+
+test('claudeHome defaults to ~/.claude when CLAUDE_CONFIG_DIR unset', () => {
+  const prev = process.env.CLAUDE_CONFIG_DIR;
+  delete process.env.CLAUDE_CONFIG_DIR;
+  try {
+    assert.strictEqual(claudeHome(), path.join(os.homedir(), '.claude'));
+  } finally {
+    if (prev !== undefined) process.env.CLAUDE_CONFIG_DIR = prev;
+  }
+});
+
+test('claudeHome honors CLAUDE_CONFIG_DIR when set', () => {
+  const prev = process.env.CLAUDE_CONFIG_DIR;
+  process.env.CLAUDE_CONFIG_DIR = '/tmp/work-claude';
+  try {
+    assert.strictEqual(claudeHome(), '/tmp/work-claude');
+  } finally {
+    if (prev === undefined) delete process.env.CLAUDE_CONFIG_DIR;
+    else process.env.CLAUDE_CONFIG_DIR = prev;
+  }
+});
+
+test('claudeHome re-reads env on every call (not cached)', () => {
+  const prev = process.env.CLAUDE_CONFIG_DIR;
+  delete process.env.CLAUDE_CONFIG_DIR;
+  try {
+    const before = claudeHome();
+    process.env.CLAUDE_CONFIG_DIR = '/tmp/account-A';
+    const during = claudeHome();
+    delete process.env.CLAUDE_CONFIG_DIR;
+    const after = claudeHome();
+    assert.strictEqual(before, path.join(os.homedir(), '.claude'));
+    assert.strictEqual(during, '/tmp/account-A');
+    assert.strictEqual(after, path.join(os.homedir(), '.claude'));
+  } finally {
+    if (prev !== undefined) process.env.CLAUDE_CONFIG_DIR = prev;
+  }
+});
+
+test('claudeHome ignores empty CLAUDE_CONFIG_DIR (falls back to ~/.claude)', () => {
+  // Empty string is falsy in JS — sanity-check the `||` fallback path so an
+  // accidentally `CLAUDE_CONFIG_DIR=` (unset-style) shell line does not strand
+  // us writing to the literal repository root `/`.
+  const prev = process.env.CLAUDE_CONFIG_DIR;
+  process.env.CLAUDE_CONFIG_DIR = '';
+  try {
+    assert.strictEqual(claudeHome(), path.join(os.homedir(), '.claude'));
+  } finally {
+    if (prev === undefined) delete process.env.CLAUDE_CONFIG_DIR;
+    else process.env.CLAUDE_CONFIG_DIR = prev;
+  }
+});

package/claude-plugin/scripts/doctor.js

@@ -8,6 +8,7 @@ const { readBinaryVersion, isDevMode, getNewestMtime } = require('./version-util
 const {
   getPluginVersion, readJson, healthCheck, CACHE_DIR,
   removeHooksFromSettings, isOurHookEntry, writeJsonAtomic,
+  settingsPath,
 } = require('./lifecycle');
 const { findBinary, clearCache: clearBinaryCache } = require('./find-binary');
 
@@ -91,41 +92,61 @@ function runDiagnostics() {
         }).trim();
         const hc = JSON.parse(hcOutput);
 
-        // Schema
-        if (hc.issue && hc.issue.includes('schema')) {
-          results.push({ name: 'Schema', status: 'warn', detail: hc.issue, fixId: 'schema-mismatch' });
+        // No-index short-circuit — binary deliberately returns a structured
+        // JSON with reason='no_index' instead of bailing, so we can route to
+        // the index-empty fix without grepping stderr. Falls through to the
+        // rest of runDiagnostics so Auto-update / Hooks still report.
+        if (hc.reason === 'no_index') {
+          results.push({ name: 'Schema', status: 'ok', detail: 'binary ok (no index yet)' });
+          results.push({ name: 'Index', status: 'warn', detail: 'missing — not indexed yet', fixId: 'index-empty' });
+          results.push({ name: 'Embeddings', status: 'skip', detail: 'no index' });
         } else {
-          results.push({ name: 'Schema', status: 'ok', detail: `v${hc.schema_version}` });
-        }
+          // Schema
+          if (hc.issue && hc.issue.includes('schema')) {
+            results.push({ name: 'Schema', status: 'warn', detail: hc.issue, fixId: 'schema-mismatch' });
+          } else {
+            results.push({ name: 'Schema', status: 'ok', detail: `v${hc.schema_version}` });
+          }
 
-        // Index
-        if (hc.nodes === 0) {
-          results.push({ name: 'Index', status: 'warn', detail: 'empty', fixId: 'index-empty' });
-        } else {
-          const age = hc.index_age ? ` (${hc.index_age})` : '';
-          results.push({
-            name: 'Index',
-            status: 'ok',
-            detail: `${hc.nodes} nodes, ${hc.edges} edges, ${hc.files} files${age}`,
-          });
-        }
+          // Index
+          if (hc.nodes === 0) {
+            results.push({ name: 'Index', status: 'warn', detail: 'empty', fixId: 'index-empty' });
+          } else {
+            const age = hc.index_age ? ` (${hc.index_age})` : '';
+            results.push({
+              name: 'Index',
+              status: 'ok',
+              detail: `${hc.nodes} nodes, ${hc.edges} edges, ${hc.files} files${age}`,
+            });
+          }
 
-        // Embeddings
-        const ep = hc.embedding_progress || '0/0';
-        const [done, total] = ep.split('/').map(Number);
-        if (total > 0 && done < total) {
-          const pct = Math.round((done / total) * 100);
-          results.push({ name: 'Embeddings', status: 'ok', detail: `${pct}% (${done}/${total})` });
-        } else if (total === 0) {
-          results.push({ name: 'Embeddings', status: 'ok', detail: 'no embeddable nodes' });
-        } else {
-          results.push({ name: 'Embeddings', status: 'ok', detail: `100% (${done}/${total})` });
+          // Embeddings
+          const ep = hc.embedding_progress || '0/0';
+          const [done, total] = ep.split('/').map(Number);
+          if (total > 0 && done < total) {
+            const pct = Math.round((done / total) * 100);
+            results.push({ name: 'Embeddings', status: 'ok', detail: `${pct}% (${done}/${total})` });
+          } else if (total === 0) {
+            results.push({ name: 'Embeddings', status: 'ok', detail: 'no embeddable nodes' });
+          } else {
+            results.push({ name: 'Embeddings', status: 'ok', detail: `100% (${done}/${total})` });
+          }
         }
       } catch (e) {
-        const msg = e.stderr ? e.stderr.toString().trim().slice(0, 100) : e.message.slice(0, 100);
-        results.push({ name: 'Schema', status: 'error', detail: `health-check failed: ${msg}`, fixId: 'binary-broken' });
-        results.push({ name: 'Index', status: 'skip', detail: 'health-check failed' });
-        results.push({ name: 'Embeddings', status: 'skip', detail: 'health-check failed' });
+        const rawStderr = e.stderr ? e.stderr.toString() : '';
+        const msg = rawStderr ? rawStderr.trim().slice(0, 100) : e.message.slice(0, 100);
+        // "No index found" is a missing-index situation, not a broken binary —
+        // the index-empty fix path knows how to create one. Without this branch
+        // the fixId routes to nothing and the report shows "0/1 addressed".
+        if (rawStderr.includes('No index found')) {
+          results.push({ name: 'Schema', status: 'ok', detail: 'binary ok (no index yet)' });
+          results.push({ name: 'Index', status: 'warn', detail: 'missing — not indexed yet', fixId: 'index-empty' });
+          results.push({ name: 'Embeddings', status: 'skip', detail: 'no index' });
+        } else {
+          results.push({ name: 'Schema', status: 'error', detail: `health-check failed: ${msg}`, fixId: 'binary-broken' });
+          results.push({ name: 'Index', status: 'skip', detail: 'health-check failed' });
+          results.push({ name: 'Embeddings', status: 'skip', detail: 'health-check failed' });
+        }
       }
     } else {
       results.push({ name: 'Schema', status: 'skip', detail: 'binary not executable' });
@@ -170,8 +191,7 @@ function runDiagnostics() {
   //    cache/<ver>/hooks/hooks.json is now authoritative. Duplicates cause
   //    every hook to fire twice until settings.json is cleaned.
   try {
-    const SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
-    const settings = readJson(SETTINGS_PATH) || {};
+    const settings = readJson(settingsPath()) || {};
     const legacyCount = countLegacyHookEntries(settings);
     if (legacyCount === 0) {
       results.push({ name: 'Legacy hooks', status: 'ok', detail: 'settings.json is clean' });
@@ -357,10 +377,10 @@ function runRepairs(results) {
 
       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) || {};
+        const settingsFile = settingsPath();
+        const settings = readJson(settingsFile) || {};
         if (removeHooksFromSettings(settings)) {
-          writeJsonAtomic(SETTINGS_PATH, settings);
+          writeJsonAtomic(settingsFile, settings);
           console.log('  \u2705 settings.json cleaned — restart Claude Code to apply');
           fixed++;
         } else {

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

@@ -95,3 +95,49 @@ test('lifecycle CLI handles install, disable self-heal, re-enable, and uninstall
   assert.equal(fs.existsSync(cacheDir), false);
 });
 
+test('lifecycle install writes to CLAUDE_CONFIG_DIR instead of ~/.claude when set', (t) => {
+  // Multi-account isolation: a user with CLAUDE_CONFIG_DIR=~/work-claude
+  // expects all plugin config (settings.json, installed_plugins.json,
+  // statusline-providers backup) to land under that directory, not the
+  // default ~/.claude. Default path must remain untouched.
+  const homeDir = mkHome(t);
+  const configDir = fs.mkdtempSync(path.join(os.tmpdir(), 'code-graph-cfgdir-'));
+  t.after(() => fs.rmSync(configDir, { recursive: true, force: true }));
+
+  const cfgSettings = path.join(configDir, 'settings.json');
+  const cfgInstalled = path.join(configDir, 'plugins', 'installed_plugins.json');
+  const cfgBackup = path.join(configDir, 'statusline-providers.json');
+  const defaultSettings = path.join(homeDir, '.claude', 'settings.json');
+
+  writeJson(cfgSettings, {
+    statusLine: { type: 'command', command: 'echo prior-work-status' },
+    enabledPlugins: { 'code-graph-mcp@code-graph-mcp': true },
+  });
+  writeJson(cfgInstalled, {
+    plugins: {
+      'code-graph-mcp@code-graph-mcp': [{
+        installPath: pluginRoot,
+        version: currentVersion,
+        scope: 'user',
+      }],
+    },
+  });
+
+  // Run install with CLAUDE_CONFIG_DIR set; HOME points elsewhere.
+  const env = { ...process.env, HOME: homeDir, CLAUDE_CONFIG_DIR: configDir };
+  delete env.CLAUDE_PLUGIN_ROOT;
+  execFileSync(process.execPath, [lifecycleCli, 'install'], {
+    cwd: repoRoot, env, stdio: ['pipe', 'pipe', 'pipe'],
+  });
+
+  // Config landed in the override dir...
+  const settings = readJson(cfgSettings);
+  assert.match(settings.statusLine.command, /statusline-composite\.js/);
+  assert.equal(fs.existsSync(cfgBackup), true,
+    'statusline-providers backup should land in CLAUDE_CONFIG_DIR');
+
+  // ...and default ~/.claude was never touched.
+  assert.equal(fs.existsSync(defaultSettings), false,
+    'default ~/.claude/settings.json must not be written when override is set');
+});
+

package/claude-plugin/scripts/lifecycle.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { claudeHome } = require('./claude-config');
 
 const PLUGIN_ID = 'code-graph-mcp@code-graph-mcp';
 const OLD_PLUGIN_IDS = [
@@ -16,13 +17,18 @@ const CACHE_DIR = path.join(os.homedir(), '.cache', 'code-graph');
 // to its own marketplace path, polluting all subsequent settings.json hook processes).
 const PLUGIN_ROOT = path.resolve(__dirname, '..');
 const MANIFEST_FILE = path.join(CACHE_DIR, 'install-manifest.json');
-const SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
-const INSTALLED_PLUGINS_PATH = path.join(os.homedir(), '.claude', 'plugins', 'installed_plugins.json');
 const REGISTRY_FILE = path.join(CACHE_DIR, 'statusline-registry.json');
+
+// Lazy resolvers — Claude Code's config dir can be overridden by CLAUDE_CONFIG_DIR
+// (multi-account isolation). Re-read every call so test subprocesses with a
+// different env see the right path.
+function settingsPath() { return path.join(claudeHome(), 'settings.json'); }
+function installedPluginsPath() { return path.join(claudeHome(), 'plugins', 'installed_plugins.json'); }
 // Durable mirror outside ~/.cache/ — survives cache cleanup. Captures the
 // `_previous` snapshot (pre-install statusline) and any third-party providers
 // (GSD, etc.). readRegistry() self-heals from this file when primary is missing.
-const PROVIDERS_BACKUP_FILE = path.join(os.homedir(), '.claude', 'statusline-providers.json');
+function providersBackupFile() { return path.join(claudeHome(), 'statusline-providers.json'); }
+function pluginsCacheDir() { return path.join(claudeHome(), 'plugins', 'cache'); }
 
 // --- Helpers ---
 
@@ -65,7 +71,7 @@ function hasOwn(obj, key) {
 }
 
 function hasInstalledPluginRecord() {
-  const installed = readJson(INSTALLED_PLUGINS_PATH);
+  const installed = readJson(installedPluginsPath());
   return !!(installed && installed.plugins && Array.isArray(installed.plugins[PLUGIN_ID]) && installed.plugins[PLUGIN_ID].length > 0);
 }
 
@@ -83,7 +89,7 @@ function readRegistry() {
   if (primary && Array.isArray(primary) && primary.length > 0) return primary;
   // Self-heal: primary missing or empty (e.g. user cleaned ~/.cache/code-graph/).
   // Durable backup in ~/.claude/ retains `_previous` + third-party providers.
-  const backup = readJson(PROVIDERS_BACKUP_FILE);
+  const backup = readJson(providersBackupFile());
   if (backup && Array.isArray(backup) && backup.length > 0) {
     try { writeJsonAtomic(REGISTRY_FILE, backup); } catch { /* ok */ }
     return backup;
@@ -94,13 +100,13 @@ function readRegistry() {
 function writeRegistry(registry) {
   if (!registry || registry.length === 0) {
     try { fs.unlinkSync(REGISTRY_FILE); } catch { /* ok */ }
-    try { fs.unlinkSync(PROVIDERS_BACKUP_FILE); } catch { /* ok */ }
+    try { fs.unlinkSync(providersBackupFile()); } catch { /* ok */ }
     return;
   }
   writeJsonAtomic(REGISTRY_FILE, registry);
   // Mirror to durable location so cache cleanup doesn't strand `_previous`
   // or third-party provider entries.
-  try { writeJsonAtomic(PROVIDERS_BACKUP_FILE, registry); } catch { /* ok */ }
+  try { writeJsonAtomic(providersBackupFile(), registry); } catch { /* ok */ }
 }
 
 function registerStatuslineProvider(id, command, needsStdin) {
@@ -126,18 +132,18 @@ function unregisterStatuslineProvider(id) {
   return true;
 }
 
-function isPluginExplicitlyDisabled(settings = readJson(SETTINGS_PATH) || {}) {
+function isPluginExplicitlyDisabled(settings = readJson(settingsPath()) || {}) {
   return hasOwn(settings.enabledPlugins, PLUGIN_ID) && settings.enabledPlugins[PLUGIN_ID] === false;
 }
 
-function isPluginInactive(settings = readJson(SETTINGS_PATH) || {}) {
+function isPluginInactive(settings = readJson(settingsPath()) || {}) {
   if (isPluginExplicitlyDisabled(settings)) return true;
 
   const hasComposite = isOurComposite(settings);
   const hasCodeGraphRegistry = readRegistry().some((provider) => provider.id === 'code-graph');
   if (!hasComposite && !hasCodeGraphRegistry) return false;
 
-  const installed = readJson(INSTALLED_PLUGINS_PATH);
+  const installed = readJson(installedPluginsPath());
   if (!installed || !installed.plugins) return false;
   return !hasInstalledPluginRecord();
 }
@@ -165,7 +171,7 @@ function detachStatuslineIntegration(settings) {
 }
 
 function cleanupDisabledStatusline() {
-  const settings = readJson(SETTINGS_PATH);
+  const settings = readJson(settingsPath());
   if (!settings || !isPluginInactive(settings)) {
     return { cleaned: false, settingsChanged: false };
   }
@@ -173,7 +179,7 @@ function cleanupDisabledStatusline() {
   let settingsChanged = detachStatuslineIntegration(settings);
   if (removeHooksFromSettings(settings)) settingsChanged = true;
   if (settingsChanged) {
-    writeJsonAtomic(SETTINGS_PATH, settings);
+    writeJsonAtomic(settingsPath(), settings);
   }
 
   return { cleaned: true, settingsChanged };
@@ -182,7 +188,7 @@ function cleanupDisabledStatusline() {
 // --- Scope Conflict Detection ---
 
 function checkScopeConflict() {
-  const installed = readJson(INSTALLED_PLUGINS_PATH);
+  const installed = readJson(installedPluginsPath());
   if (!installed || !installed.plugins) return null;
   for (const [key, entries] of Object.entries(installed.plugins)) {
     if (key === PLUGIN_ID) continue;
@@ -207,10 +213,10 @@ function migrateOldPluginIds(settings) {
     }
 
     // Clean old ID from installed_plugins.json
-    const installed = readJson(INSTALLED_PLUGINS_PATH);
+    const installed = readJson(installedPluginsPath());
     if (installed && installed.plugins && oldId in installed.plugins) {
       delete installed.plugins[oldId];
-      writeJsonAtomic(INSTALLED_PLUGINS_PATH, installed);
+      writeJsonAtomic(installedPluginsPath(), installed);
     }
   }
 
@@ -225,10 +231,11 @@ function migrateOldPluginIds(settings) {
   }
 
   // Clean old cache paths
+  const cacheRoot = pluginsCacheDir();
   const oldCacheDirs = [
-    path.join(os.homedir(), '.claude', 'plugins', 'cache', 'sdsrss', 'code-graph'),
-    path.join(os.homedir(), '.claude', 'plugins', 'cache', 'sdsrss-code-graph', 'code-graph'),
-    path.join(os.homedir(), '.claude', 'plugins', 'cache', 'sdsrss-code-graph'),
+    path.join(cacheRoot, 'sdsrss', 'code-graph'),
+    path.join(cacheRoot, 'sdsrss-code-graph', 'code-graph'),
+    path.join(cacheRoot, 'sdsrss-code-graph'),
   ];
   for (const dir of oldCacheDirs) {
     try { fs.rmSync(dir, { recursive: true, force: true }); } catch { /* ok */ }
@@ -284,7 +291,7 @@ function removeHooksFromSettings(settings) {
 function install() {
   const version = getPluginVersion();
   const manifest = readManifest();
-  const settings = readJson(SETTINGS_PATH) || {};
+  const settings = readJson(settingsPath()) || {};
   let settingsChanged = false;
 
   // 0. Migrate from old plugin IDs
@@ -329,7 +336,7 @@ function install() {
 
   // 3. Write settings atomically if changed
   if (settingsChanged) {
-    writeJsonAtomic(SETTINGS_PATH, settings);
+    writeJsonAtomic(settingsPath(), settings);
   }
 
   // 4. Write manifest with version
@@ -344,7 +351,7 @@ function install() {
 // --- Uninstall (clean all config) ---
 
 function uninstall() {
-  const settings = readJson(SETTINGS_PATH);
+  const settings = readJson(settingsPath());
   let settingsChanged = false;
 
   if (settings) {
@@ -370,12 +377,12 @@ function uninstall() {
 
     // 4. Write settings if changed
     if (settingsChanged) {
-      writeJsonAtomic(SETTINGS_PATH, settings);
+      writeJsonAtomic(settingsPath(), settings);
     }
   }
 
   // 5. Remove all known IDs from installed_plugins.json
-  const installedPlugins = readJson(INSTALLED_PLUGINS_PATH);
+  const installedPlugins = readJson(installedPluginsPath());
   if (installedPlugins && installedPlugins.plugins) {
     let ipChanged = false;
     for (const id of [PLUGIN_ID, ...OLD_PLUGIN_IDS]) {
@@ -384,17 +391,18 @@ function uninstall() {
         ipChanged = true;
       }
     }
-    if (ipChanged) writeJsonAtomic(INSTALLED_PLUGINS_PATH, installedPlugins);
+    if (ipChanged) writeJsonAtomic(installedPluginsPath(), installedPlugins);
   }
 
   // 6. Remove cache directory
   try { fs.rmSync(CACHE_DIR, { recursive: true, force: true }); } catch { /* ok */ }
 
   // 7. Remove plugin files from cache (all known paths, including parent dirs)
+  const cacheRoot = pluginsCacheDir();
   const pluginCacheDirs = [
-    path.join(os.homedir(), '.claude', 'plugins', 'cache', MARKETPLACE_NAME),
-    path.join(os.homedir(), '.claude', 'plugins', 'cache', 'sdsrss-code-graph'),
-    path.join(os.homedir(), '.claude', 'plugins', 'cache', 'sdsrss', 'code-graph'),
+    path.join(cacheRoot, MARKETPLACE_NAME),
+    path.join(cacheRoot, 'sdsrss-code-graph'),
+    path.join(cacheRoot, 'sdsrss', 'code-graph'),
   ];
   for (const dir of pluginCacheDirs) {
     try { fs.rmSync(dir, { recursive: true, force: true }); } catch { /* ok */ }
@@ -409,7 +417,7 @@ function update() {
   const version = getPluginVersion();
   const manifest = readManifest();
   const oldVersion = manifest.version;
-  const settings = readJson(SETTINGS_PATH) || {};
+  const settings = readJson(settingsPath()) || {};
   let settingsChanged = false;
 
   // 0. Migrate from old plugin IDs
@@ -438,7 +446,7 @@ function update() {
 
   // 4. Write settings if changed
   if (settingsChanged) {
-    writeJsonAtomic(SETTINGS_PATH, settings);
+    writeJsonAtomic(settingsPath(), settings);
   }
 
   // 5. Clear update-check cache (force re-check after update)
@@ -463,7 +471,7 @@ function update() {
  * Cache layout: ~/.claude/plugins/cache/<marketplace>/<plugin>/<version>/
  */
 function cleanupOldCacheVersions(keep = 3) {
-  const cacheParent = path.join(os.homedir(), '.claude', 'plugins', 'cache', MARKETPLACE_NAME);
+  const cacheParent = path.join(pluginsCacheDir(), MARKETPLACE_NAME);
   try {
     // List all subdirectories under the marketplace cache
     const entries = fs.readdirSync(cacheParent, { withFileTypes: true });
@@ -498,7 +506,7 @@ function cleanupOldCacheVersions(keep = 3) {
 // Returns { healthy, issues, repaired }.
 
 function healthCheck() {
-  const settings = readJson(SETTINGS_PATH) || {};
+  const settings = readJson(settingsPath()) || {};
   const issues = [];
 
   // Check statusLine path
@@ -554,7 +562,7 @@ module.exports = {
   removeHooksFromSettings, isOurHookEntry,
   registerStatuslineProvider, unregisterStatuslineProvider,
   PLUGIN_ID, OLD_PLUGIN_IDS, MARKETPLACE_NAME, CACHE_DIR, REGISTRY_FILE,
-  PROVIDERS_BACKUP_FILE,
+  settingsPath, installedPluginsPath, providersBackupFile, pluginsCacheDir,
 };
 
 // CLI: node lifecycle.js <install|uninstall|update|health>

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

@@ -2,11 +2,11 @@
 'use strict';
 const { spawn, execSync, execFileSync } = require('child_process');
 const path = require('path');
-const os = require('os');
 const fs = require('fs');
 const {
   install, update, readManifest, getPluginVersion, checkScopeConflict,
   cleanupDisabledStatusline, isPluginInactive, readJson, CACHE_DIR,
+  settingsPath,
 } = require('./lifecycle');
 const { readBinaryVersion, isDevMode, getNewestMtime } = require('./version-utils');
 const { maybeAutoAdopt, isAdopted } = require('./adopt');
@@ -58,7 +58,7 @@ function syncLifecycleConfig() {
   // Self-heal: version matches but statusLine may have been lost or path corrupted
   // (e.g. plugin removed and reinstalled, or CLAUDE_PLUGIN_ROOT leaked from another plugin).
   // install() is idempotent — isOurComposite guard prevents duplicate work.
-  const settings = readJson(path.join(os.homedir(), '.claude', 'settings.json')) || {};
+  const settings = readJson(settingsPath()) || {};
   if (!settings.statusLine || !settings.statusLine.command ||
       !settings.statusLine.command.includes('statusline-composite')) {
     install();

package/package.json

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