@google/gemini-cli 0.55.0-preview.2 → 0.55.1

package/bundle/{interactiveCli-KX3U7SFD.js → interactiveCli-4CVVH6KY.js}

@@ -157,10 +157,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-QPGTVRXP.js";
+} from "./chunk-5LKFYSMV.js";
 import {
   require_source
-} from "./chunk-57ZLFNIU.js";
+} from "./chunk-F6UH32RP.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -214,24 +214,24 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-O5GQF2L7.js";
+} from "./chunk-ODKPTNXF.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-2NTEXQZI.js";
+} from "./chunk-AICCA4O7.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-DBPSBJMI.js";
+} from "./chunk-MVFWCC7A.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-7IYUUE2H.js";
+} from "./chunk-MMGNXRKB.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -437,7 +437,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-MLTI5CK6.js";
+} from "./chunk-32XQ54AJ.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-TUDYL3X4.js";
@@ -15538,6 +15538,7 @@ function ProQuotaDialog({
   message,
   isTerminalQuotaError,
   isModelNotFoundError,
+  isCapacityExceeded,
   authType,
   tierName,
   onChoice
@@ -15556,6 +15557,24 @@ function ProQuotaDialog({
         key: "retry_later"
       }
     ];
+  } else if (isCapacityExceeded) {
+    items = [
+      {
+        label: "Keep trying",
+        value: "retry_once",
+        key: "retry_once"
+      },
+      {
+        label: `Switch to ${fallbackModel}`,
+        value: "retry_always",
+        key: "retry_always"
+      },
+      {
+        label: "Stop",
+        value: "retry_later",
+        key: "retry_later"
+      }
+    ];
   } else if (isModelNotFoundError || isTerminalQuotaError) {
     const isUltra = isUltraTier(tierName);
     items = [
@@ -17694,6 +17713,7 @@ var DialogManager = ({
         message: quotaState.proQuotaRequest.message,
         isTerminalQuotaError: quotaState.proQuotaRequest.isTerminalQuotaError,
         isModelNotFoundError: !!quotaState.proQuotaRequest.isModelNotFoundError,
+        isCapacityExceeded: !!quotaState.proQuotaRequest.isCapacityExceeded,
         authType: quotaState.proQuotaRequest.authType,
         tierName: config?.getUserTierName(),
         onChoice: uiActions.handleProQuotaChoice
@@ -25417,6 +25437,7 @@ async function openG1Url(path14, campaign) {
 }
 
 // packages/cli/src/ui/hooks/useQuotaAndFallback.ts
+var isObject = (val) => typeof val === "object" && val !== null;
 function useQuotaAndFallback({
   config,
   historyManager,
@@ -25439,6 +25460,16 @@ function useQuotaAndFallback({
       let message;
       let isTerminalQuotaError = false;
       let isModelNotFoundError = false;
+      const errorObj = isObject(error) ? error : null;
+      const errorReasonValue = errorObj?.["reason"];
+      const errorReason = typeof errorReasonValue === "string" ? errorReasonValue : void 0;
+      const errorMessageValue = errorObj?.["message"];
+      const errorMessage = typeof errorMessageValue === "string" ? errorMessageValue : void 0;
+      const isCapacityExceeded = errorReason === "MODEL_CAPACITY_EXHAUSTED" || errorReason === "MODEL_CAPACITY_EXCEEDED" || typeof errorMessage === "string" && /exhausted your capacity|capacity exceeded|MODEL_CAPACITY_EXHAUSTED/i.test(
+        errorMessage
+      ) || typeof error === "string" && /exhausted your capacity|capacity exceeded|MODEL_CAPACITY_EXHAUSTED/i.test(
+        error
+      );
       const usageLimitReachedModel = isProModel(failedModel) ? "all Pro models" : failedModel;
       if (error instanceof TerminalQuotaError) {
         isTerminalQuotaError = true;
@@ -25462,14 +25493,24 @@ function useQuotaAndFallback({
           });
           if (creditsResult) return creditsResult;
         }
-        const messageLines = [
-          `Usage limit reached for ${usageLimitReachedModel}.`,
-          error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
-          `/stats model for usage details`,
-          `/model to switch models.`,
-          contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE ? `/auth to switch to API key.` : null
-        ].filter(Boolean);
-        message = messageLines.join("\n");
+        if (isCapacityExceeded) {
+          const messageLines = [
+            `We are currently experiencing high demand for ${usageLimitReachedModel}.`,
+            "We apologize and appreciate your patience.",
+            error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
+            `/model to switch models.`
+          ].filter(Boolean);
+          message = messageLines.join("\n");
+        } else {
+          const messageLines = [
+            `Usage limit reached for ${usageLimitReachedModel}.`,
+            error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
+            `/stats model for usage details`,
+            `/model to switch models.`,
+            contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE ? `/auth to switch to API key.` : null
+          ].filter(Boolean);
+          message = messageLines.join("\n");
+        }
       } else if (error instanceof ModelNotFoundError) {
         isModelNotFoundError = true;
         if (contentGeneratorConfig?.authType === AuthType.USE_VERTEX_AI && VALID_GEMINI_MODELS.has(failedModel)) {
@@ -25502,7 +25543,7 @@ function useQuotaAndFallback({
         ];
         message = messageLines.join("\n");
       }
-      if (errorVerbosity === "low" && !isTerminalQuotaError && !isModelNotFoundError) {
+      if (errorVerbosity === "low" && (!isTerminalQuotaError || isCapacityExceeded) && !isModelNotFoundError) {
         return "retry_once";
       }
       setModelSwitchedFromQuotaError(true);
@@ -25520,6 +25561,7 @@ function useQuotaAndFallback({
             message,
             isTerminalQuotaError,
             isModelNotFoundError,
+            isCapacityExceeded,
             authType: contentGeneratorConfig?.authType
           });
         }
@@ -30675,12 +30717,12 @@ var streamRequest = (request, onUploadProgress, originalBody) => {
 };
 
 // node_modules/ky/distribution/utils/is.js
-var isObject = (value) => value !== null && typeof value === "object";
+var isObject2 = (value) => value !== null && typeof value === "object";
 
 // node_modules/ky/distribution/utils/merge.js
 var validateAndMerge = (...sources) => {
   for (const source of sources) {
-    if ((!isObject(source) || Array.isArray(source)) && source !== void 0) {
+    if ((!isObject2(source) || Array.isArray(source)) && source !== void 0) {
       throw new TypeError("The `options` argument must be an object");
     }
   }
@@ -30725,7 +30767,7 @@ var appendSearchParameters = (target, source) => {
         }
         result.append(String(pair[0]), String(pair[1]));
       }
-    } else if (isObject(input)) {
+    } else if (isObject2(input)) {
       for (const [key, value] of Object.entries(input)) {
         if (value !== void 0) {
           result.append(key, String(value));
@@ -30752,14 +30794,14 @@ var deepMerge = (...sources) => {
         returnValue = [];
       }
       returnValue = [...returnValue, ...source];
-    } else if (isObject(source)) {
+    } else if (isObject2(source)) {
       for (let [key, value] of Object.entries(source)) {
         if (key === "signal" && value instanceof globalThis.AbortSignal) {
           signals.push(value);
           continue;
         }
         if (key === "context") {
-          if (value !== void 0 && value !== null && (!isObject(value) || Array.isArray(value))) {
+          if (value !== void 0 && value !== null && (!isObject2(value) || Array.isArray(value))) {
             throw new TypeError("The `context` option must be an object");
           }
           returnValue = {
@@ -30776,16 +30818,16 @@ var deepMerge = (...sources) => {
           }
           continue;
         }
-        if (isObject(value) && key in returnValue) {
+        if (isObject2(value) && key in returnValue) {
           value = deepMerge(returnValue[key], value);
         }
         returnValue = { ...returnValue, [key]: value };
       }
-      if (isObject(source.hooks)) {
+      if (isObject2(source.hooks)) {
         hooks = mergeHooks(hooks, source.hooks);
         returnValue.hooks = hooks;
       }
-      if (isObject(source.headers)) {
+      if (isObject2(source.headers)) {
         headers = mergeHeaders(headers, source.headers);
         returnValue.headers = headers;
       }
@@ -33893,7 +33935,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-QXH36QMO.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-53U6T2D7.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,

package/bundle/{interactiveCli-O4YSZIKG.js → interactiveCli-OLXPGHKG.js}

@@ -157,10 +157,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-OC55SY62.js";
+} from "./chunk-IHBI4YWX.js";
 import {
   require_source
-} from "./chunk-3OPKUUXP.js";
+} from "./chunk-UE3CHSFT.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -214,24 +214,24 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-SEHUSFSL.js";
+} from "./chunk-DPETPWEN.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-DRN2VYCZ.js";
+} from "./chunk-UNIFGKZA.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-L6Q242KC.js";
+} from "./chunk-RV6ZZ7XX.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-CBX65YIB.js";
+} from "./chunk-MXXWTJ5T.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -437,7 +437,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-R3S5PP5S.js";
+} from "./chunk-ZYL2LM3Y.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-TUDYL3X4.js";
@@ -15538,6 +15538,7 @@ function ProQuotaDialog({
   message,
   isTerminalQuotaError,
   isModelNotFoundError,
+  isCapacityExceeded,
   authType,
   tierName,
   onChoice
@@ -15556,6 +15557,24 @@ function ProQuotaDialog({
         key: "retry_later"
       }
     ];
+  } else if (isCapacityExceeded) {
+    items = [
+      {
+        label: "Keep trying",
+        value: "retry_once",
+        key: "retry_once"
+      },
+      {
+        label: `Switch to ${fallbackModel}`,
+        value: "retry_always",
+        key: "retry_always"
+      },
+      {
+        label: "Stop",
+        value: "retry_later",
+        key: "retry_later"
+      }
+    ];
   } else if (isModelNotFoundError || isTerminalQuotaError) {
     const isUltra = isUltraTier(tierName);
     items = [
@@ -17694,6 +17713,7 @@ var DialogManager = ({
         message: quotaState.proQuotaRequest.message,
         isTerminalQuotaError: quotaState.proQuotaRequest.isTerminalQuotaError,
         isModelNotFoundError: !!quotaState.proQuotaRequest.isModelNotFoundError,
+        isCapacityExceeded: !!quotaState.proQuotaRequest.isCapacityExceeded,
         authType: quotaState.proQuotaRequest.authType,
         tierName: config?.getUserTierName(),
         onChoice: uiActions.handleProQuotaChoice
@@ -25417,6 +25437,7 @@ async function openG1Url(path14, campaign) {
 }
 
 // packages/cli/src/ui/hooks/useQuotaAndFallback.ts
+var isObject = (val) => typeof val === "object" && val !== null;
 function useQuotaAndFallback({
   config,
   historyManager,
@@ -25439,6 +25460,16 @@ function useQuotaAndFallback({
       let message;
       let isTerminalQuotaError = false;
       let isModelNotFoundError = false;
+      const errorObj = isObject(error) ? error : null;
+      const errorReasonValue = errorObj?.["reason"];
+      const errorReason = typeof errorReasonValue === "string" ? errorReasonValue : void 0;
+      const errorMessageValue = errorObj?.["message"];
+      const errorMessage = typeof errorMessageValue === "string" ? errorMessageValue : void 0;
+      const isCapacityExceeded = errorReason === "MODEL_CAPACITY_EXHAUSTED" || errorReason === "MODEL_CAPACITY_EXCEEDED" || typeof errorMessage === "string" && /exhausted your capacity|capacity exceeded|MODEL_CAPACITY_EXHAUSTED/i.test(
+        errorMessage
+      ) || typeof error === "string" && /exhausted your capacity|capacity exceeded|MODEL_CAPACITY_EXHAUSTED/i.test(
+        error
+      );
       const usageLimitReachedModel = isProModel(failedModel) ? "all Pro models" : failedModel;
       if (error instanceof TerminalQuotaError) {
         isTerminalQuotaError = true;
@@ -25462,14 +25493,24 @@ function useQuotaAndFallback({
           });
           if (creditsResult) return creditsResult;
         }
-        const messageLines = [
-          `Usage limit reached for ${usageLimitReachedModel}.`,
-          error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
-          `/stats model for usage details`,
-          `/model to switch models.`,
-          contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE ? `/auth to switch to API key.` : null
-        ].filter(Boolean);
-        message = messageLines.join("\n");
+        if (isCapacityExceeded) {
+          const messageLines = [
+            `We are currently experiencing high demand for ${usageLimitReachedModel}.`,
+            "We apologize and appreciate your patience.",
+            error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
+            `/model to switch models.`
+          ].filter(Boolean);
+          message = messageLines.join("\n");
+        } else {
+          const messageLines = [
+            `Usage limit reached for ${usageLimitReachedModel}.`,
+            error.retryDelayMs ? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.` : null,
+            `/stats model for usage details`,
+            `/model to switch models.`,
+            contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE ? `/auth to switch to API key.` : null
+          ].filter(Boolean);
+          message = messageLines.join("\n");
+        }
       } else if (error instanceof ModelNotFoundError) {
         isModelNotFoundError = true;
         if (contentGeneratorConfig?.authType === AuthType.USE_VERTEX_AI && VALID_GEMINI_MODELS.has(failedModel)) {
@@ -25502,7 +25543,7 @@ function useQuotaAndFallback({
         ];
         message = messageLines.join("\n");
       }
-      if (errorVerbosity === "low" && !isTerminalQuotaError && !isModelNotFoundError) {
+      if (errorVerbosity === "low" && (!isTerminalQuotaError || isCapacityExceeded) && !isModelNotFoundError) {
         return "retry_once";
       }
       setModelSwitchedFromQuotaError(true);
@@ -25520,6 +25561,7 @@ function useQuotaAndFallback({
             message,
             isTerminalQuotaError,
             isModelNotFoundError,
+            isCapacityExceeded,
             authType: contentGeneratorConfig?.authType
           });
         }
@@ -30675,12 +30717,12 @@ var streamRequest = (request, onUploadProgress, originalBody) => {
 };
 
 // node_modules/ky/distribution/utils/is.js
-var isObject = (value) => value !== null && typeof value === "object";
+var isObject2 = (value) => value !== null && typeof value === "object";
 
 // node_modules/ky/distribution/utils/merge.js
 var validateAndMerge = (...sources) => {
   for (const source of sources) {
-    if ((!isObject(source) || Array.isArray(source)) && source !== void 0) {
+    if ((!isObject2(source) || Array.isArray(source)) && source !== void 0) {
       throw new TypeError("The `options` argument must be an object");
     }
   }
@@ -30725,7 +30767,7 @@ var appendSearchParameters = (target, source) => {
         }
         result.append(String(pair[0]), String(pair[1]));
       }
-    } else if (isObject(input)) {
+    } else if (isObject2(input)) {
       for (const [key, value] of Object.entries(input)) {
         if (value !== void 0) {
           result.append(key, String(value));
@@ -30752,14 +30794,14 @@ var deepMerge = (...sources) => {
         returnValue = [];
       }
       returnValue = [...returnValue, ...source];
-    } else if (isObject(source)) {
+    } else if (isObject2(source)) {
       for (let [key, value] of Object.entries(source)) {
         if (key === "signal" && value instanceof globalThis.AbortSignal) {
           signals.push(value);
           continue;
         }
         if (key === "context") {
-          if (value !== void 0 && value !== null && (!isObject(value) || Array.isArray(value))) {
+          if (value !== void 0 && value !== null && (!isObject2(value) || Array.isArray(value))) {
             throw new TypeError("The `context` option must be an object");
           }
           returnValue = {
@@ -30776,16 +30818,16 @@ var deepMerge = (...sources) => {
           }
           continue;
         }
-        if (isObject(value) && key in returnValue) {
+        if (isObject2(value) && key in returnValue) {
           value = deepMerge(returnValue[key], value);
         }
         returnValue = { ...returnValue, [key]: value };
       }
-      if (isObject(source.hooks)) {
+      if (isObject2(source.hooks)) {
         hooks = mergeHooks(hooks, source.hooks);
         returnValue.hooks = hooks;
       }
-      if (isObject(source.headers)) {
+      if (isObject2(source.headers)) {
         headers = mergeHeaders(headers, source.headers);
         returnValue.headers = headers;
       }
@@ -33893,7 +33935,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-YBK5NQJR.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-VRMTKDJD.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,