codex-multi-auth 2.15.0 → 2.17.0

package/dist/lib/request/helpers/model-map.js

@@ -52,7 +52,21 @@ const TOOL_CAPABILITIES = {
         compaction: false,
     },
 };
-export 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 const CURRENT_CODEX_MODEL = "gpt-5.6-sol";
+/**
+ * The retired codex mini ids (`gpt-5.1-codex-mini`, `gpt-5-codex-mini`,
+ * `codex-mini-latest`) go to Terra, OpenAI's named replacement for
+ * `gpt-5.1-codex-mini`, rather than up to Sol.
+ */
+const CODEX_MINI_REPLACEMENT_MODEL = "gpt-5.6-terra";
 export const DEFAULT_MODEL = "gpt-5.5";
 // Model used for diagnostic live/quota probes (`check`, `report`, `best`).
 // Deliberately distinct from DEFAULT_MODEL: GPT-5.6 is the latest general family
@@ -70,18 +84,18 @@ export const DEFAULT_MODEL = "gpt-5.5";
 export const DEFAULT_PROBE_MODEL = "gpt-5.6-sol";
 // Single source of truth for the live/quota probe fallback chain. Both the
 // manager probe (lib/quota-probe.ts) and the runtime probe (lib/runtime/quota-probe.ts)
-// import this so the ordered candidate list cannot drift between them. It leads
-// with GPT-5.6 and steps down so accounts without 5.6 entitlement still resolve
-// a working probe model.
+// import this so the ordered candidate list cannot drift between them.
+//
+// Every entry must be a model the Codex backend still serves. The chain used to
+// end on `gpt-5.4` and three codex models; all four are gone from the upstream
+// catalog (`gpt-5.4` carries `retirement_at: 2026-08-31`), so a probe that
+// reached them spent requests on guaranteed failures. `gpt-6-luna` closes it
+// because it is offered on the most plans of any catalog model (24).
 export const QUOTA_PROBE_MODEL_CHAIN = [
     DEFAULT_PROBE_MODEL,
     DEFAULT_MODEL,
-    "gpt-5.4",
-    "gpt-5.3-codex",
-    "gpt-5.2-codex",
-    "gpt-5-codex",
+    "gpt-6-luna",
 ];
