@qduc/term2 0.20.0 → 0.22.0

package/dist/providers/codex-compact.d.ts

@@ -1,4 +1,6 @@
 import type { ProviderInputItem } from '../contracts/provider-input.js';
+/** Explicit compact-endpoint incompatibility, not a transient or history error. */
+export declare function isCodexCompactionIncompatible(error: unknown): boolean;
 /**
  * Codex (chatgpt.com) does not accept Responses `context_management` on ordinary
  * turns. Compaction uses the Responses endpoint with a trailing

package/dist/providers/codex-compact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-compact.d.ts","sourceRoot":"","sources":["../../source/providers/codex-compact.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGxE;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAc9F"}
+{"version":3,"file":"codex-compact.d.ts","sourceRoot":"","sources":["../../source/providers/codex-compact.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGxE,mFAAmF;AACnF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAWrE;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAc9F"}

package/dist/providers/codex-compact.js

@@ -1,4 +1,18 @@
 import { OPENAI_RESPONSES_OPAQUE_TAG } from './provider-opaque-compatibility.js';
+/** Explicit compact-endpoint incompatibility, not a transient or history error. */
+export function isCodexCompactionIncompatible(error) {
+    if (!error || typeof error !== 'object')
+        return false;
+    const record = error;
+    const status = record.status ?? record.statusCode;
+    if (status === 404 || status === 405)
+        return true;
+    if (status !== 400 && status !== 422)
+        return false;
+    const message = [record.message, record.error?.message].filter((value) => typeof value === 'string').join(' ');
+    return (/compaction_trigger|context_management|parallel_tool_calls|reasoning\.context/i.test(message) &&
+        /unsupported|not support|requires|unknown (?:field|parameter)|unrecognized/i.test(message));
+}
 /**
  * Codex (chatgpt.com) does not accept Responses `context_management` on ordinary
  * turns. Compaction uses the Responses endpoint with a trailing

package/dist/providers/codex-compact.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-compact.js","sourceRoot":"","sources":["../../source/providers/codex-compact.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAA0B;IACvE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,MAAM,GAAG,IAA+B,CAAC;QAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACjC,OAAO;gBACL,GAAG,MAAM;gBACT,cAAc,EAAE,EAAE,QAAQ,EAAE,2BAA2B,EAAE;aAC1D,CAAC;QACJ,CAAC;QACD,OAAO,MAA2B,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"codex-compact.js","sourceRoot":"","sources":["../../source/providers/codex-compact.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF,mFAAmF;AACnF,MAAM,UAAU,6BAA6B,CAAC,KAAc;IAC1D,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,MAAM,GAAG,KAAmG,CAAC;IACnH,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;IAClD,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAClD,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC;IACnD,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/G,OAAO,CACL,+EAA+E,CAAC,IAAI,CAAC,OAAO,CAAC;QAC7F,4EAA4E,CAAC,IAAI,CAAC,OAAO,CAAC,CAC3F,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAA0B;IACvE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,MAAM,GAAG,IAA+B,CAAC;QAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACjC,OAAO;gBACL,GAAG,MAAM;gBACT,cAAc,EAAE,EAAE,QAAQ,EAAE,2BAA2B,EAAE;aAC1D,CAAC;QACJ,CAAC;QACD,OAAO,MAA2B,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/providers/codex-responses-model.d.ts

@@ -1,4 +1,4 @@
-import type { ContextCompactionSessionState, StreamedModelTurn, StreamedModelTurnEvent, StreamedModelTurnInput, StreamedModelTurnRequest } from '../contracts/streamed-model-turn.js';
+import type { ContextCompactionSessionState, StreamedModelConversationResetOptions, StreamedModelTurn, StreamedModelTurnEvent, StreamedModelTurnInput, StreamedModelTurnRequest } from '../contracts/streamed-model-turn.js';
 import type { ISessionContextService, IProviderTraffic } from '../services/service-interfaces.js';
 import { type ProviderRequestCapture } from './provider-request-capture.js';
 import { type WebSocketReceiveTimeouts } from './websocket-receive-watchdog.js';
@@ -7,6 +7,13 @@ export type CodexResponsesTransportOptions = {
     supportsContextCompaction?: boolean;
     contextCompactionSessionState?: ContextCompactionSessionState;
 };
+export type CodexTransportRequestContext = {
+    onConnectionAcquired?: (details: {
+        connectionId: string;
+        reused: boolean;
+        affinityKey?: string;
+    }) => void;
+};
 /** Provider-owned transport seam used by Codex's HTTP and WebSocket models. */
 export declare class CodexResponsesTransport {
     #private;
@@ -24,7 +31,7 @@ export declare class CodexResponsesTransport {
         history: ReturnType<typeof compactOutputToProviderHistory>;
     }>;
     buildResponsesCreateRequest(request: StreamedModelTurnRequest, stream: boolean): any;
-    fetchResponse(request: StreamedModelTurnRequest, stream: boolean, requestData: any): Promise<any>;
+    fetchResponse(request: StreamedModelTurnRequest, stream: boolean, requestData: any, requestContext?: CodexTransportRequestContext): Promise<any>;
 }
 export declare class OpenAIResponsesModel implements StreamedModelTurn {
     protected readonly client: any;
@@ -40,7 +47,7 @@ export declare class OpenAIResponsesModel implements StreamedModelTurn {
         history: ReturnType<typeof compactOutputToProviderHistory>;
     }>;
     protected buildResponsesCreateRequest(request: StreamedModelTurnRequest, stream: boolean): any;
-    protected fetchResponse(request: StreamedModelTurnRequest, stream: boolean): Promise<any>;
+    protected fetchResponse(request: StreamedModelTurnRequest, stream: boolean, requestContext?: CodexTransportRequestContext): Promise<any>;
     protected fetchUnaryResponse(request: StreamedModelTurnRequest): Promise<any>;
     protected rawStream(request: StreamedModelTurnRequest): AsyncIterable<any>;
     stream(request: StreamedModelTurnRequest): AsyncIterable<StreamedModelTurnEvent>;
@@ -70,6 +77,19 @@ export declare class CodexResponsesWSModel extends OpenAIResponsesWSModel {
     private readonly requestTokens;
     private readonly websocketReceiveTimeouts;
     constructor(client: any, modelId: string, tokenManager: any, diagnosticLogger?: DiagnosticLogger | CodexResponsesTransport, providerTraffic?: IProviderTraffic | CodexResponsesTransport, sessionContextService?: ISessionContextService | CodexResponsesTransport, websocketReceiveTimeouts?: WebSocketReceiveTimeouts | CodexResponsesTransport, requestCapture?: ProviderRequestCapture | CodexResponsesTransport, transport?: CodexResponsesTransport);
+    /**
+     * Drop server-history bookkeeping for one logical scope while leaving the
+     * provider transport pool alive. Rollover supplies the predecessor key;
+     * refusing an unscoped reset protects live nested scopes sharing this model.
+     */
+    resetConversationState(options?: StreamedModelConversationResetOptions): void;
+    compactHistory(request: {
+        input: readonly StreamedModelTurnInput[];
+        instructions?: string;
+        signal?: AbortSignal;
+    }): Promise<{
+        history: ReturnType<typeof compactOutputToProviderHistory>;
+    }>;
     protected fetchUnaryResponse(request: StreamedModelTurnRequest): Promise<any>;
     protected rawStream(request: StreamedModelTurnRequest): AsyncIterable<any>;
     buildResponsesCreateRequest(request: StreamedModelTurnRequest, stream: boolean): any;

package/dist/providers/codex-responses-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-responses-model.d.ts","sourceRoot":"","sources":["../../source/providers/codex-responses-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-responses-model.d.ts","sourceRoot":"","sources":["../../source/providers/codex-responses-model.ts"],"names":[],"mappings":"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"}

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

@@ -6,6 +6,7 @@ import { sanitizeHeaders } from '../utils/header-sanitizer.js';
 import { AbortedStreamRecorder } from './aborted-stream-recorder.js';
 import { isOrphanedChainedToolOutputError, OrphanedChainedToolOutputError } from '../lib/chained-input-filter.js';
 import { AmbiguousModelOutcomeError, ConversationStateNoProgressError } from '../services/retry/retry-errors.js';
+import { isClassifiedCancellation } from '../services/retry/provider-failure-classification.js';
 import { fingerprintChainRequest } from '../services/retry/chain-recovery-fingerprint.js';
 import { ChainedWireState } from './chained-wire-state.js';
 import { LunaResponsesLiteWireProtocol } from './luna-responses-lite-wire-protocol.js';
@@ -32,6 +33,30 @@ function toCodexToolChoice(choice) {
     }
     throw new Error('Unsupported Codex tool choice.');
 }
+function toCodexResponsesTool(tool) {
+    if (tool.type === 'custom') {
+        return {
+            type: 'custom',
+            name: tool.name,
+            ...(tool.description ? { description: tool.description } : {}),
+            format: tool.format,
+        };
+    }
+    return {
+        type: 'function',
+        name: tool.name,
+        ...(tool.description ? { description: tool.description } : {}),
+        parameters: tool.parameters,
+        ...(tool.strict !== undefined ? { strict: tool.strict } : {}),
+    };
+}
+function toCodexToolChoiceForTools(choice, tools) {
+    if (choice && typeof choice === 'object' && typeof choice.name === 'string') {
+        const selected = tools.find((tool) => tool.name === choice.name);
+        return { type: selected?.type === 'custom' ? 'custom' : 'function', name: choice.name };
+    }
+    return toCodexToolChoice(choice);
+}
 const TERMINAL_RESPONSE_EVENT_TYPES = new Set([
     'response.completed',
     'response.failed',
@@ -64,10 +89,15 @@ export class CodexResponsesTransport {
         const stream = await this.client.responses.create({
             model: this.model,
             input: [...request.input, { type: 'compaction_trigger' }],
-            parallel_tool_calls: true,
+            parallel_tool_calls: !isCodexResponsesLiteModel(this.model),
             stream: true,
             store: false,
             include: ['reasoning.encrypted_content'],
+            // The Responses-Lite lane rejects compaction without an explicit
+            // reasoning context (400 `requires reasoning.context all_turns`);
+            // ordinary turns already carry this via request normalization, but
+            // the compaction call builds its own body and must set it itself.
+            ...(isCodexResponsesLiteModel(this.model) ? { reasoning: { context: 'all_turns' } } : {}),
             ...(request.instructions !== undefined ? { instructions: request.instructions } : {}),
         }, request.signal ? { signal: request.signal } : undefined);
         let compactionItem;
@@ -102,8 +132,10 @@ export class CodexResponsesTransport {
                 input: toCodexResponsesInput(request.input),
                 stream,
                 ...(request.instructions !== undefined ? { instructions: request.instructions } : {}),
-                ...(request.tools.length > 0 ? { tools: request.tools.map((tool) => ({ type: 'function', ...tool })) } : {}),
-                ...(request.toolChoice !== undefined ? { tool_choice: toCodexToolChoice(request.toolChoice) } : {}),
+                ...(request.tools.length > 0 ? { tools: request.tools.map(toCodexResponsesTool) } : {}),
+                ...(request.toolChoice !== undefined
+                    ? { tool_choice: toCodexToolChoiceForTools(request.toolChoice, request.tools) }
+                    : {}),
                 ...(request.temperature !== undefined ? { temperature: request.temperature } : {}),
                 ...(request.topP !== undefined ? { top_p: request.topP } : {}),
                 ...(request.frequencyPenalty !== undefined ? { frequency_penalty: request.frequencyPenalty } : {}),
@@ -118,14 +150,23 @@ export class CodexResponsesTransport {
             },
         };
     }
-    async fetchResponse(request, stream, requestData) {
+    async fetchResponse(request, stream, requestData, requestContext) {
         try {
             if (stream && this.websocket) {
                 if (!(this.client instanceof OpenAI) && typeof this.client?.responses?.create === 'function') {
                     return this.client.responses.create(requestData);
                 }
                 const headers = request.providerOptions?.extraHeaders;
-                const socket = this.#sessions.acquire(headers);
+                const affinityKey = typeof request.codex?.promptCacheKey === 'string' && request.codex.promptCacheKey.length > 0
+                    ? request.codex.promptCacheKey
+                    : undefined;
+                const acquisition = this.#sessions.acquireWithMetadata(headers, { affinityKey });
+                const socket = acquisition.socket;
+                requestContext?.onConnectionAcquired?.({
+                    connectionId: acquisition.connectionId,
+                    reused: acquisition.reused,
+                    ...(affinityKey ? { affinityKey } : {}),
+                });
                 const messages = socket.stream();
                 const requestEvent = { type: 'response.create', ...requestData };
                 // Until the frame is written to an OPEN socket it is still ours, so a
@@ -177,6 +218,12 @@ export class CodexResponsesTransport {
                                 const event = message.message;
                                 if (TERMINAL_RESPONSE_EVENT_TYPES.has(event?.type) || event?.type === 'response.completed') {
                                     terminalReceived = true;
+                                    // The terminal frame proves this lease is no longer in
+                                    // flight. Release before yielding it: the application can
+                                    // settle a rollover immediately after observing the
+                                    // terminal event, before this generator is resumed for its
+                                    // finally block.
+                                    release(true);
                                 }
                                 yield event;
                             }
@@ -184,6 +231,7 @@ export class CodexResponsesTransport {
                                 const event = message.event;
                                 if (TERMINAL_RESPONSE_EVENT_TYPES.has(event?.type) || event?.type === 'response.completed') {
                                     terminalReceived = true;
+                                    release(true);
                                 }
                                 yield event;
                             }
@@ -254,9 +302,9 @@ export class OpenAIResponsesModel {
         }
         return built;
     }
-    async fetchResponse(request, stream) {
+    async fetchResponse(request, stream, requestContext) {
         const built = this.buildResponsesCreateRequest(request, stream);
-        return this.transport.fetchResponse(request, stream, built.requestData);
+        return this.transport.fetchResponse(request, stream, built.requestData, requestContext);
     }
     async fetchUnaryResponse(request) {
         return this.fetchResponse(request, false);
@@ -349,7 +397,8 @@ async function* convertCodexRawStream(source) {
         else if (event?.type === 'response.output_item.added' && event.output_item?.type === 'compaction') {
             yield { type: 'context_compaction_started', provider: OPENAI_RESPONSES_OPAQUE_TAG };
         }
-        else if (event?.type === 'response.output_item.added' && event.output_item?.type === 'function_call') {
+        else if (event?.type === 'response.output_item.added' &&
+            (event.output_item?.type === 'function_call' || event.output_item?.type === 'custom_tool_call')) {
             const index = typeof event.output_index === 'number' ? event.output_index : event.output_item.id ?? 0;
             if (typeof event.output_item.name === 'string')
                 toolNamesByIndex.set(index, event.output_item.name);
@@ -366,7 +415,8 @@ async function* convertCodexRawStream(source) {
             const toolName = toolNamesByIndex.get(index);
             yield { type: 'tool_call_streaming_delta', ...(toolName ? { toolName } : {}), argumentCharCount };
         }
-        else if (event?.type === 'response.output_item.done' && event.item?.type === 'function_call') {
+        else if (event?.type === 'response.output_item.done' &&
+            (event.item?.type === 'function_call' || event.item?.type === 'custom_tool_call')) {
             const call = toCodexToolCallOutput(event.item);
             output.push(call);
             pendingToolCalls.push(call);
@@ -422,12 +472,24 @@ function toCodexToolCallOutput(item) {
     const name = codexString(item?.name);
     if (!id || !name)
         throw new Error('Codex function call output is missing its call id or name.');
-    return { type: 'tool_call', id, name, arguments: typeof item.arguments === 'string' ? item.arguments : '{}' };
+    return {
+        type: 'tool_call',
+        id,
+        name,
+        arguments: item.type === 'custom_tool_call'
+            ? typeof item.input === 'string'
+                ? item.input
+                : ''
+            : typeof item.arguments === 'string'
+                ? item.arguments
+                : '{}',
+        ...(item.type === 'custom_tool_call' ? { toolType: 'custom' } : {}),
+    };
 }
 function toCodexOutputItem(item) {
     if (!item || typeof item !== 'object')
         throw new Error('Unsupported Codex response output item.');
-    if (item.type === 'function_call')
+    if (item.type === 'function_call' || item.type === 'custom_tool_call')
         return toCodexToolCallOutput(item);
     if (item.type === 'message') {
         const content = Array.isArray(item.content) ? item.content : [];
@@ -485,11 +547,15 @@ function toCodexUsage(rawUsage) {
         return undefined;
     const cachedInputTokens = rawUsage.input_tokens_details?.cached_tokens ?? rawUsage.inputTokensDetails?.cachedTokens;
     const cacheWriteTokens = rawUsage.input_tokens_details?.cache_write_tokens ?? rawUsage.inputTokensDetails?.cacheWriteTokens;
+    const reasoningTokens = rawUsage.output_tokens_details?.reasoning_tokens ??
+        rawUsage.outputTokensDetails?.reasoningTokens ??
+        rawUsage.outputTokensDetails?.reasoning_tokens;
     return {
         ...(inputTokens !== undefined ? { inputTokens } : {}),
         ...(outputTokens !== undefined ? { outputTokens } : {}),
         ...(cachedInputTokens !== undefined ? { cachedInputTokens } : {}),
         ...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),
+        ...(reasoningTokens !== undefined ? { reasoningTokens } : {}),
     };
 }
 function codexString(value) {
@@ -677,6 +743,7 @@ const CODEX_SERVER_HISTORY_TOOL_RESULT_TYPES = new Set([
     'computer_call_output',
     'computer_call_result',
     'apply_patch_call_output',
+    'custom_tool_call_output',
 ]);
 const normalizeCodexServerHistoryItem = (item) => {
     const record = asRecord(item);
@@ -690,7 +757,7 @@ const normalizeCodexServerHistoryItem = (item) => {
         type,
         itemId,
         callId,
-        isFunctionCall: type === 'function_call' || type === 'tool_call',
+        isFunctionCall: type === 'function_call' || type === 'tool_call' || type === 'custom_tool_call',
         isToolResult: type === 'tool_result' || (typeof type === 'string' && CODEX_SERVER_HISTORY_TOOL_RESULT_TYPES.has(type)),
     };
 };
@@ -965,6 +1032,7 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
     #lastSentChainFingerprint;
     #lastRejectedChainFingerprint;
     #lastLogicalRequestByKey = new Map();
+    #transportDiagnosticsByRequest = new WeakMap();
     providerTraffic;
     diagnosticLogger;
     sessionContextService;
@@ -998,10 +1066,31 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
                 : websocketReceiveTimeouts;
         this.requestCapture = requestCapture instanceof CodexResponsesTransport ? undefined : requestCapture;
     }
+    /**
+     * Drop server-history bookkeeping for one logical scope while leaving the
+     * provider transport pool alive. Rollover supplies the predecessor key;
+     * refusing an unscoped reset protects live nested scopes sharing this model.
+     */
+    resetConversationState(options) {
+        if (!options?.providerHistoryKey)
+            return;
+        this.#forgetCodexServerHistoryForKey(options.providerHistoryKey);
+    }
+    #transportDiagnostics(request) {
+        return this.#transportDiagnosticsByRequest.get(request);
+    }
+    async compactHistory(request) {
+        const result = await super.compactHistory(request);
+        // A native compaction item replaces the provider's prior transcript. The
+        // old Responses-Lite chain may still contain an unfinished function call,
+        // so retaining it would combine the checkpoint with stale server debt.
+        this.#forgetCodexServerHistoryForCurrentKey();
+        return result;
+    }
     #modelNameFallback() {
         return this.modelId;
     }
-    #logTrafficStarted(requestId, requestData, headers) {
+    #logTrafficStarted(requestId, requestData, headers, transportDiagnostics) {
         const providerTraffic = this.providerTraffic ?? DUMMY_PROVIDER_TRAFFIC;
         const model = typeof requestData.model === 'string' ? requestData.model : this.#modelNameFallback();
         const sanitizedHeaders = headers ? sanitizeHeaders(headers) : undefined;
@@ -1011,11 +1100,12 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
             model,
             sentBody: requestData,
             headers: sanitizedHeaders,
+            transportDiagnostics,
             modelClass: WS_RESPONSE_MODEL_CLASS,
             modelWrapperClass: WS_RESPONSE_WRAPPER_CLASS,
         });
     }
-    #logTrafficReceived(requestId, requestData, response, receiveTiming) {
+    #logTrafficReceived(requestId, requestData, response, receiveTiming, transportDiagnostics) {
         const providerTraffic = this.providerTraffic ?? DUMMY_PROVIDER_TRAFFIC;
         const model = typeof requestData.model === 'string' ? requestData.model : this.#modelNameFallback();
         providerTraffic.recordResponseReceived({
@@ -1026,11 +1116,12 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
             response: response,
             transport: 'websocket',
             ...(receiveTiming ? { receiveTiming } : {}),
+            transportDiagnostics,
             modelClass: WS_RESPONSE_MODEL_CLASS,
             modelWrapperClass: WS_RESPONSE_WRAPPER_CLASS,
         });
     }
-    #logTrafficFailed(requestId, requestData, error, receiveTiming, diagnostics) {
+    #logTrafficFailed(requestId, requestData, error, receiveTiming, diagnostics, transportDiagnostics) {
         const providerTraffic = this.providerTraffic ?? DUMMY_PROVIDER_TRAFFIC;
         const model = typeof requestData.model === 'string' ? requestData.model : this.#modelNameFallback();
         providerTraffic.recordRequestFailed({
@@ -1040,11 +1131,12 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
             error,
             ...(receiveTiming ? { receiveTiming } : {}),
             ...(diagnostics ? { diagnostics } : {}),
+            transportDiagnostics,
             modelClass: WS_RESPONSE_MODEL_CLASS,
             modelWrapperClass: WS_RESPONSE_WRAPPER_CLASS,
         });
     }
-    #logTrafficClosed(requestId, requestData, outcome, eventCount, diagnostics) {
+    #logTrafficClosed(requestId, requestData, outcome, eventCount, diagnostics, transportDiagnostics) {
         const providerTraffic = this.providerTraffic ?? DUMMY_PROVIDER_TRAFFIC;
         const model = typeof requestData.model === 'string' ? requestData.model : this.#modelNameFallback();
         providerTraffic.recordResponseClosed({
@@ -1054,11 +1146,12 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
             outcome,
             eventCount,
             ...(diagnostics ? { diagnostics } : {}),
+            transportDiagnostics,
             modelClass: WS_RESPONSE_MODEL_CLASS,
             modelWrapperClass: WS_RESPONSE_WRAPPER_CLASS,
         });
     }
-    async #withTrafficLogging(responseStream, requestId, requestData, wireStateKey, wireStateToken, signal, receiveTiming, asProvablyUnsent) {
+    async #withTrafficLogging(responseStream, requestId, requestData, wireStateKey, wireStateToken, signal, receiveTiming, asProvablyUnsent, transportDiagnostics) {
         const logReceived = this.#logTrafficReceived.bind(this);
         const logFailed = this.#logTrafficFailed.bind(this);
         const logClosed = this.#logTrafficClosed.bind(this);
@@ -1091,7 +1184,7 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
                         if (wireStateKey && wireStateToken && typeof response.id === 'string' && response.id.length > 0) {
                             wireState.recordResponse(wireStateKey, wireStateToken, response.id, response.output);
                         }
-                        logReceived(requestId, requestData, response, receiveTiming?.());
+                        logReceived(requestId, requestData, response, receiveTiming?.(), transportDiagnostics);
                     }
                     yield event;
                 }
@@ -1106,11 +1199,22 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
                 // reached the wire; the wire-state decision above still keys off the
                 // error as thrown.
                 const failure = asProvablyUnsent?.(error) ?? error;
-                // Bounded evidence of whatever progress the recorder observed before
-                // the failure (category/counter/timing, no raw frame payload) — a
-                // stream that fails after thousands of frames (e.g. an abrupt close)
-                // must not lose that evidence the way an unrecorded failure would.
-                logFailed(requestId, requestData, failure, receiveTiming?.(), recorder.boundedDiagnostics());
+                if (signal?.aborted && eventCount > 0 && isClassifiedCancellation(failure)) {
+                    // An active request can reject from the provider as soon as the
+                    // application's abort reaches the socket. Preserve the partial raw
+                    // transcript in the same aborted outcome used when the consumer
+                    // closes the iterator explicitly; otherwise a guard-triggered abort
+                    // would be reduced to bounded counters before the recorder's
+                    // finally block can retain it.
+                    logClosed(requestId, requestData, 'aborted', eventCount, recorder.diagnostics(), transportDiagnostics);
+                }
+                else {
+                    // Bounded evidence of whatever progress the recorder observed before
+                    // the failure (category/counter/timing, no raw frame payload) — a
+                    // stream that fails after thousands of frames (e.g. an abrupt close)
+                    // must not lose that evidence the way an unrecorded failure would.
+                    logFailed(requestId, requestData, failure, receiveTiming?.(), recorder.boundedDiagnostics(), transportDiagnostics);
+                }
                 throw failure;
             }
             finally {
@@ -1128,7 +1232,7 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
                         ? recorder.diagnostics()
                         : outcome === 'failed'
                             ? recorder.boundedDiagnostics()
-                            : undefined);
+                            : undefined, transportDiagnostics);
                 }
                 recorder.release();
                 if (wireStateKey && wireStateToken) {
@@ -1286,6 +1390,23 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
         if (previousResponseId)
             this.codexConsumedToolResultCallIdsByResponseId.set(previousResponseId, consumed);
     }
+    #forgetCodexServerHistoryForCurrentKey() {
+        this.#forgetCodexServerHistoryForKey(this.#getCodexServerHistoryKey());
+    }
+    #forgetCodexServerHistoryForKey(key) {
+        if (!key)
+            return;
+        const responseId = this.chainedWireState.getStoredResponseId(key);
+        this.chainedWireState.invalidate(key);
+        this.codexPreviousResponseIds.delete(key);
+        this.codexTurnIdsBySession.delete(key);
+        this.#lastLogicalRequestByKey.delete(key);
+        if (responseId) {
+            this.codexConsumedToolResultCallIdsByResponseId.delete(responseId);
+            this.codexFunctionCallIdsByResponseId.delete(responseId);
+        }
+        this.#lastSentChainFingerprint = undefined;
+    }
     #forgetCodexResponseId() {
         this.#serverHistoryReuseDisabled = true;
         this.codexPreviousResponseIds.clear();
