@google/gemini-cli-a2a-server 0.11.0 → 0.11.2

package/dist/a2a-server.mjs

@@ -288503,8 +288503,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "c9c2e79d";
-var CLI_VERSION = "0.11.0";
+var GIT_COMMIT_INFO = "f36dec6a";
+var CLI_VERSION = "0.11.2";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -290849,43 +290849,6 @@ function isApiError(error) {
 function isStructuredError(error) {
   return typeof error === "object" && error !== null && "message" in error && typeof error.message === "string";
 }
-function isProQuotaExceededError(error) {
-  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);
-  }
-  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;
-}
-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;
-}
 
 // packages/core/dist/src/core/loggingContentGenerator.js
 var LoggingContentGenerator = class {
@@ -291007,7 +290970,7 @@ function createContentGeneratorConfig(config2, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, gcConfig, sessionId2) {
-  const version3 = "0.11.0";
+  const version3 = "0.11.2";
   const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -324663,6 +324626,226 @@ async function reportError(error, baseMessage, context2, type = "general", repor
   }
 }
 
+// packages/core/dist/src/utils/googleErrors.js
+function parseGoogleApiError(error) {
+  if (!error) {
+    return null;
+  }
+  let errorObj = error;
+  if (typeof errorObj === "string") {
+    try {
+      errorObj = JSON.parse(errorObj);
+    } catch (_) {
+      return null;
+    }
+  }
+  if (Array.isArray(errorObj) && errorObj.length > 0) {
+    errorObj = errorObj[0];
+  }
+  if (typeof errorObj !== "object" || errorObj === null) {
+    return null;
+  }
+  let currentError = fromGaxiosError(errorObj) ?? fromApiError(errorObj);
+  let depth = 0;
+  const maxDepth = 10;
+  while (currentError && typeof currentError.message === "string" && depth < maxDepth) {
+    try {
+      const parsedMessage = JSON.parse(currentError.message.replace(/\u00A0/g, "").replace(/\n/g, " "));
+      if (parsedMessage.error) {
+        currentError = parsedMessage.error;
+        depth++;
+      } else {
+        break;
+      }
+    } catch (_error) {
+      break;
+    }
+  }
+  if (!currentError) {
+    return null;
+  }
+  const code2 = currentError.code;
+  const message = currentError.message;
+  const errorDetails = currentError.details;
+  if (Array.isArray(errorDetails) && code2 && message) {
+    const details = [];
+    for (const detail of errorDetails) {
+      if (detail && typeof detail === "object") {
+        const detailObj = detail;
+        const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
+        if (typeKey) {
+          if (typeKey !== "@type") {
+            detailObj["@type"] = detailObj[typeKey];
+            delete detailObj[typeKey];
+          }
+          details.push(detailObj);
+        }
+      }
+    }
+    if (details.length > 0) {
+      return {
+        code: code2,
+        message,
+        details
+      };
+    }
+  }
+  return null;
+}
+function fromGaxiosError(errorObj) {
+  const gaxiosError = errorObj;
+  let outerError;
+  if (gaxiosError.response?.data) {
+    let data = gaxiosError.response.data;
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (_) {
+      }
+    }
+    if (Array.isArray(data) && data.length > 0) {
+      data = data[0];
+    }
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
+        outerError = data.error;
+      }
+    }
+  }
+  if (!outerError) {
+    if (gaxiosError.error) {
+      outerError = gaxiosError.error;
+    } else {
+      return void 0;
+    }
+  }
+  return outerError;
+}
+function fromApiError(errorObj) {
+  const apiError = errorObj;
+  let outerError;
+  if (apiError.message) {
+    let data = apiError.message;
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (_) {
+      }
+    }
+    if (Array.isArray(data) && data.length > 0) {
+      data = data[0];
+    }
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
+        outerError = data.error;
+      }
+    }
+  }
+  return outerError;
+}
+
+// packages/core/dist/src/utils/googleQuotaErrors.js
+var TerminalQuotaError = class extends Error {
+  cause;
+  constructor(message, cause) {
+    super(message);
+    this.cause = cause;
+    this.name = "TerminalQuotaError";
+  }
+};
+var RetryableQuotaError = class extends Error {
+  cause;
+  retryDelayMs;
+  constructor(message, cause, retryDelaySeconds) {
+    super(message);
+    this.cause = cause;
+    this.name = "RetryableQuotaError";
+    this.retryDelayMs = retryDelaySeconds * 1e3;
+  }
+};
+function parseDurationInSeconds(duration) {
+  if (!duration.endsWith("s")) {
+    return null;
+  }
+  const seconds = parseFloat(duration.slice(0, -1));
+  return isNaN(seconds) ? null : seconds;
+}
+function classifyGoogleError(error) {
+  const googleApiError = parseGoogleApiError(error);
+  if (!googleApiError || googleApiError.code !== 429) {
+    return error;
+  }
+  const quotaFailure = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure");
+  const errorInfo = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.ErrorInfo");
+  const retryInfo = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo");
+  if (quotaFailure) {
+    for (const violation of quotaFailure.violations) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerDay") || quotaId.includes("Daily")) {
+        return new TerminalQuotaError(`${googleApiError.message}
+Expected quota reset within 24h.`, googleApiError);
+      }
+    }
+  }
+  if (errorInfo) {
+    if (errorInfo.domain) {
+      const validDomains = [
+        "cloudcode-pa.googleapis.com",
+        "staging-cloudcode-pa.googleapis.com",
+        "autopush-cloudcode-pa.googleapis.com"
+      ];
+      if (validDomains.includes(errorInfo.domain)) {
+        if (errorInfo.reason === "RATE_LIMIT_EXCEEDED") {
+          let delaySeconds = 10;
+          if (retryInfo?.retryDelay) {
+            const parsedDelay = parseDurationInSeconds(retryInfo.retryDelay);
+            if (parsedDelay) {
+              delaySeconds = parsedDelay;
+            }
+          }
+          return new RetryableQuotaError(`${googleApiError.message}`, googleApiError, delaySeconds);
+        }
+        if (errorInfo.reason === "QUOTA_EXHAUSTED") {
+          return new TerminalQuotaError(`${googleApiError.message}`, googleApiError);
+        }
+      }
+    }
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerDay") || quotaLimit.includes("Daily")) {
+      return new TerminalQuotaError(`${googleApiError.message}
+Expected quota reset within 24h.`, googleApiError);
+    }
+  }
+  if (retryInfo?.retryDelay) {
+    const delaySeconds = parseDurationInSeconds(retryInfo.retryDelay);
+    if (delaySeconds) {
+      if (delaySeconds > 120) {
+        return new TerminalQuotaError(`${googleApiError.message}
+Suggested retry after ${retryInfo.retryDelay}.`, googleApiError);
+      }
+      return new RetryableQuotaError(`${googleApiError.message}
+Suggested retry after ${retryInfo.retryDelay}.`, googleApiError, delaySeconds);
+    }
+  }
+  if (quotaFailure) {
+    for (const violation of quotaFailure.violations) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerMinute")) {
+        return new RetryableQuotaError(`${googleApiError.message}
+Suggested retry after 60s.`, googleApiError, 60);
+      }
+    }
+  }
+  if (errorInfo) {
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerMinute")) {
+      return new RetryableQuotaError(`${errorInfo.reason}
+Suggested retry after 60s.`, googleApiError, 60);
+    }
+  }
+  return error;
+}
+
 // packages/core/dist/src/utils/delay.js
 function createAbortError() {
   const abortError = new Error("Aborted");
@@ -324693,7 +324876,7 @@ function delay2(ms, signal) {
 // packages/core/dist/src/utils/retry.js
 var FETCH_FAILED_MESSAGE = "exception TypeError: fetch failed sending request";
 var DEFAULT_RETRY_OPTIONS = {
-  maxAttempts: 5,
+  maxAttempts: 3,
   initialDelayMs: 5e3,
   maxDelayMs: 3e4,
   // 30 seconds
@@ -324728,7 +324911,6 @@ async function retryWithBackoff(fn, options2) {
   };
   let attempt = 0;
   let currentDelay = initialDelayMs;
-  let consecutive429Count = 0;
   while (attempt < maxAttempts) {
     if (signal?.aborted) {
       throw createAbortError();
@@ -324748,72 +324930,51 @@ async function retryWithBackoff(fn, options2) {
       if (error instanceof Error && error.name === "AbortError") {
         throw error;
       }
-      const errorStatus = getErrorStatus(error);
-      if (errorStatus === 429 && authType === AuthType2.LOGIN_WITH_GOOGLE && isProQuotaExceededError(error) && onPersistent429) {
-        try {
-          const fallbackModel = await onPersistent429(authType, error);
-          if (fallbackModel !== false && fallbackModel !== null) {
-            attempt = 0;
-            consecutive429Count = 0;
-            currentDelay = initialDelayMs;
-            continue;
-          } else {
-            throw error;
-          }
-        } catch (fallbackError) {
-          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
-        }
-      }
-      if (errorStatus === 429 && authType === AuthType2.LOGIN_WITH_GOOGLE && !isProQuotaExceededError(error) && isGenericQuotaExceededError(error) && onPersistent429) {
-        try {
-          const fallbackModel = await onPersistent429(authType, error);
-          if (fallbackModel !== false && fallbackModel !== null) {
-            attempt = 0;
-            consecutive429Count = 0;
-            currentDelay = initialDelayMs;
-            continue;
-          } else {
-            throw error;
+      const classifiedError = classifyGoogleError(error);
+      if (classifiedError instanceof TerminalQuotaError) {
+        if (onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
+          try {
+            const fallbackModel = await onPersistent429(authType, classifiedError);
+            if (fallbackModel) {
+              attempt = 0;
+              currentDelay = initialDelayMs;
+              continue;
+            }
+          } catch (fallbackError) {
+            debugLogger.warn("Fallback to Flash model failed:", fallbackError);
           }
-        } catch (fallbackError) {
-          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
         }
+        throw classifiedError;
       }
-      if (errorStatus === 429) {
-        consecutive429Count++;
-      } else {
-        consecutive429Count = 0;
-      }
-      if (consecutive429Count >= 2 && onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
-        try {
-          const fallbackModel = await onPersistent429(authType, error);
-          if (fallbackModel !== false && fallbackModel !== null) {
-            attempt = 0;
-            consecutive429Count = 0;
-            currentDelay = initialDelayMs;
-            continue;
-          } else {
-            throw error;
+      if (classifiedError instanceof RetryableQuotaError) {
+        if (attempt >= maxAttempts) {
+          if (onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
+            try {
+              const fallbackModel = await onPersistent429(authType, classifiedError);
+              if (fallbackModel) {
+                attempt = 0;
+                currentDelay = initialDelayMs;
+                continue;
+              }
+            } catch (fallbackError) {
+              console.warn("Model fallback failed:", fallbackError);
+            }
           }
-        } catch (fallbackError) {
-          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
+          throw classifiedError;
         }
+        console.warn(`Attempt ${attempt} failed: ${classifiedError.message}. Retrying after ${classifiedError.retryDelayMs}ms...`);
+        await delay2(classifiedError.retryDelayMs, signal);
+        continue;
       }
       if (attempt >= maxAttempts || !shouldRetryOnError(error, retryFetchErrors)) {
         throw error;
       }
-      const { delayDurationMs, errorStatus: delayErrorStatus } = getDelayDurationAndStatus(error);
-      if (delayDurationMs > 0) {
-        debugLogger.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? "unknown"}. Retrying after explicit delay of ${delayDurationMs}ms...`, error);
-        await delay2(delayDurationMs, signal);
-        currentDelay = initialDelayMs;
-      } else {
-        logRetryAttempt(attempt, error, errorStatus);
-        const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
-        const delayWithJitter = Math.max(0, currentDelay + jitter);
-        await delay2(delayWithJitter, signal);
-        currentDelay = Math.min(maxDelayMs, currentDelay * 2);
-      }
+      const errorStatus = getErrorStatus(error);
+      logRetryAttempt(attempt, error, errorStatus);
+      const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
+      const delayWithJitter = Math.max(0, currentDelay + jitter);
+      await delay2(delayWithJitter, signal);
+      currentDelay = Math.min(maxDelayMs, currentDelay * 2);
     }
   }
   throw new Error("Retry attempts exhausted");
@@ -324832,36 +324993,6 @@ function getErrorStatus(error) {
   }
   return void 0;
 }
-function getRetryAfterDelayMs(error) {
-  if (typeof error === "object" && error !== null) {
-    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 * 1e3;
-          }
-          const retryAfterDate = new Date(retryAfterHeader);
-          if (!isNaN(retryAfterDate.getTime())) {
-            return Math.max(0, retryAfterDate.getTime() - Date.now());
-          }
-        }
-      }
-    }
-  }
-  return 0;
-}
-function getDelayDurationAndStatus(error) {
-  const errorStatus = getErrorStatus(error);
-  let delayDurationMs = 0;
-  if (errorStatus === 429) {
-    delayDurationMs = getRetryAfterDelayMs(error);
-  }
-  return { delayDurationMs, errorStatus };
-}
 function logRetryAttempt(attempt, error, errorStatus) {
   let message = `Attempt ${attempt} failed. Retrying with backoff...`;
   if (errorStatus) {
@@ -348650,9 +348781,7 @@ var Config = class {
     this.useWriteTodos = params.useWriteTodos ?? false;
     this.initialUseModelRouter = params.useModelRouter ?? false;
     this.useModelRouter = this.initialUseModelRouter;
-    this.disableModelRouterForAuth = params.disableModelRouterForAuth ?? [
-      AuthType2.LOGIN_WITH_GOOGLE
-    ];
+    this.disableModelRouterForAuth = params.disableModelRouterForAuth ?? [];
     this.enableMessageBusIntegration = params.enableMessageBusIntegration ?? false;
     this.codebaseInvestigatorSettings = {
       enabled: params.codebaseInvestigatorSettings?.enabled ?? false,
@@ -351837,34 +351966,12 @@ var hasFileExtension = (0, import_picomatch.default)("**/*[*.]*");
 var import_fdir = __toESM(require_dist10(), 1);
 
 // packages/core/dist/src/utils/errorParsing.js
-var getRateLimitErrorMessageGoogleFree = (fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-Possible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session.`;
-var getRateLimitErrorMessageGoogleProQuotaFree = (currentModel = DEFAULT_GEMINI_MODEL, fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-You have reached your daily ${currentModel} quota limit. You will be switched to the ${fallbackModel} model for the rest of this session. To increase your limits, upgrade to get higher limits at https://goo.gle/set-up-gemini-code-assist, or use /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-var getRateLimitErrorMessageGoogleGenericQuotaFree = () => `
-You have reached your daily quota limit. To increase your limits, upgrade to get higher limits at https://goo.gle/set-up-gemini-code-assist, or use /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-var getRateLimitErrorMessageGooglePaid = (fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-Possible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session. We appreciate you for choosing Gemini Code Assist and the Gemini CLI.`;
-var getRateLimitErrorMessageGoogleProQuotaPaid = (currentModel = DEFAULT_GEMINI_MODEL, fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-You have reached your daily ${currentModel} quota limit. You will be switched to the ${fallbackModel} model for the rest of this session. We appreciate you for choosing Gemini Code Assist and the Gemini CLI. To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-var getRateLimitErrorMessageGoogleGenericQuotaPaid = (currentModel = DEFAULT_GEMINI_MODEL) => `
-You have reached your daily quota limit. We appreciate you for choosing Gemini Code Assist and the Gemini CLI. To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
 var RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI = "\nPlease wait and try again later. To increase your limits, request a quota increase through AI Studio, or switch to another /auth method";
 var RATE_LIMIT_ERROR_MESSAGE_VERTEX = "\nPlease wait and try again later. To increase your limits, request a quota increase through Vertex, or switch to another /auth method";
 var getRateLimitErrorMessageDefault = (fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
 Possible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session.`;
-function getRateLimitMessage(authType, error, userTier, currentModel, fallbackModel) {
+function getRateLimitMessage(authType, fallbackModel) {
   switch (authType) {
-    case AuthType2.LOGIN_WITH_GOOGLE: {
-      const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
-      if (isProQuotaExceededError(error)) {
-        return isPaidTier ? getRateLimitErrorMessageGoogleProQuotaPaid(currentModel || DEFAULT_GEMINI_MODEL, fallbackModel) : getRateLimitErrorMessageGoogleProQuotaFree(currentModel || DEFAULT_GEMINI_MODEL, fallbackModel);
-      } else if (isGenericQuotaExceededError(error)) {
-        return isPaidTier ? getRateLimitErrorMessageGoogleGenericQuotaPaid(currentModel || DEFAULT_GEMINI_MODEL) : getRateLimitErrorMessageGoogleGenericQuotaFree();
-      } else {
-        return isPaidTier ? getRateLimitErrorMessageGooglePaid(fallbackModel) : getRateLimitErrorMessageGoogleFree(fallbackModel);
-      }
-    }
     case AuthType2.USE_GEMINI:
       return RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI;
     case AuthType2.USE_VERTEX_AI:
@@ -351877,7 +351984,7 @@ function parseAndFormatApiError(error, authType, userTier, currentModel, fallbac
   if (isStructuredError(error)) {
     let text = `[API Error: ${error.message}]`;
     if (error.status === 429) {
-      text += getRateLimitMessage(authType, error, userTier, currentModel, fallbackModel);
+      text += getRateLimitMessage(authType, fallbackModel);
     }
     return text;
   }
@@ -351900,7 +352007,7 @@ function parseAndFormatApiError(error, authType, userTier, currentModel, fallbac
         }
         let text = `[API Error: ${finalMessage} (Status: ${parsedError.error.status})]`;
         if (parsedError.error.code === 429) {
-          text += getRateLimitMessage(authType, parsedError, userTier, currentModel, fallbackModel);
+          text += getRateLimitMessage(authType, fallbackModel);
         }
         return text;
       }