@chikhamx/voidx 1.0.1 → 1.1.0

package/bin/postinstall.js

@@ -1,64 +1,319 @@
 #!/usr/bin/env node
 "use strict";
 
-// Lightweight environment check that runs after npm install.
-// Detects Python 3.11+ and prints a hint if missing. Never blocks installation.
+// Post-install: download a standalone Python, create venv, pip install voidx.
+// Falls back to system Python if download fails.
 
+const { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } = require("fs");
 const { spawnSync } = require("child_process");
+const { get, request } = require("https");
+const { createGunzip } = require("zlib");
+const { pipeline } = require("stream/promises");
+const { createUnzip } = require("zlib");
+const { join, dirname } = require("path");
+const os = require("os");
+const fs = require("fs");
+const path = require("path");
+const { execSync } = require("child_process");
 
-function main() {
-  const probe = detectPython();
-  if (probe.ok) {
-    console.error(`\n✅ voidx: Python ${probe.versionText} found at "${probe.path}"\n`);
-    return;
+const pkg = require("../package.json");
+
+// ── Python build metadata ──────────────────────────────────────────────────
+// Pin to a specific python-build-standalone release tag and CPython version.
+// Update these when upgrading the bundled Python.
+const PBS_TAG = "20260602";
+const PBS_CPYTHON = "3.12.13";
+const PBS_RELEASE_BASE = `https://github.com/astral-sh/python-build-standalone/releases/download/${PBS_TAG}`;
+
+// ── Platform mapping ───────────────────────────────────────────────────────
+function getPlatformInfo() {
+  const platform = os.platform();
+  const arch = os.arch();
+
+  const map = {
+    "darwin-arm64":  { target: "aarch64-apple-darwin" },
+    "darwin-x64":    { target: "x86_64-apple-darwin" },
+    "linux-arm64":   { target: "aarch64-unknown-linux-gnu" },
+    "linux-x64":     { target: "x86_64-unknown-linux-gnu" },
+    "win32-arm64":   { target: "aarch64-pc-windows-msvc" },
+    "win32-x64":     { target: "x86_64-pc-windows-msvc" },
+  };
+
+  const key = `${platform}-${arch}`;
+  const entry = map[key];
+  if (!entry) {
+    return null;
+  }
+  return { platform, arch, target: entry.target };
+}
+
+function getPbsFilename(target) {
+  return `cpython-${PBS_CPYTHON}+${PBS_TAG}-${target}-install_only_stripped.tar.gz`;
+}
+
+// ── Paths ──────────────────────────────────────────────────────────────────
+function resolveDataHome(env) {
+  if (env.VOIDX_NPM_HOME) return path.resolve(env.VOIDX_NPM_HOME);
+  if (process.platform === "win32") {
+    return env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
+  }
+  return env.XDG_DATA_HOME || path.join(os.homedir(), ".local", "share");
+}
+
+function resolvePythonDir(env) {
+  return path.join(resolveDataHome(env), "voidx", "python");
+}
+
+function resolveVenvDir(env) {
+  if (env.VOIDX_NPM_VENV) return path.resolve(env.VOIDX_NPM_VENV);
+  return path.join(resolveDataHome(env), "voidx", "npm-venv");
+}
+
+function resolveVenvPython(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "python.exe")
+    : path.join(venvDir, "bin", "python");
+}
+
+function resolveVoidxExecutable(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "voidx.exe")
+    : path.join(venvDir, "bin", "voidx");
+}
+
+function resolveBundledPython(pythonDir, platform) {
+  // install_only_stripped layout:
+  //   unix:   python/python/bin/python3
+  //   win32:  python/python/python.exe
+  const installDir = path.join(pythonDir, "python");
+  if (platform === "win32") {
+    return path.join(installDir, "python.exe");
+  }
+  return path.join(installDir, "bin", "python3");
+}
+
+// ── Download ───────────────────────────────────────────────────────────────
+function downloadFile(url, dest) {
+  return new Promise((resolve, reject) => {
+    const doRequest = (currentUrl, redirects = 0) => {
+      if (redirects > 5) {
+        return reject(new Error(`Too many redirects downloading ${url}`));
+      }
+      const mod = currentUrl.startsWith("https") ? require("https") : require("http");
+      mod.get(currentUrl, { timeout: 60000 }, (res) => {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          return doRequest(res.headers.location, redirects + 1);
+        }
+        if (res.statusCode !== 200) {
+          return reject(new Error(`HTTP ${res.statusCode} downloading ${currentUrl}`));
+        }
+        const total = parseInt(res.headers["content-length"] || "0", 10);
+        let downloaded = 0;
+        let lastPercent = -1;
+
+        res.on("data", (chunk) => {
+          downloaded += chunk.length;
+          if (total > 0) {
+            const pct = Math.floor((downloaded / total) * 100);
+            if (pct !== lastPercent && pct % 10 === 0) {
+              lastPercent = pct;
+              process.stderr.write(`    ${pct}% (${Math.round(downloaded / 1024 / 1024)}/${Math.round(total / 1024 / 1024)} MB)\n`);
+            }
+          }
+        });
+
+        const stream = createWriteStream(dest);
+        res.pipe(stream);
+        stream.on("finish", () => {
+          stream.close();
+          resolve(dest);
+        });
+        stream.on("error", reject);
+        res.on("error", reject);
+      }).on("error", reject);
+    };
+    doRequest(url);
+  });
+}
+
+// ── Extract ────────────────────────────────────────────────────────────────
+function extractTarGz(archive, destDir) {
+  // Use the system tar command — available on macOS, Linux, and modern Windows (10+)
+  const result = spawnSync("tar", ["-xzf", archive, "-C", destDir], {
+    encoding: "utf8",
+    windowsHide: true,
+  });
+  if (result.error) {
+    throw new Error(`Failed to extract Python: ${result.error.message}`);
   }
+  if (result.status !== 0) {
+    throw new Error(`Failed to extract Python (tar exited ${result.status}).`);
+  }
+}
+
+// ── Version marker ─────────────────────────────────────────────────────────
+function readMarker(markerPath) {
+  try { return readFileSync(markerPath, "utf8"); } catch { return ""; }
+}
 
