@devries-cameron20 / t3code-1 / commits / 0f0c1ca196
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate (#32219)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

MarcoDotIO committed Nov 14, 2026 at 23:55 UTC 0f0c1ca196943505ef454c0002a3a9918919e2ed
9 files changed +116 -15
apps/server/src/provider/Drivers/AntigravityUsage.ts
+6 -1
@@ -15,7 +15,11 @@ import * as Layer from "effect/Layer";
15 import * as Path from "effect/Path";
16
17 import { resolveAntigravityInstanceDirectories } from "../antigravityAuthSupport.ts";
18 -import { makeAntigravityUsageCache, readAntigravityUsage } from "./antigravityUsageReader.ts";
18 +import {
19 + antigravityRateModel,
20 + makeAntigravityUsageCache,
21 + readAntigravityUsage,
22 +} from "./antigravityUsageReader.ts";
23
24 export class AntigravityUsage extends Context.Service<
25 AntigravityUsage,
@@ -123,6 +127,7 @@ export const layer = Layer.effect(AntigravityUsage, make);
127 export const antigravityUsageReader: ProviderUsageReader<AntigravitySettings, AntigravityUsage> = {
128 kind: "scan",
129 provider: "antigravity",
130 + rateModel: antigravityRateModel,
131 scan: ({ instances, windowStartMs }) =>
132 AntigravityUsage.pipe(Effect.flatMap((usage) => usage.scan({ instances, windowStartMs }))),
133 };
apps/server/src/provider/Drivers/antigravityUsageReader.ts
+8 -7
@@ -129,18 +129,19 @@ const MODEL_IDS: Record<number, string> = {
129 };
130
131 // Effort and routing variants share the base model's price.
132 -function withRateModel(record: UsageRecord): UsageRecord {
133 - const base = record.model.replace(
134 - /-(?:extra-low|low|medium|high|tiered|control|thinking|agent)$/,
135 - "",
136 - );
137 - const rateModel = /^gemini-3-flash-(?:agent(?:-[ab])?|[ab])$/.test(record.model)
132 +export const antigravityRateModel = (model: string) => {
133 + const base = model.replace(/-(?:extra-low|low|medium|high|tiered|control|thinking|agent)$/, "");
134 + return /^gemini-3-flash-(?:agent(?:-[ab])?|[ab])$/.test(model)
135 ? "gemini-3.5-flash"
139 - : record.model === "gemini-3.7-flash-safety-le"
136 + : model === "gemini-3.7-flash-safety-le"
137 ? "gemini-3.7-flash"
138 : base === "gemini-3-flash"
139 ? "gemini-3-flash-preview"
140 : base;
141 +};
142 +
143 +function withRateModel(record: UsageRecord): UsageRecord {
144 + const rateModel = antigravityRateModel(record.model);
145 return rateModel === record.model ? record : { ...record, rateModel };
146 }
147
apps/server/src/usage/UsageService.test.ts
+70
@@ -1227,6 +1227,76 @@ describe("UsageService", () => {
1227 }),
1228 );
1229
1230 + it.effect("prices Pi usage mapped onto a Pi model at that model's rate", () =>
1231 + Effect.gen(function* () {
1232 + const { home, settings } = yield* setup;
1233 + const dir = NodePath.join(home, "pi", "sessions", "project");
1234 + const message = (id: string, model: string) => ({
1235 + type: "message",
1236 + id,
1237 + timestamp: "2026-08-01T10:00:00Z",
1238 + message: {
1239 + role: "assistant",
1240 + provider: "anthropic",
1241 + model,
1242 + usage: { input: 10, output: 5 },
1243 + },
1244 + });
1245 + yield* Effect.promise(async () => {
1246 + await NodeFSP.mkdir(dir, { recursive: true });
1247 + await NodeFSP.writeFile(
1248 + NodePath.join(dir, "session.jsonl"),
1249 + [
1250 + { type: "session", id: "session" },
1251 + message("released", "actual-model"),
1252 + message("preview", "actual-model-preview"),
1253 + ]
1254 + .map((line) => encodeUnknownJsonString(line))
1255 + .join("\n") + "\n",
1256 + );
1257 + });
1258 + const summary = yield* Effect.gen(function* () {
1259 + const service = yield* UsageService.make;
1260 + return yield* service.readSummary(WINDOW);
1261 + }).pipe(
1262 + Effect.scoped,
1263 + Effect.provide(
1264 + layerService({
1265 + prefix: "usage-pi-model-alias",
1266 + home,
1267 + ratesDocument: {
1268 + "actual-model": { input_cost_per_token: 1, output_cost_per_token: 4 },
1269 + },
1270 + settings: {
1271 + ...settings,
1272 + usageModelAliases: { "anthropic/actual-model-preview": "anthropic/actual-model" },
1273 + },
1274 + }),
1275 + ),
1276 + );
1277 + assert.deepStrictEqual(
1278 + summary.buckets
1279 + .filter((bucket) => bucket.provider === "pi")
1280 + .map(({ model, records, unpricedRecords, costUsd, costSource }) => ({
1281 + model,
1282 + records,
1283 + unpricedRecords,
1284 + costUsd,
1285 + costSource,
1286 + })),
1287 + [
1288 + {
1289 + model: "anthropic/actual-model",
1290 + records: 2,
1291 + unpricedRecords: 0,
1292 + costUsd: 60,
1293 + costSource: "modelPriced",
1294 + },
1295 + ],
1296 + );
1297 + }),
1298 + );
1299 +
1300 it.effect(
1301 "reads Muse inference history once, persists appended usage, and reprices unknown models",
1302 () =>
apps/server/src/usage/UsageService.ts
+7
@@ -90,6 +90,12 @@ const scanReaders = BUILT_IN_USAGE_DRIVERS.flatMap((driver) =>
90 driver.usage?.kind === "scan" ? [{ driver, reader: driver.usage }] : [],
91 );
92
93 +const providerRateModels = new Map(
94 + BUILT_IN_USAGE_DRIVERS.flatMap(({ usage }) =>
95 + usage?.rateModel === undefined ? [] : [[usage.provider, usage.rateModel] as const],
96 + ),
97 +);
98 +
99 const transcriptFormats = new Map(
100 transcriptReaders.map(({ reader }) => [reader.provider, reader.format] as const),
101 );
@@ -997,6 +1003,7 @@ export const make = Effect.gen(function* () {
1003 rates,
1004 priceOverrides,
1005 modelAliases,
1006 + rateModel: (provider, model) => providerRateModels.get(provider)?.(model),
1007 ...(input.modelFilter === undefined ? {} : { modelFilter: input.modelFilter }),
1008 });
1009
apps/server/src/usage/usageAggregation.test.ts
+1
@@ -277,6 +277,7 @@ describe("UsageAggregator", () => {
277 untilDay: "2026-08-31",
278 rates,
279 modelAliases: resolveModelAliases({ "example-preview": "claude-fable-5" }),
280 + rateModel: () => "claude-fable",
281 });
282 aggregator.add(record());
283 aggregator.add(record({ model: "example-preview", rateModel: "example-preview-high" }));
apps/server/src/usage/usageAggregation.ts
+8 -3
@@ -10,7 +10,7 @@ import type {
10 } from "@t3tools/contracts";
11
12 import { EMPTY_TOTALS, type UsageRecord } from "@t3tools/provider-core/server/usage";
13 -import { cacheSavingsUsd, priceUsage, type RateTable } from "./usagePricing.ts";
13 +import { cacheSavingsUsd, lookupRate, priceUsage, type RateTable } from "./usagePricing.ts";
14
15 // en-CA gives ISO-ordered parts in the requested zone; Date getters are host-local.
16 function makeDayFormatter(timeZone: string): (timestampMs: number) => string {
@@ -70,6 +70,7 @@ export interface AggregateOptions {
70 readonly rates: RateTable;
71 readonly priceOverrides?: RateTable;
72 readonly modelAliases?: ReadonlyMap<string, string>;
73 + readonly rateModel?: (provider: UsageRecord["provider"], model: string) => string | undefined;
74 readonly modelFilter?: UsageModelFilter;
75 readonly resolution?: UsageResolution;
76 readonly sinceTimeMs?: number;
@@ -341,12 +342,16 @@ export class UsageAggregator {
342 if (priced.costSource === "providerReported") bucket.providerReportedRecords += 1;
343 }
344
344 - // Aliases use the target's rate, replacing provider-specific rateModel.
345 + // Aliases use the target's rate. Only an unpriced target goes through the provider's own rate naming.
346 #mapModel(record: UsageRecord): UsageRecord {
347 const model = this.#options.modelAliases?.get(record.model);
348 if (model === undefined) return record;
349 const { rateModel: _rateModel, ...rest } = record;
349 - return { ...rest, model };
350 + const rateModel =
351 + lookupRate(this.#options.rates, model) === null
352 + ? this.#options.rateModel?.(record.provider, model)
353 + : undefined;
354 + return rateModel === undefined ? { ...rest, model } : { ...rest, model, rateModel };
355 }
356
357 // Time-ordered records usually reuse the previous bucket; avoid rebuilding its key.
packages/provider-core/src/server/usage.ts
+12 -4
@@ -105,8 +105,16 @@ export interface ProviderUsageScanInput<Config> {
105 readonly awaitRefresh: boolean;
106 }
107
108 +interface ProviderUsageRateModel {
109 + /**
110 + * The rate-table name for a model ID this provider records with a separate `rateModel`, so
111 + * usage mapped onto that ID prices like the provider's own records of it.
112 + */
113 + readonly rateModel?: (model: string) => string;
114 +}
115 +
116 export type ProviderUsageReader<Config, R> =
109 - | {
117 + | (ProviderUsageRateModel & {
118 readonly kind: "transcripts";
119 readonly provider: UsageProviderKind;
120 readonly format: TranscriptUsageFormat<unknown>;
@@ -126,12 +134,12 @@ export type ProviderUsageReader<Config, R> =
134 never,
135 R
136 >;
129 - }
130 - | {
137 + })
138 + | (ProviderUsageRateModel & {
139 readonly kind: "scan";
140 readonly provider: UsageProviderKind;
141 /** Fails only when the whole usage read cannot go on; an unreadable source is a status. */
142 readonly scan: (
143 input: ProviderUsageScanInput<Config>,
144 ) => Effect.Effect<ReadonlyArray<ProviderUsageScan>, UsageReadError, R>;
137 - };
145 + });
packages/provider-cursor/src/server/driver.ts
+2
@@ -10,6 +10,7 @@ import * as FileSystem from "effect/FileSystem";
10 import * as Path from "effect/Path";
11 import * as Schema from "effect/Schema";
12 import * as HttpClient from "effect/http/HttpClient";
13 +import { cursorRateModel } from "./accountUsage.ts";
14 import { readCursorUsageLimits } from "./usageLimits.ts";
15
16 import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
@@ -72,6 +73,7 @@ export const CursorDriver: ProviderDriver<
73 usage: {
74 kind: "scan",
75 provider: "cursor",
76 + rateModel: cursorRateModel,
77 scan: ({ instances, windowStartMs, retentionCutoffMs, awaitRefresh }) =>
78 CursorUsageAccounts.CursorUsageAccounts.pipe(
79 Effect.flatMap((accounts) =>
packages/provider-pi/src/server/usage.ts
+2
@@ -129,6 +129,8 @@ export const piUsageReader: ProviderUsageReader<PiSettings, Path.Path> = {
129 kind: "transcripts",
130 provider: "pi",
131 format: piUsageFormat,
132 + // Pi model IDs are `<provider>/<rate model>`.
133 + rateModel: (model) => model.slice(model.indexOf("/") + 1),
134 directories: Effect.fn("piUsageReader.directories")(function* ({ config, environment }) {
135 const path = yield* Path.Path;
136 const home = yield* HostProcess.HomeDirectory;