Skip to content

fix(proxy): preserve chat fallback fields #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ymkiux merged 11 commits into from
May 7, 2026
Merged

fix(proxy): preserve chat fallback fields #151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8a9581
fix(proxy): preserve chat fallback fields
awsl233777 May 7, 2026
0ba12e2
test(proxy): avoid keepalive handles in shim tests
awsl233777 May 7, 2026
b78f50e
fix(proxy): tighten chat fallback cleanup
awsl233777 May 7, 2026
f8efc7c
fix(proxy): mirror responses chat tool conversion
awsl233777 May 7, 2026
a916078
fix(proxy): normalize chat fallback passthroughs
awsl233777 May 7, 2026
214a1c2
fix(proxy): normalize nested response tools
awsl233777 May 7, 2026
af7dbef
fix(bridge): return local status for openai root
awsl233777 May 7, 2026
acdaee2
fix(bridge): normalize response tools for chat fallback
awsl233777 May 7, 2026
0cc2a3c
fix(bridge): normalize response tools before upstream responses
awsl233777 May 7, 2026
21f5bef
fix(bridge): drop unsupported tools for openai fallback
awsl233777 May 7, 2026
a493f64
docs(readme): document openai bridge conversion
awsl233777 May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 122 additions & 48 deletions cli/builtin-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,41 @@ function createBuiltinProxyRuntimeController(deps = {}) {
});
}

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 candidates;
}

async function proxyRequestJsonWithFallbackUrls(baseUrl, pathSuffix, options = {}) {
const urls = buildUpstreamUrlCandidates(baseUrl, pathSuffix);
if (urls.length === 0) {
return { ok: false, error: 'failed to build upstream URL' };
}
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;
}
if (!(result.status === 404 || result.status === 405)) {
return result;
}
}
return lastResult || { ok: false, error: 'failed to build upstream URL' };
}

function extractChatCompletionResult(payload) {
if (!payload || typeof payload !== 'object') return { text: '' };
const choice = Array.isArray(payload.choices) ? payload.choices[0] : null;
Expand Down Expand Up @@ -206,28 +241,6 @@ function createBuiltinProxyRuntimeController(deps = {}) {
// - { 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 }];
}
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 }] : [];
}
// 单个 block：{type:"input_text"|"input_image", ...}
if (typeof input.type === 'string') {
const content = toChatContent([input]);
return content ? [{ role: 'user', content }] : [];
}
return [];
}
if (!Array.isArray(input)) {
return [];
}

const toChatContent = (blocks) => {
if (!Array.isArray(blocks)) return '';
const out = [];
Expand Down Expand Up @@ -261,6 +274,28 @@ function createBuiltinProxyRuntimeController(deps = {}) {
return out;
};

if (typeof input === 'string') {
return [{ role: 'user', content: input }];
}
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 }] : [];
}
// 单个 block：{type:"input_text"|"input_image", ...}
if (typeof input.type === 'string') {
const content = toChatContent([input]);
return content ? [{ role: 'user', content }] : [];
}
return [];
}
if (!Array.isArray(input)) {
return [];
}

const messages = [];
for (const item of input) {
if (!item || typeof item !== 'object') continue;
Expand Down Expand Up @@ -288,6 +323,57 @@ function createBuiltinProxyRuntimeController(deps = {}) {
return [];
}

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',
'stream_options',
'temperature',
Comment thread
coderabbitai[bot] marked this conversation as resolved.
'top_p',
'tools',
'tool_choice',
'logprobs',
'top_logprobs',
'top_logprops',
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
'kbs',
'is_online',
'user',
'seed',
'n',
'modalities',
'audio',
'reasoning_effort'
];
for (const key of passthroughKeys) {
if (Object.prototype.hasOwnProperty.call(source, key)) {
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()
Expand Down Expand Up @@ -761,15 +847,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) {
Expand Down Expand Up @@ -812,24 +895,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,
Expand All @@ -841,6 +909,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' });
Expand Down
Loading
Loading