@machina.ai/cell-cli-core 1.10.0-rc1 → 1.13.0-rc1

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

@@ -16,6 +16,7 @@ export interface RetryOptions {
     onPersistent429?: (authType?: string, error?: unknown) => Promise<string | boolean | null>;
     authType?: string;
     retryFetchErrors?: boolean;
+    signal?: AbortSignal;
 }
 /**
  * Retries a function with exponential backoff and jitter.

package/dist/src/utils/retry.js

@@ -5,10 +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,
@@ -40,14 +42,6 @@ function defaultShouldRetry(error, retryFetchErrors) {
     }
     return false;
 }
-/**
- * Delays execution for a specified number of milliseconds.
- * @param ms The number of milliseconds to delay.
- * @returns A promise that resolves after the delay.
- */
-function delay(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 /**
  * Retries a function with exponential backoff and jitter.
  * @param fn The asynchronous function to retry.
@@ -56,20 +50,25 @@ function delay(ms) {
  * @throws The last error encountered if all attempts fail.
  */
 export async function retryWithBackoff(fn, options) {
+    if (options?.signal?.aborted) {
+        throw createAbortError();
+    }
     if (options?.maxAttempts !== undefined && options.maxAttempts <= 0) {
         throw new Error('maxAttempts must be a positive number.');
     }
     const cleanOptions = options
         ? Object.fromEntries(Object.entries(options).filter(([_, v]) => v != null))
         : {};
-    const { maxAttempts, initialDelayMs, maxDelayMs, onPersistent429, authType, shouldRetryOnError, shouldRetryOnContent, retryFetchErrors, } = {
+    const { maxAttempts, initialDelayMs, maxDelayMs, onPersistent429, authType, shouldRetryOnError, shouldRetryOnContent, retryFetchErrors, signal, } = {
         ...DEFAULT_RETRY_OPTIONS,
         ...cleanOptions,
     };
     let attempt = 0;
     let currentDelay = initialDelayMs;
-    let consecutive429Count = 0;
     while (attempt < maxAttempts) {
+        if (signal?.aborted) {
+            throw createAbortError();
+        }
         attempt++;
         try {
             const result = await fn();
@@ -77,122 +76,68 @@ export async function retryWithBackoff(fn, options) {
                 shouldRetryOnContent(result)) {
                 const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
                 const delayWithJitter = Math.max(0, currentDelay + jitter);
-                await delay(delayWithJitter);
+                await delay(delayWithJitter, signal);
                 currentDelay = Math.min(maxDelayMs, currentDelay * 2);
                 continue;
             }
             return result;
         }
         catch (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
-                    console.warn('Fallback to Flash model failed:', fallbackError);
-                }
+            if (error instanceof Error && error.name === 'AbortError') {
+                throw error;
             }
-            // 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
-                    console.warn('Fallback to Flash model failed:', fallbackError);
-                }
-            }
-            // Track consecutive 429 errors
-            if (errorStatus === 429) {
-                consecutive429Count++;
-            }
-            else {
-                consecutive429Count = 0;
+                throw classifiedError; // Throw if no fallback or fallback failed.
             }
-            // 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;
+            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);
+                        }
                     }
-                    else {
-                        // Fallback handler returned null/false, meaning don't continue - stop retry process
-                        throw error;
-                    }
-                }
-                catch (fallbackError) {
-                    // If fallback fails, continue with original error
-                    console.warn('Fallback to Flash model failed:', fallbackError);
+                    throw classifiedError;
                 }
