Skip to content

Commit c5c3fe9

Browse files
fix(server): don't let a resumed Codex scan rewind without a request timestamp
A clean scan state cached before request timestamps were recorded resumed with no timestamp, so its first appended request could rewind the counters unguarded and bill an exact replay. Without a recorded timestamp a rewind now counts as malformed, as on main, until a billed request records one. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 94837c3 commit c5c3fe9

2 files changed

Lines changed: 25 additions & 21 deletions

File tree

‎apps/server/src/provider/Drivers/codexUsage.test.ts‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -395,26 +395,31 @@ describe("parseCodexLine", () => {
395395
}).toEqual({ processed: [1200, 120, 350, 240, 12], skipped: 0 });
396396
});
397397

398-
it("does not bill a replay of an earlier request as a counter rewind", () => {
399-
const state = initialCodexScanState();
400-
parseCodexLine(turnContext, state);
401-
const replayed = at(51, counted(counters(100, 20), counters(1100, 220)));
402-
const processed = [
403-
at(50, counted(counters(1000, 200), counters(1000, 200))),
404-
replayed,
405-
at(52, counted(counters(300, 50), counters(1400, 270))),
406-
replayed,
407-
at(53, counted(counters(10, 2), counters(1110, 222))),
408-
].map((line) => {
409-
const record = parseCodexLine(line, state);
410-
return record === null ? 0 : totalTokens(record.totals);
411-
});
398+
it.each([false, true])(
399+
"does not bill a replay of an earlier request as a counter rewind (resumed from a state cached without request timestamps: %s)",
400+
(resumed) => {
401+
const state = initialCodexScanState();
402+
parseCodexLine(turnContext, state);
403+
const replayed = at(51, counted(counters(100, 20), counters(1100, 220)));
404+
const scanned = [
405+
at(50, counted(counters(1000, 200), counters(1000, 200))),
406+
replayed,
407+
at(52, counted(counters(300, 50), counters(1400, 270))),
408+
].map((line) => parseCodexLine(line, state));
409+
if (resumed) delete state.lastRequestTimestampMs;
410+
const processed = [
411+
...scanned,
412+
...[replayed, at(53, counted(counters(10, 2), counters(1110, 222)))].map((line) =>
413+
parseCodexLine(line, state),
414+
),
415+
].map((record) => (record === null ? 0 : totalTokens(record.totals)));
412416

413-
expect({
414-
processed,
415-
skipped: codexUsageFormat.readMalformedRecords?.(state),
416-
}).toEqual({ processed: [1200, 120, 350, 0, 12], skipped: 1 });
417-
});
417+
expect({
418+
processed,
419+
skipped: codexUsageFormat.readMalformedRecords?.(state),
420+
}).toEqual({ processed: [1200, 120, 350, 0, 12], skipped: 1 });
421+
},
422+
);
418423

419424
it("ignores a replay of the current sequence's first request without rewinding the baseline", () => {
420425
const state = initialCodexScanState();

‎apps/server/src/provider/Drivers/codexUsage.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,7 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord |
261261
// A replay keeps its original timestamp, so only a later request may rewind the counters.
262262
const mayRewind =
263263
restarted ||
264-
state.lastRequestTimestampMs === undefined ||
265-
timestampMs > state.lastRequestTimestampMs;
264+
(state.lastRequestTimestampMs !== undefined && timestampMs > state.lastRequestTimestampMs);
266265
const reconciled =
267266
base !== null &&
268267
(previous === null ||

0 commit comments

Comments
 (0)