xiaozhou-chat 1.0.9 → 1.0.12

package/lib/chat.js

@@ -2,6 +2,7 @@
 import { Spinner, StreamPrinter } from "./ui.js";
 import { sleep } from "./utils.js";
 import { updateConfig, setProfileValue } from "./config.js";
+import { builtInTools } from "./tools.js";
 
 // 尝试加载 Markdown 渲染库
 let marked;
@@ -57,43 +58,28 @@ export async function chatStream(context, userInput = null, options = {}) {
     }
 
     // 构造 Tools 定义
-    // TODO: 从 mcpClients 和 builtInTools 获取
-    // 这里我们假设 context 传入了完整的 tools 列表，或者我们在外部组装
-    // 为了解耦，建议外部传入 tools array
     const tools = context.tools || [];
 
-    const body = {
-        model: config.model,
-        messages: messages,
-        stream: true,
-        max_tokens: 8192
-    };
-
-    if (tools.length > 0) {
-        body.tools = tools;
-    }
-
+    // 处理 System Prompt
+    let requestMessages = messages;
     if (config.systemPrompt) {
-        // Ensure system prompt is at the beginning
-        if (messages.length === 0 || messages[0].role !== "system") {
-             // Check if we should insert or replace? 
-             // Simplest: just don't mutate history permanently if it's transient?
-             // But usually system prompt is part of config. 
-             // Let's assume messages already handles system prompt or we unshift it here for the request ONLY.
-             // But standard is: messages[0] is system.
-             // We'll let the caller handle message structure, or handle it here.
-             // For CLI, we usually want to prepend system prompt if not present.
-             const sysMsg = { role: "system", content: config.systemPrompt };
-             if (messages.length > 0 && messages[0].role === "system") {
-                 // Replace existing? Or assume caller synced it?
-                 // Let's use a copy for the request to be safe
-                 body.messages = [sysMsg, ...messages.filter(m => m.role !== "system")];
-             } else {
-                 body.messages = [sysMsg, ...messages];
-             }
-        }
+         const sysMsg = { role: "system", content: config.systemPrompt };
+         if (messages.length > 0 && messages[0].role === "system") {
+             requestMessages = [sysMsg, ...messages.filter(m => m.role !== "system")];
+         } else {
+             requestMessages = [sysMsg, ...messages];
+         }
     }
 
+    // 构造请求 Body
+    const createBody = (withTools = true) => ({
+        model: config.model,
+        messages: requestMessages,
+        stream: true, 
+        max_tokens: 8192, 
+        tools: (withTools && tools.length > 0) ? tools : undefined
+    });
+
     const spinner = new Spinner(isRecursion ? "AI 正在分析工具结果..." : "AI 正在思考...");
     spinner.start();
     
@@ -101,44 +87,82 @@ export async function chatStream(context, userInput = null, options = {}) {
 
     let requestUrl = `${config.baseUrl}/chat/completions`;
     
-    // 自动尝试逻辑
-    let shouldRetryWithV1 = false;
+    // 自动修正 Base URL (如果缺少 /v1)
+    if (!config.baseUrl.endsWith("/v1") && !config.baseUrl.endsWith("/v1/")) {
+        // console.log(`\n⚠️  自动追加 /v1 到 Base URL`);
+        requestUrl = `${config.baseUrl}/v1/chat/completions`;
+    }
 
+    let shouldRetryWithV1 = false;
+    
     try {
-        let res = await requestWithRetry(requestUrl, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                Authorization: `Bearer ${config.apiKey}`
-            },
-            body: JSON.stringify(body),
-            signal: signal
-        });
-
-        // 智能检测：如果返回的是 HTML (通常是 404 页或首页)，且 URL 没带 v1，可能是用户配错了
+        let res;
+        let usedTools = true;
+
+        // 第一次尝试 (默认带 Tools)
+        try {
+            res = await requestWithRetry(requestUrl, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: `Bearer ${config.apiKey}`
+                },
+                body: JSON.stringify(createBody(true)),
+                signal: signal
+            }, 1); // 减少内部重试，由外层控制
+        } catch (e) {
+            // 如果是 400 错误，且我们用了 Tools，尝试降级
+            if (e.message.includes("400") || e.message.includes("Improperly formed request")) {
+                console.log("\n⚠️  API 不支持工具调用或参数格式错误，尝试自动降级为纯聊天模式...");
+                usedTools = false;
+                res = await requestWithRetry(requestUrl, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                        Authorization: `Bearer ${config.apiKey}`
+                    },
+                    body: JSON.stringify(createBody(false)),
+                    signal: signal
+                });
+            } else {
+                throw e;
+            }
+        }
+
+        // 智能检测 HTML (404/BaseUrl 错误)
         const contentType = res.headers.get("content-type");
         if (contentType && contentType.includes("text/html")) {
             if (!config.baseUrl.endsWith("/v1") && !config.baseUrl.endsWith("/v1/")) {
-                // 静默重试，不打扰用户
                 requestUrl = `${config.baseUrl}/v1/chat/completions`;
                 shouldRetryWithV1 = true;
-                
-                // 重试请求
+                // 重试 (保持降级状态)
                 res = await requestWithRetry(requestUrl, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
                         Authorization: `Bearer ${config.apiKey}`
                     },
-                    body: JSON.stringify(body),
+                    body: JSON.stringify(createBody(usedTools)),
                     signal: signal
                 });
             }
         }
 
