yymaxapi 1.0.67 → 1.0.69

package/bin/yymaxapi.js

@@ -676,7 +676,7 @@ function writeClaudeCodeSettings(baseUrl, apiKey) {
   }
 }
 
-function writeCodexConfig(baseUrl, apiKey) {
+function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
   const codexDir = path.join(os.homedir(), '.codex');
   if (!fs.existsSync(codexDir)) fs.mkdirSync(codexDir, { recursive: true });
 
@@ -698,7 +698,7 @@ function writeCodexConfig(baseUrl, apiKey) {
     }
     const section = [
       marker,
-      `model = "gpt-5.4"`,
+      `model = "${modelId}"`,
       `model_provider = "${providerKey}"`,
       ``,
       `[model_providers.${providerKey}]`,
@@ -726,6 +726,8 @@ function writeCodexConfig(baseUrl, apiKey) {
 
 function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
   const home = os.homedir();
+  const claudeUrl = claudeBaseUrl.replace(/\/+$/, '');
+  const codexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
 
   // ---- 1. opencode.json (CLI + 桌面版) ----
   const configDir = process.platform === 'win32'
@@ -738,21 +740,42 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
     if (fs.existsSync(configPath)) {
       try { existing = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { existing = {}; }
     }
-    const cleanClaudeUrl = claudeBaseUrl.replace(/\/+$/, '');
-    const cleanCodexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
     if (!existing.provider) existing.provider = {};
-    existing.provider.anthropic = {
-      options: { apiKey: apiKey, baseURL: cleanClaudeUrl }
+
+    // Claude provider (@ai-sdk/anthropic)
+    existing.provider['yunyi-claude'] = {
+      name: '云翼 Claude',
+      npm: '@ai-sdk/anthropic',
+      models: { 'claude-sonnet-4-6': { name: 'Claude Sonnet 4.6' } },
+      options: { apiKey, baseURL: `${claudeUrl}/v1` }
     };
-    if (cleanCodexUrl) {
-      existing.provider.openai = {
-        options: { apiKey: apiKey, baseURL: cleanCodexUrl }
+
+    // Codex provider (@ai-sdk/openai)
+    if (codexUrl) {
+      existing.provider['yunyi-codex'] = {
+        name: '云翼 Codex',
+        npm: '@ai-sdk/openai',
+        models: { 'gpt-5.4': { name: 'GPT 5.4' } },
+        options: { apiKey, baseURL: codexUrl }
       };
     }
+
+    // 清理旧版写入的通用 provider 名（之前的 bug）
+    if (existing.provider.anthropic && existing.provider.anthropic.options
+      && existing.provider.anthropic.options.baseURL && existing.provider.anthropic.options.baseURL.includes('yunyi')) {
+      delete existing.provider.anthropic;
+    }
+
+    // 设置默认模型
     const rawModelId = modelId || 'claude-sonnet-4-6';
-    existing.model = rawModelId.startsWith('anthropic/') || rawModelId.startsWith('openai/')
-      ? rawModelId
-      : `anthropic/${rawModelId}`;
+    existing.model = `yunyi-claude/${rawModelId}`;
+
+    // 从 disabled_providers 中移除我们的 provider
+    if (Array.isArray(existing.disabled_providers)) {
+      existing.disabled_providers = existing.disabled_providers.filter(p => p !== 'yunyi-claude' && p !== 'yunyi-codex');
+      if (existing.disabled_providers.length === 0) delete existing.disabled_providers;
+    }
+
     if (!existing.$schema) existing.$schema = 'https://opencode.ai/config.json';
     fs.writeFileSync(configPath, JSON.stringify(existing, null, 2), 'utf8');
   } catch { /* 非关键，静默失败 */ }
@@ -763,49 +786,74 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
   try {
     if (!fs.existsSync(codexDir)) fs.mkdirSync(codexDir, { recursive: true });
 
-    const claudeUrl = claudeBaseUrl.replace(/\/+$/, '');
-    const codexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
-
-    const marker = '# >>> yunyi opencode >>>';
-    const markerEnd = '# <<< yunyi opencode <<<';
-    let existing = '';
+    let content = '';
     if (fs.existsSync(codexConfigPath)) {
-      existing = fs.readFileSync(codexConfigPath, 'utf8');
-      const re = new RegExp(`${marker.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')}[\\s\\S]*?${markerEnd.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')}\\n?`, 'g');
-      existing = existing.replace(re, '').trim();
+      content = fs.readFileSync(codexConfigPath, 'utf8');
     }
 
-    const section = [
-      marker,
-      `model = "yunyi-claude/claude-sonnet-4-6"`,
-      `model_provider = "yunyi-claude"`,
-      `model_context_window = 1000000`,
-      `model_auto_compact_token_limit = 900000`,
-      `model_reasoning_effort = "xhigh"`,
+    // 移除旧标记块（yunyi opencode / maxapi codex）
+    content = content.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
+    content = content.replace(/# >>> maxapi codex >>>[\s\S]*?# <<< maxapi codex <<<\n?/g, '');
+
+    // 移除旧的 yunyi model_providers 段落（包括 yunyi-cli 写入的 [model_providers.yunyi]）
+    content = content.replace(/\[model_providers\.yunyi[^\]]*\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
+
+    // 替换或插入顶层设置
+    const topSettings = {
+      model_provider: '"yunyi-claude"',
+      model: '"claude-sonnet-4-6"',
+      model_context_window: '1000000',
+      model_auto_compact_token_limit: '900000',
+      model_reasoning_effort: '"xhigh"',
+      disable_response_storage: 'true',
+    };
+    for (const [key, value] of Object.entries(topSettings)) {
+      const re = new RegExp(`^${key}\\s*=\\s*[^\\n]*`, 'm');
+      if (re.test(content)) {
+        content = content.replace(re, `${key} = ${value}`);
+      } else {
+        // 插入到第一个 section 之前
+        const firstSection = content.search(/^\[/m);
+        if (firstSection > 0) {
+          content = content.slice(0, firstSection) + `${key} = ${value}\n` + content.slice(firstSection);
+        } else if (firstSection === 0) {
+          content = `${key} = ${value}\n` + content;
+        } else {
+          content += `${key} = ${value}\n`;
+        }
+      }
+    }
+
+    // 清理多余空行
+    content = content.replace(/\n{3,}/g, '\n\n').trim();
+
+    // 追加 model_providers 段落
+    const providers = [
       '',
-      `[model_providers.yunyi-claude]`,
-      `name = "云翼 Claude"`,
+      '# >>> yunyi opencode >>>',
+      '[model_providers.yunyi-claude]',
+      'name = "云翼 Claude"',
       `base_url = "${claudeUrl}"`,
-      `wire_api = "anthropic"`,
-      `env_key = "ANTHROPIC_API_KEY"`,
+      'wire_api = "anthropic"',
+      `experimental_bearer_token = "${apiKey}"`,
     ];
-
     if (codexUrl) {
-      section.push(
+      providers.push(
         '',
-        `[model_providers.yunyi-codex]`,
-        `name = "云翼 Codex"`,
+        '[model_providers.yunyi-codex]',
+        'name = "云翼 Codex"',
         `base_url = "${codexUrl}"`,
-        `wire_api = "responses"`,
-        `requires_openai_auth = true`,
-        `env_key = "OPENAI_API_KEY"`,
+        'wire_api = "responses"',
+        `experimental_bearer_token = "${apiKey}"`,
+        'requires_openai_auth = true',
       );
     }
+    providers.push('# <<< yunyi opencode <<<');
+    content += '\n\n' + providers.join('\n') + '\n';
 
-    section.push(markerEnd);
-    fs.writeFileSync(codexConfigPath, existing ? `${existing}\n\n${section.join('\n')}\n` : `${section.join('\n')}\n`, 'utf8');
+    fs.writeFileSync(codexConfigPath, content, 'utf8');
 
-    // ~/.codex/auth.json
+    // ---- 3. ~/.codex/auth.json ----
     const authPath = path.join(codexDir, 'auth.json');
     let auth = {};
     if (fs.existsSync(authPath)) {
@@ -3018,15 +3066,104 @@ async function activateOpencode(paths, args = {}) {
   writeSpinner.succeed('Opencode 配置写入完成');
 
   console.log(chalk.green('\n✅ Opencode 配置完成！'));
-  console.log(chalk.cyan(`   Claude: ${claudeBaseUrl}`));
-  console.log(chalk.cyan(`   Codex:  ${codexBaseUrl}`));
-  console.log(chalk.gray(`   默认模型: anthropic/${modelId}`));
+  console.log(chalk.cyan(`   Claude: ${claudeBaseUrl}  →  claude-sonnet-4-6`));
+  console.log(chalk.cyan(`   Codex:  ${codexBaseUrl}  →  gpt-5.4`));
+  console.log(chalk.gray(`   默认模型: yunyi-claude/${modelId}`));
   console.log(chalk.gray('   API Key: 已设置'));
   console.log(chalk.gray('\n   已写入:'));
   console.log(chalk.gray('   • ~/.config/opencode/opencode.json (CLI + 桌面版)'));
   console.log(chalk.gray('   • ~/.codex/config.toml (model_providers)'));
   console.log(chalk.gray('   • ~/.codex/auth.json (API Keys)'));
-  console.log(chalk.yellow('\n   切换模型: 在 opencode 内使用 /model 命令切换 claude/gpt'));
+  console.log(chalk.yellow('\n   切换模型: 在 opencode 内使用 /model 命令切换 yunyi-claude / yunyi-codex'));
+}
+
+// ============ 单独配置 Codex CLI ============
+async function activateCodex(paths, args = {}) {
+  console.log(chalk.cyan.bold('\n🔧 配置 Codex CLI\n'));
+
+  // ---- 选模型 ----
+  let modelId = CODEX_MODELS[0]?.id || 'gpt-5.4';
+  if (CODEX_MODELS.length > 1) {
+    const { selected } = await inquirer.prompt([{
+      type: 'list',
+      name: 'selected',
+      message: '选择模型:',
+      choices: CODEX_MODELS.map(m => ({ name: m.name, value: m.id }))
+    }]);
+    modelId = selected;
+  }
+  const modelConfig = CODEX_MODELS.find(m => m.id === modelId) || { id: modelId, name: modelId };
+
+  // ---- 测速选节点 ----
+  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];
+    } 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; }
+    }
+  }
+
+  // ---- API Key ----
+  const directKey = (args['api-key'] || args.apiKey || args.key || '').toString().trim();
+  let apiKey;
+  if (directKey) {
+    apiKey = directKey;
+  } else {
+    const envKey = process.env.OPENAI_API_KEY || '';
+    apiKey = await promptApiKey('请输入 API Key:', envKey);
+  }
+  if (!apiKey) { console.log(chalk.gray('已取消')); return; }
+
+  // ---- 验证 ----
+  console.log('');
+  const validation = await validateApiKey(selectedEndpoint.url, apiKey);
+  if (!validation.valid) {
+    const { continueAnyway } = await inquirer.prompt([{
+      type: 'confirm', name: 'continueAnyway',
+      message: 'API Key 验证失败，是否仍然继续写入配置？', default: false
+    }]);
+    if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
+  }
+
+  // ---- 写入配置 ----
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
+  const writeSpinner = ora({ text: '正在写入 Codex 配置...', spinner: 'dots' }).start();
+  writeCodexConfig(codexBaseUrl, apiKey, modelId);
+  writeSpinner.succeed('Codex 配置写入完成');
+
+  console.log(chalk.green('\n✅ Codex CLI 配置完成！'));
+  console.log(chalk.cyan(`   Base URL: ${codexBaseUrl}`));
+  console.log(chalk.gray(`   模型: ${modelConfig.name} (${modelId})`));
+  console.log(chalk.gray('   API Key: 已设置'));
+  console.log(chalk.gray('\n   已写入:'));
+  console.log(chalk.gray('   • ~/.codex/config.toml (model + model_providers)'));
+  console.log(chalk.gray('   • ~/.codex/auth.json (OPENAI_API_KEY)'));
+  console.log(chalk.yellow('\n   提示: 请重新打开终端使配置生效'));
 }
 
 // ============ yycode 精简模式（零交互一键配置） ============
@@ -3248,6 +3385,7 @@ async function main() {
         { name: '  配置 OpenClaw（Claude + Codex）', value: 'auto_activate' },
         { name: '  配置 Claude Code', value: 'activate_claude_code' },
         { name: '  配置 Opencode', value: 'activate_opencode' },
+        { name: '  配置 Codex CLI', value: 'activate_codex' },
         new inquirer.Separator('  -- 工具 --'),
         { name: '  切换模型', value: 'switch_model' },
         { name: `  权限管理${getToolsProfileTag(paths)}`, value: 'tools_profile' },
@@ -3292,6 +3430,9 @@ async function main() {
         case 'activate_opencode':
           await activateOpencode(paths);
           break;
+        case 'activate_codex':
+          await activateCodex(paths);
+          break;
       }
     } catch (error) {
       console.log(chalk.red(`\n错误: ${error.message}\n`));

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

@@ -107,3 +107,62 @@ npx yymaxapi@latest
 - GPT 可用模型：`gpt-5.4`
 - 已验证环境：腾讯云 OpenCloudOS，OpenClaw `2026.2.3-1`
 - 参考文档：https://cloud.tencent.com/developer/article/2624003
+
+### 腾讯云 + Claude Code CLI 一起写入（同一 Key）
+
+云翼一张卡可同时用于 Claude 与 GPT。按下面两步做即可同时生效。
+
+**1. 腾讯云 OpenClaw 自定义模型（添加两条）**
+
+在腾讯云 OpenClaw 的「自定义模型」里添加**两条**，`api_key` 用同一云翼 Key 即可。
+
+第一条 — Claude Sonnet 4.6：
+
+```json
+{
+  "provider": "anthropic",
+  "base_url": "https://yunyi.rdzhvip.com/claude",
+  "api": "anthropic-messages",
+  "api_key": "<你的云翼 API Key>",
+  "model": {
+    "id": "claude-sonnet-4-6",
+    "name": "Claude Sonnet 4.6"
+  }
+}
+```
+
+第二条 — GPT 5.4：
+
+```json
+{
+  "provider": "openai",
+  "base_url": "https://yunyi.rdzhvip.com/codex",
+  "api": "openai-responses",
+  "api_key": "<你的云翼 API Key>",
+  "model": {
+    "id": "gpt-5.4",
+    "name": "GPT 5.4"
+  }
+}
+```
+
+**2. Claude Code CLI（本机终端）**
+
+在终端执行一次，或写入 `~/.zshrc` / `~/.bashrc` 后 `source`，Claude Code 即走云翼 Claude：
+
+```bash
+export ANTHROPIC_BASE_URL="https://yunyi.rdzhvip.com/claude"
+export ANTHROPIC_AUTH_TOKEN="<你的云翼 API Key>"
+# 若遇证书报错可加：
+export NODE_TLS_REJECT_UNAUTHORIZED=0
+```
+
+Windows（PowerShell，用户级环境变量）：
+
+```powershell
+[Environment]::SetEnvironmentVariable('ANTHROPIC_BASE_URL', 'https://yunyi.rdzhvip.com/claude', 'User')
+[Environment]::SetEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', '<你的云翼 API Key>', 'User')
+[Environment]::SetEnvironmentVariable('NODE_TLS_REJECT_UNAUTHORIZED', '0', 'User')
+```
+
+完成后：腾讯云 OpenClaw 里可选 Claude 或 GPT；本机 Claude Code CLI 使用同一 Key 走云翼 Claude。

package/package.json

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