claw-subagent-service 0.0.143 → 0.0.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "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;
   }
   
@@ -111,10 +115,11 @@ async function getOrCreateGatewaySession(fallbackSessionId) {
 async function ensureOpencodeRunning(log) {
   try {
     // 快速检查 4096 端口
-    await axios.get('http://127.0.0.1:4096/global/health', { timeout: 3000 });
+    const healthResponse = await axios.get('http://127.0.0.1:4096/global/health', { timeout: 3000 });
+    log('DEBUG', `OpenCode health check: ${JSON.stringify(healthResponse.data)}`);
     return true;
-  } catch {
-    log('WARN', 'OpenCode 服务未运行，准备启动...');
+  } catch (e) {
+    log('WARN', `OpenCode 服务未运行: ${e.message}，准备启动...`);
     
     const { exec } = require('child_process');
     
@@ -126,11 +131,12 @@ async function ensureOpencodeRunning(log) {
     
     // 再次检查
     try {
-      await axios.get('http://127.0.0.1:4096/global/health', { timeout: 3000 });
+      const healthResponse = await axios.get('http://127.0.0.1:4096/global/health', { timeout: 3000 });
+      log('DEBUG', `OpenCode health check after start: ${JSON.stringify(healthResponse.data)}`);
       log('INFO', 'OpenCode 服务已启动');
       return true;
-    } catch {
-      log('ERROR', 'OpenCode 服务启动失败');
+    } catch (e) {
+      log('ERROR', `OpenCode 服务启动失败: ${e.message}`);
       return false;
     }
   }
@@ -167,6 +173,9 @@ async function forwardChatMessage(sessionId, content, onDelta, logFn, timeoutMs
   log('DEBUG', `请求体包含 system 参数: ${!!requestBody.system}`);
   
   try {
+    log('DEBUG', `发送请求到: ${url}`);
+    log('DEBUG', `请求体: ${JSON.stringify(requestBody).substring(0, 500)}`);
+    
     const response = await axios.post(url, requestBody, {
       headers: { 'Content-Type': 'application/json' },
       timeout: timeoutMs
@@ -174,15 +183,17 @@ 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)}`);
+    log('DEBUG', `响应 headers: ${JSON.stringify(response.headers)}`);
 
     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 +232,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}, 开始模拟流式发送`);