yingclaw 1.7.0 → 1.7.2

package/README.md

@@ -32,9 +32,8 @@ claw setup
 
 - `ANTHROPIC_BASE_URL`
 - API Key
-- Models URL（可选）
 
-如果填写了 Models URL，会自动获取模型列表；如果留空或获取失败，则手动输入主模型和快速模型。
+工具会根据 Base URL 自动尝试获取模型列表；如果获取失败，则手动输入主模型和快速模型。
 
 **第三步：以后直接用**
 ```bash

package/bin/cli.js

@@ -7,6 +7,7 @@ const {
   saveConfig,
   writeEnvToZshrc,
   fetchModels,
+  fetchModelsFromBaseUrl,
   resetConfig,
   validateConfig,
   resolveFastModel,
@@ -137,22 +138,16 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
     }).then(v => v.trim());
   }
 
-  const modelsUrl = await input({
-    message: chalk.cyan('Models URL（可选，留空则手动输入模型）'),
-    default: existingConfig?.provider === 'custom' ? existingConfig.modelsUrl : undefined,
-    validate: (v) => !v.trim() || isValidUrl(v.trim()) ? true : '请输入有效 URL，或留空',
-  }).then(v => v.trim());
-
   let modelChoices = [];
-  if (modelsUrl) {
-    const fetchSpinner = ora('正在获取可用模型...').start();
-    const onlineModels = await fetchModels('custom', apiKey, modelsUrl);
-    if (onlineModels && onlineModels.length > 0) {
-      fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
-      modelChoices = onlineModels.map(id => ({ name: id, value: id }));
-    } else {
-      fetchSpinner.warn(chalk.yellow('无法获取在线列表，改为手动输入模型'));
-    }
+  let modelsUrl;
+  const fetchSpinner = ora('正在自动获取可用模型...').start();
+  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 }));
+  } else {
+    fetchSpinner.warn(chalk.yellow('无法自动获取模型列表，改为手动输入模型'));
   }
 
   let model;

package/lib/config.js

@@ -80,6 +80,43 @@ function parseModelIdsResponse(providerKey, data) {
   return normalizeModelIds(providerKey, ids);
 }
 
+function buildModelUrlCandidates(baseUrl) {
+  let url;
+  try { url = new URL(baseUrl); } catch { return []; }
+
+  const pathname = url.pathname.replace(/\/+$/, '');
+  const candidates = [];
+  const add = (pathPart) => {
+    const normalized = pathPart.startsWith('/') ? pathPart : `/${pathPart}`;
+    candidates.push(`${url.origin}${normalized}`);
+  };
+
+  add(`${pathname}/v1/models`);
+
+  if (pathname.endsWith('/anthropic')) {
+    const withoutAnthropic = pathname.slice(0, -'/anthropic'.length);
+    add(`${withoutAnthropic}/v1/models`);
+  }
+
+  add('/v1/models');
+
+  return [...new Set(candidates)];
+}
+
+async function fetchModelsFromBaseUrl(providerKey, apiKey, baseUrl, fetcher = fetchModels) {
+  const effectiveProviderKey = providerKey === 'custom'
+    ? providerKeyFromBaseUrl(baseUrl) || providerKey
+    : providerKey;
+
+  for (const modelsUrl of buildModelUrlCandidates(baseUrl)) {
+    const models = await fetcher(effectiveProviderKey, apiKey, modelsUrl);
+    if (models && models.length > 0) {
+      return { modelsUrl, models: normalizeModelIds(effectiveProviderKey, models) };
+    }
+  }
+  return null;
+}
+
 // 联网拉取厂商支持的模型列表，失败返回 null
 function fetchModels(providerKey, apiKey, modelsUrlOverride) {
   return new Promise((resolve) => {
@@ -267,6 +304,8 @@ module.exports = {
   validateConfig,
   normalizeModelIds,
   parseModelIdsResponse,
+  buildModelUrlCandidates,
+  fetchModelsFromBaseUrl,
   resolveFastModel,
   providerKeyFromBaseUrl,
   buildClaudeEnv,

package/package.json

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