yymaxapi 1.0.111 → 1.0.116

package/README.md

@@ -16,6 +16,7 @@ npx yymaxapi@latest
 npx yymaxapi@latest speed-test
 ```
 或在具体配置命令后追加 `--speed-test`，按测速结果手动选点。
+如需直接切换到其他云翼域名，可在预设/一键激活命令后追加 `--endpoint-url https://yunyi.cfd`，也兼容 `--base-url https://你的域名/claude` 这种写法。
 
 **方式二：一键配置 Claude**
 ```bash

package/bin/yymaxapi.js

@@ -73,19 +73,11 @@ if (!process.__yymaxapiWarningFilterInstalled && typeof process.emitWarning ===
 // ============ 预设 (由 build.js 从 provider config 生成) ============
 const DEFAULT_ENDPOINTS = [
   {
-    "name": "国内主节点",
-    "url": "https://yunyi.rdzhvip.com"
-  },
-  {
-    "name": "CF国外节点1",
+    "name": "默认主节点",
     "url": "https://yunyi.cfd"
   },
   {
-    "name": "CF国外节点2",
-    "url": "https://cdn1.yunyi.cfd"
-  },
-  {
-    "name": "CF国外节点3",
+    "name": "CF国外节点1",
     "url": "https://cdn2.yunyi.cfd"
   }
 ];
@@ -616,9 +608,73 @@ function shouldRunEndpointSpeedTest(args = {}) {
   return !!raw;
 }
 
+function getEndpointOverrideInput(args = {}) {
+  const raw = args['endpoint-url']
+    ?? args.endpointUrl
+    ?? args.endpoint
+    ?? args.domain
+    ?? args['base-url']
+    ?? args.baseUrl
+    ?? '';
+  return String(raw || '').trim();
+}
+
+function normalizeEndpointBaseUrl(baseUrl) {
+  let trimmed = String(baseUrl || '').trim();
+  if (!trimmed) return '';
+
+  trimmed = trimClaudeMessagesSuffix(trimmed);
+  trimmed = trimOpenAiEndpointSuffix(trimmed);
+  trimmed = stripManagedYunyiSuffix(trimmed);
+
+  try {
+    const urlObj = new URL(trimmed);
+    urlObj.search = '';
+    urlObj.hash = '';
+    const normalizedPath = urlObj.pathname.replace(/\/+$/, '');
+    return `${urlObj.origin}${normalizedPath && normalizedPath !== '/' ? normalizedPath : ''}`;
+  } catch {
+    return trimmed.replace(/\/+$/, '');
+  }
+}
+
+function resolveEndpointOverride(args = {}) {
+  const raw = getEndpointOverrideInput(args);
+  if (!raw) return null;
+
+  const normalized = normalizeEndpointBaseUrl(raw);
+  if (!normalized || !isValidUrl(normalized)) {
+    throw new Error('自定义节点 URL 无效，请使用 http(s):// 域名，支持填写根域名、/claude 或 /codex 地址');
+  }
+
+  return { name: '自定义节点', url: normalized };
+}
+
+async function promptCustomEndpointSelection(args = {}, options = {}) {
+  const defaultInput = getEndpointOverrideInput(args);
+  const promptMessage = options.customEndpointMessage || '请输入节点域名或 Base URL（支持根域名、/claude、/codex）:';
+  const { customEndpointInput } = await inquirer.prompt([{
+    type: 'input',
+    name: 'customEndpointInput',
+    message: promptMessage,
+    default: defaultInput,
+    validate: input => {
+      const normalized = normalizeEndpointBaseUrl(input);
+      return Boolean(normalized && isValidUrl(normalized)) || '请输入有效的 URL（http:// 或 https://）';
+    }
+  }]);
+
+  return {
+    name: options.customEndpointName || '自定义节点',
+    url: normalizeEndpointBaseUrl(customEndpointInput)
+  };
+}
+
 async function resolveEndpointSelection(args = {}, options = {}) {
   const defaultEndpoint = options.defaultEndpoint || ENDPOINTS[0];
   if (!defaultEndpoint) return null;
+  const directOverride = resolveEndpointOverride(args);
+  if (directOverride) return directOverride;
   if (!shouldRunEndpointSpeedTest(args)) return defaultEndpoint;
 
   const speedIntro = options.speedIntro || '📡 开始测速节点...\n';
@@ -636,6 +692,7 @@ async function resolveEndpointSelection(args = {}, options = {}) {
       message: chooseMessage,
       choices: [
         { name: `* 使用默认节点 (${defaultEndpoint.name})`, value: -1 },
+        { name: '* 手动输入节点域名', value: '__custom__' },
         new inquirer.Separator('  ---- 或按测速结果选择 ----'),
         ...sorted.map((endpoint, index) => ({
           name: `${endpoint.name} - ${endpoint.latency}ms (评分:${endpoint.score})`,
@@ -644,7 +701,9 @@ async function resolveEndpointSelection(args = {}, options = {}) {
       ]
     }]);
 
-    const selectedEndpoint = selectedIndex === -1 ? defaultEndpoint : sorted[selectedIndex];
+    const selectedEndpoint = selectedIndex === '__custom__'
+      ? await promptCustomEndpointSelection(args, options)
+      : (selectedIndex === -1 ? defaultEndpoint : sorted[selectedIndex]);
     if (speedResult.usedFallback) {
       console.log(chalk.yellow('\n⚠ 当前使用备用节点\n'));
     }
@@ -652,13 +711,21 @@ async function resolveEndpointSelection(args = {}, options = {}) {
   }
 
   console.log(chalk.red('\n⚠️  所有节点（含备用）均不可达'));
-  const { proceed } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'proceed',
-    message: proceedMessage,
-    default: false
+  const proceedChoiceLabel = options.proceedChoiceLabel || `${proceedMessage.replace(/[？?]\s*$/, '')} (${defaultEndpoint.name})`;
+  const { nextAction } = await inquirer.prompt([{
+    type: 'list',
+    name: 'nextAction',
+    message: '测速未找到可用节点，接下来怎么做？',
+    choices: [
+      { name: proceedChoiceLabel, value: 'default' },
+      { name: '手动输入节点域名', value: 'custom' },
+      { name: '取消', value: 'cancel' }
+    ]
   }]);
-  if (!proceed) {
+  if (nextAction === 'custom') {
+    return promptCustomEndpointSelection(args, options);
+  }
+  if (nextAction !== 'default') {
     console.log(chalk.gray('已取消'));
     return null;
   }
@@ -1046,12 +1113,12 @@ function writeClaudeCodeSettings(baseUrl, apiKey, modelId = getDefaultClaudeMode
     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;
     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_AUTH_TOKEN;
+    delete settings.env.ANTHROPIC_API_KEY;
     delete settings.availableModels;
     delete settings.env.ANTHROPIC_MODEL;
     if (!fs.existsSync(claudeDir)) fs.mkdirSync(claudeDir, { recursive: true });
@@ -2671,17 +2738,17 @@ function hasManagedYunyiFootprint(config) {
 }
 
 function inferManagedYunyiEndpointUrl(config, explicitEndpointUrl = '') {
-  const direct = stripManagedYunyiSuffix(explicitEndpointUrl);
-  if (direct && isLikelyYunyiBaseUrl(direct)) return direct;
+  const direct = normalizeEndpointBaseUrl(explicitEndpointUrl);
+  if (direct && isValidUrl(direct)) return direct;
 
   const providers = config?.models?.providers || {};
   for (const [name, provider] of Object.entries(providers)) {
     if (!isYunyiProviderEntry(name, provider, 'claude') && !isYunyiProviderEntry(name, provider, 'codex')) continue;
-    const candidate = stripManagedYunyiSuffix(provider?.baseUrl || provider?.base_url || '');
-    if (candidate && isLikelyYunyiBaseUrl(candidate)) return candidate;
+    const candidate = normalizeEndpointBaseUrl(provider?.baseUrl || provider?.base_url || '');
+    if (candidate && isValidUrl(candidate)) return candidate;
   }
 
-  return ENDPOINTS.find(item => isLikelyYunyiBaseUrl(item.url))?.url || ENDPOINTS[0]?.url || '';
+  return ENDPOINTS.find(item => isValidUrl(item.url))?.url || ENDPOINTS[0]?.url || '';
 }
 
 function inferManagedYunyiApiKey(config, explicitApiKey = '') {
@@ -3450,6 +3517,10 @@ function shellQuote(value) {
   return `"${str.replace(/(["\\$`])/g, '\\$1')}"`;
 }
 
