@google/gemini-cli-core 0.11.0 → 0.11.1

package/dist/src/utils/googleQuotaErrors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"googleQuotaErrors.js","sourceRoot":"","sources":["../../../src/utils/googleQuotaErrors.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/googleQuotaErrors.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/googleQuotaErrors.test.js

@@ -0,0 +1,281 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { classifyGoogleError, RetryableQuotaError, TerminalQuotaError, } from './googleQuotaErrors.js';
+import * as errorParser from './googleErrors.js';
+describe('classifyGoogleError', () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should return original error if not a Google API error', () => {
+        const regularError = new Error('Something went wrong');
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+        const result = classifyGoogleError(regularError);
+        expect(result).toBe(regularError);
+    });
+    it('should return original error if code is not 429', () => {
+        const apiError = {
+            code: 500,
+            message: 'Server error',
+            details: [],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const originalError = new Error();
+        const result = classifyGoogleError(originalError);
+        expect(result).toBe(originalError);
+        expect(result).not.toBeInstanceOf(TerminalQuotaError);
+        expect(result).not.toBeInstanceOf(RetryableQuotaError);
+    });
+    it('should return TerminalQuotaError for daily quota violations in QuotaFailure', () => {
+        const apiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+                    violations: [
+                        {
+                            subject: 'user',
+                            description: 'daily limit',
+                            quotaId: 'RequestsPerDay-limit',
+                        },
+                    ],
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(TerminalQuotaError);
+        expect(result.cause).toBe(apiError);
+    });
+    it('should return TerminalQuotaError for daily quota violations in ErrorInfo', () => {
+        const apiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
+                    reason: 'QUOTA_EXCEEDED',
+                    domain: 'googleapis.com',
+                    metadata: {
+                        quota_limit: 'RequestsPerDay_PerProject_PerUser',
+                    },
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(TerminalQuotaError);
+    });
+    it('should return TerminalQuotaError for long retry delays', () => {
+        const apiError = {
+            code: 429,
+            message: 'Too many requests',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.RetryInfo',
+                    retryDelay: '301s', // > 5 minutes
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(TerminalQuotaError);
+    });
+    it('should return RetryableQuotaError for short retry delays', () => {
+        const apiError = {
+            code: 429,
+            message: 'Too many requests',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.RetryInfo',
+                    retryDelay: '45.123s',
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(RetryableQuotaError);
+        expect(result.retryDelayMs).toBe(45123);
+    });
+    it('should return RetryableQuotaError for per-minute quota violations in QuotaFailure', () => {
+        const apiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+                    violations: [
+                        {
+                            subject: 'user',
+                            description: 'per minute limit',
+                            quotaId: 'RequestsPerMinute-limit',
+                        },
+                    ],
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(RetryableQuotaError);
+        expect(result.retryDelayMs).toBe(60000);
+    });
+    it('should return RetryableQuotaError for per-minute quota violations in ErrorInfo', () => {
+        const apiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
+                    reason: 'QUOTA_EXCEEDED',
+                    domain: 'googleapis.com',
+                    metadata: {
+                        quota_limit: 'RequestsPerMinute_PerProject_PerUser',
+                    },
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(RetryableQuotaError);
+        expect(result.retryDelayMs).toBe(60000);
+    });
+    it('should return RetryableQuotaError for another short retry delay', () => {
+        const apiError = {
+            code: 429,
+            message: 'You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 56.185908122s.',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+                    violations: [
+                        {
+                            quotaMetric: 'generativelanguage.googleapis.com/generate_content_free_tier_requests',
+                            quotaId: 'GenerateRequestsPerMinutePerProjectPerModel-FreeTier',
+                            quotaDimensions: {
+                                location: 'global',
+                                model: 'gemini-2.5-pro',
+                            },
+                            quotaValue: '2',
+                        },
+                    ],
+                },
+                {
+                    '@type': 'type.googleapis.com/google.rpc.Help',
+                    links: [
+                        {
+                            description: 'Learn more about Gemini API quotas',
+                            url: 'https://ai.google.dev/gemini-api/docs/rate-limits',
+                        },
+                    ],
+                },
+                {
+                    '@type': 'type.googleapis.com/google.rpc.RetryInfo',
+                    retryDelay: '56s',
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(RetryableQuotaError);
+        expect(result.retryDelayMs).toBe(56000);
+    });
+    it('should return RetryableQuotaError for Cloud Code RATE_LIMIT_EXCEEDED with retry delay', () => {
+        const apiError = {
+            code: 429,
+            message: 'You have exhausted your capacity on this model. Your quota will reset after 0s.',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
+                    reason: 'RATE_LIMIT_EXCEEDED',
+                    domain: 'cloudcode-pa.googleapis.com',
+                    metadata: {
+                        uiMessage: 'true',
+                        model: 'gemini-2.5-pro',
+                        quotaResetDelay: '539.477544ms',
+                        quotaResetTimeStamp: '2025-10-20T19:14:08Z',
+                    },
+                },
+                {
+                    '@type': 'type.googleapis.com/google.rpc.RetryInfo',
+                    retryDelay: '0.539477544s',
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(RetryableQuotaError);
+        expect(result.retryDelayMs).toBeCloseTo(539.477544);
+    });
+    it('should return TerminalQuotaError for Cloud Code QUOTA_EXHAUSTED', () => {
+        const apiError = {
+            code: 429,
+            message: 'You have exhausted your capacity on this model. Your quota will reset after 0s.',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
+                    reason: 'QUOTA_EXHAUSTED',
+                    domain: 'cloudcode-pa.googleapis.com',
+                    metadata: {
+                        uiMessage: 'true',
+                        model: 'gemini-2.5-pro',
+                        quotaResetDelay: '539.477544ms',
+                        quotaResetTimeStamp: '2025-10-20T19:14:08Z',
+                    },
+                },
+                {
+                    '@type': 'type.googleapis.com/google.rpc.RetryInfo',
+                    retryDelay: '0.539477544s',
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(TerminalQuotaError);
+    });
+    it('should prioritize daily limit over retry info', () => {
+        const apiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+                    violations: [
+                        {
+                            subject: 'user',
+                            description: 'daily limit',
+                            quotaId: 'RequestsPerDay-limit',
+                        },
+                    ],
+                },
+                {
+                    '@type': 'type.googleapis.com/google.rpc.RetryInfo',
+                    retryDelay: '10s',
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const result = classifyGoogleError(new Error());
+        expect(result).toBeInstanceOf(TerminalQuotaError);
+    });
+    it('should return original error for 429 without specific details', () => {
+        const apiError = {
+            code: 429,
+            message: 'Too many requests',
+            details: [
+                {
+                    '@type': 'type.googleapis.com/google.rpc.DebugInfo',
+                    detail: 'some debug info',
+                    stackEntries: [],
+                },
+            ],
+        };
+        vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+        const originalError = new Error();
+        const result = classifyGoogleError(originalError);
+        expect(result).toBe(originalError);
+    });
+});
+//# sourceMappingURL=googleQuotaErrors.test.js.map

package/dist/src/utils/googleQuotaErrors.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"googleQuotaErrors.test.js","sourceRoot":"","sources":["../../../src/utils/googleQuotaErrors.test.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/quotaErrorDetection.d.ts

@@ -14,5 +14,3 @@ export interface ApiError {
 }
 export declare function isApiError(error: unknown): error is ApiError;
 export declare function isStructuredError(error: unknown): error is StructuredError;
-export declare function isProQuotaExceededError(error: unknown): boolean;
-export declare function isGenericQuotaExceededError(error: unknown): boolean;

package/dist/src/utils/quotaErrorDetection.js

@@ -16,50 +16,4 @@ export function isStructuredError(error) {
         'message' in error &&
         typeof error.message === 'string');
 }
-export function isProQuotaExceededError(error) {
-    // Check for Pro quota exceeded errors by looking for the specific pattern
-    // This will match patterns like:
-    // - "Quota exceeded for quota metric 'Gemini 2.5 Pro Requests'"
-    // - "Quota exceeded for quota metric 'Gemini 2.5-preview Pro Requests'"
-    // We use string methods instead of regex to avoid ReDoS vulnerabilities
-    const checkMessage = (message) => message.includes("Quota exceeded for quota metric 'Gemini") &&
-        message.includes("Pro Requests'");
-    if (typeof error === 'string') {
-        return checkMessage(error);
-    }
-    if (isStructuredError(error)) {
-        return checkMessage(error.message);
-    }
-    if (isApiError(error)) {
-        return checkMessage(error.error.message);
-    }
-    // Check if it's a Gaxios error with response data
-    if (error && typeof error === 'object' && 'response' in error) {
-        const gaxiosError = error;
-        if (gaxiosError.response && gaxiosError.response.data) {
-            if (typeof gaxiosError.response.data === 'string') {
-                return checkMessage(gaxiosError.response.data);
-            }
-            if (typeof gaxiosError.response.data === 'object' &&
-                gaxiosError.response.data !== null &&
-                'error' in gaxiosError.response.data) {
-                const errorData = gaxiosError.response.data;
-                return checkMessage(errorData.error?.message || '');
-            }
-        }
-    }
-    return false;
-}
-export function isGenericQuotaExceededError(error) {
-    if (typeof error === 'string') {
-        return error.includes('Quota exceeded for quota metric');
-    }
-    if (isStructuredError(error)) {
-        return error.message.includes('Quota exceeded for quota metric');
-    }
-    if (isApiError(error)) {
-        return error.error.message.includes('Quota exceeded for quota metric');
-    }
-    return false;
-}
 //# sourceMappingURL=quotaErrorDetection.js.map

package/dist/src/utils/quotaErrorDetection.js.map

@@ -1 +1 @@
-{"version":3,"file":"quotaErrorDetection.js","sourceRoot":"","sources":["../../../src/utils/quotaErrorDetection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,OAAO,IAAI,KAAK;QAChB,OAAQ,KAAkB,CAAC,KAAK,KAAK,QAAQ;QAC7C,SAAS,IAAK,KAAkB,CAAC,KAAK,CACvC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,OAAQ,KAAyB,CAAC,OAAO,KAAK,QAAQ,CACvD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,0EAA0E;IAC1E,iCAAiC;IACjC,gEAAgE;IAChE,wEAAwE;IACxE,wEAAwE;IAExE,MAAM,YAAY,GAAG,CAAC,OAAe,EAAW,EAAE,CAChD,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC;QAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,kDAAkD;IAClD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;QAC9D,MAAM,WAAW,GAAG,KAInB,CAAC;QACF,IAAI,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACtD,IAAI,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAClD,OAAO,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACjD,CAAC;YACD,IACE,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ;gBAC7C,WAAW,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI;gBAClC,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,EACpC,CAAC;gBACD,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,IAEtC,CAAC;gBACF,OAAO,YAAY,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,KAAc;IACxD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"quotaErrorDetection.js","sourceRoot":"","sources":["../../../src/utils/quotaErrorDetection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,OAAO,IAAI,KAAK;QAChB,OAAQ,KAAkB,CAAC,KAAK,KAAK,QAAQ;QAC7C,SAAS,IAAK,KAAkB,CAAC,KAAK,CACvC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,OAAQ,KAAyB,CAAC,OAAO,KAAK,QAAQ,CACvD,CAAC;AACJ,CAAC"}

package/dist/src/utils/retry.js

@@ -5,12 +5,12 @@
  */
 import { ApiError } from '@google/genai';
 import { AuthType } from '../core/contentGenerator.js';
-import { isProQuotaExceededError, isGenericQuotaExceededError, } from './quotaErrorDetection.js';
+import { classifyGoogleError, RetryableQuotaError, TerminalQuotaError, } from './googleQuotaErrors.js';
 import { delay, createAbortError } from './delay.js';
 import { debugLogger } from './debugLogger.js';
 const FETCH_FAILED_MESSAGE = 'exception TypeError: fetch failed sending request';
 const DEFAULT_RETRY_OPTIONS = {
-    maxAttempts: 5,
+    maxAttempts: 3,
     initialDelayMs: 5000,
     maxDelayMs: 30000, // 30 seconds
     shouldRetryOnError: defaultShouldRetry,
@@ -65,7 +65,6 @@ export async function retryWithBackoff(fn, options) {
     };
     let attempt = 0;
     let currentDelay = initialDelayMs;
-    let consecutive429Count = 0;
     while (attempt < maxAttempts) {
         if (signal?.aborted) {
             throw createAbortError();
@@ -87,115 +86,58 @@ export async function retryWithBackoff(fn, options) {
             if (error instanceof Error && error.name === 'AbortError') {
                 throw error;
             }
-            const errorStatus = getErrorStatus(error);
-            // Check for Pro quota exceeded error first - immediate fallback for OAuth users
-            if (errorStatus === 429 &&
-                authType === AuthType.LOGIN_WITH_GOOGLE &&
-                isProQuotaExceededError(error) &&
-                onPersistent429) {
-                try {
-                    const fallbackModel = await onPersistent429(authType, error);
-                    if (fallbackModel !== false && fallbackModel !== null) {
-                        // Reset attempt counter and try with new model
-                        attempt = 0;
-                        consecutive429Count = 0;
-                        currentDelay = initialDelayMs;
-                        // With the model updated, we continue to the next attempt
-                        continue;
-                    }
-                    else {
-                        // Fallback handler returned null/false, meaning don't continue - stop retry process
-                        throw error;
-                    }
-                }
-                catch (fallbackError) {
-                    // If fallback fails, continue with original error
-                    debugLogger.warn('Fallback to Flash model failed:', fallbackError);
-                }
-            }
-            // Check for generic quota exceeded error (but not Pro, which was handled above) - immediate fallback for OAuth users
-            if (errorStatus === 429 &&
-                authType === AuthType.LOGIN_WITH_GOOGLE &&
-                !isProQuotaExceededError(error) &&
-                isGenericQuotaExceededError(error) &&
-                onPersistent429) {
-                try {
-                    const fallbackModel = await onPersistent429(authType, error);
-                    if (fallbackModel !== false && fallbackModel !== null) {
-                        // Reset attempt counter and try with new model
-                        attempt = 0;
-                        consecutive429Count = 0;
-                        currentDelay = initialDelayMs;
-                        // With the model updated, we continue to the next attempt
-                        continue;
+            const classifiedError = classifyGoogleError(error);
+            if (classifiedError instanceof TerminalQuotaError) {
+                if (onPersistent429 && authType === AuthType.LOGIN_WITH_GOOGLE) {
+                    try {
+                        const fallbackModel = await onPersistent429(authType, classifiedError);
+                        if (fallbackModel) {
+                            attempt = 0; // Reset attempts and retry with the new model.
+                            currentDelay = initialDelayMs;
+                            continue;
+                        }
                     }
-                    else {
-                        // Fallback handler returned null/false, meaning don't continue - stop retry process
-                        throw error;
+                    catch (fallbackError) {
+                        debugLogger.warn('Fallback to Flash model failed:', fallbackError);
                     }
                 }
-                catch (fallbackError) {
-                    // If fallback fails, continue with original error
-                    debugLogger.warn('Fallback to Flash model failed:', fallbackError);
-                }
-            }
-            // Track consecutive 429 errors
-            if (errorStatus === 429) {
-                consecutive429Count++;
+                throw classifiedError; // Throw if no fallback or fallback failed.
             }
-            else {
-                consecutive429Count = 0;
-            }
-            // If we have persistent 429s and a fallback callback for OAuth
-            if (consecutive429Count >= 2 &&
-                onPersistent429 &&
-                authType === AuthType.LOGIN_WITH_GOOGLE) {
-                try {
-                    const fallbackModel = await onPersistent429(authType, error);
-                    if (fallbackModel !== false && fallbackModel !== null) {
-                        // Reset attempt counter and try with new model
-                        attempt = 0;
-                        consecutive429Count = 0;
-                        currentDelay = initialDelayMs;
-                        // With the model updated, we continue to the next attempt
-                        continue;
-                    }
-                    else {
-                        // Fallback handler returned null/false, meaning don't continue - stop retry process
-                        throw error;
+            if (classifiedError instanceof RetryableQuotaError) {
+                if (attempt >= maxAttempts) {
+                    if (onPersistent429 && authType === AuthType.LOGIN_WITH_GOOGLE) {
+                        try {
+                            const fallbackModel = await onPersistent429(authType, classifiedError);
+                            if (fallbackModel) {
+                                attempt = 0; // Reset attempts and retry with the new model.
+                                currentDelay = initialDelayMs;
+                                continue;
+                            }
+                        }
+                        catch (fallbackError) {
+                            console.warn('Model fallback failed:', fallbackError);
+                        }
                     }
+                    throw classifiedError;
                 }
-                catch (fallbackError) {
-                    // If fallback fails, continue with original error
-                    debugLogger.warn('Fallback to Flash model failed:', fallbackError);
-                }
+                console.warn(`Attempt ${attempt} failed: ${classifiedError.message}. Retrying after ${classifiedError.retryDelayMs}ms...`);
+                await delay(classifiedError.retryDelayMs, signal);
+                continue;
             }
-            // Check if we've exhausted retries or shouldn't retry
+            // Generic retry logic for other errors
             if (attempt >= maxAttempts ||
                 !shouldRetryOnError(error, retryFetchErrors)) {
                 throw error;
             }
-            const { delayDurationMs, errorStatus: delayErrorStatus } = getDelayDurationAndStatus(error);
-            if (delayDurationMs > 0) {
-                // Respect Retry-After header if present and parsed
-                debugLogger.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? 'unknown'}. Retrying after explicit delay of ${delayDurationMs}ms...`, error);
-                await delay(delayDurationMs, signal);
-                // Reset currentDelay for next potential non-429 error, or if Retry-After is not present next time
-                currentDelay = initialDelayMs;
-            }
-            else {
-                // Fall back to exponential backoff with jitter
-                logRetryAttempt(attempt, error, errorStatus);
-                // Add jitter: +/- 30% of currentDelay
-                const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
-                const delayWithJitter = Math.max(0, currentDelay + jitter);
-                await delay(delayWithJitter, signal);
-                currentDelay = Math.min(maxDelayMs, currentDelay * 2);
-            }
+            const errorStatus = getErrorStatus(error);
+            logRetryAttempt(attempt, error, errorStatus);
+            // Exponential backoff with jitter for non-quota errors
+            const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
+            const delayWithJitter = Math.max(0, currentDelay + jitter);
+            await delay(delayWithJitter, signal);
+            currentDelay = Math.min(maxDelayMs, currentDelay * 2);
         }
     }
-    // This line should theoretically be unreachable due to the throw in the catch block.
-    // Added for type safety and to satisfy the compiler that a promise is always returned.
     throw new Error('Retry attempts exhausted');
 }
 /**
@@ -220,52 +162,6 @@ export function getErrorStatus(error) {
     }
     return undefined;
 }
-/**
- * Extracts the Retry-After delay from an error object's headers.
- * @param error The error object.
- * @returns The delay in milliseconds, or 0 if not found or invalid.
- */
-function getRetryAfterDelayMs(error) {
-    if (typeof error === 'object' && error !== null) {
-        // Check for error.response.headers (common in axios errors)
-        if ('response' in error &&
-            typeof error.response === 'object' &&
-            error.response !== null) {
-            const response = error.response;
-            if ('headers' in response &&
-                typeof response.headers === 'object' &&
-                response.headers !== null) {
-                const headers = response.headers;
-                const retryAfterHeader = headers['retry-after'];
-                if (typeof retryAfterHeader === 'string') {
-                    const retryAfterSeconds = parseInt(retryAfterHeader, 10);
-                    if (!isNaN(retryAfterSeconds)) {
-                        return retryAfterSeconds * 1000;
-                    }
-                    // It might be an HTTP date
-                    const retryAfterDate = new Date(retryAfterHeader);
-                    if (!isNaN(retryAfterDate.getTime())) {
-                        return Math.max(0, retryAfterDate.getTime() - Date.now());
-                    }
-                }
-            }
-        }
-    }
-    return 0;
-}
-/**
- * Determines the delay duration based on the error, prioritizing Retry-After header.
- * @param error The error object.
- * @returns An object containing the delay duration in milliseconds and the error status.
- */
-function getDelayDurationAndStatus(error) {
-    const errorStatus = getErrorStatus(error);
-    let delayDurationMs = 0;
-    if (errorStatus === 429) {
-        delayDurationMs = getRetryAfterDelayMs(error);
-    }
-    return { delayDurationMs, errorStatus };
-}
 /**
  * Logs a message for a retry attempt when using exponential backoff.
  * @param attempt The current attempt number.