Claude Code. Any Model. The most powerful AI coding agent now speaks every language.
feat(adapters): end openai and anthropic-compat retry waits on abort
Jack Rudenkoefbe6f496811
diff --git a/packages/cli/src/providers/transport/anthropic-compat.ts b/packages/cli/src/providers/transport/anthropic-compat.tsindex 4d8e81bf..2fe31ebb 100644--- a/packages/cli/src/providers/transport/anthropic-compat.ts+++ b/packages/cli/src/providers/transport/anthropic-compat.ts@@ -8,6 +8,7 @@import { credentials } from "../../auth/credentials/authority.js";import { terminalCredentialError } from "../../auth/credentials/credential-error.js";+import { callAbortError, sleepUnlessAborted } from "../../handlers/shared/call-context.js";import type { RemoteProvider } from "../../handlers/shared/remote-provider-types.js";import { log } from "../../logger.js";import { getProviderByName } from "../provider-definitions.js";@@ -166,7 +167,10 @@ export class AnthropicProviderTransport implements ProviderTransport {* Terminal 429s (billing/quota) skip the retry chain — see isTerminal429* in transport/openai.ts for the patterns matched.*/- async enqueueRequest(fetchFn: () => Promise<Response>): Promise<Response> {+ async enqueueRequest(+ fetchFn: () => Promise<Response>,+ opts?: { signal?: AbortSignal }+ ): Promise<Response> {const maxRetries = 2;let lastResponse: Response | null = null;@@ -194,7 +198,9 @@ export class AnthropicProviderTransport implements ProviderTransport {log(`[${this.displayName}] 429 rate limited, retry ${attempt + 1}/${maxRetries} in ${(delayMs / 1000).toFixed(1)}s`);- await new Promise((resolve) => setTimeout(resolve, delayMs));+ // An internal call's deadline ends the wait; the re-try would be+ // refused by the caller's pre-start check anyway, so stop here.+ if (await sleepUnlessAborted(delayMs, opts?.signal)) throw callAbortError();continue;}diff --git a/packages/cli/src/providers/transport/openai.ts b/packages/cli/src/providers/transport/openai.tsindex 02405833..1bc4b455 100644--- a/packages/cli/src/providers/transport/openai.ts+++ b/packages/cli/src/providers/transport/openai.ts@@ -6,6 +6,7 @@* Includes 30-second timeout with detailed error reporting.*/+import { callAbortError, sleepUnlessAborted } from "../../handlers/shared/call-context.js";import { isQuotaExhaustionError } from "../../handlers/shared/quota-exhaustion.js";import type { RemoteProvider } from "../../handlers/shared/remote-provider-types.js";import { log } from "../../logger.js";@@ -110,7 +111,10 @@ export class OpenAIProviderTransport implements ProviderTransport {* skip the retry chain entirely: retrying a balance error wastes wall* clock and lies about endpoint health.*/- async enqueueRequest(fetchFn: () => Promise<Response>): Promise<Response> {+ async enqueueRequest(+ fetchFn: () => Promise<Response>,+ opts?: { signal?: AbortSignal }+ ): Promise<Response> {const maxRetries = 2;let lastResponse: Response | null = null;@@ -141,12 +145,16 @@ export class OpenAIProviderTransport implements ProviderTransport {log(`[${this.displayName}] 429 rate limited, retry ${attempt + 1}/${maxRetries} in ${(delayMs / 1000).toFixed(1)}s`);- await new Promise((resolve) => setTimeout(resolve, delayMs));+ // An internal call's deadline ends the wait (see the catch below).+ if (await sleepUnlessAborted(delayMs, opts?.signal)) throw callAbortError();continue;}return response;} catch (fetchError: any) {+ // The caller's own deadline, not this transport's 30 s timeout: the+ // abort is rethrown unchanged, so it is never reported as a timeout.+ if (opts?.signal?.aborted) throw fetchError;if (fetchError.name === "AbortError") {log(`[${this.displayName}] Request timed out after 30s`);throw new OpenAITimeoutError(this.provider.baseUrl, fetchError);