@openagents-org/agent-launcher 0.2.139 → 0.2.141

package/package.json

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

package/registry.json

@@ -616,7 +616,7 @@
       "requires": ["python3"],
       "macos": "curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash -s -- --skip-setup",
       "linux": "curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash -s -- --skip-setup",
-      "windows": "wsl.exe -e bash -lc \"curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash -s -- --skip-setup\""
+      "windows": "\"%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe\" -NoProfile -ExecutionPolicy Bypass -Command \"Invoke-RestMethod -UseBasicParsing 'https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.ps1' | Invoke-Expression\""
     },
     "launch": {
       "args": []

package/src/adapters/claude.js

@@ -305,6 +305,15 @@ class ClaudeAdapter extends BaseAdapter {
       if (jsMatch) {
         return [nodeBin, path.resolve(cmdDir, jsMatch[1])];
       }
+      // .cmd shims that forward to a native .exe (e.g. Claude Code's
+      // claude.cmd → @anthropic-ai/claude-code/bin/claude.exe). Resolve to the
+      // exe and spawn it directly. Wrapping such a .cmd in `cmd.exe /c` caps the
+      // command line at cmd.exe's 8191-char limit, which truncates the ~14KB
+      // --append-system-prompt and makes the agent hang ("command line too long").
+      const exeMatch = cmdContent.match(/%dp0%\\([^\s"*?]+\.exe)/i);
+      if (exeMatch) {
+        return [path.resolve(cmdDir, exeMatch[1])];
+      }
     } else {
       // Unix: symlink → resolve to actual .js file
       try {
@@ -564,7 +573,7 @@ class ClaudeAdapter extends BaseAdapter {
         const resolved = this._resolveToNodeCmd(oaBin);
         if (resolved) {
           mcpCommand = resolved[0];
-          mcpFinalArgs = [resolved[1], ...mcpArgs];
+          mcpFinalArgs = [...resolved.slice(1), ...mcpArgs];
         } else {
           mcpCommand = oaBin;
         }
@@ -689,7 +698,7 @@ class ClaudeAdapter extends BaseAdapter {
     const resolved = this._resolveToNodeCmd(filteredCmd[0]);
     let finalCmd = filteredCmd;
     if (resolved) {
-      finalCmd = [resolved[0], resolved[1], ...filteredCmd.slice(1)];
+      finalCmd = [...resolved, ...filteredCmd.slice(1)];
     } else if (IS_WINDOWS && filteredCmd[0].toLowerCase().endsWith('.cmd')) {
       finalCmd = ['cmd.exe', '/c', ...filteredCmd];
     }
@@ -999,6 +1008,30 @@ class ClaudeAdapter extends BaseAdapter {
       }
     }
 
+    // Third-party Anthropic-compatible relays (the common reason a custom
+    // ANTHROPIC_BASE_URL is set) authenticate via `Authorization: Bearer`, which
+    // the Claude CLI only sends when ANTHROPIC_AUTH_TOKEN is set. With just
+    // ANTHROPIC_API_KEY the CLI sends `x-api-key`, which most relays ignore — the
+    // relay then rejects every request as 401 "invalid token / 无效的令牌". When a
+    // non-official base URL is configured and no auth token was provided, mirror
+    // the API key into ANTHROPIC_AUTH_TOKEN (it outranks the API key in Claude
+    // Code's auth precedence) so the CLI uses Bearer auth. The launcher normally
+    // sets this when saving env; this is the runtime backstop for envs saved by
+    // an older launcher or coming from any other source. The official
+    // api.anthropic.com endpoint keeps x-api-key, so it is left untouched.
+    const anthropicBase = (cleanEnv.ANTHROPIC_BASE_URL || '').trim();
+    const anthropicKey = (cleanEnv.ANTHROPIC_API_KEY || '').trim();
+    if (anthropicKey && anthropicBase && !(cleanEnv.ANTHROPIC_AUTH_TOKEN || '').trim()) {
+      let officialAnthropic = false;
+      try {
+        const host = new URL(anthropicBase).hostname.toLowerCase();
+        officialAnthropic = host === 'anthropic.com' || host.endsWith('.anthropic.com');
+      } catch { officialAnthropic = false; }
+      if (!officialAnthropic) {
+        cleanEnv.ANTHROPIC_AUTH_TOKEN = anthropicKey;
+      }
+    }
+
     // Spawn a persistent process and send the first message via stdin
     let effectiveContent = content;
     for (let attempt = 0; attempt < 2; attempt++) {

package/src/adapters/hermes.js

@@ -24,6 +24,9 @@ const { buildOpenclawSystemPrompt } = require('./workspace-prompt');
 const { whichBinary, getEnhancedEnv } = require('../paths');
 
 const IS_WINDOWS = process.platform === 'win32';
+const HERMES_INSTALL_HINT = IS_WINDOWS
+  ? 'powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.ps1 | iex"'
+  : 'curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash';
 const SESSION_ID_RE = /session_id:\s*(\S+)/;
 const MAX_HISTORY_ENTRIES = 12;
 
@@ -56,7 +59,7 @@ class HermesAdapter extends BaseAdapter {
     if (this._hermesBin) {
       this._log(`Using Hermes binary: ${this._hermesBin} (profile=${this.hermesProfile})`);
     } else {
-      this._log('Warning: hermes CLI not found. Install: curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash');
+      this._log(`Warning: hermes CLI not found. Install: ${HERMES_INSTALL_HINT}`);
     }
   }
 
@@ -76,7 +79,9 @@ class HermesAdapter extends BaseAdapter {
     try {
       const env = getEnhancedEnv();
       if (IS_WINDOWS) {
-        // Native Windows unsupported upstream — we try anyway for WSL cases
+        // Native Windows is supported (install.ps1). The installer adds
+        // venv\Scripts to the user PATH; a running daemon won't see that update,
+        // hence the enriched env + the explicit candidates in Tier 2.
         const r = execSync('where hermes.exe 2>nul || where hermes.cmd 2>nul || where hermes 2>nul', {
           encoding: 'utf-8', timeout: 5000, windowsHide: true, env,
         });
@@ -88,9 +93,16 @@ class HermesAdapter extends BaseAdapter {
       }
     } catch {}
 
-    // Tier 2: Common install locations. The installer drops `hermes` in
-    // ~/.local/bin and (on Windows) ~/.hermes/bin.
+    // Tier 2: Common install locations. The native Windows installer
+    // (install.ps1) provisions a portable venv and drops hermes.exe under
+    // %LOCALAPPDATA%\hermes\hermes-agent\venv\Scripts (with the uv shim in
+    // %LOCALAPPDATA%\hermes\bin). The Unix installer uses ~/.local/bin.
+    const localAppData = process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local');
     const candidates = IS_WINDOWS ? [
+      path.join(localAppData, 'hermes', 'hermes-agent', 'venv', 'Scripts', 'hermes.exe'),
+      path.join(localAppData, 'hermes', 'hermes-agent', 'venv', 'Scripts', 'hermes.cmd'),
+      path.join(localAppData, 'hermes', 'bin', 'hermes.exe'),
+      path.join(localAppData, 'hermes', 'bin', 'hermes.cmd'),
       path.join(home, '.hermes', 'bin', 'hermes.exe'),
       path.join(home, '.hermes', 'bin', 'hermes.cmd'),
       path.join(home, '.hermes', 'bin', 'hermes'),
@@ -111,10 +123,10 @@ class HermesAdapter extends BaseAdapter {
     const viaWhich = whichBinary('hermes');
     if (viaWhich) return viaWhich;
 
-    // Tier 4 (Windows only): Hermes is not supported natively on Windows — it
-    // installs and runs inside WSL2. If a WSL distro has hermes on its login
-    // PATH, resolve its absolute in-WSL path; _runHermes then invokes it as
-    // `wsl -e <path> …`.
+    // Tier 4 (Windows only): fall back to a WSL install if one exists. Native
+    // Windows (Tiers 1-3) is preferred, but a user who set hermes up inside
+    // WSL2 still works — resolve its absolute in-WSL path; _runHermes then
+    // invokes it as `wsl -e <path> …`.
     if (IS_WINDOWS) {
       const wslPath = this._resolveWslHermes();
       if (wslPath) {
@@ -283,7 +295,7 @@ class HermesAdapter extends BaseAdapter {
 
   _buildHermesCmd(prompt, resumeSessionId) {
     if (!this._hermesBin) {
-      throw new Error('hermes CLI not found. Install with: curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash');
+      throw new Error(`hermes CLI not found. Install with: ${HERMES_INSTALL_HINT}`);
     }
     const args = [];
     if (this.hermesProfile && this.hermesProfile !== 'default') {

package/src/paths.js

@@ -197,6 +197,15 @@ function _addWindowsPaths(dirs) {
   if (localAppData) _push(dirs, path.join(localAppData, 'cursor-agent'));
   _push(dirs, path.join(HOME, '.local', 'bin'));
 
+  // Hermes CLI native (no-WSL) installer drops hermes.exe in the portable
+  // venv's Scripts dir and the uv shim in %LOCALAPPDATA%\hermes\bin. Same
+  // registry-PATH staleness as Cursor — add explicitly so an already-running
+  // daemon resolves hermes via `where` without a reboot.
+  if (localAppData) {
+    _push(dirs, path.join(localAppData, 'hermes', 'hermes-agent', 'venv', 'Scripts'));
+    _push(dirs, path.join(localAppData, 'hermes', 'bin'));
+  }
+
   // Node.js install
   _push(dirs, path.join(programFiles, 'nodejs'));