@chikhamx/voidx 2.1.0 → 2.1.1

package/bin/postinstall.js

@@ -61,7 +61,8 @@ function resolvePythonDir(env) {
 
 function resolveVenvDir(env) {
   if (env.VOIDX_NPM_VENV) return path.resolve(env.VOIDX_NPM_VENV);
-  return path.join(resolveDataHome(env), "voidx", "npm-venv");
+  // Use the same venv directory as install.sh — single environment, no duplicates
+  return path.join(resolveDataHome(env), "voidx", "venv");
 }
 
 function resolveVenvPython(venvDir) {
@@ -87,6 +88,77 @@ function resolveBundledPython(pythonDir, platform) {
   return path.join(installDir, "bin", "python3");
 }
 
+// ── Legacy cleanup ──────────────────────────────────────────────────────────
+// Remove voidx installed via system Python (pip/pipx) from v1.x era,
+// and old npm-venv directory from v2.x early releases.
+function cleanupLegacy(env) {
+  const isWin = process.platform === "win32";
+
+  // pip
+  for (const cmd of isWin ? ["pip"] : ["pip3", "pip"]) {
+    try {
+      const result = spawnSync(cmd, ["show", "voidx"], {
+        encoding: "utf8",
+        windowsHide: true,
+      });
+      if (!result.error && result.status === 0 && (result.stdout || "").includes("Name: voidx")) {
+        const versionMatch = (result.stdout || "").match(/Version:\s*(\S+)/);
+        const version = versionMatch ? versionMatch[1] : "unknown";
+        console.error(`  ⚠️  Found pip-installed voidx ${version} (${cmd}), uninstalling…`);
+        const uninstallResult = spawnSync(cmd, ["uninstall", "voidx", "-y"], {
+          encoding: "utf8",
+          windowsHide: true,
+          stdio: "inherit",
+        });
+        if (uninstallResult.status === 0) {
+          console.error("  ✅ Uninstalled pip-installed voidx");
+        } else {
+          console.error(`  ⚠️  Failed to uninstall voidx via ${cmd}. Run manually: ${cmd} uninstall voidx`);
+        }
+      }
+    } catch (err) {
+      // spawnSync sets result.error for ENOENT (handled by status check above);
+      // this catch only handles truly unexpected synchronous throws.
+      console.error(`  ⚠️  Failed to check ${cmd}: ${err.message}`);
+    }
+  }
+
+  // pipx
+  try {
+    const result = spawnSync("pipx", ["list"], { encoding: "utf8", windowsHide: true });
+    if (!result.error && result.status === 0 && /^voidx\b/m.test(result.stdout || "")) {
+      console.error("  ⚠️  Found pipx-installed voidx, uninstalling…");
+      const uninstallResult = spawnSync("pipx", ["uninstall", "voidx"], {
+        encoding: "utf8",
+        windowsHide: true,
+        stdio: "inherit",
+      });
+      if (uninstallResult.status === 0) {
+        console.error("  ✅ Uninstalled pipx-installed voidx");
+      } else {
+        console.error("  ⚠️  Failed to uninstall voidx via pipx. Run manually: pipx uninstall voidx");
+      }
+    }
+  } catch (err) {
+    // spawnSync sets result.error for ENOENT (handled by status check above);
+    // this catch only handles truly unexpected synchronous throws.
+    console.error(`  ⚠️  Failed to check pipx: ${err.message}`);
+  }
+
+  // Old npm-venv directory
+  const dataHome = resolveDataHome(env);
+  const oldNpmVenv = path.join(dataHome, "voidx", "npm-venv");
+  if (existsSync(oldNpmVenv)) {
+    console.error("  ⚠️  Found old npm-venv directory, removing…");
+    try {
+      rmSync(oldNpmVenv, { recursive: true, force: true });
+      console.error("  ✅ Removed old npm-venv directory");
+    } catch (err) {
+      console.error(`  Failed to remove old npm-venv: ${err.message}`);
+    }
+  }
+}
+
 // ── Download with retry ────────────────────────────────────────────────────
 const MAX_DOWNLOAD_RETRIES = 3;
 
@@ -239,8 +311,14 @@ async function main() {
   const venvPython = resolveVenvPython(venvDir);
   const executable = resolveVoidxExecutable(venvDir);
   const packageSpec = env.VOIDX_NPM_PACKAGE_SPEC || `voidx==${pkg.version}`;
-  const markerPath = path.join(venvDir, ".voidx-npm-version");
-  const marker = `${pkg.version}\n${packageSpec}\n${PBS_TAG}\n${PBS_CPYTHON}\n`;
+  const markerPath = path.join(venvDir, ".voidx-install-version");
+  const marker = `${pkg.version}\n${PBS_TAG}\n${PBS_CPYTHON}\n`;
+
+  // ── Legacy cleanup ────────────────────────────────────────────────────────
+  // Remove voidx installed via system Python (pip/pipx) from v1.x era.
+  // Also remove old npm-venv directory from v2.x early releases.
+  // Runs before marker check so legacy cleanup happens even when already installed.
+  cleanupLegacy(env);
 
   // Already set up and up-to-date?
   if (existsSync(executable) && readMarker(markerPath) === marker) {

package/bin/voidx.js

@@ -11,6 +11,7 @@ const pkg = require("../package.json");
 // ── Configuration ──────────────────────────────────────────────────────────
 
 const PBS_TAG = "20260602";
+const PBS_CPYTHON = "3.12.13";
 const PBS_PYTHON_MAJOR = "3.12";
 
 // ── Main ───────────────────────────────────────────────────────────────────
@@ -56,7 +57,7 @@ function selectPython(env) {
     return candidate;
   }
 
-  // 2. Bundled Python (preferred)
+  // 2. Bundled Python only — voidx runs in its own isolated environment
   const bundledBin = resolveBundledPythonBin(env);
   if (bundledBin && fs.existsSync(bundledBin)) {
     const candidate = { command: bundledBin, args: [], label: "bundled" };
@@ -66,41 +67,34 @@ function selectPython(env) {
     }
   }
 
-  // 3. System Python fallback (for upgrades from v1.x where bundled Python was not used)
-  const candidates = [
-    { command: "python3", args: [], label: "python3" },
-    { command: "python", args: [], label: "python" },
-    { command: "python3.13", args: [], label: "python3.13" },
-    { command: "python3.12", args: [], label: "python3.12" },
-    { command: "python3.11", args: [], label: "python3.11" },
-  ];
-  if (process.platform === "win32") {
-    candidates.push({ command: "py", args: ["-3"], label: "py -3" });
+  // 3. Bundled Python not found — try to bootstrap it (postinstall may have failed)
+  console.error("\n⚙️  Bundled Python not found, running setup…\n");
+  const postinstallScript = path.join(path.dirname(__filename), "postinstall.js");
+  if (fs.existsSync(postinstallScript)) {
+    const result = spawnSync(process.execPath, [postinstallScript], {
+      stdio: "inherit",
+      windowsHide: true,
+      env: { ...env },
+    });
+    if (result.status !== 0) {
+      console.error("  Setup failed. Try reinstalling:");
+      console.error("    npm install -g @chikhamx/voidx");
+    }
   }
 
-  const oldVersions = [];
-  for (const candidate of candidates) {
+  // Retry after bootstrap
+  if (bundledBin && fs.existsSync(bundledBin)) {
+    const candidate = { command: bundledBin, args: [], label: "bundled" };
     const probe = probePython(candidate);
-    if (!probe.ok) {
-      continue;
-    }
-    if (isCompatible(probe.version)) {
+    if (probe.ok && isCompatible(probe.version)) {
       return candidate;
     }
-    oldVersions.push(`${probe.versionText} at ${candidate.label}`);
   }
 
-  if (oldVersions.length > 0) {
-    throw new Error(
-      `voidx requires Python 3.11+. Found ${oldVersions.join(", ")}.\n` +
-      "Install Python 3.11+ or reinstall the npm package to get the bundled runtime:\n" +
-      "  npm install -g @chikhamx/voidx"
-    );
-  }
   throw new Error(
-    "voidx requires Python 3.11+. No Python found.\n" +
-    "Install Python 3.11+ or reinstall the npm package to get the bundled runtime:\n" +
-    "  npm install -g @chikhamx/voidx"
+    "voidx bundled Python not found. Reinstall to set up the isolated runtime:\n" +
+    "  npm install -g @chikhamx/voidx\n" +
+    "  or: curl -fsSL https://raw.githubusercontent.com/chikhamx/voidx/master/scripts/install.sh | bash"
   );
 }
 
@@ -162,14 +156,15 @@ function resolveBundledPythonBin(env) {
   const pythonDir = resolvePythonDir(env);
   return process.platform === "win32"
     ? path.join(pythonDir, "python", "python.exe")
-    : path.join(pythonDir, "python", "bin", `python${PBS_PYTHON_MAJOR}`);
+    : path.join(pythonDir, "python", "bin", "python3");
 }
 
 function resolveVenvDir(env) {
   if (env.VOIDX_NPM_VENV) {
     return path.resolve(env.VOIDX_NPM_VENV);
   }
-  return path.join(resolveDataHome(env), "voidx", "npm-venv");
+  // Use the same venv directory as install.sh — single environment, no duplicates
+  return path.join(resolveDataHome(env), "voidx", "venv");
 }
 
 function resolveVenvPython(venvDir) {
@@ -195,12 +190,10 @@ function ensureVenv(python, venvDir, env) {
     return;
   }
 
-  const markerPath = path.join(venvDir, ".voidx-npm-version");
-  const packageSpec = env.VOIDX_NPM_PACKAGE_SPEC || `voidx==${pkg.version}`;
-  // Marker must match postinstall.js format (includes PBS_TAG + PBS_CPYTHON)
-  const marker = `${pkg.version}\n${packageSpec}\n${PBS_TAG}\n3.12.13\n`;
+  const markerPath = path.join(venvDir, ".voidx-install-version");
+  const marker = `${pkg.version}\n${PBS_TAG}\n${PBS_CPYTHON}\n`;
   if (fs.existsSync(executable) && readFile(markerPath) === marker) {
-    debug(env, `Using cached npm-managed environment at ${venvDir}`);
+    debug(env, `Using cached environment at ${venvDir}`);
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chikhamx/voidx",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "npm launcher for voidx, a terminal AI coding agent.",
   "bin": {
     "voidx": "bin/voidx.js"