yymaxapi 1.0.66 → 1.0.68

package/bin/yymaxapi.js

@@ -726,6 +726,10 @@ 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'
     ? path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'opencode')
     : path.join(home, '.config', 'opencode');
@@ -736,33 +740,131 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
     if (fs.existsSync(configPath)) {
       try { existing = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { existing = {}; }
     }
-    const cleanClaudeUrl = claudeBaseUrl.replace(/\/+$/, '');
-    let 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');
-    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 });
+
+    let content = '';
+    if (fs.existsSync(codexConfigPath)) {
+      content = fs.readFileSync(codexConfigPath, 'utf8');
+    }
+
+    // 移除旧标记块（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 = [
+      '',
+      '# >>> yunyi opencode >>>',
+      '[model_providers.yunyi-claude]',
+      'name = "云翼 Claude"',
+      `base_url = "${claudeUrl}"`,
+      'wire_api = "anthropic"',
+      `experimental_bearer_token = "${apiKey}"`,
+    ];
+    if (codexUrl) {
+      providers.push(
+        '',
+        '[model_providers.yunyi-codex]',
+        'name = "云翼 Codex"',
+        `base_url = "${codexUrl}"`,
+        'wire_api = "responses"',
+        `experimental_bearer_token = "${apiKey}"`,
+        'requires_openai_auth = true',
+      );
+    }
+    providers.push('# <<< yunyi opencode <<<');
+    content += '\n\n' + providers.join('\n') + '\n';
+
+    fs.writeFileSync(codexConfigPath, content, 'utf8');
+
+    // ---- 3. ~/.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 = {}) {
@@ -2964,13 +3066,15 @@ 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(`   模型: ${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: 已设置'));
-  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 命令切换 yunyi-claude / yunyi-codex'));
 }
 
 // ============ yycode 精简模式（零交互一键配置） ============

package/package.json

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