yymaxapi 1.0.51 → 1.0.53

package/bin/yymaxapi.js

@@ -88,36 +88,24 @@ const FALLBACK_ENDPOINTS = [
 ];
 
 const DEFAULT_CLAUDE_MODELS = [
-  {
-    "id": "claude-opus-4-6",
-    "name": "Claude Opus 4.6"
-  },
-  {
-    "id": "claude-opus-4-6-Thinking",
-    "name": "Claude Opus 4.6 Thinking"
-  },
   {
     "id": "claude-sonnet-4-6",
     "name": "Claude Sonnet 4.6"
   },
   {
-    "id": "claude-sonnet-4-6-Thinking",
-    "name": "Claude Sonnet 4.6 Thinking"
-  },
-  {
-    "id": "claude-haiku-4-5",
-    "name": "Claude Haiku 4.5"
+    "id": "claude-opus-4-6",
+    "name": "Claude Opus 4.6 (待恢复)"
   }
 ];
 
 const DEFAULT_CODEX_MODELS = [
   {
-    "id": "gpt-5.3-codex",
-    "name": "GPT 5.3 Codex"
+    "id": "gpt-5.4",
+    "name": "GPT 5.4"
   },
   {
-    "id": "gpt-5.2",
-    "name": "GPT 5.2"
+    "id": "gpt-5.4-pro",
+    "name": "GPT 5.4 Pro (待支持)"
   }
 ];
 
@@ -132,8 +120,8 @@ const DEFAULT_API_CONFIG = {
   "codex": {
     "urlSuffix": "/codex",
     "api": "openai-responses",
-    "contextWindow": 128000,
-    "maxTokens": 32768,
+    "contextWindow": 1050000,
+    "maxTokens": 128000,
     "providerName": "yunyi"
   }
 };
