@sdsrs/code-graph 0.101.0 → 0.102.0

package/claude-plugin/scripts/mcp-launcher.js

@@ -7,7 +7,7 @@
  * Used by .mcp.json so the plugin controls binary discovery instead of
  * relying on the binary being in PATH.
  */
-const { spawn, spawnSync } = require('child_process');
+const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const { isNonProjectCwd } = require('./project-detect');
@@ -86,66 +86,15 @@ if (process.env.CODE_GRAPH_FORCE_PLUGIN_MCP !== '1' && isNonProjectCwd(process.c
 }
 
 const { findBinary, clearCache, unsupportedPlatformHint } = require('./find-binary');
+const { installBinaryInBackground } = require('./launcher-install');
 
-let binary = findBinary();
+const binary = findBinary();
 
-// Auto-install binary if not found (first-time install)
-if (!binary) {
-  let version = 'latest';
-  try {
-    const pj = path.join(__dirname, '..', '.claude-plugin', 'plugin.json');
-    version = JSON.parse(fs.readFileSync(pj, 'utf8')).version || 'latest';
-  } catch { /* use latest */ }
-
-  process.stderr.write(`[code-graph] Binary not found, installing @sdsrs/code-graph@${version}...\n`);
-  const npmResult = spawnSync('npm', ['install', '-g', `@sdsrs/code-graph@${version}`], {
-    timeout: 60000, stdio: ['ignore', 'pipe', 'pipe'], encoding: 'utf8',
-  });
-  if (npmResult.error || npmResult.status !== 0) {
-    process.stderr.write('[code-graph] npm install failed.\n');
-    if (npmResult.stderr) {
-      process.stderr.write(npmResult.stderr.trim().split('\n').map(l => `[code-graph][npm] ${l}\n`).join(''));
-    }
-  } else {
-    clearCache();
-    binary = findBinary();
-    if (binary) {
-      process.stderr.write(`[code-graph] Installed at ${binary}\n`);
-    }
-  }
-}
-
-// Fallback: npm install may have succeeded but optionalDependencies for the
-// platform binary can fail silently (npm tolerates OS-mismatch + flaky
-// registry). Pull the platform binary directly from the GitHub release.
-//
-// --install-missing bypasses auto-update.js's isDevMode() short-circuit. The
-// marketplace ships the full repo (including Cargo.toml at the workspace root),
-// so dev-mode heuristics that look for Cargo.toml were misclassifying every
-// marketplace install as dev mode and skipping this fallback (issue #12).
-if (!binary) {
-  process.stderr.write('[code-graph] Falling back to GitHub release download...\n');
-  const result = spawnSync(
-    process.execPath,
-    [path.join(__dirname, 'auto-update.js'), '--silent', '--install-missing'],
-    { timeout: 90000, stdio: ['ignore', 'pipe', 'pipe'], encoding: 'utf8' }
-  );
-  if (result.stderr && result.stderr.trim()) {
-    process.stderr.write(result.stderr.trim().split('\n').map(l => `[code-graph][auto-update] ${l}\n`).join(''));
-  }
-  if (result.error) {
-    process.stderr.write(`[code-graph] auto-update spawn failed: ${result.error.message}\n`);
-  } else if (result.status !== 0) {
-    process.stderr.write(`[code-graph] auto-update exited with status ${result.status}\n`);
-  }
-  clearCache();
-  binary = findBinary();
-  if (binary) {
-    process.stderr.write(`[code-graph] Installed at ${binary}\n`);
-  }
-}
-
-if (!binary) {
+// Manual-install guidance, printed when the background install chain exhausts
+// both steps without producing a binary. Unlike the old sync path this does NOT
+// exit: the upgradeable stub stays connected (0 tools), so a manual
+// `npm install -g` mid-session still upgrades the live connection.
+function printManualInstallHints() {
   const installedViaMarketplace = fs.existsSync(
     path.join(__dirname, '..', '.claude-plugin', 'plugin.json')
   );
@@ -155,9 +104,9 @@ if (!binary) {
     // npm package does not exist, so the generic "npm install @sdsrs/code-graph-<plat>-<arch>"
     // suggestion below would point at a nonexistent package. Show the source/emulation hint.
     process.stderr.write('[code-graph] Binary not found.\n' + platformHint + '\n');
-    process.exit(1);
+    return;
   }
-  process.stderr.write('[code-graph] Binary not found. Install manually:\n');
+  process.stderr.write('[code-graph] Binary install failed. Install manually:\n');
   if (installedViaMarketplace) {
     process.stderr.write(
       '  # Re-install the plugin via Claude Code marketplace:\n' +
@@ -171,7 +120,67 @@ if (!binary) {
     '  npm install -g @sdsrs/code-graph\n' +
     '  npm install -g @sdsrs/code-graph-' + process.platform + '-' + process.arch + '\n'
   );
-  process.exit(1);
+}
+
+// --- Missing binary: answer the handshake NOW, install in the background ----
+// The old chain ran `npm install -g` (60s timeout) and the GitHub-release
+// fallback (90s) SYNCHRONOUSLY before answering any MCP JSON-RPC. Claude
+// Code's connect timeout is 30s, so a cold install always presented as
+// "MCP server connection timed out after 30000ms" and the tools only appeared
+// on a later reconnect. Serve the upgradeable 0-tool stub first (initialize is
+// answered instantly), run the same install chain in the background, and hand
+// the live connection to the real binary via the same upgrade mechanism the
+// non-project gate uses — no reconnect, no restart.
+//
+// --install-missing bypasses auto-update.js's isDevMode() short-circuit. The
+// marketplace ships the full repo (including Cargo.toml at the workspace root),
+// so dev-mode heuristics that look for Cargo.toml were misclassifying every
+// marketplace install as dev mode and skipping this fallback (issue #12).
+if (!binary) {
+  let version = 'latest';
+  try {
+    const pj = path.join(__dirname, '..', '.claude-plugin', 'plugin.json');
+    version = JSON.parse(fs.readFileSync(pj, 'utf8')).version || 'latest';
+  } catch { /* use latest */ }
+
+  process.stderr.write(
+    `[code-graph] Binary not found — serving 0-tool stub while installing ` +
+    `@sdsrs/code-graph@${version} in the background (tools appear when it lands)...\n`
+  );
+
+  const stub = serveEmptyMcpStub({
+    upgrade: {
+      shouldUpgrade: () => !!findBinary(),
+      spawnReal: () => {
+        const bin = findBinary();
+        if (!bin) return null;
+        process.stderr.write(`[code-graph] binary ready at ${bin} — upgrading plugin MCP to real tools (restart Claude Code for full tool steering)\n`);
+        return spawn(bin, ['serve'], { stdio: ['pipe', 'pipe', 'inherit'], env: process.env });
+      },
+    },
+  });
+
+  const { GLOBAL_INSTALL_MARKER, INSTALL_LOCK_FILE } = require('./lifecycle');
+  installBinaryInBackground({
+    version,
+    findBinary,
+    clearCache,
+    // Nudge the handover immediately instead of waiting for the stub's next poll.
+    onInstalled: () => stub.attemptUpgrade(),
+    onFailed: () => printManualInstallHints(),
+    // Marker: this npm install was OURS, so lifecycle.js uninstall knows it
+    // owns removing the global packages (never yanks a user's own install).
+    recordGlobalInstall: () => {
+      fs.mkdirSync(path.dirname(GLOBAL_INSTALL_MARKER), { recursive: true });
+      fs.writeFileSync(GLOBAL_INSTALL_MARKER, JSON.stringify({
+        installedBy: 'code-graph-mcp launcher', version, at: new Date().toISOString(),
+      }, null, 2) + '\n');
+    },
+    // Serialize against other cold sessions + auto-update (parallel global npm
+    // installs corrupt the shared prefix).
+    lockPath: INSTALL_LOCK_FILE,
+  });
+  return; // top-level function scope of mcp-launcher.js
 }
 
 // Pre-spawn: verify binary is executable (catches macOS quarantine, permission issues)

package/claude-plugin/scripts/npm-exec.js

@@ -0,0 +1,15 @@
+'use strict';
+// npm is `npm.cmd` on Windows: child_process spawn/execFileSync cannot exec a
+// .cmd without a shell (and Node >= 18.20 throws EINVAL spawning .cmd directly
+// as a CVE-2024-27980 mitigation). Every bare `spawn('npm', ...)` in the
+// install/update flow therefore silently ENOENT'd on Windows while
+// commandExists('npm') (via `where`) said npm was present. All args routed
+// through here are fixed flags / package specs — shell-quoting-safe.
+const NPM_NEEDS_SHELL = process.platform === 'win32';
+
+/** Merge shell:true into spawn/exec options when the platform needs it. */
+function npmSpawnOpts(opts = {}) {
+  return NPM_NEEDS_SHELL ? { ...opts, shell: true } : opts;
+}
+
+module.exports = { npmSpawnOpts, NPM_NEEDS_SHELL };

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

@@ -480,10 +480,13 @@ function runSessionInit({ source } = {}) {
     cleanupDisabledStatusline();
     // Genuine uninstall (not a temporary disable) leaves residue the settings-only
     // self-heal can't reach: ~/.cache/code-graph (the ~40MB binary + state) and the
-    // current project's CLAUDE.md adoption block. CC fires no uninstall hook, so this
-    // SessionStart is the only automated teardown — symmetric to install's auto-adopt.
-    // Per-project: only the cwd we're in; other adopted projects self-clean when next
-    // opened, or via `code-graph-mcp unadopt`.
+    // current project's CLAUDE.md adoption block. CC fires no uninstall hook, AND it
+    // stops loading this plugin's hooks.json the moment the install record is gone —
+    // so after a real `/plugin uninstall` this SessionStart usually never runs again.
+    // The reachable teardown is cleanupDisabledStatusline() via the composite
+    // statusline (still wired in settings.json); it removes the cache residue too.
+    // This branch remains for the disable→uninstall-while-running edge and as the
+    // only place project unadoption can happen automatically.
     let teardown = null;
     if (uninstalled) {
       const cacheRemoved = removeCacheResidue();

package/claude-plugin/scripts/statusline.js

@@ -57,13 +57,31 @@ const codeGraphDir = path.join(root, '.code-graph');
 // 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);
+  // Staleness gate: the file is normally deleted by the server's IndexGuard, but
+  // a killed process (session exit, SIGKILL, the 30s MCP connect-timeout kill)
+  // skips Drop, and the orphan would pin "indexing N/M" here forever. A LIVE
+  // indexer heartbeats the file at least once per batch and per finalize phase,
+  // so an old mtime proves no indexer is writing it: ignore the file and fall
+  // through to the health check. (Mirrors INDEXING_STATUS_STALE_SECS in
+  // src/indexer/pipeline/mod.rs, which drives server/CLI-side stale cleanup.)
+  const INDEXING_STALE_MS = 120000;
+  const fresh = (Date.now() - fs.statSync(progressFile).mtimeMs) < INDEXING_STALE_MS;
+  const p = fresh ? JSON.parse(fs.readFileSync(progressFile, 'utf8')) : null;
+  if (p && p.s === 'indexing' && p.t > 0) {
+    // floor, not round: skipped files (parse errors, oversized) keep d below t
+    // even in the terminal progress write, and rounding displayed that state as
+    // a confusing stuck "100%".
+    const pct = Math.floor((p.d / p.t) * 100);
     process.stdout.write(`code-graph: \u21BB indexing ${p.d}/${p.t} (${pct}%)`);
     process.exit(0);
   }
+  if (p && p.s === 'finalizing' && p.t > 0) {
+    // Post-batch full-graph phases (context strings, import bind/prune, ANALYZE):
+    // the file count no longer moves, so show an explicit phase label instead of
+    // a frozen-looking counter.
+    process.stdout.write(`code-graph: ↻ finalizing ${p.d}/${p.t}`);
+    process.exit(0);
+  }
 } catch { /* no progress file or parse error — continue to health check */ }
 
 // No indexing in progress — show normal health status
@@ -131,8 +149,14 @@ function statusUnavailable(errText) {
 let report = null;
 let errText = '';
 try {
+  // 1500ms, NOT 3000ms: the composite wrapper kills this whole provider at
+  // 3000ms (statusline-composite.js runProvider), so an inner budget equal to
+  // the outer one guaranteed the OUTER timeout fired first on a slow
+  // health-check (e.g. CPU saturated by the embedding backfill) and the segment
+  // silently vanished. Keeping the inner budget well under the outer one turns
+  // "slow health-check" into a rendered "offline"/"updating" instead of a blank.
   report = parseReport(execFileSync(bin, ['health-check', '--format', 'json'], {
-    timeout: 3000,
+    timeout: 1500,
     stdio: ['pipe', 'pipe', 'pipe'],
     // Run the binary FROM the resolved root so its own project-root resolution
     // lands on the same DB the gate above picked (a subdir cwd would otherwise

package/claude-plugin/scripts/version-utils.js

@@ -3,12 +3,20 @@ const { execFileSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
-const VERSION_OUTPUT_RE = /^code-graph-mcp\s+(\d+\.\d+\.\d+)$/;
+// Tolerant match: the version line anywhere in the output (m flag), optional
+// "v" prefix, and anything after the numeric triple (build-metadata suffixes
+// like "1.2.3 (abc123)" or "-dev"). The old fully-anchored /^...$/ turned ANY
+// deviation into null, which upstream reads as "broken binary" → judged
+// permanently stale → re-download every session, with the fresh download
+// rejected by the same parse: a self-sustaining loop.
+const VERSION_OUTPUT_RE = /^code-graph-mcp\s+v?(\d+\.\d+\.\d+)/m;
 
 function readBinaryVersion(binaryPath) {
   try {
     const out = execFileSync(binaryPath, ['--version'], {
-      timeout: 2000,
+      // 5s: a cold exec of a freshly-written ~40MB binary (page-in, Windows AV
+      // scan) regularly exceeded the old 2s, misclassifying a good binary.
+      timeout: 5000,
       stdio: ['pipe', 'pipe', 'pipe'],
     }).toString().trim();
     const match = out.match(VERSION_OUTPUT_RE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph",
-  "version": "0.101.0",
+  "version": "0.102.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": {
@@ -36,10 +36,10 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "@sdsrs/code-graph-linux-x64": "0.101.0",
-    "@sdsrs/code-graph-linux-arm64": "0.101.0",
-    "@sdsrs/code-graph-darwin-x64": "0.101.0",
-    "@sdsrs/code-graph-darwin-arm64": "0.101.0",
-    "@sdsrs/code-graph-win32-x64": "0.101.0"
+    "@sdsrs/code-graph-linux-x64": "0.102.0",
+    "@sdsrs/code-graph-linux-arm64": "0.102.0",
+    "@sdsrs/code-graph-darwin-x64": "0.102.0",
+    "@sdsrs/code-graph-darwin-arm64": "0.102.0",
+    "@sdsrs/code-graph-win32-x64": "0.102.0"
   }
 }