@@ -1362,39 +1483,47 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
             return undefined;
         }
         const sessionContext = this.sessionContextService?.getContext();
-        const sessionId = sessionContext?.providerHistoryKey ?? sessionContext?.sessionId ?? requestId;
-        const threadId = sessionId;
+        const logicalSessionId = sessionContext?.providerHistoryKey ?? sessionContext?.sessionId ?? requestId;
+        // WebSocket handshake headers cannot change after a socket is opened. Use
+        // the root cache affinity for that physical identity, while the per-frame
+        // client metadata below continues to identify the current logical scope.
+        // The backend's treatment of these two identity channels is not assumed;
+        // the distinction is kept explicit in tests and telemetry.
+        const transportSessionId = request.codex?.promptCacheKey ?? sessionContext?.promptCacheKey ?? logicalSessionId;
+        const threadId = logicalSessionId;
         const hasPreviousResponseId = typeof request?.previousResponseId === 'string' && request.previousResponseId.length > 0;
-        const turnId = hasPreviousResponseId ? this.codexTurnIdsBySession.get(sessionId) ?? randomUUID() : randomUUID();
-        this.codexTurnIdsBySession.set(sessionId, turnId);
+        const turnId = hasPreviousResponseId
+            ? this.codexTurnIdsBySession.get(logicalSessionId) ?? randomUUID()
+            : randomUUID();
+        this.codexTurnIdsBySession.set(logicalSessionId, turnId);
         const windowId = `${threadId}:1`;
         const turnMetadata = JSON.stringify({
             installation_id: installationId,
-            session_id: sessionId,
+            session_id: logicalSessionId,
             thread_id: threadId,
             turn_id: turnId,
             window_id: windowId,
             request_kind: 'turn',
         });
         return {
-            sessionId,
+            sessionId: logicalSessionId,
             threadId,
             turnId,
             windowId,
             turnMetadata,
             clientMetadata: {
                 'x-codex-installation-id': installationId,
-                session_id: sessionId,
+                session_id: logicalSessionId,
                 thread_id: threadId,
                 'x-codex-window-id': windowId,
                 turn_id: turnId,
                 'x-codex-turn-metadata': turnMetadata,
             },
             headers: {
-                'x-client-request-id': threadId,
-                'session-id': sessionId,
-                'thread-id': threadId,
-                'x-codex-window-id': windowId,
+                'x-client-request-id': transportSessionId,
+                'session-id': transportSessionId,
+                'thread-id': transportSessionId,
+                'x-codex-window-id': transportSessionId + ':1',
                 'x-codex-turn-metadata': turnMetadata,
             },
         };
