codex-multi-auth 2.15.0 → 2.17.0

package/dist/lib/model-route-policy.js

@@ -0,0 +1,159 @@
+import { mergeCatalogModel, mergeCatalogModels } from "./runtime/catalog-capabilities.js";
+import { isRecord } from "./utils.js";
+export function parseModelRoute(model) {
+    if (!model || model.length > 256 || /[\u0000-\u0020\u007f]/.test(model))
+        throw new Error("Invalid route model");
+    let kind = "oauth";
+    for (const candidate of ["api", "zdr"])
+        if (model.startsWith(`${candidate}/`)) {
+            kind = candidate;
+            model = model.slice(candidate.length + 1);
+            break;
+        }
+    let serviceTier;
+    if (model.startsWith("speed/")) {
+        const match = /^speed\/([A-Za-z0-9._-]{1,64})\/(.+)$/.exec(model);
+        if (!match?.[1] || !match[2])
+            throw new Error("Invalid speed route");
+        serviceTier = match[1];
+        model = match[2];
+    }
+    if (!model || /^(api|zdr|speed)\//.test(model))
+        throw new Error("Invalid route model");
+    return {
+        kind,
+        upstreamModel: model,
+        ...(serviceTier ? { serviceTier } : {}),
+    };
+}
+export function modelServiceTiers(model) {
+    if (!Array.isArray(model.service_tiers))
+        return [];
+    return model.service_tiers.filter((tier) => isRecord(tier) &&
+        typeof tier.id === "string" &&
+        /^[A-Za-z0-9._-]{1,64}$/.test(tier.id) &&
+        typeof tier.name === "string" &&
+        tier.name.length <= 100 &&
+        !/[\x00-\x1f\x7f]/.test(tier.name) &&
+        typeof tier.description === "string");
+}
+export function canonicalServiceTier(tier) {
+    return tier === "priority" ? "fast" : tier;
+}
+export function supportsModelSettings(model, reasoningEffort, serviceTier) {
+    return ((!reasoningEffort ||
+        Array.isArray(model.supported_reasoning_levels) &&
+            model.supported_reasoning_levels.some((l) => isRecord(l) && l.effort === reasoningEffort)) &&
+        (!serviceTier ||
+            serviceTier === "default" ||
+            serviceTier === "auto" ||
+            modelServiceTiers(model).some((t) => canonicalServiceTier(t.id) === canonicalServiceTier(serviceTier))));
+}
+function visible(catalog, model) {
+    if ((isRecord(model.capability_probe_status) &&
+        model.capability_probe_status.responses === "unsupported") ||
+        !catalog.enabled ||
+        !model.slug ||
+        /^(api|zdr|speed)\//.test(model.slug))
+        return false;
+    return (catalog.kind === "oauth" ||
+        catalog.visibleModels?.includes(model.slug) === true);
+}
+export function resolveModelRoute(model, catalogs, settings = {}) {
+    const parsed = parseModelRoute(model);
+    if (parsed.serviceTier &&
+        settings.serviceTier &&
+        canonicalServiceTier(parsed.serviceTier) !==
+            canonicalServiceTier(settings.serviceTier))
+        throw new Error("Conflicting speed selection");
+    const serviceTier = parsed.serviceTier ?? settings.serviceTier;
+    const candidates = catalogs
+        .filter((c) => c.kind === parsed.kind &&
+        c.models.some((m) => m.slug === parsed.upstreamModel &&
+            visible(c, m) &&
+            supportsModelSettings(m, settings.reasoningEffort, serviceTier)))
+        .sort((a, b) => a.priority - b.priority || a.id.localeCompare(b.id));
+    return { ...parsed, ...(serviceTier ? { serviceTier } : {}), candidates };
+}
+export function buildVisibleModelUnion(catalogs) {
+    const models = new Map();
+    const sources = new Map();
+    for (const catalog of [...catalogs].sort((a, b) => a.priority - b.priority)) {
+        for (const model of catalog.models) {
+            if (!visible(catalog, model))
+                continue;
+            const prefix = catalog.kind === "oauth" ? "" : `${catalog.kind}/`;
+            const name = `${catalog.kind === "oauth" ? "" : `${catalog.kind.toUpperCase()} · `}${typeof model.display_name === "string" ? model.display_name : model.slug}`;
+            const slug = prefix + model.slug;
+            const group = sources.get(slug) ?? [];
+            group.push({ ...model, ...(Array.isArray(model.service_tiers) ? { service_tiers: modelServiceTiers(model) } : {}) });
+            sources.set(slug, group);
+            const existing = models.get(slug);
+            const entry = (existing ? mergeCatalogModel(existing, model) : undefined) ??
+                (catalog.kind === "oauth"
+                    ? { ...model }
+                    : { ...model, slug, display_name: name });
+            models.set(slug, entry);
+            const programs = new Map();
+            for (const source of [entry.available_access_programs, model.available_access_programs]) {
+                if (!isRecord(source))
+                    continue;
+                for (const [category, values] of Object.entries(source)) {
+                    if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,79}$/.test(category) || !Array.isArray(values))
+                        continue;
+                    const merged = programs.get(category) ?? new Set();
+                    for (const value of values)
+                        if (typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9._-]{0,79}$/.test(value))
+                            merged.add(value);
+                    programs.set(category, merged);
+                }
+            }
+            if (programs.size)
+                entry.available_access_programs = Object.fromEntries([...programs].map(([category, values]) => [category, [...values]]));
+        }
+    }
+    for (const [slug, group] of sources) {
+        const entry = models.get(slug), merged = mergeCatalogModels(group);
+        if (!entry || !merged)
+            continue;
+        entry.supported_reasoning_levels = merged.supported_reasoning_levels;
+        if (merged.default_service_tier !== undefined)
+            entry.default_service_tier = merged.default_service_tier === "fast" ? "priority" : merged.default_service_tier;
+        if (Array.isArray(merged.service_tiers))
+            entry.service_tiers = modelServiceTiers(merged).map(tier => ({ ...tier, id: canonicalServiceTier(tier.id) === "fast" ? "priority" : tier.id }));
+    }
+    return [...models.values()];
+}
+/** Whitelist capability metadata; never persist model instructions or arbitrary fields. */
+export function modelEntitlements(model) {
+    const safe = (v) => typeof v === "string" && /^[A-Za-z0-9._-]{1,80}$/.test(v);
+    return {
+        model: model.slug,
+        ...(typeof model.capability_checked_at === "number"
+            ? { checkedAt: model.capability_checked_at }
+            : {}),
+        ...(isRecord(model.capability_probe_status)
+            ? {
+                probes: Object.fromEntries(Object.entries(model.capability_probe_status).filter((entry) => /^(responses|fast|ultrafast|effort:(none|minimal|low|medium|high|xhigh|max|ultra))$/.test(entry[0]) &&
+                    [
+                        "verified",
+                        "unsupported",
+                        "unverified",
+                        "downgraded",
+                    ].includes(String(entry[1])))),
+            }
+            : {}),
+        serviceTiers: modelServiceTiers(model).map((t) => ({
+            id: t.id,
+            name: t.name,
+        })),
+        reasoningLevels: Array.isArray(model.supported_reasoning_levels)
+            ? model.supported_reasoning_levels.flatMap((v) => isRecord(v) && safe(v.effort) ? [v.effort] : [])
+            : [],
+        accessPrograms: isRecord(model.available_access_programs)
+            ? Object.entries(model.available_access_programs).flatMap(([category, values]) => safe(category) && Array.isArray(values)
+                ? values.filter(safe).map((v) => `${category}:${v}`)
+                : [])
+            : [],
+    };
+}

