claw-subagent-service 0.0.61 → 0.0.63

package/package.json

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

package/service/rongcloud/message-handler.js

@@ -97,9 +97,16 @@ class MessageHandler {
       } else {
         // 如果配置了代理地址，使用流式处理
         if (this.isStreamingEnabled) {
-          this.handleNormalMessageStream(msg).catch(err => {
-            this.log?.error(`[MessageHandler] 流式处理异常: ${err.message}`);
-          });
+          try {
+            await this.handleNormalMessageStream(msg);
+          } catch (err) {
+            this.log?.error(`[MessageHandler] 流式处理失败，回退到非流式: ${err.message}`);
+            const reply = await this.handleNormalMessage(msg);
+            if (reply) {
+              const targetId = this.getReplyTarget(msg);
+              await this.sendFn(targetId, reply, msg.conversationType);
+            }
+          }
         } else {
           // 降级到非流式处理
           const reply = await this.handleNormalMessage(msg);
@@ -164,9 +171,22 @@ class MessageHandler {
 
     // 如果配置了代理地址，使用流式处理
     if (this.isStreamingEnabled) {
-      this.handleNormalMessageStream(msg).catch(err => {
-        this.log?.error(`[MessageHandler] 流式处理异常: ${err.message}`);
-      });
+      try {
+        await this.handleNormalMessageStream(msg);
+      } catch (err) {
+        this.log?.error(`[MessageHandler] 流式处理失败，回退到 CLI: ${err.message}`);
+        // 回退到非流式 CLI 调用
+        try {
+          const reply = await this.openclawClient.chat(msg.content, msg.senderUserId);
+          if (reply) {
+            this.log?.info(`[MessageHandler] AI 回复: ${reply.substring(0, 50)}...`);
+            await this.sendFn(targetId, reply, msg.conversationType);
+          }
+        } catch (cliErr) {
+          this.log?.error(`[MessageHandler] CLI 回退也失败: ${cliErr.message}`);
+          await this.sendFn(targetId, `❌ 处理失败: ${cliErr.message}`, msg.conversationType);
+        }
+      }
       return;
     }
 
@@ -199,36 +219,48 @@ class MessageHandler {
     this.log?.info(`[MessageHandler] 开始流式处理，streamId=${streamId}`);
 
     // 2. 调用 OpenClaw SSE
-    return this.openclawClient.chatStream(
-      msg.content,
-      msg.senderUserId,
-      async (delta) => {
-        buffer += delta;
-        // 策略：每 30 个字符或遇到句末标点发送一次片段
-        if (buffer.length >= 30 || /[。！？.!?\n]$/.test(delta)) {
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, false);
-          isFirstChunk = false;
-          buffer = '';
-        }
-      },
-      async (fullText) => {
-        // 发送剩余缓冲区和结束标记
-        if (buffer.trim()) {
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, true);
-        } else if (!isFirstChunk) {
-          // 已经发送过内容，单独发送结束标记
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true);
-        } else {
-          // 完全没有收到内容，发送错误提示
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true);
+    let hasSentChunk = false;
+    try {
+      await this.openclawClient.chatStream(
+        msg.content,
+        msg.senderUserId,
+        async (delta) => {
+          buffer += delta;
+          // 策略：每 30 个字符或遇到句末标点发送一次片段
+          if (buffer.length >= 30 || /[。！？.!?\n]$/.test(delta)) {
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, false);
+            isFirstChunk = false;
+            hasSentChunk = true;
+            buffer = '';
+          }
+        },
+        async (fullText) => {
+          // 发送剩余缓冲区和结束标记
+          if (buffer.trim()) {
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, true);
+            hasSentChunk = true;
+          } else if (!isFirstChunk) {
+            // 已经发送过内容，单独发送结束标记
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true);
+            hasSentChunk = true;
+          } else {
+            // 完全没有收到内容，发送错误提示
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true);
+            hasSentChunk = true;
+          }
+
+          if (!hasSentChunk) {
+            throw new Error('流式消息发送失败，没有任何片段成功送达');
+          }
+
+          this.log?.info(`[MessageHandler] 流式消息完成，streamId=${streamId}, 总长度: ${fullText.length}`);
         }
-        this.log?.info(`[MessageHandler] 流式消息完成，streamId=${streamId}, 总长度: ${fullText.length}`);
-      },
-      async (err) => {
-        this.log?.error(`[MessageHandler] 流式处理错误: ${err.message}`);
-        await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 响应出现错误，请稍后重试。', streamId, isFirstChunk, true);
-      }
-    );
+      );
+    } catch (err) {
+      this.log?.error(`[MessageHandler] 流式处理错误: ${err.message}`);
+      await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 响应出现错误，请稍后重试。', streamId, isFirstChunk, true);
+      throw err;
+    }
   }
 
   /**
@@ -248,7 +280,9 @@ class MessageHandler {
       );
       this.log?.info(`[MessageHandler] typing 状态已发送: ${fromUserId} -> ${targetId}`);
     } catch (err) {
-      this.log?.warn(`[MessageHandler] 发送 typing 状态失败: ${err.message}`);
+      const url = `${this.config.apiBaseUrl}/im/api/proxy/stream/typing`;
+      const status = err.response?.status;
+      this.log?.warn(`[MessageHandler] 发送 typing 状态失败: ${err.message}, url=${url}, status=${status || 'N/A'}`);
     }
   }
 
@@ -272,7 +306,9 @@ class MessageHandler {
         { timeout: 10000 }
       );
     } catch (err) {
-      this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}`);
+      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'}`);
     }
   }
 

package/service/rongcloud/openclaw-client.js

@@ -332,9 +332,16 @@ class OpenClawClient {
           continue;
         }
 
-        this.log?.error(`[OpenClawClient] SSE 请求失败: ${err.message}`);
-        onError?.(err);
-        return;
+        if (is404 && isLast) {
+          this.log?.error(`[OpenClawClient] 所有 SSE 端点均返回 404。OpenClaw chatCompletions 端点未启用。`);
+          this.log?.error(`[OpenClawClient] 请检查 ~/.openclaw/openclaw.json 中是否包含:`);
+          this.log?.error(`[OpenClawClient]   gateway.http.endpoints.chatCompletions.enabled = true`);
+          this.log?.error(`[OpenClawClient] 修改后请重启 OpenClaw gateway: openclaw gateway`);
+        } else {
+          this.log?.error(`[OpenClawClient] SSE 请求失败: ${err.message}`);
+        }
+        // 不再内部调用 onError，让错误通过 Promise reject 向上传播，便于调用方回退
+        throw err;
       }
     }
   }
@@ -367,7 +374,7 @@ class OpenClawClient {
     });
 
     return new Promise((resolve, reject) => {
-      response.data.on('data', (chunk) => {
+      response.data.on('data', async (chunk) => {
         buffer += chunk.toString();
         const lines = buffer.split('\n');
         buffer = lines.pop(); // 保留未完整的最后一行
@@ -384,7 +391,12 @@ class OpenClawClient {
             const delta = data.choices?.[0]?.delta?.content;
             if (delta) {
               fullText += delta;
-              onDelta?.(delta);
+              try {
+                await onDelta?.(delta);
+              } catch (err) {
+                reject(err);
+                return;
+              }
             }
           } catch {
             // 忽略无法解析的 JSON 行
@@ -392,10 +404,14 @@ class OpenClawClient {
         }
       });
 
-      response.data.on('end', () => {
+      response.data.on('end', async () => {
         this.log?.info(`[OpenClawClient] SSE 流结束，总长度: ${fullText.length}`);
-        onDone?.(fullText);
-        resolve();
+        try {
+          await onDone?.(fullText);
+          resolve();
+        } catch (err) {
+          reject(err);
+        }
       });
 
       response.data.on('error', (err) => {

package/service/worker.js

@@ -232,6 +232,8 @@ function loadRongCloudConfig() {
     config.heartbeatInterval = 20;
   }
 
+  log.info(`[WORKER] 最终 apiBaseUrl: ${config.apiBaseUrl}`);
+
   if (config.token && config.accountId) {
     return config;
   }