@openagents-org/agent-launcher 0.2.140 → 0.2.142

package/package.json

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

package/src/adapters/base.js

@@ -93,7 +93,10 @@ class BaseAdapter {
 
     // Sync workspace-managed skills into disabledModules
     try {
-      const agents = await this.client.getAgents(this.workspaceId, this.token);
+      const agents = await Promise.race([
+        this.client.getAgents(this.workspaceId, this.token),
+        new Promise((_, reject) => setTimeout(() => reject(new Error('skill sync timed out (10s)')), 10000)),
+      ]);
       const self = agents.find((a) => a.agentName === this.agentName);
       if (self && self.enabledSkills) {
         const { skillsToDisabledModules } = require('../skill-catalog');

package/src/adapters/claude.js

@@ -73,6 +73,10 @@ class ClaudeAdapter extends BaseAdapter {
   async _onControlAction(action, payload) {
     if (action === 'stop') {
       const channel = (payload && typeof payload === 'object') ? payload.channel : null;
+      if (channel) {
+        const pp = this._persistentProcs[channel];
+        if (pp) pp.userStopped = true;
+      }
       if (channel && this._channelProcesses[channel]) {
         this._log(`Stopping process for channel=${channel}`);
         this._stoppingChannels.add(channel);
@@ -84,6 +88,7 @@ class ClaudeAdapter extends BaseAdapter {
           await this.sendResponse(channel, 'Execution stopped by user.');
         } catch {}
       } else {
+        for (const pp of Object.values(this._persistentProcs)) pp.userStopped = true;
         await this._stopAllProcesses('Execution stopped by user.');
       }
       return;
@@ -226,7 +231,7 @@ class ClaudeAdapter extends BaseAdapter {
    */
   async _buildChannelRecap(channelName, currentMessage) {
     const messages = await this.client.getRecentMessages(
-      this.workspaceId, channelName, this.token, 30
+      this.workspaceId, channelName, this.token, 60
     );
     if (!messages || messages.length === 0) return null;
 
@@ -236,20 +241,16 @@ class ClaudeAdapter extends BaseAdapter {
       if (mt === 'status' || mt === 'thinking' || mt === 'loading') continue;
       const text = (m.content || '').trim();
       if (!text) continue;
-      // Don't echo the user's current message back at them.
       if (text === currentMessage) continue;
       const who = m.senderType === 'human'
         ? (m.senderName || 'user')
         : (m.senderName || 'agent');
-      // Cap each line so a single huge paste doesn't blow up the prompt.
-      const truncated = text.length > 800 ? text.slice(0, 800) + '…' : text;
+      const truncated = text.length > 2000 ? text.slice(0, 2000) + '…' : text;
       lines.push(`[${who}] ${truncated}`);
     }
     if (lines.length === 0) return null;
 
-    // Keep only the tail; older context has diminishing value and we
-    // don't want to balloon the system prompt.
-    const tail = lines.slice(-15).join('\n');
+    const tail = lines.slice(-20).join('\n');
     return (
       'You previously worked in this channel but your prior session is no ' +
       'longer available, so here is the recent conversation for context:\n\n' +
@@ -305,6 +306,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 +574,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 +699,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];
     }
@@ -719,6 +729,7 @@ class ClaudeAdapter extends BaseAdapter {
       lastStdoutTime: Date.now(),
       watchdogTimer: null,
       awaitingToolResult: false,
+      userStopped: false,
     };
 
     if (proc.stderr) {
@@ -974,6 +985,12 @@ class ClaudeAdapter extends BaseAdapter {
         }
         return;
       }
+      if (existingPP.userStopped) {
+        if (!existingPP.everPostedAnything) {
+          try { await this.sendResponse(msgChannel, 'Execution stopped by user.'); } catch {}
+        }
+        return;
+      }
       // Process died mid-message — fall through to spawn a fresh one
       this._log(`Persistent process died, falling back to fresh spawn for ${msgChannel}`);
     }
@@ -999,13 +1016,48 @@ 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;
+
+    // When starting without a session (no --resume), prepend channel
+    // history so the fresh CLI has conversation context.
+    if (!this._channelSessions[msgChannel]) {
+      try {
+        const recap = await this._buildChannelRecap(msgChannel, content);
+        if (recap) effectiveContent = `${recap}\n\n---\n\n${content}`;
+      } catch {}
+    }
+
     for (let attempt = 0; attempt < 2; attempt++) {
       if (mcpConfigFile) { try { fs.unlinkSync(mcpConfigFile); } catch {} mcpConfigFile = null; }
 
       if (attempt > 0) {
         this._killPersistentProc(msgChannel);
+        // Rebuild recap for retry without resume
         try {
           const recap = await this._buildChannelRecap(msgChannel, content);
           if (recap) effectiveContent = `${recap}\n\n---\n\n${content}`;
@@ -1032,7 +1084,13 @@ class ClaudeAdapter extends BaseAdapter {
         const result = await this._sendToPersistentProc(pp, effectiveContent);
 
         if (result.exited) {
-          this._log(`Process exited during first message (attempt ${attempt + 1})`);
+          this._log(`Process exited during first message (attempt ${attempt + 1}), userStopped=${pp.userStopped}`);
+          if (pp.userStopped) {
+            if (!pp.everPostedAnything) {
+              try { await this.sendResponse(msgChannel, 'Execution stopped by user.'); } catch {}
+            }
+            break;
+          }
           if (attempt === 0 && this._channelSessions[msgChannel]) {
             this._log(`Stale session detected, retrying without resume`);
             delete this._channelSessions[msgChannel];

package/src/adapters/cursor.js

@@ -285,6 +285,13 @@ class CursorAdapter extends BaseAdapter {
       if (jsMatch) {
         return [nodeBin, path.resolve(cmdDir, jsMatch[1])];
       }
+      // .cmd shims that forward to a native .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, truncating long args (e.g. system prompts).
+      const exeMatch = cmdContent.match(/%dp0%\\([^\s"*?]+\.exe)/i);
+      if (exeMatch) {
+        return [path.resolve(cmdDir, exeMatch[1])];
+      }
     } else {
       try {
         let target = binPath;
@@ -424,7 +431,7 @@ class CursorAdapter extends BaseAdapter {
     try {
       const resolved = this._resolveToNodeCmd(cmd[0]);
       if (resolved) {
-        cmd = [resolved[0], resolved[1], ...cmd.slice(1)];
+        cmd = [...resolved, ...cmd.slice(1)];
       } else if (IS_WINDOWS && cmd[0].toLowerCase().endsWith('.cmd')) {
         cmd = ['cmd.exe', '/c', ...cmd];
       }

package/src/adapters/gemini.js

@@ -122,6 +122,13 @@ class GeminiAdapter extends BaseAdapter {
       if (jsMatch) {
         return [nodeBin, path.resolve(cmdDir, jsMatch[1])];
       }
+      // .cmd shims that forward to a native .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, truncating long args (e.g. system prompts).
+      const exeMatch = cmdContent.match(/%dp0%\\([^\s"*?]+\.exe)/i);
+      if (exeMatch) {
+        return [path.resolve(cmdDir, exeMatch[1])];
+      }
     } else {
       try {
         let target = binPath;
@@ -265,7 +272,7 @@ class GeminiAdapter extends BaseAdapter {
       try {
         const resolved = this._resolveToNodeCmd(cmd[0]);
         if (resolved) {
-          cmd = [resolved[0], resolved[1], ...cmd.slice(1)];
+          cmd = [...resolved, ...cmd.slice(1)];
         } else if (IS_WINDOWS && cmd[0].toLowerCase().endsWith('.cmd')) {
           cmd = ['cmd.exe', '/c', ...cmd];
         }

package/src/daemon.js

@@ -151,6 +151,14 @@ class Daemon {
       if (!this._adapters || !this._adapters[agentName]) break;
       await new Promise(r => setTimeout(r, 500));
     }
+    // Force-clear the adapter slot if it's still hanging. Without this,
+    // a hung adapter.run() promise prevents the slot from ever being
+    // released, and subsequent start/restart commands see "already running".
+    if (this._adapters && this._adapters[agentName]) {
+      this._log(`WARNING: ${agentName} adapter did not exit after stop — force-releasing slot`);
+      try { this._adapters[agentName].stop(); } catch {}
+      delete this._adapters[agentName];
+    }
     this._writeStatus();
   }
 

package/src/installer.js

@@ -132,7 +132,12 @@ class Installer {
       : null;
     if (verifyCmd) {
       try {
-        require('child_process').execSync(verifyCmd, { stdio: 'ignore', timeout: 5000 });
+        // Use the enhanced PATH so a freshly-installed CLI living in a dir the
+        // installer added (e.g. %LOCALAPPDATA%\cursor-agent) is found — otherwise
+        // `cursor-agent --version` exits "not recognized" and verify wrongly fails.
+        require('child_process').execSync(verifyCmd, {
+          stdio: 'ignore', timeout: 5000, env: getEnhancedEnv(), windowsHide: true,
+        });
         return true;
       } catch { return false; }
     }

package/src/update-check.js

@@ -140,9 +140,14 @@ function runUpdate(opts = {}) {
   const spawn = opts.spawn || spawnSync;
   const npmBin = opts.npmBin || findNpmBin({ platform });
   const prefix = opts.prefix !== undefined ? opts.prefix : detectInstallPrefix();
-  const args = ['install', '--no-save', `${PKG_NAME}@latest`];
+  // Use a GLOBAL install (-g). A LOCAL install (`npm install <pkg> --prefix
+  // <dir>`) treats <dir> as a project root and prunes every node_modules entry
+  // not reachable from its package.json. When the prefix is the portable node
+  // dir, that deletes node's own bundled npm/corepack (and other agent runtimes),
+  // breaking every subsequent `agn` command. A global install only adds/updates
+  // the named package into <prefix>/node_modules and never prunes its siblings.
+  const args = ['install', '-g', `${PKG_NAME}@latest`];
   if (prefix) args.push('--prefix', prefix);
-  else args.push('-g');
 
   // On Windows, npm.cmd is a batch file and must be invoked through cmd.exe.
   // Passing the args via cmd.exe with shell:false lets Node quote paths that