yymaxapi 1.0.55 → 1.0.57

package/bin/yymaxapi.js

@@ -3397,62 +3397,77 @@ async function switchModel(paths) {
     return;
   }
 
-  const claudeApiConfig = API_CONFIG.claude;
-  const codexApiConfig = API_CONFIG.codex;
-  const claudeProviderName = claudeApiConfig.providerName;
-  const codexProviderName = codexApiConfig.providerName;
+  const PROVIDER_LABELS = {
+    'claude-yunyi': '云翼 Claude (包月)',
+    'yunyi': '云翼 Codex (包月)',
+    'heibai': 'MAXAPI (按量)',
+  };
+
+  const claudeProviderName = API_CONFIG.claude.providerName;
+  const codexProviderName = API_CONFIG.codex.providerName;
 
-  // 从预设模型列表构建选项（确保始终展示最新可用模型）
+  // 预设模型列表
   const choices = [];
-  const listedKeys = new Set();
+  const presetKeys = new Set();
 
   if (CLAUDE_MODELS.length > 0) {
     choices.push(new inquirer.Separator('  -- Claude --'));
     for (const m of CLAUDE_MODELS) {
-      const providerName = providers[claudeProviderName] ? claudeProviderName : Object.keys(providers)[0];
-      const modelKey = `${providerName}/${m.id}`;
+      const pName = providers[claudeProviderName] ? claudeProviderName : Object.keys(providers)[0];
+      const modelKey = `${pName}/${m.id}`;
       const isCurrent = modelKey === primary;
       choices.push({
         name: isCurrent ? `${m.name} (当前)` : m.name,
         value: modelKey,
       });
-      listedKeys.add(modelKey);
+      presetKeys.add(modelKey);
     }
   }
 
   if (CODEX_MODELS.length > 0) {
     choices.push(new inquirer.Separator('  -- GPT --'));
     for (const m of CODEX_MODELS) {
-      const providerName = providers[codexProviderName] ? codexProviderName : Object.keys(providers)[0];
-      const modelKey = `${providerName}/${m.id}`;
+      const pName = providers[codexProviderName] ? codexProviderName : Object.keys(providers)[0];
+      const modelKey = `${pName}/${m.id}`;
       const isCurrent = modelKey === primary;
       choices.push({
         name: isCurrent ? `${m.name} (当前)` : m.name,
         value: modelKey,
       });
-      listedKeys.add(modelKey);
+      presetKeys.add(modelKey);
     }
   }
 
-  // 补上配置文件中已有但不在预设列表里的模型
+  // 收集用户配置中的其他模型（不在预设列表里的）
+  const otherModels = [];
   for (const [providerName, providerConfig] of Object.entries(providers)) {
     for (const m of (providerConfig.models || [])) {
       const modelKey = `${providerName}/${m.id}`;
-      if (listedKeys.has(modelKey)) continue;
-      const isCurrent = modelKey === primary;
-      choices.push({
-        name: isCurrent ? `${m.name || m.id} (当前)` : (m.name || m.id),
-        value: modelKey,
-      });
-      listedKeys.add(modelKey);
+      if (!presetKeys.has(modelKey)) {
+        otherModels.push({ modelKey, name: m.name || m.id, providerName });
+      }
     }
   }
-
-  if (choices.filter(c => c.value).length === 0) {
-    console.log(chalk.yellow('⚠️ 未找到任何可用模型'));
-    return;
+  const registeredKeys = Object.keys(config.agents?.defaults?.models || {});
+  for (const modelKey of registeredKeys) {
+    if (presetKeys.has(modelKey) || otherModels.some(o => o.modelKey === modelKey)) continue;
+    const [pName, mId] = modelKey.split('/');
+    if (!pName || !mId) continue;
+    otherModels.push({ modelKey, name: `${PROVIDER_LABELS[pName] || pName} / ${mId}`, providerName: pName });
   }
 
+  // 当前主模型不在预设列表中时，标注在"其他"入口上
+  const primaryInPreset = presetKeys.has(primary);
+  const otherLabel = otherModels.length > 0
+    ? `切换其他模型 (${otherModels.length} 个)`
+    : '切换其他模型';
+
+  choices.push(new inquirer.Separator(''));
+  choices.push({
+    name: !primaryInPreset && primary ? `${otherLabel} ← 当前在此` : otherLabel,
+    value: '__other__',
+  });
+
   const currentProvider = primary.split('/')[0] || '';
   const currentProviderConfig = providers[currentProvider];
   console.log(chalk.gray(`当前模型: ${primary || '未设置'}`));
@@ -3465,25 +3480,51 @@ async function switchModel(paths) {
     type: 'list',
     name: 'selected',
     message: '选择模型:',
-    default: primary,
+    default: primaryInPreset ? primary : undefined,
     pageSize: 15,
     choices,
   }]);
 
