claw-subagent-service 0.0.133 → 0.0.135

package/command/linux/start.sh

@@ -246,14 +246,53 @@ start_docker() {
         cat /tmp/openclaw-run-help.txt | head -30
     fi
     
+    # 先停止所有已有的 openclaw 进程，避免端口冲突
+    log_info "检查并停止已有的 openclaw 进程..."
+    local existing_pids=""
+    if command -v pgrep &>/dev/null; then
+        existing_pids=$(pgrep -f "openclaw" | tr '\n' ' ')
+    elif command -v pidof &>/dev/null; then
+        existing_pids=$(pidof openclaw)
+    else
+        existing_pids=$(ps aux | grep -v grep | grep "openclaw" | awk '{print $2}' | tr '\n' ' ')
+    fi
+    
+    if [ -n "$existing_pids" ]; then
+        log_warn "发现已有 openclaw 进程: $existing_pids，先停止它们..."
+        for ep in $existing_pids; do
+            log_info "停止进程 $ep..."
+            kill -15 "$ep" 2>/dev/null || true
+        done
+        # 等待 3 秒让进程优雅退出
+        sleep 3
+        # 检查是否还有残留进程，如果有则强制停止
+        local remaining_pids=""
+        if command -v pgrep &>/dev/null; then
+            remaining_pids=$(pgrep -f "openclaw" | tr '\n' ' ')
+        fi
+        if [ -n "$remaining_pids" ]; then
+            log_warn "强制停止残留进程: $remaining_pids"
+            for rp in $remaining_pids; do
+                kill -9 "$rp" 2>/dev/null || true
+            done
+            sleep 1
+        fi
+    fi
+    
+    # 确保端口未被占用
+    if command -v fuser &>/dev/null; then
+        fuser -k "${PORT}/tcp" 2>/dev/null || true
+    fi
+    
     # 尝试使用正确的参数启动
     # 注意：openclaw gateway 可能使用不同的参数名
-    # 在 Docker 环境中，使用 run 子命令前台运行，而不是后台启动
     log_info "尝试启动: openclaw gateway run --port $PORT"
+    
+    # 使用 nohup 后台启动，将输出重定向到日志文件
     nohup openclaw gateway run --port "$PORT" > "$log_file" 2>&1 &
     
-    # 等待 5 秒检查进程是否启动（给更多时间）
-    sleep 5
+    # 等待 15 秒检查进程是否启动（给更多时间初始化）
+    sleep 15
     local started_pid=$!
     log_info "启动的进程 PID: $started_pid"
     
@@ -272,7 +311,7 @@ start_docker() {
     
     # 检查进程监听的端口
     log_info "检查进程监听的端口..."
-    sleep 2
+    sleep 5
     local listening_ports=$(netstat -tlnp 2>/dev/null | grep "$started_pid" || ss -tlnp 2>/dev/null | grep "$started_pid" || echo "")
     if [ -n "$listening_ports" ]; then
         log_info "进程 $started_pid 监听的端口:"

package/command/linux/stop.sh

@@ -460,6 +460,12 @@ show_help() {
 main() {
     local force=""
     
+    # 检查 FORCE 环境变量（来自 script-executor 的强制停止模式）
+    if [ "${FORCE:-}" = "1" ]; then
+        force="1"
+        log_info "检测到 FORCE=1 环境变量，启用强制停止模式"
+    fi
+    
     # 解析命令行参数
     while [ $# -gt 0 ]; do
         case $1 in

package/package.json

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

package/service/daemon.js

@@ -28,6 +28,31 @@ let crashCount = 0;
 let lastCrashTime = 0;
 const updater = new Updater();
 
+// 检测是否是 npm 更新后的重启
+const VERSION_FILE = path.join(os.tmpdir(), '.claw-subagent-service.version');
+function detectUpdateRestart() {
+  try {
+    const currentVersion = updater.loadCurrentVersion();
+    let previousVersion = null;
+    
+    if (fs.existsSync(VERSION_FILE)) {
+      previousVersion = fs.readFileSync(VERSION_FILE, 'utf8').trim();
+    }
+    
+    // 写入当前版本
+    fs.writeFileSync(VERSION_FILE, currentVersion);
+    
+    // 如果之前有版本记录，且当前版本不同，说明是更新后的重启
+    if (previousVersion && previousVersion !== currentVersion) {
+      log.info(`[DAEMON] 检测到版本变化: ${previousVersion} → ${currentVersion}，这是更新后的重启`);
+      return true;
+    }
+  } catch (err) {
+    log.warn(`[DAEMON] 检测版本变化失败: ${err.message}`);
+  }
+  return false;
+}
+
 process.chdir(__dirname);
 
 /**
@@ -359,7 +384,14 @@ process.on('message', (msg) => {
   if (msg === 'shutdown') gracefulShutdown();
 });
 
-startWorker(false, null);
+// 检测是否是 npm 更新后的重启
+const isAfterNpmUpdate = detectUpdateRestart();
+if (isAfterNpmUpdate) {
+  log.info('[DAEMON] npm 更新后的重启，启动 Worker 并设置健康观察...');
+  startWorker(true, null);
+} else {
+  startWorker(false, null);
+}
 updater.startSchedule(restartWorkerWithUpdate);
 
 process.on('uncaughtException', (err) => {

package/service/modules/openclaw-control.js

@@ -112,14 +112,16 @@ async function manageWithServiceManager(command) {
 
 /**
  * 使用 ScriptExecutor 执行脚本（Docker 模式）
+ * @param {number} command - 命令代码
+ * @param {boolean} force - 是否强制停止
  * @returns {Object} { result, output }
  */
-async function executeWithScript(command) {
+async function executeWithScript(command, force = false) {
   const executor = getExecutor();
   const scriptName = getScriptName(command);
   
   try {
-    const result = await executor.executeWithStatus(command, scriptName);
+    const result = await executor.executeWithStatus(command, scriptName, force);
     // ScriptExecutor 现在返回 { status, message, output }
     return { 
       result: { status: result.status, message: result.message },
@@ -200,10 +202,11 @@ async function verifyCommandResult(command, result, scriptOutput = '') {
   return result;
 }
 
-async function executeCommand(command, window, sendResponse) {
+async function executeCommand(command, window, sendResponse, force = false) {
   const cmdName = getCommandName(command);
-  console.log(`[OpenClawControl] ====== 开始执行 ${cmdName} 命令 ======`);
-  console.log(`[OpenClawControl] 命令代码: ${command}`);
+  const actionName = force ? '强制' + cmdName : cmdName;
+  console.log(`[OpenClawControl] ====== 开始执行 ${actionName} 命令 ======`);
+  console.log(`[OpenClawControl] 命令代码: ${command}, force: ${force}`);
   console.log(`[OpenClawControl] 平台: ${process.platform}`);
 
   let result;
@@ -223,7 +226,7 @@ async function executeCommand(command, window, sendResponse) {
   let scriptOutput = '';
   if (!result) {
     console.log(`[OpenClawControl] 使用脚本方式执行...`);
-    const scriptResult = await executeWithScript(command);
+    const scriptResult = await executeWithScript(command, force);
     result = scriptResult.result;
     scriptOutput = scriptResult.output;
     console.log(`[OpenClawControl] 脚本执行结果: ${result.status} - ${result.message}`);
@@ -242,13 +245,13 @@ async function executeCommand(command, window, sendResponse) {
       result.status === OpenClawServiceStatus.STOP_SUCCESS ||
       result.status === OpenClawServiceStatus.RESTART_SUCCESS ||
       result.status === OpenClawServiceStatus.CONFIG_FIX_SUCCESS) {
-    console.log(`[OpenClawControl] ${cmdName} 成功: ${result.message}`);
+    console.log(`[OpenClawControl] ${actionName} 成功: ${result.message}`);
   } else if (result.status === OpenClawServiceStatus.ERROR) {
-    console.log(`[OpenClawControl] ${cmdName} 失败: ${result.message}`);
+    console.log(`[OpenClawControl] ${actionName} 失败: ${result.message}`);
   } else if (result.status === OpenClawServiceStatus.NOT_INSTALL) {
-    console.log(`[OpenClawControl] ${cmdName}: OpenClaw未安装`);
+    console.log(`[OpenClawControl] ${actionName}: OpenClaw未安装`);
   } else {
-    console.log(`[OpenClawControl] ${cmdName} 状态: ${result.message}`);
+    console.log(`[OpenClawControl] ${actionName} 状态: ${result.message}`);
   }
 
   if (sendResponse) {
@@ -264,16 +267,19 @@ async function executeCommand(command, window, sendResponse) {
         const { getOpenClawStatus } = require('./port-checker');
         const portStatus = await getOpenClawStatus(18789);
         console.log(`[OpenClawControl] 端口状态: ${portStatus}`);
-        // 更新真实状态
+        // 更新真实状态 - 始终以端口检测结果为准
         if (command === OpenClawCommandEnum.STOP) {
           realStatus = portStatus === 1 ? OpenClawServiceStatus.RUNNING : OpenClawServiceStatus.STOP_SUCCESS;
           realMessage = portStatus === 1 ? '停止失败: 服务仍在运行' : '服务已停止';
+          if (portStatus === 1) httpStatus = 'error';
         } else if (command === OpenClawCommandEnum.START) {
           realStatus = portStatus === 1 ? OpenClawServiceStatus.START_SUCCESS : OpenClawServiceStatus.ERROR;
           realMessage = portStatus === 1 ? '服务已启动' : '启动失败: 服务未运行';
+          if (portStatus !== 1) httpStatus = 'error';
         } else if (command === OpenClawCommandEnum.RESTART) {
           realStatus = portStatus === 1 ? OpenClawServiceStatus.RESTART_SUCCESS : OpenClawServiceStatus.ERROR;
           realMessage = portStatus === 1 ? '服务已重启' : '重启失败: 服务未运行';
+          if (portStatus !== 1) httpStatus = 'error';
         }
         console.log(`[OpenClawControl] 操作后真实状态: portStatus=${portStatus}, realStatus=${realStatus}, message=${realMessage}`);
       } catch (e) {

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

@@ -64,27 +64,40 @@ class RongyunMessageHandler {
         return;
       }
 
-      const msgType = parsed.msg_type;
+      // 解析 content 字段（前端将业务数据放在 content 内）
+      let data = parsed;
+      if (parsed.content && typeof parsed.content === 'string') {
+        try {
+          const contentData = JSON.parse(parsed.content);
+          // 将 content 内的数据合并到顶层，方便处理器直接访问
+          // 保留原始 content 字段（用于聊天消息等场景）
+          data = { ...parsed, ...contentData, _raw_content: parsed.content };
+        } catch (e) {
+          this.logWarn(`解析 content 失败: ${e.message}`);
+        }
+      }
+
+      const msgType = data.msg_type;
       this.logInfo(`[RongyunMessageHandler] 处理消息类型: ${msgType}`);
 
       switch (msgType) {
         case RongyunMessageTypeEnum.COMMAND:
-          await this.handleCommand(parsed);
+          await this.handleCommand(data);
           break;
         case RongyunMessageTypeEnum.CHAT_MESSAGE:
-          await this.handleChatMessage(parsed);
+          await this.handleChatMessage(data);
           break;
         case RongyunMessageTypeEnum.CREATE_OPENCODE_SESSION:
-          await this.handleCreateSession(parsed);
+          await this.handleCreateSession(data);
           break;
         case RongyunMessageTypeEnum.DELETE_OPENCODE_SESSION:
-          await this.handleDeleteSession(parsed);
+          await this.handleDeleteSession(data);
           break;
         case RongyunMessageTypeEnum.DEVICE_CONTROL:
-          await this.handleDeviceControl(parsed);
+          await this.handleDeviceControl(data);
           break;
         case RongyunMessageTypeEnum.DEVICE_STATUS_REQUEST:
-          await this.handleDeviceStatusRequest(parsed);
+          await this.handleDeviceStatusRequest(data);
           break;
         default:
           this.logWarn(`未处理的消息类型: ${msgType}`);
@@ -100,8 +113,9 @@ class RongyunMessageHandler {
     const commandId = data.command_id;
     const requestId = data.request_id;
     const sourceId = data.source_im_id;
+    const force = data.force === true;  // 是否强制停止
 
-    this.logInfo(`[RongyunMessageHandler] 收到命令: command=${command}, command_id=${commandId}, from=${sourceId || 'guardserver'}`);
+    this.logInfo(`[RongyunMessageHandler] 收到命令: command=${command}, command_id=${commandId}, force=${force}, from=${sourceId || 'guardserver'}`);
 
     // 验证命令是否有效
     const validCommands = Object.values(OpenClawCommandEnum);
@@ -143,11 +157,12 @@ class RongyunMessageHandler {
       
       if (isAsyncCommand) {
         // 立即响应，告知前端命令已接收
+        const actionName = force ? '强制' + getCommandName(command) : getCommandName(command);
         await this.sendResponse(RongyunMessageTypeEnum.COMMAND_RESULT, {
           command,
           command_id: commandId,
           status: 'success',
-          message: `${getCommandName(command)}命令已接收，正在执行...`
+          message: `${actionName}命令已接收，正在执行...`
         }, requestId, sourceId);
       }
       
@@ -163,8 +178,8 @@ class RongyunMessageHandler {
         }
         // 异步命令不在这里响应，因为已经提前响应了
         // 但我们可以在这里记录执行结果
-        this.logInfo(`[RongyunMessageHandler] 命令执行完成: command=${command}, status=${response.status}, message=${response.message}`);
-      }).then(() => {
+        this.logInfo(`[RongyunMessageHandler] 命令执行完成: command=${command}, force=${force}, status=${response.status}, message=${response.message}`);
+      }, force).then(() => {
         // 命令执行完成后，立即释放锁
         this.commandLock = false;
         if (this.commandLockTimer) {
@@ -206,7 +221,8 @@ class RongyunMessageHandler {
   async handleChatMessage(data) {
     const roomId = data.room_id;
     const sessionId = data.gateway_session_id || data.session_id;
-    const content = data.content;
+    // 使用解析后的 content（聊天内容），如果没有则使用原始 content
+    const content = data.content || data._raw_content;
     const requestId = data.request_id;
 
     this.logInfo(`[RongyunMessageHandler] 收到聊天消息, roomId=${roomId}, sessionId=${sessionId}`);

package/service/modules/script-executor.js

@@ -79,7 +79,7 @@ class ScriptExecutor {
     }
   }
 
-  async executeWithStatus(command, scriptName) {
+  async executeWithStatus(command, scriptName, force = false) {
     // 配置修复命令特殊处理：直接执行命令，不需要脚本
     if (command === OpenClawCommandEnum.CONFIG_FIX) {
       return await this.executeCommandDirect('openclaw doctor --fix', 120);
@@ -88,8 +88,8 @@ class ScriptExecutor {
     const scriptPath = path.join(this.scriptDir, scriptName);
 
     try {
-      console.log(`[ScriptExecutor] 开始执行脚本: ${scriptPath}`);
-      const { stdout, stderr, exitCode } = await this.runScript(scriptPath);
+      console.log(`[ScriptExecutor] 开始执行脚本: ${scriptPath}, force=${force}`);
+      const { stdout, stderr, exitCode } = await this.runScript(scriptPath, force);
       const fullOutput = stdout + stderr;
       
       // 调试日志：记录脚本实际输出
@@ -206,7 +206,7 @@ class ScriptExecutor {
     });
   }
 
-  runScript(scriptPath) {
+  runScript(scriptPath, force = false) {
     // Linux/Mac 系统：自动修复 shell 脚本的 CRLF 换行符
     if (process.platform !== 'win32') {
       try {
@@ -233,6 +233,12 @@ class ScriptExecutor {
         cmd = 'bash';
         args = [scriptPath];
       }
+      
+      // 如果是强制停止，添加 FORCE 环境变量
+      if (force) {
+        args.unshift('FORCE=1');
+        console.log(`[ScriptExecutor] 强制停止模式: FORCE=1`);
+      }
 
       // 调试日志：记录执行环境
       if (process.platform !== 'win32') {