yymaxapi 1.0.123 → 1.0.125

package/bin/yymaxapi.js

@@ -1248,13 +1248,39 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.5') {
   } catch { /* 非关键，静默失败 */ }
 }
 
-function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKey = getExternalModelKey('claude', getDefaultClaudeModel().id)) {
+function extractTomlProviderBearerToken(content, providerKey) {
+  const escapedProviderKey = escapeRegExp(providerKey);
+  const match = String(content || '').match(new RegExp(`\\[model_providers\\.${escapedProviderKey}\\][\\s\\S]*?experimental_bearer_token\\s*=\\s*"([^"]*)"`, 'm'));
+  return String(match?.[1] || '').trim();
+}
+
+function readOpenClawProviderApiKey(providerKey) {
+  try {
+    const paths = getConfigPath();
+    const config = readConfig(paths.openclawConfig);
+    return String(config?.models?.providers?.[providerKey]?.apiKey || '').trim();
+  } catch {
+    return '';
+  }
+}
+
+function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKey = getExternalModelKey('claude', getDefaultClaudeModel().id), options = {}) {
   const home = os.homedir();
   const claudeUrl = claudeBaseUrl.replace(/\/+$/, '');
   const codexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
+  const claudeApiKey = String(apiKey || '').trim();
   const claudeProviderKey = getExternalClaudeProviderKey();
   const codexProviderKey = getExternalCodexProviderKey();
+  const openClawCodexProviderKey = String(API_CONFIG?.codex?.providerName || codexProviderKey).trim() || codexProviderKey;
   const brandPrefix = getProviderBrandPrefix();
+  const codexDir = path.join(home, '.codex');
+  const codexConfigPath = path.join(codexDir, 'config.toml');
+  const codexAuthPath = path.join(codexDir, 'auth.json');
+  const existingCodexToml = readTextIfExists(codexConfigPath);
+  let existingCodexAuth = {};
+  if (fs.existsSync(codexAuthPath)) {
+    try { existingCodexAuth = JSON.parse(fs.readFileSync(codexAuthPath, 'utf8')); } catch { existingCodexAuth = {}; }
+  }
 
   // ---- 1. opencode.json (CLI + 桌面版) ----
   const configDir = process.platform === 'win32'
@@ -1268,13 +1294,21 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
       try { existing = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { existing = {}; }
     }
     if (!existing.provider) existing.provider = {};
+    const codexApiKey = String(
+      options.codexApiKey || options.codexKey || options.gptApiKey || options.gptKey || ''
+    ).trim()
+      || readOpenClawProviderApiKey(openClawCodexProviderKey)
+      || extractTomlProviderBearerToken(existingCodexToml, codexProviderKey)
+      || String(existingCodexAuth.OPENAI_API_KEY || '').trim()
+      || String(existing.provider?.[codexProviderKey]?.options?.apiKey || '').trim()
+      || claudeApiKey;
 
     // Claude provider (@ai-sdk/anthropic)
     existing.provider[claudeProviderKey] = {
       name: `${brandPrefix} Claude`,
       npm: '@ai-sdk/anthropic',
       models: buildProviderModelMap(CLAUDE_MODELS),
-      options: { apiKey, baseURL: `${claudeUrl}/v1` }
+      options: { apiKey: claudeApiKey, baseURL: `${claudeUrl}/v1` }
     };
 
     // Codex provider (@ai-sdk/openai)
@@ -1283,7 +1317,7 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
         name: `${brandPrefix} Codex`,
         npm: '@ai-sdk/openai',
         models: buildProviderModelMap(CODEX_MODELS),
-        options: { apiKey, baseURL: codexUrl }
+        options: { apiKey: codexApiKey, baseURL: codexUrl }
       };
     }
 
@@ -1308,15 +1342,21 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
   } 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');
