@gajae-code/ai 0.16.1 → 0.16.3

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.16.3] - 2026-09-04
+
+## [0.16.2] - 2026-09-04
+
+- OpenAI Codex GPT-5.6 Sol selections now reject a known non-Pro ChatGPT OAuth account before dispatch, instead of allowing a binding that fails later with the provider's raw entitlement error. The same rejection is normalized for HTTP and streaming provider responses with guidance to choose a callable model or use an API-key credential.
+
 ## [0.16.1] - 2026-09-03
 
 ### Added

package/dist/types/utils/codex-entitlement.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Model entitlement facts shared by Codex credential selection and provider
+ * error presentation.
+ *
+ * GPT-5.6 Sol is a Pro-tier ChatGPT Codex model. The usage endpoint is the
+ * authority for the account tier; this module only names the model policy and
+ * keeps the provider's deterministic rejection wording in one place.
+ */
+export declare function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
+export declare function requiresStrictOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
+export declare function isOpenAICodexChatGPTEntitlementError(message: string | undefined, code?: string): boolean;
+export declare function formatOpenAICodexChatGPTEntitlementError(modelId: string | undefined): string;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/ai",
-	"version": "0.16.1",
+	"version": "0.16.3",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo and Gajae Code Contributors",
@@ -40,8 +40,8 @@
 	"dependencies": {
 		"@anthropic-ai/sdk": "^0.94.0",
 		"@bufbuild/protobuf": "^2.12.0",
-		"@gajae-code/natives": "0.16.1",
-		"@gajae-code/utils": "0.16.1",
+		"@gajae-code/natives": "0.16.3",
+		"@gajae-code/utils": "0.16.3",
 		"openai": "^6.36.0",
 		"partial-json": "^0.1.7",
 		"zod": "4.4.3"

package/src/auth-storage.ts

@@ -26,6 +26,11 @@ import type {
 	UsageReport,
 } from "./usage";
 
+import {
+	formatOpenAICodexChatGPTEntitlementError,
+	requiresOpenAICodexProModel,
+	requiresStrictOpenAICodexProModel,
+} from "./utils/codex-entitlement";
 import { getOAuthApiKey, getOAuthProvider, refreshOAuthToken, resolveOAuthStorageProvider } from "./utils/oauth";
 import { loginDeepInfra } from "./utils/oauth/deepinfra";
 import { loginDeepSeek } from "./utils/oauth/deepseek";
@@ -1140,10 +1145,6 @@ export function readBrokerErrorBody(error: unknown): string | undefined {
 	}
 }
 
-function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean {
-	return provider === "openai-codex" && typeof modelId === "string" && modelId.includes("-spark");
-}
-
 function getUsagePlanType(report: UsageReport | null): string | undefined {
 	const metadata = report?.metadata;
 	if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) return undefined;