-const LEGACY_CODEX_MODEL = "gpt-5-codex";
 /**
  * GPT-5.6 tiers, per the upstream Codex catalog
  * (openai/codex `codex-rs/models-manager/models.json`).
@@ -112,8 +126,8 @@ const GPT_5_6_LUNA_EFFORTS = [
 /**
  * GPT-6 Astra, OpenAI's 2026-09-03 frontier release.
  *
- * There is no Sol/Terra/Luna split this generation: the announced lineup is the
- * flagship plus `aeon`, a long-horizon variant built for runs measured in days.
+ * The launch lineup was the flagship plus `aeon`, a long-horizon variant built
+ * for runs measured in days; Sol and Luna followed on 2026-09-22 (below).
  * `gpt-6-astra` is the API model name OpenAI published at launch;
  * `gpt-6-astra-aeon` is the second slug that shipped beside it in the Codex
  * model list. "Astra Pro" is a plan tier, not a separate slug we have seen, so
@@ -139,6 +153,24 @@ const GPT_6_ASTRA_EFFORTS = [
     "max",
     "ultra",
 ];
+/**
+ * GPT-6 Sol and Luna, added to the upstream Codex catalog on 2026-09-22
+ * (openai/codex #47332) beside Astra. Sol is the everyday workhorse and Luna
+ * the small, cheap tier; there is no GPT-6 Terra. Upstream migrates `gpt-5.5`,
+ * `gpt-5.6-sol` and `gpt-5.6-terra` users to Sol and `gpt-5.6-luna` users to
+ * Luna. Ladders and defaults below are the catalog's own values: Sol reaches
+ * `ultra`, Luna stops at `max` (same split as 5.6), both default to `medium`.
+ */
+const GPT_6_SOL_MODEL = "gpt-6-sol";
+const GPT_6_LUNA_MODEL = "gpt-6-luna";
+const GPT_6_SOL_EFFORTS = GPT_6_ASTRA_EFFORTS;
+const GPT_6_LUNA_EFFORTS = [
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max",
+];
 /**
  * Cyber-specialty models from the upstream Codex catalog
  * (openai/codex `codex-rs/models-manager/models.json`).
@@ -166,33 +198,43 @@ const GPT_5_5_RELEASE_MODEL = "gpt-5.5-2026-04-23";
 const GPT_5_5_PRO_RELEASE_MODEL = "gpt-5.5-pro-2026-04-23";
 const GPT_5_5_RELEASE_COMPAT_MODEL = "gpt-5.5-20260423";
 const GPT_5_5_PRO_RELEASE_COMPAT_MODEL = "gpt-5.5-pro-20260423";
+/**
+ * Where an unrecognised `gpt-5.<minor>` id lands. Every minor below 5.5 is
+ * retired (OpenAI deprecations page, upstream catalog removals), so each maps
+ * to the replacement OpenAI names for it rather than to a model that no longer
+ * answers: 5.1/5.2 to Sol, 5.4 to GPT-6 Sol/Luna as upstream Codex migrates it,
+ * and every `pro` to the one live pro model.
+ */
 const GENERAL_GPT5_VERSION_CATALOG = {
     1: {
-        base: "gpt-5.1",
+        base: GPT_5_6_SOL_MODEL,
+        pro: GPT_5_5_PRO_CANONICAL_MODEL,
     },
     2: {
-        base: "gpt-5.2",
-        pro: "gpt-5.2-pro",
+        base: GPT_5_6_SOL_MODEL,
+        pro: GPT_5_5_PRO_CANONICAL_MODEL,
     },
     4: {
-        base: DEFAULT_MODEL,
-        pro: "gpt-5.4-pro",
-        mini: "gpt-5.4-mini",
-        nano: "gpt-5.4-nano",
+        base: GPT_6_SOL_MODEL,
+        pro: GPT_5_5_PRO_CANONICAL_MODEL,
+        mini: GPT_6_LUNA_MODEL,
+        nano: GPT_6_LUNA_MODEL,
     },
     5: {
         base: GPT_5_5_CANONICAL_MODEL,
         pro: GPT_5_5_PRO_CANONICAL_MODEL,
-        mini: "gpt-5-mini",
-        nano: "gpt-5-nano",
+        mini: GPT_5_6_TERRA_MODEL,
+        nano: GPT_5_6_LUNA_MODEL,
     },
 };
 const GENERAL_GPT5_STABLE_VARIANTS = GENERAL_GPT5_VERSION_CATALOG[5];
