@pentoshi/clai 4.11.28 → 4.12.0

package/dist/llm/codex-models.js

@@ -0,0 +1,172 @@
+import { createHash } from "node:crypto";
+import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { getDataDir } from "../store/paths.js";
+import { CODEX_API_BASE_URL, CODEX_CLIENT_VERSION, codexRequestHeaders, } from "./codex-auth.js";
+import { credentialFor, withCodexCredential } from "./codex-credential.js";
+import { catalogEntriesFromPayload } from "./catalog-facts.js";
+import { ingestModelCatalogEntries, readJson } from "./http.js";
+export const codexFallbackModels = [
+    "gpt-6.1-sol",
+    "gpt-6-astra",
+    "gpt-6-sol",
+    "gpt-6-luna",
+    "gpt-5.6-sol",
+    "gpt-5.6-terra",
+    "gpt-5.6-luna",
+    "gpt-5.5",
+    "gpt-5.4",
+    "gpt-5.4-mini",
+    "gpt-5.3-codex-spark",
+];
+const CACHE_TTL_MS = 5 * 60_000;
+const catalogs = new Map();
+const pending = new Map();
+let readDiskCache = true;
+function catalogKey(credential) {
+    return createHash("sha256")
+        .update(JSON.stringify([
+        CODEX_API_BASE_URL,
+        CODEX_CLIENT_VERSION,
+        credential.accountId,
+        credential.residency,
+    ]))
+        .digest("hex");
+}
+function stringField(entry, name) {
+    return typeof entry[name] === "string" ? entry[name] : undefined;
+}
+function normalizeEntries(payload) {
+    return catalogEntriesFromPayload(payload).flatMap((value) => {
+        if (!value || typeof value !== "object" || Array.isArray(value))
+            return [];
+        const entry = value;
+        const id = entry.slug ?? entry.id ?? entry.name;
+        if (typeof id !== "string" || !id.trim())
+            return [];
+        const context = entry.context_window ?? entry.max_context_window;
+        const effectivePercentage = entry.effective_context_window_percent;
+        const percentage = typeof effectivePercentage === "number"
+            && effectivePercentage > 0 && effectivePercentage <= 100
+            ? effectivePercentage : 95;
+        const { model_messages: _messages, base_instructions: _instructions, ...metadata } = entry;
+        return [{
+                ...metadata,
+                id: id.trim(),
+                ...(typeof context === "number" && Number.isFinite(context) && context > 0
+                    ? {
+                        context_window: context,
+                        top_provider: { context_length: Math.floor(context * percentage / 100) },
+                    }
+                    : {}),
+            }];
+    });
+}
+function activateCatalog(cache) {
+    ingestModelCatalogEntries("codex", cache.entries);
+    return cache.entries
+        .filter((entry) => entry.visibility === undefined || entry.visibility === "list")
+        .map((entry) => String(entry.id))
+        .filter((id, index, ids) => ids.indexOf(id) === index)
+        .sort();
+}
+export function codexModelMetadata(credential, model) {
+    const entry = catalogs.get(catalogKey(credential))?.entries.find((entry) => entry.id === model);
+    if (!entry)
+        return undefined;
+    const levels = Array.isArray(entry.supported_reasoning_levels)
+        ? entry.supported_reasoning_levels : [];
+    const supportedEfforts = levels.flatMap((level) => {
+        if (typeof level === "string")
+            return [level];
+        if (level && typeof level === "object" && typeof level.effort === "string") {
+            return [level.effort];
+        }
+        return [];
+    });
+    return {
+        id: model,
+        visibility: stringField(entry, "visibility"),
+        supportedEfforts,
+        defaultEffort: stringField(entry, "default_reasoning_level"),
+        defaultSummary: stringField(entry, "default_reasoning_summary"),
+        supportsSummary: entry.supports_reasoning_summary_parameter !== false,
+        supportsVerbosity: entry.support_verbosity === true,
+        defaultVerbosity: stringField(entry, "default_verbosity"),
+        multiAgentEffort: stringField(entry, "multi_agent_reasoning_effort"),
+        responsesLite: entry.use_responses_lite === true,
+    };
+}
+async function fetchCatalog(auth, key) {
+    const path = join(getDataDir(), "codex-models", `${key}.json`);
+    let cached = catalogs.get(key);
+    if (!cached && readDiskCache) {
+        try {
+            const parsed = JSON.parse(await readFile(path, "utf8"));
+            if (Number.isFinite(parsed.fetchedAt) && Array.isArray(parsed.entries)) {
+                cached = { ...parsed, entries: normalizeEntries(parsed.entries) };
+                catalogs.set(key, cached);
+            }
+        }
+        catch { }
+    }
+    if (cached && Date.now() - cached.fetchedAt < CACHE_TTL_MS)
+        return activateCatalog(cached);
+    try {
+        const updated = await withCodexCredential(auth, async (credential) => {
+            const response = await fetch(`${CODEX_API_BASE_URL}/models?client_version=${CODEX_CLIENT_VERSION}`, {
+                headers: {
+                    authorization: `Bearer ${credential.accessToken}`,
+                    ...codexRequestHeaders(credential.accountId, {}, credential.residency),
+                    ...(cached?.etag ? { "if-none-match": cached.etag } : {}),
+                },
+                signal: AbortSignal.timeout(15_000),
+            });
+            if (response.status === 304 && cached)
+                return { ...cached, fetchedAt: Date.now() };
+            const payload = await readJson(response);
+            const entries = normalizeEntries(payload);
+            if (!entries.length)
+                throw new Error("ChatGPT returned an empty model catalog");
+            return { fetchedAt: Date.now(), entries, etag: response.headers.get("etag") ?? undefined };
+        });
+        catalogs.set(key, updated);
+        const result = activateCatalog(updated);
+        try {
+            await mkdir(join(getDataDir(), "codex-models"), { recursive: true });
+            const temporary = `${path}.${process.pid}.tmp`;
+            await writeFile(temporary, JSON.stringify(updated), { mode: 0o600 });
+            await rename(temporary, path);
+        }
+        catch { }
+        return result;
+    }
+    catch (error) {
+        if (cached)
+            return activateCatalog(cached);
+        throw error;
+    }
+}
+export async function listCodexModels(auth) {
+    const key = catalogKey(credentialFor(auth));
+    const cached = catalogs.get(key);
+    if (cached && Date.now() - cached.fetchedAt < CACHE_TTL_MS)
+        return activateCatalog(cached);
+    const existing = pending.get(key);
+    if (existing)
+        return existing;
+    const task = fetchCatalog(auth, key);
+    pending.set(key, task);
+    try {
+        return await task;
+    }
+    finally {
+        pending.delete(key);
+    }
+}
+export function resetCodexModelCache() {
+    catalogs.clear();
+    pending.clear();
+    readDiskCache = false;
+}
+//# sourceMappingURL=codex-models.js.map

