From 654185b54422dffa7077ce78a6d331281cef55c3 Mon Sep 17 00:00:00 2001
From: Mukunda Rao Katta <mukunda.vjcs6@gmail.com>
Date: Sat, 25 Apr 2026 11:17:51 -0700
Subject: [PATCH] fix(client): restore 60s cap on Retry-After header

---
 src/client.ts       |  6 +++---
 tests/index.test.ts | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index f55a6b986..ccbb42839 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -946,9 +946,9 @@ export class OpenAI {
       }
     }
 
-    // If the API asks us to wait a certain amount of time, just do what it
-    // says, but otherwise calculate a default
-    if (timeoutMillis === undefined) {
+    // If the API asks us to wait a certain amount of time (and it's a reasonable amount),
+    // just do what it says, but otherwise calculate a default
+    if (!(timeoutMillis && 0 <= timeoutMillis && timeoutMillis < 60 * 1000)) {
       const maxRetries = options.maxRetries ?? this.maxRetries;
       timeoutMillis = this.calculateDefaultRetryTimeoutMillis(retriesRemaining, maxRetries);
     }
diff --git a/tests/index.test.ts b/tests/index.test.ts
index f15b518e9..ee0af9280 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -764,6 +764,49 @@ describe('retries', () => {
     expect(count).toEqual(3);
   });
 
+  test('caps Retry-After at 60s when server returns a large value', async () => {
+    // Capture delays passed to setTimeout (which sleep() wraps) and fire callbacks
+    // immediately so the test doesn't actually wait. We set a small client timeout
+    // (30s) so the per-request abort watchdog can't be confused with the retry sleep.
+    const realSetTimeout = globalThis.setTimeout;
+    const sleepDelays: number[] = [];
+    const setTimeoutSpy = jest
+      .spyOn(globalThis, 'setTimeout')
+      .mockImplementation(((cb: (...args: any[]) => void, ms?: number, ...args: any[]) => {
+        if (typeof ms === 'number') sleepDelays.push(ms);
+        return realSetTimeout(cb, 0, ...args);
+      }) as any);
+
+    try {
+      let count = 0;
+      const testFetch = async (
+        url: string | URL | Request,
+        { signal }: RequestInit = {},
+      ): Promise<Response> => {
+        if (count++ === 0) {
+          return new Response(undefined, {
+            status: 429,
+            // 600 seconds == 10 minutes; without a cap the SDK would sleep for the full duration.
+            headers: { 'Retry-After': '600' },
+          });
+        }
+        return new Response(JSON.stringify({ a: 1 }), { headers: { 'Content-Type': 'application/json' } });
+      };
+
+      const client = new OpenAI({ apiKey: 'My API Key', fetch: testFetch, timeout: 30_000 });
+
+      expect(await client.request({ path: '/foo', method: 'get' })).toEqual({ a: 1 });
+      expect(count).toEqual(2);
+
+      // With the cap in place the retry should fall back to calculated backoff
+      // (<= 8s with jitter); without the cap the largest delay would be 600_000ms.
+      const longestDelay = Math.max(0, ...sleepDelays);
+      expect(longestDelay).toBeLessThan(60 * 1000);
+    } finally {
+      setTimeoutSpy.mockRestore();
+    }
+  });
+
   describe('auth', () => {
     test('apiKey', async () => {
       const client = new OpenAI({