yymaxapi 1.0.63 → 1.0.65

package/bin/yymaxapi.js

@@ -716,32 +716,49 @@ function writeCodexConfig(baseUrl, apiKey) {
   } catch { /* 非关键，静默失败 */ }
 }
 
-function writeOpencodeConfig(baseUrl, apiKey, modelId) {
+function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
   const home = os.homedir();
   const configDir = process.platform === 'win32'
     ? path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'opencode')
     : path.join(home, '.config', 'opencode');
-  const configPath = path.join(configDir, 'config.json');
+  const configPath = path.join(configDir, 'opencode.json');
   try {
     if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
-    const cleanUrl = baseUrl.replace(/\/+$/, '');
-    const config = {
-      provider: {
-        anthropic: {
+    let existing = {};
+    if (fs.existsSync(configPath)) {
+      try { existing = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { existing = {}; }
+    }
+    const cleanClaudeUrl = claudeBaseUrl.replace(/\/+$/, '');
+    let cleanCodexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
+    if (cleanCodexUrl && !cleanCodexUrl.endsWith('/v1')) cleanCodexUrl += '/v1';
+    if (!existing.provider) existing.provider = {};
+    existing.provider.anthropic = {
+      options: {
+        apiKey: apiKey,
+        baseURL: cleanClaudeUrl
+      }
+    };
+    if (cleanCodexUrl) {
+      existing.provider.openai = {
+        options: {
           apiKey: apiKey,
-          baseURL: cleanUrl
+          baseURL: cleanCodexUrl
         }
-      },
-      model: modelId || 'claude-sonnet-4-6'
-    };
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
+      };
+    }
+    const rawModelId = modelId || 'claude-sonnet-4-6';
+    existing.model = rawModelId.startsWith('anthropic/') || rawModelId.startsWith('openai/')
+      ? rawModelId
+      : `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;
   }
 }
 
-function syncExternalTools(type, baseUrl, apiKey) {
+function syncExternalTools(type, baseUrl, apiKey, extra = {}) {
   const synced = [];
   try {
     if (type === 'claude') {
@@ -751,6 +768,10 @@ function syncExternalTools(type, baseUrl, apiKey) {
       writeCodexConfig(baseUrl, apiKey);
       synced.push('Codex CLI config');
     }
+    if (type === 'claude' && extra.codexBaseUrl) {
+      writeOpencodeConfig(baseUrl, extra.codexBaseUrl, apiKey);
+      synced.push('Opencode config');
+    }
   } catch { /* ignore */ }
   return synced;
 }
@@ -2745,7 +2766,7 @@ async function autoActivate(paths, args = {}) {
   updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
   updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
   const extSynced = [];
-  try { syncExternalTools('claude', claudeBaseUrl, apiKey); extSynced.push('Claude Code settings'); } catch { /* ignore */ }
+  try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl }); extSynced.push('Claude Code settings'); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey); extSynced.push('Codex CLI config'); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
 
@@ -2927,13 +2948,15 @@ async function activateOpencode(paths, args = {}) {
 
   // ---- 写入配置 ----
   const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
   const modelId = 'claude-sonnet-4-6';
   const writeSpinner = ora({ text: '正在写入 Opencode 配置...', spinner: 'dots' }).start();
-  const configPath = writeOpencodeConfig(claudeBaseUrl, apiKey, modelId);
+  const configPath = writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId);
   writeSpinner.succeed('Opencode 配置写入完成');
 
   console.log(chalk.green('\n✅ Opencode 配置完成！'));
-  console.log(chalk.cyan(`   Base URL: ${claudeBaseUrl}`));
+  console.log(chalk.cyan(`   Claude: ${claudeBaseUrl}`));
+  console.log(chalk.cyan(`   Codex:  ${codexBaseUrl}`));
   console.log(chalk.gray(`   模型: ${modelId}`));
   console.log(chalk.gray('   API Key: 已设置'));
   if (configPath) {
@@ -3083,7 +3106,7 @@ async function yycodeQuickSetup(paths) {
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
   updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
-  try { syncExternalTools('claude', claudeBaseUrl, apiKey); } catch { /* ignore */ }
+  try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
 

package/package.json

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