@openagents-org/agent-launcher 0.2.61 → 0.2.63

package/package.json

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

package/src/adapters/claude.js

@@ -106,6 +106,14 @@ class ClaudeAdapter extends BaseAdapter {
   }
 
   _findClaudeBinary() {
+    const home = os.homedir();
+
+    // Tier 0: Portable install at ~/.openagents/nodejs/node_modules/.bin/
+    const portableBin = path.join(home, '.openagents', 'nodejs', 'node_modules', '.bin');
+    const ext = IS_WINDOWS ? '.cmd' : '';
+    const portableCandidate = path.join(portableBin, `claude${ext}`);
+    if (fs.existsSync(portableCandidate)) return portableCandidate;
+
     // Tier 1: PATH search
     try {
       if (IS_WINDOWS) {
@@ -120,12 +128,10 @@ class ClaudeAdapter extends BaseAdapter {
 
     // Tier 2: Next to current Node.js interpreter (npm global)
     const nodeBinDir = path.dirname(process.execPath);
-    const ext = IS_WINDOWS ? '.cmd' : '';
     const nearNode = path.join(nodeBinDir, `claude${ext}`);
     if (fs.existsSync(nearNode)) return nearNode;
 
     // Tier 3: Common install locations
-    const home = os.homedir();
     const candidates = IS_WINDOWS ? [
       path.join(process.env.APPDATA || '', 'npm', 'claude.cmd'),
     ] : [
@@ -343,12 +349,15 @@ class ClaudeAdapter extends BaseAdapter {
       // visible console windows and Unicode path issues
       if (IS_WINDOWS && cmd[0].toLowerCase().endsWith('.cmd')) {
         // Resolve .cmd shim → actual JS entry point
+        // npm shims use %dp0% (directory of the .cmd file) as a relative base
+        const cmdDir = path.dirname(path.resolve(cmd[0]));
         const cmdContent = fs.readFileSync(cmd[0], 'utf-8');
-        const jsMatch = cmdContent.match(/"([^"]+\.js)"/);
+        const jsMatch = cmdContent.match(/"?%dp0%\\([^"*?]+\.js)"?/i);
         if (jsMatch) {
+          const jsPath = path.resolve(cmdDir, jsMatch[1]);
           const nodeExe = path.join(os.homedir(), '.openagents', 'nodejs', 'node.exe');
           const nodeBin = fs.existsSync(nodeExe) ? nodeExe : 'node';
-          cmd = [nodeBin, jsMatch[1], ...cmd.slice(1)];
+          cmd = [nodeBin, jsPath, ...cmd.slice(1)];
         } else {
           cmd = ['cmd.exe', '/c', ...cmd];
         }