xiaozhou-chat 1.0.16 → 1.0.18

package/bin/cli.js

@@ -1,4 +1,39 @@
 #!/usr/bin/env node
+
+// -------------------------------------------------------------------------
+// 🛡️ 环境净化区：在加载任何依赖前，清理可能导致冲突的环境变量
+// -------------------------------------------------------------------------
+(function sanitizeEnvironment() {
+  const proxyVars = [
+    'HTTP_PROXY', 'HTTPS_PROXY', 'ALL_PROXY', 'NO_PROXY',
+    'http_proxy', 'https_proxy', 'all_proxy', 'no_proxy'
+  ];
+  
+  let cleaned = [];
+  for (const key of proxyVars) {
+    if (process.env[key]) {
+      delete process.env[key];
+      cleaned.push(key);
+    }
+  }
+
+  // 同时清理可能干扰的通用 API 配置（防止 .env 污染）
+  const conflictVars = ['API_KEY', 'BASE_URL', 'MODEL', 'OPENAI_API_KEY'];
+  for (const key of conflictVars) {
+    if (process.env[key]) {
+      delete process.env[key];
+      cleaned.push(key);
+    }
+  }
+
+  if (cleaned.length > 0) {
+    // 仅在调试模式或检测到显式代理时提示，避免干扰正常输出
+    // 但为了响应用户需求，我们这里打印一个温和的提示
+    // console.log(`\n🛡️  已自动屏蔽潜在冲突的环境变量: ${cleaned.join(', ')}`);
+  }
+})();
+// -------------------------------------------------------------------------
+
 import fs from "node:fs";
 import path from "node:path";
 import readline from "node:readline";

package/lib/chat.js

@@ -34,6 +34,27 @@ export async function requestWithRetry(url, options, maxRetries = 3) {
                 const text = await res.text();
                 // 4xx errors: do not retry
                 if (res.status >= 400 && res.status < 500) {
+                     if (res.status === 400) {
+                        console.log(`\n❌ API请求参数错误 (400)。调试信息:`);
+                        console.log(`- Endpoint: ${url}`);
+                        console.log(`- Model: ${options.body ? JSON.parse(options.body).model : 'unknown'}`);
+                        // 尝试解析并打印更友好的错误
+                        try {
+                            const errJson = JSON.parse(text);
+                            console.log(`- Server Message: ${errJson.error?.message || text}`);
+                        } catch {
+                            console.log(`- Server Response: ${text}`);
+                        }
+                        
+                        // 提示用户检查配置
+                        if (url.includes("tribiosapi")) {
+                            console.log("- 提示: 默认模型 'claude-sonnet-4-5-20250929' 可能已过期或不可用。");
+                            console.log("  请尝试运行 'npx xiaozhou-chat config --model=gpt-4o' 切换模型。");
+                        } else {
+                            console.log("- 提示: 请检查当前模型名称是否与您的 API 提供商兼容。");
+                        }
+                        console.log(`- Config Source: 检查当前目录或 ~ 目录下是否存在 .newapi-chat-config.json`);
+                     }
                      throw new Error(`API Error (${res.status}): ${text}`);
                 }
                 // 5xx errors: retry
@@ -128,19 +149,25 @@ export async function chatStream(context, userInput = null, options = {}) {
 
         // 第一次尝试 (默认带 Tools)
         try {
+            const body = createBody(true);
             res = await requestWithRetry(requestUrl, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",
                     Authorization: `Bearer ${config.apiKey}`
                 },
-                body: JSON.stringify(createBody(true)),
+                body: JSON.stringify(body),
                 signal: signal
             }, 1); // 减少内部重试，由外层控制
         } catch (e) {
             // 如果是 400 错误，且我们用了 Tools，尝试降级
             if (e.message.includes("400") || e.message.includes("Improperly formed request")) {
                 console.log("\n⚠️  API 不支持工具调用或参数格式错误，尝试自动降级为纯聊天模式...");
+                
+                const body = createBody(false);
+                // 打印降级后的请求信息以供调试
+                console.log(`ℹ️  [Debug] Retrying with model: ${body.model}, max_tokens: ${body.max_tokens}`);
+
                 usedTools = false;
                 res = await requestWithRetry(requestUrl, {
                     method: "POST",
@@ -148,7 +175,7 @@ export async function chatStream(context, userInput = null, options = {}) {
                         "Content-Type": "application/json",
                         Authorization: `Bearer ${config.apiKey}`
                     },
-                    body: JSON.stringify(createBody(false)),
+                    body: JSON.stringify(body),
                     signal: signal
                 });
             } else {

package/lib/config.js

@@ -88,9 +88,26 @@ function loadConfigFrom(file) {
 // 加载配置 (Home < Project)
 export function loadConfig() {
   const home = loadConfigFrom(homeConfigFile);
+  
+  // 显式打印当前加载的配置文件，辅助调试
+  // 只有在存在项目级配置时才打印，避免在普通目录下显得啰嗦
+  const hasProjectConfig = fs.existsSync(projectConfigFile);
+  const hasAltConfig = fs.existsSync(projectAltConfigFile);
+  
+  if (hasProjectConfig) {
+      console.log(`\n📂 [Config] 检测到项目级配置文件: ${projectConfigFile}`);
+  } else if (hasAltConfig) {
+      console.log(`\n📂 [Config] 检测到项目级配置文件: ${projectAltConfigFile}`);
+  }
+
   const project =
     loadConfigFrom(projectConfigFile) ||
     loadConfigFrom(projectAltConfigFile);
+  
+  // 检查是否加载了空配置导致覆盖
+  if ((hasProjectConfig || hasAltConfig) && !project.apiKey && !project.profiles) {
+      console.log(`⚠️  [Config] 警告: 项目级配置文件似乎为空或格式不正确，可能会覆盖全局配置！`);
+  }
 
   // Deep merge profiles if needed, but simple merge is okay for now
   const config = { ...home, ...project };

package/package.json

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