yymaxapi 1.0.66 → 1.0.67

package/bin/yymaxapi.js

@@ -726,6 +726,8 @@ function writeCodexConfig(baseUrl, apiKey) {
 
 function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
   const home = os.homedir();
+
+  // ---- 1. opencode.json (CLI + 桌面版) ----
   const configDir = process.platform === 'win32'
     ? path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'opencode')
     : path.join(home, '.config', 'opencode');
@@ -737,20 +739,14 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
       try { existing = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { existing = {}; }
     }
     const cleanClaudeUrl = claudeBaseUrl.replace(/\/+$/, '');
-    let cleanCodexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
+    const cleanCodexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
     if (!existing.provider) existing.provider = {};
     existing.provider.anthropic = {
-      options: {
-        apiKey: apiKey,
-        baseURL: cleanClaudeUrl
-      }
+      options: { apiKey: apiKey, baseURL: cleanClaudeUrl }
     };
     if (cleanCodexUrl) {
       existing.provider.openai = {
-        options: {
-          apiKey: apiKey,
-          baseURL: cleanCodexUrl
-        }
+        options: { apiKey: apiKey, baseURL: cleanCodexUrl }
       };
     }
     const rawModelId = modelId || 'claude-sonnet-4-6';
@@ -759,10 +755,68 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
       : `anthropic/${rawModelId}`;
     if (!existing.$schema) existing.$schema = 'https://opencode.ai/config.json';
     fs.writeFileSync(configPath, JSON.stringify(existing, null, 2), 'utf8');
-    return configPath;
-  } catch {
-    return null;
-  }
+  } catch { /* 非关键，静默失败 */ }
+
+  // ---- 2. ~/.codex/config.toml (opencode 也读此格式) ----
+  const codexDir = path.join(home, '.codex');
+  const codexConfigPath = path.join(codexDir, 'config.toml');
+  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 = '';
+    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();
+    }
+
+    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"`,
+      '',
+      `[model_providers.yunyi-claude]`,
+      `name = "云翼 Claude"`,
+      `base_url = "${claudeUrl}"`,
+      `wire_api = "anthropic"`,
+      `env_key = "ANTHROPIC_API_KEY"`,
+    ];
+
+    if (codexUrl) {
+      section.push(
+        '',
+        `[model_providers.yunyi-codex]`,
+        `name = "云翼 Codex"`,
+        `base_url = "${codexUrl}"`,
+        `wire_api = "responses"`,
+        `requires_openai_auth = true`,
+        `env_key = "OPENAI_API_KEY"`,
+      );
+    }
+
+    section.push(markerEnd);
+    fs.writeFileSync(codexConfigPath, existing ? `${existing}\n\n${section.join('\n')}\n` : `${section.join('\n')}\n`, 'utf8');
+
+    // ~/.codex/auth.json
+    const authPath = path.join(codexDir, 'auth.json');
+    let auth = {};
+    if (fs.existsSync(authPath)) {
+      try { auth = JSON.parse(fs.readFileSync(authPath, 'utf8')); } catch { auth = {}; }
+    }
+    auth.ANTHROPIC_API_KEY = apiKey;
+    auth.OPENAI_API_KEY = apiKey;
+    fs.writeFileSync(authPath, JSON.stringify(auth, null, 2), 'utf8');
+  } catch { /* 非关键，静默失败 */ }
+
+  return configPath;
 }
 
 function syncExternalTools(type, baseUrl, apiKey, extra = {}) {
@@ -2966,11 +3020,13 @@ async function activateOpencode(paths, args = {}) {
   console.log(chalk.green('\n✅ Opencode 配置完成！'));
   console.log(chalk.cyan(`   Claude: ${claudeBaseUrl}`));
   console.log(chalk.cyan(`   Codex:  ${codexBaseUrl}`));
-  console.log(chalk.gray(`   模型: ${modelId}`));
+  console.log(chalk.gray(`   默认模型: anthropic/${modelId}`));
   console.log(chalk.gray('   API Key: 已设置'));
-  if (configPath) {
-    console.log(chalk.gray(`   配置文件: ${configPath}`));
-  }
+  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'));
 }
 
 // ============ yycode 精简模式（零交互一键配置） ============

package/package.json

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