@openagents-org/agent-launcher 0.2.90 → 0.2.92

package/package.json

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

package/src/adapters/claude.js

@@ -130,7 +130,7 @@ class ClaudeAdapter extends BaseAdapter {
     if (IS_WINDOWS && binPath.toLowerCase().endsWith('.cmd')) {
       const cmdDir = path.dirname(path.resolve(binPath));
       const cmdContent = fs.readFileSync(binPath, 'utf-8');
-      const jsMatch = cmdContent.match(/%dp0%\\([^\s"*?]+\.js)/i);
+      const jsMatch = cmdContent.match(/%dp0%\\([^\s"*?]+\.m?js)/i);
       if (jsMatch) {
         return [nodeBin, path.resolve(cmdDir, jsMatch[1])];
       }

package/src/adapters/openclaw.js

@@ -68,12 +68,60 @@ class OpenClawAdapter extends BaseAdapter {
     if (fs.existsSync(mjs)) return mjs;
 
     // Fallback: check if openclaw is on PATH (system install)
+    // On Windows, resolve .cmd shim to actual .mjs path to avoid spawn issues
     try {
-      const cmd = IS_WINDOWS ? 'where openclaw' : 'which openclaw';
+      const cmd = IS_WINDOWS ? 'where openclaw.cmd' : 'which openclaw';
       const result = execSync(cmd, { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] })
         .split(/\r?\n/)[0].trim();
-      if (result) return result;
+      if (result) {
+        const resolved = this._resolveShimToMjs(result);
+        if (resolved) return resolved;
+        // On Unix, which returns the actual binary/symlink
+        if (!IS_WINDOWS) return result;
+      }
     } catch {}
+    // Windows: also try without .cmd extension (for system installs on PATH)
+    if (IS_WINDOWS) {
+      try {
+        const result = execSync('where openclaw', { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] })
+          .split(/\r?\n/)[0].trim();
+        if (result) {
+          // Try the .cmd variant of this path
+          const cmdPath = result.replace(/(?:\.cmd)?$/i, '.cmd');
+          const resolved = this._resolveShimToMjs(cmdPath);
+          if (resolved) return resolved;
+        }
+      } catch {}
+    }
+    return null;
+  }
+
+  /**
+   * Resolve a .cmd shim or Unix symlink to the actual openclaw.mjs path.
+   * On Windows: parses the .cmd shim to extract %dp0%\..\openclaw\openclaw.mjs
+   * On Unix: follows symlink to the .mjs file
+   */
+  _resolveShimToMjs(binPath) {
+    if (IS_WINDOWS) {
+      try {
+        if (!binPath.toLowerCase().endsWith('.cmd')) return null;
+        const cmdContent = fs.readFileSync(binPath, 'utf-8');
+        const match = cmdContent.match(/%dp0%\\([^\s"*?]+\.mjs)/i)
+          || cmdContent.match(/%dp0%\\([^\s"*?]+\.js)/i);
+        if (match) {
+          const cmdDir = path.dirname(path.resolve(binPath));
+          return path.resolve(cmdDir, match[1]);
+        }
+      } catch {}
+    } else {
+      try {
+        let target = binPath;
+        if (fs.lstatSync(binPath).isSymbolicLink()) {
+          target = path.resolve(path.dirname(binPath), fs.readlinkSync(binPath));
+        }
+        if (target.endsWith('.mjs') || target.endsWith('.js')) return target;
+      } catch {}
+    }
     return null;
   }
 
@@ -246,23 +294,38 @@ class OpenClawAdapter extends BaseAdapter {
       this._log('Spawn: stderr → ' + stderrFile);
 
       // Always spawn node + openclaw.mjs directly (no shims, no cmd.exe, cross-platform)
+      // This avoids Windows .cmd shim issues and Unicode path encoding problems.
       const portableDir = path.join(os.homedir(), '.openagents', 'nodejs');
-      // Unified path first (symlink on Unix), then legacy bin/ fallback
+      // Unified path first (symlink on Unix), then legacy bin/ fallback, then system node
       const nodeUnified = path.join(portableDir, IS_WINDOWS ? 'node.exe' : 'node');
-      const nodeBin = fs.existsSync(nodeUnified) ? nodeUnified : path.join(portableDir, 'bin', 'node');
-      // Check isolated runtime first, then legacy
-      const runtimeMjs = path.join(getRuntimePrefix('openclaw'), 'node_modules', 'openclaw', 'openclaw.mjs');
-      const legacyMjs = path.join(portableDir, 'node_modules', 'openclaw', 'openclaw.mjs');
-      const openclawMjs = fs.existsSync(runtimeMjs) ? runtimeMjs : legacyMjs;
+      let nodeBin = fs.existsSync(nodeUnified) ? nodeUnified : path.join(portableDir, 'bin', 'node');
+      if (!fs.existsSync(nodeBin)) {
+        try {
+          const cmd = IS_WINDOWS ? 'where node.exe' : 'which node';
+          nodeBin = execSync(cmd, { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] })
+            .split(/\r?\n/)[0].trim();
+        } catch { nodeBin = 'node'; }
+      }
 
+      // binary from _findOpenclawBinary() is already resolved to .mjs when possible
       let spawnBin, spawnArgs;
-      if (fs.existsSync(nodeBin) && fs.existsSync(openclawMjs)) {
+      if (binary && binary.endsWith('.mjs')) {
+        // Direct node + .mjs invocation (works for managed, legacy, AND global installs)
         spawnBin = nodeBin;
-        spawnArgs = [openclawMjs, ...args];
+        spawnArgs = [binary, ...args];
       } else {
-        // Fallback: try the binary path directly (system install)
-        spawnBin = binary;
-        spawnArgs = args;
+        // Check managed locations explicitly
+        const runtimeMjs = path.join(getRuntimePrefix('openclaw'), 'node_modules', 'openclaw', 'openclaw.mjs');
+        const legacyMjs = path.join(portableDir, 'node_modules', 'openclaw', 'openclaw.mjs');
+        const openclawMjs = fs.existsSync(runtimeMjs) ? runtimeMjs : (fs.existsSync(legacyMjs) ? legacyMjs : null);
+        if (openclawMjs) {
+          spawnBin = nodeBin;
+          spawnArgs = [openclawMjs, ...args];
+        } else {
+          // Last resort: spawn binary directly with shell (handles .cmd on Windows)
+          spawnBin = binary;
+          spawnArgs = args;
+        }
       }
       const proc = spawn(spawnBin, spawnArgs, {
         stdio: ['ignore', 'pipe', stderrFd],

package/src/cli.js

@@ -207,10 +207,10 @@ async function cmdSearch(connector, flags, positional) {
   try {
     catalog = await connector.getCatalog();
   } catch {
-    catalog = connector.registry.getCatalogSync().map((e) => ({
-      ...e,
-      installed: connector.isInstalled(e.name),
-    }));
+    catalog = connector.registry.getCatalogSync().map((e) => {
+      const info = connector.installer.getInstallInfo(e.name);
+      return { ...e, installed: info.installed, managed: info.managed, location: info.location };
+    });
   }
 
   if (query) {
@@ -253,9 +253,10 @@ async function cmdRuntimes(connector) {
   try {
     catalog = await connector.getCatalog();
   } catch {
-    catalog = connector.registry.getCatalogSync().map((e) => ({
-      ...e, installed: connector.isInstalled(e.name),
-    }));
+    catalog = connector.registry.getCatalogSync().map((e) => {
+      const info = connector.installer.getInstallInfo(e.name);
+      return { ...e, installed: info.installed, managed: info.managed, location: info.location };
+    });
   }
 
   const installed = catalog.filter((e) => e.installed);

package/src/index.js

@@ -33,10 +33,10 @@ class AgentConnector {
   async getCatalog() {
     const catalog = await this.registry.getCatalog();
     // Always re-check installed status (don't trust cached value)
-    return catalog.map((entry) => ({
-      ...entry,
-      installed: this.installer.isInstalled(entry.name),
-    }));
+    return catalog.map((entry) => {
+      const info = this.installer.getInstallInfo(entry.name);
+      return { ...entry, installed: info.installed, managed: info.managed, location: info.location };
+    });
   }
 
   /**

package/src/installer.js

@@ -35,7 +35,22 @@ class Installer {
    * Check if an agent type is installed.
    * Checks binary on PATH first, then marker files.
    */
+  /**
+   * Check if an agent type is installed.
+   * @returns {boolean} true if installed (any location)
+   */
   isInstalled(agentType) {
+    return this.getInstallInfo(agentType).installed;
+  }
+
+  /**
+   * Get detailed install info for an agent type.
+   * @returns {{ installed: boolean, managed: boolean, location: string|null }}
+   *   - installed: true if the agent is found anywhere
+   *   - managed: true if installed inside ~/.openagents/ (can be uninstalled by launcher)
+   *   - location: 'runtime' | 'legacy' | 'global' | null
+   */
+  getInstallInfo(agentType) {
     const entry = this.registry.getEntry(agentType);
     const npmPkg = entry && entry.install ? entry.install.npm_package : null;
     const binary = entry && entry.install ? entry.install.binary : agentType;
@@ -49,17 +64,21 @@ class Installer {
 
     // Check isolated runtime prefix first (~/.openagents/runtimes/<type>/)
     const runtimeModules = path.join(getRuntimePrefix(agentType), 'node_modules');
-    if (fs.existsSync(path.join(runtimeModules, pkgName, 'package.json'))) return true;
+    if (fs.existsSync(path.join(runtimeModules, pkgName, 'package.json'))) {
+      return { installed: true, managed: true, location: 'runtime' };
+    }
 
     // Legacy: check shared prefix (~/.openagents/nodejs/node_modules/)
     const legacyModules = path.join(os.homedir(), '.openagents', 'nodejs', 'node_modules');
-    if (fs.existsSync(path.join(legacyModules, pkgName, 'package.json'))) return true;
+    if (fs.existsSync(path.join(legacyModules, pkgName, 'package.json'))) {
+      return { installed: true, managed: true, location: 'legacy' };
+    }
 
     // Fallback: check if binary exists on PATH (system install)
     const binaryPath = this._whichBinary(agentType);
     if (!binaryPath) {
       try { fs.unlinkSync(path.join(this.markersDir, agentType)); } catch {}
-      return false;
+      return { installed: false, managed: false, location: null };
     }
 
     // Verify it's not a stale shim pointing to a missing package
@@ -72,11 +91,13 @@ class Installer {
         for (const ext of ['', '.cmd', '.ps1']) {
           try { const p = path.join(path.dirname(binaryPath), binary + ext); if (fs.existsSync(p)) fs.unlinkSync(p); } catch {}
         }
-        return false;
+        return { installed: false, managed: false, location: null };
       }
+      return { installed: true, managed: true, location: 'legacy' };
     }
 
-    return true;
+    // Binary found outside ~/.openagents/ — global/system install
+    return { installed: true, managed: false, location: 'global' };
   }
 
   /**