codexmate 0.0.25 → 0.0.27

package/README.md

@@ -1,10 +1,10 @@
-<div align="center">
+<div align="center">
 
 <img src="site/.vitepress/public/images/logo.png" alt="Codex Mate logo" width="180" />
 
 # Codex Mate
 
-**Local-first control panel for Codex / Claude Code / OpenClaw configs, sessions, and usage analytics.**
+**Local-first CLI + Web UI that edits your AI tool configs and sessions directly on disk, with built-in usage analytics and safe rollback.**
 
 [![Build](https://img.shields.io/github/actions/workflow/status/SakuraByteCore/codexmate/release.yml?label=build&style=flat)](https://github.com/SakuraByteCore/codexmate/actions/workflows/release.yml)
 [![Version](https://img.shields.io/npm/v/codexmate?label=version&style=flat)](https://www.npmjs.com/package/codexmate)
@@ -16,6 +16,9 @@
 
 [Docs](https://sakurabytecore.github.io/codexmate/) · [Quick Start](#quick-start) · [Commands](#command-reference) · [Web UI](#web-ui) · [MCP](#mcp) · [中文](README.zh.md)
 
+<br />
+<img src="site/.vitepress/public/images/readme-hero.png" alt="Codex Mate screenshot" width="960" />
+
 </div>
 
 ---
@@ -25,6 +28,7 @@
 Codex Mate is a local-first CLI + Web UI for unified management of:
 
 - Codex provider/model switching and config writes
+- OpenAI-compatible bridge mode for Codex Responses API conversion
 - Claude Code profiles (writes to `~/.claude/settings.json`)
 - Claude Code `CLAUDE.md` editing (writes to `~/.claude/CLAUDE.md`)
 - OpenClaw JSON5 profiles and workspace `AGENTS.md`
@@ -52,6 +56,7 @@ It works on local files directly and does not require cloud hosting. The skills
 **Configuration**
 - Provider/model switching (`switch`, `use`)
 - Codex `config.toml` template confirmation before write
+- OpenAI bridge providers: write Codex to a local `/bridge/openai/<provider>/v1` endpoint and normalize Responses API requests for OpenAI-compatible upstreams
 - Claude Code profile management and apply
 - Claude Code `CLAUDE.md` editing (writes to `~/.claude/CLAUDE.md`)
 - OpenClaw JSON5 profile management
@@ -86,6 +91,7 @@ It works on local files directly and does not require cloud hosting. The skills
 - MCP stdio domains (`tools`, `resources`, `prompts`)
 - Automation hooks (`/hooks/*`) + outbound webhook notifiers
 - Built-in proxy controls (`proxy`)
+- OpenAI bridge conversion for Codex `/v1/responses` requests, including upstream `/responses` preference, `/chat/completions` fallback, and function-tool normalization
 - Auth profile management (`auth`)
 - Zip/unzip utilities
 
@@ -226,7 +232,7 @@ npm run reset 79
 | `codexmate setup` | Interactive setup |
 | `codexmate list` / `codexmate models` | List providers / models |
 | `codexmate switch <provider>` / `codexmate use <model>` | Switch provider / model |
-| `codexmate add <name> <URL> [API_KEY]` | Add provider |
+| `codexmate add <name> <URL> [API_KEY] [--bridge openai]` | Add provider; `--bridge openai` creates a local Codex Responses-compatible bridge for OpenAI-style upstreams |
 | `codexmate delete <name>` | Delete provider |
 | `codexmate claude <BaseURL> <API_KEY> [model]` | Write Claude Code config |
 | `codexmate auth <list\|import\|switch\|delete\|status>` | Auth profile management |
@@ -253,6 +259,7 @@ codexmate codex --model gpt-5.3-codex --follow-up "step1" --follow-up "step2"
 ### Codex Mode
 - Provider/model switching
 - Model list management
+- OpenAI bridge providers for Codex Responses API conversion to OpenAI-compatible upstreams
 - `~/.codex/AGENTS.md` editing
 
 ### Claude Code Mode
@@ -307,6 +314,7 @@ codexmate mcp serve --allow-write
 - `~/.codex/auth.json`
 - `~/.codex/models.json`
 - `~/.codex/provider-current-models.json`
+- `~/.codex/codexmate-openai-bridge.json`
 - `~/.claude/settings.json`
 - `~/.claude/CLAUDE.md`
 - `~/.openclaw/openclaw.json`

package/README.zh.md

@@ -4,7 +4,7 @@
 
 # Codex Mate
 
-**Codex / Claude Code / OpenClaw 的本地控制台：配置、会话与 Usage 统计一体化管理。**
+**本地优先的 CLI + Web UI：直接写入你的本地配置与会话文件，内置 Usage 统计，并提供可审计、可回滚的变更保护。**
 
 [![Build](https://img.shields.io/github/actions/workflow/status/SakuraByteCore/codexmate/release.yml?label=build&style=flat)](https://github.com/SakuraByteCore/codexmate/actions/workflows/release.yml)
 [![Version](https://img.shields.io/npm/v/codexmate?label=version&style=flat)](https://www.npmjs.com/package/codexmate)
@@ -16,6 +16,9 @@
 
 [文档](https://sakurabytecore.github.io/codexmate/) · [快速开始](#快速开始) · [命令速查](#命令速查) · [Web 界面](#web-界面) · [MCP](#mcp) · [English](README.md)
 
+<br />
+<img src="site/.vitepress/public/images/readme-hero.png" alt="Codex Mate 界面预览" width="960" />
+
 </div>
 
 ---
@@ -25,6 +28,7 @@
 Codex Mate 提供一套本地优先的 CLI + Web UI，用于统一管理：
 
 - Codex 的 provider / model 切换与配置写入
+- 面向 Codex Responses API 的 OpenAI 兼容桥接转换
 - Claude Code 配置方案（写入 `~/.claude/settings.json`）
 - Claude Code `CLAUDE.md` 编辑（写入 `~/.claude/CLAUDE.md`）
 - OpenClaw JSON5 配置与 Workspace `AGENTS.md`
@@ -52,6 +56,7 @@ Codex Mate 提供一套本地优先的 CLI + Web UI，用于统一管理：
 **配置管理**
 - provider / model 切换（`switch` / `use`）
 - Codex `config.toml` 模板确认后写入
+- OpenAI 桥接 provider：将 Codex 写到本地 `/bridge/openai/<provider>/v1`，并为 OpenAI 兼容上游归一化 Responses API 请求
 - Claude Code 多配置方案管理与一键应用
 - Claude Code `CLAUDE.md` 编辑（写入 `~/.claude/CLAUDE.md`）
 - 分享命令前缀切换（`npm start` / `codexmate`），用于复制 provider / Claude 导入命令
@@ -90,6 +95,7 @@ Codex Mate 提供一套本地优先的 CLI + Web UI，用于统一管理：
 **工程能力**
 - MCP stdio 能力（tools/resources/prompts）
 - 自动化钩子（`/hooks/*`）+ 外发 webhook 通知
+- Codex `/v1/responses` 的 OpenAI 桥接转换：优先尝试上游 `/responses`，必要时回退 `/chat/completions`，并归一化 function tools
 - Zip 压缩/解压（优先系统工具，失败回退 JS 库）
 
 ## 自动化（信号 → 行动）
@@ -229,7 +235,7 @@ npm run reset 79
 | `codexmate setup` | 交互式初始化 |
 | `codexmate list` / `codexmate models` | 查看提供商 / 模型 |
 | `codexmate switch <provider>` / `codexmate use <model>` | 切换 provider / model |
-| `codexmate add <name> <URL> [API_KEY]` | 添加提供商 |
+| `codexmate add <name> <URL> [API_KEY] [--bridge openai]` | 添加提供商；`--bridge openai` 会为 OpenAI 风格上游创建本地 Codex Responses 兼容桥接 |
 | `codexmate delete <name>` | 删除提供商 |
 | `codexmate claude <BaseURL> <API_KEY> [model]` | 写入 Claude Code 配置 |
 | `codexmate workflow <list\|get\|validate\|run\|runs>` | MCP 工作流管理 |
@@ -255,6 +261,7 @@ codexmate codex --model gpt-5.3-codex --follow-up "步骤1" --follow-up "步骤2
 ### Codex 配置模式
 - provider / model 切换
 - 模型管理
+- OpenAI 桥接 provider：将 Codex Responses API 转换给 OpenAI 兼容上游
 - `~/.codex/AGENTS.md` 编辑
 
 ### Claude Code 配置模式
@@ -315,6 +322,7 @@ codexmate mcp serve --allow-write
 - `~/.codex/auth.json`
 - `~/.codex/models.json`
 - `~/.codex/provider-current-models.json`
+- `~/.codex/codexmate-openai-bridge.json`
 - `~/.claude/settings.json`
 - `~/.claude/CLAUDE.md`
 - `~/.openclaw/openclaw.json`

package/cli/builtin-proxy.js

@@ -174,70 +174,182 @@ function createBuiltinProxyRuntimeController(deps = {}) {
         });
     }
 
-    function extractChatCompletionResult(payload) {
-        if (!payload || typeof payload !== 'object') return { text: '' };
-        const choice = Array.isArray(payload.choices) ? payload.choices[0] : null;
-        const message = choice && typeof choice === 'object' ? choice.message : null;
-        const content = message && typeof message === 'object' ? message.content : '';
-        let text = '';
-        if (typeof content === 'string') {
-            text = content;
-        } else if (Array.isArray(content)) {
-            text = content
-                .map((item) => {
-                    if (!item) return '';
-                    if (typeof item === 'string') return item;
-                    if (typeof item === 'object') {
-                        if (typeof item.text === 'string') return item.text;
-                        if (typeof item.content === 'string') return item.content;
-                    }
-                    return '';
-                })
-                .filter(Boolean)
-                .join('');
+    function buildUpstreamUrlCandidates(baseUrl, pathSuffix) {
+        const safeSuffix = String(pathSuffix || '').replace(/^\/+/, '');
+        const candidates = [];
+        const push = (url) => {
+            if (url && !candidates.includes(url)) {
+                candidates.push(url);
+            }
+        };
+        push(joinApiUrl(baseUrl, safeSuffix));
+        const trimmed = normalizeBaseUrl(baseUrl);
+        if (trimmed && safeSuffix) {
+            push(`${trimmed}/${safeSuffix}`);
         }
-        return { text };
+        return candidates;
     }
 
-    function normalizeResponsesInputToChatMessages(input) {
-        // 支持：
-        // - string
-        // - { role, content }（单条 message）
-        // - { type:"input_text"|"input_image", ... }（单个 block）
-        // - [{ role, content: [{type:"input_text"|"input_image", ...}] }]
-        // - [{ type:"input_text"|"input_image", ... }]（视为单条 user 消息）
-        if (typeof input === 'string') {
-            return [{ role: 'user', content: input }];
+    async function proxyRequestJsonWithFallbackUrls(baseUrl, pathSuffix, options = {}) {
+        const urls = buildUpstreamUrlCandidates(baseUrl, pathSuffix);
+        if (urls.length === 0) {
+            return { ok: false, error: 'failed to build upstream URL' };
         }
-        if (input && typeof input === 'object' && !Array.isArray(input)) {
-            if (typeof input.role === 'string' && input.content != null) {
-                const role = input.role.trim() || 'user';
-                const content = Array.isArray(input.content)
-                    ? toChatContent(input.content)
-                    : input.content;
-                return content ? [{ role, content }] : [];
+        let lastResult = null;
+        for (let index = 0; index < urls.length; index += 1) {
+            const result = await proxyRequestJson(urls[index], options);
+            lastResult = result;
+            if (!result.ok) {
+                return result;
             }
-            // 单个 block：{type:"input_text"|"input_image", ...}
-            if (typeof input.type === 'string') {
-                const content = toChatContent([input]);
-                return content ? [{ role: 'user', content }] : [];
+            if (!(result.status === 404 || result.status === 405)) {
+                return result;
             }
-            return [];
         }
-        if (!Array.isArray(input)) {
-            return [];
+        return lastResult || { ok: false, error: 'failed to build upstream URL' };
+    }
+
+    function stringifyJsonValue(value, fallback = '') {
+        if (typeof value === 'string') return value;
+        if (value == null) return fallback;
+        try {
+            return JSON.stringify(value);
+        } catch (_) {
+            return fallback;
         }
+    }
 
+    function normalizeChatUsageToResponsesUsage(usage) {
+        if (!usage || typeof usage !== 'object' || Array.isArray(usage)) return undefined;
+        const pickNumber = (...keys) => {
+            for (const key of keys) {
+                if (Number.isFinite(usage[key])) return usage[key];
+            }
+            return undefined;
+        };
+        const inputTokens = pickNumber('input_tokens', 'prompt_tokens');
+        const outputTokens = pickNumber('output_tokens', 'completion_tokens');
+        const totalTokens = pickNumber('total_tokens');
+        const result = {};
+        if (inputTokens != null) result.input_tokens = inputTokens;
+        if (outputTokens != null) result.output_tokens = outputTokens;
+        if (totalTokens != null) result.total_tokens = totalTokens;
+        if (usage.input_tokens_details && typeof usage.input_tokens_details === 'object') {
+            result.input_tokens_details = usage.input_tokens_details;
+        } else if (usage.prompt_tokens_details && typeof usage.prompt_tokens_details === 'object') {
+            result.input_tokens_details = usage.prompt_tokens_details;
+        }
+        if (usage.output_tokens_details && typeof usage.output_tokens_details === 'object') {
+            result.output_tokens_details = usage.output_tokens_details;
+        } else if (usage.completion_tokens_details && typeof usage.completion_tokens_details === 'object') {
+            result.output_tokens_details = usage.completion_tokens_details;
+        }
+        return Object.keys(result).length > 0 ? result : usage;
+    }
+
+    function mapChatFinishReasonToResponses(choice) {
+        const finishReason = choice && typeof choice === 'object' && typeof choice.finish_reason === 'string'
+            ? choice.finish_reason
+            : '';
+        if (finishReason === 'length') {
+            return { status: 'incomplete', incomplete_details: { reason: 'max_output_tokens' } };
+        }
+        if (finishReason === 'content_filter') {
+            return { status: 'incomplete', incomplete_details: { reason: 'content_filter' } };
+        }
+        return { status: 'completed' };
+    }
+
+    function normalizeChatMessageContentToResponsesContent(content, refusal = '') {
+        const blocks = [];
+        const pushText = (text) => {
+            if (typeof text === 'string' && text) {
+                blocks.push({ type: 'output_text', text });
+            }
+        };
+        if (typeof content === 'string') {
+            pushText(content);
+        } else if (Array.isArray(content)) {
+            for (const item of content) {
+                if (!item) continue;
+                if (typeof item === 'string') {
+                    pushText(item);
+                    continue;
+                }
+                if (typeof item !== 'object') continue;
+                const type = typeof item.type === 'string' ? item.type : '';
+                if ((type === 'text' || type === 'output_text') && typeof item.text === 'string') {
+                    pushText(item.text);
+                    continue;
+                }
+                if (typeof item.content === 'string') {
+                    pushText(item.content);
+                }
+            }
+        }
+        if (typeof refusal === 'string' && refusal) {
+            blocks.push({ type: 'refusal', refusal });
+        }
+        return blocks;
+    }
+
+    function buildResponsesPayloadFromChatCompletion(payload, fallbackModel = '') {
+        const base = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : {};
+        const choice = Array.isArray(base.choices) ? base.choices[0] : null;
+        const message = choice && typeof choice === 'object' && choice.message && typeof choice.message === 'object'
+            ? choice.message
+            : {};
+        const output = [];
+        const messageContent = normalizeChatMessageContentToResponsesContent(message.content, message.refusal);
+        if (messageContent.length > 0 || !Array.isArray(message.tool_calls) || message.tool_calls.length === 0) {
+            output.push({
+                type: 'message',
+                role: 'assistant',
+                content: messageContent.length > 0 ? messageContent : [{ type: 'output_text', text: '' }]
+            });
+        }
+        if (Array.isArray(message.tool_calls)) {
+            for (const toolCall of message.tool_calls) {
+                if (!toolCall || typeof toolCall !== 'object') continue;
+                const fn = toolCall.function && typeof toolCall.function === 'object' ? toolCall.function : {};
+                const name = typeof fn.name === 'string' ? fn.name : '';
+                if (!name) continue;
+                output.push({
+                    type: 'function_call',
+                    call_id: typeof toolCall.id === 'string' && toolCall.id ? toolCall.id : `call_${crypto.randomBytes(8).toString('hex')}`,
+                    name,
+                    arguments: stringifyJsonValue(fn.arguments, '{}')
+                });
+            }
+        }
+        const finish = mapChatFinishReasonToResponses(choice);
+        return ensureResponseMetadata({
+            id: typeof base.id === 'string' ? base.id : undefined,
+            model: typeof base.model === 'string' ? base.model : fallbackModel,
+            status: finish.status,
+            ...(finish.incomplete_details ? { incomplete_details: finish.incomplete_details } : {}),
+            output,
+            usage: normalizeChatUsageToResponsesUsage(base.usage)
+        });
+    }
+
+    function normalizeResponsesInputToChatMessages(input) {
+        // 参考 cc-switch 的 Responses 转换形态：message content 保持为消息，function_call /
+        // function_call_output 提升为 OpenAI Chat 的 assistant tool_calls / tool 消息。
         const toChatContent = (blocks) => {
             if (!Array.isArray(blocks)) return '';
             const out = [];
             for (const block of blocks) {
                 if (!block || typeof block !== 'object') continue;
                 const type = typeof block.type === 'string' ? block.type : '';
-                if (type === 'input_text' && typeof block.text === 'string') {
+                if ((type === 'input_text' || type === 'output_text' || type === 'text') && typeof block.text === 'string') {
                     out.push({ type: 'text', text: block.text });
                     continue;
                 }
+                if (type === 'refusal' && typeof block.refusal === 'string') {
+                    out.push({ type: 'text', text: block.refusal });
+                    continue;
+                }
                 if (type === 'input_image') {
                     const raw = block.image_url != null ? block.image_url : block.imageUrl;
                     const url = typeof raw === 'string'
@@ -248,11 +360,6 @@ function createBuiltinProxyRuntimeController(deps = {}) {
                     }
                     continue;
                 }
-                // 容错：兼容已是 chat content 的 {type:"text"} / {type:"image_url"}
-                if (type === 'text' && typeof block.text === 'string') {
-                    out.push({ type: 'text', text: block.text });
-                    continue;
-                }
                 if (type === 'image_url' && block.image_url) {
                     out.push({ type: 'image_url', image_url: block.image_url });
                 }
@@ -261,26 +368,67 @@ function createBuiltinProxyRuntimeController(deps = {}) {
             return out;
         };
 
-        const messages = [];
-        for (const item of input) {
-            if (!item || typeof item !== 'object') continue;
+        const messageFromResponsesItem = (item) => {
+            if (!item || typeof item !== 'object') return null;
+            const type = typeof item.type === 'string' ? item.type : '';
+            if (type === 'function_call') {
+                const name = typeof item.name === 'string' ? item.name : '';
+                if (!name) return null;
+                return {
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [{
+                        id: typeof item.call_id === 'string' && item.call_id ? item.call_id : (typeof item.id === 'string' ? item.id : `call_${crypto.randomBytes(8).toString('hex')}`),
+                        type: 'function',
+                        function: {
+                            name,
+                            arguments: stringifyJsonValue(item.arguments, '{}')
+                        }
+                    }]
+                };
+            }
+            if (type === 'function_call_output') {
+                const callId = typeof item.call_id === 'string' ? item.call_id : '';
+                return {
+                    role: 'tool',
+                    tool_call_id: callId,
+                    content: stringifyJsonValue(item.output, '')
+                };
+            }
             if (typeof item.role === 'string' && item.content != null) {
                 const role = item.role.trim() || 'user';
                 const content = Array.isArray(item.content)
                     ? toChatContent(item.content)
                     : item.content;
-                if (content) {
-                    messages.push({ role, content });
-                }
-                continue;
+                return content || content === null ? { role, content } : null;
+            }
+            if (type) {
+                const content = toChatContent([item]);
+                return content ? { role: 'user', content } : null;
             }
+            return null;
+        };
+
+        if (typeof input === 'string') {
+            return [{ role: 'user', content: input }];
+        }
+        if (input && typeof input === 'object' && !Array.isArray(input)) {
+            const message = messageFromResponsesItem(input);
+            return message ? [message] : [];
+        }
+        if (!Array.isArray(input)) {
+            return [];
         }
 
+        const messages = [];
+        for (const item of input) {
+            const message = messageFromResponsesItem(item);
+            if (message) messages.push(message);
+        }
         if (messages.length > 0) {
             return messages;
         }
 
-        // 退化：把 input array 当作单条 user content blocks
         const fallbackContent = toChatContent(input);
         if (fallbackContent) {
             return [{ role: 'user', content: fallbackContent }];
@@ -288,6 +436,99 @@ function createBuiltinProxyRuntimeController(deps = {}) {
         return [];
     }
 
+    function normalizeResponsesToolsToChatTools(tools) {
+        if (!Array.isArray(tools)) return tools;
+        return tools
+            .map((tool) => {
+                if (!tool || typeof tool !== 'object') return null;
+                if (tool.type !== 'function') return tool;
+                const sourceFn = tool.function && typeof tool.function === 'object' && !Array.isArray(tool.function)
+                    ? tool.function
+                    : {};
+                const name = typeof sourceFn.name === 'string' && sourceFn.name.trim()
+                    ? sourceFn.name.trim()
+                    : (typeof tool.name === 'string' ? tool.name.trim() : '');
+                if (!name) return null;
+                const description = typeof sourceFn.description === 'string'
+                    ? sourceFn.description
+                    : (typeof tool.description === 'string' ? tool.description : undefined);
+                const parameters = sourceFn.parameters && typeof sourceFn.parameters === 'object' && !Array.isArray(sourceFn.parameters)
+                    ? sourceFn.parameters
+                    : (tool.parameters && typeof tool.parameters === 'object' && !Array.isArray(tool.parameters) ? tool.parameters : {});
+                const strict = typeof sourceFn.strict === 'boolean'
+                    ? sourceFn.strict
+                    : (typeof tool.strict === 'boolean' ? tool.strict : undefined);
+                const fn = { name, parameters };
+                if (description !== undefined) fn.description = description;
+                if (strict !== undefined) fn.strict = strict;
+                return { type: 'function', function: fn };
+            })
+            .filter(Boolean);
+    }
+
+    function normalizeResponsesToolChoiceToChatToolChoice(toolChoice) {
+        if (!toolChoice || typeof toolChoice !== 'object' || Array.isArray(toolChoice)) return toolChoice;
+        if (toolChoice.type === 'function' && typeof toolChoice.name === 'string') {
+            return { type: 'function', function: { name: toolChoice.name } };
+        }
+        return toolChoice;
+    }
+
+    function buildChatCompletionsBodyFromResponsesPayload(payload) {
+        const source = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : {};
+        const messages = normalizeResponsesInputToChatMessages(source.input);
+        const instructions = typeof source.instructions === 'string' ? source.instructions.trim() : '';
+        if (instructions) {
+            messages.unshift({ role: 'system', content: instructions });
+        }
+
+        const chatBody = {
+            model: typeof source.model === 'string' ? source.model : '',
+            messages,
+            stream: false
+        };
+
+        const passthroughKeys = [
+            'frequency_penalty',
+            'presence_penalty',
+            'response_format',
+            'stop',
+            'temperature',
+            'top_p',
+            'tools',
+            'tool_choice',
+            'logprobs',
+            'top_logprobs',
+            'kbs',
+            'is_online',
+            'user',
+            'seed',
+            'n',
+            'modalities',
+            'audio',
+            'reasoning_effort'
+        ];
+        for (const key of passthroughKeys) {
+            if (Object.prototype.hasOwnProperty.call(source, key)) {
+                if (key === 'tools') {
+                    chatBody[key] = normalizeResponsesToolsToChatTools(source[key]);
+                } else if (key === 'tool_choice') {
+                    chatBody[key] = normalizeResponsesToolChoiceToChatToolChoice(source[key]);
+                } else {
+                    chatBody[key] = source[key];
+                }
+            }
+        }
+
+        if (Object.prototype.hasOwnProperty.call(source, 'max_tokens')) {
+            chatBody.max_tokens = source.max_tokens;
+        } else if (source.max_output_tokens != null) {
+            chatBody.max_tokens = source.max_output_tokens;
+        }
+
+        return chatBody;
+    }
+
     function ensureResponseMetadata(payload) {
         const base = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : {};
         const id = typeof base.id === 'string' && base.id.trim()
@@ -761,15 +1002,12 @@ function createBuiltinProxyRuntimeController(deps = {}) {
                         'X-Codexmate-Proxy': '1'
                     };
 
-                    const upstreamResponsesUrl = joinApiUrl(upstream.baseUrl, 'responses');
-                    const upstreamResponses = upstreamResponsesUrl
-                        ? await proxyRequestJson(upstreamResponsesUrl, {
-                            method: 'POST',
-                            headers: commonHeaders,
-                            timeoutMs,
-                            body: { ...payload, stream: false }
-                        })
-                        : { ok: false, error: 'failed to build upstream URL' };
+                    const upstreamResponses = await proxyRequestJsonWithFallbackUrls(upstream.baseUrl, 'responses', {
+                        method: 'POST',
+                        headers: commonHeaders,
+                        timeoutMs,
+                        body: { ...payload, stream: false }
+                    });
 
                     // 优先走上游 /responses（如果支持）。若上游报错且不是“端点不支持”，则直接透传错误。
                     if (upstreamResponses.ok && upstreamResponses.status >= 200 && upstreamResponses.status < 300) {
@@ -812,24 +1050,9 @@ function createBuiltinProxyRuntimeController(deps = {}) {
                     }
 
                     const model = typeof payload.model === 'string' ? payload.model : '';
-                    const messages = normalizeResponsesInputToChatMessages(payload.input);
-                    const chatBody = {
-                        model,
-                        messages,
-                        stream: false
-                    };
-                    if (payload.max_output_tokens != null && chatBody.max_tokens == null) {
-                        chatBody.max_tokens = payload.max_output_tokens;
-                    }
+                    const chatBody = buildChatCompletionsBodyFromResponsesPayload(payload);
 
-                    const upstreamChatUrl = joinApiUrl(upstream.baseUrl, 'chat/completions');
-                    if (!upstreamChatUrl) {
-                        res.writeHead(500, { 'Content-Type': 'application/json; charset=utf-8' });
-                        res.end(JSON.stringify({ error: 'failed to build upstream URL' }));
-                        return;
-                    }
-
-                    const upstreamChat = await proxyRequestJson(upstreamChatUrl, {
+                    const upstreamChat = await proxyRequestJsonWithFallbackUrls(upstream.baseUrl, 'chat/completions', {
                         method: 'POST',
                         headers: commonHeaders,
                         timeoutMs,
@@ -841,6 +1064,12 @@ function createBuiltinProxyRuntimeController(deps = {}) {
                         return;
                     }
 
+                    if (upstreamChat.status >= 400) {
+                        res.writeHead(upstreamChat.status, { 'Content-Type': 'application/json; charset=utf-8' });
+                        res.end(upstreamChat.bodyText || JSON.stringify({ error: 'Upstream error' }));
+                        return;
+                    }
+
                     const chatJson = parseJsonOrError(upstreamChat.bodyText);
                     if (chatJson.error) {
                         res.writeHead(502, { 'Content-Type': 'application/json; charset=utf-8' });
@@ -848,16 +1077,7 @@ function createBuiltinProxyRuntimeController(deps = {}) {
                         return;
                     }
 
-                    const { text } = extractChatCompletionResult(chatJson.value);
-                    const responsesPayload = ensureResponseMetadata({
-                        model,
-                        output: [{
-                            type: 'message',
-                            role: 'assistant',
-                            content: [{ type: 'output_text', text }]
-                        }],
-                        usage: chatJson.value && chatJson.value.usage ? chatJson.value.usage : undefined
-                    });
+                    const responsesPayload = buildResponsesPayloadFromChatCompletion(chatJson.value, model);
 
                     if (wantsStream) {
                         res.writeHead(200, {