-  if (selected === primary) {
+  let finalSelected = selected;
+
+  if (selected === '__other__') {
+    if (otherModels.length === 0) {
+      console.log(chalk.gray('\n当前配置中没有其他模型，仅有预设模型可用'));
+      return;
+    }
+    const otherChoices = otherModels.map(o => {
+      const label = PROVIDER_LABELS[o.providerName] || o.providerName;
+      const isCurrent = o.modelKey === primary;
+      return {
+        name: isCurrent ? `${o.name} [${label}] (当前)` : `${o.name} [${label}]`,
+        value: o.modelKey,
+      };
+    });
+    const { pickedOther } = await inquirer.prompt([{
+      type: 'list',
+      name: 'pickedOther',
+      message: '选择其他模型:',
+      default: !primaryInPreset ? primary : undefined,
+      pageSize: 15,
+      choices: otherChoices,
+    }]);
+    finalSelected = pickedOther;
+  }
+
+  if (finalSelected === primary) {
     console.log(chalk.gray('\n模型未变更'));
     return;
   }
 
-  const selectedProvider = selected.split('/')[0];
-  const selectedModelId = selected.split('/')[1];
-  config.agents.defaults.model.primary = selected;
-  if (!config.agents.defaults.models[selected]) {
-    config.agents.defaults.models[selected] = { alias: selectedProvider };
+  const selectedProviderKey = finalSelected.split('/')[0];
+  const selectedModelId = finalSelected.split('/')[1];
+  config.agents.defaults.model.primary = finalSelected;
+  if (!config.agents.defaults.models[finalSelected]) {
+    config.agents.defaults.models[finalSelected] = { alias: selectedProviderKey };
   }
 
-  // 同步更新 provider.models，确保 primary 指向的模型在列表中
-  const providerConfig = providers[selectedProvider];
+  // 同步更新 provider.models
+  const providerConfig = providers[selectedProviderKey];
   if (providerConfig && selectedModelId) {
     const existingModel = (providerConfig.models || []).find(m => m.id === selectedModelId);
     if (!existingModel) {
@@ -3504,16 +3545,16 @@ async function switchModel(paths) {
     }
   }
 
-  config.agents.defaults.model.fallbacks = (config.agents.defaults.model.fallbacks || []).filter(k => k !== selected);
-  if (primary && primary !== selected && !config.agents.defaults.model.fallbacks.includes(primary)) {
+  config.agents.defaults.model.fallbacks = (config.agents.defaults.model.fallbacks || []).filter(k => k !== finalSelected);
+  if (primary && primary !== finalSelected && !config.agents.defaults.model.fallbacks.includes(primary)) {
     config.agents.defaults.model.fallbacks.push(primary);
   }
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
 
-  const selectedProviderConfig = providers[selectedProvider];
-  const selectedLabel = PROVIDER_LABELS[selectedProvider] || selectedProvider;
-  console.log(chalk.green(`\n✅ 已切换到 ${selected}`));
+  const selectedProviderConfig = providers[selectedProviderKey];
+  const selectedLabel = PROVIDER_LABELS[selectedProviderKey] || selectedProviderKey;
+  console.log(chalk.green(`\n✅ 已切换到 ${finalSelected}`));
   console.log(chalk.gray(`   来源: ${selectedLabel}`));
   if (selectedProviderConfig) {
     console.log(chalk.gray(`   节点: ${selectedProviderConfig.baseUrl}`));
@@ -3522,7 +3563,6 @@ async function switchModel(paths) {
   const gwPort = config.gateway?.port || 18789;
   const gwToken = config.gateway?.auth?.token;
 
-  // 自动重启 Gateway 使切换立即生效
   if (await isPortOpen(gwPort)) {
     const gwSpinner = ora({ text: '重启 Gateway 使模型切换生效...', spinner: 'dots' }).start();
     const ok = await restartGateway({ silent: true });
@@ -3794,14 +3834,14 @@ async function testConnection(paths, args = {}) {
     let result = await testGatewayApi(gatewayPort, gatewayToken, primary);
     const latency = Date.now() - startTime;
 
-    // /v1/responses 返回 405 时，回退测试 /v1/chat/completions
-    if (!result.success && result.reachable && result.status === 405) {
+    // /v1/responses 返回 404/405 时，回退测试 /v1/chat/completions
+    if (!result.success && result.reachable && [404, 405].includes(result.status)) {
       console.log(chalk.gray('   /v1/responses 不支持，回退测试 /v1/chat/completions...'));
       result = await testGatewayApi(gatewayPort, gatewayToken, primary, '/v1/chat/completions');
     }
 
-    // CLI 对话已成功 + Gateway 可达（405）= Dashboard 通过 WebSocket 工作，视为通过
-    if (!result.success && cliPassed && result.reachable && result.status === 405) {
+    // CLI 对话已成功 + Gateway 可达（404/405）= Dashboard 通过 WebSocket 工作，视为通过
+    if (!result.success && cliPassed && result.reachable && [404, 405].includes(result.status)) {
       console.log(chalk.green(`\n✅ Gateway 测试通过`));
       console.log(chalk.cyan(`   CLI 对话正常，Gateway 可达`));
       console.log(chalk.gray(`   注: Gateway Dashboard 通过 WebSocket 通信，REST 端点返回 405 属正常现象`));
@@ -3836,8 +3876,8 @@ async function testConnection(paths, args = {}) {
         console.log(chalk.gray(`   3) 若仍 401，检查是否存在多个配置目录（.openclaw 与 .clawdbot）`));
       }
 
-      if (cliPassed && /\b405\b/.test(String(result.error || ''))) {
-        console.log(chalk.yellow(`\n⚠️ 已定位：Gateway 可达（HTTP 405），Web API 端点不支持当前请求方法`));
+      if (cliPassed && /\b(404|405)\b/.test(String(result.error || ''))) {
+        console.log(chalk.yellow(`\n⚠️ 已定位：Gateway 可达，Web REST 端点返回 ${result.status || '404/405'}`));
         console.log(chalk.gray(`   CLI 对话正常，Web Dashboard 应可正常使用。`));
         console.log(chalk.gray(`   如遇问题，尝试更新 Gateway: npm install -g openclaw@latest && openclaw gateway restart`));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {