@openagents-org/agent-launcher 0.2.50 → 0.2.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openagents-org/agent-launcher",
-  "version": "0.2.50",
+  "version": "0.2.52",
   "description": "OpenAgents Launcher — install, configure, and run AI coding agents from your terminal",
   "main": "src/index.js",
   "bin": {

package/src/adapters/openclaw.js

@@ -55,32 +55,19 @@ class OpenClawAdapter extends BaseAdapter {
   // ------------------------------------------------------------------
 
   _findOpenclawBinary() {
+    // We know exactly where openclaw is — installed via --prefix ~/.openagents/nodejs
+    const home = process.env.USERPROFILE || process.env.HOME || '';
+    const portableDir = path.join(home, '.openagents', 'nodejs');
+    const mjs = path.join(portableDir, 'node_modules', 'openclaw', 'openclaw.mjs');
+    if (fs.existsSync(mjs)) return mjs;
+
+    // Fallback: check if openclaw is on PATH (system install)
     try {
       const cmd = IS_WINDOWS ? 'where openclaw' : 'which openclaw';
-      const { getEnhancedEnv } = require('../paths');
-      const result = execSync(cmd, { encoding: 'utf-8', timeout: 5000, env: getEnhancedEnv() })
+      const result = execSync(cmd, { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] })
         .split(/\r?\n/)[0].trim();
       if (result) return result;
     } catch {}
-
-    // Check common npm global directories
-    const dirs = [];
-    if (IS_WINDOWS) {
-      const appdata = process.env.APPDATA || '';
-      if (appdata) dirs.push(path.join(appdata, 'npm'));
-      // Portable Node.js installed by OpenAgents Launcher
-      const home = process.env.USERPROFILE || process.env.HOME || '';
-      if (home) dirs.push(path.join(home, '.openagents', 'nodejs'));
-    } else {
-      const home = process.env.HOME || '';
-      dirs.push(path.join(home, '.openagents', 'nodejs', 'bin'), '/usr/local/bin');
-    }
-    for (const d of dirs) {
-      for (const name of ['openclaw.cmd', 'openclaw']) {
-        const candidate = path.join(d, name);
-        if (fs.existsSync(candidate)) return candidate;
-      }
-    }
     return null;
   }
 
@@ -244,21 +231,21 @@ class OpenClawAdapter extends BaseAdapter {
       const stderrFd = fs.openSync(stderrFile, 'w');
       this._log('Spawn: stderr → ' + stderrFile);
 
-      let spawnBin = binary;
-      let spawnArgs = args;
-      if (IS_WINDOWS) {
-        // Avoid cmd.exe — it can't handle Unicode paths (Chinese/Japanese/Korean usernames)
-        // Find node.exe + openclaw.mjs and spawn directly
-        const portableNode = path.join(os.homedir(), '.openagents', 'nodejs', 'node.exe');
-        const openclawMjs = path.join(os.homedir(), '.openagents', 'nodejs', 'node_modules', 'openclaw', 'openclaw.mjs');
-        if (fs.existsSync(portableNode) && fs.existsSync(openclawMjs)) {
-          spawnBin = portableNode;
-          spawnArgs = [openclawMjs, ...args];
-        } else {
-          // Fallback to cmd.exe (works for ASCII-only paths)
-          spawnBin = process.env.COMSPEC || 'cmd.exe';
-          spawnArgs = ['/C', binary, ...args.map(a => a.includes(' ') ? `"${a}"` : a)];
-        }
+      // Always spawn node + openclaw.mjs directly (no shims, no cmd.exe, cross-platform)
+      const portableDir = path.join(os.homedir(), '.openagents', 'nodejs');
+      const nodeBin = IS_WINDOWS
+        ? path.join(portableDir, 'node.exe')
+        : path.join(portableDir, 'bin', 'node');
+      const openclawMjs = path.join(portableDir, 'node_modules', 'openclaw', 'openclaw.mjs');
+
+      let spawnBin, spawnArgs;
+      if (fs.existsSync(nodeBin) && fs.existsSync(openclawMjs)) {
+        spawnBin = nodeBin;
+        spawnArgs = [openclawMjs, ...args];
+      } else {
+        // Fallback: try the binary path directly (system install)
+        spawnBin = binary;
+        spawnArgs = args;
       }
       const proc = spawn(spawnBin, spawnArgs, {
         stdio: ['ignore', 'pipe', stderrFd],

package/src/installer.js

@@ -55,9 +55,11 @@ class Installer {
     if (binaryPath.startsWith(portableDir)) {
       const pkgDir = path.join(globalModules, npmPkg || binary);
       if (!fs.existsSync(path.join(pkgDir, 'package.json'))) {
-        // Stale shim — clean it up
-        for (const ext of ['', '.cmd', '.ps1']) {
-          try { const p = path.join(portableDir, binary + ext); if (fs.existsSync(p)) fs.unlinkSync(p); } catch {}
+        // Stale shim — clean it up from all possible locations
+        for (const dir of [portableDir, path.join(globalModules, '.bin')]) {
+          for (const ext of ['', '.cmd', '.ps1']) {
+            try { const p = path.join(dir, binary + ext); if (fs.existsSync(p)) fs.unlinkSync(p); } catch {}
+          }
         }
         return false;
       }
@@ -272,9 +274,12 @@ class Installer {
     const binary = entry && entry.install ? entry.install.binary : agentType;
     if (!binary) return;
     const portableDir = path.join(os.homedir(), '.openagents', 'nodejs');
-    for (const ext of ['', '.cmd', '.ps1']) {
-      const shimPath = path.join(portableDir, binary + ext);
-      try { if (fs.existsSync(shimPath)) fs.unlinkSync(shimPath); } catch {}
+    const binDir = path.join(portableDir, 'node_modules', '.bin');
+    for (const dir of [portableDir, binDir]) {
+      for (const ext of ['', '.cmd', '.ps1']) {
+        const shimPath = path.join(dir, binary + ext);
+        try { if (fs.existsSync(shimPath)) fs.unlinkSync(shimPath); } catch {}
+      }
     }
   }