@draht/ai 2026.4.26 → 2026.6.11

package/dist/providers/openai-codex-responses.js

@@ -1,25 +1,41 @@
-// NEVER convert to top-level runtime imports - breaks browser/Vite builds (web-ui)
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+// NEVER convert to top-level runtime imports - breaks browser/Vite builds
 let _os = null;
-const dynamicImport = (specifier) => import(specifier);
+const dynamicImport = (specifier) => import(__rewriteRelativeImportExtension(specifier));
 const NODE_OS_SPECIFIER = "node:" + "os";
 if (typeof process !== "undefined" && (process.versions?.node || process.versions?.bun)) {
     dynamicImport(NODE_OS_SPECIFIER).then((m) => {
         _os = m;
     });
 }
-import { getEnvApiKey } from "../env-api-keys.js";
-import { supportsXhigh } from "../models.js";
+import { clampThinkingLevel } from "../models.js";
+import { registerSessionResourceCleanup } from "../session-resources.js";
+import { combineAbortSignals } from "../utils/abort-signals.js";
+import { appendAssistantMessageDiagnostic, createAssistantMessageDiagnostic, formatThrownValue, } from "../utils/diagnostics.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
+import { headersToRecord } from "../utils/headers.js";
+import { clampOpenAIPromptCacheKey } from "./openai-prompt-cache.js";
 import { convertResponsesMessages, convertResponsesTools, processResponsesStream } from "./openai-responses-shared.js";
-import { buildBaseOptions, clampReasoning, clampToXhigh } from "./simple-options.js";
+import { buildBaseOptions, clampToXhigh } from "./simple-options.js";
 // ============================================================================
 // Configuration
 // ============================================================================
 const DEFAULT_CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 const JWT_CLAIM_PATH = "https://api.openai.com/auth";
-const MAX_RETRIES = 3;
+const DEFAULT_MAX_RETRIES = 0;
 const BASE_DELAY_MS = 1000;
+const DEFAULT_MAX_RETRY_DELAY_MS = 60_000;
+const DEFAULT_SSE_HEADER_TIMEOUT_MS = 10_000;
+const DEFAULT_WEBSOCKET_CONNECT_TIMEOUT_MS = 15_000;
 const CODEX_TOOL_CALL_PROVIDERS = new Set(["openai", "openai-codex", "opencode"]);
