claw-subagent-service 0.0.67 → 0.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "description": "虾说智能助手",
   "main": "cli.js",
   "bin": {

package/service/rongcloud/message-handler.js

@@ -13,6 +13,7 @@ class MessageHandler {
     this.openclawClient = new OpenClawClient(log);
     this.nodeId = config.accountId || '';
     this.handleNormalMessage = handleNormalMessage;
+    this._streamQueue = Promise.resolve();
   }
 
   /**
@@ -293,27 +294,33 @@ class MessageHandler {
       this.log?.warn('[MessageHandler] _sendStreamChunk  skipped: isStreamingEnabled=false');
       return;
     }
-    try {
-      const resp = await axios.post(
-        `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`,
-        {
-          fromUserId,
-          targetId,
-          content,
-          streamId,
-          isFirstChunk,
-          isLastChunk,
-          conversationType,
-          seq
-        },
-        { timeout: 10000 }
-      );
-      this.log?.info(`[MessageHandler] _sendStreamChunk 成功: status=${resp.status}, seq=${seq}`);
-    } catch (err) {
-      const url = `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`;
-      const status = err.response?.status;
-      this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}, url=${url}, status=${status || 'N/A'}, seq=${seq}`);
-    }
+    
+    // 使用队列确保流式消息片段串行发送，避免并发导致后端处理错乱
+    this._streamQueue = this._streamQueue.then(async () => {
+      try {
+        const resp = await axios.post(
+          `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`,
+          {
+            fromUserId,
+            targetId,
+            content,
+            streamId,
+            isFirstChunk,
+            isLastChunk,
+            conversationType,
+            seq
+          },
+          { timeout: 10000 }
+        );
+        this.log?.info(`[MessageHandler] _sendStreamChunk 成功: status=${resp.status}, seq=${seq}`);
+      } catch (err) {
+        const url = `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`;
+        const status = err.response?.status;
+        this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}, url=${url}, status=${status || 'N/A'}, seq=${seq}`);
+      }
+    });
+    
+    await this._streamQueue;
   }
 
   parseCommand(raw, senderId) {

package/service/rongcloud/openclaw-client.js

@@ -418,6 +418,9 @@ class OpenClawClient {
 
     let fullText = '';
     let buffer = '';
+    let lastChunkData = null;
+    let hasError = false;
+    let errorMsg = '';
 
     const response = await axios.post(apiUrl, payload, {
       headers,
@@ -440,23 +443,49 @@ class OpenClawClient {
 
           try {
             const data = JSON.parse(dataStr);
-            // 尝试多个可能的内容字段，兼容不同版本 OpenClaw
-            const delta = data.choices?.[0]?.delta?.content
-              ?? data.choices?.[0]?.message?.content
-              ?? data.choices?.[0]?.text
-              ?? data.content
-              ?? data.delta;
-            if (typeof delta === 'string' && delta) {
-              fullText += delta;
-              try {
-                await onDelta?.(delta);
-              } catch (err) {
-                reject(err);
-                return;
+            lastChunkData = data;
+
+            // 检测流式错误块
+            if (data.error) {
+              hasError = true;
+              errorMsg = typeof data.error === 'string' ? data.error : (data.error.message || JSON.stringify(data.error));
+              this.log?.error(`[OpenClawClient] SSE chunk error: ${errorMsg}`);
+              continue;
+            }
+
+            // 尝试多个可能的内容字段，兼容不同版本 OpenClaw / 不同模型提供商
+            let delta = null;
+            const choice = data.choices?.[0];
+            if (choice) {
+              delta = choice.delta?.content
+                ?? choice.message?.content
+                ?? choice.text
+                ?? choice.delta?.text
+                ?? choice.delta?.reasoning_content
+                ?? null;
+            }
+            if (delta === null || delta === undefined) {
+              delta = data.content ?? data.delta ?? data.text ?? null;
+            }
+
+            if (typeof delta === 'string') {
+              if (delta.length > 0) {
+                fullText += delta;
+                try {
+                  await onDelta?.(delta);
+                } catch (err) {
+                  reject(err);
+                  return;
+                }
               }
+              // 空字符串 delta 是合法的（无新内容块），静默跳过
+            } else if (delta !== null && delta !== undefined) {
+              this.log?.info(`[OpenClawClient] SSE 原始数据(delta非字符串): ${JSON.stringify(data).substring(0, 200)}`);
             } else {
-              // 调试：打印未识别的 SSE 数据结构
-              this.log?.info(`[OpenClawClient] SSE 原始数据(无delta): ${JSON.stringify(data).substring(0, 200)}`);
+              // 无可识别的 content 字段，仅当不包含 finish_reason 时才打印调试日志
+              if (!data.choices?.[0]?.finish_reason) {
+                this.log?.info(`[OpenClawClient] SSE 原始数据(无content): ${JSON.stringify(data).substring(0, 200)}`);
+              }
             }
           } catch {
             // 忽略无法解析的 JSON 行
@@ -466,8 +495,23 @@ class OpenClawClient {
 
       response.data.on('end', async () => {
         this.log?.info(`[OpenClawClient] SSE 流结束，总长度: ${fullText.length}`);
+
+        if (hasError) {
+          reject(new Error(`OpenClaw SSE 错误: ${errorMsg}`));
+          return;
+        }
+
+        if (fullText.length === 0) {
+          // 兜底：某些网关会在最后一个 chunk 的 message.content 中返回完整内容
+          const lastContent = lastChunkData?.choices?.[0]?.message?.content;
+          if (typeof lastContent === 'string' && lastContent.length > 0) {
+            fullText = lastContent;
+            this.log?.info(`[OpenClawClient] 从 last chunk message.content 提取内容，长度: ${fullText.length}`);
+          }
+        }
+
         if (fullText.length === 0) {
-          reject(new Error('OpenClaw SSE 返回空内容，可能模型未配置或 payload 格式不兼容'));
+          reject(new Error('OpenClaw SSE 返回空内容，可能 LLM 网络异常或模型未配置'));
           return;
         }
         try {