clone/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-06-01 19:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): distinguish fallback chains and fix maxAttempts for auto vs explicit model selection (#26163)

Browse Source
This commit is contained in:
Adam Weidman
2026-04-29 16:23:37 -04:00
committed by GitHub
parent 99235fc59d
commit 3aedbbc067
15 changed files with 922 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/src/utils/retry.ts
View File

@@ -249,6 +249,9 @@ export async function retryWithBackoff<T>(
...cleanOptions,
};
const getCurrentMaxAttempts = () =>
getAvailabilityContext?.()?.policy.maxAttempts ?? maxAttempts;
let attempt = 0;
let currentDelay = initialDelayMs;
const throwIfAborted = () => {
@@ -257,7 +260,7 @@ export async function retryWithBackoff<T>(
}
};
while (attempt < maxAttempts) {
while (attempt < getCurrentMaxAttempts()) {
if (signal?.aborted) {
throw createAbortError();
}
@@ -344,7 +347,7 @@ export async function retryWithBackoff<T>(
errorCode !== undefined && errorCode >= 500 && errorCode < 600;
if (classifiedError instanceof RetryableQuotaError || is500) {
if (attempt >= maxAttempts) {
if (attempt >= getCurrentMaxAttempts()) {
const errorMessage =
classifiedError instanceof Error ? classifiedError.message : '';
debugLogger.warn(
@@ -405,7 +408,7 @@ export async function retryWithBackoff<T>(
// Generic retry logic for other errors
if (
attempt >= maxAttempts ||
attempt >= getCurrentMaxAttempts() ||
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
!shouldRetryOnError(error as Error, retryFetchErrors)
) {