yymaxapi 1.0.77 → 1.0.79

package/bin/yymaxapi.js

@@ -680,11 +680,15 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
   const codexDir = path.join(os.homedir(), '.codex');
   if (!fs.existsSync(codexDir)) fs.mkdirSync(codexDir, { recursive: true });
 
-  // ~/.codex/config.toml — 用 section marker 管理
+  // ~/.codex/config.toml — 顶层设置和 section 分开管理
+  // TOML 规范：[section] 之后的 key=value 属于该 section，不是顶层
+  // 所以 model / model_provider 必须在所有 [section] 之前
   const configPath = path.join(codexDir, 'config.toml');
   const marker = '# >>> maxapi codex >>>';
   const markerEnd = '# <<< maxapi codex <<<';
-  const providerKey = 'openclaw-relay';
+  const topMarker = '# >>> maxapi codex top >>>';
+  const topMarkerEnd = '# <<< maxapi codex top <<<';
+  const providerKey = 'yunyi-codex';
   // 确保 base_url 以 /v1 结尾（Codex CLI 要求）
   let normalizedUrl = baseUrl.replace(/\/+$/, '');
   if (!normalizedUrl.endsWith('/v1')) normalizedUrl += '/v1';
@@ -692,24 +696,46 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
     let existing = '';
     if (fs.existsSync(configPath)) {
       existing = fs.readFileSync(configPath, 'utf8');
-      // 移除旧的 maxapi section
+      // 移除旧的 maxapi section（provider block）
       const re = new RegExp(`${marker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${markerEnd.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
-      existing = existing.replace(re, '').trim();
-    }
-    const section = [
-      marker,
+      existing = existing.replace(re, '');
+      // 移除旧的 maxapi top-level block
+      const topRe = new RegExp(`${topMarker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${topMarkerEnd.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
+      existing = existing.replace(topRe, '');
+      // 兼容旧版：移除散落的 model/model_provider、旧 openclaw-relay、旧 yunyi opencode 标记块
+      existing = existing.replace(/^model\s*=\s*"[^"]*"\s*$/gm, '');
+      existing = existing.replace(/^model_provider\s*=\s*"[^"]*"\s*$/gm, '');
+      existing = existing.replace(/\[model_providers\.openclaw-relay\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
+      existing = existing.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
+      existing = existing.replace(/\n{3,}/g, '\n\n').trim();
+    }
+
+    // 顶层设置（MUST 在所有 [section] 之前）
+    const topBlock = [
+      topMarker,
       `model = "${modelId}"`,
       `model_provider = "${providerKey}"`,
-      ``,
+      topMarkerEnd
+    ].join('\n');
+
+    // Provider section（追加在文件末尾）
+    const providerBlock = [
+      marker,
       `[model_providers.${providerKey}]`,
-      `name = "OpenClaw Relay"`,
+      `name = "云翼 Codex"`,
       `base_url = "${normalizedUrl}"`,
       `wire_api = "responses"`,
       `experimental_bearer_token = "${apiKey}"`,
-      `requires_openai_auth = true`,
       markerEnd
     ].join('\n');
-    const content = existing ? `${existing}\n\n${section}\n` : `${section}\n`;
+
+    // 组装：顶层设置 → 原有内容 → provider section
+    let content;
+    if (existing) {
+      content = `${topBlock}\n\n${existing}\n\n${providerBlock}\n`;
+    } else {
+      content = `${topBlock}\n\n${providerBlock}\n`;
+    }
     fs.writeFileSync(configPath, content, 'utf8');
   } catch { /* 非关键，静默失败 */ }
 
@@ -795,31 +821,14 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
     // 移除旧标记块（仅移除 yunyi opencode 自己的）
     content = content.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
 
-    // 移除旧的 yunyi model_providers 段落（包括 yunyi-cli 写入的 [model_providers.yunyi]）
-    content = content.replace(/\[model_providers\.yunyi[^\]]*\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
-
-    // 只追加 yunyi-codex provider（Claude 配置仅在 opencode.json 中，Codex CLI 不支持 wire_api=anthropic）
-    const providers = [''];
-    if (codexUrl) {
-      providers.push(
-        '# >>> yunyi opencode >>>',
-        '[model_providers.yunyi-codex]',
-        'name = "云翼 Codex"',
-        `base_url = "${codexUrl}"`,
-        'wire_api = "responses"',
-        `experimental_bearer_token = "${apiKey}"`,
-        'requires_openai_auth = true',
-        '# <<< yunyi opencode <<<'
-      );
-    }
+    // 移除旧版 yunyi-cli 写入的 [model_providers.yunyi] 和 [model_providers.yunyi-claude]（不动 yunyi-codex，由 writeCodexConfig 管理）
+    content = content.replace(/\[model_providers\.yunyi\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
+    content = content.replace(/\[model_providers\.yunyi-claude\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
 
     // 清理多余空行
     content = content.replace(/\n{3,}/g, '\n\n').trim();
 
-    // 追加 provider section
-    if (providers.length > 1) {
-      content += '\n\n' + providers.join('\n') + '\n';
-    }
+    // yunyi-codex provider 由 writeCodexConfig 统一管理，此处不再重复写入
 
     fs.writeFileSync(codexConfigPath, content, 'utf8');
 

package/package.json

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