@@ -1615,14 +1744,28 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
         // transport's private fetch path. Capture it without changing the
         // prepared request or wire state.
         captureProviderRequest(this.requestCapture, { provider: 'codex', transport: 'websocket', requestData });
-        this.#logTrafficStarted(requestId, requestData, extraHeaders);
+        const transportDiagnostics = {
+            ...(request.codex?.promptCacheKey ?? this.sessionContextService?.getContext()?.promptCacheKey
+                ? {
+                    affinityKey: request.codex?.promptCacheKey ?? this.sessionContextService?.getContext()?.promptCacheKey,
+                }
+                : {}),
+            ...(this.#getCodexServerHistoryKey() ? { logicalHistoryKey: this.#getCodexServerHistoryKey() } : {}),
+        };
+        this.#logTrafficStarted(requestId, requestData, extraHeaders, transportDiagnostics);
         if (!stream) {
             try {
-                const response = await fetchAndReconstructUnaryResponse(async () => watchdog.wrap(await super.fetchResponse(updatedRequest, true)), this.diagnosticLogger);
+                const response = await fetchAndReconstructUnaryResponse(async () => watchdog.wrap(await super.fetchResponse(updatedRequest, true, {
+                    onConnectionAcquired: (details) => this.#transportDiagnosticsByRequest.set(updatedRequest, {
+                        ...transportDiagnostics,
+                        connectionId: details.connectionId,
+                        reused: details.reused,
+                    }),
+                })), this.diagnosticLogger);
                 if (wireStateKey && wireStateToken && typeof response?.id === 'string' && response.id.length > 0) {
                     this.chainedWireState.recordResponse(wireStateKey, wireStateToken, response.id, response.output);
                 }
-                this.#logTrafficReceived(requestId, requestData, response, watchdog.receiveTiming());
+                this.#logTrafficReceived(requestId, requestData, response, watchdog.receiveTiming(), this.#transportDiagnostics(updatedRequest));
                 return response;
             }
             catch (error) {
@@ -1639,15 +1782,21 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
                         this.chainedWireState.invalidate(wireStateKey);
                     }
                 }
