claw-subagent-service 0.0.141 → 0.0.143

package/command/linux/restart.sh

@@ -271,15 +271,36 @@ restart_docker() {
     
     log_info "正在启动 OpenClaw 服务..."
     
+    # 查找 openclaw 的完整路径
+    local openclaw_path=""
+    if command -v openclaw &>/dev/null; then
+        openclaw_path=$(which openclaw)
+        log_info "找到 openclaw: $openclaw_path"
+    else
+        # 尝试常见路径
+        for path in /usr/local/bin/openclaw /usr/bin/openclaw /opt/openclaw/bin/openclaw; do
+            if [ -x "$path" ]; then
+                openclaw_path="$path"
+                log_info "找到 openclaw: $openclaw_path"
+                break
+            fi
+        done
+    fi
+    
+    if [ -z "$openclaw_path" ]; then
+        log_error "无法找到 openclaw 命令，请确保已安装 OpenClaw"
+        exit 1
+    fi
+    
     # 使用 setsid 创建新会话，完全脱离父进程
     # 这样即使父进程（Node.js）退出，openclaw 也不会被终止
     log_info "使用 setsid 启动，确保进程脱离父进程..."
     if command -v setsid &>/dev/null; then
-        setsid bash -c "openclaw gateway run --port $PORT" > "$log_file" 2>&1 &
+        setsid bash -c "export PATH='$PATH'; $openclaw_path gateway run --port $PORT" > "$log_file" 2>&1 &
     else
         # 如果没有 setsid，使用 nohup 作为后备
         log_warn "setsid 不可用，使用 nohup 作为后备..."
-        nohup openclaw gateway run --port "$PORT" > "$log_file" 2>&1 &
+        nohup bash -c "export PATH='$PATH'; $openclaw_path gateway run --port $PORT" > "$log_file" 2>&1 &
     fi
     
     log_info "OpenClaw 服务启动命令已发送（PID: $!）"

package/command/linux/start.sh

@@ -297,19 +297,40 @@ start_docker() {
         fuser -k "${PORT}/tcp" 2>/dev/null || true
     fi
     
+    # 查找 openclaw 的完整路径
+    local openclaw_path=""
+    if command -v openclaw &>/dev/null; then
+        openclaw_path=$(which openclaw)
+        log_info "找到 openclaw: $openclaw_path"
+    else
+        # 尝试常见路径
+        for path in /usr/local/bin/openclaw /usr/bin/openclaw /opt/openclaw/bin/openclaw; do
+            if [ -x "$path" ]; then
+                openclaw_path="$path"
+                log_info "找到 openclaw: $openclaw_path"
+                break
+            fi
+        done
+    fi
+    
+    if [ -z "$openclaw_path" ]; then
+        log_error "无法找到 openclaw 命令，请确保已安装 OpenClaw"
+        exit 1
+    fi
+    
     # 尝试使用正确的参数启动
     # 注意：openclaw gateway 可能使用不同的参数名
-    log_info "尝试启动: openclaw gateway run --port $PORT"
+    log_info "尝试启动: $openclaw_path gateway run --port $PORT"
     
     # 使用 setsid 创建新会话，完全脱离父进程
     # 这样即使父进程（Node.js）退出，openclaw 也不会被终止
     log_info "使用 setsid 启动，确保进程脱离父进程..."
     if command -v setsid &>/dev/null; then
-        setsid bash -c "openclaw gateway run --port $PORT" > "$log_file" 2>&1 &
+        setsid bash -c "export PATH='$PATH'; $openclaw_path gateway run --port $PORT" > "$log_file" 2>&1 &
     else
         # 如果没有 setsid，使用 nohup 作为后备
         log_warn "setsid 不可用，使用 nohup 作为后备..."
-        nohup openclaw gateway run --port "$PORT" > "$log_file" 2>&1 &
+        nohup bash -c "export PATH='$PATH'; $openclaw_path gateway run --port $PORT" > "$log_file" 2>&1 &
     fi
     local started_pid=$!
     log_info "启动的进程 PID: $started_pid"

package/package.json

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

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

@@ -224,8 +224,9 @@ class RongyunMessageHandler {
     // 使用解析后的 content（聊天内容），如果没有则使用原始 content
     const content = data.content || data._raw_content;
     const requestId = data.request_id;
+    const sourceId = data.source_im_id;
 
-    this.logInfo(`[RongyunMessageHandler] 收到聊天消息, roomId=${roomId}, sessionId=${sessionId}`);
+    this.logInfo(`[RongyunMessageHandler] 收到聊天消息, roomId=${roomId}, sessionId=${sessionId}, from=${sourceId}`);
 
     if (!roomId || !sessionId || !content) {
       await this.sendResponse(RongyunMessageTypeEnum.CHAT_MESSAGE, {
@@ -233,7 +234,7 @@ class RongyunMessageHandler {
         message: '缺少必要参数',
         content: '[错误] 缺少必要参数',
         metadata: {}
-      }, requestId);
+      }, requestId, sourceId);
       return;
     }
 
@@ -258,7 +259,7 @@ class RongyunMessageHandler {
         message: 'Response received',
         content: fullResponse,
         metadata: {}
-      }, requestId);
+      }, requestId, sourceId);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       this.logError(`聊天消息处理异常: ${msg}`);
@@ -267,15 +268,16 @@ class RongyunMessageHandler {
         message: msg,
         content: `[错误] 转发失败: ${msg}`,
         metadata: {}
-      }, requestId);
+      }, requestId, sourceId);
     }
   }
 
   async handleCreateSession(data) {
     const requestId = data.request_id;
     const title = data.title || '新会话';
+    const sourceId = data.source_im_id;
 
-    this.logInfo(`[RongyunMessageHandler] 创建会话, title=${title}`);
+    this.logInfo(`[RongyunMessageHandler] 创建会话, title=${title}, from=${sourceId}`);
 
     try {
       const session = await createOpencodeSession(title);
@@ -283,14 +285,14 @@ class RongyunMessageHandler {
       await this.sendResponse(RongyunMessageTypeEnum.OPENCODE_SESSION_CREATED, {
         status: 'success',
         opencode_session_id: session.id
-      }, requestId);
+      }, requestId, sourceId);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       this.logError(`创建会话失败: ${msg}`);
       await this.sendResponse(RongyunMessageTypeEnum.OPENCODE_SESSION_CREATED, {
         status: 'error',
         message: msg
-      }, requestId);
+      }, requestId, sourceId);
     }
   }