@google/gemini-cli 0.54.0-preview.0 → 0.54.0

package/bundle/{interactiveCli-353YNM5T.js → interactiveCli-CXCZMXKQ.js}

@@ -157,10 +157,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-PMUWVEQP.js";
+} from "./chunk-2MRUXBJ5.js";
 import {
   require_source
-} from "./chunk-ZJJUEIJO.js";
+} from "./chunk-G7VQ6O6G.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -214,24 +214,24 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-4GNXWN36.js";
+} from "./chunk-GOQJOV4P.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-HYGO4QEK.js";
+} from "./chunk-5SMD2SLQ.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-CZ6IKC6W.js";
+} from "./chunk-MZBH35ZS.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-X7LEASVK.js";
+} from "./chunk-IM5WJKYT.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -275,12 +275,14 @@ import {
   LegacyAgentProtocol,
   LlmRole,
   Logger,
+  MAX_TOKENS_EXCEEDED_SUGGESTION,
   MCPDiscoveryState,
   MCPServerStatus,
   MessageBusType,
   MessageSenderType,
   ModelNotFoundError,
   ModelSlashCommandEvent,
+  OTHER_BLOCKED_MESSAGE,
   OverageMenuShownEvent,
   OverageOptionSelectedEvent,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
@@ -293,8 +295,10 @@ import {
   QuestionType,
   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,
   SessionEndReason,
@@ -303,9 +307,11 @@ import {
   SlashCommandStatus,
   Storage,
   SubagentState,
+  THINKING_ONLY_COMPRESS_SUGGESTION,
   TOPIC_PARAM_STRATEGIC_INTENT,
   TOPIC_PARAM_SUMMARY,
   TOPIC_PARAM_TITLE,
+  TRUE_EMPTY_RESPONSE_MESSAGE,
   TerminalQuotaError,
   ToolConfirmationOutcome,
   ToolErrorType,
@@ -431,7 +437,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-UOZMJZMA.js";
+} from "./chunk-F6IU45OZ.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-TUDYL3X4.js";
@@ -8050,6 +8056,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;
   }
@@ -27765,6 +27783,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)) {
@@ -28020,7 +28084,9 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
             loopDetectedRef.current = true;
             break;
           case GeminiEventType.Retry:
+            break;
           case GeminiEventType.InvalidStream:
+            handleInvalidStreamEvent(event.value, userMessageTimestamp);
             break;
           default: {
             const unreachable = event;
@@ -28052,6 +28118,7 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       handleChatModelEvent,
       handleAgentExecutionStoppedEvent,
       handleAgentExecutionBlockedEvent,
+      handleInvalidStreamEvent,
       addItem,
       pendingHistoryItemRef,
       setPendingHistoryItem,
@@ -28294,6 +28361,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
       );
@@ -28431,7 +28520,8 @@ var useGeminiStream = (geminiClient, history, addItem, config, settings, onDebug
       isLowErrorVerbosity,
       maybeAddSuppressedToolErrorNote,
       maybeAddLowVerbosityFailureNote,
-      setIsResponding
+      setIsResponding,
+      toolCalls
     ]
   );
   const pendingHistoryItems = (0, import_react99.useMemo)(
@@ -33797,7 +33887,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-I4VSDXDZ.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-YWNTGRUE.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,

package/bundle/{interactiveCli-D26FIBDY.js → interactiveCli-P7QQLIDS.js}

@@ -157,10 +157,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-S2XDE4E6.js";
+} from "./chunk-RHINAWEP.js";
 import {
   require_source
-} from "./chunk-KU7W3PYO.js";
+} from "./chunk-BBNFLOXC.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -214,24 +214,24 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-QZ32DOIY.js";
+} from "./chunk-VIQEWLM4.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-KFW7GOXJ.js";
+} from "./chunk-UTXCUPDT.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-ANCJ47GY.js";
+} from "./chunk-SQWRALPF.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-XTGYOEM3.js";
+} from "./chunk-43HYOV6F.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-YOK6TS2W.js";
+} from "./chunk-HS7THREL.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-HT4GPBRA.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-FUTPYP6V.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,

package/bundle/{interactiveCli-OZI3EOZ3.js → interactiveCli-RU7LCVXL.js}

@@ -157,10 +157,10 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-I2F6JPKA.js";
+} from "./chunk-LH73BY77.js";
 import {
   require_source
-} from "./chunk-K7T2IFNS.js";
+} from "./chunk-MOGTJC2T.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -214,24 +214,24 @@ import {
   stripAnsi,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-JKXIXUUH.js";
+} from "./chunk-JPCDQXHB.js";
 import {
   handleAutoUpdate,
   isDevelopment,
   relaunchApp,
   setUpdateHandler
-} from "./chunk-CPVZILP2.js";
+} from "./chunk-NZ6P6XKP.js";
 import {
   isTodoList,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-5X6WKNCA.js";
+} from "./chunk-TZAOURRV.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-GMYSSSFG.js";
+} from "./chunk-SHZORH3T.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-HM6J5QFA.js";
+} from "./chunk-YYWWE5GW.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-YWDOWAQ7.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-NZQZUVCI.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,

package/bundle/{liteRtServerManager-CHOKKKD7.js → liteRtServerManager-FIVLVXQJ.js}

@@ -3,11 +3,11 @@ import {
   DEFAULT_PORT,
   getBinaryPath,
   isServerRunning
-} from "./chunk-QZ32DOIY.js";
-import "./chunk-ANCJ47GY.js";
+} from "./chunk-VIQEWLM4.js";
+import "./chunk-SQWRALPF.js";
 import {
   debugLogger
-} from "./chunk-YOK6TS2W.js";
+} from "./chunk-HS7THREL.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-IUUIT4SU.js";
 import "./chunk-TUDYL3X4.js";
@@ -41,7 +41,7 @@ var LiteRtServerManager = class {
       `[LiteRtServerManager] Auto-starting LiteRT server on port ${port}...`
     );
     try {
-      const { startServer } = await import("./start-GSFOK3MC.js");
+      const { startServer } = await import("./start-YWT3TSZW.js");
       const started = await startServer(binaryPath, port);
       if (started) {
         debugLogger.log(`[LiteRtServerManager] Server started on port ${port}`);