@@ -4955,6 +4956,19 @@ export class AuthStorage {
 		// non-Pro accounts can still attempt Spark requests (e.g. trial/grandfathered access).
 		const enforceProRequirement =
 			requiresProModel && candidates.some(candidate => hasOpenAICodexProPlan(candidate.usage));
+		// Spark retains its historical Plus fallback for grandfathered accounts.
+		// Sol is different: a confirmed non-Pro plan cannot call it, so reject the
+		// model before returning an OAuth bearer and letting the turn fail remotely.
+		const strictProRequirement = requiresStrictOpenAICodexProModel(provider, options?.modelId);
+		if (
+			strictProRequirement &&
+			candidates.length > 0 &&
+			candidates.every(
+				candidate => getUsagePlanType(candidate.usage) !== undefined && !hasOpenAICodexProPlan(candidate.usage),
+			)
+		) {
+			throw new Error(formatOpenAICodexChatGPTEntitlementError(options?.modelId));
+		}
 
 		const fallback = candidates[0];
 

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

@@ -51,6 +51,10 @@ import {
 	normalizeSystemPrompts,
 	sanitizeOpenAIResponsesHistoryItemsForReplay,
 } from "../utils";
+import {
+	formatOpenAICodexChatGPTEntitlementError,
+	isOpenAICodexChatGPTEntitlementError,
+} from "../utils/codex-entitlement";
 import { AssistantMessageEventStream } from "../utils/event-stream";
 import { STREAM_FIRST_EVENT_TIMEOUT_PROVIDER_CODE, transportFailureFacts } from "../utils/fallback-transport";
 import { finalizeErrorMessage, type RawHttpRequestDump } from "../utils/http-inspector";
@@ -1234,7 +1238,7 @@ function handleCodexStreamEvent(args: {
 	}
 
 	if (eventType === "error" || eventType === "response.failed") {
-		throw createCodexProviderStreamError(rawEvent);
+		throw createCodexProviderStreamError(rawEvent, model.id);
 	}
 
 	return firstTokenTime;
@@ -2853,7 +2857,11 @@ async function openCodexSseEventStream(
 	updateCodexSessionMetadataFromHeaders(state, response.headers);
 	if (!response.ok) {
 		const info = await parseCodexError(response);
-		const error = new Error(info.friendlyMessage || info.message);
+		const error = new Error(
+			isOpenAICodexChatGPTEntitlementError(info.message, info.code)
+				? formatOpenAICodexChatGPTEntitlementError(body.model)
+				: info.friendlyMessage || info.message,
+		);
 		(error as { headers?: Headers; status?: number }).headers = response.headers;
 		(error as { headers?: Headers; status?: number }).status = response.status;
 		(error as { code?: string }).code = info.code;
@@ -3235,11 +3243,12 @@ function isRetryableCodexFailureEvent(rawEvent: Record<string, unknown>): boolea
 	return !!message && CODEX_RETRYABLE_EVENT_MESSAGE.test(message);
 }
 
-function createCodexProviderStreamError(rawEvent: Record<string, unknown>): CodexProviderStreamError {
+function createCodexProviderStreamError(rawEvent: Record<string, unknown>, modelId: string): CodexProviderStreamError {
 	const code = getCodexEventErrorCode(rawEvent);
 	const message = getCodexEventErrorMessage(rawEvent);
-	const formattedMessage =
-		typeof rawEvent.type === "string" && rawEvent.type === "error"
+	const formattedMessage = isOpenAICodexChatGPTEntitlementError(message, code)
+		? formatOpenAICodexChatGPTEntitlementError(modelId)
+		: typeof rawEvent.type === "string" && rawEvent.type === "error"
 			? formatCodexErrorEvent(rawEvent, code, message)
 			: (formatCodexFailure(rawEvent) ?? "Codex response failed");
 	return new CodexProviderStreamError(

package/src/utils/codex-entitlement.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Model entitlement facts shared by Codex credential selection and provider
+ * error presentation.
+ *
+ * GPT-5.6 Sol is a Pro-tier ChatGPT Codex model. The usage endpoint is the
+ * authority for the account tier; this module only names the model policy and
+ * keeps the provider's deterministic rejection wording in one place.
+ */
+export declare function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
+export declare function requiresStrictOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
+export declare function isOpenAICodexChatGPTEntitlementError(message: string | undefined, code?: string): boolean;
+export declare function formatOpenAICodexChatGPTEntitlementError(modelId: string | undefined): string;

package/src/utils/codex-entitlement.ts

@@ -0,0 +1,36 @@
+/**
+ * Model entitlement facts shared by Codex credential selection and provider
+ * error presentation.
+ *
+ * GPT-5.6 Sol is a Pro-tier ChatGPT Codex model. The usage endpoint is the
+ * authority for the account tier; this module only names the model policy and
+ * keeps the provider's deterministic rejection wording in one place.
+ */
+
+export function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean {
+	return (
+		provider === "openai-codex" &&
+		typeof modelId === "string" &&
+		(modelId.toLowerCase().includes("-spark") || modelId.toLowerCase() === "gpt-5.6-sol")
+	);
+}
+
+export function requiresStrictOpenAICodexProModel(provider: string, modelId: string | undefined): boolean {
+	return provider === "openai-codex" && modelId?.toLowerCase() === "gpt-5.6-sol";
+}
+
+export function isOpenAICodexChatGPTEntitlementError(message: string | undefined, code?: string): boolean {
+	return (
+		/\bnot supported when using codex with a chatgpt account\b/i.test(message ?? "") &&
+		(code === undefined || code.toLowerCase() === "invalid_request_error")
+	);
+}
+
+export function formatOpenAICodexChatGPTEntitlementError(modelId: string | undefined): string {
+	const safeModelId = modelId
+		?.replace(/[\x00-\x1f\x7f-\x9f]+/gu, " ")
+		.trim()
+		.slice(0, 128);
+	const model = safeModelId ? ` model "${safeModelId}"` : " model";
+	return `This ChatGPT Codex account cannot use${model}. Select a model available to this ChatGPT account, such as "gpt-5.5", or use an API-key credential that supports the model.`;
+}