blitzwing 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzwing",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Interactive setup wizard to join a Blitzwing Petals mother swarm as a compute contributor",
   "bin": {
     "blitzwing": "bin/blitzwing.js"

package/src/install.js

@@ -18,41 +18,59 @@ function venvPip() {
   return path.join(VENV_PATH, "bin", "pip");
 }
 
+function pythonVersion(bin) {
+  try {
+    const ver = execFileSync(bin, ["--version"], { encoding: "utf8" }).trim();
+    const m = ver.match(/Python (\d+)\.(\d+)/);
+    if (!m) return null;
+    return { ver, major: Number(m[1]), minor: Number(m[2]) };
+  } catch {
+    return null;
+  }
+}
+
+function isPetalsCompatible(info) {
+  return info && info.major === 3 && info.minor >= 10 && info.minor <= 11;
+}
+
 export function ensurePython() {
-  // Prefer 3.10/3.11 — Petals/hivemind break on 3.12+ / 3.13+
-  const candidates = ["python3.11", "python3.10", "python3", "python"];
-  let py = null;
-  let ver = "";
+  // Petals/hivemind break on 3.12+. Never fall back to a too-new interpreter.
+  const candidates = [];
+  const envBin = process.env.BLITZWING_PYTHON || process.env.PETALS_PYTHON;
+  if (envBin) candidates.push(envBin);
+  if (process.env.CONDA_PREFIX) {
+    candidates.push(
+      path.join(process.env.CONDA_PREFIX, "bin", "python3.11"),
+      path.join(process.env.CONDA_PREFIX, "bin", "python3.10"),
+      path.join(process.env.CONDA_PREFIX, "bin", "python")
+    );
+  }
+  candidates.push(
+    path.join(process.env.HOME || "", "miniconda", "envs", "blitzwing", "bin", "python3.11"),
+    path.join(process.env.HOME || "", "miniconda", "envs", "blitzwing", "bin", "python"),
+    path.join(process.env.HOME || "", "miniconda3", "envs", "blitzwing", "bin", "python3.11"),
+    path.join(process.env.HOME || "", "miniconda3", "envs", "blitzwing", "bin", "python"),
+    "python3.11",
+    "python3.10"
+  );
+
+  const seen = new Set();
   for (const cmd of candidates) {
-    const found = which(cmd);
+    if (!cmd || seen.has(cmd)) continue;
+    seen.add(cmd);
+    const found = cmd.includes("/") || cmd.includes("\\") ? (fs.existsSync(cmd) ? cmd : null) : which(cmd);
     if (!found) continue;
-    try {
-      ver = execFileSync(found, ["--version"], { encoding: "utf8" }).trim();
-      const m = ver.match(/Python (\d+)\.(\d+)/);
-      if (!m) continue;
-      const major = Number(m[1]);
-      const minor = Number(m[2]);
-      if (major === 3 && minor >= 10 && minor <= 11) {
-        py = found;
-        break;
-      }
-      if (!py) {
-        py = found; // fallback, may fail later
-      }
-    } catch {
-      /* try next */
+    const info = pythonVersion(found);
+    if (isPetalsCompatible(info)) {
+      return { py: found, ver: info.ver };
     }
   }
-  if (!py) {
-    throw new Error("Python 3.10 or 3.11 is required. Install via conda/miniconda and re-run.");
-  }
-  const m = ver.match(/Python (\d+)\.(\d+)/);
-  if (m && (Number(m[1]) !== 3 || Number(m[2]) > 11)) {
-    throw new Error(
-      `${ver} is too new for Petals. Use Python 3.11 (e.g. conda create -n blitzwing python=3.11).`
-    );
-  }
-  return { py, ver };
+
+  throw new Error(
+    "Python 3.10 or 3.11 is required (3.12+ will not work). " +
+      "Install with: conda create -n blitzwing python=3.11 && conda activate blitzwing  " +
+      "or set BLITZWING_PYTHON=/path/to/python3.11"
+  );
 }
 
 function petalsImportable(python) {