claw-subagent-service 0.0.70 → 0.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "description": "虾说智能助手",
   "main": "cli.js",
   "bin": {
@@ -37,4 +37,4 @@
     "node": ">=14.0.0"
   },
   "license": "MIT"
-}
+}

package/service/rongcloud/message-handler.js

@@ -42,7 +42,7 @@ class MessageHandler {
       return false;
     }
 
-    const allowedTypes = ['RC:TxtMsg', 'claw'];
+    const allowedTypes = ['RC:TxtMsg'];
     if (!allowedTypes.includes(msg.messageType)) {
       this.log?.info(`[MessageHandler] 忽略非文本消息: ${msg.messageType}`);
       return false;
@@ -94,30 +94,25 @@ class MessageHandler {
       const logContent = typeof msg.content === 'string' ? msg.content : (msg.content?.content || '');
       this.log?.info(`[MessageHandler] 收到消息 from=${msg.senderUserId}, type=${type}, content=${logContent.substring(0, 50)}`);
 
-      if (msg.messageType === 'claw') {
-        this.log?.info(`收到龙虾消息，交由 OpenClawClient 处理`);
-        await this.handleClaw(msg);
-      } else {
-        // 如果配置了代理地址，使用流式处理
-        if (this.isStreamingEnabled) {
-          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 {
-          // 降级到非流式处理
+      // 如果配置了代理地址，使用流式处理
+      if (this.isStreamingEnabled) {
+        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);
+        if (reply) {
+          const targetId = this.getReplyTarget(msg);
+          await this.sendFn(targetId, reply, msg.conversationType);
+        }
       }
     } catch (err) {
       this.log?.error(`[MessageHandler] 处理消息异常: ${err.message}`);
@@ -127,9 +122,6 @@ class MessageHandler {
   }
 
   getMessageType(msg) {
-    if (msg.messageType === 'claw') {
-      return MessageType.CLAW;
-    }
     const text = typeof msg.content === 'string' ? msg.content : (msg.content?.content || '');
     if (text.startsWith('/')) {
       return MessageType.COMMAND;
@@ -164,47 +156,6 @@ class MessageHandler {
     await this.sendFn(targetId, reply, msg.conversationType);
   }
 
-  async handleClaw(msg) {
-    const targetId = this.getReplyTarget(msg);
-
-    // 发送已读回执（fire-and-forget，不阻塞）
-    if (this.sendReadReceiptFn) {
-      this.sendReadReceiptFn(msg).catch(() => {});
-    }
-
-    // 如果配置了代理地址，使用流式处理
-    if (this.isStreamingEnabled) {
-      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;
-    }
-
-    // 降级：后台执行 openclaw CLI，不阻塞消息队列
-    this.openclawClient.chat(msg.content, msg.senderUserId)
-      .then(reply => {
-        this.log?.info(`[MessageHandler] AI 回复: ${reply.substring(0, 50)}...`);
-        this.sendFn(targetId, reply, msg.conversationType).catch(() => {});
-      })
-      .catch(err => {
-        this.log?.error(`[MessageHandler] OpenClaw 调用失败: ${err.message}`);
-        this.sendFn(targetId, `❌ 处理失败: ${err.message}`, msg.conversationType).catch(() => {});
-      });
-  }
-
   /**
    * 流式处理普通消息
    */
@@ -234,19 +185,21 @@ class MessageHandler {
           buffer += delta;
           seq += 1;
           this.log?.info(`[MessageHandler] onDelta: seq=${seq}, delta_len=${delta.length}, buffer_len=${buffer.length}`);
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, seq === 1, false, seq);
+          // 发送增量（delta），让前端做增量拼接，避免内容重复
+          await this._sendStreamChunk(fromUserId, targetId, conversationType, delta, streamId, seq === 1, false, seq);
           hasSentChunk = true;
         },
         async (fullText) => {
           this.log?.info(`[MessageHandler] onDone 触发, fullText.length=${fullText.length}, buffer.length=${buffer.length}, hasSentChunk=${hasSentChunk}`);
           if (buffer.trim()) {
+            // 发送尾流：空字符串表示流结束，前端保留已拼接的完整内容
             seq += 1;
-            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, seq === 1, true, seq);
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true, seq);
             hasSentChunk = true;
           } else if (hasSentChunk) {
             // 已经发送过内容，单独发送结束标记
             seq += 1;
-            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, false, true, seq);
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true, seq);
           } else {
             // 完全没有收到内容，发送错误提示
             await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true, 1);

package/service/rongcloud/types.js

@@ -1,7 +1,6 @@
 const MessageType = {
   COMMAND: 'command',
-  NORMAL: 'normal',
-  CLAW: 'claw'
+  NORMAL: 'normal'
 };
 
 module.exports = {