+                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
-                console.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? 'unknown'}. Retrying after explicit delay of ${delayDurationMs}ms...`, error);
-                await delay(delayDurationMs);
-                // 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);
-                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');
 }
 /**
@@ -217,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.
@@ -275,7 +174,7 @@ function logRetryAttempt(attempt, error, errorStatus) {
         message = `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`;
     }
     if (errorStatus === 429) {
-        console.warn(message, error);
+        debugLogger.warn(message, error);
     }
     else if (errorStatus && errorStatus >= 500 && errorStatus < 600) {
         console.error(message, error);
@@ -283,17 +182,17 @@ function logRetryAttempt(attempt, error, errorStatus) {
     else if (error instanceof Error) {
         // Fallback for errors that might not have a status but have a message
         if (error.message.includes('429')) {
-            console.warn(`Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`, error);
+            debugLogger.warn(`Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`, error);
         }
         else if (error.message.match(/5\d{2}/)) {
             console.error(`Attempt ${attempt} failed with 5xx error. Retrying with backoff...`, error);
         }
         else {
-            console.warn(message, error); // Default to warn for other errors
+            debugLogger.warn(message, error); // Default to warn for other errors
         }
     }
     else {
-        console.warn(message, error); // Default to warn if error type is unknown
+        debugLogger.warn(message, error); // Default to warn if error type is unknown
     }
 }
 //# sourceMappingURL=retry.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/utils/retry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,0BAA0B,CAAC;AAElC,MAAM,oBAAoB,GACxB,mDAAmD,CAAC;AAoBtD,MAAM,qBAAqB,GAAiB;IAC1C,WAAW,EAAE,CAAC;IACd,cAAc,EAAE,IAAI;IACpB,UAAU,EAAE,KAAK,EAAE,aAAa;IAChC,kBAAkB,EAAE,kBAAkB;CACvC,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,kBAAkB,CACzB,KAAsB,EACtB,gBAA0B;IAE1B,IACE,gBAAgB;QAChB,KAAK,YAAY,KAAK;QACtB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAC5C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8BAA8B;IAC9B,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;QAC9B,4CAA4C;QAC5C,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,KAAK,CAAC;QACvC,OAAO,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IAC7E,CAAC;IAED,6DAA6D;IAC7D,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAoB,EACpB,OAA+B;IAE/B,IAAI,OAAO,EAAE,WAAW,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,YAAY,GAAG,OAAO;QAC1B,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;QAC3E,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,EACJ,WAAW,EACX,cAAc,EACd,UAAU,EACV,eAAe,EACf,QAAQ,EACR,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,GACjB,GAAG;QACF,GAAG,qBAAqB;QACxB,GAAG,YAAY;KAChB,CAAC;IAEF,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,YAAY,GAAG,cAAc,CAAC;IAClC,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAE5B,OAAO,OAAO,GAAG,WAAW,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;QACV,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAC;YAE1B,IACE,oBAAoB;gBACpB,oBAAoB,CAAC,MAAiC,CAAC,EACvD,CAAC;gBACD,MAAM,MAAM,GAAG,YAAY,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC,CAAC;gBAC3D,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC7B,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;gBACtD,SAAS;YACX,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAE1C,gFAAgF;YAChF,IACE,WAAW,KAAK,GAAG;gBACnB,QAAQ,KAAK,QAAQ,CAAC,iBAAiB;gBACvC,uBAAuB,CAAC,KAAK,CAAC;gBAC9B,eAAe,EACf,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBAC7D,IAAI,aAAa,KAAK,KAAK,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;wBACtD,+CAA+C;wBAC/C,OAAO,GAAG,CAAC,CAAC;wBACZ,mBAAmB,GAAG,CAAC,CAAC;wBACxB,YAAY,GAAG,cAAc,CAAC;wBAC9B,0DAA0D;wBAC1D,SAAS;oBACX,CAAC;yBAAM,CAAC;wBACN,oFAAoF;wBACpF,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;gBAAC,OAAO,aAAa,EAAE,CAAC;oBACvB,kDAAkD;oBAClD,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,aAAa,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,qHAAqH;YACrH,IACE,WAAW,KAAK,GAAG;gBACnB,QAAQ,KAAK,QAAQ,CAAC,iBAAiB;gBACvC,CAAC,uBAAuB,CAAC,KAAK,CAAC;gBAC/B,2BAA2B,CAAC,KAAK,CAAC;gBAClC,eAAe,EACf,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBAC7D,IAAI,aAAa,KAAK,KAAK,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;wBACtD,+CAA+C;wBAC/C,OAAO,GAAG,CAAC,CAAC;wBACZ,mBAAmB,GAAG,CAAC,CAAC;wBACxB,YAAY,GAAG,cAAc,CAAC;wBAC9B,0DAA0D;wBAC1D,SAAS;oBACX,CAAC;yBAAM,CAAC;wBACN,oFAAoF;wBACpF,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;gBAAC,OAAO,aAAa,EAAE,CAAC;oBACvB,kDAAkD;oBAClD,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,aAAa,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,+BAA+B;YAC/B,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;gBACxB,mBAAmB,EAAE,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,mBAAmB,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,+DAA+D;YAC/D,IACE,mBAAmB,IAAI,CAAC;gBACxB,eAAe;gBACf,QAAQ,KAAK,QAAQ,CAAC,iBAAiB,EACvC,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBAC7D,IAAI,aAAa,KAAK,KAAK,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;wBACtD,+CAA+C;wBAC/C,OAAO,GAAG,CAAC,CAAC;wBACZ,mBAAmB,GAAG,CAAC,CAAC;wBACxB,YAAY,GAAG,cAAc,CAAC;wBAC9B,0DAA0D;wBAC1D,SAAS;oBACX,CAAC;yBAAM,CAAC;wBACN,oFAAoF;wBACpF,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;gBAAC,OAAO,aAAa,EAAE,CAAC;oBACvB,kDAAkD;oBAClD,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,aAAa,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,sDAAsD;YACtD,IACE,OAAO,IAAI,WAAW;gBACtB,CAAC,kBAAkB,CAAC,KAAc,EAAE,gBAAgB,CAAC,EACrD,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,GACtD,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAEnC,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;gBACxB,mDAAmD;gBACnD,OAAO,CAAC,IAAI,CACV,WAAW,OAAO,uBAAuB,gBAAgB,IAAI,SAAS,sCAAsC,eAAe,OAAO,EAClI,KAAK,CACN,CAAC;gBACF,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC7B,kGAAkG;gBAClG,YAAY,GAAG,cAAc,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,+CAA+C;gBAC/C,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;gBAC7C,sCAAsC;gBACtC,MAAM,MAAM,GAAG,YAAY,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC,CAAC;gBAC3D,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC7B,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;IACH,CAAC;IACD,qFAAqF;IACrF,uFAAuF;IACvF,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,IAAI,QAAQ,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;QACD,2DAA2D;QAC3D,IACE,UAAU,IAAI,KAAK;YACnB,OAAQ,KAAgC,CAAC,QAAQ,KAAK,QAAQ;YAC7D,KAAgC,CAAC,QAAQ,KAAK,IAAI,EACnD,CAAC;YACD,MAAM,QAAQ,GACZ,KACD,CAAC,QAAQ,CAAC;YACX,IAAI,QAAQ,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAChE,OAAO,QAAQ,CAAC,MAAM,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,4DAA4D;QAC5D,IACE,UAAU,IAAI,KAAK;YACnB,OAAQ,KAAgC,CAAC,QAAQ,KAAK,QAAQ;YAC7D,KAAgC,CAAC,QAAQ,KAAK,IAAI,EACnD,CAAC;YACD,MAAM,QAAQ,GAAI,KAA6C,CAAC,QAAQ,CAAC;YACzE,IACE,SAAS,IAAI,QAAQ;gBACrB,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;gBACpC,QAAQ,CAAC,OAAO,KAAK,IAAI,EACzB,CAAC;gBACD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAsC,CAAC;gBAChE,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;gBAChD,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;oBACzC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;oBACzD,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;wBAC9B,OAAO,iBAAiB,GAAG,IAAI,CAAC;oBAClC,CAAC;oBACD,2BAA2B;oBAC3B,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC;oBAClD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;wBACrC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;GAIG;AACH,SAAS,yBAAyB,CAAC,KAAc;IAI/C,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;QACxB,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CACtB,OAAe,EACf,KAAc,EACd,WAAoB;IAEpB,IAAI,OAAO,GAAG,WAAW,OAAO,mCAAmC,CAAC;IACpE,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,GAAG,WAAW,OAAO,uBAAuB,WAAW,4BAA4B,CAAC;IAC7F,CAAC;IAED,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;SAAM,IAAI,WAAW,IAAI,WAAW,IAAI,GAAG,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC;QAClE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAClC,sEAAsE;QACtE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CACV,WAAW,OAAO,0EAA0E,EAC5F,KAAK,CACN,CAAC;QACJ,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,KAAK,CACX,WAAW,OAAO,kDAAkD,EACpE,KAAK,CACN,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,mCAAmC;QACnE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,2CAA2C;IAC3E,CAAC;AACH,CAAC"}
+{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/utils/retry.ts"],"names":[],"mappings":"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"}

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

@@ -6,8 +6,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { ApiError } from '@google/genai';
+import { AuthType } from '../core/contentGenerator.js';
 import { retryWithBackoff } from './retry.js';
 import { setSimulate429 } from './testUtils.js';
+import { debugLogger } from './debugLogger.js';
+import { TerminalQuotaError, RetryableQuotaError, } from './googleQuotaErrors.js';
 // Helper to create a mock function that fails a certain number of times
 const createFailingFunction = (failures, successValue = 'success') => {
     let attempts = 0;
@@ -35,7 +38,7 @@ describe('retryWithBackoff', () => {
         // Disable 429 simulation for tests
         setSimulate429(false);
         // Suppress unhandled promise rejection warnings for tests that expect errors
-        console.warn = vi.fn();
+        debugLogger.warn = vi.fn();
     });
     afterEach(() => {
         vi.restoreAllMocks();
@@ -79,21 +82,21 @@ describe('retryWithBackoff', () => {
         const promise = retryWithBackoff(mockFn);
         // Expect it to fail with the error from the 5th attempt.
         await Promise.all([
-            expect(promise).rejects.toThrow('Simulated error attempt 5'),
+            expect(promise).rejects.toThrow('Simulated error attempt 3'),
             vi.runAllTimersAsync(),
         ]);
-        expect(mockFn).toHaveBeenCalledTimes(5);
+        expect(mockFn).toHaveBeenCalledTimes(3);
     });
-    it('should default to 5 maxAttempts if options.maxAttempts is undefined', async () => {
-        // This function will fail more than 5 times to ensure all retries are used.
+    it('should default to 3 maxAttempts if options.maxAttempts is undefined', async () => {
+        // This function will fail more than 3 times to ensure all retries are used.
         const mockFn = createFailingFunction(10);
         const promise = retryWithBackoff(mockFn, { maxAttempts: undefined });
         // Expect it to fail with the error from the 5th attempt.
         await Promise.all([
-            expect(promise).rejects.toThrow('Simulated error attempt 5'),
+            expect(promise).rejects.toThrow('Simulated error attempt 3'),
             vi.runAllTimersAsync(),
         ]);
-        expect(mockFn).toHaveBeenCalledTimes(5);
+        expect(mockFn).toHaveBeenCalledTimes(3);
     });
     it('should not retry if shouldRetry returns false', async () => {
         const mockFn = vi.fn(async () => {
@@ -259,140 +262,76 @@ describe('retryWithBackoff', () => {
         });
     });
     describe('Flash model fallback for OAuth users', () => {
-        it('should trigger fallback for OAuth personal users after persistent 429 errors', async () => {
+        it('should trigger fallback for OAuth personal users on TerminalQuotaError', async () => {
             const fallbackCallback = vi.fn().mockResolvedValue('gemini-2.5-flash');
             let fallbackOccurred = false;
             const mockFn = vi.fn().mockImplementation(async () => {
                 if (!fallbackOccurred) {
-                    const error = new Error('Rate limit exceeded');
-                    error.status = 429;
-                    throw error;
+                    throw new TerminalQuotaError('Daily limit reached', {});
                 }
                 return 'success';
             });
             const promise = retryWithBackoff(mockFn, {
                 maxAttempts: 3,
                 initialDelayMs: 100,
-                onPersistent429: async (authType) => {
+                onPersistent429: async (authType, error) => {
                     fallbackOccurred = true;
-                    return await fallbackCallback(authType);
+                    return await fallbackCallback(authType, error);
                 },
                 authType: 'oauth-personal',
             });
-            // Advance all timers to complete retries
             await vi.runAllTimersAsync();
-            // Should succeed after fallback
             await expect(promise).resolves.toBe('success');
-            // Verify callback was called with correct auth type
-            expect(fallbackCallback).toHaveBeenCalledWith('oauth-personal');
-            // Should retry again after fallback
-            expect(mockFn).toHaveBeenCalledTimes(3); // 2 initial attempts + 1 after fallback
+            expect(fallbackCallback).toHaveBeenCalledWith('oauth-personal', expect.any(TerminalQuotaError));
+            expect(mockFn).toHaveBeenCalledTimes(2);
         });
-        it('should NOT trigger fallback for API key users', async () => {
-            const fallbackCallback = vi.fn();
-            const mockFn = vi.fn(async () => {
-                const error = new Error('Rate limit exceeded');
-                error.status = 429;
-                throw error;
+        it('should use retryDelayMs from RetryableQuotaError', async () => {
+            const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+            const mockFn = vi.fn().mockImplementation(async () => {
+                throw new RetryableQuotaError('Per-minute limit', {}, 12.345);
             });
             const promise = retryWithBackoff(mockFn, {
-                maxAttempts: 3,
+                maxAttempts: 2,
                 initialDelayMs: 100,
-                onPersistent429: fallbackCallback,
-                authType: 'gemini-api-key',
             });
-            // Handle the promise properly to avoid unhandled rejections
-            const resultPromise = promise.catch((error) => error);
+            // Attach the rejection expectation *before* running timers
+            // eslint-disable-next-line vitest/valid-expect
+            const assertionPromise = expect(promise).rejects.toThrow();
             await vi.runAllTimersAsync();
-            const result = await resultPromise;
-            // Should fail after all retries without fallback
-            expect(result).toBeInstanceOf(Error);
-            expect(result.message).toBe('Rate limit exceeded');
-            // Callback should not be called for API key users
-            expect(fallbackCallback).not.toHaveBeenCalled();
+            await assertionPromise;
+            expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 12345);
         });
-        it('should reset attempt counter and continue after successful fallback', async () => {
-            let fallbackCalled = false;
-            const fallbackCallback = vi.fn().mockImplementation(async () => {
-                fallbackCalled = true;
-                return 'gemini-2.5-flash';
-            });
+        it.each([[AuthType.USE_GEMINI], [AuthType.USE_VERTEX_AI], [undefined]])('should not trigger fallback for non-Google auth users (authType: %s) on TerminalQuotaError', async (authType) => {
+            const fallbackCallback = vi.fn();
             const mockFn = vi.fn().mockImplementation(async () => {
-                if (!fallbackCalled) {
-                    const error = new Error('Rate limit exceeded');
-                    error.status = 429;
-                    throw error;
-                }
-                return 'success';
+                throw new TerminalQuotaError('Daily limit reached', {});
             });
             const promise = retryWithBackoff(mockFn, {
                 maxAttempts: 3,
-                initialDelayMs: 100,
                 onPersistent429: fallbackCallback,
-                authType: 'oauth-personal',
+                authType,
             });
-            await vi.runAllTimersAsync();
-            await expect(promise).resolves.toBe('success');
-            expect(fallbackCallback).toHaveBeenCalledOnce();
+            await expect(promise).rejects.toThrow('Daily limit reached');
+            expect(fallbackCallback).not.toHaveBeenCalled();
+            expect(mockFn).toHaveBeenCalledTimes(1);
         });
-        it('should continue with original error if fallback is rejected', async () => {
-            const fallbackCallback = vi.fn().mockResolvedValue(null); // User rejected fallback
-            const mockFn = vi.fn(async () => {
-                const error = new Error('Rate limit exceeded');
-                error.status = 429;
-                throw error;
-            });
-            const promise = retryWithBackoff(mockFn, {
-                maxAttempts: 3,
-                initialDelayMs: 100,
-                onPersistent429: fallbackCallback,
-                authType: 'oauth-personal',
-            });
-            // Handle the promise properly to avoid unhandled rejections
-            const resultPromise = promise.catch((error) => error);
-            await vi.runAllTimersAsync();
-            const result = await resultPromise;
-            // Should fail with original error when fallback is rejected
-            expect(result).toBeInstanceOf(Error);
-            expect(result.message).toBe('Rate limit exceeded');
-            expect(fallbackCallback).toHaveBeenCalledWith('oauth-personal', expect.any(Error));
+    });
+    it('should abort the retry loop when the signal is aborted', async () => {
+        const abortController = new AbortController();
+        const mockFn = vi.fn().mockImplementation(async () => {
+            const error = new Error('Server error');
+            error.status = 500;
+            throw error;
         });
-        it('should handle mixed error types (only count consecutive 429s)', async () => {
-            const fallbackCallback = vi.fn().mockResolvedValue('gemini-2.5-flash');
-            let attempts = 0;
-            let fallbackOccurred = false;
-            const mockFn = vi.fn().mockImplementation(async () => {
-                attempts++;
-                if (fallbackOccurred) {
-                    return 'success';
-                }
-                if (attempts === 1) {
-                    // First attempt: 500 error (resets consecutive count)
-                    const error = new Error('Server error');
-                    error.status = 500;
-                    throw error;
-                }
-                else {
-                    // Remaining attempts: 429 errors
-                    const error = new Error('Rate limit exceeded');
-                    error.status = 429;
-                    throw error;
-                }
-            });
-            const promise = retryWithBackoff(mockFn, {
-                maxAttempts: 5,
-                initialDelayMs: 100,
-                onPersistent429: async (authType) => {
-                    fallbackOccurred = true;
-                    return await fallbackCallback(authType);
-                },
-                authType: 'oauth-personal',
-            });
-            await vi.runAllTimersAsync();
-            await expect(promise).resolves.toBe('success');
-            // Should trigger fallback after 2 consecutive 429s (attempts 2-3)
-            expect(fallbackCallback).toHaveBeenCalledWith('oauth-personal');
+        const promise = retryWithBackoff(mockFn, {
+            maxAttempts: 5,
+            initialDelayMs: 100,
+            signal: abortController.signal,
         });
+        await vi.advanceTimersByTimeAsync(50);
+        abortController.abort();
+        await expect(promise).rejects.toThrow(expect.objectContaining({ name: 'AbortError' }));
+        expect(mockFn).toHaveBeenCalledTimes(1);
     });
 });
 //# sourceMappingURL=retry.test.js.map