@gajae-code/ai 0.16.1 → 0.16.4

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

@@ -0,0 +1,22 @@
+/**
+ * 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 type OpenAICodexProEntitlement = "entitled" | "denied" | "unknown";
+/**
+ * Classify a ChatGPT `plan_type` for strict Pro-tier Codex models.
+ *
+ * The usage endpoint remains authoritative: only exact, documented tier names
+ * are classified. Known Free/Plus tiers can be rejected locally, while missing
+ * or unfamiliar values stay unknown and reach the provider instead of being
+ * guessed from a substring.
+ */
+export declare function classifyOpenAICodexProEntitlement(planType: string | undefined): OpenAICodexProEntitlement;
+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,57 @@
+/**
+ * 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.
+ */
+
+const OPENAI_CODEX_PRO_ENTITLED_PLAN_TYPES = new Set(["pro", "business", "enterprise", "team"]);
+const OPENAI_CODEX_PRO_DENIED_PLAN_TYPES = new Set(["free", "plus"]);
+
+export type OpenAICodexProEntitlement = "entitled" | "denied" | "unknown";
+
+/**
+ * Classify a ChatGPT `plan_type` for strict Pro-tier Codex models.
+ *
+ * The usage endpoint remains authoritative: only exact, documented tier names
+ * are classified. Known Free/Plus tiers can be rejected locally, while missing
+ * or unfamiliar values stay unknown and reach the provider instead of being
+ * guessed from a substring.
+ */
+export function classifyOpenAICodexProEntitlement(planType: string | undefined): OpenAICodexProEntitlement {
+	const normalized = planType?.trim().toLowerCase();
+	if (!normalized) return "unknown";
+	if (OPENAI_CODEX_PRO_ENTITLED_PLAN_TYPES.has(normalized)) return "entitled";
+	if (OPENAI_CODEX_PRO_DENIED_PLAN_TYPES.has(normalized)) return "denied";
+	return "unknown";
+}
+
+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.`;
+}

package/src/utils/discovery/antigravity.ts

@@ -180,6 +180,7 @@ export async function fetchAntigravityDiscoveryModels(
 	options: FetchAntigravityDiscoveryModelsOptions,
 ): Promise<Model<"google-gemini-cli">[] | null> {
 	const fetcher = options.fetcher ?? fetch;
+	const signal = options.signal ?? AbortSignal.timeout(5_000);
 	const targetProvider = options.targetProvider ?? "google-antigravity";
 	const endpoints = options.endpoint
 		? [trimTrailingSlashes(options.endpoint)]
@@ -196,7 +197,7 @@ export async function fetchAntigravityDiscoveryModels(
 					"User-Agent": options.userAgent ?? getAntigravityUserAgent(),
 				},
 				body: JSON.stringify({}),
-				signal: options.signal,
+				signal,
 			});
 		} catch {
 			continue;

package/src/utils/discovery/gemini.ts

@@ -72,6 +72,7 @@ export async function fetchGeminiModels(
 	const baseUrl = normalizeBaseUrl(options.baseUrl);
 	const pageSize = normalizePositiveInt(options.pageSize, DEFAULT_PAGE_SIZE);
 	const maxPages = normalizePositiveInt(options.maxPages, DEFAULT_MAX_PAGES);
+	const signal = options.signal ?? AbortSignal.timeout(5_000);
 
 	const bundledById = new Map(
 		getBundledModels("google").map(model => [model.id, model as Model<"google-generative-ai">]),
@@ -86,7 +87,7 @@ export async function fetchGeminiModels(
 		try {
 			response = await fetchImpl(requestUrl, {
 				method: "GET",
-				signal: options.signal,
+				signal,
 			});
 		} catch {
 			return null;