@openagents-org/agent-launcher 0.2.49 → 0.2.51

package/package.json

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

package/src/adapters/openclaw.js

@@ -65,15 +65,16 @@ class OpenClawAdapter extends BaseAdapter {
 
     // Check common npm global directories
     const dirs = [];
+    const home = process.env.USERPROFILE || process.env.HOME || '';
+    // --prefix installs put .bin shims in node_modules/.bin/
+    if (home) dirs.push(path.join(home, '.openagents', 'nodejs', 'node_modules', '.bin'));
     if (IS_WINDOWS) {
+      if (home) dirs.push(path.join(home, '.openagents', 'nodejs'));
       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, '.npm-global', 'bin'), '/usr/local/bin');
+      if (home) dirs.push(path.join(home, '.openagents', 'nodejs', 'bin'));
+      dirs.push('/usr/local/bin');
     }
     for (const d of dirs) {
       for (const name of ['openclaw.cmd', 'openclaw']) {

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 {}
+      }
     }
   }
 

package/src/paths.js

@@ -177,9 +177,8 @@ function _addUnixPaths(dirs) {
   _push(dirs, '/usr/local/bin');
   _push(dirs, '/usr/bin');
 
-  // npm global (varies by install method)
-  _push(dirs, path.join(HOME, '.npm-global', 'bin'));
-  _push(dirs, path.join(HOME, '.openagents', 'npm-global', 'bin'));
+  // npm global — all installs use --prefix ~/.openagents/nodejs
+  // No need for ~/.npm-global or ~/.openagents/npm-global
 
   // nvm
   const nvmDir = process.env.NVM_DIR || path.join(HOME, '.nvm');