@howaboua/pi-codex-conversion 1.0.23 → 1.0.25

package/README.md

@@ -9,7 +9,7 @@ This package replaces Pi's default Codex/GPT experience with a narrower Codex-li
 - preserves Pi's composed system prompt and applies a narrow Codex-oriented delta on top
 - renders exec activity with Codex-style command and background-terminal labels
 - renders `apply_patch` calls with Codex-style `Added` / `Edited` / `Deleted` diff blocks and Pi-style colored diff lines
-- targets modern Pi tool/rendering APIs and is aligned with Pi `0.69.x`
+- targets modern Pi tool/rendering APIs and is aligned with Pi `0.70.x`
 
 ![Available tools](./available-tools.png)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {
@@ -51,15 +51,15 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@mariozechner/pi-ai": "^0.69.0",
-    "@mariozechner/pi-coding-agent": "^0.69.0",
-    "@mariozechner/pi-tui": "^0.69.0",
+    "@mariozechner/pi-ai": "^0.70.0",
+    "@mariozechner/pi-coding-agent": "^0.70.0",
+    "@mariozechner/pi-tui": "^0.70.0",
     "typebox": "^1.1.24"
   },
   "devDependencies": {
-    "@mariozechner/pi-ai": "^0.69.0",
-    "@mariozechner/pi-coding-agent": "^0.69.0",
-    "@mariozechner/pi-tui": "^0.69.0",
+    "@mariozechner/pi-ai": "^0.70.0",
+    "@mariozechner/pi-coding-agent": "^0.70.0",
+    "@mariozechner/pi-tui": "^0.70.0",
     "tsx": "^4.20.5",
     "typebox": "^1.1.24",
     "typescript": "^5.9.3"

package/src/providers/openai-codex-custom-provider.ts

@@ -480,19 +480,19 @@ function clampReasoningEffort(modelId: string, effort: string): string {
 	return effort;
 }
 
-function getServiceTierCostMultiplier(serviceTier: ServiceTier): number {
+function getServiceTierCostMultiplier(model: Model<Api>, serviceTier: ServiceTier): number {
 	switch (serviceTier) {
 		case "flex":
 			return 0.5;
 		case "priority":
-			return 2;
+			return model.id === "gpt-5.5" ? 2.5 : 2;
 		default:
 			return 1;
 	}
 }
 
-function applyServiceTierPricing(usage: AssistantMessage["usage"], serviceTier: ServiceTier): void {
-	const multiplier = getServiceTierCostMultiplier(serviceTier);
+function applyServiceTierPricing(usage: AssistantMessage["usage"], serviceTier: ServiceTier, model: Model<Api>): void {
+	const multiplier = getServiceTierCostMultiplier(model, serviceTier);
 	if (multiplier === 1) return;
 	usage.cost.input *= multiplier;
 	usage.cost.output *= multiplier;
@@ -848,6 +848,7 @@ async function* parseWebSocket(socket: WebSocketLike, signal: AbortSignal | unde
 	let pending: (() => void) | null = null;
 	let done = false;
 	let failed: Error | null = null;
+	let closeError: Error | null = null;
 	let sawCompletion = false;
 	let pendingMessages = 0;
 	let messageChain = Promise.resolve();
@@ -871,6 +872,7 @@ async function* parseWebSocket(socket: WebSocketLike, signal: AbortSignal | unde
 					const type = typeof parsed.type === "string" ? parsed.type : "";
 					if (type === "response.completed" || type === "response.done" || type === "response.incomplete") {
 						sawCompletion = true;
+						closeError = null;
 						done = true;
 					}
 					queue.push(parsed);
@@ -900,8 +902,8 @@ async function* parseWebSocket(socket: WebSocketLike, signal: AbortSignal | unde
 			wake();
 			return;
 		}
-		if (!failed) {
-			failed = extractWebSocketCloseError(event);
+		if (!closeError) {
+			closeError = extractWebSocketCloseError(event);
 		}
 		done = true;
 		wake();
@@ -934,6 +936,7 @@ async function* parseWebSocket(socket: WebSocketLike, signal: AbortSignal | unde
 		}
 
 		if (failed) throw failed;
+		if (closeError && !sawCompletion) throw closeError;
 		if (!sawCompletion) {
 			throw new Error("WebSocket stream closed before response.completed");
 		}
@@ -1077,7 +1080,7 @@ async function processCapturedResponsesStream<TApi extends Api>(
 	await processResponsesStream(tappedEvents as AsyncIterable<never>, output, stream, model, {
 		serviceTier: (options as { serviceTier?: ServiceTier } | undefined)?.serviceTier,
 		resolveServiceTier: resolveCodexServiceTier,
-		applyServiceTierPricing,
+		applyServiceTierPricing: (usage, serviceTier) => applyServiceTierPricing(usage, serviceTier, model as Model<Api>),
 	});
 }
 

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

@@ -8,12 +8,10 @@ type Message = Context["messages"][number];
 
 interface ImageGenerationCallItem {
 	type: "image_generation_call";
-	id?: string;
-	status?: string;
-	result?: string | null;
-	output_format?: string;
+	id: string;
+	status: string;
+	result: string | null;
 	revised_prompt?: string;
-	[key: string]: unknown;
 }
 
 interface ImageGenerationCallBlock {
@@ -76,6 +74,23 @@ function isImageGenerationCallBlock(block: InternalAssistantContent): block is I
 	return block.type === "image_generation_call" && block.item?.type === "image_generation_call";
 }
 
+function sanitizeImageGenerationCallItem(item: unknown): ImageGenerationCallItem | undefined {
+	if (!item || typeof item !== "object") return undefined;
+	const candidate = item as Record<string, unknown>;
+	if (candidate.type !== "image_generation_call") return undefined;
+	if (typeof candidate.id !== "string" || candidate.id === "") return undefined;
+	if (typeof candidate.status !== "string" || candidate.status === "") return undefined;
+	if (!(typeof candidate.result === "string" || candidate.result === null)) return undefined;
+
+	return {
+		type: "image_generation_call",
+		id: candidate.id,
+		status: candidate.status,
+		result: candidate.result,
+		...(typeof candidate.revised_prompt === "string" ? { revised_prompt: candidate.revised_prompt } : {}),
+	};
+}
+
 const NON_VISION_USER_IMAGE_PLACEHOLDER = "(image omitted: model does not support images)";
 const NON_VISION_TOOL_IMAGE_PLACEHOLDER = "(tool image omitted: model does not support images)";
 
@@ -287,7 +302,8 @@ export function convertResponsesMessages<TApi extends Api>(
 			let assistantBlockIndex = 0;
 			for (const block of msg.content as InternalAssistantContent[]) {
 				if (isImageGenerationCallBlock(block)) {
-					output.push(block.item as ResponseInput[number]);
+					const imageGenerationCall = sanitizeImageGenerationCallItem(block.item);
+					if (imageGenerationCall) output.push(imageGenerationCall as ResponseInput[number]);
 				} else if (block.type === "thinking") {
 					if (block.thinkingSignature) output.push(JSON.parse(block.thinkingSignature));
 				} else if (block.type === "text") {
@@ -581,10 +597,13 @@ export async function processResponsesStream<TApi extends Api>(
 				stream.push({ type: "toolcall_end", contentIndex: toolCallIndex, toolCall, partial: output });
 				outputStates.delete(event.output_index);
 			} else if (item.type === "image_generation_call") {
-				(output.content as InternalAssistantContent[]).push({
-					type: "image_generation_call",
-					item: item as ImageGenerationCallItem,
-				});
+				const imageGenerationCall = sanitizeImageGenerationCallItem(item);
+				if (imageGenerationCall) {
+					(output.content as InternalAssistantContent[]).push({
+						type: "image_generation_call",
+						item: imageGenerationCall,
+					});
+				}
 				outputStates.delete(event.output_index);
 			}
 		} else if (event.type === "response.completed") {
@@ -613,7 +632,8 @@ export async function processResponsesStream<TApi extends Api>(
 				output.stopReason = "toolUse";
 			}
 		} else if (event.type === "error") {
-			throw new Error(`Error Code ${event.code}: ${event.message}` || "Unknown error");
+			const details = [event.code, event.message].filter(Boolean).join(": ");
+			throw new Error(details || "Unknown error");
 		} else if (event.type === "response.failed") {
 			const error = event.response?.error;
 			const details = (event.response as { incomplete_details?: { reason?: string } } | undefined)?.incomplete_details;