Skip to content

Claude Code. Any Model. The most powerful AI coding agent now speaks every language.

refactor(openai-codex): add injection points for code-mode tests

Jack Rudenkocb4bf5dba3d0
diff --git a/packages/cli/src/code-mode/request.ts b/packages/cli/src/code-mode/request.ts
index ec5dd663..b9cd17c3 100644
--- a/packages/cli/src/code-mode/request.ts
+++ b/packages/cli/src/code-mode/request.ts
@@ -84,6 +84,12 @@ export function isLiteFallbackActive(model: string, now: number = Date.now()): b
return true;
}
+/** Forget remembered lite rejections and logged decisions (tests only). */
+export function resetCodeModeRequestStateForTests(): void {
+ liteFallbackUntil.clear();
+ lastLogged.clear();
+}
+
/** Remember that the backend rejected a lite request for `model`. */
export function markLiteFallback(model: string, now: number = Date.now()): void {
liteFallbackUntil.set(model.toLowerCase(), now + LITE_FALLBACK_TTL_MS);
diff --git a/packages/cli/src/code-mode/sandbox/quickjs-loader.ts b/packages/cli/src/code-mode/sandbox/quickjs-loader.ts
index dbfb5ff0..751b6043 100644
--- a/packages/cli/src/code-mode/sandbox/quickjs-loader.ts
+++ b/packages/cli/src/code-mode/sandbox/quickjs-loader.ts
@@ -267,6 +267,19 @@ export function currentQuickJSModule(): QuickJSModuleLease | undefined {
return current?.usable ? current : undefined;
}
+/**
+ * Forget the loaded module and every latch (tests only): a simulated import
+ * failure otherwise latches `unavailable` for the rest of the process.
+ * Runtimes still in a dropped lease are left to their owners.
+ */
+export function resetQuickJSLoaderForTests(): void {
+ current = undefined;
+ loading = undefined;
+ unavailable = undefined;
+ wasmBytesUnreadableLogged = false;
+ liveLeases.clear();
+}
+
/** Whether a sandbox can run in this process (loads the module on first call). */
export async function isSandboxAvailable(): Promise<boolean> {
return (await loadQuickJSModule()) !== undefined;
diff --git a/packages/cli/src/handlers/shared/stream-parsers/responses/responses-leg.ts b/packages/cli/src/handlers/shared/stream-parsers/responses/responses-leg.ts
index 785eca07..a2054bc7 100644
--- a/packages/cli/src/handlers/shared/stream-parsers/responses/responses-leg.ts
+++ b/packages/cli/src/handlers/shared/stream-parsers/responses/responses-leg.ts
@@ -39,7 +39,12 @@ import {
isParallelWrapperName,
parseParallelWrapper,
} from "./parallel-wrapper.js";
-import { type StallClock, StallGuard, isOutputBearingEvent } from "./stall-guard.js";
+import {
+ type StallClock,
+ StallGuard,
+ isOutputBearingEvent,
+ systemStallClock,
+} from "./stall-guard.js";
/** One leg's usage, read from `response.completed` / `.incomplete`. */
export interface Usage {
@@ -120,6 +125,8 @@ export interface ResponsesLegContext {
* ignored, exactly as before code mode existed.
*/
codeMode?: boolean;
+ /** The clock of the EXEC_DRAIN_MS drain; tests inject a fake one. Default wall clock. */
+ drainClock?: StallClock;
}
/** A held exec call (code mode). */
@@ -205,7 +212,7 @@ class ResponsesLeg {
// reasoning items in order (an exec's precedingItems; a turn record's items).
private heldExec: HeldExec | undefined;
private readonly items: ResponsesItem[] = [];
- private drainTimer: ReturnType<typeof setTimeout> | undefined;
+ private drainTimer: unknown;
/** A degenerate wrapper held until the terminal event (`holdDegenerate`). */
private heldDegenerate: { reason: DegenerateReason; bytes: number } | undefined;
private cancelReader: (() => void) | undefined;
@@ -230,8 +237,8 @@ class ResponsesLeg {
* keep reading only for the terminal event's usage, at most EXEC_DRAIN_MS.
*/
private startDrain(what: string): void {
- if (this.drainTimer) return;
- this.drainTimer = setTimeout(() => {
+ if (this.drainTimer !== undefined) return;
+ this.drainTimer = this.drainClock.setTimeout(() => {
log(`[ResponsesSSE] no terminal event ${EXEC_DRAIN_MS} ms after the ${what}; using it`);
this.cancelReader?.();
}, EXEC_DRAIN_MS);
@@ -279,6 +286,10 @@ class ResponsesLeg {
return { stop: this.degenerate(held.reason, held.bytes) };
}
+ private get drainClock(): StallClock {
+ return this.ctx.drainClock ?? systemStallClock;
+ }
+
private get sink(): ClaudeSseSink {
return this.ctx.sink;
}
@@ -394,7 +405,7 @@ class ResponsesLeg {
} finally {
guard?.disarm();
signal.removeEventListener("abort", onAbort);
- if (this.drainTimer) clearTimeout(this.drainTimer);
+ if (this.drainTimer !== undefined) this.drainClock.clearTimeout(this.drainTimer);
}
if (signal.aborted) return { kind: "cancelled", usage: this.usage };
diff --git a/packages/cli/src/handlers/shared/stream-parsers/responses/responses-turn.ts b/packages/cli/src/handlers/shared/stream-parsers/responses/responses-turn.ts
index 1c33c0f2..d480c6de 100644
--- a/packages/cli/src/handlers/shared/stream-parsers/responses/responses-turn.ts
+++ b/packages/cli/src/handlers/shared/stream-parsers/responses/responses-turn.ts
@@ -104,7 +104,8 @@ import {
} from "./responses-leg.js";
import { type StallClock, type StallPolicy, systemStallClock } from "./stall-guard.js";
-export interface ResponsesTurnOptions extends Omit<ResponsesLegContext, "sink" | "codeMode"> {
+export interface ResponsesTurnOptions
+ extends Omit<ResponsesLegContext, "sink" | "codeMode" | "drainClock"> {
/** Code mode for this turn (architecture §5.11). Absent ⇒ exec calls are ignored, as before. */
codeMode?: CodeModeTurnHooks;
/**
@@ -281,6 +282,8 @@ class ResponsesTurn {
sink: this.sink,
stall: this.stallFor(headersAt),
codeMode: this.opts.codeMode !== undefined,
+ // The drain runs on the stall guard's clock, so one fake clock drives both.
+ drainClock: this.opts.retry?.stallClock,
});
this.legUsages.push("usage" in outcome ? outcome.usage : undefined);
const next =
diff --git a/packages/cli/src/providers/transport/openai-codex.ts b/packages/cli/src/providers/transport/openai-codex.ts
index ea9fbe90..d7240ffb 100644
--- a/packages/cli/src/providers/transport/openai-codex.ts
+++ b/packages/cli/src/providers/transport/openai-codex.ts
@@ -29,10 +29,28 @@ import { recordSignedArm } from "../../auth/credentials/billing-probe.js";
import { CodexOAuthHalf } from "../../auth/credentials/codex-credential.js";
import type { RequestAuth } from "../../auth/credentials/types.js";
import { classifyConnectionError } from "../../handlers/shared/connection-error.js";
+import type { RemoteProvider } from "../../handlers/shared/remote-provider-types.js";
import { conversationKey } from "./conversation-key.js";
import { OpenAIProviderTransport } from "./openai.js";
import type { AuthBinding } from "./types.js";
+/**
+ * What `forceRefreshAuth` uses of the Codex OAuth login. Injectable so a test
+ * never touches the real singleton (a test suite once deleted the real Codex
+ * login through a singleton reset); production passes nothing.
+ */
+export interface CodexOAuthRefresher {
+ /** Rotate the OAuth token (single-flight through CodexOAuth's refresh lock). */
+ refreshToken(): Promise<unknown>;
+ /** Mint a request artifact from the OAuth half ONLY. */
+ mintOAuthAuth(): Promise<RequestAuth | null>;
+}
+
+const defaultCodexOAuthRefresher: CodexOAuthRefresher = {
+ refreshToken: () => CodexOAuth.getInstance().refreshToken(),
+ mintOAuthAuth: () => new CodexOAuthHalf().getRequestAuth({ model: "" }),
+};
+
export class OpenAICodexTransport extends OpenAIProviderTransport {
/**
* The last auth artifact refreshAuth() minted. Shared by every request on this
@@ -43,6 +61,18 @@ export class OpenAICodexTransport extends OpenAIProviderTransport {
*/
private cachedAuth: RequestAuth | null = null;
+ private readonly oauthRefresher: CodexOAuthRefresher;
+
+ constructor(
+ provider: RemoteProvider,
+ modelName: string,
+ apiKey: string,
+ oauthRefresher: CodexOAuthRefresher = defaultCodexOAuthRefresher
+ ) {
+ super(provider, modelName, apiKey);
+ this.oauthRefresher = oauthRefresher;
+ }
+
/**
* Resolve OAuth (or fall through to api-key) via the credential authority and
* cache the artifact. composed-handler calls this before getEndpoint/getHeaders.
@@ -111,8 +141,8 @@ export class OpenAICodexTransport extends OpenAIProviderTransport {
* an outage.
*/
async forceRefreshAuth(): Promise<AuthBinding> {
- await CodexOAuth.getInstance().refreshToken();
- const auth = await new CodexOAuthHalf().getRequestAuth({ model: "" });
+ await this.oauthRefresher.refreshToken();
+ const auth = await this.oauthRefresher.mintOAuthAuth();
// Kept for callers that pass no binding; the request path uses the return.
this.cachedAuth = auth;
return { auth };