Skip to content

Commit 0b65fdf

Browse files
fix(usage): keep each equal Codex request's saved tier on a whole-file re-parse
Matching saved corrections by identity alone collapsed equal requests at the same timestamp and applied the last one's tier to all of them. Match saved occurrences in order instead. AI-assisted; verified with the tests and tools listed above. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c62e61e commit 0b65fdf

2 files changed

Lines changed: 28 additions & 14 deletions

File tree

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -884,12 +884,15 @@ describe("UsageService", () => {
884884
type: "turn_context",
885885
payload: { model: "gpt-6-astra", turn_id },
886886
});
887-
const usage = (output_tokens: number) => ({
887+
const usage = (output_tokens: number, total_output_tokens: number) => ({
888888
type: "event_msg",
889889
timestamp: "2026-08-01T10:00:00Z",
890890
payload: {
891891
type: "token_count",
892-
info: { last_token_usage: { input_tokens: 0, output_tokens } },
892+
info: {
893+
last_token_usage: { input_tokens: 0, output_tokens },
894+
total_token_usage: { input_tokens: 0, output_tokens: total_output_tokens },
895+
},
893896
},
894897
});
895898
const lines = (records: readonly unknown[]) =>
@@ -908,7 +911,10 @@ describe("UsageService", () => {
908911
lines([
909912
{ type: "session_meta", payload: { id: "tier-session", model_provider: "openai" } },
910913
context("ultra-turn"),
911-
usage(1),
914+
usage(1, 1),
915+
// An equal request at the same time, from a turn priced at the standard tier.
916+
context("standard-turn"),
917+
usage(1, 2),
912918
]),
913919
);
914920
});
@@ -919,8 +925,9 @@ describe("UsageService", () => {
919925
sessionId: "tier-session",
920926
options: [{ id: "serviceTier", value: "ultrafast" }],
921927
});
928+
yield* seedCodexHistory({ id: "standard-turn", sessionId: "tier-session", options: [] });
922929
const first = yield* UsageService.make;
923-
verify(yield* first.readSummary(WINDOW), 1, 6);
930+
verify(yield* first.readSummary(WINDOW), 2, 7);
924931
yield* first.awaitPersisted;
925932

926933
// Downgrade the saved cache to v14, whose clean Codex entries cannot resume.
@@ -932,15 +939,15 @@ describe("UsageService", () => {
932939
NodePath.join(stateDir, "usage-scan-cache-v14.json"),
933940
encodeUnknownJsonString({ ...document, version: 14 }),
934941
);
935-
await NodeFSP.appendFile(rolloutPath, lines([context("later-turn"), usage(2)]));
942+
await NodeFSP.appendFile(rolloutPath, lines([context("later-turn"), usage(2, 4)]));
936943
});
937944
const sql = yield* SqlClient.SqlClient;
938945
yield* sql`ALTER TABLE orchestration_events RENAME TO unavailable_events`;
939946
const upgraded = yield* UsageService.make;
940-
verify(yield* upgraded.readSummary(WINDOW), 3, 8);
947+
verify(yield* upgraded.readSummary(WINDOW), 4, 9);
941948
yield* upgraded.awaitPersisted;
942949
const restarted = yield* UsageService.make;
943-
verify(yield* restarted.readSummary(WINDOW), 3, 8);
950+
verify(yield* restarted.readSummary(WINDOW), 4, 9);
944951
yield* sql`ALTER TABLE unavailable_events RENAME TO orchestration_events`;
945952
}).pipe(
946953
Effect.provide(

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -567,17 +567,24 @@ export const make = Effect.gen(function* () {
567567
if (!parsed.resumed && cached !== undefined && cached.provider === provider) {
568568
// A whole-file re-parse re-emits saved requests unresolved. Keep their saved tier
569569
// corrections, since the history that resolved them may no longer be available.
570-
const saved = new Map<string, UsageRecord>();
570+
// Equal requests keep their own corrections by matching occurrences in order.
571+
const saved = new Map<string, UsageRecord[]>();
571572
for (const previous of [...cached.records, ...cached.tailRecords]) {
572573
const corrected = correctedRecord(previous);
573-
if (corrected.unresolvedServiceTierTurnId === undefined) {
574-
saved.set(identity(corrected), corrected);
575-
}
574+
const key = identity(corrected);
575+
const occurrences = saved.get(key);
576+
if (occurrences === undefined) saved.set(key, [corrected]);
577+
else occurrences.push(corrected);
576578
}
577579
for (const record of [...parsed.records, ...parsed.tailRecords]) {
578-
if (record.unresolvedServiceTierTurnId === undefined) continue;
579-
const corrected = saved.get(identity(record));
580-
if (corrected !== undefined) resolvedRecords.set(record, corrected);
580+
const corrected = saved.get(identity(record))?.shift();
581+
if (
582+
record.unresolvedServiceTierTurnId !== undefined &&
583+
corrected !== undefined &&
584+
corrected.unresolvedServiceTierTurnId === undefined
585+
) {
586+
resolvedRecords.set(record, corrected);
587+
}
581588
}
582589
}
583590
if (parsed.resumed && cached !== undefined && cached.tailRecords.length > 0) {

0 commit comments

Comments
 (0)