-  console.error("\n⚠️  voidx requires Python 3.11+, but no compatible Python was found.\n");
-  console.error(hint());
-  console.error(`\nOnce Python 3.11+ is installed, voidx will bootstrap the rest on first run.\n`);
+function writeMarker(markerPath, content) {
+  mkdirSync(dirname(markerPath), { recursive: true });
+  writeFileSync(markerPath, content);
+}
+
+// ── pip install ────────────────────────────────────────────────────────────
+function pipInstall(venvPython, packageSpec, env) {
+  const pipEnv = Object.assign({}, env, {
+    PIP_NO_INPUT: "1",
+    PIP_DISABLE_PIP_VERSION_CHECK: "1",
+    PYTHON_KEYRING_BACKEND: "keyring.backends.null.Keyring",
+  });
+  const result = spawnSync(
+    venvPython,
+    ["-m", "pip", "install", "--upgrade", "--progress-bar", "on", packageSpec],
+    { encoding: "utf8", stdio: "inherit", windowsHide: true, env: pipEnv }
+  );
+  if (result.error) {
+    throw new Error(`pip install failed: ${result.error.message}`);
+  }
+  if (result.status !== 0) {
+    throw new Error("pip install failed. See errors above.");
+  }
 }
 
-function detectPython() {
+// ── System Python fallback ─────────────────────────────────────────────────
+function probeSystemPython() {
   const candidates = [
-    "python3", "python",
-    "python3.13", "python3.12", "python3.11",
+    { command: "python3", args: [] },
+    { command: "python", args: [] },
+    { command: "python3.12", args: [] },
+    { command: "python3.11", args: [] },
   ];
   if (process.platform === "win32") {
-    candidates.push("py");
+    candidates.push({ command: "py", args: ["-3"] });
   }
 
-  for (const cmd of candidates) {
-    const args = process.platform === "win32" && cmd === "py" ? ["-3.11"] : [];
-    const result = spawnSync(cmd, [...args, "-c", "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}')"], {
-      encoding: "utf8",
-      windowsHide: true,
-    });
+  for (const candidate of candidates) {
+    const result = spawnSync(
+      candidate.command,
+      [...candidate.args, "-c", "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')"],
+      { encoding: "utf8", windowsHide: true }
+    );
     if (result.error || result.status !== 0) continue;
-    const versionText = (result.stdout || "").trim();
-    const match = /^(\d+)\.(\d+)\.\d+/.exec(versionText);
+    const ver = (result.stdout || "").trim();
+    const match = /^(\d+)\.(\d+)/.exec(ver);
     if (!match) continue;
-    const major = Number.parseInt(match[1], 10);
-    const minor = Number.parseInt(match[2], 10);
+    const major = parseInt(match[1], 10);
+    const minor = parseInt(match[2], 10);
     if (major > 3 || (major === 3 && minor >= 11)) {
-      return { ok: true, versionText, path: cmd };
+      return { command: candidate.command, args: candidate.args };
     }
   }
-  return { ok: false };
+  return null;
 }
 
-function hint() {
-  if (process.platform === "darwin") {
-    return "  Install:  brew install python@3.12";
+// ── Main ───────────────────────────────────────────────────────────────────
+async function main() {
+  const env = process.env;
+  const venvDir = resolveVenvDir(env);
+  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`;
+
+  // Already set up and up-to-date?
+  if (existsSync(executable) && readMarker(markerPath) === marker) {
+    console.error(`\n✅ voidx ${pkg.version} ready (cached)\n`);
+    return;
   }
-  if (process.platform === "linux") {
-    return "  Install via your package manager, e.g.:\n" +
-           "    sudo apt install python3.12    (Debian/Ubuntu)\n" +
-           "    sudo dnf install python3.12    (Fedora)";
+
+  // Step 1: Get a Python interpreter (bundled or system)
+  let pythonForVenv;
+  const platformInfo = getPlatformInfo();
+
+  if (platformInfo && env.VOIDX_NPM_SKIP_BUNDLED_PYTHON !== "1") {
+    console.error(`\n🐍 Setting up voidx ${pkg.version}…\n`);
+    console.error("  [1/3] Downloading Python runtime…");
+
+    const pythonDir = resolvePythonDir(env);
+    const pbsFilename = getPbsFilename(platformInfo.target);
+    const pbsUrl = `${PBS_RELEASE_BASE}/${pbsFilename}`;
+    const archivePath = path.join(pythonDir, pbsFilename);
+    const bundledPython = resolveBundledPython(pythonDir, platformInfo.platform);
+
+    if (!existsSync(bundledPython)) {
+      try {
+        mkdirSync(pythonDir, { recursive: true });
+
+        if (!existsSync(archivePath)) {
+          console.error(`    Downloading ${pbsFilename}…`);
+          await downloadFile(pbsUrl, archivePath);
+          console.error("    Download complete.");
+        }
+
+        console.error("    Extracting Python runtime…");
+        extractTarGz(archivePath, pythonDir);
+        console.error("    Extraction complete.");
+
+        // Clean up archive to save disk
+        try { fs.unlinkSync(archivePath); } catch {}
+      } catch (err) {
+        console.error(`\n  ⚠️  Bundled Python download failed: ${err.message}`);
+        console.error("  Falling back to system Python…\n");
+      }
+    } else {
+      console.error("    Using cached Python runtime.");
+    }
+
+    if (existsSync(bundledPython)) {
+      pythonForVenv = { command: bundledPython, args: [], label: "bundled" };
+    }
   }
-  if (process.platform === "win32") {
-    return "  Install:  https://python.org/downloads";
+
+  // Fallback to system Python
+  if (!pythonForVenv) {
+    const sysPython = probeSystemPython();
+    if (sysPython) {
+      pythonForVenv = sysPython;
+      console.error("\n  Using system Python.\n");
+    } else {
+      console.error("\n  ❌ No Python 3.11+ found. Please install Python 3.11+ and run voidx again.\n");
+      console.error("     macOS:   brew install python@3.12");
+      console.error("     Linux:   sudo apt install python3.12");
+      console.error("     Windows: https://python.org/downloads\n");
+      process.exit(1);
+    }
   }
-  return "  Install Python 3.11+ from https://python.org/downloads";
+
+  // Step 2: Create venv
+  console.error("  [2/3] Creating virtual environment…");
+  if (!existsSync(venvPython)) {
+    const venvResult = spawnSync(
+      pythonForVenv.command,
+      [...pythonForVenv.args, "-m", "venv", venvDir],
+      { encoding: "utf8", stdio: "inherit", windowsHide: true }
+    );
+    if (venvResult.error) {
+      console.error(`\n  ❌ Failed to create venv: ${venvResult.error.message}\n`);
+      process.exit(1);
+    }
+    if (venvResult.status !== 0) {
+      console.error("\n  ❌ Failed to create venv. See errors above.\n");
+      process.exit(1);
+    }
+  }
+
+  // Step 3: pip install
+  console.error("  [3/3] Installing voidx and dependencies…");
+  pipInstall(venvPython, packageSpec, env);
+
+  // Done
+  writeMarker(markerPath, marker);
+  console.error(`\n✅ voidx ${pkg.version} installed! Run: voidx\n`);
 }
 
-main();
+main().catch((err) => {
+  console.error(`\n❌ Setup failed: ${err.message}\n`);
+  process.exit(1);
+});

package/bin/voidx.js

@@ -8,6 +8,13 @@ const path = require("path");
 
 const pkg = require("../package.json");
 
+// ── Configuration ──────────────────────────────────────────────────────────
+
+const PBS_TAG = "20260602";
+const PBS_PYTHON_MAJOR = "3.12";
+
+// ── Main ───────────────────────────────────────────────────────────────────
+
 function main(argv = process.argv.slice(2), env = process.env) {
   try {
     const python = selectPython(env);
@@ -23,14 +30,17 @@ function main(argv = process.argv.slice(2), env = process.env) {
       process.exit(code === null ? 1 : code);
     });
     child.on("error", (error) => {
-      fail(`Failed to start voidx from npm-managed environment: ${error.message}`);
+      fail(`Failed to start voidx: ${error.message}`);
     });
   } catch (error) {
     fail(error.message);
   }
 }
 
+// ── Python selection ───────────────────────────────────────────────────────
+
 function selectPython(env) {
+  // 1. Explicit override
   const explicit = env.VOIDX_PYTHON;
   if (explicit) {
     const candidate = { command: explicit, args: [], label: explicit };
@@ -46,6 +56,17 @@ function selectPython(env) {
     return candidate;
   }
 
+  // 2. Bundled Python (downloaded by postinstall)
+  const bundledBin = resolveBundledPythonBin(env);
+  if (bundledBin && fs.existsSync(bundledBin)) {
+    const candidate = { command: bundledBin, args: [], label: "bundled" };
+    const probe = probePython(candidate);
+    if (probe.ok && isCompatible(probe.version)) {
+      return candidate;
+    }
+  }
+
+  // 3. System Python
   const candidates = [
     { command: "python3", args: [], label: "python3" },
     { command: "python", args: [], label: "python" },
@@ -54,7 +75,7 @@ function selectPython(env) {
     { command: "python3.11", args: [], label: "python3.11" },
   ];
   if (process.platform === "win32") {
-    candidates.push({ command: "py", args: ["-3.11"], label: "py -3.11" });
+    candidates.push({ command: "py", args: ["-3"], label: "py -3" });
   }
 
   const oldVersions = [];
@@ -76,26 +97,10 @@ function selectPython(env) {
     );
   }
   throw new Error(
-    `voidx npm launcher requires Python 3.11+. ${hint}`
+    `voidx requires Python 3.11+. No Python found.\n${hint}`
   );
 }
 
-function pythonHint() {
-  if (process.platform === "darwin") {
-    return "Install Python 3.11+ via: brew install python@3.12\n" +
-      "Or point to an existing install: VOIDX_PYTHON=/path/to/python3 voidx";
-  }
-  if (process.platform === "linux") {
-    return "Install Python 3.11+ via your package manager (apt/dnf).\n" +
-      "Or point to an existing install: VOIDX_PYTHON=/path/to/python3 voidx";
-  }
-  if (process.platform === "win32") {
-    return "Install Python 3.11+ from https://python.org/downloads\n" +
-      "Or: VOIDX_PYTHON=C:\\Python312\\python.exe voidx";
-  }
-  return "Install Python 3.11+ or set VOIDX_PYTHON.";
-}
-
 function probePython(candidate) {
   const code = [
     "import sys",
@@ -131,6 +136,69 @@ function isCompatible(version) {
   return version[0] > 3 || (version[0] === 3 && version[1] >= 11);
 }
 
+function pythonHint() {
+  if (process.platform === "darwin") {
+    return "Install Python 3.11+ via: brew install python@3.12\n" +
+      "Or reinstall voidx to get the bundled Python.";
+  }
+  if (process.platform === "linux") {
+    return "Install Python 3.11+ via your package manager (apt/dnf).\n" +
+      "Or reinstall voidx to get the bundled Python.";
+  }
+  if (process.platform === "win32") {
+    return "Install Python 3.11+ from https://python.org/downloads\n" +
+      "Or reinstall voidx to get the bundled Python.";
+  }
+  return "Install Python 3.11+ or reinstall voidx.";
+}
+
+// ── Paths ──────────────────────────────────────────────────────────────────
+
+function resolveDataHome(env) {
+  if (env.VOIDX_NPM_HOME) {
+    return path.resolve(env.VOIDX_NPM_HOME);
+  }
+  if (process.platform === "win32") {
+    return env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
+  }
+  return env.XDG_DATA_HOME || path.join(os.homedir(), ".local", "share");
+}
+
+function resolvePythonDir(env) {
+  if (env.VOIDX_NPM_PYTHON_DIR) {
+    return path.resolve(env.VOIDX_NPM_PYTHON_DIR);
+  }
+  return path.join(resolveDataHome(env), "voidx", "python");
+}
+
+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}`);
+}
+
+function resolveVenvDir(env) {
+  if (env.VOIDX_NPM_VENV) {
+    return path.resolve(env.VOIDX_NPM_VENV);
+  }
+  return path.join(resolveDataHome(env), "voidx", "npm-venv");
+}
+
+function resolveVenvPython(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "python.exe")
+    : path.join(venvDir, "bin", "python");
+}
+
+function resolveVoidxExecutable(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "voidx.exe")
+    : path.join(venvDir, "bin", "voidx");
+}
+
+// ── Venv setup ─────────────────────────────────────────────────────────────
+
 function ensureVenv(python, venvDir, env) {
   const executable = resolveVoidxExecutable(venvDir);
   if (env.VOIDX_NPM_SKIP_BOOTSTRAP === "1") {
@@ -142,7 +210,8 @@ function ensureVenv(python, venvDir, env) {
 
   const markerPath = path.join(venvDir, ".voidx-npm-version");
   const packageSpec = env.VOIDX_NPM_PACKAGE_SPEC || `voidx==${pkg.version}`;
-  const marker = `${pkg.version}\n${packageSpec}\n`;
+  // Marker must match postinstall.js format (includes PBS_TAG + PBS_CPYTHON)
+  const marker = `${pkg.version}\n${packageSpec}\n${PBS_TAG}\n3.12.13\n`;
   if (fs.existsSync(executable) && readFile(markerPath) === marker) {
     debug(env, `Using cached npm-managed environment at ${venvDir}`);
     return;
@@ -209,34 +278,7 @@ function ensureVenv(python, venvDir, env) {
   fs.writeFileSync(markerPath, marker);
 }
 
-function resolveVenvDir(env) {
-  if (env.VOIDX_NPM_VENV) {
-    return path.resolve(env.VOIDX_NPM_VENV);
-  }
-  return path.join(resolveDataHome(env), "voidx", "npm-venv");
-}
-
-function resolveDataHome(env) {
-  if (env.VOIDX_NPM_HOME) {
-    return path.resolve(env.VOIDX_NPM_HOME);
-  }
-  if (process.platform === "win32") {
-    return env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
-  }
-  return env.XDG_DATA_HOME || path.join(os.homedir(), ".local", "share");
-}
-
-function resolveVenvPython(venvDir) {
-  return process.platform === "win32"
-    ? path.join(venvDir, "Scripts", "python.exe")
-    : path.join(venvDir, "bin", "python");
-}
-
-function resolveVoidxExecutable(venvDir) {
-  return process.platform === "win32"
-    ? path.join(venvDir, "Scripts", "voidx.exe")
-    : path.join(venvDir, "bin", "voidx");
-}
+// ── Helpers ────────────────────────────────────────────────────────────────
 
 function readFile(filePath) {
   try {
@@ -266,5 +308,6 @@ module.exports = {
   parseVersion,
   resolveDataHome,
   resolveVenvDir,
+  resolveBundledPythonBin,
   selectPython,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chikhamx/voidx",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "npm launcher for voidx, a terminal AI coding agent.",
   "bin": {
     "voidx": "bin/voidx.js"
@@ -11,6 +11,15 @@
   "engines": {
     "node": ">=16"
   },
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ],
+  "cpu": [
+    "x64",
+    "arm64"
+  ],
   "keywords": [
     "ai",
     "agent",