Skip to content

Commit 93e2471

Browse files
jieyuexingcodex
andcommitted
fix(server): 将自定义 Codex provider 的限额认证拒绝判为不支持
移植上游 pingdotgg#22772 的生产逻辑和回归测试,保留错误类型、错误码、原始消息与账号形状的窄条件,不包含展示夹具。 Co-Authored-By: Codex <[email protected]>
1 parent 397e1c2 commit 93e2471

4 files changed

Lines changed: 108 additions & 3 deletions

File tree

‎apps/server/src/provider/CodexProvider.ts‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import { makeUnavailableUsageLimits } from "@t3tools/provider-core/server/usageL
4949
import {
5050
codexRateLimitsFailureMessage,
5151
codexRateLimitsToLimits,
52+
isCodexUsageAuthRequiredError,
5253
type CodexRateLimitSnapshot,
5354
type CodexResetCreditsSummary,
5455
} from "./codexUsageLimits.ts";
@@ -67,7 +68,7 @@ type CodexRateLimitsProbe =
6768
readonly resetCredits: CodexResetCreditsSummary | null | undefined;
6869
readonly accountId?: string | null | undefined;
6970
}
70-
| { readonly failure: string };
71+
| { readonly failure: string; readonly authRequired?: true };
7172

7273
const CODEX_APP_SERVER_PROBE_FORCE_KILL_AFTER = "2 seconds" as const;
7374
const CODEX_CATALOG_REFRESH_TIMEOUT_MS = 3_000;
@@ -593,7 +594,10 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
593594
),
594595
Effect.catch((error) =>
595596
Effect.logDebug("Codex rate-limit read failed.", { cause: error }).pipe(
596-
Effect.as<CodexRateLimitsProbe>({ failure: codexRateLimitsFailureMessage(error) }),
597+
Effect.as<CodexRateLimitsProbe>({
598+
failure: codexRateLimitsFailureMessage(error),
599+
...(isCodexUsageAuthRequiredError(error) ? { authRequired: true as const } : {}),
600+
}),
597601
),
598602
),
599603
),
@@ -842,8 +846,17 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
842846
const accountStatus = managedAuth
843847
? { status: "ready" as const, auth: managedAuth, message: undefined }
844848
: accountProbeStatus(snapshot);
849+
// Without an OpenAI account (e.g. a custom model_provider) Codex refuses the
850+
// usage read. The same account shape can still read usage with native auth,
851+
// so only that refusal means unsupported; any other failure stays transient.
852+
const accountlessUsageRefused =
853+
!snapshot.account.account &&
854+
!snapshot.account.requiresOpenaiAuth &&
855+
snapshot.rateLimits !== undefined &&
856+
"failure" in snapshot.rateLimits &&
857+
snapshot.rateLimits.authRequired === true;
845858
const usageLimits =
846-
snapshot.account.account?.type === "apiKey"
859+
snapshot.account.account?.type === "apiKey" || accountlessUsageRefused
847860
? makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" })
848861
: snapshot.rateLimits === undefined || "failure" in snapshot.rateLimits
849862
? makeUnavailableUsageLimits({

‎apps/server/src/provider/ProviderRegistry.test.ts‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,58 @@ it.layer(
478478
}),
479479
);
480480

