Skip to content

Commit d232272

Browse files
fix(server): keep the Codex request timestamp monotonic
An accepted request with an older timestamp, such as an appended legacy request, moved the recorded timestamp backward and let a replay of a later request pass the rewind check again. Keep the latest timestamp seen. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c5c3fe9 commit d232272

2 files changed

Lines changed: 25 additions & 2 deletions

File tree

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,26 @@ describe("parseCodexLine", () => {
421421
},
422422
);
423423

424+
it("does not let an older accepted request reopen the rewind window for a replay", () => {
425+
const state = initialCodexScanState();
426+
parseCodexLine(turnContext, state);
427+
const replayed = at(52, counted(counters(100, 20), counters(1100, 220)));
428+
const processed = [
429+
at(50, counted(counters(1000, 200), counters(1000, 200))),
430+
replayed,
431+
at(49, counted(counters(10, 2))),
432+
replayed,
433+
].map((line) => {
434+
const record = parseCodexLine(line, state);
435+
return record === null ? 0 : totalTokens(record.totals);
436+
});
437+
438+
expect({
439+
processed,
440+
skipped: codexUsageFormat.readMalformedRecords?.(state),
441+
}).toEqual({ processed: [1200, 120, 12, 0], skipped: 1 });
442+
});
443+
424444
it("ignores a replay of the current sequence's first request without rewinding the baseline", () => {
425445
const state = initialCodexScanState();
426446
parseCodexLine(turnContext, state);

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,10 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord |
207207
state.lastCumulativeUsage = advanceCodexUsage(state.lastCumulativeUsage, last);
208208
}
209209
state.lastUsageSignature = signature;
210-
state.lastRequestTimestampMs = timestampMs;
210+
state.lastRequestTimestampMs = Math.max(
211+
timestampMs,
212+
state.lastRequestTimestampMs ?? timestampMs,
213+
);
211214
return null;
212215
}
213216
state.suppressingForkCopies = false;
@@ -283,7 +286,7 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord |
283286
state.lastCumulativeUsage = advanced;
284287
}
285288
state.lastUsageSignature = signature;
286-
state.lastRequestTimestampMs = timestampMs;
289+
state.lastRequestTimestampMs = Math.max(timestampMs, state.lastRequestTimestampMs ?? timestampMs);
287290

288291
const inputTokens = last.input_tokens;
289292
const cachedInputTokens = last.cached_input_tokens;

0 commit comments

Comments
 (0)