package/dist/llm/codex-models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-models.js","sourceRoot":"","sources":["../../src/llm/codex-models.ts"],"names":[],"mappings":"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"}

package/dist/llm/codex-request.d.ts

@@ -0,0 +1 @@
+export declare function finalizeCodexBody(body: Record<string, unknown>, responsesLite: boolean): Record<string, unknown>;

package/dist/llm/codex-request.js

@@ -0,0 +1,61 @@
+import { createHash } from "node:crypto";
+const UUID_NAMESPACE_OID = "6ba7b8129dad11d180b400c04fd430c8";
+function uuidV5(namespace, value) {
+    const bytes = createHash("sha1")
+        .update(Buffer.from(namespace.replace(/-/g, ""), "hex"))
+        .update(value)
+        .digest()
+        .subarray(0, 16);
+    bytes[6] = (bytes[6] & 0x0f) | 0x50;
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+    const hex = bytes.toString("hex");
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+function sortedJson(value) {
+    return JSON.stringify(value, (_key, item) => {
+        if (!item || typeof item !== "object" || Array.isArray(item))
+            return item;
+        return Object.fromEntries(Object.entries(item).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0));
+    });
+}
+export function finalizeCodexBody(body, responsesLite) {
+    if (responsesLite) {
+        const tools = Array.isArray(body.tools) ? body.tools : [];
+        const groupedTools = tools.length
+            ? [{ type: "namespace", name: "functions", description: "", tools }]
+            : [];
+        const namespace = uuidV5(UUID_NAMESPACE_OID, String(body.prompt_cache_key));
+        const prefix = [{
+                type: "additional_tools",
+                id: `at_${uuidV5(namespace, sortedJson(groupedTools))}`,
+                role: "developer",
+                tools: groupedTools,
+            }];
+        if (typeof body.instructions === "string" && body.instructions) {
+            prefix.push({
+                type: "message",
+                id: `msg_${uuidV5(namespace, body.instructions)}`,
+                role: "developer",
+                content: [{ type: "input_text", text: body.instructions }],
+                internal_chat_message_metadata_passthrough: {
+                    content_item_kinds: ["model.base_instructions"],
+                },
+            });
+        }
+        body.input = [...prefix, ...body.input];
+        delete body.instructions;
+        delete body.tools;
+        body.parallel_tool_calls = false;
+    }
+    const ordered = {};
+    for (const key of [
+        "model", "stream", "service_tier", "instructions", "input", "tools",
+        "tool_choice", "parallel_tool_calls", "reasoning", "store", "stream_options",
+        "include", "prompt_cache_key", "text", "client_metadata", "access_programs",
+    ]) {
+        if (key in body)
+            ordered[key] = body[key];
+    }
+    return ordered;
+}
+//# sourceMappingURL=codex-request.js.map

