Skip to content

fix(server): Codex usage-limit stops keep their reset time #18721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
voltcrash wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(server): Codex usage-limit stops keep their reset time #18721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf2a8a3
fix(server): Codex usage-limit stops keep their reset time
voltcrash Oct 12, 2026
a8abab3
fix(server): preserve authoritative Codex usage reset times
juliusmarminge Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
230 changes: 221 additions & 9 deletions apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { applyUsageLimitsUpdate } from "@t3tools/provider-core/server/usageLimits";
import { historyResponseItems } from "@t3tools/provider-core/server/handoffBudget";
import {
makeProviderTextDeltaCoalescer,
Expand Down Expand Up @@ -27,6 +28,7 @@ import {
ProviderTurnId,
RunAttemptId,
RunId,
type ServerProviderUsageLimits,
ThreadId,
TurnItemId,
} from "@t3tools/contracts";
Expand Down Expand Up @@ -1141,6 +1143,10 @@ describe("CodexAdapterV2 post-settle continuation", () => {
Effect.void,
onRequest: (method: string, params: unknown) => Effect.Effect<void> = () => Effect.void,
readChildMetadata?: Parameters<typeof withCodexReplayChildMetadata>[2],
usageLimits: Pick<
CodexAdapterV2.CodexAdapterV2Options,
"getUsageLimits" | "onUsageLimits"
> = {},
beforeEmitInbound?: CodexReplay.CodexAppServerReplayDriver["beforeEmitInbound"],
) =>
Effect.gen(function* () {
Expand All @@ -1152,13 +1158,13 @@ describe("CodexAdapterV2 post-settle continuation", () => {
const changes = yield* makeChangeSignal;
const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
[];
const driver = yield* CodexReplay.makeReplayDriver(
const replayDriver = yield* CodexReplay.makeReplayDriver(
transcript,
beforeEmitInbound === undefined ? {} : { beforeEmitInbound },
);
const clientFactory: CodexAdapterV2.CodexAppServerClientFactoryShape = {
open: (openInput) =>
Layer.build(CodexReplay.layerReplayWithDriver(driver)).pipe(
Layer.build(CodexReplay.layerReplayWithDriver(replayDriver)).pipe(
Effect.mapError(
(cause) =>
new ProviderAdapter.ProviderAdapterOpenSessionError({
Expand Down Expand Up @@ -1202,6 +1208,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
continuationRequests.push(request);
}).pipe(Effect.andThen(changes.notify)),
},
...usageLimits,
});
const threadId = ThreadId.make(`thread-${transcript.scenario}`);
const runtime = yield* adapter.openSession({
Expand Down Expand Up @@ -3561,6 +3568,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
: Effect.void,
undefined,
undefined,
{},
(entry) =>
entry.label === "first-completed"
? Deferred.await(completions.first)
Expand Down Expand Up @@ -5089,6 +5097,18 @@ describe("CodexAdapterV2 post-settle continuation", () => {
notification: true,
expectedClass: "provider_error",
},
{
name: "near-full-reset",
code: "usageLimitExceeded",
notification: true,
expectedClass: "usage_limit",
},
{
name: "published-reset",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
] as const)("classifies Codex terminal failures from $name evidence", (scenario) =>
Effect.scoped(
Effect.gen(function* () {
Expand All @@ -5115,6 +5135,32 @@ describe("CodexAdapterV2 post-settle continuation", () => {
entries: [
...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
...(scenario.name === "deferred-reset" ? [snapshot] : []),
// Codex can refuse the turn while its last update still reads 99%.
...(scenario.name === "near-full-reset"
? [
{
...snapshot,
frame: {
method: "account/rateLimits/updated",
params: {
rateLimits: {
limitId: "codex",
primary: {
usedPercent: 99,
resetsAt: 2000100000,
windowDurationMins: 300,
},
secondary: {
usedPercent: 73,
resetsAt: 2000500000,
windowDurationMins: 10080,
},
},
},
},
},
]
: []),
...(scenario.name === "deferred-reset"
? [
{
Expand Down Expand Up @@ -5236,12 +5282,34 @@ describe("CodexAdapterV2 post-settle continuation", () => {
],
});
const resetReceipt = yield* Deferred.make<void>();
const harness = yield* makeCodexReplayHarness(transcript, (event) =>
event.type === "turn_item.updated" &&
event.turnItem.type === "error" &&
event.turnItem.failure.resetAt === resetAt
? Deferred.succeed(resetReceipt, undefined)
: Effect.void,
const harness = yield* makeCodexReplayHarness(
transcript,
(event) =>
event.type === "turn_item.updated" &&
event.turnItem.type === "error" &&
event.turnItem.failure.resetAt === resetAt
? Deferred.succeed(resetReceipt, undefined)
: Effect.void,
undefined,
undefined,
scenario.name === "published-reset" || scenario.name === "near-full-reset"
? {
getUsageLimits: Effect.succeed({
checkedAt: "2033-05-19T03:00:00.000Z",
windows: [
{
id: "primary",
kind: "session",
label: "Session",
usedPercent: 100,
resetsAt:
scenario.name === "near-full-reset" ? "2033-05-23T22:26:40.000Z" : resetAt,
},
{ id: "secondary", kind: "weekly", label: "Weekly", usedPercent: 40 },
],
}),
}
: undefined,
);
yield* harness.runtime.startTurn(
makeCodexTestTurnInput({
Expand All @@ -5258,7 +5326,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
if (terminal?.status !== "failed") return;
assert.equal(terminal.failure.class, scenario.expectedClass);
assert.equal(terminal.threadDisposition, "reusable");
if (scenario.name === "deferred-reset") assert.equal(terminal.failure.resetAt, resetAt);
if (
scenario.name === "deferred-reset" ||
scenario.name === "near-full-reset" ||
scenario.name === "published-reset"
)
assert.equal(terminal.failure.resetAt, resetAt);
if (scenario.name === "matching-details")
assert.equal(terminal.failure.message, "Detailed provider allowance explanation.");
if (scenario.name === "late-reset") {
Expand All @@ -5284,6 +5357,145 @@ describe("CodexAdapterV2 post-settle continuation", () => {
),
);

it.effect.each(["before", "after"] as const)(
"does not lock a stopped turn to stale published limits published %s stop while fresh notifications arrive",
(publishedWhen) =>
Effect.scoped(
Effect.gen(function* () {
yield* TestClock.setTime(Date.parse("2033-05-18T03:00:00.000Z"));
const nativeThreadId = "native-stale-published-limit";
const nativeTurnId = "turn-stale-published-limit";
const resetAt = "2033-05-19T07:20:00.000Z";
const staleResetAt = "2033-05-23T22:26:40.000Z";
const stalePublished: ServerProviderUsageLimits = {
checkedAt: "2033-05-18T02:00:00.000Z",
windows: [
{
id: "primary",
kind: "session",
label: "Session",
usedPercent: 100,
resetsAt: staleResetAt,
},
],
};
const published = yield* Ref.make<ServerProviderUsageLimits | undefined>(
publishedWhen === "before" ? stalePublished : undefined,
);
const stopped = yield* Deferred.make<void>();
const freshLimitsPublished = yield* Deferred.make<void>();
const transcript = makeCodexReplayTranscript({
scenario: "codex-stale-published-limit",
entries: [
...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
{
type: "emit_inbound",
label: "turn/completed",
frame: {
method: "turn/completed",
params: {
threadId: nativeThreadId,
turn: {
...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }),
error: {
message: "Usage limit reached.",
codexErrorInfo: "usageLimitExceeded",
},
},
},
},
},
...[
{ label: "renewed-window", primary: { usedPercent: 50, windowDurationMins: 300 } },
{
label: "fresh-reset",
primary: { usedPercent: 100, resetsAt: 2000100000, windowDurationMins: 300 },
},
].map(({ label, primary }) => ({
type: "emit_inbound" as const,
label,
frame: {
method: "account/rateLimits/updated",
params: { rateLimits: { limitId: "codex", primary } },
},
})),
],
});
const harness = yield* makeCodexReplayHarness(
transcript,
(event) => {
if (event.type === "turn.terminal") return Deferred.succeed(stopped, undefined);
return Effect.void;
},
undefined,
undefined,
{
getUsageLimits: Ref.get(published),
onUsageLimits: (update) =>
Ref.update(published, (previous) =>
applyUsageLimitsUpdate({ previous, update, checkedAt: update.checkedAt }),
).pipe(
Effect.andThen(
update.windows.some((window) => window.resetsAt === resetAt)
? Deferred.succeed(freshLimitsPublished, undefined)
: Effect.void,
),
),
},
(entry) =>
entry.label === "renewed-window"
? Deferred.await(stopped).pipe(
Effect.andThen(
publishedWhen === "after" ? Ref.set(published, stalePublished) : Effect.void,
),
)
: Effect.void,
);
yield* harness.runtime.startTurn(
makeCodexTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now: yield* DateTime.now,
text: "Continue.",
attemptId: RunAttemptId.make("attempt-stale-published-limit"),
}),
);
yield* harness.firstTerminal;
const terminal = harness.terminalEvents()[0];
assert.equal(terminal?.status, "failed");
if (terminal?.status !== "failed") return;
assert.equal(terminal.failure.class, "usage_limit");
assert.equal(terminal.failure.resetAt, publishedWhen === "before" ? staleResetAt : null);
yield* Deferred.await(freshLimitsPublished);
yield* harness.until(() =>
harness.events.some(
(event) =>
event.type === "turn_item.updated" &&
event.turnItem.type === "error" &&
event.turnItem.failure.resetAt === resetAt,
),
);
const resets = harness.events.flatMap((event) =>
event.type === "turn_item.updated" && event.turnItem.type === "error"
? [event.turnItem.failure.resetAt]
: [],
);
const latestResetAt = resets.length > 0 ? resets.at(-1) : terminal.failure.resetAt;
assert.deepEqual(
{ resets, latestResetAt },
{
resets: publishedWhen === "before" ? [null, resetAt] : [resetAt],
latestResetAt: resetAt,
},
);
}).pipe(
Effect.provide(
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
),
),
),
);

// regression: #17501 Codex 429 retry exhaustion classifies as a usage limit
it.effect.each([
{
Expand Down
Loading
Loading