claw-subagent-service 0.0.56 → 0.0.58

package/package.json

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

package/service/modules/opencode-service.js

@@ -47,7 +47,7 @@ nohup openclaw gateway --port 18789 --host 0.0.0.0 --verbose > /var/log/openclaw
 - 不知道就查资料，别瞎猜
 - 看到 \`systemctl\` 相关报错，立即切换为 \`nohup\` 方案, 因为docker容器内是没有systemctl的。
 - 超过6分钟 没有修复好就停下来，报告你遇到的问题，不要无限循环的进行修复。
-- 不要对外透漏你是什么模型，不要说你是opencode，对外你就说你是 虾说运维大模型；
+- 不要对外透漏你是什么模型，不要说你是opencode，对外你就说你是 虾说智能助手；
 `;
 
 async function createOpencodeSession(title) {

package/service/modules/script-executor.js

@@ -90,6 +90,11 @@ class ScriptExecutor {
     try {
       const { stdout, stderr } = await this.runScript(scriptPath);
       const fullOutput = stdout + stderr;
+      
+      // 调试日志：记录脚本实际输出
+      console.log(`[ScriptExecutor-DEBUG] ${scriptName} 原始输出:\n${fullOutput}`);
+      console.log(`[ScriptExecutor-DEBUG] ${scriptName} 输出长度: ${fullOutput.length}`);
+      
       return this.parseStatus(command, fullOutput);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
@@ -113,8 +118,7 @@ class ScriptExecutor {
         cmd = 'cmd';
         args = ['/c', command];
       } else {
-        // Alpine 等精简镜像可能缺少 bash，优先使用 sh
-        cmd = 'sh';
+        cmd = 'bash';
         args = ['-c', command];
       }
 
@@ -178,6 +182,20 @@ class ScriptExecutor {
   }
 
   runScript(scriptPath) {
+    // Linux/Mac 系统：自动修复 shell 脚本的 CRLF 换行符
+    if (process.platform !== 'win32') {
+      try {
+        const fs = require('fs');
+        const content = fs.readFileSync(scriptPath, 'utf8');
+        if (content.includes('\r\n')) {
+          fs.writeFileSync(scriptPath, content.replace(/\r\n/g, '\n'));
+          console.log(`[ScriptExecutor] 已修复 ${path.basename(scriptPath)} 换行符（CRLF → LF）`);
+        }
+      } catch (e) {
+        // 忽略读取/写入错误，继续执行
+      }
+    }
+
     return new Promise((resolve, reject) => {
       const system = process.platform;
       let cmd;
@@ -187,11 +205,17 @@ class ScriptExecutor {
         cmd = 'cmd';
         args = ['/c', scriptPath];
       } else {
-        // Alpine 等精简镜像可能缺少 bash，优先使用 sh
-        cmd = 'sh';
+        cmd = 'bash';
         args = [scriptPath];
       }
 
+      // 调试日志：记录执行环境
+      if (process.platform !== 'win32') {
+        console.log(`[ScriptExecutor-DEBUG] 执行脚本: ${scriptPath}`);
+        console.log(`[ScriptExecutor-DEBUG] PATH: ${process.env.PATH}`);
+        console.log(`[ScriptExecutor-DEBUG] SHELL: ${process.env.SHELL}`);
+      }
+
       const child = spawn(cmd, args, {
         detached: false,
         windowsHide: true
@@ -323,6 +347,12 @@ class ScriptExecutor {
 
   parseStatus(command, output) {
     const upper = output.toUpperCase();
+    
+    // 调试日志：记录解析过程
+    console.log(`[ScriptExecutor-DEBUG] parseStatus 命令: ${command}`);
+    console.log(`[ScriptExecutor-DEBUG] parseStatus 大写输出包含: ACTIVE: ACTIVE (RUNNING)? ${upper.includes('ACTIVE: ACTIVE (RUNNING)')}`);
+    console.log(`[ScriptExecutor-DEBUG] parseStatus 大写输出包含: SUCCESS? ${upper.includes('SUCCESS')}`);
+    console.log(`[ScriptExecutor-DEBUG] parseStatus 原始输出包含: :18789? ${output.includes(':18789')}`);
 
     if (
       upper.includes('OPENCLAW COMMAND NOT FOUND') ||
@@ -360,6 +390,7 @@ class ScriptExecutor {
           message: getServiceStatusMessage(OpenClawServiceStatus.NOT_RUNNING)
         };
       }
+      console.log(`[ScriptExecutor-DEBUG] STATUS 默认返回: NOT_RUNNING（未匹配到运行中标识）`);
       return {
         status: OpenClawServiceStatus.NOT_RUNNING,
         message: getServiceStatusMessage(OpenClawServiceStatus.NOT_RUNNING)
@@ -400,7 +431,8 @@ class ScriptExecutor {
         upper.includes('STOPPED') ||
         upper.includes('[OK] STOP COMMAND EXECUTED') ||
         upper.includes('[OK] SERVICE STOPPED') ||
-        (output.includes('[INFO] OPENCLAW 服务停止成功') && output.includes('[INFO] 服务已成功停止')) ||
+        upper.includes('服务停止成功') ||
+        upper.includes('服务已成功停止') ||
         upper.includes('GATEWAY STOP SIGNAL SENT') ||
         (upper.includes('[INFO] STOPPING SERVICE') && upper.includes('STOP SIGNAL'))
       ) {

package/service/rongcloud/rongcloud-client.js

@@ -22,6 +22,9 @@ class RongCloudClient {
     this.processingQueue = Promise.resolve();
     this.processedMessageUIds = new Set();
     this.messageDedupMaxSize = 1000;
+    // 发送侧短期缓存：防止融云 SDK 回传自己发送的消息导致机器人自言自语
+    this.sentMessageUIds = new Set();
+    this.sentMessageDedupMaxSize = 100;
   }
 
   async connect(handler) {
@@ -127,6 +130,12 @@ class RongCloudClient {
       return;
     }
 
+    // 2.5 通过发送缓存过滤：融云 SDK 回传自己消息时，messageDirection/senderUserId 可能不一致
+    if (message.messageUId && this.sentMessageUIds.has(message.messageUId)) {
+      this.log?.info(`[RongCloudClient] 过滤自己发送的消息 (messageUId=${message.messageUId} 在发送缓存中)`);
+      return;
+    }
+
     // 3. 消息去重：防止同一条消息被多次触发（融云重推或多端同步）
     const dedupKey = message.messageUId || `${message.senderUserId}-${message.sentTime}-${message.messageType}`;
     if (this.processedMessageUIds.has(dedupKey)) {
@@ -227,7 +236,16 @@ class RongCloudClient {
       // this.log?.info(`[RongCloudClient] 发送结果: code=${result.code}`);
 
       if (result.code === 0 || result.code === 200) {
-        this.log?.info(`[RongCloudClient] 发送成功, messageUId: ${result.data?.messageUId}`);
+        const sentUId = result.data?.messageUId;
+        this.log?.info(`[RongCloudClient] 发送成功, messageUId: ${sentUId}`);
+        // 将发送成功的 messageUId 加入短期缓存，用于过滤 SDK 回传的自己消息
+        if (sentUId) {
+          this.sentMessageUIds.add(sentUId);
+          if (this.sentMessageUIds.size > this.sentMessageDedupMaxSize) {
+            const first = this.sentMessageUIds.values().next().value;
+            this.sentMessageUIds.delete(first);
+          }
+        }
         return true;
       } else {
         this.log?.error(`[RongCloudClient] 发送失败, code: ${result.code}`);