@oh-my-pi/pi-ai 14.5.3 → 14.5.6

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+## [14.5.4] - 2026-04-28
+### Changed
+
+- Changed OpenAI custom Lark grammar payloads to strip comments and blank lines before sending provider requests.
+
+### Fixed
+
+- Fixed OpenAI Codex GPT model pricing by inheriting matching OpenAI catalog rates for zero-priced discovered Codex entries.
+
 ## [14.5.3] - 2026-04-27
 ### Added
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-ai",
-	"version": "14.5.3",
+	"version": "14.5.6",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -46,8 +46,8 @@
 		"@aws-sdk/credential-provider-node": "^3.972.36",
 		"@bufbuild/protobuf": "^2.12.0",
 		"@google/genai": "^1.50.1",
-		"@oh-my-pi/pi-natives": "14.5.3",
-		"@oh-my-pi/pi-utils": "14.5.3",
+		"@oh-my-pi/pi-natives": "14.5.6",
+		"@oh-my-pi/pi-utils": "14.5.6",
 		"@sinclair/typebox": "^0.34.49",
 		"@smithy/node-http-handler": "^4.6.1",
 		"ajv": "^8.20.0",

package/src/models.json

@@ -33899,9 +33899,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.25,
+				"output": 10,
+				"cacheRead": 0.125,
 				"cacheWrite": 0
 			},
 			"contextWindow": 400000,
@@ -33927,9 +33927,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.25,
+				"output": 10,
+				"cacheRead": 0.125,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -33983,9 +33983,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.25,
+				"output": 10,
+				"cacheRead": 0.13,
 				"cacheWrite": 0
 			},
 			"contextWindow": 400000,
@@ -34011,9 +34011,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.25,
+				"output": 10,
+				"cacheRead": 0.125,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34039,9 +34039,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.25,
+				"output": 10,
+				"cacheRead": 0.125,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34067,9 +34067,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 0.25,
+				"output": 2,
+				"cacheRead": 0.025,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34095,9 +34095,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.75,
+				"output": 14,
+				"cacheRead": 0.175,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34123,9 +34123,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.75,
+				"output": 14,
+				"cacheRead": 0.175,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34151,9 +34151,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 1.75,
+				"output": 14,
+				"cacheRead": 0.175,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34206,9 +34206,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 2.5,
+				"output": 15,
+				"cacheRead": 0.25,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34234,9 +34234,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 0.75,
+				"output": 4.5,
+				"cacheRead": 0.075,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34262,9 +34262,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 0.2,
+				"output": 1.25,
+				"cacheRead": 0.02,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -34290,9 +34290,9 @@
 				"image"
 			],
 			"cost": {
-				"input": 0,
-				"output": 0,
-				"cacheRead": 0,
+				"input": 5,
+				"output": 30,
+				"cacheRead": 0.5,
 				"cacheWrite": 0
 			},
 			"contextWindow": 272000,
@@ -52775,4 +52775,4 @@
 			}
 		}
 	}
-}
+}

package/src/providers/grammar.ts

@@ -0,0 +1,70 @@
+export function compactGrammarDefinition(syntax: "lark" | "regex", definition: string): string {
+	if (syntax !== "lark") {
+		return definition;
+	}
+
+	return compactLarkGrammarDefinition(definition);
+}
+
+function compactLarkGrammarDefinition(definition: string): string {
+	const lines: string[] = [];
+
+	for (const line of definition.split(/\r?\n/)) {
+		const uncommented = stripLarkLineComment(line).trimEnd();
+		if (uncommented.trim()) {
+			lines.push(uncommented);
+		}
+	}
+
+	return lines.join("\n");
+}
+
+function stripLarkLineComment(line: string): string {
+	let inString: string | undefined;
+	let inRegex = false;
+	let escaped = false;
+
+	for (let i = 0; i < line.length; i++) {
+		const char = line[i];
+		const next = line[i + 1];
+
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+
+		if (inString) {
+			if (char === inString) {
+				inString = undefined;
+			}
+			continue;
+		}
+
+		if (inRegex) {
+			if (char === "/") {
+				inRegex = false;
+			}
+			continue;
+		}
+
+		if (char === "/" && next === "/") {
+			return line.slice(0, i);
+		}
+
+		if (char === '"' || char === "'") {
+			inString = char;
+			continue;
+		}
+
+		if (char === "/") {
+			inRegex = true;
+		}
+	}
+
+	return line;
+}

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

