Skip to content

fix(server): refresh Codex reset times after usage limits #28291

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
tensorcopy wants to merge 4 commits into
base: main
Choose a base branch
from
+340 −25
Open

fix(server): refresh Codex reset times after usage limits #28291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cf8add
fix(server): refresh Codex reset times after usage limits
tensorcopy Oct 31, 2026
43c31ec
fix(server): publish refreshed Codex usage windows
tensorcopy Oct 31, 2026
02409c7
fix(server): resolve Codex resets before terminal ingestion closes
tensorcopy Oct 31, 2026
ca74001
Merge remote-tracking branch 'github/main' into fix/codex-limit-reset…
maria-rcks Nov 5, 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
277 changes: 266 additions & 11 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
Expand Up @@ -1246,6 +1246,9 @@ describe("CodexAdapterV2 post-settle continuation", () => {
transcript.scenario,
).pipe(Effect.orDie);
const changes = yield* makeChangeSignal;
const usageLimitsUpdates: Array<
Parameters<NonNullable<CodexAdapterV2.CodexAdapterV2Options["onUsageLimits"]>>[0]
> = [];
const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
[];
const driver = yield* CodexReplay.makeReplayDriver(
Expand Down Expand Up @@ -1295,11 +1298,14 @@ describe("CodexAdapterV2 post-settle continuation", () => {
settings: DEFAULT_CODEX_SETTINGS,
environment: {},
clientFactory,
...(onUsageLimits ? { onUsageLimits } : {}),
digest: yield* Digest.Digest,
fileSystem,
idAllocator,
serverConfig,
onUsageLimits: (update) =>
Effect.sync(() => {
usageLimitsUpdates.push(update);
}).pipe(Effect.andThen(onUsageLimits?.(update) ?? Effect.void)),
continuationRequests: {
offer: (request) =>
Effect.sync(() => {
Expand Down Expand Up @@ -1363,6 +1369,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
threadId,
serverConfig,
events,
usageLimitsUpdates,
continuationRequests,
terminalEvents,
subagentUpdates,
Expand Down Expand Up @@ -5572,6 +5579,54 @@ describe("CodexAdapterV2 post-settle continuation", () => {
notification: false,
expectedClass: "usage_limit",
},
{
name: "stale-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "empty-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "failed-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "timed-out-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "unexhausted-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "newer-notification-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "omitted-window-read",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "known-reset",
code: "usageLimitExceeded",
notification: false,
expectedClass: "usage_limit",
},
{
name: "replacement",
code: "usageLimitExceeded",
Expand Down Expand Up @@ -5707,7 +5762,66 @@ describe("CodexAdapterV2 post-settle continuation", () => {
},
]
: []),
...(scenario.name === "deferred-reset" ? [snapshot] : []),
...(scenario.name === "deferred-reset" || scenario.name === "known-reset"
? [snapshot]
: scenario.name === "stale-read" ||
scenario.name === "failed-read" ||
scenario.name === "unexhausted-read" ||
scenario.name === "newer-notification-read"
? [
{
...snapshot,
frame: {
method: "account/rateLimits/updated",
params: {
rateLimits: {
limitId: "codex",
primary: {
usedPercent: 99,
resetsAt: 2000000000,
windowDurationMins: 300,
},
},
},
},
},
]
: []),
...(scenario.name === "omitted-window-read"
? [
{
...snapshot,
frame: {
method: "account/rateLimits/updated",
params: {
rateLimits: {
limitId: "codex",
primary: { usedPercent: 100, resetsAt: 2000000000 },
secondary: { usedPercent: 100 },
},
},
},
},
]
: []),
...(scenario.name === "stale-read" || scenario.name === "empty-read"
? [
{
type: "emit_inbound" as const,
label: "account/rateLimits/updated/premium",
frame: {
method: "account/rateLimits/updated",
params: {
rateLimits: {
limitId: "premium",
primary: null,
secondary: null,
},
},
},
},
]
: []),
...(scenario.name === "deferred-reset"
? [
{
Expand Down Expand Up @@ -5791,6 +5905,89 @@ describe("CodexAdapterV2 post-settle continuation", () => {
},
},
},
...(scenario.expectedClass === "usage_limit" &&
!("expectedCode" in scenario) &&
scenario.name !== "deferred-reset" &&
scenario.name !== "known-reset" &&
scenario.name !== "timed-out-read"
? [
{
type: "expect_outbound" as const,
label: "account/rateLimits/read",
frame: {
id: 4,
method: "account/rateLimits/read",
params: null,
},
},
...(scenario.name === "newer-notification-read"
? [
{
...snapshot,
frame: {
method: "account/rateLimits/updated",
params: {
rateLimits: {
limitId: "codex",
primary: {
usedPercent: 50,
resetsAt: 2000200000,
windowDurationMins: 300,
},
},
},
},
},
]
: []),
{
type: "emit_inbound" as const,
label: "account/rateLimits/read",
frame: {
id: 4,
...(scenario.name === "failed-read"
? { error: { code: -32603, message: "Usage endpoint unavailable." } }
: {
result: {
rateLimits: { limitId: "premium", primary: null, secondary: null },
rateLimitsByLimitId: {
codex:
scenario.name === "stale-read" ||
scenario.name === "empty-read" ||
scenario.name === "newer-notification-read"
? {
limitId: "codex",
primary: {
usedPercent: 100,
resetsAt: 2000000000,
windowDurationMins: 300,
},
secondary: {
usedPercent: 100,
resetsAt: 2000100000,
windowDurationMins: 10080,
},
}
: scenario.name === "omitted-window-read"
? {
limitId: "codex",
secondary: { usedPercent: 99, resetsAt: 2000100000 },
}
: {
limitId: "codex",
primary: {
usedPercent: 99,
resetsAt: 2000000000,
windowDurationMins: 300,
},
},
},
},
}),
},
},
]
: []),
...(scenario.name === "late-reset" || "resetAfter" in scenario ? [snapshot] : []),
...(scenario.name === "deferred-reset"
? [
Expand Down Expand Up @@ -5829,6 +6026,8 @@ describe("CodexAdapterV2 post-settle continuation", () => {
],
});
const resetReceipt = yield* Deferred.make<void>();
const readStarted = yield* Deferred.make<void>();
const readInterrupted = yield* Deferred.make<void>();
const snapshotReceipt = yield* Deferred.make<void>();
const harness = yield* makeCodexReplayHarness(
transcript,
Expand All @@ -5838,7 +6037,19 @@ describe("CodexAdapterV2 post-settle continuation", () => {
event.turnItem.failure.resetAt === resetAt
? Deferred.succeed(resetReceipt, undefined)
: Effect.void,
undefined,
(method) =>
method === "account/rateLimits/read"
? Deferred.succeed(readStarted, undefined).pipe(
Effect.andThen(
scenario.name === "timed-out-read"
? Effect.never.pipe(
Effect.onInterrupt(() => Deferred.succeed(readInterrupted, undefined)),
)
: Effect.void,
),
Effect.asVoid,
)
: Effect.void,
undefined,
undefined,
() => Deferred.succeed(snapshotReceipt, undefined),
Expand All @@ -5852,13 +6063,45 @@ describe("CodexAdapterV2 post-settle continuation", () => {
attemptId: RunAttemptId.make(`attempt-limit-${scenario.name}`),
}),
);
if (scenario.name === "timed-out-read") {
yield* Deferred.await(readStarted);
assert.lengthOf(harness.terminalEvents(), 0);
yield* TestClock.adjust("3 seconds");
yield* Deferred.await(readInterrupted);
}
yield* harness.firstTerminal;
const terminal = harness.terminalEvents()[0];
assert.equal(terminal?.status, "failed");
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.endsWith("-read")) yield* Deferred.await(readStarted);
if (scenario.name === "timed-out-read") {
assert.isNull(terminal.failure.resetAt);
assert.isFalse(
harness.events.some(
(event) =>
event.type === "turn_item.updated" &&
event.turnItem.type === "error" &&
event.turnItem.failure.resetAt != null,
),
);
}
if (scenario.name === "known-reset") assert.isFalse(yield* Deferred.isDone(readStarted));
if (["deferred-reset", "known-reset", "stale-read", "empty-read"].includes(scenario.name)) {
assert.equal(terminal.failure.resetAt, resetAt);
}
if (
[
"failed-read",
"unexhausted-read",
"omitted-window-read",
"newer-notification-read",
].includes(scenario.name)
) {
assert.isNull(terminal.failure.resetAt);
assert.equal(terminal.failure.message, message);
}
if (scenario.name === "matching-details")
assert.equal(terminal.failure.message, "Detailed provider allowance explanation.");
if ("resetAfter" in scenario) {
Expand All @@ -5872,15 +6115,27 @@ describe("CodexAdapterV2 post-settle continuation", () => {
),
);
}
if (scenario.name === "late-reset") {
if (scenario.name === "newer-notification-read") {
assert.deepEqual(
harness.usageLimitsUpdates
.at(-1)
?.windows.map(({ usedPercent, resetsAt }) => ({ usedPercent, resetsAt })),
[{ usedPercent: 50, resetsAt: "2033-05-20T11:06:40.000Z" }],
);
}
if (scenario.name === "late-reset" && terminal.failure.resetAt !== resetAt) {
yield* Deferred.await(resetReceipt);
const item = harness.events.find(
(event) =>
event.type === "turn_item.updated" &&
event.turnItem.type === "error" &&
event.turnItem.failure.resetAt === resetAt,
}
if (scenario.name === "stale-read" || scenario.name === "empty-read") {
assert.deepEqual(
harness.usageLimitsUpdates
.at(-1)
?.windows.map(({ id, usedPercent, resetsAt }) => ({ id, usedPercent, resetsAt })),
[
{ id: "primary", usedPercent: 100, resetsAt: "2033-05-18T03:33:20.000Z" },
{ id: "secondary", usedPercent: 100, resetsAt: resetAt },
],
);
assert.isDefined(item);
}
if (scenario.name === "retry" || "willRetry" in scenario)
assert.equal(terminal.retry?.attempt, 1);
Expand Down
Loading
Loading