claw-subagent-service 0.0.63 → 0.0.65

package/package.json

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

package/service/modules/heartbeat-dashboard.js

@@ -13,11 +13,11 @@ class HeartbeatManager {
 
   start(getMacAddress, getOpenClawStatus) {
     const interval = (this.config.heartbeatInterval || 20) * 1000;
-    this.log?.info(`[HeartbeatManager] 启动心跳定时器，间隔: ${interval}ms`);
-    
+    // this.log?.info(`[HeartbeatManager] 启动心跳定时器，间隔: ${interval}ms`);
+
     this.timer = setInterval(async () => {
       if (!this.rongcloudClient?.isConnected) return;
-      
+
       try {
         const mac = getMacAddress();
         const status = await getOpenClawStatus(this.config.openclawPort || 18789);
@@ -31,7 +31,7 @@ class HeartbeatManager {
           }
         );
         if (sent) {
-          this.log?.info('[HeartbeatManager] 心跳已发送');
+          // this.log?.info('[HeartbeatManager] 心跳已发送');
         } else {
           this.log?.warn('[HeartbeatManager] 心跳发送失败');
         }
@@ -62,15 +62,15 @@ class DashboardReporter {
   start(getMacAddress) {
     const interval = 30000; // 30秒
     this.log?.info(`[DashboardReporter] 启动仪表盘上报定时器，间隔: ${interval}ms`);
-    
+
     this.timer = setInterval(async () => {
       if (!this.rongcloudClient?.isConnected) return;
-      
+
       try {
         const data = await collectDashboardData();
         const timestamp = data.diagnostics?.generatedAt || new Date().toISOString();
         const mac = getMacAddress();
-        
+
         // 拆分为 6 条消息发送
         await this.sendChunk(RongyunMessageTypeEnum.DASHBOARD_SESSIONS, {
           mac_address: mac,
@@ -78,21 +78,21 @@ class DashboardReporter {
           sessionStatuses: data.sessionStatuses,
           timestamp,
         }, 1000);
-        
+
         await this.sendChunk(RongyunMessageTypeEnum.DASHBOARD_JOBS, {
           mac_address: mac,
           cronJobs: data.cronJobs,
           approvals: data.approvals,
           timestamp,
         }, 1000);
-        
+
         await this.sendChunk(RongyunMessageTypeEnum.DASHBOARD_PROJECTS, {
           mac_address: mac,
           projects: data.projects,
           tasks: data.tasks,
           timestamp,
         }, 1000);
-        
+
         await this.sendChunk(RongyunMessageTypeEnum.DASHBOARD_SUMMARIES, {
           mac_address: mac,
           projectSummaries: data.projectSummaries,
@@ -101,20 +101,20 @@ class DashboardReporter {
           diagnostics: data.diagnostics,
           timestamp,
         }, 1000);
-        
+
         await this.sendChunk(RongyunMessageTypeEnum.DASHBOARD_SESSIONS_CONTEXTS, {
           mac_address: mac,
           sessionsContexts: (data.sessionsContexts || []).slice(0, 50),
           timestamp,
         }, 1000);
-        
+
         await this.sendChunk(RongyunMessageTypeEnum.DASHBOARD_USAGE_EVENTS, {
           mac_address: mac,
           usageEvents: (data.usageEvents || []).slice(-100),
           timestamp,
         }, 0);
-        
-        this.log?.info('[DashboardReporter] 所有数据块发送完成');
+
+        // this.log?.info('[DashboardReporter] 所有数据块发送完成');
       } catch (err) {
         this.log?.error(`[DashboardReporter] 上报异常: ${err.message}`);
       }
@@ -132,7 +132,7 @@ class DashboardReporter {
     } catch (err) {
       this.log?.error(`[DashboardReporter] ${msgType} 发送异常: ${err.message}`);
     }
-    
+
     if (delayMs > 0) {
       await new Promise(resolve => setTimeout(resolve, delayMs));
     }

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

@@ -22,7 +22,7 @@ class RongyunMessageSender {
   buildMessage(msgType, content, requestId) {
     const mac = getMacAddress();
     const secret = generateSecret(mac, this.config.secretKey || 'secret_key');
-    
+
     return {
       msg_type: msgType,
       source_im_id: this.config.accountId || '',
@@ -46,8 +46,8 @@ class RongyunMessageSender {
 
     try {
       const messagePayload = this.buildMessage(msgType, content, requestId);
-      
-      this.log?.info(`[RongyunMessageSender] 发送协议消息 -> ${this.serverImId}, type=${msgType}`);
+
+      // this.log?.info(`[RongyunMessageSender] 发送协议消息 -> ${this.serverImId}, type=${msgType}`);
 
       const result = await this.rongcloudClient.sendMessage(
         this.serverImId,
@@ -56,7 +56,7 @@ class RongyunMessageSender {
       );
 
       if (result) {
-        this.log?.info(`[RongyunMessageSender] ${msgType} 发送成功`);
+        // this.log?.info(`[RongyunMessageSender] ${msgType} 发送成功`);
       } else {
         this.log?.warn(`[RongyunMessageSender] ${msgType} 发送失败`);
       }

package/service/rongcloud/message-handler.js

@@ -208,7 +208,7 @@ class MessageHandler {
   async handleNormalMessageStream(msg) {
     const targetId = this.getReplyTarget(msg);
     const streamId = `${Date.now()}-${Math.random().toString(36).substring(2, 10)}`;
-    let isFirstChunk = true;
+    let seq = 0;
     let buffer = '';
     const fromUserId = this.config.accountId;
     const conversationType = msg.conversationType;
@@ -226,26 +226,24 @@ class MessageHandler {
         msg.senderUserId,
         async (delta) => {
           buffer += delta;
-          // 策略：每 30 个字符或遇到句末标点发送一次片段
-          if (buffer.length >= 30 || /[。！？.!?\n]$/.test(delta)) {
-            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, false);
-            isFirstChunk = false;
-            hasSentChunk = true;
-            buffer = '';
-          }
+          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);
+          hasSentChunk = true;
         },
         async (fullText) => {
-          // 发送剩余缓冲区和结束标记
+          this.log?.info(`[MessageHandler] onDone 触发, fullText.length=${fullText.length}, buffer.length=${buffer.length}, hasSentChunk=${hasSentChunk}`);
           if (buffer.trim()) {
-            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, true);
+            seq += 1;
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, seq === 1, true, seq);
             hasSentChunk = true;
-          } else if (!isFirstChunk) {
+          } else if (hasSentChunk) {
             // 已经发送过内容，单独发送结束标记
-            await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true);
-            hasSentChunk = true;
+            seq += 1;
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, false, true, seq);
           } else {
             // 完全没有收到内容，发送错误提示
-            await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true);
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true, 1);
             hasSentChunk = true;
           }
 
@@ -258,7 +256,7 @@ class MessageHandler {
       );
     } catch (err) {
       this.log?.error(`[MessageHandler] 流式处理错误: ${err.message}`);
-      await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 响应出现错误，请稍后重试。', streamId, isFirstChunk, true);
+      await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 响应出现错误，请稍后重试。', streamId, true, true, 1);
       throw err;
     }
   }
@@ -289,10 +287,14 @@ class MessageHandler {
   /**
    * 发送流式消息片段（通过 Python 后端代理）
    */
-  async _sendStreamChunk(fromUserId, targetId, conversationType, content, streamId, isFirstChunk, isLastChunk) {
-    if (!this.isStreamingEnabled) return;
+  async _sendStreamChunk(fromUserId, targetId, conversationType, content, streamId, isFirstChunk, isLastChunk, seq = 1) {
+    this.log?.info(`[MessageHandler] _sendStreamChunk ENTRY: target=${targetId}, streamId=${streamId}, seq=${seq}, first=${isFirstChunk}, last=${isLastChunk}, content_len=${content?.length || 0}`);
+    if (!this.isStreamingEnabled) {
+      this.log?.warn('[MessageHandler] _sendStreamChunk  skipped: isStreamingEnabled=false');
+      return;
+    }
     try {
-      await axios.post(
+      const resp = await axios.post(
         `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`,
         {
           fromUserId,
@@ -301,14 +303,16 @@ class MessageHandler {
           streamId,
           isFirstChunk,
           isLastChunk,
-          conversationType
+          conversationType,
+          seq
         },
         { timeout: 10000 }
       );
+      this.log?.info(`[MessageHandler] _sendStreamChunk 成功: status=${resp.status}, seq=${seq}`);
     } catch (err) {
       const url = `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`;
       const status = err.response?.status;
-      this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}, url=${url}, status=${status || 'N/A'}`);
+      this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}, url=${url}, status=${status || 'N/A'}, seq=${seq}`);
     }
   }
 

package/service/rongcloud/openclaw-client.js

@@ -153,11 +153,60 @@ function checkPort(port) {
   });
 }
 
+/**
+ * 确保 openclaw.json 中启用了 chatCompletions 端点
+ * 在启动 gateway 前调用，避免 SSE 流式调用返回 404
+ */
+function ensureChatCompletionsConfig(log) {
+  const realHome = getRealHomeDir();
+  const openclawDir = path.join(realHome, '.openclaw');
+  const configPath = path.join(openclawDir, 'openclaw.json');
+
+  let settings = {};
+  let existed = false;
+
+  try {
+    if (fs.existsSync(configPath)) {
+      const content = fs.readFileSync(configPath, 'utf-8');
+      settings = JSON.parse(content);
+      existed = true;
+    }
+  } catch (err) {
+    log?.warn(`[OpenClawClient] 读取 openclaw.json 失败: ${err.message}`);
+    settings = {};
+  }
+
+  const current = settings.gateway?.http?.endpoints?.chatCompletions?.enabled;
+  if (current === true) {
+    log?.info('[OpenClawClient] openclaw.json 中 chatCompletions 已启用');
+    return;
+  }
+
+  if (!settings.gateway) settings.gateway = {};
+  if (!settings.gateway.http) settings.gateway.http = {};
+  if (!settings.gateway.http.endpoints) settings.gateway.http.endpoints = {};
+  if (!settings.gateway.http.endpoints.chatCompletions) settings.gateway.http.endpoints.chatCompletions = {};
+  settings.gateway.http.endpoints.chatCompletions.enabled = true;
+
+  try {
+    if (!fs.existsSync(openclawDir)) {
+      fs.mkdirSync(openclawDir, { recursive: true });
+    }
+    fs.writeFileSync(configPath, JSON.stringify(settings, null, 2), 'utf-8');
+    log?.info(`[OpenClawClient] 已自动在 openclaw.json 中启用 chatCompletions (${existed ? '更新' : '新建'})`);
+  } catch (err) {
+    log?.error(`[OpenClawClient] 写入 openclaw.json 失败: ${err.message}`);
+  }
+}
+
 /**
  * 启动 OpenClaw gateway
  */
 function startOpenClawGateway(log) {
   return new Promise((resolve) => {
+    // 启动前自动修复配置
+    ensureChatCompletionsConfig(log);
+
     log?.info('[OpenClawClient] 正在启动 OpenClaw gateway...');
 
     const child = spawn('openclaw', ['gateway'], {
@@ -230,8 +279,7 @@ class OpenClawClient {
    * 确保 OpenClaw gateway 在运行
    */
   async ensureGatewayRunning() {
-    if (this.gatewayStarted) return true;
-
+    // 每次调用都实际检查端口，避免 gateway 崩溃后缓存状态失效
     const gatewayRunning = await checkPort(18789);
 
     if (gatewayRunning) {
@@ -240,6 +288,8 @@ class OpenClawClient {
       return true;
     }
 
+    this.gatewayStarted = false;
+
     // 避免并发启动
     if (this.gatewayStarting) {
       this.log?.info('[OpenClawClient] gateway 正在启动中，等待...');