+// `gpt-5-mini`/`gpt-5-nano` point at snapshots OpenAI retires on 2026-12-11;
+// the deprecations page names Terra and Luna as their replacements.
 const GENERAL_GPT5_GENERIC_VARIANTS = {
     base: DEFAULT_MODEL,
     pro: GPT_5_5_PRO_CANONICAL_MODEL,
-    mini: "gpt-5-mini",
-    nano: "gpt-5-nano",
+    mini: GPT_5_6_TERRA_MODEL,
+    nano: GPT_5_6_LUNA_MODEL,
 };
 /**
  * Effective model profiles keyed by canonical model name.
@@ -203,41 +245,6 @@ const GENERAL_GPT5_GENERIC_VARIANTS = {
  * present in the latest upstream release.
  */
 export const MODEL_PROFILES = {
-    [CURRENT_CODEX_MODEL]: {
-        normalizedModel: CURRENT_CODEX_MODEL,
-        promptFamily: "gpt-5-codex",
-        defaultReasoningEffort: "high",
-        supportedReasoningEfforts: ["low", "medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.basic,
-    },
-    "gpt-5.4": {
-        normalizedModel: "gpt-5.4",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "none",
-        supportedReasoningEfforts: ["none", "low", "medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.full,
-    },
-    "gpt-5.4-pro": {
-        normalizedModel: "gpt-5.4-pro",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "high",
-        supportedReasoningEfforts: ["medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.computerAndCompact,
-    },
-    "gpt-5.4-mini": {
-        normalizedModel: "gpt-5.4-mini",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: ["medium"],
-        capabilities: TOOL_CAPABILITIES.compactOnly,
-    },
-    "gpt-5.4-nano": {
-        normalizedModel: "gpt-5.4-nano",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: ["medium"],
-        capabilities: TOOL_CAPABILITIES.compactOnly,
-    },
     // Like GPT-5.6, GPT-6 Astra ships its base instructions inline in the
     // upstream model catalog rather than as a `gpt_6_prompt.md`, so it stays on
     // the GPT-5.2 prompt family with every other post-5.2 general model. Adding
@@ -258,6 +265,20 @@ export const MODEL_PROFILES = {
         supportedReasoningEfforts: GPT_6_ASTRA_EFFORTS,
         capabilities: TOOL_CAPABILITIES.full,
     },
+    [GPT_6_SOL_MODEL]: {
+        normalizedModel: GPT_6_SOL_MODEL,
+        promptFamily: "gpt-5.2",
+        defaultReasoningEffort: "medium",
+        supportedReasoningEfforts: GPT_6_SOL_EFFORTS,
+        capabilities: TOOL_CAPABILITIES.full,
+    },
+    [GPT_6_LUNA_MODEL]: {
+        normalizedModel: GPT_6_LUNA_MODEL,
+        promptFamily: "gpt-5.2",
+        defaultReasoningEffort: "medium",
+        supportedReasoningEfforts: GPT_6_LUNA_EFFORTS,
+        capabilities: TOOL_CAPABILITIES.full,
+    },
     [DAYBREAK_BLUE_MODEL]: {
         normalizedModel: DAYBREAK_BLUE_MODEL,
         promptFamily: "gpt-5.2",
@@ -310,41 +331,12 @@ export const MODEL_PROFILES = {
         supportedReasoningEfforts: ["medium", "high", "xhigh"],
         capabilities: TOOL_CAPABILITIES.computerAndCompact,
     },
-    "gpt-5.2-pro": {
-        normalizedModel: "gpt-5.2-pro",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "high",
-        supportedReasoningEfforts: ["medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.basic,
-    },
-    "gpt-5.2": {
-        normalizedModel: "gpt-5.2",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "none",
-        supportedReasoningEfforts: ["none", "low", "medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.basic,
-    },
-    "gpt-5.1": {
-        normalizedModel: "gpt-5.1",
-        promptFamily: "gpt-5.1",
-        defaultReasoningEffort: "none",
-        supportedReasoningEfforts: ["none", "low", "medium", "high"],
-        capabilities: TOOL_CAPABILITIES.basic,
-    },
-    "gpt-5-mini": {
-        normalizedModel: "gpt-5-mini",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: ["medium"],
-        capabilities: TOOL_CAPABILITIES.compactOnly,
-    },
-    "gpt-5-nano": {
-        normalizedModel: "gpt-5-nano",
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: ["medium"],
-        capabilities: TOOL_CAPABILITIES.compactOnly,
-    },
+    // Every model older than 5.5 is retired: `gpt-5.1`, `gpt-5.2` and the whole
+    // 5.4 family left the upstream Codex catalog, the codex models and the
+    // chat-latest snapshots are past their shutdown date on OpenAI's
+    // deprecations page, and `gpt-5-mini`/`gpt-5-nano` shut down 2026-12-11.
+    // Their ids stay accepted as aliases of the named replacement (below) so an
+    // old config keeps working, but no request is sent under a dead name.
 };
 const MODEL_MAP = {};
 function addAlias(alias, normalizedModel) {
@@ -382,6 +374,11 @@ function addGpt6Aliases() {
     // rather than letting it fall through to GPT-5.5.
     addEffortAliases("astra", GPT_6_ASTRA_MODEL, GPT_6_ASTRA_EFFORTS);
     addEffortAliases("astra-aeon", GPT_6_ASTRA_AEON_MODEL, GPT_6_ASTRA_EFFORTS);
+    // No bare `sol`/`luna` aliases: those names already mean the 5.6 tiers to
+    // anyone who used them before 2026-09-22, and re-pointing them would swap a
+    // user's model generation without asking.
+    addEffortAliases(GPT_6_SOL_MODEL, GPT_6_SOL_MODEL, GPT_6_SOL_EFFORTS);
+    addEffortAliases(GPT_6_LUNA_MODEL, GPT_6_LUNA_MODEL, GPT_6_LUNA_EFFORTS);
 }
 function addDaybreakAliases() {
     addEffortAliases(DAYBREAK_BLUE_MODEL, DAYBREAK_BLUE_MODEL, DAYBREAK_EFFORTS);
@@ -396,35 +393,61 @@ function addGeneralAliases() {
     addReasoningAliases(GPT_5_5_PRO_CANONICAL_MODEL, GPT_5_5_PRO_CANONICAL_MODEL);
     addReasoningAliases(GPT_5_5_PRO_RELEASE_MODEL, GPT_5_5_PRO_CANONICAL_MODEL);
     addReasoningAliases(GPT_5_5_PRO_RELEASE_COMPAT_MODEL, GPT_5_5_PRO_CANONICAL_MODEL);
-    addReasoningAliases("gpt-5.4", "gpt-5.4");
-    addReasoningAliases("gpt-5.4-pro", "gpt-5.4-pro");
-    addReasoningAliases("gpt-5.4-mini", "gpt-5.4-mini");
-    addReasoningAliases("gpt-5.4-nano", "gpt-5.4-nano");
-    addReasoningAliases("gpt-5.2-pro", "gpt-5.2-pro");
     addReasoningAliases("gpt-5-pro", GPT_5_5_PRO_CANONICAL_MODEL);
-    addReasoningAliases("gpt-5.2", "gpt-5.2");
-    addReasoningAliases("gpt-5.1", "gpt-5.1");
     addReasoningAliases("gpt-5", DEFAULT_MODEL);
-    addReasoningAliases("gpt-5-mini", "gpt-5-mini");
-    addReasoningAliases("gpt-5-nano", "gpt-5-nano");
-    addReasoningAliases("gpt-5.1-chat-latest", "gpt-5.1");
-    addReasoningAliases("gpt-5-chat-latest", DEFAULT_MODEL);
 }
-function addCodexAliases() {
-    addReasoningAliases(CURRENT_CODEX_MODEL, CURRENT_CODEX_MODEL);
-    addReasoningAliases("gpt-5.3-codex-spark", CURRENT_CODEX_MODEL);
-    addReasoningAliases(LEGACY_CODEX_MODEL, CURRENT_CODEX_MODEL);
-    addReasoningAliases("gpt-5.2-codex", CURRENT_CODEX_MODEL);
-    addReasoningAliases("gpt-5.1-codex", CURRENT_CODEX_MODEL);
+/**
+ * Retired general ids, each kept as an alias of the replacement OpenAI names
+ * for it: the upstream Codex catalog's migration target where it has one
+ * (`gpt-5.4` -> GPT-6 Sol, `gpt-5.4-mini` -> GPT-6 Luna), otherwise the
+ * deprecations page's recommended replacement. The effort-suffixed forms
+ * (`gpt-5.4-high`, `gpt-5.1-none`, ...) come along so old configs resolve;
+ * efforts the replacement does not accept are coerced as for any request.
+ */
+const RETIRED_GENERAL_MODEL_REPLACEMENTS = {
+    "gpt-5.4": GPT_6_SOL_MODEL,
+    "gpt-5.4-mini": GPT_6_LUNA_MODEL,
+    "gpt-5.4-nano": GPT_6_LUNA_MODEL,
+    "gpt-5.4-pro": GPT_5_5_PRO_CANONICAL_MODEL,
+    "gpt-5.2": GPT_5_6_SOL_MODEL,
+    "gpt-5.2-pro": GPT_5_5_PRO_CANONICAL_MODEL,
+    "gpt-5.1": GPT_5_6_SOL_MODEL,
+    "gpt-5-mini": GPT_5_6_TERRA_MODEL,
+    "gpt-5-nano": GPT_5_6_LUNA_MODEL,
+    "gpt-5-chat-latest": GPT_5_6_SOL_MODEL,
+    "gpt-5.1-chat-latest": GPT_5_6_SOL_MODEL,
+    "gpt-5.2-chat-latest": GPT_5_6_SOL_MODEL,
+    "gpt-5.3-chat-latest": GPT_5_6_SOL_MODEL,
+};
+/**
+ * Retired codex ids. All shut down on OpenAI's deprecations page or left the
+ * upstream Codex catalog; OpenAI names `gpt-5.6-sol` as the replacement for
+ * the full-size ones and `gpt-5.6-terra` for `gpt-5.1-codex-mini`.
+ */
+const RETIRED_CODEX_MODEL_REPLACEMENTS = {
+    "gpt-5.3-codex": CURRENT_CODEX_MODEL,
+    "gpt-5.3-codex-spark": CURRENT_CODEX_MODEL,
+    "gpt-5.2-codex": CURRENT_CODEX_MODEL,
+    "gpt-5.1-codex": CURRENT_CODEX_MODEL,
+    "gpt-5.1-codex-max": CURRENT_CODEX_MODEL,
+    "gpt-5-codex": CURRENT_CODEX_MODEL,
+    "codex-max": CURRENT_CODEX_MODEL,
+    "gpt-5.1-codex-mini": CODEX_MINI_REPLACEMENT_MODEL,
+    "gpt-5-codex-mini": CODEX_MINI_REPLACEMENT_MODEL,
+    "codex-mini-latest": CODEX_MINI_REPLACEMENT_MODEL,
+};
+/** Every retired id and its replacement, for diagnostics and tests. */
+export const RETIRED_MODEL_REPLACEMENTS = {
+    ...RETIRED_GENERAL_MODEL_REPLACEMENTS,
+    ...RETIRED_CODEX_MODEL_REPLACEMENTS,
+};
+function addRetiredAliases() {
+    for (const [retired, replacement] of Object.entries(RETIRED_MODEL_REPLACEMENTS)) {
+        addReasoningAliases(retired, replacement);
+    }
     addAlias("gpt_5_codex", CURRENT_CODEX_MODEL);
-    addReasoningAliases("codex-max", CURRENT_CODEX_MODEL);
-    addReasoningAliases("gpt-5.1-codex-max", CURRENT_CODEX_MODEL);
-    addAlias("codex-max", CURRENT_CODEX_MODEL);
-    addAlias("codex-mini-latest", CURRENT_CODEX_MODEL);
-    addReasoningAliases("gpt-5-codex-mini", CURRENT_CODEX_MODEL);
-    addReasoningAliases("gpt-5.1-codex-mini", CURRENT_CODEX_MODEL);
 }
-addCodexAliases();
+addRetiredAliases();
 addGeneralAliases();
 addGpt56Aliases();
 addGpt6Aliases();
@@ -461,39 +484,21 @@ function resolveStableGeneralGpt5Variant(variant) {
     }
     throw new Error(`Stable GPT-5 fallback is missing for variant ${variant}`);
 }
+/**
+ * Any id carrying a `codex` token. Every codex model is retired, so this only
+ * picks the replacement: a `mini` codex id goes to Terra, everything else to
+ * Sol (see RETIRED_CODEX_MODEL_REPLACEMENTS).
+ */
 function resolveCodexCatalogModel(modelId) {
     const normalized = modelId.toLowerCase();
-    if (normalized.includes("gpt-5.3-codex-spark") ||
-        normalized.includes("gpt 5.3 codex spark")) {
-        return CURRENT_CODEX_MODEL;
-    }
-    if (normalized.includes("gpt-5.3-codex") ||
-        normalized.includes("gpt 5.3 codex")) {
-        return CURRENT_CODEX_MODEL;
-    }
-    if (normalized.includes("gpt-5.2-codex") ||
-        normalized.includes("gpt 5.2 codex")) {
-        return CURRENT_CODEX_MODEL;
-    }
-    if (normalized.includes("gpt-5.1-codex-max") ||
-        normalized.includes("gpt 5.1 codex max")) {
-        return CURRENT_CODEX_MODEL;
-    }
-    if (normalized.includes("gpt-5.1-codex-mini") ||
-        normalized.includes("gpt 5.1 codex mini") ||
-        normalized.includes("codex-mini-latest") ||
-        normalized.includes("gpt-5-codex-mini") ||
-        normalized.includes("gpt 5 codex mini")) {
-        return CURRENT_CODEX_MODEL;
+    if (!normalized.includes("codex")) {
+        return undefined;
     }
-    if (normalized.includes("gpt-5-codex") ||
-        normalized.includes("gpt 5 codex") ||
-        normalized.includes("gpt-5.1-codex") ||
-        normalized.includes("gpt 5.1 codex") ||
-        normalized.includes("codex")) {
-        return CURRENT_CODEX_MODEL;
+    // Anchored so `codex-minimal` (an effort suffix) is not read as a mini.
+    if (/codex[- ]mini(?!mal)/.test(normalized)) {
+        return CODEX_MINI_REPLACEMENT_MODEL;
     }
-    return undefined;
+    return CURRENT_CODEX_MODEL;
 }
 /**
  * Resolve GPT-5.6 identifiers that are not exact aliases (for example a future
@@ -514,8 +519,9 @@ function resolveCodexCatalogModel(modelId) {
  * `gpt 5` token pair) and every unrecognised GPT-6 id lands on `DEFAULT_MODEL`,
  * running GPT-5.5 for a caller who asked for the frontier model. `aeon` keeps
  * its own canonical id because it is a behaviourally different model (long
- * horizon), not a rename of the flagship; everything else resolves to the
- * flagship, matching OpenAI's bare `gpt-6` alias.
+ * horizon), not a rename of the flagship. A `sol`/`luna` tier token picks that
+ * tier; everything else resolves to the flagship, matching OpenAI's bare
+ * `gpt-6` alias.
  *
  * Ids carrying a `codex` token are left to `resolveCodexCatalogModel`, exactly
  * as the 5.6 resolver defers them.
@@ -547,6 +553,16 @@ function resolveGpt6CatalogModel(modelId) {
     }
     if (tokens.includes("aeon"))
         return GPT_6_ASTRA_AEON_MODEL;
+    if (isAstra)
+        return GPT_6_ASTRA_MODEL;
+    // Before Sol and Luna existed every non-Astra GPT-6 id fell to the line
+    // below, so `gpt-6-luna` silently ran Astra at 100x Luna's price. `terra`
+    // goes to Sol because there is no GPT-6 Terra and upstream migrates
+    // `gpt-5.6-terra` users to Sol.
+    if (tokens.includes("luna"))
+        return GPT_6_LUNA_MODEL;
+    if (tokens.includes("sol") || tokens.includes("terra"))
+        return GPT_6_SOL_MODEL;
     return GPT_6_ASTRA_MODEL;
 }
 /**
@@ -647,6 +663,17 @@ export function resolveNormalizedModel(model) {
     if (mappedModel) {
         return mappedModel;
     }
+    // `max`/`ultra` are not generated as aliases for the pre-5.6 ids, so
+    // `gpt-5.3-chat-latest-max` missed the retired table and the general GPT-5
+    // resolver sent it to 5.5 instead of its replacement. Retry the lookup
+    // without the suffix before any fuzzy resolver runs.
+    const withoutTopEffort = modelId.replace(/-(max|ultra)$/i, "");
+    if (withoutTopEffort !== modelId) {
+        const mappedWithoutEffort = lookupMappedModel(withoutTopEffort);
+        if (mappedWithoutEffort) {
+            return mappedWithoutEffort;
+        }
+    }
     // Daybreak first: its slugs carry neither a `codex` nor a `gpt 5` token, so
     // every other resolver declines them and they would reach DEFAULT_MODEL.
     const daybreakCatalogModel = resolveDaybreakCatalogModel(modelId);

package/dist/lib/request/response-outcome.d.ts

@@ -0,0 +1,25 @@
+export interface StreamCompletion {
+    success: boolean;
+    errorCode: string | null;
+    missingTerminal: boolean;
+}
+/** Protocol completion, separate from socket delivery. Never retain output or error messages. */
+export declare class ResponseOutcome {
+    private readonly requireTerminal;
+    private terminal;
+    rejection: {
+        error: {
+            code?: string;
+            param?: string;
+        };
+    } | undefined;
+    constructor(requireTerminal: boolean);
+    observe(value: unknown): void;
+    /**
+     * `response.incomplete` (e.g. max_output_tokens) is a delivered response, not an
+     * account failure: it counts as success for health and affinity, and its terminal
+     * type survives only as the usage annotation in `errorCode`.
+     */
+    finish(): StreamCompletion;
+}
+//# sourceMappingURL=response-outcome.d.ts.map

package/dist/lib/request/response-outcome.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-outcome.d.ts","sourceRoot":"","sources":["../../../lib/request/response-outcome.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CACzB;AAED,iGAAiG;AACjG,qBAAa,eAAe;IAIf,OAAO,CAAC,QAAQ,CAAC,eAAe;IAH5C,OAAO,CAAC,QAAQ,CAAkE;IAClF,SAAS,EAAE;QAAE,KAAK,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,SAAS,CAAC;gBAEvC,eAAe,EAAE,OAAO;IAErD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAuB7B;;;;OAIG;IACH,MAAM,IAAI,gBAAgB;CAS1B"}

package/dist/lib/request/response-outcome.js

@@ -0,0 +1,49 @@
+import { isRecord } from "../utils.js";
+/** Protocol completion, separate from socket delivery. Never retain output or error messages. */
+export class ResponseOutcome {
+    requireTerminal;
+    terminal;
+    rejection;
+    constructor(requireTerminal) {
+        this.requireTerminal = requireTerminal;
+    }
+    observe(value) {
+        if (!isRecord(value))
+            return;
+        let type = value.type ?? (value.object === "response" && typeof value.status === "string" ? `response.${value.status}` : undefined);
+        // SSE `response.done` carries its outcome in the nested status.
+        if (type === "response.done") {
+            const status = isRecord(value.response) ? value.response.status : undefined;
+            type = typeof status === "string" ? `response.${status}` : "response.completed";
+        }
+        if (type === "response.completed") {
+            if (!this.terminal)
+                this.terminal = "completed";
+            return;
+        }
+        const failure = type === "response.failed" || type === "error";
+        if (!failure && type !== "response.incomplete" && type !== "response.cancelled")
+            return;
+        this.terminal = failure ? "failed" : type === "response.incomplete" ? "incomplete" : "cancelled";
+        const response = isRecord(value.response) ? value.response : value;
+        const error = isRecord(response.error) ? response.error : type === "error" ? value : undefined;
+        if (error) {
+            const safe = (v) => typeof v === "string" && /^[A-Za-z0-9._-]{1,100}$/.test(v) ? v : undefined;
+            this.rejection = { error: { code: safe(error.code), param: safe(error.param) } };
+        }
+    }
+    /**
+     * `response.incomplete` (e.g. max_output_tokens) is a delivered response, not an
+     * account failure: it counts as success for health and affinity, and its terminal
+     * type survives only as the usage annotation in `errorCode`.
+     */
+    finish() {
+        const missingTerminal = this.requireTerminal && !this.terminal;
+        const success = !missingTerminal && (!this.terminal || this.terminal === "completed" || this.terminal === "incomplete");
+        return {
+            success,
+            missingTerminal,
+            errorCode: missingTerminal ? "upstream_missing_terminal" : this.terminal && this.terminal !== "completed" ? `upstream_response_${this.terminal}` : null,
+        };
+    }
+}

package/dist/lib/request/stream-failover-runtime.d.ts

@@ -1,5 +1,6 @@
 import type { ServerResponse } from "node:http";
 import type { RuntimeRotationProxyStatus } from "../runtime/rotation-server-types.js";
+import type { StreamCompletion } from "./response-outcome.js";
 export declare const HOP_BY_HOP_HEADERS: Set<string>;
 export declare function responseHeadersForClient(upstreamHeaders: Headers): Record<string, string>;
 export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, onTimeout: () => void, message: string): Promise<T>;
@@ -13,5 +14,5 @@ export declare function forwardStreamingResponse(upstream: Response, res: Server
  */
 onChunk?: (chunk: Uint8Array) => void, 
 /** Additional response headers, applied after (so they can override) the forwarded upstream ones. */
-extraHeaders?: Record<string, string>): Promise<boolean>;
+extraHeaders?: Record<string, string>, completion?: () => StreamCompletion): Promise<boolean>;
 //# sourceMappingURL=stream-failover-runtime.d.ts.map

package/dist/lib/request/stream-failover-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-failover-runtime.d.ts","sourceRoot":"","sources":["../../../lib/request/stream-failover-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEtF,eAAO,MAAM,kBAAkB,aAW7B,CAAC;AAWH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUzF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAClC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,IAAI,EACrB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,CAAC,CAAC,CAmBZ;AAED,wBAAsB,aAAa,CAClC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,QAAQ,SAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAuDjB;AAoBD,wBAAsB,wBAAwB,CAC7C,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,0BAA0B,EAClC,aAAa,EAAE,MAAM,IAAI,EACzB,oBAAoB,EAAE,MAAM;AAC5B;;;;;GAKG;AACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI;AACrC,qGAAqG;AACrG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,OAAO,CAAC,CAsDlB"}
+{"version":3,"file":"stream-failover-runtime.d.ts","sourceRoot":"","sources":["../../../lib/request/stream-failover-runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,eAAO,MAAM,kBAAkB,aAW7B,CAAC;AAWH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUzF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAClC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,IAAI,EACrB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,CAAC,CAAC,CAmBZ;AAED,wBAAsB,aAAa,CAClC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,QAAQ,SAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAuDjB;AAoBD,wBAAsB,wBAAwB,CAC7C,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,0BAA0B,EAClC,aAAa,EAAE,MAAM,IAAI,EACzB,oBAAoB,EAAE,MAAM;AAC5B;;;;;GAKG;AACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI;AACrC,qGAAqG;AACrG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,UAAU,CAAC,EAAE,MAAM,gBAAgB,GACjC,OAAO,CAAC,OAAO,CAAC,CAmElB"}

package/dist/lib/request/stream-failover-runtime.js

@@ -1,3 +1,4 @@
+import { ClientCancellationError } from "./client-cancellation.js";
 export const HOP_BY_HOP_HEADERS = new Set([
     "connection",
     "content-length",
@@ -137,19 +138,34 @@ export async function forwardStreamingResponse(upstream, res, status, onStreamEr
  */
 onChunk, 
 /** Additional response headers, applied after (so they can override) the forwarded upstream ones. */
-extraHeaders) {
+extraHeaders, completion) {
     status.streamsStarted += 1;
     res.writeHead(upstream.status, {
         ...responseHeadersForClient(upstream.headers),
         ...extraHeaders,
     });
-    if (!upstream.body) {
+    let clientDisconnected = false;
+    const finish = () => {
+        if (clientDisconnected || res.destroyed)
+            return false;
+        const result = completion?.();
+        // Already ended by a concurrent close path: never write after end.
+        if (res.writableEnded)
+            return false;
+        if (result && !result.success) {
+            status.lastError = result.errorCode;
+            if (result.missingTerminal)
+                res.write(Buffer.from(`data: ${JSON.stringify({ type: "error", error: { code: result.errorCode, message: "Upstream ended before completing the response." } })}\n\n`));
+        }
         res.end();
-        return true;
-    }
+        return result?.success ?? true;
+    };
+    if (!upstream.body)
+        return finish();
     const reader = upstream.body.getReader();
     res.on("close", () => {
         if (!res.writableEnded) {
+            clientDisconnected = true;
             void reader.cancel().catch(() => undefined);
         }
     });
@@ -163,10 +179,9 @@ extraHeaders) {
             if (value && value.byteLength > 0) {
                 onChunk?.(value);
                 // If the response is already finished (clean end by a concurrent
-                // close-then-reader-cancel path), stop writing. Do NOT guard on
-                // res.destroyed here: a socket-error-during-backpressure scenario sets
-                // destroyed=true and then lets the next res.write() throw so the catch
-                // block can record the error and fire onStreamError correctly.
+                // close-then-reader-cancel path), stop writing. A destroyed response
+                // is left to the next res.write(), which throws into the catch below;
+                // that path returns false without penalizing the upstream account.
                 if (res.writableEnded)
                     break;
                 // Respect backpressure: when the client's socket buffer is full,
@@ -177,10 +192,14 @@ extraHeaders) {
                 }
             }
         }
-        res.end();
-        return true;
+        return finish();
     }
     catch (error) {
+        if (clientDisconnected || res.destroyed || (error instanceof ClientCancellationError)) {
+            if (!res.destroyed)
+                res.destroy();
+            return false;
+        }
         status.lastError = error instanceof Error ? error.message : String(error);
         onStreamError();
         if (!res.destroyed) {

package/dist/lib/runtime/account-check.d.ts.map

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

package/dist/lib/runtime/account-check.js

@@ -1,17 +1,11 @@
 import { maskEmail } from "../logger.js";
 import { CODEX_UNAVAILABLE_PROBE_NOTE } from "../quota-probe.js";
 import { isCodexUnavailableError } from "../errors.js";
-import { bumpStorageAffinityGeneration, reconcilePinnedAccountIndex, } from "../storage.js";
+import { cloneTrackedAccountStorage, bumpStorageAffinityGeneration, reconcilePinnedAccountIndex, } from "../storage.js";
 export async function runRuntimeAccountCheck(deepProbe, deps) {
     const loadedStorage = await deps.hydrateEmails(await deps.loadAccounts());
     const workingStorage = loadedStorage
-        ? {
-            ...loadedStorage,
-            accounts: loadedStorage.accounts.map((account) => ({ ...account })),
-            activeIndexByFamily: loadedStorage.activeIndexByFamily
-                ? { ...loadedStorage.activeIndexByFamily }
-                : {},
-        }
+        ? cloneTrackedAccountStorage(loadedStorage)
         : deps.createEmptyStorage();
     if (workingStorage.accounts.length === 0) {
         deps.showLine("\nNo accounts to check.\n");