@openagents-org/agent-launcher 0.2.31 → 0.2.33

package/package.json

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

package/src/adapters/base.js

@@ -232,7 +232,11 @@ class BaseAdapter {
   // ------------------------------------------------------------------
 
   async _dispatchMessage(msg) {
-    const channel = msg.sessionId || this.channelName;
+    // Use sessionId only if it looks like a channel, not an agent target
+    let channel = this.channelName || 'general';
+    if (msg.sessionId && !msg.sessionId.startsWith('openagents:') && !msg.sessionId.startsWith('agent:')) {
+      channel = msg.sessionId;
+    }
 
     if (this._channelBusy.has(channel)) {
       if (!this._channelQueues[channel]) this._channelQueues[channel] = [];

package/src/adapters/openclaw.js

@@ -144,7 +144,12 @@ class OpenClawAdapter extends BaseAdapter {
 
     if (!content) return;
 
-    const msgChannel = msg.sessionId || this.channelName;
+    // msg.sessionId may be a channel name (from workspace UI) or an agent target
+    // (from API). Only use it if it looks like a channel, otherwise use channelName.
+    let msgChannel = this.channelName || 'general';
+    if (msg.sessionId && !msg.sessionId.startsWith('openagents:') && !msg.sessionId.startsWith('agent:')) {
+      msgChannel = msg.sessionId;
+    }
     const sender = msg.senderName || msg.senderType || 'user';
     this._log(`Processing message from ${sender} in ${msgChannel}: ${content.slice(0, 80)}...`);
 
@@ -177,7 +182,8 @@ class OpenClawAdapter extends BaseAdapter {
         return;
       }
 
-      const sessionKey = `openagents-${this.workspaceId.slice(0, 8)}-${channel.slice(-8)}`;
+      const channelSuffix = (channel || 'general').replace(/[^a-zA-Z0-9-]/g, '').slice(-8) || 'general';
+      const sessionKey = `openagents-${this.workspaceId.slice(0, 8)}-${channelSuffix}`;
 
       const args = [
         '--log-level', 'trace',
@@ -324,8 +330,13 @@ class OpenClawAdapter extends BaseAdapter {
     // Find the JSON by looking for '{"payloads"' or the last complete JSON object.
     let jsonStr = null;
 
-    // Strategy 1: find {"payloads" directly
-    const payloadsIdx = text.indexOf('{"payloads"');
+    // Strategy 1: find {"payloads" or { "payloads" (with whitespace)
+    let payloadsIdx = text.indexOf('{"payloads"');
+    if (payloadsIdx < 0) {
+      // Try with whitespace after {
+      const match = text.match(/\{\s*"payloads"/);
+      if (match) payloadsIdx = match.index;
+    }
     if (payloadsIdx >= 0) {
       // Find the matching closing brace by counting braces
       let depth = 0;
@@ -365,11 +376,17 @@ class OpenClawAdapter extends BaseAdapter {
       try {
         const data = JSON.parse(jsonStr);
         const payloads = data.payloads || [];
+        this._log(`CLI parsed: ${payloads.length} payloads, keys=${payloads.map(p=>Object.keys(p).join('/')).join(', ')}, text=${payloads.map(p=>(p.text||'').slice(0,50)).join('|')}`);
         if (payloads.length > 0) {
-          resolve(payloads.filter(p => p.text).map(p => p.text).join('\n\n'));
-          return;
+          const texts = payloads.filter(p => p.text).map(p => p.text);
+          if (texts.length > 0) {
+            resolve(texts.join('\n\n'));
+            return;
+          }
         }
-      } catch {}
+      } catch (e) {
+        this._log(`CLI JSON parse error: ${e.message}`);
+      }
     }
 
     // Fallback: return non-diagnostic text