package/dist/llm/codex-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-request.js","sourceRoot":"","sources":["../../src/llm/codex-request.ts"],"names":[],"mappings":"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"}

package/dist/llm/codex-usage.d.ts

@@ -0,0 +1,4 @@
+import type { ProviderAuth } from "./provider.js";
+import type { ProviderBalance } from "./provider-balance.js";
+export declare function codexBalanceFromUsage(payload: unknown, accountId?: string): ProviderBalance;
+export declare function fetchCodexUsage(auth: ProviderAuth): Promise<ProviderBalance>;

package/dist/llm/codex-usage.js

@@ -0,0 +1,96 @@
+import { CODEX_API_BASE_URL, codexRequestHeaders } from "./codex-auth.js";
+import { withCodexCredential } from "./codex-credential.js";
+import { readJson } from "./http.js";
+function record(value) {
+    return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function numeric(value) {
+    if (typeof value !== "number" && typeof value !== "string")
+        return undefined;
+    if (typeof value === "string" && !value.trim())
+        return undefined;
+    const result = Number(value);
+    return Number.isFinite(result) && result >= 0 ? result : undefined;
+}
+function windowLabel(seconds, fallback) {
+    if (!seconds)
+        return fallback;
+    if (seconds % 86_400 === 0)
+        return seconds === 604_800 ? "Weekly" : `${seconds / 86_400} day`;
+    if (seconds % 3600 === 0)
+        return `${seconds / 3600} hour`;
+    if (seconds % 60 === 0)
+        return `${seconds / 60} minute`;
+    return `${seconds} second`;
+}
+export function codexBalanceFromUsage(payload, accountId) {
+    const usage = record(payload);
+    if (!usage)
+        throw new Error("Invalid ChatGPT usage response");
+    const breakdowns = [];
+    const addWindows = (value, prefix = "") => {
+        const limits = record(value);
+        for (const [name, fallback] of [["primary_window", "Primary"], ["secondary_window", "Secondary"]]) {
+            const window = record(limits?.[name]);
+            const used = numeric(window?.used_percent);
+            if (used === undefined)
+                continue;
+            const resetAt = numeric(window?.reset_at);
+            const resetAfter = numeric(window?.reset_after_seconds);
+            breakdowns.push({
+                label: `${prefix}${windowLabel(numeric(window?.limit_window_seconds), fallback)} limit`,
+                used: Math.min(100, used),
+                limit: 100,
+                overages: 0,
+                unit: "percent",
+                nextResetAt: resetAt ? resetAt * 1000 : resetAfter !== undefined ? Date.now() + resetAfter * 1000 : undefined,
+            });
+        }
+    };
+    addWindows(usage.rate_limit);
+    addWindows(usage.code_review_rate_limit, "Code review · ");
+    if (Array.isArray(usage.additional_rate_limits)) {
+        for (const value of usage.additional_rate_limits) {
+            const additional = record(value);
+            const label = additional?.limit_name ?? additional?.metered_feature;
+            addWindows(additional?.rate_limit, typeof label === "string" ? `${label} · ` : "");
+        }
+    }
+    const credits = record(usage.credits);
+    const creditBalance = numeric(credits?.balance);
+    const individual = record(record(usage.spend_control)?.individual_limit);
+    const limit = numeric(individual?.limit);
+    const used = numeric(individual?.used);
+    if (limit !== undefined && used !== undefined) {
+        const reset = numeric(individual?.reset_at);
+        breakdowns.push({ label: "Spend limit", limit, used, overages: 0, nextResetAt: reset ? reset * 1000 : undefined });
+    }
+    if (!breakdowns.length && !credits && typeof usage.plan_type !== "string")
+        throw new Error("ChatGPT usage response contains no subscription details");
+    return {
+        provider: "codex",
+        accountId,
+        plan: typeof usage.plan_type === "string" ? usage.plan_type : undefined,
+        breakdowns,
+        credits: credits ? {
+            remaining: creditBalance,
+            unlimited: credits.unlimited === true,
+            available: credits.has_credits === true,
+        } : undefined,
+        limitReached: record(usage.rate_limit)?.limit_reached === true || record(usage.spend_control)?.reached === true,
+        fetchedAt: Date.now(),
+    };
+}
+export async function fetchCodexUsage(auth) {
+    return withCodexCredential(auth, async (credential) => {
+        const response = await fetch(`${CODEX_API_BASE_URL.replace(/\/codex$/, "")}/wham/usage`, {
+            headers: {
+                authorization: `Bearer ${credential.accessToken}`,
+                ...codexRequestHeaders(credential.accountId, {}, credential.residency),
+            },
+            signal: AbortSignal.timeout(15_000),
+        });
+        return codexBalanceFromUsage(await readJson(response), credential.accountId);
+    });
+}
+//# sourceMappingURL=codex-usage.js.map

package/dist/llm/codex-usage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-usage.js","sourceRoot":"","sources":["../../src/llm/codex-usage.ts"],"names":[],"mappings":"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"}

package/dist/llm/codex.d.ts

@@ -1,4 +1,3 @@
 import { type LlmProvider } from "./provider.js";
-export declare const codexFallbackModels: readonly string[];
-export declare function resetCodexModelCache(): void;
+export { resetCodexModelCache, codexFallbackModels } from "./codex-models.js";
 export declare const codexProvider: LlmProvider;

package/dist/llm/codex.js

@@ -1,162 +1,11 @@
 import { CHATGPT_SUBSCRIPTION_DISPLAY_NAME, defaultModels, } from "./provider.js";
-import { readJson, ingestModelCatalogEntries, ProviderError } from "./http.js";
-import { CODEX_API_BASE_URL, CODEX_CLIENT_VERSION, accountIdFromIdToken, codexPromptCacheKey, codexRequestHeaders, decodeCodexKey, extractResidency, expiresAtFromAccessToken, maybeRefreshCodexCredential, } from "./codex-auth.js";
-import { currentRequestPurpose } from "./request-purpose.js";
-import { getProviderKeys, setProviderKeys } from "../store/keys.js";
-import { META_STREAM_TERMINAL } from "./stream-terminal.js";
-import { mapResponsesEffort, responsesStream, } from "./responses-dialect.js";
-export const codexFallbackModels = [
-    "gpt-5.6-sol",
-    "gpt-5.6-terra",
-    "gpt-5.6-luna",
-    "gpt-5.5",
-    "gpt-5.4",
-    "gpt-5.4-mini",
-    "gpt-5.3-codex-spark",
-];
-const baseUrl = CODEX_API_BASE_URL;
-let cachedModels = null;
-let lastFetchTime = 0;
-const CACHE_TTL_MS = 30 * 60 * 1000;
-export function resetCodexModelCache() {
-    cachedModels = null;
-    lastFetchTime = 0;
-}
-function requireKey(auth) {
-    if (!auth.apiKey) {
-        throw new Error(`${CHATGPT_SUBSCRIPTION_DISPLAY_NAME} authentication required. Run \`clai auth chatgpt\` (browser sign-in) or add a key with \`clai set chatgpt <token>\`.`);
-    }
-    return auth.apiKey;
-}
-function credentialFor(auth) {
-    const key = requireKey(auth);
-    const decoded = decodeCodexKey(key);
-    if (decoded)
-        return decoded;
-    const accountId = accountIdFromIdToken(key);
-    if (!accountId) {
-        throw new Error(`${CHATGPT_SUBSCRIPTION_DISPLAY_NAME} credential is malformed. Run \`clai auth chatgpt\` to sign in again.`);
-    }
-    return {
-        accessToken: key,
-        accountId,
-        expiresAt: expiresAtFromAccessToken(key),
-        residency: extractResidency(key),
-    };
-}
-async function withCodexCredential(auth, run) {
-    let credential = credentialFor(auth);
-    if (credential.refreshToken &&
-        credential.expiresAt !== undefined &&
-        credential.expiresAt <= Date.now() + 60_000) {
-        const fresh = await maybeRefreshCodexCredential(auth.apiKey ?? "").catch(() => undefined);
-        if (fresh && fresh !== auth.apiKey) {
-            await replaceCodexKey(auth.apiKey ?? "", fresh).catch(() => undefined);
-            credential = credentialFor({ ...auth, apiKey: fresh });
-        }
-    }
-    try {
-        return await run(credential);
-    }
-    catch (error) {
-        const status = error instanceof ProviderError ? error.status : undefined;
-        const renewable = (status === 401 || status === 403) && currentRequestPurpose() === undefined;
-        if (!renewable)
-            throw error;
-        const fresh = await maybeRefreshCodexCredential(auth.apiKey ?? "");
-        if (!fresh || fresh === auth.apiKey) {
-            if (!credential.refreshToken) {
-                throw new ProviderError(`${CHATGPT_SUBSCRIPTION_DISPLAY_NAME} token expired and has no refresh token. Run \`clai auth chatgpt\` to sign in again.`, status ?? 401);
-            }
-            throw error;
-        }
-        await replaceCodexKey(auth.apiKey ?? "", fresh).catch(() => undefined);
-        const renewed = credentialFor({ ...auth, apiKey: fresh });
-        return run(renewed);
-    }
-}
-async function replaceCodexKey(oldKey, newKey) {
-    const multi = await getProviderKeys("codex");
-    if (multi.source === "env")
-        return;
-    if (multi.keys.some((slot) => slot.value === newKey))
-        return;
-    const values = multi.keys.map((slot) => slot.value === oldKey ? newKey : slot.value);
-    const disabled = multi.keys
-        .filter((slot) => slot.disabled === true)
-        .map((slot) => (slot.value === oldKey ? newKey : slot.value));
-    await setProviderKeys("codex", values, multi.activeIndex, disabled);
-}
-function settingsFor(credential) {
-    return codexRequestHeaders(credential.accountId, {}, credential.residency);
-}
-function codexCacheKey(context) {
-    return codexPromptCacheKey(context);
-}
-function codexConfigFor(credential) {
-    return {
-        baseUrl,
-        providerId: "codex",
-        displayName: CHATGPT_SUBSCRIPTION_DISPLAY_NAME,
-        artifactDialect: "openai-compatible",
-        terminalPolicy: META_STREAM_TERMINAL,
-        omitSampling: true,
-        maxTokensField: "omit",
-        omitParallelToolCalls: true,
-        instructionsField: "instructions",
-        systemRole: "developer",
-        buildHeaders(auth, accept, context) {
-            const cacheKey = codexPromptCacheKey(context);
-            return {
-                "content-type": "application/json",
-                accept,
-                ...(auth.apiKey ? { authorization: `Bearer ${auth.apiKey}` } : {}),
-                ...codexRequestHeaders(credential.accountId, {}, credential.residency, cacheKey),
-                "session-id": cacheKey,
-            };
-        },
-        reasoningPayload(reasoning) {
-            if (!reasoning?.enabled)
-                return undefined;
-            return { effort: mapResponsesEffort(reasoning.effort), summary: "auto" };
-        },
-        bodyExtras(context) {
-            return {
-                store: false,
-                include: ["reasoning.encrypted_content"],
-                prompt_cache_key: codexPromptCacheKey(context),
-            };
-        },
-    };
-}
-function codexCatalogEntries(payload) {
-    const container = payload && typeof payload === "object" && !Array.isArray(payload)
-        ? payload
-        : undefined;
-    const list = Array.isArray(container?.models)
-        ? container.models
-        : Array.isArray(container?.data)
-            ? container.data
-            : Array.isArray(payload)
-                ? payload
-                : [];
-    return list.map((entry) => {
-        if (!entry || typeof entry !== "object" || Array.isArray(entry))
-            return entry;
-        const record = entry;
-        const slug = record.slug ?? record.id ?? record.name;
-        if (typeof slug !== "string" || !slug)
-            return entry;
-        const visibility = record.visibility;
-        return {
-            ...record,
-            id: slug,
-            ...(visibility === "list" || visibility === undefined
-                ? {}
-                : { visibility }),
-        };
-    });
-}
+import { ProviderError } from "./http.js";
+import { withCodexCredential } from "./codex-credential.js";
+import { listCodexModels } from "./codex-models.js";
+import { codexConfigFor } from "./codex-config.js";
+import { CODEX_API_BASE_URL, CODEX_CLIENT_VERSION, accountIdFromIdToken, codexRequestHeaders, decodeCodexKey, encodeCodexKey, } from "./codex-auth.js";
+import { responsesStream } from "./responses-dialect.js";
+export { resetCodexModelCache, codexFallbackModels } from "./codex-models.js";
 export const codexProvider = {
     id: "codex",
     displayName: CHATGPT_SUBSCRIPTION_DISPLAY_NAME,
@@ -164,79 +13,43 @@ export const codexProvider = {
     defaultModel: defaultModels.codex,
     envVar: "CODEX_API_KEY",
     validateKey: (key) => decodeCodexKey(key) !== undefined || accountIdFromIdToken(key) !== undefined,
-    async listModels(auth) {
-        const now = Date.now();
-        if (cachedModels && now - lastFetchTime < CACHE_TTL_MS) {
-            return cachedModels;
-        }
-        const headers = {};
-        if (auth.apiKey) {
-            const credential = decodeCodexKey(auth.apiKey);
-            if (credential) {
-                Object.assign(headers, settingsFor(credential));
-                headers["authorization"] = `Bearer ${credential.accessToken}`;
-            }
-        }
-        const response = await fetch(`${baseUrl}/models?client_version=${CODEX_CLIENT_VERSION}`, { headers });
-        const payload = await readJson(response);
-        const models = ingestModelCatalogEntries("codex", codexCatalogEntries(payload));
-        const result = models.length > 0 ? models : [...codexFallbackModels];
-        if (result.length > 0) {
-            cachedModels = result;
-            lastFetchTime = now;
-        }
-        return result;
-    },
+    listModels: listCodexModels,
     async ping(auth) {
-        const credential = credentialFor(auth);
-        const response = await fetch(`${baseUrl}/models?client_version=${CODEX_CLIENT_VERSION}`, {
-            headers: {
-                authorization: `Bearer ${credential.accessToken}`,
-                ...settingsFor(credential),
-            },
-        });
-        if (!response.ok) {
-            throw new ProviderError(`${CHATGPT_SUBSCRIPTION_DISPLAY_NAME} authentication failed (HTTP ${response.status}). Run \`clai auth chatgpt\` to sign in.`, response.status);
-        }
-    },
-    async complete(request, auth) {
-        const model = await resolveCodexModel(auth, request.model);
-        return withCodexCredential(auth, async (credential) => {
-            const config = codexConfigFor(credential);
-            const streamRequest = {
-                ...request,
-                provider: "codex",
-                model,
-            };
-            return responsesStream(config, streamRequest, { apiKey: credential.accessToken }, () => { }, model);
-        });
-    },
-    async stream(request, auth, onToken) {
-        const model = await resolveCodexModel(auth, request.model);
-        return withCodexCredential(auth, async (credential) => {
-            const config = codexConfigFor(credential);
-            const streamRequest = {
-                ...request,
-                provider: "codex",
-                model,
-            };
-            return responsesStream(config, streamRequest, { apiKey: credential.accessToken }, onToken, model);
+        await withCodexCredential(auth, async (credential) => {
+            const response = await fetch(`${CODEX_API_BASE_URL}/models?client_version=${CODEX_CLIENT_VERSION}`, {
+                headers: {
+                    authorization: `Bearer ${credential.accessToken}`,
+                    ...codexRequestHeaders(credential.accountId, {}, credential.residency),
+                },
+                signal: AbortSignal.timeout(15_000),
+            });
+            if (!response.ok) {
+                throw new ProviderError(`${CHATGPT_SUBSCRIPTION_DISPLAY_NAME} authentication failed (HTTP ${response.status}). Run \`clai auth chatgpt\` to sign in.`, response.status);
+            }
         });
     },
+    complete: (request, auth) => runCodexRequest(request, auth, () => { }),
+    stream: runCodexRequest,
 };
 async function resolveCodexModel(auth, requestedModel) {
-    if (requestedModel)
-        return requestedModel;
     let available = [];
     try {
         available = await codexProvider.listModels(auth);
     }
     catch {
-        available = cachedModels ?? [...codexFallbackModels];
+        return requestedModel ?? defaultModels.codex;
     }
+    if (requestedModel)
+        return requestedModel;
     if (available.includes(defaultModels.codex)) {
         return defaultModels.codex;
     }
     return available[0] ?? defaultModels.codex;
 }
+async function runCodexRequest(request, auth, onToken) {
+    return withCodexCredential(auth, async (credential) => {
+        const model = await resolveCodexModel({ apiKey: encodeCodexKey(credential) }, request.model);
+        return responsesStream(codexConfigFor(credential), { ...request, provider: "codex", model }, { apiKey: credential.accessToken }, onToken, model);
+    });
+}
 //# sourceMappingURL=codex.js.map