claw-subagent-service 0.0.47 → 0.0.48

package/cli.js

@@ -26,6 +26,8 @@ const command = args[0] || '--run';
 
 function runDaemon() {
   console.log('[CLI] 启动 Daemon...');
+  console.log(`[CLI] CLI 路径: ${__filename}`);
+  console.log(`[CLI] Daemon 路径: ${DAEMON_PATH}`);
 
   const daemon = spawn('node', [DAEMON_PATH], {
     stdio: 'inherit',

package/package.json

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

package/service/daemon.js

@@ -177,6 +177,8 @@ function startWorker(isAfterUpdate = false, backupDirForRollback = null) {
   if (stopping || isRollingBack) return;
 
   log.info(`[DAEMON] 启动 Worker，daemon PID: ${process.pid}，更新后重启: ${isAfterUpdate}`);
+  log.info(`[DAEMON] Daemon 目录: ${__dirname}`);
+  log.info(`[DAEMON] Worker 路径: ${WORKER_PATH}`);
 
   // 启动前释放旧端口，防止旧 worker 残留占用
   freePortIfNeeded(PORT);

package/service/rongcloud/rongcloud-client.js

@@ -42,14 +42,15 @@ class RongCloudClient {
     this.log?.info(`[RongCloudClient] has sendReadReceiptResponseV2: ${typeof RongIMLib.sendReadReceiptResponseV2 === 'function'}`);
     this.log?.info(`[RongCloudClient] has sendReadReceiptResponseV5: ${typeof RongIMLib.sendReadReceiptResponseV5 === 'function'}`);
 
-    // 同时注册新版 addEventListener 和旧版 setOnReceiveMessageListener
-    // 某些场景下（如群聊消息）SDK 可能只通过旧版监听器分发
+    // 优先使用新版 addEventListener；与旧版 setOnReceiveMessageListener 互斥
+    // 避免同时注册导致 SDK 内部回调冲突或覆盖
     if (RongIMLib.addEventListener) {
-      this.log?.info('[RongCloudClient] 注册 addEventListener 事件');
+      this.log?.info('[RongCloudClient] 使用 addEventListener 模式');
 
       RongIMLib.addEventListener(RongIMLib.Events?.MESSAGES || 'MESSAGES', (event) => {
         this.log?.info(`[RongCloudClient] MESSAGES 事件触发, messages长度=${event?.messages?.length || 0}`);
         event.messages?.forEach(msg => {
+          this.log?.info(`[RongCloudClient] MESSAGES 单条消息: messageType=${msg.messageType}, senderUserId=${msg.senderUserId}, conversationType=${msg.conversationType}, isOffLineMessage=${msg.isOffLineMessage}, messageDirection=${msg.messageDirection}`);
           this.handleReceivedMessage(msg);
         });
       });
@@ -68,26 +69,21 @@ class RongCloudClient {
         this.log?.warn(`[RongCloudClient] 断开连接, code: ${code}`);
         this.isConnected = false;
       });
-    }
-
-    // 兜底：旧版监听器，防止群聊消息漏收
-    if (RongIMLib.setOnReceiveMessageListener) {
-      this.log?.info('[RongCloudClient] 注册 setOnReceiveMessageListener 兜底');
-      RongIMLib.setOnReceiveMessageListener({
-        onReceived: (message) => {
-          this.log?.info(`[RongCloudClient] setOnReceiveMessageListener 收到消息: messageType=${message.messageType}, senderUserId=${message.senderUserId}, conversationType=${message.conversationType}`);
-          this.handleReceivedMessage(message);
-        }
-      });
-    }
-
-    if (RongIMLib.setConnectionStatusListener && !RongIMLib.addEventListener) {
+    } else if (RongIMLib.setOnReceiveMessageListener) {
+      this.log?.info('[RongCloudClient] 使用 setOnReceiveMessageListener 模式');
       RongIMLib.setConnectionStatusListener({
         onChanged: (status) => {
           this.log?.info(`[RongCloudClient] 连接状态变化: ${status}`);
           this.isConnected = status === 3 || status === 'Connected';
         }
       });
+
+      RongIMLib.setOnReceiveMessageListener({
+        onReceived: (message) => {
+          this.log?.info(`[RongCloudClient] onReceived: messageType=${message.messageType}, senderUserId=${message.senderUserId}, conversationType=${message.conversationType}, isOffLineMessage=${message.isOffLineMessage}, messageDirection=${message.messageDirection}`);
+          this.handleReceivedMessage(message);
+        }
+      });
     }
 
     try {
@@ -111,6 +107,9 @@ class RongCloudClient {
   }
 
   handleReceivedMessage(message) {
+    // 最外层日志：确保任何消息到达都能留下痕迹（在过滤之前）
+    this.log?.info(`[RongCloudClient] handleReceivedMessage 入口: messageType=${message.messageType}, senderUserId=${message.senderUserId}, conversationType=${message.conversationType}, isOffLineMessage=${message.isOffLineMessage}, messageDirection=${message.messageDirection}, messageUId=${message.messageUId}`);
+
     // 1. 不再静默过滤离线消息：Docker 中每次启动都是新连接，
     //    群聊@消息常以离线消息形式推送，过滤会导致消息丢失
     if (message.isOffLineMessage) {
@@ -120,15 +119,18 @@ class RongCloudClient {
     // 2. 过滤自己发送的消息（融云 SDK 可能将发送消息回传）
     // messageDirection: 1=发送, 2=接收
     if (message.messageDirection === 1) {
+      this.log?.info('[RongCloudClient] 过滤自己发送的消息 (messageDirection=1)');
       return;
     }
     if (message.senderUserId === this.config.accountId) {
+      this.log?.info(`[RongCloudClient] 过滤自己发送的消息 (senderUserId=${message.senderUserId} === accountId=${this.config.accountId})`);
       return;
     }
 
     // 3. 消息去重：防止同一条消息被多次触发（融云重推或多端同步）
     const dedupKey = message.messageUId || `${message.senderUserId}-${message.sentTime}-${message.messageType}`;
     if (this.processedMessageUIds.has(dedupKey)) {
+      this.log?.info(`[RongCloudClient] 消息去重过滤: dedupKey=${dedupKey}`);
       return;
     }
     this.processedMessageUIds.add(dedupKey);

package/service/worker.js

@@ -260,6 +260,9 @@ async function refreshRongCloudToken() {
 async function initRongCloud() {
   if (!rongcloudConfig) return;
 
+  log.info(`[WORKER] Worker 启动，目录: ${__dirname}`);
+  log.info(`[WORKER] 代码版本特征: isOffLineMessage-pass-through, messageDirection-log, addEventListener-exclusive`);
+
   // 启动 opencode 服务（与桌面客户端对齐）
   log.info('[WORKER] 启动 opencode 服务...');
   try {