481+
it.effect("reports usage unsupported when an account-less Codex cannot read usage", () =>
482+
Effect.gen(function* () {
483+
const rateLimits = { failure: "Codex could not read usage (JSON-RPC -32600)." };
484+
const subscribed = yield* checkCodexProviderStatus(defaultCodexSettings, () =>
485+
Effect.succeed(makeCodexProbeSnapshot({ rateLimits })),
486+
);
487+
assert.strictEqual(subscribed.usageLimits?.unavailable?.reason, "probeFailed");
488+
489+
// A custom model_provider (e.g. a proxy) has no OpenAI account, so the
490+
// usage RPC fails with "authentication required" by design.
491+
const customProvider = yield* checkCodexProviderStatus(defaultCodexSettings, () =>
492+
Effect.succeed(
493+
makeCodexProbeSnapshot({
494+
account: { account: null, requiresOpenaiAuth: false },
495+
rateLimits: { ...rateLimits, authRequired: true },
496+
}),
497+
),
498+
);
499+
assert.strictEqual(customProvider.status, "ready");
500+
assert.strictEqual(customProvider.models[0]?.slug, "gpt-live-codex");
501+
assert.deepStrictEqual(customProvider.usageLimits?.unavailable, { reason: "unsupported" });
502+
503+
// Any other failure in that account shape stays transient.
504+
const transient = yield* checkCodexProviderStatus(defaultCodexSettings, () =>
505+
Effect.succeed(
506+
makeCodexProbeSnapshot({
507+
account: { account: null, requiresOpenaiAuth: false },
508+
rateLimits,
509+
}),
510+
),
511+
);
512+
assert.strictEqual(transient.usageLimits?.unavailable?.reason, "probeFailed");
513+
514+
// The same account shape with native auth can still answer with limits.
515+
const nativeAuth = yield* checkCodexProviderStatus(defaultCodexSettings, () =>
516+
Effect.succeed(
517+
makeCodexProbeSnapshot({
518+
account: { account: null, requiresOpenaiAuth: false },
519+
rateLimits: {
520+
snapshot: {
521+
primary: { usedPercent: 12, resetsAt: 1_784_000_000, windowDurationMins: 300 },
522+
},
523+
resetCredits: null,
524+
},
525+
}),
526+
),
527+
);
528+
assert.strictEqual(nativeAuth.usageLimits?.unavailable, undefined);
529+
assert.strictEqual(nativeAuth.usageLimits?.windows?.[0]?.usedPercent, 12);
530+
}),
531+
);
532+
481533
it.effect("reads the version of a Codex CLI too old to run app-server (#20351)", () =>
482534
Effect.gen(function* () {
483535
if ((yield* HostProcess.Platform) === "win32") return;

‎apps/server/src/provider/codexUsageLimits.test.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
codexRateLimitsFailureMessage,
66
codexRateLimitsToLimits,
77
codexRateLimitsToUpdate,
8+
isCodexUsageAuthRequiredError,
89
mergeCodexRateLimits,
910
} from "./codexUsageLimits.ts";
1011

@@ -210,6 +211,34 @@ describe("codexRateLimitsFailureMessage", () => {
210211
});
211212
});
212213

214+
describe("isCodexUsageAuthRequiredError", () => {
215+
const authRequired = "codex account authentication required to read rate limits";
216+
217+
it("recognizes only Codex's account-less usage refusal", () => {
218+
expect(
219+
isCodexUsageAuthRequiredError(
220+
new CodexErrors.CodexAppServerRequestError({ code: -32600, errorMessage: authRequired }),
221+
),
222+
).toBe(true);
223+
expect(
224+
isCodexUsageAuthRequiredError(
225+
new CodexErrors.CodexAppServerRequestError({ code: -32603, errorMessage: authRequired }),
226+
),
227+
).toBe(false);
228+
expect(
229+
isCodexUsageAuthRequiredError(
230+
new CodexErrors.CodexAppServerRequestError({
231+
code: -32600,
232+
errorMessage: "failed to fetch codex rate limits: 503 Service Unavailable",
233+
}),
234+
),
235+
).toBe(false);
236+
expect(
237+
isCodexUsageAuthRequiredError(new CodexErrors.CodexAppServerProcessExitedError({})),
238+
).toBe(false);
239+
});
240+
});
241+
213242
describe("mergeCodexRateLimits", () => {
214243
it("updates monthly credit usage, retains it when omitted, and clears an explicit null", () => {
215244
const snapshot = {

‎apps/server/src/provider/codexUsageLimits.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,17 @@ export function codexRateLimitsToUpdate(
152152
return windows.length > 0 ? { windows } : undefined;
153153
}
154154

155+
const CODEX_USAGE_AUTH_REQUIRED_MESSAGE =
156+
"codex account authentication required to read rate limits";
157+
158+
export function isCodexUsageAuthRequiredError(error: CodexErrors.CodexAppServerError): boolean {
159+
return (
160+
error._tag === "CodexAppServerRequestError" &&
161+
error.code === -32600 &&
162+
error.errorMessage === CODEX_USAGE_AUTH_REQUIRED_MESSAGE
163+
);
164+
}
165+
155166
export function codexRateLimitsFailureMessage(error: CodexErrors.CodexAppServerError): string {
156167
switch (error._tag) {
157168
case "CodexAppServerRequestError":

0 commit comments

Comments
 (0)