Skip to content

Commit fc6c7c8

Browse files
fix(server): usage model details count the real unpriced tokens (#35179)
1 parent 71dfe27 commit fc6c7c8

4 files changed

Lines changed: 53 additions & 2 deletions

File tree

‎apps/server/src/usage/UsageService.test.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,6 +1887,43 @@ describe("UsageService", () => {
18871887
}).pipe(Effect.scoped),
18881888
);
18891889

1890+
it.live("counts unpriced tokens from the unpriced records of a mixed model", () =>
1891+
Effect.gen(function* () {
1892+
const { settings, home } = yield* setup;
1893+
const message = (id: string, cost: number, input: number, output: number, minute: number) =>
1894+
encodeUnknownJson({
1895+
id,
1896+
sessionID: "session-1",
1897+
role: "assistant",
1898+
modelID: "acme-coder-1",
1899+
providerID: "acme",
1900+
time: { created: Date.parse(`2026-08-01T10:0${minute}:00Z`) },
1901+
cost,
1902+
tokens: { input, output, reasoning: 0, cache: { read: 0, write: 0 } },
1903+
});
1904+
const priced = yield* message("msg_priced", 1, 60, 40, 0);
1905+
const unpriced = yield* message("msg_unpriced", 0, 9_000, 900, 1);
1906+
yield* Effect.promise(async () => {
1907+
const directory = NodePath.join(home, "opencode", "storage", "message", "session-1");
1908+
await NodeFSP.mkdir(directory, { recursive: true });
1909+
await NodeFSP.writeFile(NodePath.join(directory, "msg_priced.json"), priced);
1910+
await NodeFSP.writeFile(NodePath.join(directory, "msg_unpriced.json"), unpriced);
1911+
});
1912+
const service = yield* UsageService.make.pipe(
1913+
Effect.provide(layerService({ prefix: "usage-service-unpriced-tokens", home, settings })),
1914+
);
1915+
const summary = yield* service.readSummary(WINDOW);
1916+
const model = mergeUsage(
1917+
[{ environmentId: EnvironmentId.make("local"), label: "local", summary }],
1918+
summary.contractVersion,
1919+
).models.find((entry) => entry.model === "acme-coder-1");
1920+
1921+
assert.strictEqual(model?.costUsd, 1);
1922+
assert.strictEqual(model?.totalTokens, 10_000);
1923+
assert.strictEqual(model?.unpricedTokens, 9_900);
1924+
}).pipe(Effect.scoped),
1925+
);
1926+
18901927
it.live("includes host and merged OpenCode instance histories once across list aliases", () =>
18911928
Effect.gen(function* () {
18921929
const { settings, home } = yield* setup;

‎apps/server/src/usage/usageAggregation.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ interface MutableBucket {
5858
speedPremiumUsd: number;
5959
records: number;
6060
unpricedRecords: number;
61+
unpricedTokens: number;
6162
providerReportedRecords: number;
6263
sessions: Set<string>;
6364
}
@@ -283,7 +284,14 @@ export class UsageAggregator {
283284
this.#options.priceOverrides,
284285
);
285286
bucket.records += 1;
286-
if (priced.costSource === "unpriced") bucket.unpricedRecords += 1;
287+
if (priced.costSource === "unpriced") {
288+
bucket.unpricedRecords += 1;
289+
bucket.unpricedTokens +=
290+
record.totals.uncachedInputTokens +
291+
record.totals.cachedInputTokens +
292+
record.totals.cacheCreationTokens +
293+
record.totals.outputTokens;
294+
}
287295
if (priced.costSource === "providerReported") bucket.providerReportedRecords += 1;
288296
}
289297

@@ -330,6 +338,7 @@ export class UsageAggregator {
330338
speedPremiumUsd: 0,
331339
records: 0,
332340
unpricedRecords: 0,
341+
unpricedTokens: 0,
333342
providerReportedRecords: 0,
334343
sessions: new Set<string>(),
335344
};
@@ -377,6 +386,7 @@ export class UsageAggregator {
377386
costSource: resolveCostSource(bucket),
378387
records: bucket.records,
379388
unpricedRecords: bucket.unpricedRecords,
389+
unpricedTokens: bucket.unpricedTokens,
380390
sessions: bucket.sessions.size,
381391
});
382392
}

‎packages/contracts/src/usage.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ export const UsageBucket = Schema.Struct({
6666
costSource: UsageCostSource,
6767
records: NonNegativeInt,
6868
unpricedRecords: NonNegativeInt,
69+
/** Absent from older servers; merges then estimate it from the unpriced record share. */
70+
unpricedTokens: Schema.optional(NonNegativeInt),
6971
sessions: NonNegativeInt,
7072
});
7173
export type UsageBucket = typeof UsageBucket.Type;

‎packages/shared/src/usageMerge.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,9 @@ export function mergeUsage(
464464
};
465465
model.records += bucket.records;
466466
model.unpricedRecords += bucket.unpricedRecords;
467-
if (bucket.records > 0) {
467+
if (bucket.unpricedTokens !== undefined) {
468+
model.unpricedTokens += bucket.unpricedTokens;
469+
} else if (bucket.records > 0) {
468470
model.unpricedTokens += (tokens * bucket.unpricedRecords) / bucket.records;
469471
}
470472
modelAccumulator.set(modelKey, model);

0 commit comments

Comments
 (0)