+function getShellNullInputRedirect() {
+  return process.platform === 'win32' ? ' < NUL' : ' < /dev/null';
+}
+
 function escapeSingleQuotedShell(value) {
   return String(value || '').replace(/'/g, "'\\''");
 }
@@ -3931,18 +4002,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)
   };
 }
@@ -4022,6 +4092,41 @@ function buildReadableAgentError(text, fallback = '') {
   return (preferred || lines[0] || fallback).slice(0, 300);
 }
 
+function scoreCliErrorDetail(text) {
+  const lower = String(text || '').toLowerCase();
+  if (!lower) return -1;
+  let score = 0;
+  if ([
+    'forbidden',
+    'unauthorized',
+    'permission to access',
+    'authentication_error',
+    'invalid bearer token',
+    'invalid api key',
+    'all models failed',
+    'auth issue',
+    'auth_permanent',
+    'unexpected status',
+    'gateway agent failed'
+  ].some(pattern => lower.includes(pattern))) {
+    score += 5;
+  }
+  if ([
+    'failed',
+    'error:',
+    'missing environment variable'
+  ].some(pattern => lower.includes(pattern))) {
+    score += 2;
+  }
+  if ([
+    'reading additional input from stdin',
+    'reconnecting'
+  ].some(pattern => lower.includes(pattern))) {
+    score -= 2;
+  }
+  return score;
+}
+
 function looksLikeCliTestError(text) {
   const lower = cleanCliTestOutput(text).toLowerCase();
   if (!lower) return false;
@@ -4044,13 +4149,19 @@ function looksLikeCliTestError(text) {
 
 function runCliTestCandidates(name, commands, env) {
   let lastError = '命令执行失败';
+  let lastErrorScore = scoreCliErrorDetail(lastError);
   for (const command of commands) {
     const result = safeExec(command, { timeout: 120000, env, maxBuffer: 1024 * 1024 });
     const combined = cleanCliTestOutput(`${result.output || ''}\n${result.stdout || ''}\n${result.stderr || ''}`);
     if (result.ok && !looksLikeCliTestError(combined)) {
       return { name, status: 'success', detail: summarizeCliTestOutput(combined) || '连接成功' };
     }
-    lastError = summarizeCliTestOutput(combined) || result.error || lastError;
+    const candidateError = buildReadableAgentError(combined, result.error || lastError);
+    const candidateScore = scoreCliErrorDetail(candidateError);
+    if (candidateScore >= lastErrorScore) {
+      lastError = candidateError;
+      lastErrorScore = candidateScore;
+    }
   }
   return { name, status: 'failed', detail: lastError };
 }
@@ -4061,15 +4172,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 = {
@@ -4127,10 +4231,11 @@ function testCodexCliConnection() {
     NODE_TLS_REJECT_UNAUTHORIZED: '0',
     NODE_NO_WARNINGS: '1'
   };
+  const nullRedirect = getShellNullInputRedirect();
 
   return runCliTestCandidates('Codex CLI', [
-    `${shellQuote(cliBinary)} exec --skip-git-repo-check ${shellQuote('请只回复 OK')}`,
-    `${shellQuote(cliBinary)} exec ${shellQuote('请只回复 OK')}`
+    `${shellQuote(cliBinary)} exec --skip-git-repo-check ${shellQuote('请只回复 OK')}${nullRedirect}`,
+    `${shellQuote(cliBinary)} exec ${shellQuote('请只回复 OK')}${nullRedirect}`
   ], env);
 }
 
@@ -5186,7 +5291,11 @@ async function autoActivate(paths, args = {}) {
   const codexApiConfig = API_CONFIG.codex;
   const claudeProviderName = claudeApiConfig.providerName;
   const codexProviderName = codexApiConfig.providerName;
-  const selectedEndpoint = ENDPOINTS[0];
+  const selectedEndpoint = await resolveEndpointSelection(args, {
+    speedIntro: '📡 开始测速云翼节点...\n',
+    proceedMessage: '仍要写入默认节点配置吗？'
+  });
+  if (!selectedEndpoint) return;
 
   // ---- API Key ----
   const apiKeyEnvFallbacks = [
@@ -5443,7 +5552,8 @@ 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 + model + 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 已在运行，重新打开一个会话即可读取新配置'));
 

package/config/API/350/212/202/347/202/271/350/256/276/347/275/256.md

@@ -13,10 +13,8 @@
 ```json5
 {
   "endpoints": [
-    { "name": "国内主节点", "url": "https://yunyi.rdzhvip.com" },
-    { "name": "CF国外节点1", "url": "https://yunyi.cfd" },
-    { "name": "CF国外节点2", "url": "https://cdn1.yunyi.cfd" },
-    { "name": "CF国外节点3", "url": "https://cdn2.yunyi.cfd" }
+    { "name": "默认主节点", "url": "https://yunyi.cfd" },
+    { "name": "CF国外节点1", "url": "https://cdn2.yunyi.cfd" }
   ],
   "fallbackEndpoints": [
     { "name": "备用节点1", "url": "http://47.99.42.193" },
@@ -77,7 +75,7 @@ npx yymaxapi@latest
 ```json
 {
   "provider": "anthropic",
-  "base_url": "https://yunyi.rdzhvip.com/claude",
+  "base_url": "https://yunyi.cfd/claude",
   "api": "anthropic-messages",
   "api_key": "<你的云翼 API Key>",
   "model": {
@@ -92,7 +90,7 @@ npx yymaxapi@latest
 ```json
 {
   "provider": "openai",
-  "base_url": "https://yunyi.rdzhvip.com/codex",
+  "base_url": "https://yunyi.cfd/codex",
   "api": "openai-completions",
   "api_key": "<你的云翼 API Key>",
   "model": {
@@ -104,6 +102,7 @@ npx yymaxapi@latest
 
 **注意事项：**
 - `base_url` 不要加 `/v1`，平台会自动拼接路径
+- 如需临时切到其他云翼域名，可直接把域名部分替换掉；`yymaxapi` 也支持在预设/一键激活命令中传 `--endpoint-url https://你的域名` 或 `--base-url https://你的域名/claude`
 - Claude 可用模型：`claude-sonnet-4-6`、`claude-opus-4-7`、`claude-haiku-4-5`
 - GPT 可用模型：`gpt-5.4`
 - 已验证环境：腾讯云 OpenCloudOS，OpenClaw `2026.2.3-1`
@@ -122,7 +121,7 @@ npx yymaxapi@latest
 ```json
 {
   "provider": "anthropic",
-  "base_url": "https://yunyi.rdzhvip.com/claude",
+  "base_url": "https://yunyi.cfd/claude",
   "api": "anthropic-messages",
   "api_key": "<你的云翼 API Key>",
   "model": {
@@ -137,7 +136,7 @@ npx yymaxapi@latest
 ```json
 {
   "provider": "openai",
-  "base_url": "https://yunyi.rdzhvip.com/codex",
+  "base_url": "https://yunyi.cfd/codex",
   "api": "openai-completions",
   "api_key": "<你的云翼 API Key>",
   "model": {
@@ -153,10 +152,10 @@ npx yymaxapi@latest
 
 ```json
 {
-  "apiBaseUrl": "https://yunyi.rdzhvip.com/claude",
+  "apiBaseUrl": "https://yunyi.cfd/claude",
   "env": {
     "ANTHROPIC_API_KEY": "<你的云翼 API Key>",
-    "ANTHROPIC_BASE_URL": "https://yunyi.rdzhvip.com/claude"
+    "ANTHROPIC_BASE_URL": "https://yunyi.cfd/claude"
   }
 }
 ```

package/package.json

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