yymaxapi 1.0.45 → 1.0.47

package/bin/yymaxapi.js

@@ -2660,22 +2660,7 @@ async function autoActivate(paths, args = {}) {
   // ---- 构建配置 ----
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
 
-  const existingProviders = Object.keys(config.models.providers || {});
-  const toRemove = existingProviders.filter(n => n !== claudeProviderName && n !== codexProviderName);
-  if (toRemove.length > 0 && !args.force) {
-    const { overwrite } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'overwrite',
-      message: `检测到已有中转配置: ${existingProviders.join(', ')}，将替换为 ${claudeProviderName} + ${codexProviderName}。是否继续？`,
-      default: false
-    }]);
-    if (!overwrite) { console.log(chalk.gray('已取消')); return; }
-  }
-
-  if (toRemove.length > 0) {
-    pruneProvidersExcept(config, [claudeProviderName, codexProviderName]);
-    pruneAuthProfilesExcept(paths.authProfiles, [claudeProviderName, codexProviderName]);
-  }
+  // 增量写入: 只添加/更新云翼 provider，保留其他已有配置
 
   // Claude 侧
   const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
@@ -3042,13 +3027,7 @@ async function yycodeQuickSetup(paths) {
   // ---- 写入两套配置 ----
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
 
-  // 清理旧 provider
-  const existingProviders = Object.keys(config.models.providers || {});
-  const toRemove = existingProviders.filter(n => n !== claudeProviderName && n !== codexProviderName);
-  if (toRemove.length > 0) {
-    pruneProvidersExcept(config, [claudeProviderName, codexProviderName]);
-    pruneAuthProfilesExcept(paths.authProfiles, [claudeProviderName, codexProviderName]);
-  }
+  // 增量写入: 只添加/更新云翼 provider，保留其他已有配置
 
   // Claude 侧
   const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
@@ -3238,30 +3217,31 @@ function getConfigStatusLine(paths) {
 
     const providers = Object.keys(config.models.providers);
     const primary = config?.agents?.defaults?.model?.primary || '';
+    const primaryProvider = primary.split('/')[0] || '';
 
-    const parts = [];
-
-    // 检查 Claude
-    const hasClaude = providers.some(p => p.includes('claude') || p.includes('yunyi-claude'));
-    if (hasClaude) {
-      const isActive = primary.includes('claude');
-      parts.push(isActive ? chalk.green('Claude ✓') : chalk.yellow('Claude ○'));
-    }
+    const PROVIDER_LABELS = {
+      'claude-yunyi': 'Claude(包月)',
+      'yunyi': 'Codex(包月)',
+      'heibai': 'MAXAPI(按量)',
+    };
 
-    // 检查 Codex/GPT
-    const hasCodex = providers.some(p => p.includes('codex') || p.includes('gpt') || p.includes('yunyi-codex'));
-    if (hasCodex) {
-      const isActive = primary.includes('codex') || primary.includes('gpt');
-      parts.push(isActive ? chalk.green('Codex ✓') : chalk.yellow('Codex ○'));
+    const parts = [];
+    for (const p of providers) {
+      const label = PROVIDER_LABELS[p] || p;
+      const isActive = p === primaryProvider;
+      parts.push(isActive ? chalk.green(`${label} ✓`) : chalk.yellow(`${label} ○`));
     }
 
     if (parts.length === 0) {
       return chalk.gray('当前状态: 未配置任何模型');
     }
 
+    const primaryModelId = primary.split('/')[1] || '';
+    const modelTag = primaryModelId ? chalk.cyan(` [模型: ${primaryModelId}]`) : '';
+
     const gwEnv = detectGatewayEnv();
     const envTag = gwEnv === 'wsl' ? chalk.cyan(' [WSL]') : '';
-    return chalk.gray('当前状态: ') + parts.join('  ') + chalk.gray('  (✓ 主模型  ○ 已配置)') + envTag;
+    return chalk.gray('当前状态: ') + parts.join('  ') + chalk.gray('  (✓ 主模型  ○ 已配置)') + modelTag + envTag;
   } catch {
     return null;
   }
@@ -3404,59 +3384,103 @@ async function activate(paths, type) {
 
 // ============ 切换模型 ============
 async function switchModel(paths) {
-  console.log(chalk.cyan('🔄 切换 Claude 模型\n'));
+  console.log(chalk.cyan('🔄 切换模型\n'));
 
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
   const primary = config.agents?.defaults?.model?.primary || '';
+  const providers = config.models?.providers || {};
 
-  if (!primary.includes('/')) {
-    console.log(chalk.yellow('⚠️ 请先通过「一键激活」设置主模型'));
+  if (Object.keys(providers).length === 0) {
+    console.log(chalk.yellow('⚠️ 未找到任何中转配置，请先通过「一键配置」设置'));
     return;
   }
 
-  const providerName = primary.split('/')[0];
-  const currentModelId = primary.split('/')[1] || '';
-  const provider = config.models?.providers?.[providerName];
+  // 已知 provider 别名映射
+  const PROVIDER_LABELS = {
+    'claude-yunyi': '云翼 Claude (包月)',
+    'yunyi': '云翼 Codex (包月)',
+    'heibai': 'MAXAPI (按量)',
+  };
 
-  if (!provider) {
-    console.log(chalk.yellow(`⚠️ 主模型对应的中转站不存在: ${providerName}`));
-    return;
+  // 收集所有 provider 的所有模型
+  const choices = [];
+  for (const [providerName, providerConfig] of Object.entries(providers)) {
+    const label = PROVIDER_LABELS[providerName] || providerName;
+    const models = providerConfig.models || [];
+    if (models.length === 0) continue;
+
+    choices.push(new inquirer.Separator(`  -- ${label} --`));
+    for (const m of models) {
+      const modelKey = `${providerName}/${m.id}`;
+      const isCurrent = modelKey === primary;
+      choices.push({
+        name: isCurrent ? `${m.name || m.id} (当前)` : (m.name || m.id),
+        value: modelKey,
+      });
+    }
   }
 
-  const models = [
-    { id: 'claude-opus-4-6', name: 'Claude Opus 4.6' },
-    { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6' },
-  ];
+  // 也把 agents.defaults.models 里注册过但 provider.models 里没列出的补上
+  const registeredKeys = Object.keys(config.agents?.defaults?.models || {});
+  const listedKeys = new Set(choices.filter(c => c.value).map(c => c.value));
+  for (const modelKey of registeredKeys) {
+    if (listedKeys.has(modelKey)) continue;
+    const [pName, mId] = modelKey.split('/');
+    if (!pName || !mId) continue;
+    const label = PROVIDER_LABELS[pName] || pName;
+    const isCurrent = modelKey === primary;
+    choices.push({
+      name: isCurrent ? `${label} / ${mId} (当前)` : `${label} / ${mId}`,
+      value: modelKey,
+    });
+  }
+
+  if (choices.filter(c => c.value).length === 0) {
+    console.log(chalk.yellow('⚠️ 未找到任何可用模型'));
+    return;
+  }
 
-  console.log(chalk.gray(`当前模型: ${currentModelId}`));
-  console.log(chalk.gray(`中转节点: ${provider.baseUrl}\n`));
+  const currentProvider = primary.split('/')[0] || '';
+  const currentProviderConfig = providers[currentProvider];
+  console.log(chalk.gray(`当前模型: ${primary || '未设置'}`));
+  if (currentProviderConfig) {
+    console.log(chalk.gray(`中转节点: ${currentProviderConfig.baseUrl}`));
+  }
+  console.log('');
 
   const { selected } = await inquirer.prompt([{
     type: 'list',
     name: 'selected',
     message: '选择模型:',
-    default: currentModelId,
-    choices: models.map(m => ({
-      name: m.id === currentModelId ? `${m.name} (当前)` : m.name,
-      value: m.id,
-    })),
+    default: primary,
+    pageSize: 15,
+    choices,
   }]);
 
-  if (selected === currentModelId) {
+  if (selected === primary) {
     console.log(chalk.gray('\n模型未变更'));
     return;
   }
 
-  const newPrimary = `${providerName}/${selected}`;
-  config.agents.defaults.model.primary = newPrimary;
-  if (!config.agents.defaults.models[newPrimary]) {
-    config.agents.defaults.models[newPrimary] = { alias: providerName };
+  const selectedProvider = selected.split('/')[0];
+  config.agents.defaults.model.primary = selected;
+  if (!config.agents.defaults.models[selected]) {
+    config.agents.defaults.models[selected] = { alias: selectedProvider };
+  }
+  config.agents.defaults.model.fallbacks = (config.agents.defaults.model.fallbacks || []).filter(k => k !== selected);
+  // 把旧的 primary 加入 fallbacks (如果存在且不同)
+  if (primary && primary !== selected && !config.agents.defaults.model.fallbacks.includes(primary)) {
+    config.agents.defaults.model.fallbacks.push(primary);
   }
   writeConfigWithSync(paths, config);
 
-  const selectedName = models.find(m => m.id === selected).name;
-  console.log(chalk.green(`\n✅ 已切换到 ${selectedName}`));
-  console.log(chalk.gray(`   ${newPrimary}`));
+  const selectedProviderConfig = providers[selectedProvider];
+  const selectedLabel = PROVIDER_LABELS[selectedProvider] || selectedProvider;
+  console.log(chalk.green(`\n✅ 已切换到 ${selected}`));
+  console.log(chalk.gray(`   来源: ${selectedLabel}`));
+  if (selectedProviderConfig) {
+    console.log(chalk.gray(`   节点: ${selectedProviderConfig.baseUrl}`));
+  }
   console.log(chalk.yellow('\n💡 切换后建议重启 Gateway: openclaw gateway restart'));
 
   const gwPort = config.gateway?.port || 18789;
@@ -3478,10 +3502,26 @@ async function testConnection(paths, args = {}) {
   }
 
   // 检查当前激活的是哪个
-  const primary = config.agents?.defaults?.model?.primary || '';
+  let primary = config.agents?.defaults?.model?.primary || '';
   if (!primary.includes('/')) {
-    console.log(chalk.yellow('⚠️ 请先设置主模型'));
-    return;
+    // primary 未设置，尝试从已有 provider 自动选择
+    const providers = config.models?.providers || {};
+    const providerNames = Object.keys(providers);
+    if (providerNames.length === 0) {
+      console.log(chalk.yellow('⚠️ 请先设置主模型'));
+      return;
+    }
+    // 优先选 claude provider
+    const claudeP = providerNames.find(n => n.includes('claude'));
+    const firstP = claudeP || providerNames[0];
+    const firstModels = providers[firstP]?.models || [];
+    if (firstModels.length > 0) {
+      primary = `${firstP}/${firstModels[0].id}`;
+      console.log(chalk.yellow(`⚠️ 主模型未设置，自动使用: ${primary}`));
+    } else {
+      console.log(chalk.yellow('⚠️ 请先设置主模型'));
+      return;
+    }
   }
 
   const providerName = primary.split('/')[0];

package/package.json

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