codex-multi-auth 2.10.0 → 2.12.0

package/dist/lib/usage/types.d.ts

@@ -1,12 +1,40 @@
 export type UsageLedgerSource = "runtime-proxy" | "plugin-host" | "local-bridge" | "cli" | "unknown";
 export type UsageLedgerOperation = "responses" | "models" | "thread-goal" | "auth-refresh" | "diagnostic" | "unknown";
 export type UsageLedgerOutcome = "success" | "failure" | "blocked" | "cancelled";
+/**
+ * The service tier a response was actually billed at.
+ *
+ * OpenAI's Fast/priority tier costs more than standard (2x for GPT-6 Astra), so
+ * a rate table with no tier dimension under-counts such a session. `standard`
+ * and `default` are the same thing on the wire; anything this union does not
+ * name is normalised to `unknown`, which is treated as unpriced rather than
+ * assumed cheap.
+ */
+export declare const USAGE_SERVICE_TIERS: readonly ["standard", "priority", "flex", "batch", "scale", "unknown"];
+export type UsageServiceTier = (typeof USAGE_SERVICE_TIERS)[number];
+/**
+ * Narrow an unvalidated value to a known tier.
+ *
+ * The ledger is JSONL on disk and can be hand-edited, so a value read back from
+ * it is untrusted. An unrecognised string reaching the pricer would be treated
+ * as a tier with no rate and silently make every affected row unpriced.
+ */
+export declare function isKnownServiceTier(value: unknown): value is UsageServiceTier;
 export interface UsageTokenCounts {
     inputTokens: number;
     outputTokens: number;
     cachedInputTokens: number;
     reasoningTokens: number;
     totalTokens: number;
+    /**
+     * Rides on the token counts rather than a separate parameter so it reaches
+     * the ledger through every existing path: the `onUsage` callback in
+     * `response-handler.ts` carries this shape, and both the streaming scanner
+     * and the non-streaming branch already funnel through
+     * `extractResponsesUsage`. Absent when the response did not report one,
+     * which is the common case and is priced as `standard`.
+     */
+    serviceTier?: UsageServiceTier;
 }
 export interface UsageLedgerAccountRef {
     accountHash?: string;
@@ -50,6 +78,11 @@ export interface UsageLedgerAppendInput {
     cachedInputTokens?: number | null;
     reasoningTokens?: number | null;
     totalTokens?: number | null;
+    /**
+     * The tier the response reported. Absent means standard, which is what every
+     * rate in `MODEL_PRICING` is quoted at.
+     */
+    serviceTier?: UsageServiceTier;
     costUsd?: number | null;
 }
 export type UsageSummaryGroupBy = "model" | "account" | "project" | "outcome" | "day";

package/dist/lib/usage/types.d.ts.map

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

package/dist/lib/usage/types.js

@@ -1 +1,28 @@
-export {};
+/**
+ * The service tier a response was actually billed at.
+ *
+ * OpenAI's Fast/priority tier costs more than standard (2x for GPT-6 Astra), so
+ * a rate table with no tier dimension under-counts such a session. `standard`
+ * and `default` are the same thing on the wire; anything this union does not
+ * name is normalised to `unknown`, which is treated as unpriced rather than
+ * assumed cheap.
+ */
+export const USAGE_SERVICE_TIERS = [
+    "standard",
+    "priority",
+    "flex",
+    "batch",
+    "scale",
+    "unknown",
+];
+/**
+ * Narrow an unvalidated value to a known tier.
+ *
+ * The ledger is JSONL on disk and can be hand-edited, so a value read back from
+ * it is untrusted. An unrecognised string reaching the pricer would be treated
+ * as a tier with no rate and silently make every affected row unpriced.
+ */
+export function isKnownServiceTier(value) {
+    return (typeof value === "string" &&
+        USAGE_SERVICE_TIERS.includes(value));
+}

package/dist/lib/usage/usage-extraction.d.ts

@@ -17,7 +17,8 @@ import type { UsageTokenCounts } from "./types.js";
 export declare function extractUsageTokenCounts(usage: unknown): UsageTokenCounts | null;
 /**
  * Pull the `usage` object out of a Responses payload, whether it arrived as a
- * bare response object (non-streaming) or wrapped in a stream event envelope.
+ * bare response object (non-streaming) or wrapped in a stream event envelope,
+ * and attach the tier it was billed at.
  */
 export declare function extractResponsesUsage(payload: unknown): UsageTokenCounts | null;
 export interface UsageStreamScanner {

package/dist/lib/usage/usage-extraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-extraction.d.ts","sourceRoot":"","sources":["../../../lib/usage/usage-extraction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA+BnD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,OAAO,GACZ,gBAAgB,GAAG,IAAI,CA+BzB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAQ/E;AAED,MAAM,WAAW,kBAAkB;IAClC,8CAA8C;IAC9C,IAAI,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IAClC,2EAA2E;IAC3E,MAAM,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;CACtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IACjD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GAAG,kBAAkB,CA6ErB"}
+{"version":3,"file":"usage-extraction.d.ts","sourceRoot":"","sources":["../../../lib/usage/usage-extraction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA+BrE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,OAAO,GACZ,gBAAgB,GAAG,IAAI,CA+BzB;AAoCD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAa/E;AAED,MAAM,WAAW,kBAAkB;IAClC,8CAA8C;IAC9C,IAAI,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IAClC,2EAA2E;IAC3E,MAAM,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;CACtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IACjD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GAAG,kBAAkB,CA6ErB"}

package/dist/lib/usage/usage-extraction.js

@@ -66,18 +66,58 @@ export function extractUsageTokenCounts(usage) {
         totalTokens: providedTotal,
     };
 }
+/**
+ * Read the billed service tier off a Responses payload.
+ *
+ * `service_tier` sits on the response object, not inside `usage`, and a stream
+ * event wraps that object one level down. An unrecognised value becomes
+ * `unknown` rather than being dropped, because dropping it would price the row
+ * at standard rates and under-count a more expensive tier.
+ */
+function extractServiceTier(payload) {
+    const raw = payload.service_tier ??
+        (isRecord(payload.response) ? payload.response.service_tier : undefined);
+    if (typeof raw !== "string")
+        return undefined;
+    const normalized = raw.trim().toLowerCase();
+    if (normalized.length === 0)
+        return undefined;
+    // `default` is what the API calls the standard tier on the wire.
+    if (normalized === "default" || normalized === "standard")
+        return "standard";
+    // The upstream catalog names this tier `priority` with the display name
+    // "Fast", and lists `fast` in `additional_speed_tiers`, so a response can
+    // report either spelling. Without this it becomes `unknown`, which prices
+    // as unpriced and fails a cost budget closed on a tier we DO have a rate
+    // for.
+    if (normalized === "fast")
+        return "priority";
+    if (normalized === "priority" ||
+        normalized === "flex" ||
+        normalized === "batch" ||
+        normalized === "scale") {
+        return normalized;
+    }
+    return "unknown";
+}
 /**
  * Pull the `usage` object out of a Responses payload, whether it arrived as a
- * bare response object (non-streaming) or wrapped in a stream event envelope.
+ * bare response object (non-streaming) or wrapped in a stream event envelope,
+ * and attach the tier it was billed at.
  */
 export function extractResponsesUsage(payload) {
     if (!isRecord(payload))
         return null;
+    const serviceTier = extractServiceTier(payload);
     const direct = extractUsageTokenCounts(payload.usage);
-    if (direct)
-        return direct;
+    if (direct) {
+        return serviceTier ? { ...direct, serviceTier } : direct;
+    }
     if (isRecord(payload.response)) {
-        return extractUsageTokenCounts(payload.response.usage);
+        const nested = extractUsageTokenCounts(payload.response.usage);
+        if (!nested)
+            return null;
+        return serviceTier ? { ...nested, serviceTier } : nested;
     }
     return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codex-multi-auth",
-	"version": "2.10.0",
+	"version": "2.12.0",
 	"description": "Codex CLI multi-account OAuth manager with account switching, health checks, runtime rotation, diagnostics, and recovery tools for @openai/codex",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/scripts/codex.js

@@ -574,7 +574,27 @@ async function applyForcedAccountSelection(rawArgs, env = process.env) {
 }
 
 function resolveModelFamilyForStatus(model) {
-	const normalized = typeof model === "string" ? model.trim().toLowerCase() : "";
+	// `resolveStatusModel` hands over the raw `--model` / `-m` value or the
+	// config value verbatim, so a provider-qualified id arrives intact. Every
+	// branch below is a `startsWith`, so `openai/gpt-6` used to match none of
+	// them and return null, dropping status routing back to `activeIndex`
+	// instead of the family index. Strip the prefix once, for all of them.
+	const normalized =
+		typeof model === "string"
+			? stripProviderPrefix(model.trim()).toLowerCase()
+			: "";
+	// GPT-6 Astra and the Daybreak cyber models share the gpt-5.2 prompt family
+	// with the GPT-5.6 general tiers (see lib/request/helpers/model-map.ts
+	// MODEL_PROFILES). Daybreak has to be checked explicitly: its slug matches
+	// none of the branches below, so it used to fall through to `null` and get
+	// bucketed against no family at all.
+	if (
+		(normalized.startsWith("gpt-6") || normalized.startsWith("astra")) &&
+		!normalized.includes("codex")
+	) {
+		return "gpt-5.2";
+	}
+	if (normalized.includes("daybreak")) return "gpt-5.2";
 	// GPT-5.6 general tiers share the gpt-5.2 prompt family (see
 	// lib/request/helpers/model-map.ts MODEL_PROFILES). Check before the generic
 	// gpt-5 catch-all, which would otherwise mis-bucket them as codex.
@@ -1259,7 +1279,18 @@ const DIRECT_UNSUPPORTED_MODEL_PATTERN =
 	/['"]([^'"]+)['"]\s+model is not supported when using codex with a chatgpt account/i;
 const CURRENT_CODEX_MODEL = "gpt-5.3-codex";
 const LEGACY_CODEX_MODEL = "gpt-5-codex";
+// Mirrors the GPT-6 rows of lib/request/error-classification.ts
+// `DEFAULT_UNSUPPORTED_CODEX_FALLBACK_CHAIN`. This table is walked differently
+// from lib's: `resolveUnsupportedModelRetryTarget` keys on the model named in
+// the error output and falls back to the original requested model, with
+// `attemptedModels` accumulating, so a row's later entries ARE reachable here.
+// The two tables are not identical today (`gpt-5.3-codex` has a row in lib and
+// not here), which predates GPT-6 and is left alone; the GPT-6 rows are pinned
+// in parity by test/codex-model-resolution.test.ts.
 const WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN = {
+	"gpt-6-astra": ["gpt-5.6-sol", "gpt-5.5"],
+	"gpt-6-astra-aeon": ["gpt-6-astra", "gpt-5.6-sol"],
+	"gpt-5.6-sol": ["gpt-5.5"],
 	"gpt-5": ["gpt-5.5"],
 	"gpt-5-pro": ["gpt-5.5-pro"],
 	"gpt-5-chat-latest": ["gpt-5.5"],
@@ -1901,6 +1932,10 @@ function hasCliAuthCredentialsStoreOverride(args) {
 // This wrapper runs before the TypeScript build, so it cannot import that source.
 const SUPPORTED_REASONING_EFFORTS_BY_MODEL = {
 	[CURRENT_CODEX_MODEL]: ["low", "medium", "high", "xhigh"],
+	"gpt-6-astra": ["low", "medium", "high", "xhigh", "max", "ultra"],
+	"gpt-6-astra-aeon": ["low", "medium", "high", "xhigh", "max", "ultra"],
+	"gpt-daybreak-blue-latest": ["low", "medium", "high", "xhigh", "max", "ultra"],
+	"gpt-daybreak-red-latest": ["low", "medium", "high", "xhigh", "max", "ultra"],
 	"gpt-5.6-sol": ["low", "medium", "high", "xhigh", "max", "ultra"],
 	"gpt-5.6-terra": ["low", "medium", "high", "xhigh", "max", "ultra"],
 	"gpt-5.6-luna": ["low", "medium", "high", "xhigh", "max"],
@@ -1960,6 +1995,18 @@ const GPT_5_6_LUNA_MODEL = "gpt-5.6-luna";
 const GPT_5_6_FLAGSHIP_ALIAS = "gpt-5.6";
 const GPT_5_6_SOL_TERRA_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
 const GPT_5_6_LUNA_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
+// GPT-6 Astra (2026-09-03). No Sol/Terra/Luna split this generation: the
+// flagship plus `aeon`, a long-horizon variant. Same frontier effort ladder as
+// 5.6 (no `none`/`minimal`, `ultra` at the top). Bare `gpt-6` -> flagship.
+const GPT_6_ASTRA_MODEL = "gpt-6-astra";
+const GPT_6_ASTRA_AEON_MODEL = "gpt-6-astra-aeon";
+const GPT_6_FLAGSHIP_ALIAS = "gpt-6";
+const GPT_6_ASTRA_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
+// Daybreak cyber models from the upstream Codex catalog. `red` is the
+// cyber-permissive variant, `blue` the defensive one.
+const DAYBREAK_BLUE_MODEL = "gpt-daybreak-blue-latest";
+const DAYBREAK_RED_MODEL = "gpt-daybreak-red-latest";
+const DAYBREAK_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
 const GENERAL_GPT5_VERSION_CATALOG = {
 	1: {
 		base: "gpt-5.1",
@@ -2163,6 +2210,47 @@ function seedRequestedModelAliases() {
 		GPT_5_6_SOL_MODEL,
 		GPT_5_6_SOL_TERRA_EFFORTS,
 	);
+	addRequestedModelEffortAliases(
+		GPT_6_ASTRA_MODEL,
+		GPT_6_ASTRA_MODEL,
+		GPT_6_ASTRA_EFFORTS,
+	);
+	addRequestedModelEffortAliases(
+		GPT_6_ASTRA_AEON_MODEL,
+		GPT_6_ASTRA_AEON_MODEL,
+		GPT_6_ASTRA_EFFORTS,
+	);
+	addRequestedModelEffortAliases(
+		GPT_6_FLAGSHIP_ALIAS,
+		GPT_6_ASTRA_MODEL,
+		GPT_6_ASTRA_EFFORTS,
+	);
+	addRequestedModelEffortAliases("astra", GPT_6_ASTRA_MODEL, GPT_6_ASTRA_EFFORTS);
+	addRequestedModelEffortAliases(
+		"astra-aeon",
+		GPT_6_ASTRA_AEON_MODEL,
+		GPT_6_ASTRA_EFFORTS,
+	);
+	addRequestedModelEffortAliases(
+		DAYBREAK_BLUE_MODEL,
+		DAYBREAK_BLUE_MODEL,
+		DAYBREAK_EFFORTS,
+	);
+	addRequestedModelEffortAliases(
+		DAYBREAK_RED_MODEL,
+		DAYBREAK_RED_MODEL,
+		DAYBREAK_EFFORTS,
+	);
+	addRequestedModelEffortAliases(
+		"daybreak-blue",
+		DAYBREAK_BLUE_MODEL,
+		DAYBREAK_EFFORTS,
+	);
+	addRequestedModelEffortAliases(
+		"daybreak-red",
+		DAYBREAK_RED_MODEL,
+		DAYBREAK_EFFORTS,
+	);
 	addRequestedModelReasoningAliases(CURRENT_CODEX_MODEL, CURRENT_CODEX_MODEL);
 	addRequestedModelReasoningAliases("gpt-5.3-codex-spark", CURRENT_CODEX_MODEL);
 	addRequestedModelReasoningAliases(LEGACY_CODEX_MODEL, CURRENT_CODEX_MODEL);
@@ -2218,6 +2306,13 @@ function resolveStableGeneralGpt5Variant(variant) {
 	return fallback;
 }
 
+// The final clause is a catch-all on the `codex` substring, matching
+// `resolveCodexCatalogModel` in lib/request/helpers/model-map.ts. It used to be
+// an exact `normalized === "codex"` check, so any codex id the explicit list
+// above did not name (`gpt-6-codex`, `gpt-5.7-codex`, …) resolved to nothing in
+// the wrapper while lib resolved it to the current codex model — a silent drift
+// between the two, which is exactly what test/codex-model-resolution.test.ts
+// exists to prevent.
 function resolveCodexRequestedModel(normalized) {
 	if (
 		normalized.includes("gpt-5.1-codex-max") ||
@@ -2246,7 +2341,7 @@ function resolveCodexRequestedModel(normalized) {
 		normalized.includes("gpt 5.1 codex") ||
 		normalized.includes("gpt-5-codex") ||
 		normalized.includes("gpt 5 codex") ||
-		normalized === "codex"
+		normalized.includes("codex")
 	) {
 		return CURRENT_CODEX_MODEL;
 	}
@@ -2258,6 +2353,51 @@ function resolveCodexRequestedModel(normalized) {
 // future `gpt-5.6-terra-fast`). Without this the general GPT-5 resolver sees
 // minor `6`, finds no catalog entry, and silently falls back to 5.5. Unknown
 // tiers resolve to Sol, matching OpenAI's bare `gpt-5.6` alias.
+// Resolve GPT-6 identifiers that are not exact aliases (a dated snapshot, the
+// `gpt-6-astra-pro` plan tier, or a tier OpenAI adds later). Without this the
+// general GPT-5 resolver never matches (it needs a `gpt 5` token pair) and the
+// id falls through to 5.5 — running GPT-5.5 for a caller who asked for the
+// frontier model. `aeon` keeps its own id because it is a behaviourally
+// different model, not a rename. Mirrors lib/request/helpers/model-map.ts.
+function resolveGpt6RequestedModel(stripped) {
+	const tokens = tokenizeRequestedModel(stripped);
+	const gptIndex = tokens.indexOf("gpt");
+	// `gpt6` with no separator tokenizes as one token, so the `gpt` + `6` pair
+	// never forms; mirror lib and claim it here.
+	const versionToken = gptIndex === -1 ? undefined : tokens[gptIndex + 1];
+	// `gpt6` with no separator tokenizes as one token, so the `gpt` + `6` pair
+	// never forms; mirror lib and claim it here.
+	const isGpt6 = versionToken === "6" || tokens.includes("gpt6");
+	// A bare `astra` token counts too: picker labels and OpenAI's own material
+	// say "Astra" with no `gpt-6` prefix, so `Astra Pro` arrives with no version
+	// tokens and would otherwise miss every branch and land on 5.5. Anchored so
+	// an id naming a different GPT major version, `gpt-4-astra-x`, is not
+	// claimed for the frontier model.
+	const namesOtherGptVersion =
+		versionToken !== undefined &&
+		/^\d+$/.test(versionToken) &&
+		versionToken !== "6";
+	const isAstra = tokens.includes("astra") && !namesOtherGptVersion;
+	if ((!isGpt6 && !isAstra) || tokens.includes("codex")) {
+		return "";
+	}
+	if (tokens.includes("aeon")) return GPT_6_ASTRA_AEON_MODEL;
+	return GPT_6_ASTRA_MODEL;
+}
+
+// Daybreak slugs carry neither a `codex` nor a `gpt 5` token, so every other
+// resolver declines them and they would reach the 5.5 default. An unrecognised
+// Daybreak id resolves to `blue`, the more restricted of the two, so a typo
+// cannot silently upgrade a caller into the cyber-permissive model.
+function resolveDaybreakRequestedModel(stripped) {
+	const tokens = tokenizeRequestedModel(stripped);
+	if (!tokens.includes("daybreak")) {
+		return "";
+	}
+	if (tokens.includes("red")) return DAYBREAK_RED_MODEL;
+	return DAYBREAK_BLUE_MODEL;
+}
+
 function resolveGpt56RequestedModel(stripped) {
 	const tokens = tokenizeRequestedModel(stripped);
 	const gptIndex = tokens.indexOf("gpt");
@@ -2316,11 +2456,21 @@ function normalizeRequestedModel(model) {
 		return exactMatch;
 	}
 
+	const daybreakModel = resolveDaybreakRequestedModel(stripped);
+	if (daybreakModel) {
+		return daybreakModel;
+	}
+
 	const codexModel = resolveCodexRequestedModel(normalized);
 	if (codexModel) {
 		return codexModel;
 	}
 
+	const gpt6Model = resolveGpt6RequestedModel(stripped);
+	if (gpt6Model) {
+		return gpt6Model;
+	}
+
 	const gpt56Model = resolveGpt56RequestedModel(stripped);
 	if (gpt56Model) {
 		return gpt56Model;
@@ -6240,6 +6390,7 @@ export {
 	coerceReasoningEffortForModel,
 	resolveModelFamilyForStatus,
 	canonicalizeRequestedModelName,
+	WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN,
 };
 
 // Run the wrapper only when actually launched (as the `codex-multi-auth-codex`