yymaxapi 1.0.110 → 1.0.112

package/bin/yymaxapi.js

@@ -1039,11 +1039,19 @@ function writeClaudeCodeSettings(baseUrl, apiKey, modelId = getDefaultClaudeMode
       try { settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch { settings = {}; }
     }
     const normalizedBaseUrl = baseUrl.replace(/\/+$/, '');
+    const normalizedModelId = String(modelId || getDefaultClaudeModel().id).trim() || getDefaultClaudeModel().id;
+    const pinnedOpusModel = (CLAUDE_MODELS.find(model => /opus/i.test(model.id)) || {}).id || 'claude-opus-4-7';
+    const pinnedSonnetModel = (CLAUDE_MODELS.find(model => /sonnet/i.test(model.id)) || {}).id || 'claude-sonnet-4-6';
+    const pinnedHaikuModel = (CLAUDE_MODELS.find(model => /haiku/i.test(model.id)) || {}).id || 'claude-haiku-4-5';
     settings.apiBaseUrl = normalizedBaseUrl;
+    settings.model = normalizedModelId;
     if (!settings.env) settings.env = {};
-    settings.env.ANTHROPIC_API_KEY = apiKey;
+    settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
     settings.env.ANTHROPIC_BASE_URL = normalizedBaseUrl;
-    delete settings.env.ANTHROPIC_AUTH_TOKEN;
+    settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = pinnedOpusModel;
+    settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL = pinnedSonnetModel;
+    settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = pinnedHaikuModel;
+    delete settings.env.ANTHROPIC_API_KEY;
     delete settings.availableModels;
     delete settings.env.ANTHROPIC_MODEL;
     if (!fs.existsSync(claudeDir)) fs.mkdirSync(claudeDir, { recursive: true });
@@ -3923,18 +3931,17 @@ function readClaudeCodeCliConfig() {
   const settings = readJsonIfExists(settingsPath) || {};
   const settingsEnv = settings.env && typeof settings.env === 'object' ? settings.env : {};
   const settingsApiKey = String(settingsEnv.ANTHROPIC_API_KEY || '').trim();
-  const settingsLegacyAuthToken = String(settingsEnv.ANTHROPIC_AUTH_TOKEN || '').trim();
+  const settingsAuthToken = String(settingsEnv.ANTHROPIC_AUTH_TOKEN || '').trim();
   const settingsBaseUrl = String(settingsEnv.ANTHROPIC_BASE_URL || settings.apiBaseUrl || '').trim();
   return {
     settingsPath,
     modelId: settings.model || settingsEnv.ANTHROPIC_MODEL || process.env.ANTHROPIC_MODEL || getDefaultClaudeModel().id,
     baseUrl: settingsBaseUrl || process.env.ANTHROPIC_BASE_URL || '',
-    apiKey: settingsApiKey || settingsLegacyAuthToken || process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN || process.env.CLAUDE_API_KEY || '',
+    apiKey: settingsAuthToken || settingsApiKey || process.env.ANTHROPIC_AUTH_TOKEN || process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY || '',
     settingsBaseUrl,
     settingsApiKey,
-    settingsLegacyAuthToken,
-    hasLegacyAuthTokenInSettings: !!settingsLegacyAuthToken,
-    usesLegacyAuthTokenOnly: !settingsApiKey && !!settingsLegacyAuthToken,
+    settingsAuthToken,
+    settingsAuthMode: settingsAuthToken ? 'auth_token' : (settingsApiKey ? 'api_key' : ''),
     configured: fs.existsSync(settingsPath)
   };
 }
@@ -4053,15 +4060,8 @@ function testClaudeCodeCliConnection() {
 
   const config = readClaudeCodeCliConfig();
   if (!config.configured) return { name: 'Claude Code CLI', status: 'skipped', detail: '未检测到 ~/.claude/settings.json' };
-  if (config.usesLegacyAuthTokenOnly) {
-    return {
-      name: 'Claude Code CLI',
-      status: 'failed',
-      detail: '检测到旧版 Claude Code 配置字段 ANTHROPIC_AUTH_TOKEN，请重新运行 yymaxapi 以改写为 ANTHROPIC_API_KEY'
-    };
-  }
-  if (!config.settingsBaseUrl || !config.settingsApiKey) {
-    return { name: 'Claude Code CLI', status: 'failed', detail: 'Claude Code 配置缺少 settings.json 中的 Base URL 或 API Key' };
+  if (!config.settingsBaseUrl || !config.apiKey) {
+    return { name: 'Claude Code CLI', status: 'failed', detail: 'Claude Code 配置缺少 settings.json 中的 Base URL 或鉴权字段' };
   }
 
   const env = {
@@ -5435,7 +5435,9 @@ async function activateClaudeCode(paths, args = {}) {
   console.log(chalk.gray('   API Key: 已设置'));
   console.log(chalk.gray('\n   已写入:'));
   console.log(chalk.gray('   • ~/.claude/settings.json'));
-  console.log(chalk.gray('   • 最小字段: apiBaseUrl + env.ANTHROPIC_API_KEY + env.ANTHROPIC_BASE_URL'));
+  console.log(chalk.gray('   • 关键字段: apiBaseUrl + model + env.ANTHROPIC_AUTH_TOKEN + env.ANTHROPIC_BASE_URL'));
+  console.log(chalk.gray('   • Claude Code 走 Bearer Token 网关鉴权，避免落入官方登录 / 批准自定义 API Key 流程'));
+  console.log(chalk.gray('   • 已钉住 Claude alias 默认版本，避免第三方中转回落到官方旧别名'));
   console.log(chalk.yellow('\n   提示: 如果 Claude Code 已在运行，重新打开一个会话即可读取新配置'));
 
   if (await confirmImmediateTest(args, '是否立即测试 Claude Code CLI 连接？')) {

package/package.json

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