The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 19:45 UTC
fix(server): usage model details count the real unpriced tokens (#35179)
Julius Marminge committed
Nov 12, 2026 at 03:22 UTC
fc6c7c8b27fc94e6486ca1b589ae138ef259f8f5
4 files changed
+53
-2
apps/server/src/usage/UsageService.test.ts
+37
@@ -1887,6 +1887,43 @@ describe("UsageService", () => {
1887
}).pipe(Effect.scoped),
1888
);
1889
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
+
1927
it.live("includes host and merged OpenCode instance histories once across list aliases", () =>
1928
Effect.gen(function* () {
1929
const { settings, home } = yield* setup;
apps/server/src/usage/usageAggregation.ts
+11
-1
@@ -58,6 +58,7 @@ interface MutableBucket {
58
speedPremiumUsd: number;
59
records: number;
60
unpricedRecords: number;
61
+ unpricedTokens: number;
62
providerReportedRecords: number;
63
sessions: Set<string>;
64
}
@@ -283,7 +284,14 @@ export class UsageAggregator {
284
this.#options.priceOverrides,
285
);
286
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
+ }
295
if (priced.costSource === "providerReported") bucket.providerReportedRecords += 1;
296
}
297
@@ -330,6 +338,7 @@ export class UsageAggregator {
338
speedPremiumUsd: 0,
339
records: 0,
340
unpricedRecords: 0,
341
+ unpricedTokens: 0,
342
providerReportedRecords: 0,
343
sessions: new Set<string>(),
344
};
@@ -377,6 +386,7 @@ export class UsageAggregator {
386
costSource: resolveCostSource(bucket),
387
records: bucket.records,
388
unpricedRecords: bucket.unpricedRecords,
389
+ unpricedTokens: bucket.unpricedTokens,
390
sessions: bucket.sessions.size,
391
});
392
}
packages/contracts/src/usage.ts
+2
@@ -66,6 +66,8 @@ export const UsageBucket = Schema.Struct({
66
costSource: UsageCostSource,
67
records: NonNegativeInt,
68
unpricedRecords: NonNegativeInt,
69
+ /** Absent from older servers; merges then estimate it from the unpriced record share. */
70
+ unpricedTokens: Schema.optional(NonNegativeInt),
71
sessions: NonNegativeInt,
72
});
73
export type UsageBucket = typeof UsageBucket.Type;
packages/shared/src/usageMerge.ts
+3
-1
@@ -464,7 +464,9 @@ export function mergeUsage(
464
};
465
model.records += bucket.records;
466
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) {
470
model.unpricedTokens += (tokens * bucket.unpricedRecords) / bucket.records;
471
}
472
modelAccumulator.set(modelKey, model);