bumblebee-cli 0.1.0 → 0.1.1

package/bin/bb.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 import { execFileSync, execSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -13,20 +13,45 @@ const args = process.argv.slice(2);
  * Thin Node.js wrapper for the Bumblebee Python CLI.
  *
  * Resolution order:
- * 1. `bb` already on PATH (user installed via pip)
+ * 1. `bb` already on PATH (user installed via pip — not our own npm wrapper)
  * 2. Local .venv created by postinstall
  * 3. `python -m bb_cli` (fallback)
  */
 
+function getNpmGlobalPrefix() {
+  try {
+    return execSync("npm prefix -g", { encoding: "utf8", stdio: "pipe" }).trim();
+  } catch {
+    return null;
+  }
+}
+
+function isOurOwnWrapper(bbPath) {
+  // Check if the found bb is inside our npm package or the npm global bin
+  const normalized = resolve(bbPath).toLowerCase();
+  if (normalized.includes("node_modules") && normalized.includes("bumblebee-cli")) {
+    return true;
+  }
+  // On Windows/Linux, npm global installs create shims in the npm prefix dir
+  const npmPrefix = getNpmGlobalPrefix();
+  if (npmPrefix && normalized.startsWith(resolve(npmPrefix).toLowerCase())) {
+    return true;
+  }
+  return false;
+}
+
 // 1. Check if `bb` is already available on PATH (pip install)
 function trySystemBb() {
   try {
     const which = process.platform === "win32" ? "where" : "which";
     const result = execSync(`${which} bb`, { stdio: "pipe", encoding: "utf8" });
-    const bbPath = result.trim().split("\n")[0];
-    // Make sure it's not pointing back to ourselves
-    if (bbPath && !bbPath.includes("npm-cli")) {
-      return bbPath;
+    // On Windows, `where` may return multiple lines; check each
+    const paths = result.trim().split(/\r?\n/);
+    for (const bbPath of paths) {
+      const p = bbPath.trim();
+      if (p && !isOurOwnWrapper(p)) {
+        return p;
+      }
     }
   } catch {
     // not found
@@ -48,10 +73,11 @@ function tryLocalVenv() {
 
 // 3. Fallback to python -m bb_cli
 function tryPythonModule() {
-  const pythonCmds = ["python3", "python"];
+  const pythonCmds =
+    process.platform === "win32" ? ["python", "python3"] : ["python3", "python"];
   for (const py of pythonCmds) {
     try {
-      execSync(`${py} --version`, { stdio: "pipe" });
+      execSync(`${py} -c "import bb_cli"`, { stdio: "pipe" });
       return { python: py, module: true };
     } catch {
       // try next
@@ -95,8 +121,12 @@ if (pyFallback) {
 }
 
 console.error(
-  "Error: Could not find Python or the Bumblebee CLI.\n" +
-    "Install Python 3.12+ and run: pip install bumblebee-cli\n" +
-    "Or reinstall this package: npm install -g bumblebee-cli"
+  "Error: Could not find the Bumblebee Python CLI.\n" +
+    "\n" +
+    "The npm package needs the Python CLI installed. Fix with ONE of:\n" +
+    "  1. pip install bumblebee-cli          (install globally)\n" +
+    "  2. npm rebuild bumblebee-cli          (retry postinstall setup)\n" +
+    "\n" +
+    "Requires Python 3.12+ — https://python.org"
 );
 process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bumblebee-cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Bumblebee CLI — Dev task management + Claude Code automation",
   "license": "MIT",
   "bin": {

package/scripts/postinstall.mjs

@@ -4,14 +4,14 @@
  * Postinstall script for bumblebee-cli
  *
  * - Checks for Python 3.12+
- * - Skips if `bb` is already on PATH (user installed via pip)
+ * - Skips if a real (pip-installed) `bb` is already on PATH
  * - Creates a local .venv and installs the Python CLI
  * - NEVER fails npm install — warns instead
  */
 
 import { execSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -26,20 +26,45 @@ function warn(msg) {
   console.warn(`[bumblebee-cli] WARNING: ${msg}`);
 }
 
-// Check if bb is already available
-function isBbInstalled() {
+// Check if a real (non-npm-wrapper) bb is already available
+function isPipBbInstalled() {
   try {
+    // Try running bb --help and check if it's the Python CLI (not our wrapper)
     const which = process.platform === "win32" ? "where" : "which";
-    execSync(`${which} bb`, { stdio: "pipe" });
-    return true;
+    const result = execSync(`${which} bb`, { encoding: "utf8", stdio: "pipe" });
+    const paths = result.trim().split(/\r?\n/);
+
+    // Get npm global prefix to filter out our own wrapper
+    let npmPrefix = null;
+    try {
+      npmPrefix = execSync("npm prefix -g", { encoding: "utf8", stdio: "pipe" }).trim();
+    } catch {}
+
+    for (const bbPath of paths) {
+      const p = bbPath.trim();
+      if (!p) continue;
+      const normalized = resolve(p).toLowerCase();
+      // Skip if it's inside npm global prefix (that's our own wrapper)
+      if (npmPrefix && normalized.startsWith(resolve(npmPrefix).toLowerCase())) {
+        continue;
+      }
+      // Skip if it's inside node_modules
+      if (normalized.includes("node_modules") && normalized.includes("bumblebee-cli")) {
+        continue;
+      }
+      // Found a real bb (pip-installed)
+      return true;
+    }
   } catch {
-    return false;
+    // not found
   }
+  return false;
 }
 
 // Find python and check version
 function findPython() {
-  const candidates = ["python3", "python"];
+  const candidates =
+    process.platform === "win32" ? ["python", "python3"] : ["python3", "python"];
   for (const cmd of candidates) {
     try {
       const version = execSync(`${cmd} --version`, {
@@ -64,8 +89,8 @@ function findPython() {
 
 function main() {
   // Skip if bb already installed via pip
-  if (isBbInstalled()) {
-    log("'bb' command found on PATH — skipping Python setup.");
+  if (isPipBbInstalled()) {
+    log("'bb' command found on PATH (pip) — skipping Python setup.");
     return;
   }