@@ -702,7 +690,7 @@ function writeCodexConfig(baseUrl, apiKey) {
     }
     const section = [
       marker,
-      `model = "gpt-5.3-codex"`,
+      `model = "gpt-5.4"`,
       `model_provider = "${providerKey}"`,
       ``,
       `[model_providers.${providerKey}]`,
@@ -1182,17 +1170,11 @@ function coerceModelsRecord(value) {
   return record;
 }
 
-const OPENCLAW_KNOWN_ROOT_KEYS = new Set([
-  'models', 'agents', 'auth', 'gateway', 'tools',
-  'channels', 'mcpServers', 'globalShortcut', 'customModes',
-  'permissions', 'proxy', 'env', 'hooks', 'storage',
-]);
+const OPENCLAW_INVALID_ROOT_KEYS = ['model'];
 
 function sanitizeRootKeys(config) {
-  for (const key of Object.keys(config)) {
-    if (!OPENCLAW_KNOWN_ROOT_KEYS.has(key)) {
-      delete config[key];
-    }
+  for (const key of OPENCLAW_INVALID_ROOT_KEYS) {
+    if (key in config) delete config[key];
   }
 }
 
@@ -2604,50 +2586,13 @@ async function presetCodex(paths, args = {}) {
 
 // ============ 一键激活（同时配置 Claude Code + Codex） ============
 async function autoActivate(paths, args = {}) {
-  console.log(chalk.cyan.bold('\n🚀 一键激活（同时配置 Claude Code + Codex）\n'));
+  console.log(chalk.cyan.bold('\n🚀 一键激活\n'));
 
   const claudeApiConfig = API_CONFIG.claude;
   const codexApiConfig = API_CONFIG.codex;
   const claudeProviderName = claudeApiConfig.providerName;
   const codexProviderName = codexApiConfig.providerName;
-
-  // ---- 测速选节点 ----
-  const shouldTest = !(args['no-test'] || args.noTest);
-  let selectedEndpoint = ENDPOINTS[0];
-
-  if (shouldTest) {
-    console.log(chalk.cyan('📡 开始测速节点...\n'));
-    const speedResult = await testAllEndpoints(ENDPOINTS, { autoFallback: true });
-
-    const sorted = speedResult.ranked || [];
-    if (sorted.length > 0) {
-      const defaultEp = ENDPOINTS[0];
-      const { selectedIndex } = await inquirer.prompt([{
-        type: 'list',
-        name: 'selectedIndex',
-        message: '选择节点:',
-        choices: [
-          { name: `* 使用默认节点 (${defaultEp.name})`, value: -1 },
-          new inquirer.Separator('  ---- 或按测速结果选择 ----'),
-          ...sorted.map((e, i) => ({
-            name: `${e.name} - ${e.latency}ms (评分:${e.score})`,
-            value: i
-          }))
-        ]
-      }]);
-      selectedEndpoint = selectedIndex === -1 ? defaultEp : sorted[selectedIndex];
-      if (speedResult.usedFallback) {
-        console.log(chalk.yellow(`\n⚠ 当前使用备用节点\n`));
-      }
-    } else {
-      console.log(chalk.red('\n⚠️  所有节点（含备用）均不可达'));
-      const { proceed } = await inquirer.prompt([{
-        type: 'confirm', name: 'proceed',
-        message: '仍要写入默认节点配置吗？', default: false
-      }]);
-      if (!proceed) { console.log(chalk.gray('已取消')); return; }
-    }
-  }
+  const selectedEndpoint = ENDPOINTS[0];
 
   // ---- API Key ----
   const apiKeyEnvFallbacks = [
@@ -2663,7 +2608,7 @@ async function autoActivate(paths, args = {}) {
     apiKey = directKey;
   } else {
     const envKey = getApiKeyFromArgs({}, apiKeyEnvFallbacks);
-    apiKey = await promptApiKey('请输入 API Key（同时用于 Claude Code 和 Codex）:', envKey || '');
+    apiKey = await promptApiKey('请输入 API Key:', envKey || '');
   }
   if (!apiKey) { console.log(chalk.gray('已取消')); return; }
 
@@ -2678,51 +2623,67 @@ async function autoActivate(paths, args = {}) {
     if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
   }
 
-  // ---- 构建配置 ----
-  const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
-
-  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
-  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
-
-  // 检测单一模式：Claude 和 Codex 只有一个模型且 id 相同（如 maxapi 的 heibai）
+  // ---- 选模型（Claude + GPT 合并展示） ----
   const isSingleMode = CLAUDE_MODELS.length === 1 && CODEX_MODELS.length === 1
     && CLAUDE_MODELS[0].id === CODEX_MODELS[0].id;
 
-  let claudeModelId, codexModelId;
+  let selectedModelId;
+  let selectedType; // 'claude' or 'codex'
 
   if (isSingleMode) {
-    // 单一模式：固定模型，不选择，不分 Claude/Codex
-    claudeModelId = CLAUDE_MODELS[0].id;
-    codexModelId = CODEX_MODELS[0].id;
+    selectedModelId = CLAUDE_MODELS[0].id;
+    selectedType = 'claude';
   } else {
-    // 多模型模式：让用户选模型
-    claudeModelId = (args['claude-model'] || '').toString().trim();
-    if (!claudeModelId && CLAUDE_MODELS.length > 1) {
+    const modelArg = (args.model || args['claude-model'] || args['codex-model'] || '').toString().trim();
+    if (modelArg) {
+      const inClaude = CLAUDE_MODELS.find(m => m.id === modelArg);
+      const inCodex = CODEX_MODELS.find(m => m.id === modelArg);
+      selectedModelId = modelArg;
+      selectedType = inClaude ? 'claude' : inCodex ? 'codex' : 'claude';
+    } else {
+      const allChoices = [];
+      if (CLAUDE_MODELS.length > 0) {
+        allChoices.push(new inquirer.Separator('  -- Claude --'));
+        for (const m of CLAUDE_MODELS) {
+          allChoices.push({ name: m.name, value: `claude:${m.id}` });
+        }
+      }
+      if (CODEX_MODELS.length > 0) {
+        allChoices.push(new inquirer.Separator('  -- GPT --'));
+        for (const m of CODEX_MODELS) {
+          allChoices.push({ name: m.name, value: `codex:${m.id}` });
+        }
+      }
+
       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
+        message: '选择模型:',
+        choices: allChoices,
+        default: `claude:${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;
+      const [pickedType, pickedId] = picked.split(':');
+      selectedType = pickedType;
+      selectedModelId = pickedId;
     }
-    if (!codexModelId) codexModelId = CODEX_MODELS[0]?.id || 'gpt-5.3-codex';
   }
 
+  // ---- 构建配置 ----
+  const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+
+  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
+
+  // 根据用户选择确定主模型
+  const isClaudePrimary = selectedType === 'claude';
+  const claudeModelId = isClaudePrimary
+    ? selectedModelId
+    : CLAUDE_MODELS[0]?.id || 'claude-sonnet-4-6';
+  const codexModelId = !isClaudePrimary
+    ? selectedModelId
+    : CODEX_MODELS[0]?.id || 'gpt-5.4';
+
   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}`;
@@ -2746,7 +2707,7 @@ async function autoActivate(paths, args = {}) {
   config.auth.profiles[`${claudeProviderName}:default`] = { provider: claudeProviderName, mode: 'api_key' };
   config.agents.defaults.models[claudeModelKey] = { alias: claudeProviderName };
 
-  // 写入 Codex provider（单一模式下仍写入，保证配置完整）
+  // 写入 Codex provider
   config.models.providers[codexProviderName] = {
     baseUrl: codexBaseUrl,
     auth: DEFAULT_AUTH_MODE,
@@ -2764,34 +2725,9 @@ async function autoActivate(paths, args = {}) {
   config.auth.profiles[`${codexProviderName}:default`] = { provider: codexProviderName, mode: 'api_key' };
   config.agents.defaults.models[codexModelKey] = { alias: codexProviderName };
 
-  // ---- 选择主力 ----
-  let primaryModelKey, fallbackModelKey;
-  if (isSingleMode) {
-    // 单一模式：直接用 Claude provider 作为 primary，不需要用户选
-    primaryModelKey = claudeModelKey;
-    fallbackModelKey = codexModelKey;
-  } else {
-    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 = isClaudePrimary ? claudeModelKey : codexModelKey;
+  const fallbackModelKey = isClaudePrimary ? codexModelKey : claudeModelKey;
   config.agents.defaults.model.primary = primaryModelKey;
   config.agents.defaults.model.fallbacks = [fallbackModelKey];
 
@@ -2808,19 +2744,11 @@ async function autoActivate(paths, args = {}) {
   writeSpinner.succeed('配置写入完成');
 
   // ---- 输出结果 ----
-  console.log(chalk.green('\n✅ 一键激活完成！'));
-  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}`));
-  }
+  const primaryLabel = isClaudePrimary ? 'Claude' : 'GPT';
+  const selectedModel = isClaudePrimary ? claudeModel : codexModel;
+  console.log(chalk.green('\n✅ 配置完成！'));
+  console.log(chalk.cyan(`   模型: ${selectedModel.name} (${primaryLabel})`));
+  console.log(chalk.gray(`   节点: ${selectedEndpoint.url} (${selectedEndpoint.name})`));
   console.log(chalk.gray('   API Key: 已设置'));
   if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
 
@@ -2830,20 +2758,6 @@ async function autoActivate(paths, args = {}) {
     console.log(chalk.green(`\n🌐 Web Dashboard:`));
     console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/?token=${gwToken}`));
   }
-
-  // ---- 测试连接 ----
-  const shouldTestGateway = args.test !== undefined
-    ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
-    : await inquirer.prompt([{
-      type: 'confirm',
-      name: 'testGateway',
-      message: '是否立即通过 OpenClaw Gateway 测试？',
-      default: true
-    }]).then(r => r.testGateway);
-
-  if (shouldTestGateway) {
-    await testConnection(paths, args);
-  }
 }
 
 // ============ 单独配置 Claude Code CLI ============
@@ -3118,8 +3032,8 @@ async function yycodeQuickSetup(paths) {
 
   // Codex 侧
   const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
-  const codexModelId = 'gpt-5.3-codex';
-  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: 'GPT 5.3 Codex' };
+  const codexModelId = CODEX_MODELS[0]?.id || 'gpt-5.4';
+  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: 'GPT 5.4' };
   const codexModelKey = `${codexProviderName}/${codexModelId}`;
 
   config.models.providers[codexProviderName] = {
@@ -4503,7 +4417,7 @@ function testCodexApi(baseUrl, apiKey, model) {
     const protocol = urlObj.protocol === 'https:' ? https : http;
 
     const postData = JSON.stringify({
-      model: model || 'gpt-5.2',
+      model: model || 'gpt-5.4',
       input: '你是哪个模型？请用一句话回答你的模型名称和版本。'
     });
 

package/package.json

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