diff --git a/src/codex/reset-credit-auto-redeem.ts b/src/codex/reset-credit-auto-redeem.ts index 2c6292368ad..3507bbb0548 100644 --- a/src/codex/reset-credit-auto-redeem.ts +++ b/src/codex/reset-credit-auto-redeem.ts @@ -93,9 +93,15 @@ function readJournal(path: string): Journal { } function writeJournal(path: string, journal: Journal, now: number): void { - // Keep only entries whose credit could still matter: settled ones older than a week are noise. - const cutoff = now - 7 * 24 * 60 * 60_000; - journal.entries = journal.entries.filter(e => e.state !== "settled" || e.updatedAt > cutoff); + // Keep only entries whose credit could still matter: a settled entry stays until the later of + // a week after its last update and the credit's own expiry, so it is never dropped while the + // credit it records can still be listed. An unparseable expiry falls back to the week rule. + const week = 7 * 24 * 60 * 60_000; + journal.entries = journal.entries.filter(e => { + if (e.state !== "settled") return true; + const expiry = Date.parse(e.expiresAt); + return now < Math.max(e.updatedAt + week, Number.isNaN(expiry) ? 0 : expiry); + }); atomicWriteFile(path, JSON.stringify(journal, null, 2)); } diff --git a/tests/codex-integration/codex-reset-credit-auto-redeem.test.ts b/tests/codex-integration/codex-reset-credit-auto-redeem.test.ts index b69dbd97f63..b1da481f4ee 100644 --- a/tests/codex-integration/codex-reset-credit-auto-redeem.test.ts +++ b/tests/codex-integration/codex-reset-credit-auto-redeem.test.ts @@ -545,6 +545,23 @@ describe("reset-credit auto-redeemer runtime (#822)", () => { expect(entries[0].updatedAt).toBe(start + 20 * MIN); }); + test("a settled entry is kept until its credit expires, even past the one-week age", async () => { + const DAY = 24 * 60 * MIN; + const journalFile = join(dir, "j.json"); + const seeded = (grantedAt: string, expiresAt: string) => ({ + accountKey: "seeded", grantedAt, expiresAt, redeemRequestId: `id-${grantedAt}`, state: "settled", updatedAt: T0 - 8 * DAY, + }); + writeFileSync(journalFile, JSON.stringify({ version: 1, entries: [ + seeded("2026-08-01T00:00:00Z", new Date(T0 + 30 * DAY).toISOString()), // old update, credit not expired yet + seeded("2026-08-02T00:00:00Z", new Date(T0 - 1 * DAY).toISOString()), // old update, credit expired + ] })); + const h = harness({ journalFile, credits: () => [credit(30)] }); + h.setNow(T0 + 20 * MIN); + expect((await h.redeemer.tick()).kind).toBe("dispatched"); + const entries = JSON.parse(readFileSync(journalFile, "utf8")).entries as Array<{ grantedAt: string }>; + expect(entries.map(e => e.grantedAt).sort()).toEqual(["2026-08-01T00:00:00Z", "2026-09-01T00:00:00Z"]); + }); + test("a persistent reservation write failure uses the idle retry interval", async () => { const journalFile = join(dir, "journal-directory"); mkdirSync(journalFile);