xiaozhou-chat 1.0.22 → 1.0.24

package/lib/chat.js

@@ -136,9 +136,30 @@ export async function chatStream(context, userInput = null, options = {}) {
 
     // 构造请求 Body
     const createBody = (withTools = true) => {
+        let safeMessages = requestMessages;
+
+        // 如果禁用工具，必须清理消息历史中的工具相关字段，否则会导致 400 错误
+        if (!withTools) {
+            safeMessages = requestMessages
+                .filter(m => m.role !== 'tool') // 移除工具输出
+                .map(m => {
+                    if (m.role === 'assistant' && m.tool_calls) {
+                        // 移除 tool_calls 字段
+                        const { tool_calls, ...rest } = m;
+                        return rest;
+                    }
+                    return m;
+                })
+                .filter(m => {
+                    // 移除可能变为空的助手消息 (既没内容也没工具调用)
+                    if (m.role === 'assistant' && !m.content) return false;
+                    return true;
+                });
+        }
+
         const body = {
             model: config.model,
-            messages: requestMessages,
+            messages: safeMessages,
             stream: true, 
             max_tokens: 8192
         };

package/lib/config.js

@@ -76,10 +76,33 @@ export function initProjectConfigFile() {
   console.log("🔒 建议将 .newapi-chat-config.json 添加到 .gitignore 以防泄露。");
 }
 
+function sanitizeString(str) {
+  if (typeof str !== 'string') return str;
+  // Remove backticks, single quotes, double quotes (if mistakenly included inside the string) and surrounding whitespace
+  // But wait, removing quotes inside might be dangerous if they are part of a valid value (unlikely for URL/Key/ModelName)
+  // Let's stick to backticks and whitespace as seen in the user issue.
+  return str.replace(/`/g, '').trim();
+}
+
+function sanitizeConfigObj(obj) {
+  if (!obj) return obj;
+  if (obj.apiKey) obj.apiKey = sanitizeString(obj.apiKey);
+  if (obj.baseUrl) obj.baseUrl = sanitizeString(obj.baseUrl);
+  if (obj.model) obj.model = sanitizeString(obj.model);
+  
+  if (obj.profiles) {
+    for (const key in obj.profiles) {
+      sanitizeConfigObj(obj.profiles[key]);
+    }
+  }
+  return obj;
+}
+
 function loadConfigFrom(file) {
   if (!fs.existsSync(file)) return {};
   try {
-    return JSON.parse(fs.readFileSync(file, "utf-8"));
+    const raw = JSON.parse(fs.readFileSync(file, "utf-8"));
+    return sanitizeConfigObj(raw);
   } catch {
     return {};
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozhou-chat",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "CLI chatbot based on NewAPI",
   "bin": {
     "xiaozhou-chat": "bin/cli.js"