-    }
+    let content = existingCodexToml;
+    const existingOpencodeConfig = fs.existsSync(configPath)
+      ? (() => { try { return JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { return {}; } })()
+      : {};
+    const codexApiKey = String(
+      options.codexApiKey || options.codexKey || options.gptApiKey || options.gptKey || ''
+    ).trim()
+      || readOpenClawProviderApiKey(openClawCodexProviderKey)
+      || extractTomlProviderBearerToken(existingCodexToml, codexProviderKey)
+      || String(existingCodexAuth.OPENAI_API_KEY || '').trim()
+      || String(existingOpencodeConfig.provider?.[codexProviderKey]?.options?.apiKey || '').trim()
+      || claudeApiKey;
 
     // 移除旧标记块（仅移除 opencode 自己写入的兼容 provider）
     content = content.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
@@ -1352,14 +1392,14 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
       `name = "${brandPrefix} Claude"`,
       `base_url = "${claudeUrl}/v1"`,
       `wire_api = "anthropic"`,
-      `experimental_bearer_token = "${apiKey}"`,
+      `experimental_bearer_token = "${claudeApiKey}"`,
       ...(normalizedCodexTomlUrl ? [
         '',
         `[model_providers.${codexProviderKey}]`,
         `name = "${brandPrefix} Codex"`,
         `base_url = "${normalizedCodexTomlUrl}"`,
         `wire_api = "responses"`,
-        `experimental_bearer_token = "${apiKey}"`
+        `experimental_bearer_token = "${codexApiKey}"`
       ] : []),
       markerEnd
     ].join('\n');
@@ -1368,14 +1408,10 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
     fs.writeFileSync(codexConfigPath, nextContent, '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');
+    const auth = { ...existingCodexAuth };
+    auth.ANTHROPIC_API_KEY = claudeApiKey;
+    auth.OPENAI_API_KEY = codexApiKey;
+    fs.writeFileSync(codexAuthPath, JSON.stringify(auth, null, 2), 'utf8');
   } catch { /* 非关键，静默失败 */ }
 
   return configPath;
@@ -3070,21 +3106,30 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
   ensureConfigStructure(config);
 
   const endpointUrl = inferManagedYunyiEndpointUrl(config, options.endpointUrl);
-  const apiKey = inferManagedYunyiApiKey(config, options.apiKey);
+  const sharedApiKey = String(options.apiKey || '').trim();
+  const fallbackApiKey = inferManagedYunyiApiKey(config, sharedApiKey);
   if (!endpointUrl) {
     return { changed: false, applied: false, claudeAgentId: null, preservedMain: false };
   }
 
   let changed = false;
   const providers = config.models.providers;
-
-  const nextClaudeProvider = buildManagedYunyiProviderConfig('claude', endpointUrl, apiKey, providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] || {});
+  const claudeApiKey = sharedApiKey
+    || String(options.claudeApiKey || options.claudeKey || '').trim()
+    || String(providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER]?.apiKey || '').trim()
+    || fallbackApiKey;
+  const gptApiKey = sharedApiKey
+    || String(options.codexApiKey || options.codexKey || options.gptApiKey || options.gptKey || '').trim()
+    || String(providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER]?.apiKey || '').trim()
+    || fallbackApiKey;
+
+  const nextClaudeProvider = buildManagedYunyiProviderConfig('claude', endpointUrl, claudeApiKey, providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] || {});
   if (JSON.stringify(nextClaudeProvider) !== JSON.stringify(providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] || {})) {
     providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] = nextClaudeProvider;
     changed = true;
   }
 
-  const nextGptProvider = buildManagedYunyiProviderConfig('codex', endpointUrl, apiKey, providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] || {});
+  const nextGptProvider = buildManagedYunyiProviderConfig('codex', endpointUrl, gptApiKey, providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] || {});
   if (JSON.stringify(nextGptProvider) !== JSON.stringify(providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] || {})) {
     providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] = nextGptProvider;
     changed = true;

package/package.json

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