-                this.#logTrafficFailed(requestId, requestData, failure, receiveTiming);
+                this.#logTrafficFailed(requestId, requestData, failure, receiveTiming, undefined, this.#transportDiagnostics(updatedRequest));
                 throw failure;
             }
         }
         try {
-            const response = (await super.fetchResponse(updatedRequest, stream));
+            const response = (await super.fetchResponse(updatedRequest, stream, {
+                onConnectionAcquired: (details) => this.#transportDiagnosticsByRequest.set(updatedRequest, {
+                    ...transportDiagnostics,
+                    connectionId: details.connectionId,
+                    reused: details.reused,
+                }),
+            }));
             const patched = wrapCodexStream(watchdog.wrap(response), this.diagnosticLogger);
             return this.#withTrafficLogging(patched, requestId, requestData, wireStateKey, wireStateToken, updatedRequest.signal, () => watchdog.receiveTiming(), (error) => asProvablyUnsentTimeout(watchdog.timeoutError(), watchdog.receiveTiming(), updatedRequest) ??
-                asProvablyUnsentConnectTimeout(error, updatedRequest, watchdog.receiveTiming().frameCount > 0));
+                asProvablyUnsentConnectTimeout(error, updatedRequest, watchdog.receiveTiming().frameCount > 0), this.#transportDiagnostics(updatedRequest));
         }
         catch (error) {
             const timeoutError = watchdog.timeoutError();
@@ -1663,7 +1812,7 @@ export class CodexResponsesWSModel extends OpenAIResponsesWSModel {
                     this.chainedWireState.invalidate(wireStateKey);
                 }
             }
-            this.#logTrafficFailed(requestId, requestData, failure, receiveTiming);
+            this.#logTrafficFailed(requestId, requestData, failure, receiveTiming, undefined, this.#transportDiagnostics(updatedRequest));
             throw failure;
         }
     }
@@ -1730,7 +1879,7 @@ export async function* wrapCodexStream(source, logger) {
             });
             throw new Error(`Codex provider stream error: ${errMsg}`);
         }
-        if (type === 'response.function_call_arguments.done' &&
+        if ((type === 'response.function_call_arguments.done' || type === 'response.custom_tool_call_input.done') &&
             typeof event.call_id === 'string' &&
             typeof event.item_id === 'string') {
             // Capture the authoritative call_id from the arguments-done event.
@@ -1743,7 +1892,7 @@ export async function* wrapCodexStream(source, logger) {
             // from the itemCallIds map so the inherited transport's
             // convertToOutputItem picks up the correct identifier and the continuation
             // request sends the right call_id.
-            if (itemRecord?.type === 'function_call' &&
+            if ((itemRecord?.type === 'function_call' || itemRecord?.type === 'custom_tool_call') &&
                 !stringValue(itemRecord?.call_id) &&
                 typeof itemRecord?.id === 'string') {
                 const knownCallId = itemCallIds.get(itemRecord.id);