yymaxapi 1.0.50 → 1.0.52

package/bin/yymaxapi.js

@@ -140,8 +140,6 @@ const DEFAULT_API_CONFIG = {
 
 const SKIP_API_VALIDATION = false;
 
-const SKIP_API_VALIDATION = false;
-
 function normalizeEndpoints(raw, fallback) {
   if (!Array.isArray(raw)) return fallback;
   const normalized = raw
@@ -1184,8 +1182,17 @@ function coerceModelsRecord(value) {
   return record;
 }
 
+const OPENCLAW_INVALID_ROOT_KEYS = ['model'];
+
+function sanitizeRootKeys(config) {
+  for (const key of OPENCLAW_INVALID_ROOT_KEYS) {
+    if (key in config) delete config[key];
+  }
+}
+
 function ensureConfigStructure(config) {
   const next = config || {};
+  sanitizeRootKeys(next);
   if (!next.models) next.models = {};
   if (!next.models.providers) next.models.providers = {};
   if (!next.agents) next.agents = {};
@@ -2668,25 +2675,54 @@ async function autoActivate(paths, args = {}) {
   // ---- 构建配置 ----
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
 
-  // 增量写入: 只添加/更新云翼 provider，保留其他已有配置
-
-  // Claude 侧 — 让用户选模型
   const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
-  let claudeModelId = (args['claude-model'] || '').toString().trim();
-  if (!claudeModelId && CLAUDE_MODELS.length > 1) {
-    const { picked } = await inquirer.prompt([{
-      type: 'list',
-      name: 'picked',
-      message: '选择 Claude 模型:',
-      choices: CLAUDE_MODELS.map(m => ({ name: m.name, value: m.id })),
-      default: CLAUDE_MODELS[0].id
-    }]);
-    claudeModelId = picked;
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
+
+  // 检测单一模式：Claude 和 Codex 只有一个模型且 id 相同（如 maxapi 的 heibai）
+  const isSingleMode = CLAUDE_MODELS.length === 1 && CODEX_MODELS.length === 1
+    && CLAUDE_MODELS[0].id === CODEX_MODELS[0].id;
+
+  let claudeModelId, codexModelId;
+
+  if (isSingleMode) {
+    // 单一模式：固定模型，不选择，不分 Claude/Codex
+    claudeModelId = CLAUDE_MODELS[0].id;
+    codexModelId = CODEX_MODELS[0].id;
+  } else {
+    // 多模型模式：让用户选模型
+    claudeModelId = (args['claude-model'] || '').toString().trim();
+    if (!claudeModelId && CLAUDE_MODELS.length > 1) {
+      const { picked } = await inquirer.prompt([{
+        type: 'list',
+        name: 'picked',
+        message: '选择 Claude 模型:',
+        choices: CLAUDE_MODELS.map(m => ({ name: m.name, value: m.id })),
+        default: CLAUDE_MODELS[0].id
+      }]);
+      claudeModelId = picked;
+    }
+    if (!claudeModelId) claudeModelId = CLAUDE_MODELS[0]?.id || 'claude-sonnet-4-6';
+
+    codexModelId = (args['codex-model'] || '').toString().trim();
+    if (!codexModelId && CODEX_MODELS.length > 1) {
+      const { pickedCodex } = await inquirer.prompt([{
+        type: 'list',
+        name: 'pickedCodex',
+        message: '选择 Codex 模型:',
+        choices: CODEX_MODELS.map(m => ({ name: m.name, value: m.id })),
+        default: CODEX_MODELS[0].id
+      }]);
+      codexModelId = pickedCodex;
+    }
+    if (!codexModelId) codexModelId = CODEX_MODELS[0]?.id || 'gpt-5.3-codex';
   }
-  if (!claudeModelId) claudeModelId = CLAUDE_MODELS[0]?.id || 'claude-sonnet-4-6';
+
   const claudeModel = CLAUDE_MODELS.find(m => m.id === claudeModelId) || { id: claudeModelId, name: claudeModelId };
+  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: codexModelId };
   const claudeModelKey = `${claudeProviderName}/${claudeModelId}`;
+  const codexModelKey = `${codexProviderName}/${codexModelId}`;
 
+  // 写入 Claude provider
   config.models.providers[claudeProviderName] = {
     baseUrl: claudeBaseUrl,
     auth: DEFAULT_AUTH_MODE,
@@ -2704,23 +2740,7 @@ async function autoActivate(paths, args = {}) {
   config.auth.profiles[`${claudeProviderName}:default`] = { provider: claudeProviderName, mode: 'api_key' };
   config.agents.defaults.models[claudeModelKey] = { alias: claudeProviderName };
 
-  // Codex 侧 — 让用户选模型
-  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
-  let codexModelId = (args['codex-model'] || '').toString().trim();
-  if (!codexModelId && CODEX_MODELS.length > 1) {
-    const { pickedCodex } = await inquirer.prompt([{
-      type: 'list',
-      name: 'pickedCodex',
-      message: '选择 Codex 模型:',
-      choices: CODEX_MODELS.map(m => ({ name: m.name, value: m.id })),
-      default: CODEX_MODELS[0].id
-    }]);
-    codexModelId = pickedCodex;
-  }
-  if (!codexModelId) codexModelId = CODEX_MODELS[0]?.id || 'gpt-5.3-codex';
-  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: codexModelId };
-  const codexModelKey = `${codexProviderName}/${codexModelId}`;
-
+  // 写入 Codex provider（单一模式下仍写入，保证配置完整）
   config.models.providers[codexProviderName] = {
     baseUrl: codexBaseUrl,
     auth: DEFAULT_AUTH_MODE,
@@ -2739,27 +2759,34 @@ async function autoActivate(paths, args = {}) {
   config.agents.defaults.models[codexModelKey] = { alias: codexProviderName };
 
   // ---- 选择主力 ----
-  let primaryType = 'claude';
-  if (args.primary === 'claude') {
-    primaryType = 'claude';
-  } else if (args.primary === 'codex') {
-    primaryType = 'codex';
+  let primaryModelKey, fallbackModelKey;
+  if (isSingleMode) {
+    // 单一模式：直接用 Claude provider 作为 primary，不需要用户选
+    primaryModelKey = claudeModelKey;
+    fallbackModelKey = codexModelKey;
   } else {
-    const { picked } = await inquirer.prompt([{
-      type: 'list',
-      name: 'picked',
-      message: '选择主力工具（默认启动哪个）:',
-      choices: [
-        { name: 'Claude Code', value: 'claude' },
-        { name: 'Codex (GPT)', value: 'codex' }
-      ]
-    }]);
-    primaryType = picked;
+    let primaryType = 'claude';
+    if (args.primary === 'claude') {
+      primaryType = 'claude';
+    } else if (args.primary === 'codex') {
+      primaryType = 'codex';
+    } else {
+      const { picked } = await inquirer.prompt([{
+        type: 'list',
+        name: 'picked',
+        message: '选择主力工具（默认启动哪个）:',
+        choices: [
+          { name: 'Claude Code', value: 'claude' },
+          { name: 'Codex (GPT)', value: 'codex' }
+        ]
+      }]);
+      primaryType = picked;
+    }
+    primaryModelKey = primaryType === 'claude' ? claudeModelKey : codexModelKey;
+    fallbackModelKey = primaryType === 'claude' ? codexModelKey : claudeModelKey;
   }
 
-  const primaryModelKey = primaryType === 'claude' ? claudeModelKey : codexModelKey;
   config.agents.defaults.model.primary = primaryModelKey;
-  const fallbackModelKey = primaryType === 'claude' ? codexModelKey : claudeModelKey;
   config.agents.defaults.model.fallbacks = [fallbackModelKey];
 
   // ---- 写入配置 ----
@@ -2775,13 +2802,19 @@ async function autoActivate(paths, args = {}) {
   writeSpinner.succeed('配置写入完成');
 
   // ---- 输出结果 ----
-  const primaryTag = primaryType === 'claude' ? ' (主)' : '';
-  const codexTag = primaryType === 'codex' ? ' (主)' : '';
   console.log(chalk.green('\n✅ 一键激活完成！'));
-  console.log(chalk.cyan(`   Claude Code${primaryTag}: ${claudeBaseUrl}`));
-  console.log(chalk.gray(`     模型: ${claudeModel.name}`));
-  console.log(chalk.cyan(`   Codex${codexTag}: ${codexBaseUrl}`));
-  console.log(chalk.gray(`     模型: ${codexModel.name}`));
+  if (isSingleMode) {
+    console.log(chalk.cyan(`   节点: ${selectedEndpoint.url}`));
+    console.log(chalk.gray(`     模型: ${claudeModel.name}`));
+  } else {
+    const primaryType = primaryModelKey === claudeModelKey ? 'claude' : 'codex';
+    const primaryTag = primaryType === 'claude' ? ' (主)' : '';
+    const codexTag = primaryType === 'codex' ? ' (主)' : '';
+    console.log(chalk.cyan(`   Claude Code${primaryTag}: ${claudeBaseUrl}`));
+    console.log(chalk.gray(`     模型: ${claudeModel.name}`));
+    console.log(chalk.cyan(`   Codex${codexTag}: ${codexBaseUrl}`));
+    console.log(chalk.gray(`     模型: ${codexModel.name}`));
+  }
   console.log(chalk.gray('   API Key: 已设置'));
   if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
 
@@ -3665,8 +3698,7 @@ async function testConnection(paths, args = {}) {
       console.log(chalk.yellow('⚠️ 请先设置主模型'));
       return;
     }
-    // 优先选云翼/maxapi provider
-    const preferOrder = ['claude-yunyi', 'yunyi', 'heibai'];
+    const preferOrder = ['maxapi', 'heibai', 'claude-yunyi', 'yunyi', 'maxapi-codex'];
     const preferred = preferOrder.find(n => providerNames.includes(n));
     const firstP = preferred || providerNames.find(n => n.includes('claude')) || providerNames[0];
     const firstModels = providers[firstP]?.models || [];

package/package.json

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