shumengya/sproutclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ai): align codex websocket headers and terminate SSE closes #1961

Browse Source
This commit is contained in:
Mario Zechner
2026-03-14 12:23:17 +01:00
parent 1feccfedcb
commit ad48b52de4
2 changed files with 265 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
packages/ai/src/providers/openai-codex-responses.ts
View File

@@ -145,7 +145,15 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
if (nextBody !== undefined) {
body = nextBody as RequestBody;
}
const headers = buildHeaders(model.headers, options?.headers, accountId, apiKey, options?.sessionId);
const websocketRequestId = options?.sessionId || createCodexRequestId();
const sseHeaders = buildSSEHeaders(model.headers, options?.headers, accountId, apiKey, options?.sessionId);
const websocketHeaders = buildWebSocketHeaders(
model.headers,
options?.headers,
accountId,
apiKey,
websocketRequestId,
);
const bodyJson = JSON.stringify(body);
const transport = options?.transport || "sse";
@@ -155,7 +163,7 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
await processWebSocketStream(
resolveCodexWebSocketUrl(model.baseUrl),
body,
headers,
websocketHeaders,
output,
stream,
model,
@@ -194,7 +202,7 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
try {
response = await fetch(resolveCodexUrl(model.baseUrl), {
method: "POST",
headers,
headers: sseHeaders,
body: bodyJson,
signal: options?.signal,
});
@@ -378,13 +386,13 @@ async function* mapCodexEvents(events: AsyncIterable<Record<string, unknown>>):
throw new Error(msg || "Codex response failed");
}
if (type === "response.done" || type === "response.completed") {
if (type === "response.done" || type === "response.completed" || type === "response.incomplete") {
const response = (event as { response?: { status?: unknown } }).response;
const normalizedResponse = response
? { ...response, status: normalizeCodexStatus(response.status) }
: response;
yield { ...event, type: "response.completed", response: normalizedResponse } as ResponseStreamEvent;
continue;
return;
}
yield event as unknown as ResponseStreamEvent;
@@ -407,30 +415,39 @@ async function* parseSSE(response: Response): AsyncGenerator<Record<string, unkn
const decoder = new TextDecoder();
let buffer = "";
while (true) {
const { done, value } = await reader.read();
if (done) break;
buffer += decoder.decode(value, { stream: true });
try {
while (true) {
const { done, value } = await reader.read();
if (done) break;
buffer += decoder.decode(value, { stream: true });
let idx = buffer.indexOf("\n\n");
while (idx !== -1) {
const chunk = buffer.slice(0, idx);
buffer = buffer.slice(idx + 2);
let idx = buffer.indexOf("\n\n");
while (idx !== -1) {
const chunk = buffer.slice(0, idx);
buffer = buffer.slice(idx + 2);
const dataLines = chunk
.split("\n")
.filter((l) => l.startsWith("data:"))
.map((l) => l.slice(5).trim());
if (dataLines.length > 0) {
const data = dataLines.join("\n").trim();
if (data && data !== "[DONE]") {
try {
yield JSON.parse(data);
} catch {}
const dataLines = chunk
.split("\n")
.filter((l) => l.startsWith("data:"))
.map((l) => l.slice(5).trim());
if (dataLines.length > 0) {
const data = dataLines.join("\n").trim();
if (data && data !== "[DONE]") {
try {
yield JSON.parse(data);
} catch {}
}
}
idx = buffer.indexOf("\n\n");
}
idx = buffer.indexOf("\n\n");
}
} finally {
try {
await reader.cancel();
} catch {}
try {
reader.releaseLock();
} catch {}
}
}
@@ -513,7 +530,7 @@ async function connectWebSocket(url: string, headers: Headers, signal?: AbortSig
}
const wsHeaders = headersToRecord(headers);
wsHeaders["OpenAI-Beta"] = OPENAI_BETA_RESPONSES_WEBSOCKETS;
delete wsHeaders["OpenAI-Beta"];
return new Promise<WebSocketLike>((resolve, reject) => {
let settled = false;
@@ -533,16 +550,18 @@ async function connectWebSocket(url: string, headers: Headers, signal?: AbortSig
resolve(socket);
};
const onError: WebSocketListener = (event) => {
const error = extractWebSocketError(event);
if (settled) return;
settled = true;
cleanup();
reject(extractWebSocketError(event));
reject(error);
};
const onClose: WebSocketListener = (event) => {
const error = extractWebSocketCloseError(event);
if (settled) return;
settled = true;
cleanup();
reject(extractWebSocketCloseError(event));
reject(error);
};
const onAbort = () => {
if (settled) return;
@@ -702,7 +721,7 @@ async function* parseWebSocket(socket: WebSocketLike, signal?: AbortSignal): Asy
try {
const parsed = JSON.parse(text) as Record<string, unknown>;
const type = typeof parsed.type === "string" ? parsed.type : "";
if (type === "response.completed" || type === "response.done") {
if (type === "response.completed" || type === "response.done" || type === "response.incomplete") {
sawCompletion = true;
done = true;
}
@@ -847,25 +866,42 @@ function extractAccountId(token: string): string {
}
}
function buildHeaders(
function createCodexRequestId(): string {
if (typeof globalThis.crypto?.randomUUID === "function") {
return globalThis.crypto.randomUUID();
}
return `codex_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
}
function buildBaseCodexHeaders(
initHeaders: Record<string, string> | undefined,
additionalHeaders: Record<string, string> | undefined,
accountId: string,
token: string,
): Headers {
const headers = new Headers(initHeaders);
for (const [key, value] of Object.entries(additionalHeaders || {})) {
headers.set(key, value);
}
headers.set("Authorization", `Bearer ${token}`);
headers.set("chatgpt-account-id", accountId);
headers.set("originator", "pi");
const userAgent = _os ? `pi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "pi (browser)";
headers.set("User-Agent", userAgent);
return headers;
}
function buildSSEHeaders(
initHeaders: Record<string, string> | undefined,
additionalHeaders: Record<string, string> | undefined,
accountId: string,
token: string,
sessionId?: string,
): Headers {
const headers = new Headers(initHeaders);
headers.set("Authorization", `Bearer ${token}`);
headers.set("chatgpt-account-id", accountId);
const headers = buildBaseCodexHeaders(initHeaders, additionalHeaders, accountId, token);
headers.set("OpenAI-Beta", "responses=experimental");
headers.set("originator", "pi");
const userAgent = _os ? `pi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "pi (browser)";
headers.set("User-Agent", userAgent);
headers.set("accept", "text/event-stream");
headers.set("content-type", "application/json");
for (const [key, value] of Object.entries(additionalHeaders || {})) {
headers.set(key, value);
}
if (sessionId) {
headers.set("session_id", sessionId);
@@ -873,3 +909,21 @@ function buildHeaders(
return headers;
}
function buildWebSocketHeaders(
initHeaders: Record<string, string> | undefined,
additionalHeaders: Record<string, string> | undefined,
accountId: string,
token: string,
requestId: string,
): Headers {
const headers = buildBaseCodexHeaders(initHeaders, additionalHeaders, accountId, token);
headers.delete("accept");
headers.delete("content-type");
headers.delete("OpenAI-Beta");
headers.delete("openai-beta");
headers.set("OpenAI-Beta", OPENAI_BETA_RESPONSES_WEBSOCKETS);
headers.set("x-client-request-id", requestId);
headers.set("session_id", requestId);
return headers;
}