diff --git a/apps/server/src/provider/Drivers/antigravityUsageReader.test.ts b/apps/server/src/provider/Drivers/antigravityUsageReader.test.ts index 88e076d98f208..8a3961fdd559c 100644 --- a/apps/server/src/provider/Drivers/antigravityUsageReader.test.ts +++ b/apps/server/src/provider/Drivers/antigravityUsageReader.test.ts @@ -386,6 +386,8 @@ describe("readAntigravityUsage", () => { "gemini-pro-orchestrator-neon", "gemini-4-hydrogen-orchestrator", "gemini-pro-orchestrator-g1-pro", + "gemini-4-hydrogen-tiered-high", + "gemini-3-flash-agent-high", ].entries()) { yield* db.run("INSERT INTO gen_metadata VALUES (?, ?)", [ idx, @@ -416,9 +418,21 @@ describe("readAntigravityUsage", () => { ["gemini-pro-orchestrator-neon", "gemini-4-neon"], ["gemini-4-hydrogen-orchestrator", "gemini-4-hydrogen"], ["gemini-pro-orchestrator-g1-pro", "gemini-4-argon"], + ["gemini-4-hydrogen-tiered-high", "gemini-4-hydrogen"], + ["gemini-3-flash-agent-high", "gemini-3.5-flash"], ["gemini-pro-orchestrator-neon", "gemini-4-neon"], ], ); + const table = parseRateTable({ + "gemini-4-hydrogen": { input_cost_per_token: 1e-6, output_cost_per_token: 4e-6 }, + }); + const hydrogen = records(result).find( + ({ model }) => model === "gemini-4-hydrogen-tiered-high", + ); + assert.ok(hydrogen); + const priced = priceUsage(table, hydrogen); + assert.strictEqual(priced.costSource, "modelPriced"); + assert.closeTo(priced.costUsd, 19e-6, 1e-12); }).pipe(Effect.provide(NodeServices.layer)), ); diff --git a/apps/server/src/provider/Drivers/antigravityUsageReader.ts b/apps/server/src/provider/Drivers/antigravityUsageReader.ts index 5dff65928ad24..47f2226171e26 100644 --- a/apps/server/src/provider/Drivers/antigravityUsageReader.ts +++ b/apps/server/src/provider/Drivers/antigravityUsageReader.ts @@ -129,13 +129,10 @@ const MODEL_IDS: Record = { 1537: "gemini-pro-orchestrator-neon", }; -// Effort and routing variants share the base model's price. -export const antigravityRateModel = (model: string) => { - const base = model.replace( - /-(?:extra-low|low|medium|high|tiered|control|thinking|agent|orchestrator)$/, - "", - ); - return /^gemini-3-flash-(?:agent(?:-[ab])?|[ab])$/.test(model) +const VARIANT_SUFFIX = /-(?:extra-low|low|medium|high|tiered|control|thinking|agent|orchestrator)$/; + +const aliasRateModel = (model: string) => + /^gemini-3-flash-(?:agent(?:-[ab])?|[ab])$/.test(model) ? "gemini-3.5-flash" : model === "gemini-3.7-flash-safety-le" ? "gemini-3.7-flash" @@ -143,9 +140,19 @@ export const antigravityRateModel = (model: string) => { ? "gemini-4-neon" : model === "gemini-pro-orchestrator-g1-pro" ? "gemini-4-argon" - : base === "gemini-3-flash" + : model === "gemini-3-flash" ? "gemini-3-flash-preview" - : base; + : undefined; + +// Effort and routing variants share the base model's price; they can stack, as in -tiered-high. +export const antigravityRateModel = (model: string) => { + let name = model; + let alias = aliasRateModel(name); + while (alias === undefined && VARIANT_SUFFIX.test(name)) { + name = name.replace(VARIANT_SUFFIX, ""); + alias = aliasRateModel(name); + } + return alias ?? name; }; function withRateModel(record: UsageRecord): UsageRecord {