code-graph-builder 0.7.0 → 0.9.0

package/bin/cli.mjs

@@ -10,16 +10,17 @@
  *   npx code-graph-builder --pip        # force python3 direct mode
  */
 
-import { spawn, execFileSync } from "node:child_process";
+import { spawn, execFileSync, execSync } from "node:child_process";
 import { createInterface } from "node:readline";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
+import { homedir, platform } from "node:os";
 import { join } from "node:path";
 
 const PYTHON_PACKAGE = "code-graph-builder";
 const MODULE_PATH = "code_graph_builder.mcp.server";
 const WORKSPACE_DIR = join(homedir(), ".code-graph-builder");
 const ENV_FILE = join(WORKSPACE_DIR, ".env");
+const IS_WIN = platform() === "win32";
 
 // ---------------------------------------------------------------------------
 // Utilities
@@ -27,16 +28,40 @@ const ENV_FILE = join(WORKSPACE_DIR, ".env");
 
 function commandExists(cmd) {
   try {
-    execFileSync("which", [cmd], { stdio: "pipe" });
+    // "which" on Unix/macOS, "where" on Windows
+    const checker = IS_WIN ? "where" : "which";
+    execFileSync(checker, [cmd], { stdio: "pipe" });
     return true;
   } catch {
     return false;
   }
 }
 
