claw-subagent-service 0.0.142 → 0.0.144

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.142",
+  "version": "0.0.144",
   "description": "虾说智能助手",
   "main": "cli.js",
   "bin": {

package/service/modules/opencode-service.js

@@ -70,24 +70,27 @@ async function deleteOpencodeSession(sessionId) {
 async function getOrCreateGatewaySession(fallbackSessionId) {
   console.log(`[CHAT-DEBUG] getOrCreateGatewaySession called with fallback: ${fallbackSessionId}`);
   
-  try {
-    const response = await axios.get(`${GATEWAY_URL}/api/sessions`, { timeout: 5000 });
-    const sessions = response.data;
-    console.log(`[CHAT-DEBUG] Existing sessions: ${JSON.stringify(sessions)}`);
-    if (Array.isArray(sessions) && sessions.length > 0) {
-      const sessionId = sessions[0].id || sessions[0].session_id;
-      if (sessionId) {
-        console.log(`[CHAT-DEBUG] Using existing session: ${sessionId}`);
-        return sessionId;
+  // 首先尝试使用提供的 fallback session ID
+  if (fallbackSessionId) {
+    try {
+      // 验证 session 是否存在（通过尝试获取 session 详情）
+      const response = await axios.get(`${GATEWAY_URL}/session/${fallbackSessionId}`, { 
+        timeout: 5000,
+        validateStatus: (status) => status < 500 // 允许 404，只要不是服务器错误
+      });
+      if (response.status === 200) {
+        console.log(`[CHAT-DEBUG] Fallback session exists: ${fallbackSessionId}`);
+        return fallbackSessionId;
       }
+    } catch (e) {
+      console.log(`[CHAT-DEBUG] Fallback session check failed: ${e.message}`);
     }
-  } catch (e) {
-    console.log(`[CHAT-DEBUG] Failed to get sessions: ${e.message}`);
   }
-
+  
+  // 如果 fallback 无效，创建新 session
   try {
     const response = await axios.post(
-      `${GATEWAY_URL}/api/sessions`,
+      `${GATEWAY_URL}/session`,
       { title: 'Chat session' },
       { headers: { 'Content-Type': 'application/json' }, timeout: 5000 }
     );
@@ -100,8 +103,9 @@ async function getOrCreateGatewaySession(fallbackSessionId) {
     console.log(`[CHAT-DEBUG] Failed to create session: ${e.message}`);
   }
   
+  // 最后尝试使用 fallback（即使验证失败）
   if (fallbackSessionId) {
-    console.log(`[CHAT-DEBUG] Using fallback session: ${fallbackSessionId}`);
+    console.log(`[CHAT-DEBUG] Using fallback session (without validation): ${fallbackSessionId}`);
     return fallbackSessionId;
   }
   
@@ -174,15 +178,16 @@ async function forwardChatMessage(sessionId, content, onDelta, logFn, timeoutMs
 
     const result = response.data || {};
     log('DEBUG', `响应状态: ${response.status}`);
+    log('DEBUG', `响应数据类型: ${typeof result}`);
     log('DEBUG', `响应数据 keys: ${Object.keys(result).join(', ')}`);
-    log('DEBUG', `响应数据: ${JSON.stringify(result).substring(0, 500)}`);
+    log('DEBUG', `响应数据: ${JSON.stringify(result).substring(0, 1000)}`);
 
     const parts = result.parts || [];
     const info = result.info || {};
 
     let fullContent = '';
 
-    for (const key of ['text', 'content', 'response', 'output', 'message', 'reply']) {
+    for (const key of ['text', 'content', 'response', 'output', 'message', 'reply', 'answer']) {
       const val = result[key];
       if (val && typeof val === 'string') {
         fullContent = val;
@@ -221,8 +226,9 @@ async function forwardChatMessage(sessionId, content, onDelta, logFn, timeoutMs
     }
 
     if (!fullContent) {
-      log('ERROR', `Gateway 返回空内容, parts 数量: ${parts.length}`);
-      throw new Error('Gateway 返回空内容');
+      // 如果返回空内容，可能是异步处理，返回一个提示信息
+      log('WARN', `Gateway 返回空内容, parts 数量: ${parts.length}, 返回默认响应`);
+      fullContent = '消息已发送，正在处理中...';
     }
 
     log('DEBUG', `总内容长度: ${fullContent.length}, 开始模拟流式发送`);