package/dist/lib/policy/runtime-policy.d.ts

@@ -24,6 +24,7 @@ export interface RuntimePolicyDecision {
     blockedAccountIndexes: Set<number>;
     blockedAccountReasons?: Record<number, string>;
     scoreBoostByAccount: Record<number, number>;
+    priorityByAccount?: Record<number, number>;
     budgetEvaluations: BudgetGuardEvaluation[];
 }
 export interface RuntimePolicyState {

package/dist/lib/policy/runtime-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-policy.d.ts","sourceRoot":"","sources":["../../../lib/policy/runtime-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-policy.d.ts","sourceRoot":"","sources":["../../../lib/policy/runtime-policy.ts"],"names":[],"mappings":"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"}

package/dist/lib/policy/runtime-policy.js

@@ -72,6 +72,7 @@ export async function evaluateRuntimePolicy(input) {
     const blockedAccountIndexes = new Set();
     const blockedAccountReasons = {};
     const scoreBoostByAccount = {};
+    const priorityByAccount = {};
     const profile = input.state.project.profile;
     if (profile?.modelDenylist.length && matchesModel(profile.modelDenylist, input.model)) {
         reasons.push("routing profile denies requested model");
@@ -101,6 +102,7 @@ export async function evaluateRuntimePolicy(input) {
             refreshToken: account.refreshToken ?? undefined,
         }, account.index);
         const accountPolicy = input.state.accountPolicies.accounts[accountKey];
+        priorityByAccount[account.index] = accountPolicy?.priority ?? 1;
         let boost = 0;
         if (accountPolicy?.paused) {
             blockedAccountIndexes.add(account.index);
@@ -155,6 +157,7 @@ export async function evaluateRuntimePolicy(input) {
         blockedAccountIndexes,
         blockedAccountReasons,
         scoreBoostByAccount,
+        priorityByAccount,
         budgetEvaluations,
     };
 }

package/dist/lib/preemptive-quota-scheduler.d.ts

@@ -58,6 +58,8 @@ export declare class PreemptiveQuotaScheduler {
      * silent clear-all; use `clearAll()` when that is the intent.
      */
     clearByPrefix(prefix: string): void;
+    /** Forget one verified recovered model; preserve sibling quota buckets. */
+    clear(key: string): void;
     /** Forget every cached quota observation. */
     clearAll(): void;
     prune(now?: number): number;

package/dist/lib/preemptive-quota-scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preemptive-quota-scheduler.d.ts","sourceRoot":"","sources":["../../lib/preemptive-quota-scheduler.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,oBAAoB,CAAC;IAC9B,SAAS,EAAE,oBAAoB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,YAAY,GAAG,uBAAuB,CAAC;CAChD;AAED,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gCAAgC,CAAC,EAAE,MAAM,CAAC;IAC1C,kCAAkC,CAAC,EAAE,MAAM,CAAC;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,sBAAsB,GAAG,IAAI,CAqB5H;AAED,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,kCAAkC,CAAS;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,GAAE,qBAA0B;IAQ/C,SAAS,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI;IA2CpD,OAAO,CAAC,UAAU;IAMlB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAM3D,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,IAAI;IA8B1E,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,qBAAqB;IAkEjE;;;;;;;;OAQG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAOnC,6CAA6C;IAC7C,QAAQ,IAAI,IAAI;IAIhB,KAAK,CAAC,GAAG,SAAa,GAAG,MAAM;CAW/B"}
+{"version":3,"file":"preemptive-quota-scheduler.d.ts","sourceRoot":"","sources":["../../lib/preemptive-quota-scheduler.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,oBAAoB,CAAC;IAC9B,SAAS,EAAE,oBAAoB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,YAAY,GAAG,uBAAuB,CAAC;CAChD;AAED,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gCAAgC,CAAC,EAAE,MAAM,CAAC;IAC1C,kCAAkC,CAAC,EAAE,MAAM,CAAC;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,sBAAsB,GAAG,IAAI,CAqB5H;AAED,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,kCAAkC,CAAS;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,GAAE,qBAA0B;IAQ/C,SAAS,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI;IA2CpD,OAAO,CAAC,UAAU;IAMlB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAM3D,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,IAAI;IA8B1E,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,qBAAqB;IAkEjE;;;;;;;;OAQG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAOnC,2EAA2E;IAC3E,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,6CAA6C;IAC7C,QAAQ,IAAI,IAAI;IAIhB,KAAK,CAAC,GAAG,SAAa,GAAG,MAAM;CAW/B"}

package/dist/lib/preemptive-quota-scheduler.js

@@ -281,6 +281,10 @@ export class PreemptiveQuotaScheduler {
                 this.snapshots.delete(key);
         }
     }
+    /** Forget one verified recovered model; preserve sibling quota buckets. */
+    clear(key) {
+        this.snapshots.delete(key);
+    }
     /** Forget every cached quota observation. */
     clearAll() {
         this.snapshots.clear();

package/dist/lib/prompts/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../lib/prompts/codex.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AA4EnG;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAI7C;AAcD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,YAAY,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAyBnE;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,WAAW,CAEnE;AA4ED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACzC,eAAe,SAAgB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAkHjB;AA6GD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,GAAE,MAAM,EAAO,GAAG,IAAI,CAiBpE;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,ozGA+EV,CAAC"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../lib/prompts/codex.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AA4EnG;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAI7C;AAcD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,YAAY,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAyBnE;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,WAAW,CAEnE;AA4ED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACzC,eAAe,SAAgB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAkHjB;AA6GD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,GAAE,MAAM,EAAO,GAAG,IAAI,CAmBpE;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,ozGA+EV,CAAC"}

package/dist/lib/prompts/codex.js

@@ -359,7 +359,9 @@ function refreshInstructionsInBackground(modelFamily, promptFile, cacheFile, cac
  * Prewarm instruction caches for the provided models/families.
  */
 export function prewarmCodexInstructions(models = []) {
-    const candidates = models.length > 0 ? models : [DEFAULT_MODEL, "gpt-5.3-codex", "gpt-5.1"];
+    // Every live model is in the gpt-5.2 prompt family now that the codex and
+    // gpt-5.1 models are retired, so the default model alone covers the prewarm.
+    const candidates = models.length > 0 ? models : [DEFAULT_MODEL];
     const prewarmTargets = new Map();
     for (const model of candidates) {
         const promptFamily = getModelFamily(model);

package/dist/lib/quota-probe.d.ts

@@ -1,3 +1,4 @@
+import { FirstUseProbeError } from "./runtime/subscription-first-use.js";
 /**
  * Human-readable note shown when a live probe fails solely because the account
  * lacks Codex entitlement (see {@link CodexUnavailableError}). Centralized so
@@ -25,6 +26,8 @@ export interface CodexQuotaWindow {
     resetAtMs?: number;
 }
 export interface CodexQuotaSnapshot {
+    primingCompleted?: boolean;
+    primingFailure?: FirstUseProbeError["reason"];
     status: number;
     planType?: string;
     activeLimit?: number;
@@ -57,6 +60,8 @@ export declare function formatQuotaResetAt(resetAtMs: number | undefined, nowMs?
  */
 export declare function formatQuotaSnapshotLine(snapshot: CodexQuotaSnapshot): string;
 export interface ProbeCodexQuotaOptions {
+    signal?: AbortSignal;
+    primeUnusedSubscription?: boolean;
     accountId: string;
     accessToken: string;
     model?: string;

package/dist/lib/quota-probe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quota-probe.d.ts","sourceRoot":"","sources":["../../lib/quota-probe.ts"],"names":[],"mappings":"AAYA;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AAEnF;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GACrC,MAAM,CAMR;AAED,MAAM,WAAW,gBAAgB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd;AA0MD;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,SAAa,GAChB,MAAM,GAAG,SAAS,CAqBpB;AAwBD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAa5E;AAED,MAAM,WAAW,sBAAsB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,sBAAsB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CA4G7B"}
+{"version":3,"file":"quota-probe.d.ts","sourceRoot":"","sources":["../../lib/quota-probe.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAyD,MAAM,qCAAqC,CAAC;AAEhI;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AAEnF;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GACrC,MAAM,CAMR;AAED,MAAM,WAAW,gBAAgB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd;AAiND;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,SAAa,GAChB,MAAM,GAAG,SAAS,CAqBpB;AAwBD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAa5E;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,sBAAsB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CA0H7B"}

package/dist/lib/quota-probe.js

@@ -1,10 +1,11 @@
-import { CODEX_BASE_URL } from "./constants.js";
+import { CODEX_BASE_URL, MAX_RATE_LIMIT_DELAY_MS } from "./constants.js";
 import { createCodexHeaders, getUnsupportedCodexModelInfo } from "./request/fetch-helpers.js";
 import { QUOTA_PROBE_MODEL_CHAIN, resolveProbeReasoningEffort, } from "./request/helpers/model-map.js";
 import { CodexUnavailableError, isCodexUnavailableError } from "./errors.js";
 import { getCodexInstructions } from "./prompts/codex.js";
 import { mutateRuntimeObservabilitySnapshot } from "./runtime/runtime-observability.js";
 import { isRecord } from "./utils.js";
+import { FirstUseProbeError, finishSubscriptionFirstUse, needsSubscriptionFirstUse } from "./runtime/subscription-first-use.js";
 /**
  * Human-readable note shown when a live probe fails solely because the account
  * lacks Codex entitlement (see {@link CodexUnavailableError}). Centralized so
@@ -79,6 +80,12 @@ function parseFiniteIntHeader(headers, name) {
  * Security: does not emit or persist header values; callers must redact any sensitive tokens before storing or logging headers.
  */
 function parseResetAtMs(headers, prefix) {
+    const raw = parseUnboundedResetAtMs(headers, prefix);
+    // A bogus header (finite, but overflowing once scaled to ms) must not read as
+    // a window that never resets.
+    return raw === undefined || Number.isNaN(raw) ? undefined : Math.min(raw, Date.now() + MAX_RATE_LIMIT_DELAY_MS);
+}
+function parseUnboundedResetAtMs(headers, prefix) {
     const resetAfterSeconds = parseFiniteIntHeader(headers, `${prefix}-reset-after-seconds`);
     if (typeof resetAfterSeconds === "number" && resetAfterSeconds > 0) {
         return Date.now() + resetAfterSeconds * 1000;
@@ -324,9 +331,11 @@ export async function fetchCodexQuotaSnapshot(options) {
     let sawUnsupportedModel = false;
     let sawOtherFailure = false;
     for (const model of models) {
+        options.signal?.throwIfAborted();
         attemptedAnyModel = true;
         try {
             const instructions = await getCodexInstructions(model);
+            options.signal?.throwIfAborted();
             const probeBody = {
                 model,
                 stream: true,
@@ -362,7 +371,7 @@ export async function fetchCodexQuotaSnapshot(options) {
                     method: "POST",
                     headers,
                     body: JSON.stringify(probeBody),
-                    signal: controller.signal,
+                    signal: options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal,
                 });
             }
             finally {
@@ -370,6 +379,18 @@ export async function fetchCodexQuotaSnapshot(options) {
             }
             const snapshotBase = parseQuotaSnapshotBase(response.headers, response.status);
             if (snapshotBase) {
+                if (options.primeUnusedSubscription && needsSubscriptionFirstUse(snapshotBase, Date.now())) {
+                    try {
+                        await finishSubscriptionFirstUse(response, timeoutMs);
+                        return { ...snapshotBase, model, primingCompleted: true };
+                    }
+                    catch (error) {
+                        // Keep valid quota data without retrying an accepted inference.
+                        if (error instanceof FirstUseProbeError)
+                            return { ...snapshotBase, model, primingFailure: error.reason };
+                        throw error;
+                    }
+                }
                 try {
                     await response.body?.cancel();
                 }
@@ -406,6 +427,9 @@ export async function fetchCodexQuotaSnapshot(options) {
             lastError = new Error("Codex response did not include quota headers");
         }
         catch (error) {
+            options.signal?.throwIfAborted();
+            if (error instanceof FirstUseProbeError)
+                throw error;
             sawOtherFailure = true;
             lastError = error instanceof Error ? error : new Error(String(error));
         }

package/dist/lib/request/client-cancellation.d.ts

@@ -0,0 +1,5 @@
+/** Internal transport marker: upstream timeouts may also use AbortError. */
+export declare class ClientCancellationError extends Error {
+    constructor();
+}
+//# sourceMappingURL=client-cancellation.d.ts.map

package/dist/lib/request/client-cancellation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-cancellation.d.ts","sourceRoot":"","sources":["../../../lib/request/client-cancellation.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,qBAAa,uBAAwB,SAAQ,KAAK;;CAKjD"}

package/dist/lib/request/client-cancellation.js

@@ -0,0 +1,7 @@
+/** Internal transport marker: upstream timeouts may also use AbortError. */
+export class ClientCancellationError extends Error {
+    constructor() {
+        super("Client cancelled request");
+        this.name = "AbortError";
+    }
+}

package/dist/lib/request/error-classification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-classification.d.ts","sourceRoot":"","sources":["../../../lib/request/error-classification.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,gBAAgB;IACzB,aAAa,EAAE,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACvB;AAED,sGAAsG;AACtG,eAAO,MAAM,oCAAoC,6CAA6C,CAAC;AAQ/F,eAAO,MAAM,wCAAwC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAoD7E,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACzC,aAAa,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,sCAAsC;IACtD,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnC,+BAA+B,EAAE,OAAO,CAAC;IACzC,iCAAiC,EAAE,OAAO,CAAC;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACvC;AAiDD,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgBzF;AAED,sGAAsG;AACtG,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAQ3F;AAED,wBAAgB,4BAA4B,CAC3C,SAAS,EAAE,OAAO,GAChB,yBAAyB,CAqD3B;AAED,wBAAgB,oCAAoC,CACnD,OAAO,EAAE,sCAAsC,GAC7C,MAAM,GAAG,SAAS,CAkCpB;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CACtD,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,SAAS,EAAE,OAAO,GAChB,OAAO,CAgBT;AAqCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAIT;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAK1E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,GACrB,OAAO,CAoDT;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAmB1E"}
+{"version":3,"file":"error-classification.d.ts","sourceRoot":"","sources":["../../../lib/request/error-classification.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,WAAW,gBAAgB;IACzB,aAAa,EAAE,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACvB;AAED,sGAAsG;AACtG,eAAO,MAAM,oCAAoC,6CAA6C,CAAC;AAQ/F,eAAO,MAAM,wCAAwC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAmE7E,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACzC,aAAa,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,sCAAsC;IACtD,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnC,+BAA+B,EAAE,OAAO,CAAC;IACzC,iCAAiC,EAAE,OAAO,CAAC;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACvC;AAiDD,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgBzF;AAED,sGAAsG;AACtG,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAQ3F;AAED,wBAAgB,4BAA4B,CAC3C,SAAS,EAAE,OAAO,GAChB,yBAAyB,CAqD3B;AAED,wBAAgB,oCAAoC,CACnD,OAAO,EAAE,sCAAsC,GAC7C,MAAM,GAAG,SAAS,CAkCpB;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CACtD,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,SAAS,EAAE,OAAO,GAChB,OAAO,CAgBT;AAqCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAIT;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAK1E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,GACrB,OAAO,CAoDT;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAmB1E"}

package/dist/lib/request/error-classification.js

@@ -5,6 +5,7 @@
  */
 import { isRecord } from "../utils.js";
 import { HTTP_STATUS, stripModelEffortSuffix } from "../constants.js";
+import { RETIRED_MODEL_REPLACEMENTS } from "./helpers/model-map.js";
 /** @internal Exported only for sibling lib/request modules; import via fetch-helpers.ts elsewhere. */
 export const CHATGPT_CODEX_UNSUPPORTED_MODEL_CODE = "model_not_supported_with_chatgpt_account";
 const CHATGPT_CODEX_UNSUPPORTED_MODEL_PATTERN = /model is not supported when using codex with a chatgpt account/i;
@@ -26,42 +27,55 @@ export const DEFAULT_UNSUPPORTED_CODEX_FALLBACK_CHAIN = {
     //
     // Depth is not free: every hop spends one of the shared per-request outbound
     // attempts (`tryConsumeOutboundRequestAttempt`). A single-account balanced
-    // session gets a budget of 5, and the aeon walk needs exactly 5, so it fits
-    // with nothing spare. Spend an attempt on a retry or a stream failover and
-    // the tail hops become unreachable, ending as an attempt-budget-exhausted
-    // 503 rather than `gpt-5.4`. Hops are ordered most-valuable-first so what is
-    // lost first matters least. Do not add a hop to a GPT-6 row without
+    // session gets a budget of 5, and the aeon walk needs 4 (it needed all 5
+    // until `gpt-5.4` was retired as the floor), leaving one attempt for a retry
+    // or a stream failover. Spend two and the tail hop becomes unreachable,
+    // ending as an attempt-budget-exhausted 503 rather than `gpt-5.5`. Hops are
+    // ordered most-valuable-first so what is lost first matters least. Do not
+    // add a hop to a GPT-6 row without
     // re-checking that budget; `test/gpt6-astra-models.test.ts` asserts it.
     "gpt-6-astra": ["gpt-5.6-sol", "gpt-5.5"],
     // aeon steps to the flagship first: still GPT-6, still Astra, just without
     // the long-horizon behaviour.
     "gpt-6-astra-aeon": ["gpt-6-astra", "gpt-5.6-sol"],
+    // Sol and Luna step to the 5.6 tier they replace, never sideways into Astra:
+    // an account without the new tier is far likelier to lack Astra too, and
+    // Astra is the priciest hop available ($10/$50 per 1M against Luna's
+    // $0.10/$0.50). Every hop on these walks still costs more than Luna itself.
+    "gpt-6-sol": ["gpt-5.6-sol"],
+    "gpt-6-luna": ["gpt-5.6-luna"],
     // The hop that makes the Astra path reach a model every account has. GPT-5.6
     // shipped without a chain entry, so an unsupported 5.6 response ended the
     // walk; with Astra above it that would have stranded the fallback one rung
-    // short of the floor it documents. Terra and Luna are deliberately still
-    // absent: nothing steps into them, so giving them a hop would change 5.6
-    // behaviour beyond completing this path.
+    // short of the floor it documents.
     "gpt-5.6-sol": ["gpt-5.5"],
+    // Luna gained its row once `gpt-6-luna` started stepping into it; without
+    // it the Luna walk would stop one rung short of `gpt-5.5`, the same
+    // stranding the Sol row fixed. It also applies to a direct `gpt-5.6-luna`
+    // request, which used to end its walk on an unsupported response and now
+    // retries on the pricier `gpt-5.5`.
+    "gpt-5.6-luna": ["gpt-5.5"],
+    // Terra gained its row once the retired codex minis and `gpt-5-mini` began
+    // stepping into it; without it those walks stopped at Terra instead of the
+    // `gpt-5.5` floor every other retired id reaches.
+    "gpt-5.6-terra": ["gpt-5.5"],
     "gpt-5": ["gpt-5.5"],
     "gpt-5-pro": ["gpt-5.5-pro"],
-    "gpt-5-chat-latest": ["gpt-5.5"],
-    "gpt-5.5": ["gpt-5.4"],
-    "gpt-5.5-pro": ["gpt-5.4"],
-    "gpt-5.5-2026-04-23": ["gpt-5.4"],
-    "gpt-5.5-pro-2026-04-23": ["gpt-5.4"],
-    "gpt-5.5-20260423": ["gpt-5.4"],
-    "gpt-5.5-pro-20260423": ["gpt-5.4"],
-    "gpt-5.3-codex-spark": ["gpt-5.3-codex", "gpt-5.2-codex"],
-    "gpt-5.3-codex": ["gpt-5.2-codex"],
-    "codex-max": ["gpt-5.3-codex"],
-    "gpt-5.1-codex-max": ["gpt-5.3-codex"],
-    "codex-mini-latest": ["gpt-5.3-codex"],
-    "gpt-5-codex-mini": ["gpt-5.3-codex"],
-    "gpt-5.1-codex-mini": ["gpt-5.3-codex"],
-    "gpt-5-codex": ["gpt-5.3-codex", "gpt-5.2-codex"],
-    "gpt-5.2-codex": ["gpt-5.3-codex"],
-    "gpt-5.1-codex": ["gpt-5.3-codex"],
+    "gpt-5.5-2026-04-23": ["gpt-5.5"],
+    "gpt-5.5-20260423": ["gpt-5.5"],
+    "gpt-5.5-pro-2026-04-23": ["gpt-5.5-pro"],
+    "gpt-5.5-pro-20260423": ["gpt-5.5-pro"],
+    // `gpt-5.5` and `gpt-5.5-pro` are the floor: they used to step to `gpt-5.4`,
+    // which the Codex backend no longer serves (`retirement_at: 2026-08-31` in
+    // the upstream catalog), so that hop could only ever fail.
+    //
+    // A retired id still reaches the backend verbatim through the pass-through
+    // rotation proxy, and the backend rejects it as unsupported. One hop to the
+    // replacement OpenAI names for it turns that into a working request.
+    ...Object.fromEntries(Object.entries(RETIRED_MODEL_REPLACEMENTS).map(([retired, replacement]) => [
+        retired,
+        [replacement],
+    ])),
 };
 function canonicalizeModelName(model) {
     if (!model)

package/dist/lib/request/fetch-helpers.js

@@ -252,7 +252,7 @@ function normalizeErrorPayload(errorBody, bodyText, statusText, status, diagnost
             error: {
                 message: `The model '${unsupportedModel}' is not currently available for this ChatGPT account when using Codex OAuth. ` +
                     "This is an account/workspace entitlement gate, not a temporary rate limit. " +
-                    "Try 'gpt-5.3-codex' (current), or legacy aliases like 'gpt-5-codex'/'gpt-5.2-codex', or enable automatic fallback via " +
+                    "Try 'gpt-5.6-sol' or 'gpt-5.5', or enable automatic fallback via " +
                     'unsupportedCodexPolicy: "fallback" (or CODEX_AUTH_UNSUPPORTED_MODEL_POLICY=fallback). ' +
                     "(Legacy: CODEX_AUTH_FALLBACK_UNSUPPORTED_MODEL=1 or fallbackOnUnsupportedCodexModel).",
                 type: "entitlement_error",

package/dist/lib/request/helpers/model-map.d.ts

@@ -31,10 +31,18 @@ export interface ModelProfile {
     supportedReasoningEfforts: readonly ModelReasoningEffort[];
     capabilities: ModelCapabilities;
 }
-export declare const CURRENT_CODEX_MODEL = "gpt-5.3-codex";
+/**
+ * Where every codex-named id routes. No codex model is left: upstream Codex
+ * dropped `gpt-5.3-codex` from its catalog on 2026-07-08, and OpenAI's
+ * deprecations page names `gpt-5.6-sol` as the replacement for every retired
+ * codex id (`gpt-5-codex`, `gpt-5.1-codex*`, `gpt-5.2-codex`). The export
+ * keeps its name so callers that mean "the model a codex request runs on"
+ * still read naturally.
+ */
+export declare const CURRENT_CODEX_MODEL = "gpt-5.6-sol";
 export declare const DEFAULT_MODEL = "gpt-5.5";
 export declare const DEFAULT_PROBE_MODEL = "gpt-5.6-sol";
-export declare const QUOTA_PROBE_MODEL_CHAIN: readonly ["gpt-5.6-sol", "gpt-5.5", "gpt-5.4", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5-codex"];
+export declare const QUOTA_PROBE_MODEL_CHAIN: readonly ["gpt-5.6-sol", "gpt-5.5", "gpt-6-luna"];
 /**
  * Effective model profiles keyed by canonical model name.
  *
@@ -45,6 +53,8 @@ export declare const QUOTA_PROBE_MODEL_CHAIN: readonly ["gpt-5.6-sol", "gpt-5.5"
  */
 export declare const MODEL_PROFILES: Record<string, ModelProfile>;
 declare const MODEL_MAP: Record<string, string>;
+/** Every retired id and its replacement, for diagnostics and tests. */
+export declare const RETIRED_MODEL_REPLACEMENTS: Readonly<Record<string, string>>;
 export { MODEL_MAP };
 /**
  * Get normalized model name from a known config/runtime identifier.

package/dist/lib/request/helpers/model-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-map.d.ts","sourceRoot":"","sources":["../../../../lib/request/helpers/model-map.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACX,oBAAoB,EACpB,mBAAmB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,YAAY,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;AAE1D,MAAM,MAAM,iBAAiB,GAC1B,aAAa,GACb,WAAW,GACX,OAAO,GACP,SAAS,GACT,SAAS,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAE5C;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,WAAW,EAMvC,CAAC;AAEX,MAAM,WAAW,iBAAiB;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC;IAChC,sBAAsB,EAAE,oBAAoB,CAAC;IAC7C,yBAAyB,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC3D,YAAY,EAAE,iBAAiB,CAAC;CAChC;AA6CD,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AACnD,eAAO,MAAM,aAAa,YAAY,CAAC;AAevC,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AAOjD,eAAO,MAAM,uBAAuB,iGAO1B,CAAC;AAoIX;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CA+I9C,CAAC;AAEX,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,CAAC;AAgI7C,OAAO,EAAE,SAAS,EAAE,CAAC;AAqOrB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQtE;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAuCxE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,CAavE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,CAEjF;AAeD;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAC1C,KAAK,EAAE,MAAM,GAAG,SAAS,GACvB,mBAAmB,CASrB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErD"}
+{"version":3,"file":"model-map.d.ts","sourceRoot":"","sources":["../../../../lib/request/helpers/model-map.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACX,oBAAoB,EACpB,mBAAmB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,YAAY,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;AAE1D,MAAM,MAAM,iBAAiB,GAC1B,aAAa,GACb,WAAW,GACX,OAAO,GACP,SAAS,GACT,SAAS,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAE5C;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,WAAW,EAMvC,CAAC;AAEX,MAAM,WAAW,iBAAiB;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC;IAChC,sBAAsB,EAAE,oBAAoB,CAAC;IAC7C,yBAAyB,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC3D,YAAY,EAAE,iBAAiB,CAAC;CAChC;AA6CD;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AAQjD,eAAO,MAAM,aAAa,YAAY,CAAC;AAevC,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AAWjD,eAAO,MAAM,uBAAuB,mDAI1B,CAAC;AAiKX;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CA6F9C,CAAC;AAEX,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,CAAC;AA4I7C,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGvE,CAAC;AAiBF,OAAO,EAAE,SAAS,EAAE,CAAC;AA6MrB;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQtE;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAmDxE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,CAavE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,CAEjF;AAeD;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAC1C,KAAK,EAAE,MAAM,GAAG,SAAS,GACvB,mBAAmB,CASrB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErD"}