+/**
+ * Find a working Python command.  On Windows the command is typically
+ * "python" (the py-launcher or Store stub), while on Unix it is "python3".
+ * Returns the command string or null if none is found.
+ */
+function findPython() {
+  const candidates = IS_WIN
+    ? ["python", "python3", "py"]
+    : ["python3", "python"];
+  for (const cmd of candidates) {
+    try {
+      const ver = execFileSync(cmd, ["--version"], { stdio: "pipe" }).toString().trim();
+      // Ensure it is Python 3.x
+      if (ver.includes("3.")) return cmd;
+    } catch { /* skip */ }
+  }
+  return null;
+}
+
+const PYTHON_CMD = findPython();
+
 function pythonPackageInstalled() {
+  if (!PYTHON_CMD) return false;
   try {
-    execFileSync("python3", ["-c", `import ${MODULE_PATH.split(".")[0]}`], {
+    execFileSync(PYTHON_CMD, ["-c", `import ${MODULE_PATH.split(".")[0]}`], {
       stdio: "pipe",
     });
     return true;
@@ -260,7 +285,134 @@ async function runSetup() {
   log("  Embedding: " + embedDisplay);
   log("  Workspace: " + workspace);
   log("");
-  log("── Next steps ──────────────────────────────────────────────");
+
+  // --- Verify installation ---
+  log("── Verifying installation ──────────────────────────────────");
+  log("");
+
+  // Step 1: Python available?
+  if (!PYTHON_CMD) {
+    log("  ✗ Python 3 not found on PATH");
+    log("    Install Python 3.10+ and re-run: npx code-graph-builder --setup");
+    log("");
+    rl.close();
+    return;
+  }
+  log(`  ✓ Python found: ${PYTHON_CMD}`);
+
+  // Step 2: Package installed? If not, auto-install.
+  if (!pythonPackageInstalled()) {
+    log(`  … Installing ${PYTHON_PACKAGE} via pip...`);
+    const pip = findPip();
+    if (pip) {
+      try {
+        execSync(
+          [...pip, "install", PYTHON_PACKAGE].map(s => `"${s}"`).join(" "),
+          { stdio: "pipe", shell: true }
+        );
+      } catch { /* handled below */ }
+    }
+  }
+
+  if (pythonPackageInstalled()) {
+    log(`  ✓ Python package installed: ${PYTHON_PACKAGE}`);
+  } else {
+    log(`  ✗ Python package not installed`);
+    log(`    Run manually: pip install ${PYTHON_PACKAGE}`);
+    log("");
+    rl.close();
+    return;
+  }
+
+  // Step 3: MCP server smoke test — spawn server, send initialize, check tools/list
+  log("  … Starting MCP server smoke test...");
+
+  const verified = await new Promise((resolve) => {
+    const envVars = loadEnvFile();
+    const mergedEnv = { ...process.env, ...envVars };
+    if (!mergedEnv.CGB_WORKSPACE) mergedEnv.CGB_WORKSPACE = WORKSPACE_DIR;
+
+    const child = spawn(PYTHON_CMD, ["-m", MODULE_PATH], {
+      stdio: ["pipe", "pipe", "pipe"],
+      env: mergedEnv,
+      shell: IS_WIN,
+    });
+
+    let stdout = "";
+    let resolved = false;
+
+    const finish = (success, detail) => {
+      if (resolved) return;
+      resolved = true;
+      try { child.kill(); } catch {}
+      resolve({ success, detail });
+    };
+
+    // Timeout after 15s
+    const timer = setTimeout(() => finish(false, "Server did not respond within 15s"), 15000);
+
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+      // Look for a valid JSON-RPC response
+      const lines = stdout.split("\n");
+      for (const line of lines) {
+        // MCP uses Content-Length header framing
+        if (line.startsWith("{")) {
+          try {
+            const msg = JSON.parse(line);
+            if (msg.result && msg.result.capabilities) {
+              // Got initialize response, now request tools/list
+              const toolsReq =
+                `Content-Length: 80\r\n\r\n` +
+                JSON.stringify({ jsonrpc: "2.0", id: 2, method: "tools/list", params: {} });
+              child.stdin.write(toolsReq);
+              stdout = "";
+              return;
+            }
+            if (msg.result && msg.result.tools) {
+              clearTimeout(timer);
+              finish(true, `${msg.result.tools.length} tools available`);
+              return;
+            }
+          } catch { /* partial JSON, wait for more */ }
+        }
+      }
+    });
+
+    child.on("error", (err) => {
+      clearTimeout(timer);
+      finish(false, err.message);
+    });
+
+    child.on("exit", (code) => {
+      clearTimeout(timer);
+      if (!resolved) finish(false, `Server exited with code ${code}`);
+    });
+
+    // Send MCP initialize request
+    const initReq = JSON.stringify({
+      jsonrpc: "2.0",
+      id: 1,
+      method: "initialize",
+      params: {
+        protocolVersion: "2024-11-05",
+        capabilities: {},
+        clientInfo: { name: "setup-verify", version: "1.0.0" },
+      },
+    });
+    const header = `Content-Length: ${Buffer.byteLength(initReq)}\r\n\r\n`;
+    child.stdin.write(header + initReq);
+  });
+
+  if (verified.success) {
+    log(`  ✓ MCP server started successfully (${verified.detail})`);
+  } else {
+    log(`  ✗ MCP server smoke test failed: ${verified.detail}`);
+    log("    The server may still work — try: npx code-graph-builder --server");
+  }
+
+  log("");
+  log("── Setup complete ─────────────────────────────────────────");
   log("");
   log("  Add to your MCP client config:");
   log("");
@@ -268,7 +420,7 @@ async function runSetup() {
   log('    "mcpServers": {');
   log('      "code-graph-builder": {');
   log('        "command": "npx",');
-  log('        "args": ["-y", "code-graph-builder", "--server"]');
+  log('        "args": ["-y", "code-graph-builder@latest", "--server"]');
   log("      }");
   log("    }");
   log("  }");
@@ -294,6 +446,7 @@ function runServer(cmd, args) {
   const child = spawn(cmd, args, {
     stdio: "inherit",
     env: mergedEnv,
+    shell: IS_WIN,  // Windows needs shell for .cmd/.ps1 scripts (uvx, pipx, etc.)
   });
 
   child.on("error", (err) => {
@@ -306,25 +459,171 @@ function runServer(cmd, args) {
   });
 }
 
+/**
+ * Find a working pip command.  Returns [cmd, ...prefixArgs] or null.
+ * Tries: pip3, pip, python3 -m pip, python -m pip
+ */
+function findPip() {
+  // Standalone pip
+  for (const cmd of IS_WIN ? ["pip", "pip3"] : ["pip3", "pip"]) {
+    if (commandExists(cmd)) return [cmd];
+  }
+  // python -m pip fallback
+  if (PYTHON_CMD) {
+    try {
+      execFileSync(PYTHON_CMD, ["-m", "pip", "--version"], { stdio: "pipe" });
+      return [PYTHON_CMD, "-m", "pip"];
+    } catch { /* skip */ }
+  }
+  return null;
+}
+
+/**
+ * Auto-install the Python package via pip, then start the server.
+ */
+function autoInstallAndStart(extraArgs) {
+  const pip = findPip();
+  if (!pip) {
+    process.stderr.write(
+      `code-graph-builder requires Python 3.10+ with pip.\n\n` +
+        (PYTHON_CMD
+          ? `Python found (${PYTHON_CMD}) but pip is not available.\n\n`
+          : `Python 3 not found on PATH.\n\n`) +
+        `Please install Python 3.10+ first, then run:\n` +
+        `  npx code-graph-builder --server\n`
+    );
+    process.exit(1);
+  }
+
+  process.stderr.write(`Installing ${PYTHON_PACKAGE}...\n`);
+
+  try {
+    execSync(
+      [...pip, "install", PYTHON_PACKAGE].map(s => `"${s}"`).join(" "),
+      { stdio: "inherit", shell: true }
+    );
+  } catch (err) {
+    process.stderr.write(
+      `\nFailed to install ${PYTHON_PACKAGE}.\n` +
+        `Try manually: ${pip.join(" ")} install ${PYTHON_PACKAGE}\n`
+    );
+    process.exit(1);
+  }
+
+  // Verify installation succeeded
+  if (!pythonPackageInstalled()) {
+    process.stderr.write(
+      `\nInstallation completed but package not importable.\n` +
+        `Try manually: ${pip.join(" ")} install ${PYTHON_PACKAGE}\n`
+    );
+    process.exit(1);
+  }
+
+  process.stderr.write(`${PYTHON_PACKAGE} installed successfully.\n`);
+  runServer(PYTHON_CMD, ["-m", MODULE_PATH]);
+}
+
+// ---------------------------------------------------------------------------
+// Uninstall — remove Python package, config, workspace data, Claude MCP entry
+// ---------------------------------------------------------------------------
+
+async function runUninstall() {
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  const ask = (q) => new Promise((resolve) => rl.question(q, resolve));
+  const log = (msg) => process.stderr.write(msg + "\n");
+
+  log("");
+  log("╔══════════════════════════════════════════════════════════╗");
+  log("║        code-graph-builder  Uninstall                    ║");
+  log("╚══════════════════════════════════════════════════════════╝");
+  log("");
+
+  // 1. Show what will be removed
+  const pip = findPip();
+  const hasPythonPkg = pythonPackageInstalled();
+  const hasWorkspace = existsSync(WORKSPACE_DIR);
+  const hasEnv = existsSync(ENV_FILE);
+
+  // Check Claude Code MCP config
+  let hasClaudeConfig = false;
+  try {
+    execFileSync("claude", ["mcp", "list"], { stdio: "pipe" });
+    hasClaudeConfig = true;
+  } catch { /* claude CLI not available */ }
+
+  log("  The following will be removed:");
+  log("");
+  if (hasPythonPkg) log("    ✓ Python package: code-graph-builder");
+  else              log("    - Python package: not installed");
+  if (hasWorkspace)  log(`    ✓ Workspace data: ${WORKSPACE_DIR}`);
+  else               log("    - Workspace data: not found");
+  if (hasEnv)        log(`    ✓ Config file:    ${ENV_FILE}`);
+  if (hasClaudeConfig) log("    ✓ Claude Code MCP server entry");
+  log("");
+
+  const answer = (await ask("  Proceed with uninstall? [y/N]: ")).trim().toLowerCase();
+  rl.close();
+
+  if (answer !== "y" && answer !== "yes") {
+    log("\n  Uninstall cancelled.\n");
+    process.exit(0);
+  }
+
+  log("");
+
+  // 2. Remove Claude Code MCP entry
+  if (hasClaudeConfig) {
+    try {
+      execSync("claude mcp remove code-graph-builder", { stdio: "pipe", shell: true });
+      log("  ✓ Removed Claude Code MCP entry");
+    } catch {
+      log("  ⚠ Could not remove Claude Code MCP entry (may not exist)");
+    }
+  }
+
+  // 3. Uninstall Python package
+  if (hasPythonPkg && pip) {
+    try {
+      execSync(
+        [...pip, "uninstall", "-y", PYTHON_PACKAGE].map(s => `"${s}"`).join(" "),
+        { stdio: "inherit", shell: true }
+      );
+      log("  ✓ Uninstalled Python package");
+    } catch {
+      log("  ⚠ Failed to uninstall Python package. Try manually: pip uninstall code-graph-builder");
+    }
+  }
+
+  // 4. Remove workspace data
+  if (hasWorkspace) {
+    const { rmSync } = await import("node:fs");
+    try {
+      rmSync(WORKSPACE_DIR, { recursive: true, force: true });
+      log(`  ✓ Removed workspace: ${WORKSPACE_DIR}`);
+    } catch (err) {
+      log(`  ⚠ Failed to remove workspace: ${err.message}`);
+    }
+  }
+
+  log("");
+  log("  Uninstall complete.");
+  log("  To also clear the npx cache: npx clear-npx-cache");
+  log("");
+}
+
 function startServer(extraArgs = []) {
-  if (commandExists("uvx")) {
+  // Prefer pip-installed package first (most reliable, includes all deps)
+  if (pythonPackageInstalled()) {
+    runServer(PYTHON_CMD, ["-m", MODULE_PATH]);
+  } else if (commandExists("uvx")) {
     runServer("uvx", [PYTHON_PACKAGE, ...extraArgs]);
   } else if (commandExists("uv")) {
     runServer("uv", ["tool", "run", PYTHON_PACKAGE, ...extraArgs]);
   } else if (commandExists("pipx")) {
     runServer("pipx", ["run", PYTHON_PACKAGE, ...extraArgs]);
-  } else if (pythonPackageInstalled()) {
-    runServer("python3", ["-m", MODULE_PATH]);
   } else {
-    process.stderr.write(
-      `code-graph-builder requires Python 3.10+.\n\n` +
-        `Install options:\n` +
-        `  1. pip install ${PYTHON_PACKAGE}\n` +
-        `  2. curl -LsSf https://astral.sh/uv/install.sh | sh  (installs uv)\n` +
-        `  3. pip install pipx\n\n` +
-        `Then run: npx code-graph-builder --server\n`
-    );
-    process.exit(1);
+    // Auto-install via pip
+    autoInstallAndStart(extraArgs);
   }
 }
 
@@ -341,25 +640,28 @@ if (mode === "--setup") {
 } else if (mode === "--server" || mode === "--pip" || mode === "--python") {
   // Start MCP server directly
   if (mode === "--pip" || mode === "--python") {
-    if (!pythonPackageInstalled()) {
+    if (!PYTHON_CMD || !pythonPackageInstalled()) {
       process.stderr.write(
         `Error: Python package '${PYTHON_PACKAGE}' is not installed.\n` +
           `Run: pip install ${PYTHON_PACKAGE}\n`
       );
       process.exit(1);
     }
-    runServer("python3", ["-m", MODULE_PATH]);
+    runServer(PYTHON_CMD, ["-m", MODULE_PATH]);
   } else {
     startServer(args.slice(1));
   }
+} else if (mode === "--uninstall") {
+  runUninstall();
 } else if (mode === "--help" || mode === "-h") {
   process.stderr.write(
     `code-graph-builder - Code knowledge graph MCP server\n\n` +
       `Usage:\n` +
-      `  npx code-graph-builder            Interactive setup wizard\n` +
-      `  npx code-graph-builder --server   Start MCP server\n` +
-      `  npx code-graph-builder --setup    Re-run setup wizard\n` +
-      `  npx code-graph-builder --help     Show this help\n\n` +
+      `  npx code-graph-builder              Interactive setup wizard\n` +
+      `  npx code-graph-builder --server     Start MCP server\n` +
+      `  npx code-graph-builder --setup      Re-run setup wizard\n` +
+      `  npx code-graph-builder --uninstall  Completely uninstall\n` +
+      `  npx code-graph-builder --help       Show this help\n\n` +
       `Config: ${ENV_FILE}\n`
   );
 } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-graph-builder",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Code knowledge graph builder with MCP server for AI-assisted code navigation",
   "license": "MIT",
   "bin": {