yingclaw 2.5.14 → 2.5.18

package/bin/cli.js

@@ -32,6 +32,7 @@ const {
   checkDesktopGatewayStatus,
   createGatewayServer,
   ensureDesktopGatewayConfig,
+  isDesktopChatModel,
 } = require('../lib/gateway');
 const { runDoctorChecks, summarize, STATUS_OK, STATUS_FAIL, STATUS_WARN, STATUS_INFO } = require('../lib/doctor');
 
@@ -151,6 +152,15 @@ async function promptModelFromChoices({ chalk, choices, message, backLabel = '
   }).then(v => v.trim());
 }
 
+function getChatModelChoices(models) {
+  return models.filter(isDesktopChatModel).map(id => ({ name: id, value: id }));
+}
+
+function formatFetchedModelCount(chalk, total, chatCount) {
+  if (total === chatCount) return chalk.green(`已获取 ${chatCount} 个可用聊天模型`);
+  return chalk.green(`已获取 ${total} 个模型，其中 ${chatCount} 个可用于 Claude/桌面聊天`);
+}
+
 async function promptManualModel(chalk, message, defaultValue) {
   return input({
     message: chalk.cyan(message),
@@ -185,8 +195,12 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
   const onlineResult = await fetchModelsFromBaseUrl('custom', apiKey, baseUrl);
   if (onlineResult) {
     modelsUrl = onlineResult.modelsUrl;
-    fetchSpinner.succeed(chalk.green(`已获取 ${onlineResult.models.length} 个可用模型`));
-    modelChoices = onlineResult.models.map(id => ({ name: id, value: id }));
+    modelChoices = getChatModelChoices(onlineResult.models);
+    if (modelChoices.length > 0) {
+      fetchSpinner.succeed(formatFetchedModelCount(chalk, onlineResult.models.length, modelChoices.length));
+    } else {
+      fetchSpinner.warn(chalk.yellow(`已获取 ${onlineResult.models.length} 个模型，但没有可用于 Claude/桌面聊天的模型`));
+    }
   } else {
     fetchSpinner.warn(chalk.yellow('无法自动获取模型列表，改为手动输入模型'));
   }
@@ -338,9 +352,15 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
       const onlineModels = await fetchModels(providerKey, apiKey);
       let modelChoices;
       if (onlineModels && onlineModels.length > 0) {
-        fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
-        modelChoices = onlineModels.map(id => ({ name: id, value: id }));
-        availableModels = onlineModels;
+        modelChoices = getChatModelChoices(onlineModels);
+        if (modelChoices.length > 0) {
+          fetchSpinner.succeed(formatFetchedModelCount(chalk, onlineModels.length, modelChoices.length));
+          availableModels = onlineModels;
+        } else {
+          fetchSpinner.warn(chalk.yellow(`已获取 ${onlineModels.length} 个模型，但没有可用于 Claude/桌面聊天的模型，使用内置默认列表`));
+          modelChoices = provider.models;
+          availableModels = provider.models.map(m => m.value);
+        }
       } else {
         fetchSpinner.warn(chalk.yellow('无法获取在线列表，使用内置默认列表'));
         modelChoices = provider.models;
@@ -644,9 +664,15 @@ program
     let modelChoices;
     let availableModels;
     if (onlineModels && onlineModels.length > 0) {
-      fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
-      modelChoices = onlineModels.map(id => ({ name: id, value: id }));
-      availableModels = onlineModels;
+      modelChoices = getChatModelChoices(onlineModels);
+      if (modelChoices.length > 0) {
+        fetchSpinner.succeed(formatFetchedModelCount(chalk, onlineModels.length, modelChoices.length));
+        availableModels = onlineModels;
+      } else {
+        fetchSpinner.warn(chalk.yellow(`已获取 ${onlineModels.length} 个模型，但没有可用于 Claude/桌面聊天的模型，使用内置默认列表`));
+        modelChoices = provider.models;
+        availableModels = provider.models.map(m => m.value);
+      }
     } else {
       fetchSpinner.warn(chalk.yellow('无法获取在线列表，使用内置默认列表'));
       modelChoices = provider.models;

package/lib/config.js

@@ -327,6 +327,7 @@ async function validateKey(config, options = {}) {
         'content-type': 'application/json',
         authorization: `Bearer ${config.apiKey}`,
         'x-api-key': config.apiKey,
+        'api-key': config.apiKey,
         'anthropic-version': '2023-06-01',
       },
       body: JSON.stringify({

package/lib/gateway.js

@@ -59,8 +59,9 @@ function desktopRouteLabel(routeId) {
 }
 
 function isDesktopChatModel(model) {
-  return !/(^|[-_])(tts|voice|voiceclone|voicedesign|speech|audio|image|video|embedding|embed|rerank|moderation)([-_]|$)/i
-    .test(String(model || ''));
+  const value = String(model || '');
+  return !/(^|[-_])(tts|voice|voiceclone|voicedesign|speech|audio|image|video|embedding|embed|rerank|moderation)([-_]|$)/i.test(value)
+    && !/(cogview|cogvideo|wanx|flux|sdxl|stable-diffusion)/i.test(value);
 }
 
 function buildDesktopGatewayRoutes(config) {
@@ -209,6 +210,7 @@ async function proxyMessages(req, res, config) {
       accept: body.stream ? 'text/event-stream' : 'application/json',
       authorization: `Bearer ${config.apiKey}`,
       'x-api-key': config.apiKey,
+      'api-key': config.apiKey,
       'anthropic-version': '2023-06-01',
     },
     body: JSON.stringify(body),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "2.5.14",
+  "version": "2.5.18",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {