@oh-my-pi/pi-ai 12.11.2 → 12.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-ai",
-	"version": "12.11.2",
+	"version": "12.12.0",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -63,7 +63,7 @@
 		"@connectrpc/connect-node": "^2.1.1",
 		"@google/genai": "^1.41.0",
 		"@mistralai/mistralai": "^1.14.0",
-		"@oh-my-pi/pi-utils": "12.11.2",
+		"@oh-my-pi/pi-utils": "12.12.0",
 		"@sinclair/typebox": "^0.34.48",
 		"@smithy/node-http-handler": "^4.4.10",
 		"ajv": "^8.18.0",

package/src/providers/openai-codex-responses.ts

@@ -387,6 +387,7 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 				const websocketV2Enabled = isCodexWebSocketV2Enabled();
 				let websocketRetries = 0;
 				while (true) {
+					const websocketRequest = buildCodexWebSocketRequest(transformedBody, websocketState, websocketV2Enabled);
 					const websocketHeaders = createCodexHeaders(
 						requestHeaders,
 						accountId,
@@ -396,13 +397,14 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 						websocketState,
 						websocketV2Enabled,
 					);
-					const websocketRequest = buildCodexWebSocketRequest(transformedBody, websocketState, websocketV2Enabled);
 					requestBodyForState = cloneRequestBody(transformedBody);
 					logCodexDebug("codex websocket request", {
 						url: toWebSocketUrl(url),
 						model: params.model,
 						reasoningEffort,
 						headers: redactHeaders(websocketHeaders),
+						sentTurnStateHeader: websocketHeaders.has(X_CODEX_TURN_STATE_HEADER),
+						sentModelsEtagHeader: websocketHeaders.has(X_MODELS_ETAG_HEADER),
 						requestType: websocketRequest.type,
 						retry: websocketRetries,
 						retryBudget: websocketRetryBudget,
@@ -467,6 +469,7 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 			const blocks = output.content;
 			const blockIndex = () => blocks.length - 1;
 			let websocketStreamRetries = 0;
+			let sawTerminalEvent = false;
 			while (true) {
 				try {
 					for await (const rawEvent of eventStream) {
@@ -645,6 +648,7 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 								}
 							}
 						} else if (eventType === "response.completed" || eventType === "response.done") {
+							sawTerminalEvent = true;
 							const response = (
 								rawEvent as {
 									response?: {
@@ -712,6 +716,11 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 							websocketStreamRetries += 1;
 							await abortableSleep(getCodexWebSocketRetryDelayMs(websocketStreamRetries), options?.signal);
 							const websocketV2Enabled = isCodexWebSocketV2Enabled();
+							const websocketRequest = buildCodexWebSocketRequest(
+								transformedBody,
+								websocketState,
+								websocketV2Enabled,
+							);
 							const websocketHeaders = createCodexHeaders(
 								requestHeaders,
 								accountId,
@@ -721,11 +730,6 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 								websocketState,
 								websocketV2Enabled,
 							);
-							const websocketRequest = buildCodexWebSocketRequest(
-								transformedBody,
-								websocketState,
-								websocketV2Enabled,
-							);
 							requestBodyForState = cloneRequestBody(transformedBody);
 							eventStream = await openCodexWebSocketEventStream(
 								toWebSocketUrl(url),
@@ -761,6 +765,21 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 				throw new Error("Request was aborted");
 			}
 
+			if (!sawTerminalEvent) {
+				if (usingWebsocket && websocketState) {
+					resetCodexWebSocketAppendState(websocketState);
+					resetCodexSessionMetadata(websocketState);
+				}
+				logCodexDebug("codex stream ended unexpectedly", {
+					transport: usingWebsocket ? "websocket" : "sse",
+					terminalEventSeen: sawTerminalEvent,
+					unexpectedStreamEnd: true,
+					sentTurnStateHeader: Boolean(websocketState?.turnState),
+					sentModelsEtagHeader: Boolean(websocketState?.modelsEtag),
+				});
+				throw new Error("Codex stream ended before terminal completion event");
+			}
+
 			if (output.stopReason === "aborted" || output.stopReason === "error") {
 				throw new Error("Codex response failed");
 			}
@@ -773,6 +792,7 @@ export const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses"
 			for (const block of output.content) delete (block as { index?: number }).index;
 			if (usingWebsocket && websocketState) {
 				resetCodexWebSocketAppendState(websocketState);
+				resetCodexSessionMetadata(websocketState);
 			}
 			output.stopReason = options?.signal?.aborted ? "aborted" : "error";
 			output.errorMessage = formatErrorMessageWithRetryAfter(error);
@@ -866,6 +886,12 @@ function resetCodexWebSocketAppendState(state: CodexWebSocketSessionState): void
 	state.lastResponseId = undefined;
 }
 
+function resetCodexSessionMetadata(state: CodexWebSocketSessionState): void {
+	state.turnState = undefined;
+	state.modelsEtag = undefined;
+	state.reasoningIncluded = undefined;
+}
+
 function recordCodexWebSocketFailure(state: CodexWebSocketSessionState, activateFallback: boolean): void {
 	resetCodexWebSocketAppendState(state);
 	state.connection?.close("fallback");
@@ -970,6 +996,14 @@ function buildCodexWebSocketRequest(
 			input: appendInput,
 		};
 	}
+	if (state?.canAppend) {
+		logCodexDebug("codex websocket append reset", {
+			hadTurnStateHeader: Boolean(state.turnState),
+			hadModelsEtagHeader: Boolean(state.modelsEtag),
+		});
+		resetCodexWebSocketAppendState(state);
+		resetCodexSessionMetadata(state);
+	}
 	return {
 		type: "response.create",
 		...requestBody,
@@ -1245,6 +1279,8 @@ async function openCodexSseEventStream(
 		url,
 		model: body.model,
 		headers: redactHeaders(headers),
+		sentTurnStateHeader: headers.has(X_CODEX_TURN_STATE_HEADER),
+		sentModelsEtagHeader: headers.has(X_MODELS_ETAG_HEADER),
 	});
 	const response = await fetchWithRetry(
 		url,