drift-ml 0.2.1 → 0.2.5

package/bin/drift.js

@@ -12,13 +12,13 @@ const http = require("http");
 
 const isWindows = process.platform === "win32";
 const ENGINE_PORT = process.env.DRIFT_ENGINE_PORT || "8000";
-const GITHUB_REPO = "lakshitsachdeva/drift";  // Engine binaries
-const ENGINE_TAG = "v0.2.0";  // Pinned — direct URL, no API, no rate limits
+const GITHUB_REPO = "lakshitsachdeva/intent2model";  // Engine binaries (same repo)
+const ENGINE_TAG = "v0.2.5";  // Pinned — direct URL, no API, no rate limits
 const ENGINE_BASE_URL = `https://github.com/${GITHUB_REPO}/releases/download/${ENGINE_TAG}`;
 const HEALTH_URL = `http://127.0.0.1:${ENGINE_PORT}/health`;
 const HEALTH_TIMEOUT_MS = 2000;
 const HEALTH_POLL_MS = 500;
-const HEALTH_POLL_MAX = 60;
+const HEALTH_POLL_MAX = 120;  // 60s — PyInstaller binary can take 30+ s to unpack on first run
 const isMac = process.platform === "darwin";
 
 function getPlatformKey() {
@@ -157,16 +157,101 @@ async function ensureEngine() {
     try {
       fs.chmodSync(binPath, 0o755);
       spawnSync("xattr", ["-dr", "com.apple.quarantine", binPath], { stdio: "pipe" });
+      // Ad-hoc sign so macOS Gatekeeper doesn't kill the binary
+      spawnSync("codesign", ["-s", "-", "--force", binPath], { stdio: "pipe" });
     } catch (_) {}
   }
-  const child = spawn(binPath, [], {
-    detached: true,
-    stdio: "ignore",
-    cwd: binDir,
-    env: { ...process.env, DRIFT_ENGINE_PORT: ENGINE_PORT },
-  });
-  child.unref();
-  return waitForEngine();
+
+  const absPath = path.resolve(binPath);
+  const env = { ...process.env, DRIFT_ENGINE_PORT: ENGINE_PORT };
+
+  // macOS: spawn a wrapper script instead of the binary directly (avoids -88)
+  // Windows: use batch file so engine starts reliably (inherits PATH for gemini etc.)
+  const binName = path.basename(binPath);
+  let toSpawn = absPath;
+  let spawnArgs = [];
+
+  if (isMac) {
+    const wrapperPath = path.join(binDir, "run-engine.sh");
+    const wrapperScript = `#!/bin/bash
+cd "$(dirname "$0")"
+export DRIFT_ENGINE_PORT="${ENGINE_PORT}"
+exec ./${binName}
+`;
+    if (!fs.existsSync(wrapperPath) || fs.readFileSync(wrapperPath, "utf8") !== wrapperScript) {
+      fs.writeFileSync(wrapperPath, wrapperScript);
+      fs.chmodSync(wrapperPath, 0o755);
+    }
+    toSpawn = "/bin/bash";
+    spawnArgs = [wrapperPath];
+  } else if (isWindows) {
+    const batPath = path.join(binDir, "run-engine.bat");
+    const batScript = `@echo off
+cd /d "%~dp0"
+set DRIFT_ENGINE_PORT=${ENGINE_PORT}
+start /b "" ${binName}
+`;
+    if (!fs.existsSync(batPath) || fs.readFileSync(batPath, "utf8") !== batScript) {
+      fs.writeFileSync(batPath, batScript);
+    }
+    toSpawn = "cmd";
+    spawnArgs = ["/c", batPath];
+  }
+
+  process.stderr.write("drift: Starting engine (first run may take 30s)...\n");
+
+  const stderrLog = path.join(binDir, ".engine-stderr.log");
+  let stderrFd;
+  try {
+    stderrFd = fs.openSync(stderrLog, "w");
+  } catch (_) {
+    stderrFd = "ignore";
+  }
+  const stdio = stderrFd === "ignore" ? "ignore" : ["ignore", "ignore", stderrFd];
+
+  function trySpawn(cmd, args) {
+    return new Promise((resolve, reject) => {
+      let child;
+      try {
+        child = spawn(cmd, args || [], {
+          detached: true,
+          stdio,
+          cwd: binDir,
+          env,
+        });
+      } catch (e) {
+        reject(e);
+        return;
+      }
+      child.on("error", (err) => reject(err));
+      child.unref();
+      waitForEngine().then(resolve);
+    });
+  }
+
+  try {
+    return await trySpawn(toSpawn, spawnArgs);
+  } catch (e) {
+    const isSpawn88 = (e.errno === -88 || (e.message && String(e.message).includes("-88")));
+    if (isMac && isSpawn88) {
+      process.stderr.write("drift: Spawn failed (-88). Trying nohup fallback...\n");
+      try {
+        const cmd = (isMac && wrapperPath) ? `"${wrapperPath}"` : `"${absPath}"`;
+        spawnSync("/bin/sh", ["-c", `nohup ${cmd} > /dev/null 2>&1 &`], {
+          cwd: binDir,
+          env: { ...process.env, DRIFT_ENGINE_PORT: ENGINE_PORT },
+          stdio: "pipe",
+        });
+        return await waitForEngine();
+      } catch (e2) {
+        console.error("drift: Engine failed. Run manually in another terminal:");
+        console.error("  ~/.drift/bin/drift-engine-macos-arm64");
+        console.error("Then run drift again.");
+        throw e2;
+      }
+    }
+    throw e;
+  }
 }
 
 function findPythonDrift() {
@@ -194,6 +279,21 @@ async function main() {
       });
       if (!started) {
         console.error("Failed to start drift engine.");
+        const binDir = getEngineDir();
+        if (binDir) {
+          const stderrLog = path.join(binDir, ".engine-stderr.log");
+          if (fs.existsSync(stderrLog)) {
+            const err = fs.readFileSync(stderrLog, "utf8").trim();
+            if (err) console.error("drift: Engine log:", err.slice(-500));
+          }
+          const enginePath = getEnginePath();
+          if (isWindows && enginePath) {
+            console.error("drift: On Windows (PowerShell), run manually to see the error:");
+            console.error("  cd $env:USERPROFILE\\.drift\\bin");
+            console.error("  .\\drift-engine-windows-x64.exe");
+            console.error("drift: Also install pipx: pip install pipx && pipx ensurepath, then pipx install drift-ml");
+          }
+        }
         process.exit(1);
       }
     }
@@ -201,11 +301,13 @@ async function main() {
 
   const driftPath = findPythonDrift();
   if (!driftPath) {
-    console.error(`
-drift is not installed. Install it with:
-
-  pipx install drift-ml
-`);
+    console.error("drift: Python CLI not found. Install with:");
+    if (isWindows) {
+      console.error("  pip install pipx");
+      console.error("  pipx ensurepath");
+      console.error("  (restart PowerShell)");
+    }
+    console.error("  pipx install drift-ml");
     process.exit(1);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drift-ml",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "description": "drift — terminal-first, chat-based AutoML. Open source. No tokens. No auth.",
   "bin": {
     "drift": "bin/drift.js"