@machina.ai/cell-cli 1.22.5-rc1 → 1.25.0-rc3

package/dist/src/ui/hooks/useFolderTrust.js

@@ -30,23 +30,16 @@ export const useFolderTrust = (settings, onTrustChange, addItem) => {
         }
     }, [folderTrust, onTrustChange, settings.merged, addItem]);
     const handleFolderTrustSelect = useCallback((choice) => {
-        const trustedFolders = loadTrustedFolders();
+        const trustLevelMap = {
+            [FolderTrustChoice.TRUST_FOLDER]: TrustLevel.TRUST_FOLDER,
+            [FolderTrustChoice.TRUST_PARENT]: TrustLevel.TRUST_PARENT,
+            [FolderTrustChoice.DO_NOT_TRUST]: TrustLevel.DO_NOT_TRUST,
+        };
+        const trustLevel = trustLevelMap[choice];
+        if (!trustLevel)
+            return;
         const cwd = process.cwd();
-        let trustLevel;
-        const wasTrusted = isTrusted ?? true;
-        switch (choice) {
-            case FolderTrustChoice.TRUST_FOLDER:
-                trustLevel = TrustLevel.TRUST_FOLDER;
-                break;
-            case FolderTrustChoice.TRUST_PARENT:
-                trustLevel = TrustLevel.TRUST_PARENT;
-                break;
-            case FolderTrustChoice.DO_NOT_TRUST:
-                trustLevel = TrustLevel.DO_NOT_TRUST;
-                break;
-            default:
-                return;
-        }
+        const trustedFolders = loadTrustedFolders();
         try {
             trustedFolders.setValue(cwd, trustLevel);
         }
@@ -60,10 +53,12 @@ export const useFolderTrust = (settings, onTrustChange, addItem) => {
         }
         const currentIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER ||
             trustLevel === TrustLevel.TRUST_PARENT;
-        setIsTrusted(currentIsTrusted);
         onTrustChange(currentIsTrusted);
-        const needsRestart = wasTrusted !== currentIsTrusted;
-        if (needsRestart) {
+        setIsTrusted(currentIsTrusted);
+        // logic: we restart if the trust state *effectively* changes from the previous state.
+        // previous state was `isTrusted`. If undefined, we assume false (untrusted).
+        const wasTrusted = isTrusted ?? false;
+        if (wasTrusted !== currentIsTrusted) {
             setIsRestarting(true);
             setIsFolderTrustDialogOpen(true);
         }

package/dist/src/ui/hooks/useFolderTrust.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/hooks/useFolderTrust.test.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { vi } from 'vitest';
+import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
 import { act } from 'react';
 import { renderHook } from '../../test-utils/render.js';
 import { waitFor } from '../../test-utils/async.js';
@@ -90,7 +90,7 @@ describe('useFolderTrust', () => {
         renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
         expect(addItem).not.toHaveBeenCalled();
     });
-    it('should handle TRUST_FOLDER choice', async () => {
+    it('should handle TRUST_FOLDER choice and trigger restart', async () => {
         isWorkspaceTrustedSpy.mockReturnValue({
             isTrusted: undefined,
             source: undefined,
@@ -106,40 +106,46 @@ describe('useFolderTrust', () => {
             expect(result.current.isTrusted).toBeUndefined();
         });
         await act(async () => {
-            await result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
+            result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
         });
         await waitFor(() => {
             expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.TRUST_FOLDER);
-            expect(result.current.isFolderTrustDialogOpen).toBe(false);
+            expect(result.current.isRestarting).toBe(true);
+            expect(result.current.isFolderTrustDialogOpen).toBe(true);
             expect(onTrustChange).toHaveBeenLastCalledWith(true);
         });
     });
-    it('should handle TRUST_PARENT choice', () => {
+    it('should handle TRUST_PARENT choice and trigger restart', async () => {
         isWorkspaceTrustedSpy.mockReturnValue({
             isTrusted: undefined,
             source: undefined,
         });
         const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
-        act(() => {
+        await act(async () => {
             result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_PARENT);
         });
-        expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.TRUST_PARENT);
-        expect(result.current.isFolderTrustDialogOpen).toBe(false);
-        expect(onTrustChange).toHaveBeenLastCalledWith(true);
+        await waitFor(() => {
+            expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.TRUST_PARENT);
+            expect(result.current.isRestarting).toBe(true);
+            expect(result.current.isFolderTrustDialogOpen).toBe(true);
+            expect(onTrustChange).toHaveBeenLastCalledWith(true);
+        });
     });
-    it('should handle DO_NOT_TRUST choice and trigger restart', () => {
+    it('should handle DO_NOT_TRUST choice and NOT trigger restart (implicit -> explicit)', async () => {
         isWorkspaceTrustedSpy.mockReturnValue({
             isTrusted: undefined,
             source: undefined,
         });
         const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
-        act(() => {
+        await act(async () => {
             result.current.handleFolderTrustSelect(FolderTrustChoice.DO_NOT_TRUST);
         });
-        expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.DO_NOT_TRUST);
-        expect(onTrustChange).toHaveBeenLastCalledWith(false);
-        expect(result.current.isRestarting).toBe(true);
-        expect(result.current.isFolderTrustDialogOpen).toBe(true);
+        await waitFor(() => {
+            expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.DO_NOT_TRUST);
+            expect(onTrustChange).toHaveBeenLastCalledWith(false);
+            expect(result.current.isRestarting).toBe(false);
+            expect(result.current.isFolderTrustDialogOpen).toBe(false);
+        });
     });
     it('should do nothing for default choice', async () => {
         isWorkspaceTrustedSpy.mockReturnValue({
@@ -147,7 +153,7 @@ describe('useFolderTrust', () => {
             source: undefined,
         });
         const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
-        act(() => {
+        await act(async () => {
             result.current.handleFolderTrustSelect('invalid_choice');
         });
         await waitFor(() => {
@@ -169,7 +175,7 @@ describe('useFolderTrust', () => {
         await waitFor(() => {
             expect(result.current.isTrusted).toBe(false);
         });
-        act(() => {
+        await act(async () => {
             result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
         });
         await waitFor(() => {
@@ -177,17 +183,19 @@ describe('useFolderTrust', () => {
             expect(result.current.isFolderTrustDialogOpen).toBe(true); // Dialog should stay open
         });
     });
-    it('should not set isRestarting to true when trust status does not change', () => {
+    it('should not set isRestarting to true when trust status does not change (true -> true)', async () => {
         isWorkspaceTrustedSpy.mockReturnValue({
-            isTrusted: undefined,
-            source: undefined,
+            isTrusted: true,
+            source: 'file',
         });
         const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
-        act(() => {
+        await act(async () => {
             result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
         });
-        expect(result.current.isRestarting).toBe(false);
-        expect(result.current.isFolderTrustDialogOpen).toBe(false); // Dialog should close
+        await waitFor(() => {
+            expect(result.current.isRestarting).toBe(false);
+            expect(result.current.isFolderTrustDialogOpen).toBe(false); // Dialog should close
+        });
     });
     it('should emit feedback on failure to set value', async () => {
         isWorkspaceTrustedSpy.mockReturnValue({

package/dist/src/ui/hooks/useFolderTrust.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFolderTrust.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useFolderTrust.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.test.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/hooks/useGeminiStream.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { Config, EditorType, GeminiClient, ThoughtSummary } from '@google/gemini-cli-core';
 import { ApprovalMode } from '@google/gemini-cli-core';
+import type { Config, EditorType, GeminiClient, ThoughtSummary, RetryAttemptPayload } from '@google/gemini-cli-core';
 import { type PartListUnion } from '@google/genai';
 import type { HistoryItem, HistoryItemWithoutId, SlashCommandProcessorResult } from '../types.js';
 import { StreamingState } from '../types.js';
@@ -33,4 +33,5 @@ export declare const useGeminiStream: (geminiClient: GeminiClient, history: Hist
         }) => void;
     } | null;
     lastOutputTime: number;
+    retryStatus: RetryAttemptPayload | null;
 };

package/dist/src/ui/hooks/useGeminiStream.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
-import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, ToolConfirmationOutcome, promptIdContext, tokenLimit, debugLogger, runInDevTraceSpan, EDIT_TOOL_NAMES, processRestorableToolCalls, } from '@google/gemini-cli-core';
+import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, ToolConfirmationOutcome, promptIdContext, tokenLimit, debugLogger, runInDevTraceSpan, EDIT_TOOL_NAMES, processRestorableToolCalls, recordToolCallInteractions, ToolErrorType, coreEvents, CoreEvent, } from '@google/gemini-cli-core';
 import { FinishReason } from '@google/genai';
 import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
 import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
@@ -38,12 +38,14 @@ function showCitations(settings) {
  */
 export const useGeminiStream = (geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, isShellFocused) => {
     const [initError, setInitError] = useState(null);
+    const [retryStatus, setRetryStatus] = useState(null);
     const abortControllerRef = useRef(null);
     const turnCancelledRef = useRef(false);
     const activeQueryIdRef = useRef(null);
     const [isResponding, setIsResponding] = useState(false);
     const [thought, setThought] = useState(null);
     const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
+    const [lastGeminiActivityTime, setLastGeminiActivityTime] = useState(0);
     const processedMemoryToolsRef = useRef(new Set());
     const { startNewPrompt, getPromptCount } = useSessionStats();
     const storage = config.storage;
@@ -54,11 +56,20 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         }
         return new GitService(config.getProjectRoot(), storage);
     }, [config, storage]);
+    useEffect(() => {
+        const handleRetryAttempt = (payload) => {
+            setRetryStatus(payload);
+        };
+        coreEvents.on(CoreEvent.RetryAttempt, handleRetryAttempt);
+        return () => {
+            coreEvents.off(CoreEvent.RetryAttempt, handleRetryAttempt);
+        };
+    }, []);
     const [toolCalls, scheduleToolCalls, markToolsAsSubmitted, setToolCallsForDisplay, cancelAllToolCalls, lastToolOutputTime,] = useReactToolScheduler(async (completedToolCallsFromScheduler) => {
         // This onComplete is called when ALL scheduled tools for a given batch are done.
         if (completedToolCallsFromScheduler.length > 0) {
             // Add the final state of these tools to the history for display.
-            addItem(mapTrackedToolCallsToDisplay(completedToolCallsFromScheduler), Date.now());
+            addItem(mapTrackedToolCallsToDisplay(completedToolCallsFromScheduler));
             // Clear the live-updating display now that the final state is in history.
             setToolCallsForDisplay([]);
             // Record tool calls with full metadata before sending responses.
@@ -69,6 +80,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                     .getGeminiClient()
                     .getChat()
                     .recordCompletedToolCalls(currentModel, completedToolCallsFromScheduler);
+                await recordToolCallInteractions(config, completedToolCallsFromScheduler);
             }
             catch (error) {
                 debugLogger.warn(`Error recording completed tool call information: ${error}`);
@@ -106,7 +118,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         if (turnCancelledRef.current &&
             prevActiveShellPtyIdRef.current !== null &&
             activeShellPtyId === null) {
-            addItem({ type: MessageType.INFO, text: 'Request cancelled.' }, Date.now());
+            addItem({ type: MessageType.INFO, text: 'Request cancelled.' });
             setIsResponding(false);
         }
         prevActiveShellPtyIdRef.current = activeShellPtyId;
@@ -138,6 +150,11 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             }
         }
     }, [streamingState, config, history]);
+    useEffect(() => {
+        if (!isResponding) {
+            setRetryStatus(null);
+        }
+    }, [isResponding]);
     const cancelOngoingRequest = useCallback(() => {
         if (streamingState !== StreamingState.Responding &&
             streamingState !== StreamingState.WaitingForConfirmation) {
@@ -176,10 +193,10 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                     }
                     return tool;
                 });
-                addItem({ ...toolGroup, tools: updatedTools }, Date.now());
+                addItem({ ...toolGroup, tools: updatedTools });
             }
             else {
-                addItem(pendingHistoryItemRef.current, Date.now());
+                addItem(pendingHistoryItemRef.current);
             }
         }
         setPendingHistoryItem(null);
@@ -193,7 +210,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 addItem({
                     type: MessageType.INFO,
                     text: 'Request cancelled.',
-                }, Date.now());
+                });
                 setIsResponding(false);
             }
         }
@@ -228,7 +245,6 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         let localQueryToSendToGemini = null;
         if (typeof query === 'string') {
             const trimmedQuery = query.trim();
-            onDebugMessage(`User query: '${trimmedQuery}'`);
             await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
             if (!shellModeActive) {
                 // Handle UI-only commands first
@@ -246,7 +262,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                                 isClientInitiated: true,
                                 prompt_id,
                             };
-                            scheduleToolCalls([toolCallRequest], abortSignal);
+                            await scheduleToolCalls([toolCallRequest], abortSignal);
                             return { queryToSend: null, shouldProceed: false };
                         }
                         case 'submit_prompt': {
@@ -314,6 +330,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
     ]);
     // --- Stream Event Handlers ---
     const handleContentEvent = useCallback((eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
+        setRetryStatus(null);
         if (turnCancelledRef.current) {
             // Prevents additional output after a user initiated cancel.
             return '';
@@ -445,13 +462,13 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 `A compressed context will be sent for future messages (compressed from: ` +
                 `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
                 `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
-        }, Date.now());
+        });
     }, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
     const handleMaxSessionTurnsEvent = useCallback(() => addItem({
         type: 'info',
         text: `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. ` +
             `Please update this limit in your setting.json file.`,
-    }, Date.now()), [addItem, config]);
+    }), [addItem, config]);
     const handleContextWindowWillOverflowEvent = useCallback((estimatedRequestTokenCount, remainingTokenCount) => {
         onCancelSubmit(true);
         const limit = tokenLimit(config.getModel());
@@ -464,7 +481,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         addItem({
             type: 'info',
             text,
-        }, Date.now());
+        });
     }, [addItem, onCancelSubmit, config]);
     const handleChatModelEvent = useCallback((eventValue, userMessageTimestamp) => {
         if (!settings?.merged?.ui?.showModelInfoInChat) {
@@ -479,15 +496,38 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             model: eventValue,
         }, userMessageTimestamp);
     }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]);
+    const handleAgentExecutionStoppedEvent = useCallback((reason, userMessageTimestamp, systemMessage) => {
+        if (pendingHistoryItemRef.current) {
+            addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+            setPendingHistoryItem(null);
+        }
+        addItem({
+            type: MessageType.INFO,
+            text: `Agent execution stopped: ${systemMessage?.trim() || reason}`,
+        }, userMessageTimestamp);
+        setIsResponding(false);
+    }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, setIsResponding]);
+    const handleAgentExecutionBlockedEvent = useCallback((reason, userMessageTimestamp, systemMessage) => {
+        if (pendingHistoryItemRef.current) {
+            addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+            setPendingHistoryItem(null);
+        }
+        addItem({
+            type: MessageType.WARNING,
+            text: `Agent execution blocked: ${systemMessage?.trim() || reason}`,
+        }, userMessageTimestamp);
+    }, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
     const processGeminiStreamEvents = useCallback(async (stream, userMessageTimestamp, signal) => {
         let geminiMessageBuffer = '';
         const toolCallRequests = [];
         for await (const event of stream) {
             switch (event.type) {
                 case ServerGeminiEventType.Thought:
+                    setLastGeminiActivityTime(Date.now());
                     setThought(event.value);
                     break;
                 case ServerGeminiEventType.Content:
+                    setLastGeminiActivityTime(Date.now());
                     geminiMessageBuffer = handleContentEvent(event.value, geminiMessageBuffer, userMessageTimestamp);
                     break;
                 case ServerGeminiEventType.ToolCallRequest:
@@ -499,6 +539,12 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 case ServerGeminiEventType.Error:
                     handleErrorEvent(event.value, userMessageTimestamp);
                     break;
+                case ServerGeminiEventType.AgentExecutionStopped:
+                    handleAgentExecutionStoppedEvent(event.value.reason, userMessageTimestamp, event.value.systemMessage);
+                    break;
+                case ServerGeminiEventType.AgentExecutionBlocked:
+                    handleAgentExecutionBlockedEvent(event.value.reason, userMessageTimestamp, event.value.systemMessage);
+                    break;
                 case ServerGeminiEventType.ChatCompressed:
                     handleChatCompressionEvent(event.value, userMessageTimestamp);
                     break;
@@ -538,7 +584,11 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             }
         }
         if (toolCallRequests.length > 0) {
-            scheduleToolCalls(toolCallRequests, signal);
+            if (pendingHistoryItemRef.current) {
+                addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+                setPendingHistoryItem(null);
+            }
+            await scheduleToolCalls(toolCallRequests, signal);
         }
         return StreamProcessingStatus.Completed;
     }, [
@@ -552,6 +602,11 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         handleContextWindowWillOverflowEvent,
         handleCitationEvent,
         handleChatModelEvent,
+        handleAgentExecutionStoppedEvent,
+        handleAgentExecutionBlockedEvent,
+        addItem,
+        pendingHistoryItemRef,
+        setPendingHistoryItem,
     ]);
     const submitQuery = useCallback(async (query, options, prompt_id) => runInDevTraceSpan({ name: 'submitQuery' }, async ({ metadata: spanMetadata }) => {
         spanMetadata.input = query;
@@ -616,7 +671,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                                 addItem({
                                     type: 'info',
                                     text: `Loop detection has been disabled for this session. Retrying request...`,
-                                }, Date.now());
+                                });
                                 if (lastQueryRef.current && lastPromptIdRef.current) {
                                     // eslint-disable-next-line @typescript-eslint/no-floating-promises
                                     submitQuery(lastQueryRef.current, { isContinuation: true }, lastPromptIdRef.current);
@@ -626,7 +681,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                                 addItem({
                                     type: 'info',
                                     text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
-                                }, Date.now());
+                                });
                             }
                         },
                     });
@@ -717,6 +772,18 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         if (geminiTools.length === 0) {
             return;
         }
+        // Check if any tool requested to stop execution immediately
+        const stopExecutionTool = geminiTools.find((tc) => tc.response.errorType === ToolErrorType.STOP_EXECUTION);
+        if (stopExecutionTool && stopExecutionTool.response.error) {
+            addItem({
+                type: MessageType.INFO,
+                text: `Agent execution stopped: ${stopExecutionTool.response.error.message}`,
+            });
+            setIsResponding(false);
+            const callIdsToMarkAsSubmitted = geminiTools.map((toolCall) => toolCall.request.callId);
+            markToolsAsSubmitted(callIdsToMarkAsSubmitted);
+            return;
+        }
         // If all the tools were cancelled, don't submit a response to Gemini.
         const allToolsCancelled = geminiTools.every((tc) => tc.status === 'cancelled');
         if (allToolsCancelled) {
@@ -726,7 +793,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 addItem({
                     type: MessageType.INFO,
                     text: 'Request cancelled.',
-                }, Date.now());
+                });
             }
             setIsResponding(false);
             if (geminiClient) {
@@ -806,7 +873,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         geminiClient,
         storage,
     ]);
-    const lastOutputTime = Math.max(lastToolOutputTime, lastShellOutputTime);
+    const lastOutputTime = Math.max(lastToolOutputTime, lastShellOutputTime, lastGeminiActivityTime);
     return {
         streamingState,
         submitQuery,
@@ -819,6 +886,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         activePtyId,
         loopDetectionConfirmationRequest,
         lastOutputTime,
+        retryStatus,
     };
 };
 //# sourceMappingURL=useGeminiStream.js.map