claw-subagent-service 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "虾说静态服务",
   "main": "cli.js",
   "bin": {

package/scripts/sync-local.js

@@ -10,13 +10,12 @@
  *   npm run sync        (推荐)
  *   node scripts/sync-local.js
  *
- * 注意: Windows 下若服务正在运行，会自动停止服务、同步后再启动。
+ * 注意: Windows 下若服务正在运行，会自动卸载服务、同步后再重新安装。
  */
 
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 
 const isWindows = process.platform === 'win32';
 const SERVICE_NAME = 'claw-subagent-service';
@@ -47,7 +46,7 @@ function getGlobalPackageDir() {
   }
 }
 
-function stopService() {
+function stopAndUninstallService() {
   if (!isWindows) {
     try {
       execSync('systemctl stop claw-subagent-service 2>/dev/null', {
@@ -59,7 +58,7 @@ function stopService() {
     return;
   }
 
-  console.log('🛑 正在停止 Windows 服务...');
+  console.log('🛑 正在停止并卸载 Windows 服务（释放文件锁）...');
 
   // 1. 停止服务
   try {
@@ -70,7 +69,7 @@ function stopService() {
     console.log('  ✅ 服务已停止');
   } catch {}
 
-  // 2. 杀掉 wrapper 进程
+  // 2. 杀掉 wrapper 进程（node-windows 生成的 .exe）
   try {
     execSync('taskkill /f /im "claw-subagent-service.exe" 2>nul', {
       stdio: 'ignore',
@@ -87,18 +86,36 @@ function stopService() {
     );
   } catch {}
 
-  // 4. 等待文件锁释放
-  console.log('  ⏳ 等待文件锁释放 (5秒)...');
-  execSync('ping -n 6 127.0.0.1 >nul', { stdio: 'ignore', windowsHide: true });
+  // 4. 通过 wmic 按命令行匹配杀掉相关 node 进程
+  try {
+    execSync('wmic process where "name=\'node.exe\' and commandline like \'%claw-subagent%\'" delete 2>nul', {
+      stdio: 'ignore',
+      timeout: 10000,
+    });
+    console.log('  ✅ 相关 node 进程已清理');
+  } catch {}
+
+  // 5. 从注册表删除服务（彻底释放 node-windows wrapper 的文件锁）
+  try {
+    execSync('sc.exe delete "claw-subagent-service" 2>nul', {
+      stdio: 'ignore',
+      timeout: 10000,
+    });
+    console.log('  ✅ 服务已从注册表删除');
+  } catch {}
+
+  // 6. 等待 Windows 回收文件句柄（关键！node-windows wrapper 需要足够时间释放）
+  console.log('  ⏳ 等待系统释放文件锁（10秒）...');
+  execSync('ping -n 11 127.0.0.1 >nul', { stdio: 'ignore', windowsHide: true });
 }
 
-function startService() {
-  console.log('🚀 正在启动服务...');
+function installAndStartService() {
+  console.log('🚀 正在安装并启动服务...');
   try {
     if (isWindows) {
-      execSync('net start "claw-subagent-service" 2>nul', {
+      execSync('claw-subagent-service --install', {
         stdio: 'inherit',
-        timeout: 30000,
+        timeout: 60000,
         windowsHide: true,
       });
     } else {
@@ -107,23 +124,23 @@ function startService() {
         timeout: 15000,
       });
     }
-    console.log('✅ 服务已启动');
+    console.log('✅ 服务已安装/启动');
   } catch (e) {
-    console.error('⚠️  服务启动失败:', e.message);
+    console.error('⚠️  服务安装/启动失败:', e.message);
     console.log('   请手动运行: claw-subagent-service --install');
   }
 }
 
-function isServiceRunning() {
+function isServiceInstalled() {
   try {
     if (isWindows) {
-      execSync('sc query "claw-subagent-service" | findstr RUNNING >nul', {
+      execSync('sc query "claw-subagent-service" | findstr SERVICE_NAME >nul', {
         stdio: 'ignore',
         windowsHide: true,
       });
       return true;
     } else {
-      execSync('systemctl is-active --quiet claw-subagent-service', {
+      execSync('systemctl is-active --quiet claw-subagent-service || systemctl is-enabled --quiet claw-subagent-service', {
         stdio: 'ignore',
       });
       return true;
@@ -135,21 +152,25 @@ function isServiceRunning() {
 
 function copyDirSync(src, dest) {
   if (isWindows) {
-    // 先清空目标目录
-    if (fs.existsSync(dest)) {
-      try {
-        fs.rmSync(dest, { recursive: true, force: true, maxRetries: 5, retryDelay: 500 });
-      } catch (e) {
-        console.error(`  ❌ 无法清空目录: ${dest}`);
-        console.error(`     错误: ${e.message}`);
-        console.error(`     请确保服务已完全停止，或尝试以管理员身份运行`);
-        process.exit(1);
-      }
+    // 确保目标目录存在
+    if (!fs.existsSync(dest)) {
+      fs.mkdirSync(dest, { recursive: true });
     }
-    fs.mkdirSync(dest, { recursive: true });
 
-    const cmd = `robocopy "${src}" "${dest}" /E /NJH /NJS /NDL /NC /NS /NFL`;
-    execSync(cmd, { encoding: 'utf-8', windowsHide: true });
+    // 使用 robocopy，遇到锁定的文件时跳过（/R:0 /W:0 表示不重试）
+    const cmd = `robocopy "${src}" "${dest}" /E /R:0 /W:0 /NJH /NJS /NDL /NC /NS /NFL`;
+    try {
+      execSync(cmd, { encoding: 'utf-8', windowsHide: true });
+    } catch (e) {
+      // robocopy 返回码含义：
+      // 0 = 成功，1 = 有文件被跳过，2 = 有额外文件，4 = 有不匹配，8 = 有错误，16 = 严重错误
+      const status = e.status || 0;
+      if (status === 1) {
+        console.log('  ℹ️  部分文件被跳过（可能正在使用）');
+      } else if (status >= 8) {
+        throw new Error(`robocopy 失败 (code ${status})`);
+      }
+    }
   } else {
     if (!fs.existsSync(dest)) {
       fs.mkdirSync(dest, { recursive: true });
@@ -222,11 +243,11 @@ function main() {
   console.log('🦞 claw-subagent-service - 本地同步\n');
 
   const targetDir = getGlobalPackageDir();
-  const wasRunning = isServiceRunning();
+  const wasInstalled = isServiceInstalled();
 
-  if (wasRunning) {
-    console.log('ℹ️  检测到服务正在运行，先停止服务以释放文件锁\n');
-    stopService();
+  if (wasInstalled) {
+    console.log('ℹ️  检测到服务已安装，先卸载以释放文件锁\n');
+    stopAndUninstallService();
   }
 
   syncFiles(targetDir);
@@ -235,12 +256,12 @@ function main() {
   console.log('\n✅ 同步完成!');
   console.log(`   目标目录: ${targetDir}`);
 
-  if (wasRunning) {
-    console.log('\n🔄 正在重新启动服务...');
-    startService();
+  if (wasInstalled) {
+    console.log('\n🔄 正在重新安装并启动服务...');
+    installAndStartService();
   } else {
     console.log('\n💡 提示:');
-    console.log('   服务未在运行，如需启动请运行:');
+    console.log('   服务未安装，如需安装请运行:');
     console.log('   claw-subagent-service --install');
   }
 }

package/service/modules/normal-message-handler.js

@@ -1,9 +1,9 @@
 /**
  * 普通消息处理器 - 接收 rongcloud 转发的普通消息并调用 AI 服务
- * 
- * 被调用位置：rongcloud/message-handler.js 第68行
+ *
+ * 被调用位置：rongcloud/message-handler.js
  * 调用方式：await this.handleNormalMessage(msg)
- * 
+ *
  * @param {Object} msg - 消息对象
  * @param {string} msg.content - 消息内容
  * @param {string} msg.senderUserId - 发送者ID
@@ -11,7 +11,9 @@
  * @param {number} msg.conversationType - 会话类型 (1=私聊, 3=群聊)
  * @returns {string} 回复内容
  */
-const { forwardChatMessage } = require('./opencode-service');
+const { OpenClawClient } = require('../rongcloud/openclaw-client');
+
+const openclawClient = new OpenClawClient(console);
 
 async function handleNormalMessage(msg) {
   console.log(`[NormalMessageHandler] 收到普通消息:`, {
@@ -21,34 +23,14 @@ async function handleNormalMessage(msg) {
   });
 
   try {
-    // 使用 senderUserId 作为 session ID，确保每个用户有独立的会话
-    const sessionId = msg.senderUserId || 'default';
     const content = msg.content;
-    
     if (!content || !content.trim()) {
       return '消息内容为空';
     }
 
-    // 调用 opencode 服务进行 AI 聊天
-    let fullResponse = '';
-    
-    await forwardChatMessage(
-      sessionId,
-      content,
-      async (delta) => {
-        // 收集响应片段
-        fullResponse += delta;
-      },
-      (level, message) => {
-        // 日志回调
-        console.log(`[CHAT-${level}] ${message}`);
-      },
-      600000 // 10分钟超时
-    );
-
-    console.log(`[NormalMessageHandler] AI 回复: ${fullResponse.substring(0, 50)}...`);
-    return fullResponse;
-
+    const reply = await openclawClient.chat(content, msg.senderUserId);
+    console.log(`[NormalMessageHandler] AI 回复: ${reply.substring(0, 50)}...`);
+    return reply;
   } catch (err) {
     console.error(`[NormalMessageHandler] 处理异常:`, err.message);
     return `抱歉，处理消息时出错: ${err.message}`;

package/service/rongcloud/message-handler.js

@@ -41,7 +41,25 @@ class MessageHandler {
       return false;
     }
 
-    const mentions = this.extractMentions(msg.content);
+    // claw 控制消息不需要 @mention 过滤
+    if (msg.messageType === 'claw') {
+      return true;
+    }
+
+    // 优先从融云 mentionedInfo 提取被@用户列表（用户界面 @昵称，但融云底层存的是 userId）
+    let mentions = [];
+    if (msg.mentionedInfo && Array.isArray(msg.mentionedInfo.userIdList)) {
+      mentions = msg.mentionedInfo.userIdList;
+      if (mentions.length > 0) {
+        this.log?.info(`[MessageHandler] 融云 mentionedInfo: ${mentions.join(', ')}`);
+      }
+    }
+
+    // 兜底：从文本内容中正则匹配 @claw_xxx
+    if (mentions.length === 0) {
+      const textContent = typeof msg.content === 'string' ? msg.content : (msg.content?.content || '');
+      mentions = this.extractMentions(textContent);
+    }
 
     if (mentions.length > 0) {
       if (!mentions.includes(this.nodeId)) {
@@ -49,8 +67,11 @@ class MessageHandler {
         return false;
       }
       this.log?.info(`[MessageHandler] 消息提及本节点(${this.nodeId})，处理`);
+    } else if (msg.conversationType === 3) {
+      this.log?.info(`[MessageHandler] 群聊消息未 @ 本节点(${this.nodeId})，忽略`);
+      return false;
     } else {
-      this.log?.info(`[MessageHandler] 消息未指定节点，本节点(${this.nodeId})处理`);
+      this.log?.info(`[MessageHandler] 单聊消息未指定节点，本节点(${this.nodeId})处理`);
     }
 
     return true;
@@ -63,12 +84,17 @@ class MessageHandler {
 
     try {
       const type = this.getMessageType(msg);
-      this.log?.info(`[MessageHandler] 收到消息 from=${msg.senderUserId}, type=${type}, content=${msg.content.substring(0, 50)}`);
+      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 {
-        await this.handleNormalMessage(msg);
+        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}`);
@@ -81,7 +107,8 @@ class MessageHandler {
     if (msg.messageType === 'claw') {
       return MessageType.CLAW;
     }
-    if (msg.content && msg.content.startsWith('/')) {
+    const text = typeof msg.content === 'string' ? msg.content : (msg.content?.content || '');
+    if (text.startsWith('/')) {
       return MessageType.COMMAND;
     }
     return MessageType.NORMAL;

package/service/rongcloud/openclaw-client.js

@@ -249,53 +249,7 @@ class OpenClawClient {
 
     this.log?.info(`[OpenClawClient] 准备发送消息到 OpenClaw，from=${fromUser}, message=${message.substring(0, 50)}`);
 
-    // 先检查 OpenClaw Gateway HTTP API 端口是否可用（默认 18789）
-    const httpAvailable = await checkPort(18789);
-    if (httpAvailable) {
-      try {
-        const gatewayToken = getGatewayToken();
-        const headers = { 'Content-Type': 'application/json' };
-        if (gatewayToken) {
-          headers['Authorization'] = `Bearer ${gatewayToken}`;
-        }
-
-        const response = await axios.post(
-          'http://127.0.0.1:18789/v1/chat/completions',
-          {
-            model: 'openclaw:main',
-            messages: [
-              { role: 'user', content: message }
-            ],
-            stream: false
-          },
-          {
-            headers,
-            timeout: 120000
-          }
-        );
-
-        if (response.status === 200 && response.data) {
-          const result = response.data;
-          const aiMessage = result.choices?.[0]?.message;
-          const content = aiMessage?.content;
-          if (content) {
-            this.log?.info(`[OpenClawClient] AI 回复: ${content.substring(0, 50)}...`);
-            return content;
-          }
-          this.log?.warn('[OpenClawClient] OpenClaw 返回了空响应');
-          return 'OpenClaw 未返回有效响应';
-        } else {
-          this.log?.error(`[OpenClawClient] OpenClaw 返回错误: ${response.status}`);
-          return `OpenClaw 返回错误: ${response.status}`;
-        }
-      } catch (err) {
-        this.log?.error(`[OpenClawClient] HTTP 调用失败: ${err.message}`);
-      }
-    } else {
-      this.log?.info('[OpenClawClient] Gateway HTTP API (18789) 未就绪，直接走 CLI');
-    }
-
-    // fallback 到 CLI 调用
+    // 直接走 CLI 调用（OpenClaw Gateway 未暴露兼容的 HTTP REST API）
     return this.chatViaCLI(message, fromUser);
   }
 
@@ -317,12 +271,14 @@ class OpenClawClient {
       this.log?.info('[OpenClawClient] 已读取到 gateway token');
     }
 
-    const args = ['agent', '-m', escapedMessage, '--session-id', sessionId];
+    const quoteArg = (s) => `"${s}"`;
+    const cmdParts = ['openclaw', 'agent', '-m', quoteArg(escapedMessage), '--session-id', quoteArg(sessionId)];
     if (gatewayToken) {
-      args.push('--token', gatewayToken);
+      cmdParts.push('--token', quoteArg(gatewayToken));
     }
+    const command = cmdParts.join(' ');
 
-    this.log?.info(`[OpenClawClient] 执行: openclaw ${args.map(a => a.includes(' ') ? `"${a}"` : a).join(' ')}`);
+    this.log?.info(`[OpenClawClient] 执行: ${command}`);
 
     return new Promise((resolve) => {
       let stdout = '';
@@ -331,7 +287,7 @@ class OpenClawClient {
 
       // 关键：不设置 OPENCLAW_GATEWAY_URL，避免触发 "gateway url override requires explicit credentials"
       // 让 openclaw agent 通过默认方式自动发现本地 gateway
-      const child = spawn('openclaw', args, {
+      const child = spawn(command, {
         shell: true,
         windowsHide: true,
         env: getOpenClawEnv(),

package/service/rongcloud/rongcloud-client.js

@@ -128,9 +128,11 @@ class RongCloudClient {
     try {
       const msgType = message.messageType;
       let rawContent = message.content;
+      let mentionedInfo = null;
 
-      // 自定义消息 content 可能是对象，提取文本内容
+      // 自定义消息 content 可能是对象，提取文本内容并保留 mentionedInfo
       if (rawContent && typeof rawContent === 'object') {
+        mentionedInfo = rawContent.mentionedInfo || null;
         rawContent = rawContent.content || rawContent.text || JSON.stringify(rawContent);
       }
 
@@ -174,7 +176,8 @@ class RongCloudClient {
         messageType: msgType || 'RC:TxtMsg',
         isOffLineMessage: message.isOffLineMessage || false,
         messageUId: message.messageUId || `local-${Date.now()}`,
-        sentTime: message.sentTime || Date.now()
+        sentTime: message.sentTime || Date.now(),
+        mentionedInfo
       };
 
       // 并行处理消息，不等待上一条完成（避免 openclaw 长耗时调用阻塞后续消息）