claw-subagent-service 0.0.109 → 0.0.111

package/package.json

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

package/service/rongcloud/openclaw-client.js

@@ -383,9 +383,9 @@ class OpenClawClient {
         }
 
         if (is404 && isLast) {
-          this.log?.error(`[OpenClawClient] 所有 SSE 端点均返回 404。OpenClaw chatCompletions 端点未启用。`);
+          this.log?.error(`[OpenClawClient] 所有 SSE 端点均返回 404。OpenClaw responses 端点未启用。`);
           this.log?.error(`[OpenClawClient] 请检查 ~/.openclaw/openclaw.json 中是否包含:`);
-          this.log?.error(`[OpenClawClient]   gateway.http.endpoints.chatCompletions.enabled = true`);
+          this.log?.error(`[OpenClawClient]   gateway.http.endpoints.responses.enabled = true`);
           this.log?.error(`[OpenClawClient] 修改后请重启 OpenClaw gateway: openclaw gateway`);
         } else {
           this.log?.error(`[OpenClawClient] SSE 请求失败: ${err.message}`);
@@ -393,13 +393,29 @@ class OpenClawClient {
           if (err.response) {
             this.log?.error(`[OpenClawClient] 错误状态码: ${err.response.status}`);
             // 安全地提取错误信息
-            const errorData = err.response.data;
-            if (typeof errorData === 'string') {
-              this.log?.error(`[OpenClawClient] 错误响应: ${errorData}`);
-            } else if (errorData && typeof errorData === 'object') {
-              // 提取常见错误字段
-              const errorMsg = errorData.error?.message || errorData.message || errorData.error || JSON.stringify(errorData);
-              this.log?.error(`[OpenClawClient] 错误响应: ${errorMsg}`);
+            try {
+              const errorData = err.response.data;
+              if (typeof errorData === 'string') {
+                this.log?.error(`[OpenClawClient] 错误响应: ${errorData}`);
+              } else if (errorData && typeof errorData === 'object') {
+                // 检查是否是 IncomingMessage 对象（流）
+                if (errorData._readableState || errorData.socket) {
+                  // 这是一个流对象，尝试读取其中的数据
+                  const buffer = errorData._readableState?.buffer;
+                  if (buffer && buffer.length > 0) {
+                    const dataStr = buffer[0].toString('utf8');
+                    this.log?.error(`[OpenClawClient] 错误响应(流): ${dataStr}`);
+                  } else {
+                    this.log?.error(`[OpenClawClient] 错误响应(流对象，无法读取)`);
+                  }
+                } else {
+                  // 提取常见错误字段
+                  const errorMsg = errorData.error?.message || errorData.message || errorData.error || JSON.stringify(errorData);
+                  this.log?.error(`[OpenClawClient] 错误响应: ${errorMsg}`);
+                }
+              }
+            } catch (e) {
+              this.log?.error(`[OpenClawClient] 无法解析错误响应: ${e.message}`);
             }
           }
         }
@@ -425,7 +441,11 @@ class OpenClawClient {
       const contentType = response.headers['content-type'] || 'image/jpeg';
       this.log?.info(`[OpenClawClient] 图片下载完成: ${imageUrl}, size=${buffer.length}, type=${contentType}`);
       
-      return `data:${contentType};base64,${base64}`;
+      // 返回对象，包含纯 base64 和 MIME 类型
+      return {
+        base64: base64,
+        mediaType: contentType
+      };
     } catch (err) {
       this.log?.error(`[OpenClawClient] 图片下载失败: ${imageUrl}, ${err.message}`);
       throw err;
@@ -443,7 +463,10 @@ class OpenClawClient {
 
     // 检测消息是否包含图片 URL
     const imageUrlMatch = message.match(/\[图片\]\s*(https?:\/\/[^\s]+)/);
-    let messages;
+    let payload;
+    
+    // 判断使用哪个端点
+    const isResponsesEndpoint = apiUrl.includes('/v1/responses');
     
     if (imageUrlMatch) {
       // 多模态格式：图片 + 文本
@@ -452,32 +475,46 @@ class OpenClawClient {
       
       try {
         // 下载图片并转换为 base64
-        const base64Image = await this._downloadImageAsBase64(imageUrl);
+        const imageData = await this._downloadImageAsBase64(imageUrl);
         
-        messages = [{
-          role: 'user',
-          content: [
-            { type: 'text', text: textContent || '描述这张图片' },
-            { type: 'image_url', image_url: { url: base64Image } }
-          ]
-        }];
+        // 统一使用 messages 格式（OpenAI 兼容标准）
+        payload = {
+          model: 'openclaw',
+          messages: [{
+            role: 'user',
+            content: [
+              { type: 'text', text: textContent || '描述这张图片' },
+              { 
+                type: 'image_url', 
+                image_url: { 
+                  url: `data:${imageData.mediaType};base64,${imageData.base64}` 
+                } 
+              }
+            ]
+          }],
+          stream: true,
+          max_tokens: 2048
+        };
       } catch (err) {
         this.log?.warn(`[OpenClawClient] 图片处理失败，回退到文本模式: ${err.message}`);
         // 回退到纯文本模式
-        messages = [{ role: 'user', content: message }];
+        payload = {
+          model: 'openclaw',
+          messages: [{ role: 'user', content: message }],
+          stream: true,
+          max_tokens: 2048
+        };
       }
     } else {
-      // 纯文本格式
-      messages = [{ role: 'user', content: message }];
+      // 纯文本格式 - 统一使用 messages 格式
+      payload = {
+        model: 'openclaw',
+        messages: [{ role: 'user', content: message }],
+        stream: true,
+        max_tokens: 2048
+      };
     }
 
-    const payload = {
-      model: 'openclaw',
-      messages: messages,
-      stream: true,
-      max_tokens: 2048
-    };
-
     this.log?.info(`[OpenClawClient] SSE 请求 payload: ${JSON.stringify(payload)}`);
 
     let fullText = '';