open-agents-ai 0.75.0 → 0.76.0

package/dist/launcher.cjs

@@ -4,6 +4,13 @@
 var nodeVersion = parseInt(process.versions.node, 10);
 
 if (nodeVersion < 22) {
+  // Prevent infinite loop: if we're inside a self-triggered reinstall, bail
+  if (process.env.OA_SELF_UPGRADE === "1") {
+    console.error("  [launcher] Skipping — already inside a self-upgrade.");
+    console.error("  Open a new terminal with Node 22 and run: oa");
+    process.exit(1);
+  }
+
   var os = require("os");
   var path = require("path");
   var fs = require("fs");
@@ -150,7 +157,7 @@ if (nodeVersion < 22) {
       if (a === "n" || a === "no") {
         bail(
           "\n  Install manually:\n" +
-          "    nvm install 20 && nvm alias default 20\n" +
+          "    nvm install 22 && nvm alias default 22\n" +
           "    npm i -g open-agents-ai\n"
         );
         return;
@@ -162,7 +169,7 @@ if (nodeVersion < 22) {
         "nvm install 22 && nvm use 22 && nvm alias default 22";
       var ok = run(shell + " -c '" + cmd + "'");
       if (!ok) {
-        bail("\n  Node 20 install failed.\n");
+        bail("\n  Node 22 install failed.\n");
         return;
       }
       console.log("");
@@ -170,6 +177,45 @@ if (nodeVersion < 22) {
     });
   }
 
+  // Find the Node 22 binary installed by nvm
+  function findNode22Bin() {
+    // Check nvm versions directory for a v22.x binary
+    var versionsDir = path.join(nvmDir, "versions", "node");
+    try {
+      var versions = fs.readdirSync(versionsDir).filter(function(v) {
+        return v.startsWith("v22");
+      }).sort().reverse();
+      if (versions.length > 0) {
+        var bin = path.join(versionsDir, versions[0], "bin", "node");
+        try { fs.statSync(bin); return bin; } catch (e) {}
+      }
+    } catch (e) {}
+    // Fallback: ask nvm which node 22 is
+    try {
+      var shell = process.env.SHELL || "/bin/bash";
+      var result = childProcess.execSync(
+        shell + ' -c \'export NVM_DIR="' + nvmDir + '" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm which 22\'',
+        { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 10000 }
+      ).trim();
+      if (result && fs.existsSync(result)) return result;
+    } catch (e) {}
+    return null;
+  }
+
+  // Find the oa launcher script under a given node prefix
+  function findOaBin(nodeBin) {
+    // nodeBin = .../bin/node → prefix = .../
+    var binDir = path.dirname(nodeBin);
+    var candidates = [
+      path.join(binDir, "oa"),
+      path.join(binDir, "open-agents"),
+    ];
+    for (var i = 0; i < candidates.length; i++) {
+      try { fs.statSync(candidates[i]); return candidates[i]; } catch (e) {}
+    }
+    return null;
+  }
+
   function doReinstall() {
     ask("  Reinstall open-agents under Node 22? [Y/n] ", function(a) {
       if (a === "n" || a === "no") {
@@ -183,7 +229,7 @@ if (nodeVersion < 22) {
       }
       console.log("");
       var shell = process.env.SHELL || "/bin/bash";
-      var cmd = 'export NVM_DIR="' + nvmDir + '" && ' +
+      var cmd = 'export OA_SELF_UPGRADE=1 && export NVM_DIR="' + nvmDir + '" && ' +
         '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && ' +
         "nvm use 22 && npm i -g open-agents-ai";
       var ok = run(shell + " -c '" + cmd + "'");
@@ -197,27 +243,35 @@ if (nodeVersion < 22) {
         return;
       }
       console.log("");
-      console.log("  ┌─────────────────────────────────────────────────┐");
-      console.log("  │  Done! Launching open-agents...                  │");
-      console.log("  └─────────────────────────────────────────────────┘");
-      console.log("");
       rl.close();
 
-      // Auto-source shell config and re-exec oa — no "open a new terminal" needed
-      var rcFile = shell.indexOf("zsh") !== -1 ? "~/.zshrc" : "~/.bashrc";
-      var relaunchCmd = 'export NVM_DIR="' + nvmDir + '" && ' +
-        '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && ' +
-        "source " + rcFile + " 2>/dev/null; " +
-        "exec oa";
-      try {
-        childProcess.execSync(shell + " -c '" + relaunchCmd + "'", {
-          stdio: "inherit",
-          env: process.env,
-        });
-      } catch (e) {
-        // Fallback: tell user to open new terminal only if re-exec fails
-        console.log("\n  If oa didn't launch, run: source " + rcFile + " && oa\n");
+      // Try to auto-relaunch under Node 22 — no new terminal needed
+      var node22 = findNode22Bin();
+      if (node22) {
+        var oaBin = findOaBin(node22);
+        if (oaBin) {
+          console.log("  ┌─────────────────────────────────────────────────┐");
+          console.log("  │  Done! Launching open-agents with Node 22...    │");
+          console.log("  └─────────────────────────────────────────────────┘");
+          console.log("");
+          // Replace this process with Node 22 running the new oa launcher
+          try {
+            childProcess.execFileSync(node22, [oaBin], {
+              stdio: "inherit",
+              env: process.env,
+            });
+          } catch (e) {
+            // execFileSync throws when the child exits — that's normal
+          }
+          process.exit(0);
+        }
       }
+
+      // Fallback if we can't find Node 22 binary or oa script
+      console.log("  ┌─────────────────────────────────────────────────┐");
+      console.log("  │  Done! Open a new terminal and run: oa          │");
+      console.log("  └─────────────────────────────────────────────────┘");
+      console.log("");
       process.exit(0);
     });
   }

package/dist/preinstall.cjs

@@ -10,6 +10,14 @@ if (nodeVersion >= 22) {
   process.exit(0);
 }
 
+// Prevent infinite loop: if we're inside a self-triggered reinstall, bail
+if (process.env.OA_SELF_UPGRADE === "1") {
+  console.log("  [preinstall] Skipping — already inside a self-upgrade.");
+  console.log("  If this Node is still too old, open a new terminal with Node 22 and run:");
+  console.log("    npm i -g open-agents-ai");
+  process.exit(1);
+}
+
 var os = require("os");
 var path = require("path");
 var fs = require("fs");
@@ -167,7 +175,7 @@ function doInstallNode(next) {
       "nvm install 22 && nvm alias default 22";
     var ok = run(shell + " -c '" + cmd + "'");
     if (!ok) {
-      bail("\n  Node 20 install failed.\n");
+      bail("\n  Node 22 install failed.\n");
       return;
     }
     console.log("");
@@ -175,6 +183,29 @@ function doInstallNode(next) {
   });
 }
 
+// Find the Node 22 binary installed by nvm
+function findNode22Bin() {
+  var versionsDir = path.join(nvmDir, "versions", "node");
+  try {
+    var versions = fs.readdirSync(versionsDir).filter(function(v) {
+      return v.startsWith("v22");
+    }).sort().reverse();
+    if (versions.length > 0) {
+      var bin = path.join(versionsDir, versions[0], "bin", "node");
+      try { fs.statSync(bin); return bin; } catch (e) {}
+    }
+  } catch (e) {}
+  try {
+    var shell = process.env.SHELL || "/bin/bash";
+    var result = childProcess.execSync(
+      shell + ' -c \'export NVM_DIR="' + nvmDir + '" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm which 22\'',
+      { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 10000 }
+    ).trim();
+    if (result && fs.existsSync(result)) return result;
+  } catch (e) {}
+  return null;
+}
+
 function doReinstall() {
   ask("  Reinstall open-agents under Node 22? [Y/n] ", function(a) {
     if (a === "n" || a === "no") {
@@ -188,7 +219,7 @@ function doReinstall() {
     }
     console.log("");
     var shell = process.env.SHELL || "/bin/bash";
-    var cmd = 'export NVM_DIR="' + nvmDir + '" && ' +
+    var cmd = 'export OA_SELF_UPGRADE=1 && export NVM_DIR="' + nvmDir + '" && ' +
       '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && ' +
       "nvm use 22 && npm i -g open-agents-ai";
     var ok = run(shell + " -c '" + cmd + "'");
@@ -202,26 +233,22 @@ function doReinstall() {
       return;
     }
     console.log("");
+
+    // Tell the user exactly how to launch — resolve the Node 22 path for them
+    var node22 = findNode22Bin();
+    var binHint = node22 ? path.dirname(node22) : "~/.nvm/versions/node/v22.x.x/bin";
     console.log("  ┌─────────────────────────────────────────────────┐");
-    console.log("  │  Done! Launching open-agents...                  │");
+    console.log("  │  Done! Node 22 installed + open-agents ready.   │");
     console.log("  └─────────────────────────────────────────────────┘");
     console.log("");
+    console.log("  To launch immediately (no new terminal needed):");
+    console.log("    " + binHint + "/oa");
+    console.log("");
+    console.log("  Or source your shell config first:");
+    var rcFile = (process.env.SHELL || "").indexOf("zsh") !== -1 ? "~/.zshrc" : "~/.bashrc";
+    console.log("    source " + rcFile + " && oa");
+    console.log("");
     rl.close();
-
-    // Auto-source shell config and launch oa — no "open a new terminal" needed
-    var rcFile2 = shell.indexOf("zsh") !== -1 ? "~/.zshrc" : "~/.bashrc";
-    var relaunchCmd = 'export NVM_DIR="' + nvmDir + '" && ' +
-      '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && ' +
-      "source " + rcFile2 + " 2>/dev/null; " +
-      "exec oa";
-    try {
-      childProcess.execSync(shell + " -c '" + relaunchCmd + "'", {
-        stdio: "inherit",
-        env: process.env,
-      });
-    } catch (e2) {
-      console.log("\n  If oa didn't launch, run: source " + rcFile2 + " && oa\n");
-    }
     process.exit(0);
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",