@sdsrs/code-graph 0.5.27 → 0.5.29

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

@@ -1,180 +1,76 @@
 #!/usr/bin/env node
 'use strict';
-const { execFileSync } = require('child_process');
-const fs = require('fs');
+const { spawn } = require('child_process');
 const path = require('path');
 const os = require('os');
-const { findBinary } = require('./find-binary');
-const { install, update, readManifest, getPluginVersion, checkScopeConflict } = require('./lifecycle');
-const { checkForUpdate, readState: readUpdateState } = require('./auto-update');
+const {
+  install, update, readManifest, getPluginVersion, checkScopeConflict,
+  cleanupDisabledStatusline, isPluginInactive, readJson,
+} = require('./lifecycle');
 
-let BIN = findBinary();
-
-// --- 0b. Retry pending binary update from previous failed auto-update ---
-{
-  const updateState = readUpdateState();
-  if (updateState.pendingBinaryUpdate) {
-    const pendingVer = updateState.pendingBinaryUpdate;
-    try {
-      execFileSync('npm', ['install', '-g', `@sdsrs/code-graph@${pendingVer}`], {
-        timeout: 30000, stdio: 'pipe'
-      });
-      try { fs.unlinkSync(path.join(os.homedir(), '.cache', 'code-graph', 'binary-path')); } catch {}
-      // Clear pending flag
-      const { writeJsonAtomic, CACHE_DIR } = require('./lifecycle');
-      const s = readUpdateState();
-      delete s.pendingBinaryUpdate;
-      writeJsonAtomic(path.join(CACHE_DIR, 'update-state.json'), s);
-      process.stderr.write(`[code-graph] Binary retry succeeded: v${pendingVer}\n`);
-      BIN = findBinary(); // refresh
-    } catch { /* npm still not available — will retry next session */ }
-  }
-}
-
-// --- 0. Auto-install binary if missing ---
-if (!BIN) {
-  const version = getPluginVersion();
-  process.stderr.write(`[code-graph] Binary not found, installing @sdsrs/code-graph@${version}...\n`);
+function launchBackgroundAutoUpdate(spawnFn = spawn, env = process.env) {
   try {
-    execFileSync('npm', ['install', '-g', `@sdsrs/code-graph@${version}`], {
-      timeout: 60000, stdio: 'pipe'
+    const child = spawnFn(process.execPath, [path.join(__dirname, 'auto-update.js'), 'check', '--silent'], {
+      detached: true,
+      stdio: 'ignore',
+      env: { ...env, CODE_GRAPH_AUTO_UPDATE_SILENT: '1' },
     });
-    // Clear cached path so findBinary picks up the new install
-    try { fs.unlinkSync(path.join(os.homedir(), '.cache', 'code-graph', 'binary-path')); } catch {}
-    BIN = findBinary();
-    if (BIN) {
-      process.stderr.write(`[code-graph] Installed v${version} at ${BIN}\n`);
-    } else {
-      process.stderr.write('[code-graph] Install succeeded but binary not found in PATH. Try: npx @sdsrs/code-graph@latest\n');
-    }
+    if (child && typeof child.unref === 'function') child.unref();
+    return true;
   } catch {
-    process.stderr.write(
-      `[code-graph] Auto-install failed. Run manually: npm install -g @sdsrs/code-graph@${version}\n`
-    );
+    return false;
   }
 }
 
-// --- 1. Health check (always runs) ---
-let healthNodes = -1;
-if (BIN) {
-  try {
-    const out = execFileSync(BIN, ['health-check', '--format', 'oneline'], {
-      timeout: 2000,
-      stdio: ['pipe', 'pipe', 'pipe']
-    }).toString().trim();
-    if (out) process.stdout.write(out);
-    // Parse node count for empty-index detection
-    const m = out.match(/(\d+)\s*nodes/);
-    if (m) healthNodes = parseInt(m[1], 10);
-  } catch { /* timeout — silent */ }
-}
+function syncLifecycleConfig() {
+  const manifest = readManifest();
+  const currentVersion = getPluginVersion();
 
-// --- 1a. Auto-index empty databases (fallback if MCP hasn't triggered indexing) ---
-if (BIN && healthNodes === 0) {
-  const dbExists = fs.existsSync(path.join(process.cwd(), '.code-graph', 'index.db'));
-  if (dbExists) {
-    // DB exists but empty — MCP server likely hasn't received notifications/initialized yet.
-    // Trigger CLI indexing as fallback so the index is ready before first tool call.
-    try {
-      process.stderr.write('[code-graph] Empty index detected, running initial indexing...\n');
-      const result = execFileSync(BIN, ['incremental-index', '--quiet'], {
-        timeout: 15000, // 15s max (SessionStart hook has 20s budget)
-        stdio: ['pipe', 'pipe', 'pipe'],
-      }).toString().trim();
-      if (result) process.stderr.write(`[code-graph] ${result}\n`);
-      // Re-run health check to update statusline with new counts
-      try {
-        const out2 = execFileSync(BIN, ['health-check', '--format', 'oneline'], {
-          timeout: 2000, stdio: ['pipe', 'pipe', 'pipe']
-        }).toString().trim();
-        if (out2) process.stdout.write(`\n${out2}`);
-      } catch { /* ok */ }
-    } catch (e) {
-      process.stderr.write(`[code-graph] Auto-index failed: ${e.message || e}\n`);
-    }
+  if (!manifest.version) {
+    install();
+    return 'installed';
+  }
+  if (manifest.version !== currentVersion) {
+    update();
+    return 'updated';
   }
+  // Self-heal: version matches but statusLine may have been lost
+  // (e.g. plugin removed and reinstalled without lifecycle uninstall).
+  // install() is idempotent — isOurComposite guard prevents duplicate work.
+  const settings = readJson(path.join(os.homedir(), '.claude', 'settings.json')) || {};
+  if (!settings.statusLine || !settings.statusLine.command ||
+      !settings.statusLine.command.includes('statusline-composite')) {
+    install();
+    return 'self-healed';
+  }
+  return 'noop';
 }
 
-// --- 1b. Suggest project_map as first action ---
-if (BIN) {
-  process.stdout.write(
-    '\n[code-graph] TIP: Call project_map first to get a full architecture overview ' +
-    '(modules, dependencies, hot functions, entry points) in one call.\n'
-  );
-}
+function runSessionInit() {
+  if (isPluginInactive()) {
+    cleanupDisabledStatusline();
+    return { inactive: true, lifecycle: 'noop', autoUpdateLaunched: false };
+  }
 
-// --- 1c. Binary version sync (plugin may update before npm binary) ---
-if (BIN) {
-  try {
-    const binOut = execFileSync(BIN, ['--version'], { timeout: 2000, stdio: 'pipe' }).toString().trim();
-    const binVersion = binOut.replace(/^code-graph-mcp\s+/, '');
-    const pluginVersion = getPluginVersion();
-    if (binVersion && pluginVersion && /^\d+\.\d+\.\d+$/.test(binVersion)) {
-      const bv = binVersion.split('.').map(Number);
-      const pv = pluginVersion.split('.').map(Number);
-      const pluginNewer = (pv[0] > bv[0]) ||
-        (pv[0] === bv[0] && pv[1] > bv[1]) ||
-        (pv[0] === bv[0] && pv[1] === bv[1] && pv[2] > bv[2]);
-      if (pluginNewer) {
-        process.stderr.write(`[code-graph] Binary v${binVersion} < plugin v${pluginVersion}, updating...\n`);
-        let binarySynced = false;
-        try {
-          execFileSync('npm', ['install', '-g', `@sdsrs/code-graph@${pluginVersion}`], {
-            timeout: 30000, stdio: 'pipe'
-          });
-          // Clear cached binary path so next lookup finds the new binary
-          try { fs.unlinkSync(path.join(os.homedir(), '.cache', 'code-graph', 'binary-path')); } catch {}
-          process.stderr.write(`[code-graph] Binary updated to v${pluginVersion}\n`);
-          binarySynced = true;
-        } catch {
-          process.stderr.write(
-            `[code-graph] Auto-update failed. Run: npm install -g @sdsrs/code-graph@${pluginVersion}\n`
-          );
-        }
-        if (binarySynced) {
-          // MCP server is still running old binary — prompt user to reconnect
-          process.stdout.write(
-            `\n\u26A0\uFE0F [code-graph] Binary updated v${binVersion} \u2192 v${pluginVersion}. ` +
-            `Run /mcp to reconnect MCP server with new version.\n`
-          );
-        }
-      }
-    }
-  } catch { /* version check failed — not critical */ }
-}
+  const conflict = checkScopeConflict();
+  if (conflict) {
+    process.stderr.write(
+      `[code-graph] Warning: conflicting install detected — ${conflict.existingId} (${conflict.scope || 'unknown'} scope). ` +
+      `Use /plugin to remove one to avoid config conflicts.\n`
+    );
+  }
 
-// --- 2. Scope conflict warning ---
-const conflict = checkScopeConflict();
-if (conflict) {
-  process.stderr.write(
-    `[code-graph] Warning: conflicting install detected — ${conflict.existingId} (${conflict.scope || 'unknown'} scope). ` +
-    `Use /plugin to remove one to avoid config conflicts.\n`
-  );
+  const lifecycle = syncLifecycleConfig();
+  const autoUpdateLaunched = launchBackgroundAutoUpdate();
+  return { inactive: false, lifecycle, autoUpdateLaunched };
 }
 
-// --- 3. Lifecycle: install or update config (idempotent) ---
-const manifest = readManifest();
-const currentVersion = getPluginVersion();
+module.exports = {
+  launchBackgroundAutoUpdate,
+  syncLifecycleConfig,
+  runSessionInit,
+};
 
-if (!manifest.version) {
-  install();
-} else if (manifest.version !== currentVersion) {
-  update();
+if (require.main === module) {
+  runSessionInit();
 }
-
-// --- 4. Auto-update (throttled, non-blocking) ---
-(async () => {
-  const result = await checkForUpdate();
-  if (result && result.updated) {
-    process.stderr.write(`[code-graph] Updated: v${result.from} \u2192 v${result.to}\n`);
-    process.stdout.write(
-      `\n\uD83D\uDD04 [code-graph] Auto-updated v${result.from} \u2192 v${result.to}. ` +
-      `Run /mcp to use the new version.\n`
-    );
-  } else if (result && result.updateAvailable) {
-    process.stderr.write(
-      `[code-graph] Update available: v${result.from} \u2192 v${result.to}. ` +
-      `Run: npx @sdsrs/code-graph@latest\n`
-    );
-  }
-})();

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

@@ -0,0 +1,35 @@
+'use strict';
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+const { launchBackgroundAutoUpdate, syncLifecycleConfig } = require('./session-init');
+
+test('syncLifecycleConfig is exported as a callable helper', () => {
+  assert.equal(typeof syncLifecycleConfig, 'function');
+});
+
+test('launchBackgroundAutoUpdate spawns detached silent updater', () => {
+  const calls = [];
+
+  const ok = launchBackgroundAutoUpdate((command, args, options) => {
+    const record = { command, args, options, unrefCalled: false };
+    calls.push(record);
+    return {
+      unref() {
+        record.unrefCalled = true;
+      },
+    };
+  }, { HOME: '/tmp/fake-home' });
+
+  assert.equal(ok, true);
+  assert.equal(calls.length, 1);
+  assert.equal(calls[0].command, process.execPath);
+  assert.match(calls[0].args[0], /auto-update\.js$/);
+  assert.equal(calls[0].args[1], 'check');
+  assert.equal(calls[0].args[2], '--silent');
+  assert.equal(calls[0].options.detached, true);
+  assert.equal(calls[0].options.stdio, 'ignore');
+  assert.equal(calls[0].options.env.CODE_GRAPH_AUTO_UPDATE_SILENT, '1');
+  assert.equal(calls[0].unrefCalled, true);
+});
+

package/claude-plugin/scripts/statusline-composite.js

@@ -7,10 +7,13 @@
  */
 const { execFileSync } = require('child_process');
 const path = require('path');
-const { readRegistry } = require('./lifecycle');
+const { cleanupDisabledStatusline, readRegistry } = require('./lifecycle');
 
 const SEPARATOR = ' \x1b[2m|\x1b[0m ';
 
+const disabledCleanup = cleanupDisabledStatusline();
+if (disabledCleanup.cleaned) process.exit(0);
+
 // Collect stdin (Claude Code pipes JSON context)
 let stdinData = '';
 let ran = false;
@@ -28,8 +31,16 @@ function run(stdin) {
     return;
   }
 
+  // Display order: pre-existing statuslines (_previous) first, then our providers.
+  // This ensures plugins installed earlier appear before ours.
+  const sorted = registry.slice().sort((a, b) => {
+    if (a.id === '_previous') return -1;
+    if (b.id === '_previous') return 1;
+    return 0;
+  });
+
   const outputs = [];
-  for (const provider of registry) {
+  for (const provider of sorted) {
     const out = runProvider(provider.command, provider.needsStdin, stdin);
     if (out) outputs.push(out);
   }

package/claude-plugin/scripts/statusline.js

@@ -4,12 +4,34 @@ const { execFileSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const { findBinary } = require('./find-binary');
+const { cleanupDisabledStatusline } = require('./lifecycle');
 
-// Only show status in projects that have a code-graph index.
+const disabledCleanup = cleanupDisabledStatusline();
+if (disabledCleanup.cleaned) process.exit(0);
+
+// Only show status in projects that have a code-graph directory.
 // The statusLine config is global, so we must exit silently for
 // directories that aren't code-graph projects.
 const cwd = process.cwd();
-if (!fs.existsSync(path.join(cwd, '.code-graph', 'index.db'))) {
+const codeGraphDir = path.join(cwd, '.code-graph');
+if (!fs.existsSync(codeGraphDir)) {
+  process.exit(0);
+}
+
+// Check for background indexing progress file first
+const progressFile = path.join(codeGraphDir, 'indexing-status.json');
+try {
+  const raw = fs.readFileSync(progressFile, 'utf8');
+  const p = JSON.parse(raw);
+  if (p.s === 'indexing' && p.t > 0) {
+    const pct = Math.round((p.d / p.t) * 100);
+    process.stdout.write(`code-graph: \u21BB indexing ${p.d}/${p.t} (${pct}%)`);
+    process.exit(0);
+  }
+} catch { /* no progress file or parse error — continue to health check */ }
+
+// No indexing in progress — show normal health status
+if (!fs.existsSync(path.join(codeGraphDir, 'index.db'))) {
   process.exit(0);
 }
 

package/package.json

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