+const WEBSOCKET_MESSAGE_TOO_BIG_CLOSE_CODE = 1009;
 const CODEX_RESPONSE_STATUSES = new Set([
     "completed",
     "incomplete",
@@ -31,12 +47,44 @@ const CODEX_RESPONSE_STATUSES = new Set([
 // ============================================================================
 // Retry Helpers
 // ============================================================================
+function isTerminalRateLimitError(errorText) {
+    return /GoUsageLimitError|FreeUsageLimitError|Monthly usage limit reached|available balance|insufficient_quota|out of budget|quota exceeded|billing/i.test(errorText);
+}
 function isRetryableError(status, errorText) {
+    if (status === 429 && isTerminalRateLimitError(errorText)) {
+        return false;
+    }
     if (status === 429 || status === 500 || status === 502 || status === 503 || status === 504) {
         return true;
     }
     return /rate.?limit|overloaded|service.?unavailable|upstream.?connect|connection.?refused/i.test(errorText);
 }
+function getRetryAfterDelayMs(headers) {
+    const retryAfterMs = headers.get("retry-after-ms");
+    if (retryAfterMs !== null) {
+        const millis = Number(retryAfterMs);
+        if (Number.isFinite(millis)) {
+            return Math.max(0, millis);
+        }
+    }
+    const retryAfter = headers.get("retry-after");
+    if (!retryAfter) {
+        return undefined;
+    }
+    const seconds = Number(retryAfter);
+    if (Number.isFinite(seconds)) {
+        return Math.max(0, seconds * 1000);
+    }
+    const date = Date.parse(retryAfter);
+    if (!Number.isNaN(date)) {
+        return Math.max(0, date - Date.now());
+    }
+    return undefined;
+}
+function capRetryDelayMs(delayMs, options) {
+    const maxRetryDelayMs = options?.maxRetryDelayMs ?? DEFAULT_MAX_RETRY_DELAY_MS;
+    return maxRetryDelayMs > 0 ? Math.min(delayMs, maxRetryDelayMs) : delayMs;
+}
 function sleep(ms, signal) {
     return new Promise((resolve, reject) => {
         if (signal?.aborted) {
@@ -50,6 +98,27 @@ function sleep(ms, signal) {
         });
     });
 }
+function normalizeTimeoutMs(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Number.isFinite(value) || value < 0) {
+        throw new Error(`Invalid timeoutMs: ${String(value)}`);
+    }
+    return Math.floor(value);
+}
+function createSSEHeaderTimeout() {
+    const controller = new AbortController();
+    let error;
+    const timeout = setTimeout(() => {
+        error = new Error(`Codex SSE response headers timed out after ${DEFAULT_SSE_HEADER_TIMEOUT_MS}ms`);
+        controller.abort(error);
+    }, DEFAULT_SSE_HEADER_TIMEOUT_MS);
+    return {
+        signal: controller.signal,
+        clear: () => clearTimeout(timeout),
+        error: () => error,
+    };
+}
 // ============================================================================
 // Main Stream Function
 // ============================================================================
@@ -74,7 +143,7 @@ export const streamOpenAICodexResponses = (model, context, options) => {
             timestamp: Date.now(),
         };
         try {
-            const apiKey = options?.apiKey || getEnvApiKey(model.provider) || "";
+            const apiKey = options?.apiKey;
             if (!apiKey) {
                 throw new Error(`No API key for provider: ${model.provider}`);
             }
@@ -88,13 +157,19 @@ export const streamOpenAICodexResponses = (model, context, options) => {
             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";
-            if (transport !== "sse") {
+            const idleTimeoutMs = normalizeTimeoutMs(options?.timeoutMs);
+            const websocketConnectTimeoutMs = normalizeTimeoutMs(options?.websocketConnectTimeoutMs);
+            const transport = options?.transport || "auto";
+            const websocketDisabledForSession = transport !== "sse" && isWebSocketSseFallbackActive(options?.sessionId);
+            if (websocketDisabledForSession) {
+                recordWebSocketSseFallback(options?.sessionId);
+            }
+            if (transport !== "sse" && !websocketDisabledForSession) {
                 let websocketStarted = false;
                 try {
                     await processWebSocketStream(resolveCodexWebSocketUrl(model.baseUrl), body, websocketHeaders, output, stream, model, () => {
                         websocketStarted = true;
-                    }, options);
+                    }, idleTimeoutMs, websocketConnectTimeoutMs, options);
                     if (options?.signal?.aborted) {
                         throw new Error("Request was aborted");
                     }
@@ -107,31 +182,63 @@ export const streamOpenAICodexResponses = (model, context, options) => {
                     return;
                 }
                 catch (error) {
-                    if (transport === "websocket" || websocketStarted) {
+                    const aborted = options?.signal?.aborted;
+                    if (aborted || isCodexNonTransportError(error)) {
                         throw error;
                     }
+                    appendAssistantMessageDiagnostic(output, createAssistantMessageDiagnostic("provider_transport_failure", error, {
+                        configuredTransport: transport,
+                        fallbackTransport: websocketStarted ? undefined : "sse",
+                        eventsEmitted: websocketStarted,
+                        phase: websocketStarted ? "after_message_stream_start" : "before_message_stream_start",
+                        requestBytes: new TextEncoder().encode(bodyJson).byteLength,
+                    }));
+                    recordWebSocketFailure(options?.sessionId, error);
+                    if (websocketStarted) {
+                        throw error;
+                    }
+                    recordWebSocketSseFallback(options?.sessionId);
                 }
             }
             // Fetch with retry logic for rate limits and transient errors
             let response;
             let lastError;
-            for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+            const maxRetries = options?.maxRetries ?? DEFAULT_MAX_RETRIES;
+            for (let attempt = 0; attempt <= maxRetries; attempt++) {
                 if (options?.signal?.aborted) {
                     throw new Error("Request was aborted");
                 }
                 try {
-                    response = await fetch(resolveCodexUrl(model.baseUrl), {
-                        method: "POST",
-                        headers: sseHeaders,
-                        body: bodyJson,
-                        signal: options?.signal,
-                    });
+                    const headerTimeout = createSSEHeaderTimeout();
+                    const combinedSignal = combineAbortSignals([options?.signal, headerTimeout.signal]);
+                    try {
+                        response = await fetch(resolveCodexUrl(model.baseUrl), {
+                            method: "POST",
+                            headers: sseHeaders,
+                            body: bodyJson,
+                            signal: combinedSignal.signal,
+                        });
+                    }
+                    catch (error) {
+                        const timeoutError = headerTimeout.error();
+                        throw timeoutError && !options?.signal?.aborted ? timeoutError : error;
+                    }
+                    finally {
+                        combinedSignal.cleanup();
+                        headerTimeout.clear();
+                    }
+                    await options?.onResponse?.({ status: response.status, headers: headersToRecord(response.headers) }, model);
                     if (response.ok) {
                         break;
                     }
                     const errorText = await response.text();
-                    if (attempt < MAX_RETRIES && isRetryableError(response.status, errorText)) {
-                        const delayMs = BASE_DELAY_MS * 2 ** attempt;
+                    if (attempt < maxRetries && isRetryableError(response.status, errorText)) {
+                        const retryAfterDelayMs = getRetryAfterDelayMs(response.headers);
+                        const delayMs = retryAfterDelayMs === undefined
+                            ? BASE_DELAY_MS * 2 ** attempt
+                            : response.status === 429
+                                ? capRetryDelayMs(retryAfterDelayMs, options)
+                                : retryAfterDelayMs;
                         await sleep(delayMs, options?.signal);
                         continue;
                     }
@@ -151,7 +258,7 @@ export const streamOpenAICodexResponses = (model, context, options) => {
                     }
                     lastError = error instanceof Error ? error : new Error(String(error));
                     // Network errors are retryable
-                    if (attempt < MAX_RETRIES && !lastError.message.includes("usage limit")) {
+                    if (attempt < maxRetries && !lastError.message.includes("usage limit")) {
                         const delayMs = BASE_DELAY_MS * 2 ** attempt;
                         await sleep(delayMs, options?.signal);
                         continue;
@@ -166,7 +273,7 @@ export const streamOpenAICodexResponses = (model, context, options) => {
                 throw new Error("No response body");
             }
             stream.push({ type: "start", partial: output });
-            await processStream(response, output, stream, model);
+            await processStream(response, output, stream, model, options);
             if (options?.signal?.aborted) {
                 throw new Error("Request was aborted");
             }
@@ -174,6 +281,10 @@ export const streamOpenAICodexResponses = (model, context, options) => {
             stream.end();
         }
         catch (error) {
+            for (const block of output.content) {
+                // partialJson is only a streaming scratch buffer; never persist it.
+                delete block.partialJson;
+            }
             output.stopReason = options?.signal?.aborted ? "aborted" : "error";
             output.errorMessage = error instanceof Error ? error.message : String(error);
             stream.push({ type: "error", reason: output.stopReason, error: output });
@@ -183,12 +294,14 @@ export const streamOpenAICodexResponses = (model, context, options) => {
     return stream;
 };
 export const streamSimpleOpenAICodexResponses = (model, context, options) => {
-    const apiKey = options?.apiKey || getEnvApiKey(model.provider);
+    const apiKey = options?.apiKey;
     if (!apiKey) {
         throw new Error(`No API key for provider: ${model.provider}`);
     }
     const base = buildBaseOptions(model, options, apiKey);
-    const reasoningEffort = supportsXhigh(model) ? clampToXhigh(options?.reasoning) : clampReasoning(options?.reasoning);
+    const rawLevel = options?.reasoning ? clampThinkingLevel(model, options.reasoning) : undefined;
+    const clampedReasoning = rawLevel === "off" ? rawLevel : clampToXhigh(rawLevel);
+    const reasoningEffort = clampedReasoning === "off" ? undefined : clampedReasoning;
     return streamOpenAICodexResponses(model, context, {
         ...base,
         reasoningEffort,
@@ -205,37 +318,61 @@ function buildRequestBody(model, context, options) {
         model: model.id,
         store: false,
         stream: true,
-        instructions: context.systemPrompt,
+        instructions: context.systemPrompt || "You are a helpful assistant.",
         input: messages,
-        text: { verbosity: options?.textVerbosity || "medium" },
+        text: { verbosity: options?.textVerbosity || "low" },
         include: ["reasoning.encrypted_content"],
-        prompt_cache_key: options?.sessionId,
+        prompt_cache_key: clampOpenAIPromptCacheKey(options?.sessionId),
         tool_choice: "auto",
         parallel_tool_calls: true,
     };
     if (options?.temperature !== undefined) {
         body.temperature = options.temperature;
     }
-    if (context.tools) {
+    if (options?.serviceTier !== undefined) {
+        body.service_tier = options.serviceTier;
+    }
+    if (context.tools && context.tools.length > 0) {
         body.tools = convertResponsesTools(context.tools, { strict: null });
     }
     if (options?.reasoningEffort !== undefined) {
-        body.reasoning = {
-            effort: clampReasoningEffort(model.id, options.reasoningEffort),
-            summary: options.reasoningSummary ?? "auto",
-        };
+        const effort = options.reasoningEffort === "none"
+            ? (model.thinkingLevelMap?.off ?? "none")
+            : (model.thinkingLevelMap?.[options.reasoningEffort] ?? options.reasoningEffort);
+        if (effort !== null) {
+            body.reasoning = {
+                effort,
+                summary: options.reasoningSummary ?? "auto",
+            };
+        }
     }
     return body;
 }
-function clampReasoningEffort(modelId, effort) {
-    const id = modelId.includes("/") ? modelId.split("/").pop() : modelId;
-    if ((id.startsWith("gpt-5.2") || id.startsWith("gpt-5.3") || id.startsWith("gpt-5.4")) && effort === "minimal")
-        return "low";
-    if (id === "gpt-5.1" && effort === "xhigh")
-        return "high";
-    if (id === "gpt-5.1-codex-mini")
-        return effort === "high" || effort === "xhigh" ? "high" : "medium";
-    return effort;
+function getServiceTierCostMultiplier(model, serviceTier) {
+    switch (serviceTier) {
+        case "flex":
+            return 0.5;
+        case "priority":
+            return model.id === "gpt-5.5" ? 2.5 : 2;
+        default:
+            return 1;
+    }
+}
+function applyServiceTierPricing(usage, serviceTier, model) {
+    const multiplier = getServiceTierCostMultiplier(model, serviceTier);
+    if (multiplier === 1)
+        return;
+    usage.cost.input *= multiplier;
+    usage.cost.output *= multiplier;
+    usage.cost.cacheRead *= multiplier;
+    usage.cost.cacheWrite *= multiplier;
+    usage.cost.total = usage.cost.input + usage.cost.output + usage.cost.cacheRead + usage.cost.cacheWrite;
+}
+function resolveCodexServiceTier(responseServiceTier, requestServiceTier) {
+    if (responseServiceTier === "default" && (requestServiceTier === "flex" || requestServiceTier === "priority")) {
+        return requestServiceTier;
+    }
+    return responseServiceTier ?? requestServiceTier;
 }
 function resolveCodexUrl(baseUrl) {
     const raw = baseUrl && baseUrl.trim().length > 0 ? baseUrl : DEFAULT_CODEX_BASE_URL;
@@ -257,8 +394,35 @@ function resolveCodexWebSocketUrl(baseUrl) {
 // ============================================================================
 // Response Processing
 // ============================================================================
-async function processStream(response, output, stream, model) {
-    await processResponsesStream(mapCodexEvents(parseSSE(response)), output, stream, model);
+async function processStream(response, output, stream, model, options) {
+    await processResponsesStream(mapCodexEvents(parseSSE(response, options?.signal)), output, stream, model, {
+        serviceTier: options?.serviceTier,
+        resolveServiceTier: resolveCodexServiceTier,
+        applyServiceTierPricing: (usage, serviceTier) => applyServiceTierPricing(usage, serviceTier, model),
+    });
+}
+class CodexApiError extends Error {
+    code;
+    payload;
+    constructor(message, options) {
+        super(message);
+        this.name = "CodexApiError";
+        this.code = options?.code;
+        this.payload = options?.payload;
+        this.cause = options?.cause;
+    }
+}
+class CodexProtocolError extends Error {
+    payload;
+    constructor(message, options) {
+        super(message);
+        this.name = "CodexProtocolError";
+        this.payload = options?.payload;
+        this.cause = options?.cause;
+    }
+}
+function isCodexNonTransportError(error) {
+    return error instanceof CodexApiError || error instanceof CodexProtocolError;
 }
 async function* mapCodexEvents(events) {
     for await (const event of events) {
@@ -268,11 +432,16 @@ async function* mapCodexEvents(events) {
         if (type === "error") {
             const code = event.code || "";
             const message = event.message || "";
-            throw new Error(`Codex error: ${message || code || JSON.stringify(event)}`);
+            throw new CodexApiError(`Codex error: ${message || code || JSON.stringify(event)}`, {
+                code: code || undefined,
+                payload: event,
+            });
         }
         if (type === "response.failed") {
-            const msg = event.response?.error?.message;
-            throw new Error(msg || "Codex response failed");
+            const response = event.response;
+            const code = response?.error?.code;
+            const message = response?.error?.message;
+            throw new CodexApiError(message || "Codex response failed", { code, payload: event });
         }
         if (type === "response.done" || type === "response.completed" || type === "response.incomplete") {
             const response = event.response;
@@ -293,15 +462,25 @@ function normalizeCodexStatus(status) {
 // ============================================================================
 // SSE Parsing
 // ============================================================================
-async function* parseSSE(response) {
+async function* parseSSE(response, signal) {
     if (!response.body)
         return;
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
+    const onAbort = () => {
+        void reader.cancel().catch(() => { });
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
     try {
         while (true) {
+            if (signal?.aborted) {
+                throw new Error("Request was aborted");
+            }
             const { done, value } = await reader.read();
+            if (signal?.aborted) {
+                throw new Error("Request was aborted");
+            }
             if (done)
                 break;
             buffer += decoder.decode(value, { stream: true });
@@ -319,7 +498,12 @@ async function* parseSSE(response) {
                         try {
                             yield JSON.parse(data);
                         }
-                        catch { }
+                        catch (cause) {
+                            throw new CodexProtocolError(`Invalid Codex SSE JSON: ${formatThrownValue(cause)}`, {
+                                cause,
+                                payload: data,
+                            });
+                        }
                     }
                 }
                 idx = buffer.indexOf("\n\n");
@@ -327,6 +511,7 @@ async function* parseSSE(response) {
         }
     }
     finally {
+        signal?.removeEventListener("abort", onAbort);
         try {
             await reader.cancel();
         }
@@ -343,18 +528,119 @@ async function* parseSSE(response) {
 const OPENAI_BETA_RESPONSES_WEBSOCKETS = "responses_websockets=2026-02-06";
 const SESSION_WEBSOCKET_CACHE_TTL_MS = 5 * 60 * 1000;
 const websocketSessionCache = new Map();
-function getWebSocketConstructor() {
+const websocketDebugStats = new Map();
+const websocketSseFallbackSessions = new Set();
+function getOrCreateWebSocketDebugStats(sessionId) {
+    let stats = websocketDebugStats.get(sessionId);
+    if (!stats) {
+        stats = {
+            requests: 0,
+            connectionsCreated: 0,
+            connectionsReused: 0,
+            cachedContextRequests: 0,
+            storeTrueRequests: 0,
+            fullContextRequests: 0,
+            deltaRequests: 0,
+            lastInputItems: 0,
+            websocketFailures: 0,
+            sseFallbacks: 0,
+        };
+        websocketDebugStats.set(sessionId, stats);
+    }
+    return stats;
+}
+export function getOpenAICodexWebSocketDebugStats(sessionId) {
+    const stats = websocketDebugStats.get(sessionId);
+    return stats ? { ...stats } : undefined;
+}
+export function resetOpenAICodexWebSocketDebugStats(sessionId) {
+    if (sessionId) {
+        websocketDebugStats.delete(sessionId);
+        websocketSseFallbackSessions.delete(sessionId);
+        return;
+    }
+    websocketDebugStats.clear();
+    websocketSseFallbackSessions.clear();
+}
+export function closeOpenAICodexWebSocketSessions(sessionId) {
+    const closeEntry = (entry) => {
+        if (entry.idleTimer)
+            clearTimeout(entry.idleTimer);
+        closeWebSocketSilently(entry.socket, 1000, "debug_close");
+    };
+    if (sessionId) {
+        const entry = websocketSessionCache.get(sessionId);
+        if (entry)
+            closeEntry(entry);
+        websocketSessionCache.delete(sessionId);
+        return;
+    }
+    for (const entry of websocketSessionCache.values()) {
+        closeEntry(entry);
+    }
+    websocketSessionCache.clear();
+}
+registerSessionResourceCleanup(closeOpenAICodexWebSocketSessions);
+function isWebSocketSseFallbackActive(sessionId) {
+    return sessionId ? websocketSseFallbackSessions.has(sessionId) : false;
+}
+function recordWebSocketSseFallback(sessionId) {
+    if (!sessionId)
+        return;
+    const stats = getOrCreateWebSocketDebugStats(sessionId);
+    stats.sseFallbacks++;
+    stats.websocketFallbackActive = isWebSocketSseFallbackActive(sessionId);
+}
+function recordWebSocketFailure(sessionId, error) {
+    if (!sessionId)
+        return;
+    websocketSseFallbackSessions.add(sessionId);
+    const stats = getOrCreateWebSocketDebugStats(sessionId);
+    stats.websocketFailures++;
+    stats.lastWebSocketError = formatThrownValue(error);
+    stats.websocketFallbackActive = true;
+}
+let _cachedWebsocket = null;
+async function getWebSocketConstructor() {
+    if (_cachedWebsocket)
+        return _cachedWebsocket;
+    // bun doesn't respect http proxy envs, ref: https://github.com/oven-sh/bun/issues/15489
+    // TODO: remove this when bun supports proxy envs in websocket.
+    if (process?.versions?.bun &&
+        (process.env.HTTP_PROXY || process.env.HTTPS_PROXY || process.env.http_proxy || process.env.https_proxy)) {
+        const m = await dynamicImport("proxy-from-env");
+        const getProxyForUrl = m.getProxyForUrl;
+        _cachedWebsocket = class extends WebSocket {
+            constructor(url, options) {
+                let _opts = {};
+                if (Array.isArray(options) || typeof options === "string") {
+                    _opts = { protocols: options };
+                }
+                else {
+                    _opts = { ...options };
+                }
+                const proxy = getProxyForUrl(url.toString().replace(/^wss:/, "https:").replace(/^ws:/, "http:"));
+                super(url, { ..._opts, ...(proxy ? { proxy } : {}) });
+            }
+        };
+        return _cachedWebsocket;
+    }
     const ctor = globalThis.WebSocket;
     if (typeof ctor !== "function")
         return null;
     return ctor;
 }
-function headersToRecord(headers) {
-    const out = {};
-    for (const [key, value] of headers.entries()) {
-        out[key] = value;
+class WebSocketCloseError extends Error {
+    code;
+    reason;
+    wasClean;
+    constructor(message, options) {
+        super(message);
+        this.name = "WebSocketCloseError";
+        this.code = options?.code;
+        this.reason = options?.reason;
+        this.wasClean = options?.wasClean;
     }
-    return out;
 }
 function getWebSocketReadyState(socket) {
     const readyState = socket.readyState;
@@ -382,8 +668,8 @@ function scheduleSessionWebSocketExpiry(sessionId, entry) {
         websocketSessionCache.delete(sessionId);
     }, SESSION_WEBSOCKET_CACHE_TTL_MS);
 }
-async function connectWebSocket(url, headers, signal) {
-    const WebSocketCtor = getWebSocketConstructor();
+async function connectWebSocket(url, headers, signal, connectTimeoutMs = DEFAULT_WEBSOCKET_CONNECT_TIMEOUT_MS) {
+    const WebSocketCtor = await getWebSocketConstructor();
     if (!WebSocketCtor) {
         throw new Error("WebSocket transport is not available in this runtime");
     }
@@ -391,6 +677,7 @@ async function connectWebSocket(url, headers, signal) {
     delete wsHeaders["OpenAI-Beta"];
     return new Promise((resolve, reject) => {
         let settled = false;
+        let timeout;
         let socket;
         try {
             socket = new WebSocketCtor(url, { headers: wsHeaders });
@@ -399,61 +686,63 @@ async function connectWebSocket(url, headers, signal) {
             reject(error instanceof Error ? error : new Error(String(error)));
             return;
         }
-        const onOpen = () => {
-            if (settled)
-                return;
-            settled = true;
-            cleanup();
-            resolve(socket);
+        const cleanup = () => {
+            if (timeout) {
+                clearTimeout(timeout);
+                timeout = undefined;
+            }
+            socket.removeEventListener("open", onOpen);
+            socket.removeEventListener("error", onError);
+            socket.removeEventListener("close", onClose);
+            signal?.removeEventListener("abort", onAbort);
         };
-        const onError = (event) => {
-            const error = extractWebSocketError(event);
+        const fail = (error, closeReason) => {
             if (settled)
                 return;
             settled = true;
             cleanup();
+            if (closeReason) {
+                closeWebSocketSilently(socket, 1000, closeReason);
+            }
             reject(error);
         };
-        const onClose = (event) => {
-            const error = extractWebSocketCloseError(event);
+        const onOpen = () => {
             if (settled)
                 return;
             settled = true;
             cleanup();
-            reject(error);
+            resolve(socket);
         };
-        const onAbort = () => {
-            if (settled)
-                return;
-            settled = true;
-            cleanup();
-            socket.close(1000, "aborted");
-            reject(new Error("Request was aborted"));
+        const onError = (event) => {
+            fail(extractWebSocketError(event));
         };
-        const cleanup = () => {
-            socket.removeEventListener("open", onOpen);
-            socket.removeEventListener("error", onError);
-            socket.removeEventListener("close", onClose);
-            signal?.removeEventListener("abort", onAbort);
+        const onClose = (event) => {
+            fail(extractWebSocketCloseError(event));
+        };
+        const onAbort = () => {
+            fail(new Error("Request was aborted"), "aborted");
         };
         socket.addEventListener("open", onOpen);
         socket.addEventListener("error", onError);
         socket.addEventListener("close", onClose);
         signal?.addEventListener("abort", onAbort);
+        if (connectTimeoutMs > 0) {
+            timeout = setTimeout(() => {
+                fail(new Error(`WebSocket connect timeout after ${connectTimeoutMs}ms`), "connect_timeout");
+            }, connectTimeoutMs);
+        }
+        if (signal?.aborted) {
+            onAbort();
+        }
     });
 }
-async function acquireWebSocket(url, headers, sessionId, signal) {
+async function acquireWebSocket(url, headers, sessionId, signal, connectTimeoutMs) {
     if (!sessionId) {
-        const socket = await connectWebSocket(url, headers, signal);
+        const socket = await connectWebSocket(url, headers, signal, connectTimeoutMs);
         return {
             socket,
-            release: ({ keep } = {}) => {
-                if (keep === false) {
-                    closeWebSocketSilently(socket);
-                    return;
-                }
-                closeWebSocketSilently(socket);
-            },
+            reused: false,
+            release: () => closeWebSocketSilently(socket),
         };
     }
     const cached = websocketSessionCache.get(sessionId);
@@ -466,6 +755,8 @@ async function acquireWebSocket(url, headers, sessionId, signal) {
             cached.busy = true;
             return {
                 socket: cached.socket,
+                entry: cached,
+                reused: true,
                 release: ({ keep } = {}) => {
                     if (!keep || !isWebSocketReusable(cached.socket)) {
                         closeWebSocketSilently(cached.socket);
@@ -478,9 +769,10 @@ async function acquireWebSocket(url, headers, sessionId, signal) {
             };
         }
         if (cached.busy) {
-            const socket = await connectWebSocket(url, headers, signal);
+            const socket = await connectWebSocket(url, headers, signal, connectTimeoutMs);
             return {
                 socket,
+                reused: false,
                 release: () => {
                     closeWebSocketSilently(socket);
                 },
@@ -491,11 +783,13 @@ async function acquireWebSocket(url, headers, sessionId, signal) {
             websocketSessionCache.delete(sessionId);
         }
     }
-    const socket = await connectWebSocket(url, headers, signal);
+    const socket = await connectWebSocket(url, headers, signal, connectTimeoutMs);
     const entry = { socket, busy: true };
     websocketSessionCache.set(sessionId, entry);
     return {
         socket,
+        entry,
+        reused: false,
         release: ({ keep } = {}) => {
             if (!keep || !isWebSocketReusable(entry.socket)) {
                 closeWebSocketSilently(entry.socket);
@@ -512,11 +806,21 @@ async function acquireWebSocket(url, headers, sessionId, signal) {
     };
 }
 function extractWebSocketError(event) {
-    if (event && typeof event === "object" && "message" in event) {
-        const message = event.message;
+    if (event && typeof event === "object") {
+        const message = "message" in event ? event.message : undefined;
         if (typeof message === "string" && message.length > 0) {
             return new Error(message);
         }
+        const nestedError = "error" in event ? event.error : undefined;
+        if (nestedError instanceof Error && nestedError.message.length > 0) {
+            return nestedError;
+        }
+        if (nestedError && typeof nestedError === "object" && "message" in nestedError) {
+            const nestedMessage = nestedError.message;
+            if (typeof nestedMessage === "string" && nestedMessage.length > 0) {
+                return new Error(nestedMessage);
+            }
+        }
     }
     return new Error("WebSocket error");
 }
@@ -524,9 +828,17 @@ function extractWebSocketCloseError(event) {
     if (event && typeof event === "object") {
         const code = "code" in event ? event.code : undefined;
         const reason = "reason" in event ? event.reason : undefined;
+        const wasClean = "wasClean" in event ? event.wasClean : undefined;
         const codeText = typeof code === "number" ? ` ${code}` : "";
-        const reasonText = typeof reason === "string" && reason.length > 0 ? ` ${reason}` : "";
-        return new Error(`WebSocket closed${codeText}${reasonText}`.trim());
+        let reasonText = typeof reason === "string" && reason.length > 0 ? ` ${reason}` : "";
+        if (!reasonText && code === WEBSOCKET_MESSAGE_TOO_BIG_CLOSE_CODE) {
+            reasonText = " message too big";
+        }
+        return new WebSocketCloseError(`WebSocket closed${codeText}${reasonText}`.trim(), {
+            code: typeof code === "number" ? code : undefined,
+            reason: typeof reason === "string" && reason.length > 0 ? reason : undefined,
+            wasClean: typeof wasClean === "boolean" ? wasClean : undefined,
+        });
     }
     return new Error("WebSocket closed");
 }
@@ -547,7 +859,7 @@ async function decodeWebSocketData(data) {
     }
     return null;
 }
-async function* parseWebSocket(socket, signal) {
+async function* parseWebSocket(socket, signal, idleTimeoutMs) {
     const queue = [];
     let pending = null;
     let done = false;
@@ -562,12 +874,13 @@ async function* parseWebSocket(socket, signal) {
     };
     const onMessage = (event) => {
         void (async () => {
-            if (!event || typeof event !== "object" || !("data" in event))
-                return;
-            const text = await decodeWebSocketData(event.data);
-            if (!text)
-                return;
+            let text = null;
             try {
+                if (!event || typeof event !== "object" || !("data" in event))
+                    return;
+                text = await decodeWebSocketData(event.data);
+                if (!text)
+                    return;
                 const parsed = JSON.parse(text);
                 const type = typeof parsed.type === "string" ? parsed.type : "";
                 if (type === "response.completed" || type === "response.done" || type === "response.incomplete") {
@@ -577,7 +890,14 @@ async function* parseWebSocket(socket, signal) {
                 queue.push(parsed);
                 wake();
             }
-            catch { }
+            catch (cause) {
+                failed = new CodexProtocolError(`Invalid Codex WebSocket JSON: ${formatThrownValue(cause)}`, {
+                    cause,
+                    payload: text,
+                });
+                done = true;
+                wake();
+            }
         })();
     };
     const onError = (event) => {
@@ -617,8 +937,23 @@ async function* parseWebSocket(socket, signal) {
             }
             if (done)
                 break;
-            await new Promise((resolve) => {
+            let timeout;
+            await new Promise((resolve, reject) => {
                 pending = resolve;
+                if (idleTimeoutMs !== undefined && idleTimeoutMs > 0) {
+                    timeout = setTimeout(() => {
+                        const error = new Error(`WebSocket idle timeout after ${idleTimeoutMs}ms`);
+                        failed = error;
+                        done = true;
+                        pending = null;
+                        closeWebSocketSilently(socket, 1000, "idle_timeout");
+                        reject(error);
+                    }, idleTimeoutMs);
+                }
+            }).finally(() => {
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
             });
         }
         if (failed) {
@@ -635,19 +970,114 @@ async function* parseWebSocket(socket, signal) {
         signal?.removeEventListener("abort", onAbort);
     }
 }
-async function processWebSocketStream(url, body, headers, output, stream, model, onStart, options) {
-    const { socket, release } = await acquireWebSocket(url, headers, options?.sessionId, options?.signal);
+function requestBodyWithoutInput(body) {
+    const { input: _input, previous_response_id: _previousResponseId, ...rest } = body;
+    return rest;
+}
+function responseInputsEqual(a, b) {
+    return JSON.stringify(a ?? []) === JSON.stringify(b ?? []);
+}
+function requestBodiesMatchExceptInput(a, b) {
+    return JSON.stringify(requestBodyWithoutInput(a)) === JSON.stringify(requestBodyWithoutInput(b));
+}
+function getCachedWebSocketInputDelta(body, continuation) {
+    if (!requestBodiesMatchExceptInput(body, continuation.lastRequestBody)) {
+        return undefined;
+    }
+    const currentInput = body.input ?? [];
+    const baseline = [...(continuation.lastRequestBody.input ?? []), ...continuation.lastResponseItems];
+    if (currentInput.length < baseline.length) {
+        return undefined;
+    }
+    const prefix = currentInput.slice(0, baseline.length);
+    if (!responseInputsEqual(prefix, baseline)) {
+        return undefined;
+    }
+    return currentInput.slice(baseline.length);
+}
+function buildCachedWebSocketRequestBody(entry, body) {
+    const continuation = entry.continuation;
+    if (!continuation) {
+        return body;
+    }
+    const delta = getCachedWebSocketInputDelta(body, continuation);
+    if (!delta || !continuation.lastResponseId) {
+        entry.continuation = undefined;
+        return body;
+    }
+    return {
+        ...body,
+        previous_response_id: continuation.lastResponseId,
+        input: delta,
+    };
+}
+async function* startWebSocketOutputOnFirstEvent(events, output, stream, onStart) {
+    let started = false;
+    for await (const event of events) {
+        if (!started) {
+            started = true;
+            onStart();
+            stream.push({ type: "start", partial: output });
+        }
+        yield event;
+    }
+}
+async function processWebSocketStream(url, body, headers, output, stream, model, onStart, idleTimeoutMs, websocketConnectTimeoutMs, options) {
+    const { socket, entry, reused, release } = await acquireWebSocket(url, headers, options?.sessionId, options?.signal, websocketConnectTimeoutMs);
     let keepConnection = true;
+    const useCachedContext = options?.transport === "websocket-cached" || options?.transport === "auto";
+    // ChatGPT Codex Responses rejects `store: true` ("Store must be set to false").
+    // WebSocket continuation still works via connection-scoped previous_response_id state.
+    const fullBody = body;
+    const requestBody = useCachedContext && entry ? buildCachedWebSocketRequestBody(entry, fullBody) : fullBody;
+    const stats = options?.sessionId ? getOrCreateWebSocketDebugStats(options.sessionId) : undefined;
+    if (stats) {
+        stats.requests++;
+        if (reused)
+            stats.connectionsReused++;
+        else
+            stats.connectionsCreated++;
+        if (useCachedContext)
+            stats.cachedContextRequests++;
+        if (requestBody.store === true)
+            stats.storeTrueRequests++;
+        stats.lastInputItems = requestBody.input?.length ?? 0;
+        if (requestBody.previous_response_id) {
+            stats.deltaRequests++;
+            stats.lastDeltaInputItems = requestBody.input?.length ?? 0;
+            stats.lastPreviousResponseId = requestBody.previous_response_id;
+        }
+        else {
+            stats.fullContextRequests++;
+            stats.lastDeltaInputItems = undefined;
+            stats.lastPreviousResponseId = undefined;
+        }
+    }
     try {
-        socket.send(JSON.stringify({ type: "response.create", ...body }));
-        onStart();
-        stream.push({ type: "start", partial: output });
-        await processResponsesStream(mapCodexEvents(parseWebSocket(socket, options?.signal)), output, stream, model);
+        socket.send(JSON.stringify({ type: "response.create", ...requestBody }));
+        await processResponsesStream(startWebSocketOutputOnFirstEvent(mapCodexEvents(parseWebSocket(socket, options?.signal, idleTimeoutMs)), output, stream, onStart), output, stream, model, {
+            serviceTier: options?.serviceTier,
+            resolveServiceTier: resolveCodexServiceTier,
+            applyServiceTierPricing: (usage, serviceTier) => applyServiceTierPricing(usage, serviceTier, model),
+        });
         if (options?.signal?.aborted) {
             keepConnection = false;
         }
+        else if (useCachedContext && entry && output.responseId) {
+            const responseItems = convertResponsesMessages(model, { messages: [output] }, CODEX_TOOL_CALL_PROVIDERS, {
+                includeSystemPrompt: false,
+            }).filter((item) => item.type !== "function_call_output");
+            entry.continuation = {
+                lastRequestBody: fullBody,
+                lastResponseId: output.responseId,
+                lastResponseItems: responseItems,
+            };
+        }
     }
     catch (error) {
+        if (entry) {
+            entry.continuation = undefined;
+        }
         keepConnection = false;
         throw error;
     }
@@ -712,7 +1142,7 @@ function buildBaseCodexHeaders(initHeaders, additionalHeaders, accountId, token)
     }
     headers.set("Authorization", `Bearer ${token}`);
     headers.set("chatgpt-account-id", accountId);
-    headers.set("originator", "draht");
+    headers.set("originator", "pi");
     const userAgent = _os ? `pi (${_os.platform()} ${_os.release()}; ${_os.arch()})` : "pi (browser)";
     headers.set("User-Agent", userAgent);
     return headers;
@@ -723,7 +1153,8 @@ function buildSSEHeaders(initHeaders, additionalHeaders, accountId, token, sessi
     headers.set("accept", "text/event-stream");
     headers.set("content-type", "application/json");
     if (sessionId) {
-        headers.set("session_id", sessionId);
+        headers.set("session-id", sessionId);
+        headers.set("x-client-request-id", sessionId);
     }
     return headers;
 }
@@ -735,7 +1166,7 @@ function buildWebSocketHeaders(initHeaders, additionalHeaders, accountId, token,
     headers.delete("openai-beta");
     headers.set("OpenAI-Beta", OPENAI_BETA_RESPONSES_WEBSOCKETS);
     headers.set("x-client-request-id", requestId);
-    headers.set("session_id", requestId);
+    headers.set("session-id", requestId);
     return headers;
 }
 //# sourceMappingURL=openai-codex-responses.js.map