@@ -42,6 +42,7 @@ import { finalizeErrorMessage, type RawHttpRequestDump } from "../utils/http-ins
 import { getOpenAIStreamIdleTimeoutMs, iterateWithIdleTimeout } from "../utils/idle-iterator";
 import { parseStreamingJson } from "../utils/json-parse";
 import { adaptSchemaForStrict, NO_STRICT } from "../utils/schema";
+import { compactGrammarDefinition } from "./grammar";
 import {
 	CODEX_BASE_URL,
 	getCodexAccountId,
@@ -647,17 +648,31 @@ async function reopenCodexWebSocketRuntimeStream(
 	runtime: CodexStreamRuntime,
 	state: CodexWebSocketSessionState,
 ): Promise<void> {
-	const next = await openCodexWebSocketTransport(
-		context.requestContext,
-		context.requestSetup,
-		context.options,
-		state,
-		runtime.websocketStreamRetries,
-	);
-	runtime.eventStream = next.eventStream;
-	runtime.requestBodyForState = next.requestBodyForState;
-	runtime.transport = next.transport;
-	state.lastTransport = next.transport;
+	try {
+		const next = await openCodexWebSocketTransport(
+			context.requestContext,
+			context.requestSetup,
+			context.options,
+			state,
+			runtime.websocketStreamRetries,
+		);
+		runtime.eventStream = next.eventStream;
+		runtime.requestBodyForState = next.requestBodyForState;
+		runtime.transport = next.transport;
+		state.lastTransport = next.transport;
+	} catch (error) {
+		const wsError = error instanceof Error ? error : new Error(String(error));
+		if (!isCodexWebSocketTransportError(wsError)) throw error;
+		// Reopen failed at the websocket layer (handshake refused, connect timeout, etc.).
+		// Activate fallback so subsequent turns use SSE, and replay this turn over SSE
+		// instead of surfacing a raw transport error to the caller.
+		recordCodexWebSocketFailure(state, true);
+		logCodexDebug("codex websocket reopen failed, falling back to SSE", {
+			error: wsError.message,
+			retry: runtime.websocketStreamRetries,
+		});
+		await reopenCodexSseRuntimeStream(context, runtime, state);
+	}
 }
 
 async function reopenCodexSseRuntimeStream(
@@ -2379,7 +2394,7 @@ export function convertTools(tools: Tool[], model: Model<"openai-codex-responses
 				format: {
 					type: "grammar",
 					syntax: tool.customFormat.syntax,
-					definition: tool.customFormat.definition,
+					definition: compactGrammarDefinition(tool.customFormat.syntax, tool.customFormat.definition),
 				},
 			};
 		}

package/src/providers/openai-responses.ts

@@ -46,6 +46,7 @@ import {
 	hasCopilotVisionInput,
 	resolveGitHubCopilotBaseUrl,
 } from "./github-copilot-headers";
+import { compactGrammarDefinition } from "./grammar";
 import {
 	appendResponsesToolResultMessages,
 	collectCustomCallIds,
@@ -577,7 +578,7 @@ export function convertTools(tools: Tool[], strictMode: boolean, model: Model<"o
 				format: {
 					type: "grammar",
 					syntax: tool.customFormat.syntax,
-					definition: tool.customFormat.definition,
+					definition: compactGrammarDefinition(tool.customFormat.syntax, tool.customFormat.definition),
 				},
 			} as unknown as OpenAITool;
 		}