code-graph-builder 0.6.0 → 0.8.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;
@@ -268,7 +293,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 +319,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,6 +332,70 @@ 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]);
+}
+
 function startServer(extraArgs = []) {
   if (commandExists("uvx")) {
     runServer("uvx", [PYTHON_PACKAGE, ...extraArgs]);
@@ -314,17 +404,10 @@ function startServer(extraArgs = []) {
   } else if (commandExists("pipx")) {
     runServer("pipx", ["run", PYTHON_PACKAGE, ...extraArgs]);
   } else if (pythonPackageInstalled()) {
-    runServer("python3", ["-m", MODULE_PATH]);
+    runServer(PYTHON_CMD, ["-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,14 +424,14 @@ 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));
   }

package/package.json

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