yymaxapi 1.0.76 → 1.0.78

package/bin/yymaxapi.js

@@ -104,8 +104,8 @@ const DEFAULT_CODEX_MODELS = [
     "name": "GPT 5.4"
   },
   {
-    "id": "gpt-5.4-pro",
-    "name": "GPT 5.4 Pro (待支持)"
+    "id": "gpt-5.3-codex",
+    "name": "GPT 5.3 Codex"
   }
 ];
 
@@ -680,10 +680,14 @@ 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 topMarker = '# >>> maxapi codex top >>>';
+  const topMarkerEnd = '# <<< maxapi codex top <<<';
   const providerKey = 'openclaw-relay';
   // 确保 base_url 以 /v1 结尾（Codex CLI 要求）
   let normalizedUrl = baseUrl.replace(/\/+$/, '');
@@ -692,24 +696,44 @@ 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, '');
+      // 兼容旧版：移除散落在 section 内的旧 model/model_provider（来自旧版 marker block 残留）
+      existing = existing.replace(/^model\s*=\s*"[^"]*"\s*$/gm, '');
+      existing = existing.replace(/^model_provider\s*=\s*"[^"]*"\s*$/gm, '');
+      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"`,
       `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 { /* 非关键，静默失败 */ }
 
@@ -792,65 +816,34 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
       content = fs.readFileSync(codexConfigPath, 'utf8');
     }
 
-    // 移除旧标记块（yunyi opencode / maxapi codex）
+    // 移除旧标记块（仅移除 yunyi opencode 自己的）
     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}"`,
-    ];
+    // 只追加 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',
+        'requires_openai_auth = false',
+        '# <<< yunyi opencode <<<'
       );
     }
-    providers.push('# <<< yunyi opencode <<<');
-    content += '\n\n' + providers.join('\n') + '\n';
+
+    // 清理多余空行
+    content = content.replace(/\n{3,}/g, '\n\n').trim();
+
+    // 追加 provider section
+    if (providers.length > 1) {
+      content += '\n\n' + providers.join('\n') + '\n';
+    }
 
     fs.writeFileSync(codexConfigPath, content, 'utf8');
 

package/config/API/350/212/202/347/202/271/350/256/276/347/275/256.md

@@ -29,7 +29,7 @@
     ],
     "codex": [
       { "id": "gpt-5.4", "name": "GPT 5.4" },
-      { "id": "gpt-5.4-pro", "name": "GPT 5.4 Pro (待支持)" }
+      { "id": "gpt-5.3-codex", "name": "GPT 5.3 Codex" }
     ]
   },
   "apiConfig": {

package/package.json

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