claw-subagent-service 0.0.84 → 0.0.86

package/package.json

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

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

@@ -13,6 +13,8 @@ const { executeCommand } = require('./openclaw-control');
 const { createOpencodeSession, deleteOpencodeSession, forwardChatMessage } = require('./opencode-service');
 const { ServiceManager } = require('./service-manager');
 const { collectDashboardData } = require('./dashboard-collector');
+const { getOpenClawStatus } = require('./port-checker');
+const { getMacAddress } = require('./mac-address');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -306,11 +308,22 @@ class RongyunMessageHandler {
     const requestId = data.request_id;
     const targetId = data.source_im_id;
 
-    this.logInfo(`[RongyunMessageHandler] 收到设备状态请求, from=${targetId}`);
+    this.logInfo(`[RongyunMessageHandler] 收到设备状态请求, from=${targetId}, requestId=${requestId}`);
 
     try {
-      const dashboard = await collectDashboardData();
-      await this.sendDeviceStatusReport(targetId, requestId, dashboard);
+      // 获取 OpenClaw 运行状态（检查端口 18789）
+      const openClawStatus = await getOpenClawStatus();
+      
+      // 构建精简状态数据（避免超过融云 128KB 限制）
+      const statusData = {
+        open_claw_status: openClawStatus,  // 1=运行中, 0=未运行
+        mac_address: getMacAddress(),
+        version: '0.0.20',
+        timestamp: Date.now(),
+      };
+      
+      this.logInfo(`[RongyunMessageHandler] 设备状态: openClawStatus=${openClawStatus}`);
+      await this.sendDeviceStatusReport(targetId, requestId, statusData);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       this.logError(`设备状态查询异常: ${msg}`);

package/service/modules/script-executor.js

@@ -92,8 +92,8 @@ class ScriptExecutor {
       const fullOutput = stdout + stderr;
       
       // 调试日志：记录脚本实际输出
-      console.log(`[ScriptExecutor-DEBUG] ${scriptName} 原始输出:\n${fullOutput}`);
-      console.log(`[ScriptExecutor-DEBUG] ${scriptName} 输出长度: ${fullOutput.length}`);
+      console.log(`[ScriptExecutor] 执行脚本: ${scriptPath}`);
+      console.log(`[ScriptExecutor] ${scriptName} 输出:\n${fullOutput}`);
       
       return this.parseStatus(command, fullOutput);
     } catch (e) {

package/service/rongcloud/rongcloud-client.js

@@ -39,16 +39,16 @@ class RongCloudClient {
     this.log?.info('[RongCloudClient] 初始化 SDK...');
     RongIMLib.init({ appkey: this.config.appKey });
 
-    // 注册 system_service 自定义消息类型（与前端对齐）
+    // 注册 command 自定义消息类型（与前端对齐）
     try {
       if (typeof RongIMLib.registerMessageType === 'function') {
-        this.SystemServiceMessage = RongIMLib.registerMessageType('system_service', true, false);
-        this.log?.info('[RongCloudClient] system_service 自定义消息类型已注册');
+        this.SystemServiceMessage = RongIMLib.registerMessageType('command', true, false);
+        this.log?.info('[RongCloudClient] command 自定义消息类型已注册');
       } else {
         this.log?.warn('[RongCloudClient] SDK 不支持 registerMessageType');
       }
     } catch (err) {
-      this.log?.warn(`[RongCloudClient] 注册 system_service 消息类型失败: ${err.message}`);
+      this.log?.warn(`[RongCloudClient] 注册 command 消息类型失败: ${err.message}`);
     }
 
     this.log?.info(`[RongCloudClient] SDK Events: ${JSON.stringify(Object.keys(RongIMLib.Events || {}))}`);
@@ -169,8 +169,8 @@ class RongCloudClient {
       // 自定义消息 content 可能是对象，提取文本内容并保留 mentionedInfo
       if (rawContent && typeof rawContent === 'object') {
         mentionedInfo = mentionedInfo || rawContent.mentionedInfo || null;
-        // system_service 等结构化消息保留完整 JSON（上层需要 msg_type 等字段）
-        if (message.messageType === 'system_service' || rawContent.msg_type) {
+        // command 等结构化消息保留完整 JSON（上层需要 msg_type 等字段）
+        if (message.messageType === 'command' || rawContent.msg_type) {
           rawContent = JSON.stringify(rawContent);
         } else {
           rawContent = rawContent.content || rawContent.text || JSON.stringify(rawContent);
@@ -274,14 +274,14 @@ class RongCloudClient {
     }
   }
 
-  async sendCustomMessage(targetId, content, conversationType, customType = 'system_service') {
+  async sendCustomMessage(targetId, content, conversationType, customType = 'command') {
     if (!this.isConnected) {
       this.log?.error('[RongCloudClient] 未连接，无法发送自定义消息');
       return false;
     }
 
     if (!this.SystemServiceMessage) {
-      this.log?.error('[RongCloudClient] system_service 消息类型未注册');
+      this.log?.error('[RongCloudClient] command 消息类型未注册');
       return false;
     }