Skip to content

Commit ce0ea7d

Browse files
committed
fix(usage): forget the Codex sequence start whenever the cumulative baseline resets to zero
The remembered first request of a counter sequence was only cleared by a context marker whose last and cumulative counters were both zero. Other paths also rebase the baseline to zero: a copied zero snapshot inside a fork burst, and a zeroed cumulative paired with a malformed request. The stale start then made the next genuine request with the same counters look like a replay, so it was dropped and the request after it was rejected as malformed. Assign the baseline through one helper that forgets the start when the new baseline has no input or output, and use it for the fork-copy and main paths.
1 parent 5366382 commit ce0ea7d

2 files changed

Lines changed: 56 additions & 6 deletions

File tree

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,26 @@ describe("parseCodexLine", () => {
317317
},
318318
);
319319

320+
it("forgets the old sequence start when a malformed pair zeroes the cumulative baseline", () => {
321+
const state = initialCodexScanState();
322+
parseCodexLine(turnContext, state);
323+
const request = counters(100, 20);
324+
const processed = [
325+
counted(request, request),
326+
counted(counters(30, 5), counters(0, 0)),
327+
counted(request, request),
328+
counted(counters(30, 5), counters(130, 25)),
329+
].map((line) => {
330+
const record = parseCodexLine(line, state);
331+
return record === null ? 0 : totalTokens(record.totals);
332+
});
333+
334+
expect({
335+
processed,
336+
skipped: codexUsageFormat.readMalformedRecords?.(state),
337+
}).toEqual({ processed: [120, 0, 120, 35], skipped: 1 });
338+
});
339+
320340
it("retains initial tier evidence only for the own OpenAI session and exact context until native settings arrive", () => {
321341
const meta = (id: string, model_provider?: string) =>
322342
JSON.stringify({ type: "session_meta", payload: { id, model_provider } });
@@ -479,5 +499,33 @@ describe("parseCodexLine", () => {
479499
);
480500
expect(record).not.toBeNull();
481501
});
502+
503+
it("forgets the old sequence start when a copied zero baseline rebases the counters", () => {
504+
const state = initialCodexScanState();
505+
const forkInstant = "2026-08-01T05:00:00.000Z";
506+
const request = counters(100, 20);
507+
const billed = (line: string) => {
508+
const record = parseCodexLine(line, state);
509+
return record === null ? 0 : totalTokens(record.totals);
510+
};
511+
parseCodexLine(stamped("2026-08-01T04:59:00.000Z", turnContext), state);
512+
const first = billed(stamped("2026-08-01T04:59:01.000Z", counted(request, request)));
513+
parseCodexLine(meta({ id: "child", timestamp: forkInstant, forkedFromId: "parent" }), state);
514+
const copied = billed(
515+
stamped(
516+
"2026-08-01T05:00:00.001Z",
517+
counted({ ...counters(0, 0), total_tokens: 26387 }, counters(0, 0)),
518+
),
519+
);
520+
const afterBurst = billed(stamped("2026-08-01T05:00:06.000Z", counted(request, request)));
521+
const next = billed(
522+
stamped("2026-08-01T05:00:06.100Z", counted(counters(30, 5), counters(130, 25))),
523+
);
524+
525+
expect({
526+
processed: [first, copied, afterBurst, next],
527+
skipped: codexUsageFormat.readMalformedRecords?.(state),
528+
}).toEqual({ processed: [120, 0, 120, 35], skipped: 0 });
529+
});
482530
});
483531
});

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ function readCodexTokenUsage(value: unknown): CodexTokenUsage | null {
5555
return isCodexTokenUsage(usage) ? usage : null;
5656
}
5757

58+
// A zeroed baseline rebases the counters, so the sequence start measured against it is forgotten.
59+
function rebaseCodexUsage(state: CodexScanState, cumulative: CodexTokenUsage) {
60+
state.lastCumulativeUsage = cumulative;
61+
if (cumulative.input_tokens + cumulative.output_tokens === 0) delete state.sequenceStartUsage;
62+
}
63+
5864
function advanceCodexUsage(previous: CodexTokenUsage | null, last: CodexTokenUsage) {
5965
return readCodexTokenUsage(
6066
Object.fromEntries(CODEX_USAGE_FIELDS.map((key) => [key, (previous?.[key] ?? 0) + last[key]])),
@@ -202,7 +208,7 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord |
202208
state.forkCopyAnchorMs = timestampMs;
203209
// Copied history is already billed in the parent, but establishes the child's baseline.
204210
const signature = last === null ? null : JSON.stringify(last);
205-
if (cumulative !== null) state.lastCumulativeUsage = cumulative;
211+
if (cumulative !== null) rebaseCodexUsage(state, cumulative);
206212
else if (!hasCumulative && last !== null && signature !== state.lastUsageSignature) {
207213
state.lastCumulativeUsage = advanceCodexUsage(state.lastCumulativeUsage, last);
208214
}
@@ -215,7 +221,7 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord |
215221

216222
const previous = state.lastCumulativeUsage;
217223
// A valid snapshot remains the next baseline even when its paired request is malformed.
218-
if (cumulative !== null) state.lastCumulativeUsage = cumulative;
224+
if (cumulative !== null) rebaseCodexUsage(state, cumulative);
219225
if (last === null || (hasCumulative && cumulative === null)) {
220226
state.malformedRecords += 1;
221227
return null;
@@ -225,10 +231,6 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord |
225231
// post-compaction marker whose total is the new context size (its cumulative may reset to zero).
226232
if (last.input_tokens + last.output_tokens === 0) {
227233
state.lastUsageSignature = null;
228-
// Zeroed counters rebase the sequence, so its remembered start can no longer be replayed.
229-
if (cumulative !== null && cumulative.input_tokens + cumulative.output_tokens === 0) {
230-
delete state.sequenceStartUsage;
231-
}
232234
return null;
233235
}
234236

0 commit comments

Comments
 (0)