-        // 停止 Spinner，准备流式输出
+        // 停止 Spinner
         spinner.stop();
 
+        // 检查是否是非流式响应 (JSON)
+        if (contentType && contentType.includes("application/json") && !createBody().stream) {
+            const data = await res.json();
+            const content = data.choices?.[0]?.message?.content || "";
+            printer.print(content);
+            printer.stop();
+            return { content };
+        }
+
+        // 准备流式输出
+        // spinner.stop(); // 移到上面了
+        
         if (shouldRetryWithV1 && res.ok && !res.headers.get("content-type")?.includes("text/html")) {
              // 静默保存配置
              try {
@@ -272,14 +296,46 @@ export async function chatStream(context, userInput = null, options = {}) {
 
         // Handle Tool Calls
         if (toolCalls.length > 0) {
+            // 提取已知工具名
+            const knownToolNames = builtInTools.map(t => t.function.name);
+            
             for (const tc of toolCalls) {
-                const funcName = tc.function.name;
+                let funcName = tc.function.name;
+                
+                // 自动修正工具名粘连 (例如: read_fileread_file -> read_file)
+                if (!knownToolNames.includes(funcName)) {
+                     // 按长度降序排序，优先匹配更长的工具名
+                     const matched = knownToolNames
+                        .sort((a, b) => b.length - a.length)
+                        .find(name => funcName.includes(name));
+                     
+                     if (matched) {
+                         console.log(`⚠️  检测到工具名异常 "${funcName}"，自动修正为 "${matched}"`);
+                         funcName = matched;
+                         tc.function.name = matched; // 修正原始对象，这对后续消息历史至关重要
+                     }
+                }
+
                 const argsStr = tc.function.arguments;
                 console.log(`🛠️  调用工具: ${funcName}(${argsStr})`);
                 
                 let result = null;
                 try {
-                    const args = JSON.parse(argsStr);
+                    let args;
+                    try {
+                        args = JSON.parse(argsStr);
+                    } catch (e) {
+                        // 尝试修复常见的 JSON 粘连问题 (例如: {"a":1}{"b":2})
+                        if (argsStr.includes("}{")) {
+                            console.log("⚠️ 检测到 JSON 粘连，尝试修复...");
+                            // 简单策略：只取第一个 JSON
+                            const fixStr = argsStr.split("}{")[0] + "}";
+                            args = JSON.parse(fixStr);
+                        } else {
+                            throw e;
+                        }
+                    }
+
                     // 1. Try built-in
                     result = await toolHandlers(funcName, args);
                     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozhou-chat",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "CLI chatbot based on NewAPI",
   "bin": {
     "xiaozhou-chat": "bin/cli.js"
@@ -22,7 +22,8 @@
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
     "minimist": "^1.2.8",
-    "moment": "^2.30.1"
+    "moment": "^2.30.1",
+    "xiaozhou-chat": "^1.0.1-0.1"
   },
   "pkg": {
     "assets": []