@google/gemini-cli 0.53.0-preview.0 → 0.53.1

package/bundle/{interactiveCli-FS3OVPXQ.js → interactiveCli-PIOEDBQZ.js}

@@ -157,10 +157,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-QSTUV3QH.js";
+} from "./chunk-YF4RJFUM.js";
 import {
   require_source
-} from "./chunk-4OVORMGE.js";
+} from "./chunk-4SJPXUBO.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -214,24 +214,24 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-IODN6H35.js";
+} from "./chunk-KUOIDGSH.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-XH7QC2TB.js";
+} from "./chunk-TIUOC6Z4.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-BDSSP5BZ.js";
+} from "./chunk-LPTVZ4FJ.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-PKFZO3SN.js";
+} from "./chunk-3QXIQPRB.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -268,8 +268,10 @@ import {
   LegacyAgentProtocol,
   LlmRole,
   Logger,
+  MAX_TOKENS_EXCEEDED_SUGGESTION,
   ModelNotFoundError,
   ModelSlashCommandEvent,
+  OTHER_BLOCKED_MESSAGE,
   OverageMenuShownEvent,
   OverageOptionSelectedEvent,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
@@ -281,16 +283,20 @@ import {
   ProjectIdRequiredError,
   READ_FILE_DISPLAY_NAME,
   READ_MANY_FILES_DISPLAY_NAME,
+  RECITATION_BLOCKED_MESSAGE,
   RELEASE_CHANNEL_STABILITY,
   ROOT_SCHEDULER_ID,
+  SAFETY_BLOCKED_MESSAGE,
   SHELL_TOOL_NAME,
   Scheduler,
   ShellExecutionService,
   SlashCommandStatus,
   Storage,
+  THINKING_ONLY_COMPRESS_SUGGESTION,
   TOPIC_PARAM_STRATEGIC_INTENT,
   TOPIC_PARAM_SUMMARY,
   TOPIC_PARAM_TITLE,
+  TRUE_EMPTY_RESPONSE_MESSAGE,
   TerminalQuotaError,
   TranscriptionFactory,
   UPDATE_TOPIC_DISPLAY_NAME,
@@ -412,7 +418,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-27C6XFMY.js";
+} from "./chunk-5Y7N3RFB.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-TUDYL3X4.js";
@@ -8031,6 +8037,18 @@ function areModelMetricsEqual(a, b) {
   if (a.api.totalRequests !== b.api.totalRequests || a.api.totalErrors !== b.api.totalErrors || a.api.totalLatencyMs !== b.api.totalLatencyMs) {
     return false;
   }
+  const errorsA = a.api.errorsByType || {};
+  const errorsB = b.api.errorsByType || {};
+  const keysA = Object.keys(errorsA);
+  const keysB = Object.keys(errorsB);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  for (const key of keysA) {
+    if (errorsA[key] !== errorsB[key]) {
+      return false;
+    }
+  }
   if (a.tokens.input !== b.tokens.input || a.tokens.prompt !== b.tokens.prompt || a.tokens.candidates !== b.tokens.candidates || a.tokens.total !== b.tokens.total || a.tokens.cached !== b.tokens.cached || a.tokens.thoughts !== b.tokens.thoughts || a.tokens.tool !== b.tokens.tool) {
     return false;
   }
@@ -27746,6 +27764,52 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       maybeAddLowVerbosityFailureNote
     ]
   );
+  const handleInvalidStreamEvent = (0, import_react99.useCallback)(
+    (eventValue, userMessageTimestamp) => {
+      if (pendingHistoryItemRef.current) {
+        addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+        setPendingHistoryItem(null);
+      }
+      maybeAddSuppressedToolErrorNote(userMessageTimestamp);
+      let text = eventValue?.message?.trim() || "Invalid stream received from model";
+      if (eventValue?.type === "NO_RESPONSE_TEXT") {
+        text = TRUE_EMPTY_RESPONSE_MESSAGE;
+      } else if (eventValue?.type === "THINKING_ONLY_RESPONSE") {
+        text = THINKING_ONLY_COMPRESS_SUGGESTION;
+      } else if (eventValue?.type === "MAX_TOKENS_EXCEEDED") {
+        text = MAX_TOKENS_EXCEEDED_SUGGESTION;
+      } else if (eventValue?.type === "SAFETY_BLOCKED") {
+        text = SAFETY_BLOCKED_MESSAGE;
+      } else if (eventValue?.type === "RECITATION_BLOCKED") {
+        text = RECITATION_BLOCKED_MESSAGE;
+      } else if (eventValue?.type === "OTHER_BLOCKED") {
+        text = OTHER_BLOCKED_MESSAGE;
+      }
+      uiTelemetryService.recordSemanticValidationError(
+        geminiClient.getCurrentSequenceModel() ?? config.getModel(),
+        eventValue?.type || "INVALID_STREAM"
+      );
+      addItem(
+        {
+          type: "error" /* ERROR */,
+          text
+        },
+        userMessageTimestamp
+      );
+      maybeAddLowVerbosityFailureNote(userMessageTimestamp);
+      setThought(null);
+    },
+    [
+      addItem,
+      pendingHistoryItemRef,
+      setPendingHistoryItem,
+      setThought,
+      maybeAddSuppressedToolErrorNote,
+      maybeAddLowVerbosityFailureNote,
+      config,
+      geminiClient
+    ]
+  );
   const handleCitationEvent = (0, import_react99.useCallback)(
     (text, userMessageTimestamp) => {
       if (!showCitations(settings)) {
@@ -28001,7 +28065,9 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
             loopDetectedRef.current = true;
             break;
           case "retry" /* Retry */:
+            break;
           case "invalid_stream" /* InvalidStream */:
+            handleInvalidStreamEvent(event.value, userMessageTimestamp);
             break;
           default: {
             const unreachable = event;
@@ -28033,6 +28099,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       handleChatModelEvent,
       handleAgentExecutionStoppedEvent,
       handleAgentExecutionBlockedEvent,
+      handleInvalidStreamEvent,
       addItem,
       pendingHistoryItemRef,
       setPendingHistoryItem,
@@ -28275,6 +28342,28 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
           return false;
         }
       );
+      if (turnCancelledRef.current) {
+        setIsResponding(false);
+        const geminiTools2 = completedAndReadyToSubmitTools.filter(
+          (t) => !t.request.isClientInitiated
+        );
+        if (geminiClient && geminiTools2.length > 0) {
+          const combinedParts = geminiTools2.flatMap(
+            (toolCall) => toolCall.response.responseParts
+          );
+          if (combinedParts.length > 0) {
+            geminiClient.addHistory({
+              role: "user",
+              parts: combinedParts
+            });
+          }
+        }
+        const callIdsToMarkAsSubmitted2 = toolCalls.map(
+          (toolCall) => toolCall.request.callId
+        );
+        markToolsAsSubmitted(callIdsToMarkAsSubmitted2);
+        return;
+      }
       const clientTools = completedAndReadyToSubmitTools.filter(
         (t) => t.request.isClientInitiated
       );
@@ -28412,7 +28501,8 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       isLowErrorVerbosity,
       maybeAddSuppressedToolErrorNote,
       maybeAddLowVerbosityFailureNote,
-      setIsResponding
+      setIsResponding,
+      toolCalls
     ]
   );
   const pendingHistoryItems = (0, import_react99.useMemo)(
@@ -33778,7 +33868,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-QYDPHHFN.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-ALVEJOWU.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,