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

package/dist/src/ui/AppContainer.js

@@ -13,7 +13,7 @@ import { UIActionsContext, } from './contexts/UIActionsContext.js';
 import { ConfigContext } from './contexts/ConfigContext.js';
 import { ToolCallStatus, AuthState, } from './types.js';
 import { MessageType, StreamingState } from './types.js';
-import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, fireSessionStartHook, fireSessionEndHook, generateSummary, } from '@google/gemini-cli-core';
+import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, generateSummary, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
@@ -34,7 +34,7 @@ import { calculateMainAreaWidth } from './utils/ui-sizing.js';
 import ansiEscapes from 'ansi-escapes';
 import * as fs from 'node:fs';
 import { basename } from 'node:path';
-import { computeWindowTitle } from '../utils/windowTitle.js';
+import { computeTerminalTitle } from '../utils/windowTitle.js';
 import { useTextBuffer } from './components/shared/text-buffer.js';
 import { useLogger } from './hooks/useLogger.js';
 import { useGeminiStream } from './hooks/useGeminiStream.js';
@@ -42,7 +42,6 @@ import { useVim } from './hooks/vim.js';
 import { SettingScope } from '../config/settings.js';
 import {} from '../core/initializer.js';
 import { useFocus } from './hooks/useFocus.js';
-import { useBracketedPaste } from './hooks/useBracketedPaste.js';
 import { useKeypress } from './hooks/useKeypress.js';
 import { keyMatchers, Command } from './keyMatchers.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
@@ -69,12 +68,13 @@ import { useIncludeDirsTrust } from './hooks/useIncludeDirsTrust.js';
 import { isWorkspaceTrusted } from '../config/trustedFolders.js';
 import { useAlternateBuffer } from './hooks/useAlternateBuffer.js';
 import { useSettings } from './contexts/SettingsContext.js';
-import { enableSupportedProtocol } from './utils/kittyProtocolDetector.js';
+import { terminalCapabilityManager } from './utils/terminalCapabilityManager.js';
 import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
-import { enableBracketedPaste } from './utils/bracketedPaste.js';
 import { useBanner } from './hooks/useBanner.js';
-const WARNING_PROMPT_DURATION_MS = 1000;
-const QUEUE_ERROR_DISPLAY_DURATION_MS = 3000;
+import { useHookDisplayState } from './hooks/useHookDisplayState.js';
+import { WARNING_PROMPT_DURATION_MS, QUEUE_ERROR_DISPLAY_DURATION_MS, SHELL_ACTION_REQUIRED_TITLE_DELAY_MS, } from './constants.js';
+import { LoginWithGoogleRestartDialog } from './auth/LoginWithGoogleRestartDialog.js';
+import { useInactivityTimer } from './hooks/useInactivityTimer.js';
 function isToolExecuting(pendingHistoryItems) {
     return pendingHistoryItems.some((item) => {
         if (item && item.type === 'tool_group') {
@@ -116,6 +116,8 @@ export const AppContainer = (props) => {
     const [shellModeActive, setShellModeActive] = useState(false);
     const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = useState(false);
     const [historyRemountKey, setHistoryRemountKey] = useState(0);
+    const [settingsNonce, setSettingsNonce] = useState(0);
+    const activeHooks = useHookDisplayState();
     const [updateInfo, setUpdateInfo] = useState(null);
     const [isTrustedFolder, setIsTrustedFolder] = useState(isWorkspaceTrusted(settings.merged).isTrusted);
     const [queueErrorMessage, setQueueErrorMessage] = useState(null);
@@ -144,9 +146,7 @@ export const AppContainer = (props) => {
         setPermissionsDialogProps(null);
     }, []);
     const toggleDebugProfiler = useCallback(() => setShowDebugProfiler((prev) => !prev), []);
-    // Helper to determine the effective model, considering the fallback state.
-    const getEffectiveModel = useCallback(() => config.getModel(), [config]);
-    const [currentModel, setCurrentModel] = useState(getEffectiveModel());
+    const [currentModel, setCurrentModel] = useState(config.getModel());
     const [userTier, setUserTier] = useState(undefined);
     const [isConfigInitialized, setConfigInitialized] = useState(false);
     const logger = useLogger(config.storage);
@@ -165,7 +165,6 @@ export const AppContainer = (props) => {
     const mainControlsRef = useRef(null);
     // For performance profiling only
     const rootUiRef = useRef(null);
-    const originalTitleRef = useRef(computeWindowTitle(basename(config.getTargetDir())));
     const lastTitleRef = useRef(null);
     const staticExtraHeight = 3;
     useEffect(() => {
@@ -176,15 +175,27 @@ export const AppContainer = (props) => {
             await config.initialize();
             setConfigInitialized(true);
             startupProfiler.flush(config);
-            // Fire SessionStart hook through MessageBus (only if hooks are enabled)
-            // Must be called AFTER config.initialize() to ensure HookRegistry is loaded
-            const hooksEnabled = config.getEnableHooks();
-            const hookMessageBus = config.getMessageBus();
-            if (hooksEnabled && hookMessageBus) {
-                const sessionStartSource = resumedSessionData
-                    ? SessionStartSource.Resume
-                    : SessionStartSource.Startup;
-                await fireSessionStartHook(hookMessageBus, sessionStartSource);
+            const sessionStartSource = resumedSessionData
+                ? SessionStartSource.Resume
+                : SessionStartSource.Startup;
+            const result = await config
+                .getHookSystem()
+                ?.fireSessionStartEvent(sessionStartSource);
+            if (result?.finalOutput) {
+                if (result.finalOutput?.systemMessage) {
+                    historyManager.addItem({
+                        type: MessageType.INFO,
+                        text: result.finalOutput.systemMessage,
+                    }, Date.now());
+                }
+                const additionalContext = result.finalOutput.getAdditionalContext();
+                const geminiClient = config.getGeminiClient();
+                if (additionalContext && geminiClient) {
+                    await geminiClient.addHistory({
+                        role: 'user',
+                        parts: [{ text: additionalContext }],
+                    });
+                }
             }
             // Fire-and-forget: generate summary for previous session in background
             generateSummary(config).catch((e) => {
@@ -197,12 +208,14 @@ export const AppContainer = (props) => {
             const ideClient = await IdeClient.getInstance();
             await ideClient.disconnect();
             // Fire SessionEnd hook on cleanup (only if hooks are enabled)
-            const hooksEnabled = config.getEnableHooks();
-            const hookMessageBus = config.getMessageBus();
-            if (hooksEnabled && hookMessageBus) {
-                await fireSessionEndHook(hookMessageBus, SessionEndReason.Exit);
-            }
+            await config?.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
         });
+        // Disable the dependencies check here. historyManager gets flagged
+        // but we don't want to react to changes to it because each new history
+        // item, including the ones from the start session hook will cause a
+        // re-render and an error when we try to reload config.
+        //
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [config, resumedSessionData]);
     useEffect(() => setUpdateHandler(historyManager.addItem, setUpdateInfo), [historyManager.addItem]);
     // Subscribe to fallback mode and model changes from core
@@ -214,7 +227,16 @@ export const AppContainer = (props) => {
         return () => {
             coreEvents.off(CoreEvent.ModelChanged, handleModelChanged);
         };
-    }, [getEffectiveModel, config]);
+    }, [config]);
+    useEffect(() => {
+        const handleSettingsChanged = () => {
+            setSettingsNonce((prev) => prev + 1);
+        };
+        coreEvents.on(CoreEvent.SettingsChanged, handleSettingsChanged);
+        return () => {
+            coreEvents.off(CoreEvent.SettingsChanged, handleSettingsChanged);
+        };
+    }, []);
     const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } = useConsoleMessages();
     const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
     // Derive widths for InputPrompt using shared helper
@@ -231,6 +253,7 @@ export const AppContainer = (props) => {
             return false;
         }
     }, []);
+    const getPreferredEditor = useCallback(() => settings.merged.general?.preferredEditor, [settings.merged.general?.preferredEditor]);
     const buffer = useTextBuffer({
         initialText: '',
         viewport: { height: 10, width: inputWidth },
@@ -238,6 +261,7 @@ export const AppContainer = (props) => {
         setRawMode,
         isValidPath,
         shellModeActive,
+        getPreferredEditor,
     });
     // Initialize input history from logger (past sessions)
     useEffect(() => {
@@ -259,8 +283,7 @@ export const AppContainer = (props) => {
             disableLineWrapping();
             app.rerender();
         }
-        enableBracketedPaste();
-        enableSupportedProtocol();
+        terminalCapabilityManager.enableSupportedModes();
         refreshStatic();
     }, [refreshStatic, isAlternateBuffer, app, config]);
     useEffect(() => {
@@ -280,6 +303,13 @@ export const AppContainer = (props) => {
     }, [bannerVisible, bannerText, settings, config, refreshStatic]);
     const { isThemeDialogOpen, openThemeDialog, closeThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
     const { authState, setAuthState, authError, authInfo, setAuthInfo, onAuthError, apiKeyDefaultValue, reloadApiKey, } = useAuthCommand(settings, config);
+    const [authContext, setAuthContext] = useState({});
+    useEffect(() => {
+        if (authState === AuthState.Authenticated && authContext.requiresRestart) {
+            setAuthState(AuthState.AwaitingGoogleLoginRestart);
+            setAuthContext({});
+        }
+    }, [authState, authContext, setAuthState]);
     const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
         config,
         historyManager,
@@ -308,6 +338,12 @@ export const AppContainer = (props) => {
     // Create handleAuthSelect wrapper for backward compatibility
     const handleAuthSelect = useCallback(async (authType, scope) => {
         if (authType) {
+            if (authType === AuthType.LOGIN_WITH_GOOGLE) {
+                setAuthContext({ requiresRestart: true });
+            }
+            else {
+                setAuthContext({});
+            }
             await clearCachedCredentialFile();
             settings.setValue(scope, 'security.auth.selectedType', authType);
             try {
@@ -332,7 +368,7 @@ Logging in with Google... Restarting Cell CLI to continue.
             }
         }
         setAuthState(AuthState.Authenticated);
-    }, [settings, config, setAuthState, onAuthError, setAuthInfo]);
+    }, [settings, config, setAuthState, onAuthError, setAuthContext, setAuthInfo]);
     const handleApiKeySubmit = useCallback(async (apiKey) => {
         try {
             onAuthError(null);
@@ -409,7 +445,7 @@ Logging in with Google... Restarting Cell CLI to continue.
                 .sendStatistics(sessionStats)
                 .catch((err) => {
                 // Don't block exit if this fails, just log it.
-                console.error('Failed to send session stats:', err);
+                debugLogger.error('Failed to send session stats:', err);
             });
             const feedbackPromise = sessionStats.metrics.tools.totalCalls === 0
                 ? Promise.resolve(null)
@@ -423,7 +459,7 @@ Logging in with Google... Restarting Cell CLI to continue.
                     }
                     catch (err) {
                         // Don't block exit if this fails, just log it.
-                        console.error('Failed to send feedback:', err);
+                        debugLogger.error('Failed to send feedback:', err);
                     }
                 }
                 await runExitCleanup();
@@ -481,7 +517,6 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
     }, [config, historyManager]);
     const cancelHandlerRef = useRef(() => { });
-    const getPreferredEditor = useCallback(() => settings.merged.general?.preferredEditor, [settings.merged.general?.preferredEditor]);
     const onCancelSubmit = useCallback((shouldRestorePrompt) => {
         if (shouldRestorePrompt) {
             setPendingRestorePrompt(true);
@@ -503,12 +538,21 @@ Logging in with Google... Restarting Cell CLI to continue.
             }
         }
     }, [pendingRestorePrompt, inputHistory, historyManager.history]);
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, retryStatus, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
+    const lastOutputTimeRef = useRef(0);
+    useEffect(() => {
+        lastOutputTimeRef.current = lastOutputTime;
+    }, [lastOutputTime]);
+    const isShellAwaitingFocus = !!activePtyId &&
+        !embeddedShellFocused &&
+        config.isInteractiveShellEnabled();
+    const showShellActionRequired = useInactivityTimer(isShellAwaitingFocus, lastOutputTime, SHELL_ACTION_REQUIRED_TITLE_DELAY_MS);
     // Auto-accept indicator
     const showAutoAcceptIndicator = useAutoAcceptIndicator({
         config,
         addItem: historyManager.addItem,
         onApprovalModeChange: handleApprovalModeChange,
+        isActive: !embeddedShellFocused,
     });
     const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, popAllMessages, } = useMessageQueue({
         isConfigInitialized,
@@ -549,16 +593,8 @@ Logging in with Google... Restarting Cell CLI to continue.
     const handleClearScreen = useCallback(() => {
         historyManager.clearItems();
         clearConsoleMessagesState();
-        if (!isAlternateBuffer) {
-            console.clear();
-        }
         refreshStatic();
-    }, [
-        historyManager,
-        clearConsoleMessagesState,
-        refreshStatic,
-        isAlternateBuffer,
-    ]);
+    }, [historyManager, clearConsoleMessagesState, refreshStatic]);
     const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
     /**
      * Determines if the input prompt should be active and accept user input.
@@ -591,9 +627,9 @@ Logging in with Google... Restarting Cell CLI to continue.
         terminalHeight: Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1),
         pager: settings.merged.tools?.shell?.pager,
         showColor: settings.merged.tools?.shell?.showColor,
+        sanitizationConfig: config.sanitizationConfig,
     });
     const isFocused = useFocus();
-    useBracketedPaste();
     // Context file names computation
     const contextFileNames = useMemo(() => {
         const fromSettings = settings.merged.context?.fileName;
@@ -677,17 +713,18 @@ Logging in with Google... Restarting Cell CLI to continue.
     const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason, } = useIdeTrustListener();
     const isInitialMount = useRef(true);
     useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
+    const warningTimeoutRef = useRef(null);
+    const tabFocusTimeoutRef = useRef(null);
+    const handleWarning = useCallback((message) => {
+        setWarningMessage(message);
+        if (warningTimeoutRef.current) {
+            clearTimeout(warningTimeoutRef.current);
+        }
+        warningTimeoutRef.current = setTimeout(() => {
+            setWarningMessage(null);
+        }, WARNING_PROMPT_DURATION_MS);
+    }, []);
     useEffect(() => {
-        let timeoutId;
-        const handleWarning = (message) => {
-            setWarningMessage(message);
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-            }
-            timeoutId = setTimeout(() => {
-                setWarningMessage(null);
-            }, WARNING_PROMPT_DURATION_MS);
-        };
         const handleSelectionWarning = () => {
             handleWarning('Press Ctrl-S to enter selection mode to copy text.');
         };
@@ -699,11 +736,14 @@ Logging in with Google... Restarting Cell CLI to continue.
         return () => {
             appEvents.off(AppEvent.SelectionWarning, handleSelectionWarning);
             appEvents.off(AppEvent.PasteTimeout, handlePasteTimeout);
-            if (timeoutId) {
-                clearTimeout(timeoutId);
+            if (warningTimeoutRef.current) {
+                clearTimeout(warningTimeoutRef.current);
+            }
+            if (tabFocusTimeoutRef.current) {
+                clearTimeout(tabFocusTimeoutRef.current);
             }
         };
-    }, []);
+    }, [handleWarning]);
     useEffect(() => {
         let timeoutId;
         const handleWarning = (message) => {
@@ -825,7 +865,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
-    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui?.customWittyPhrases, !!activePtyId && !embeddedShellFocused, lastOutputTime);
+    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui?.customWittyPhrases, !!activePtyId && !embeddedShellFocused, lastOutputTime, retryStatus);
     const handleGlobalKeypress = useCallback((key) => {
         if (copyModeEnabled) {
             setCopyModeEnabled(false);
@@ -875,7 +915,7 @@ Logging in with Google... Restarting Cell CLI to continue.
                 return newValue;
             });
         }
-        else if (keyMatchers[Command.TOGGLE_IDE_CONTEXT_DETAIL](key) &&
+        else if (keyMatchers[Command.SHOW_IDE_CONTEXT_DETAIL](key) &&
             config.getIdeMode() &&
             ideContextState) {
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -885,10 +925,34 @@ Logging in with Google... Restarting Cell CLI to continue.
             !enteringConstrainHeightMode) {
             setConstrainHeight(false);
         }
-        else if (keyMatchers[Command.TOGGLE_SHELL_INPUT_FOCUS](key)) {
-            if (activePtyId || embeddedShellFocused) {
-                setEmbeddedShellFocused((prev) => !prev);
+        else if (keyMatchers[Command.UNFOCUS_SHELL_INPUT](key) &&
+            activePtyId &&
+            embeddedShellFocused) {
+            if (key.name === 'tab' && key.shift) {
+                // Always change focus
+                setEmbeddedShellFocused(false);
+                return;
             }
+            const now = Date.now();
+            // If the shell hasn't produced output in the last 100ms, it's considered idle.
+            const isIdle = now - lastOutputTimeRef.current >= 100;
+            if (isIdle) {
+                if (tabFocusTimeoutRef.current) {
+                    clearTimeout(tabFocusTimeoutRef.current);
+                }
+                tabFocusTimeoutRef.current = setTimeout(() => {
+                    tabFocusTimeoutRef.current = null;
+                    // If the shell produced output since the tab press, we assume it handled the tab
+                    // (e.g. autocomplete) so we should not toggle focus.
+                    if (lastOutputTimeRef.current > now) {
+                        handleWarning('Press Shift+Tab to focus out.');
+                        return;
+                    }
+                    setEmbeddedShellFocused(false);
+                }, 100);
+                return;
+            }
+            handleWarning('Press Shift+Tab to focus out.');
         }
     }, [
         constrainHeight,
@@ -908,37 +972,40 @@ Logging in with Google... Restarting Cell CLI to continue.
         setCopyModeEnabled,
         copyModeEnabled,
         isAlternateBuffer,
+        handleWarning,
     ]);
     useKeypress(handleGlobalKeypress, { isActive: true });
     // Update terminal title with Cell CLI status and thoughts
     useEffect(() => {
-        // Respect both showStatusInTitle and hideWindowTitle settings
-        if (!settings.merged.ui?.showStatusInTitle ||
-            settings.merged.ui?.hideWindowTitle)
+        // Respect hideWindowTitle settings
+        if (settings.merged.ui?.hideWindowTitle)
             return;
-        let title;
-        if (streamingState === StreamingState.Idle) {
-            title = originalTitleRef.current;
-        }
-        else {
-            const statusText = thought?.subject
-                ?.replace(/[\r\n]+/g, ' ')
-                .substring(0, 80);
-            title = statusText || originalTitleRef.current;
-        }
-        // Pad the title to a fixed width to prevent taskbar icon resizing.
-        const paddedTitle = title.padEnd(80, ' ');
+        const paddedTitle = computeTerminalTitle({
+            streamingState,
+            thoughtSubject: thought?.subject,
+            isConfirming: !!shellConfirmationRequest ||
+                !!confirmationRequest ||
+                showShellActionRequired,
+            folderName: basename(config.getTargetDir()),
+            showThoughts: !!settings.merged.ui?.showStatusInTitle,
+            useDynamicTitle: settings.merged.ui?.dynamicWindowTitle ?? true,
+        });
         // Only update the title if it's different from the last value we set
         if (lastTitleRef.current !== paddedTitle) {
             lastTitleRef.current = paddedTitle;
-            stdout.write(`\x1b]2;${paddedTitle}\x07`);
+            stdout.write(`\x1b]0;${paddedTitle}\x07`);
         }
         // Note: We don't need to reset the window title on exit because Cell CLI is already doing that elsewhere
     }, [
         streamingState,
         thought,
+        shellConfirmationRequest,
+        confirmationRequest,
+        showShellActionRequired,
         settings.merged.ui?.showStatusInTitle,
+        settings.merged.ui?.dynamicWindowTitle,
         settings.merged.ui?.hideWindowTitle,
+        config,
         stdout,
     ]);
     useEffect(() => {
@@ -1102,6 +1169,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         elapsedTime,
         currentLoadingPhrase,
         historyRemountKey,
+        activeHooks,
         messageQueue,
         queueErrorMessage,
         showAutoAcceptIndicator,
@@ -1137,6 +1205,8 @@ Logging in with Google... Restarting Cell CLI to continue.
         warningMessage,
         bannerData,
         bannerVisible,
+        terminalBackgroundColor: config.getTerminalBackground(),
+        settingsNonce,
     }), [
         isThemeDialogOpen,
         themeError,
@@ -1190,6 +1260,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         elapsedTime,
         currentLoadingPhrase,
         historyRemountKey,
+        activeHooks,
         messageQueue,
         queueErrorMessage,
         showAutoAcceptIndicator,
@@ -1229,6 +1300,8 @@ Logging in with Google... Restarting Cell CLI to continue.
         warningMessage,
         bannerData,
         bannerVisible,
+        config,
+        settingsNonce,
     ]);
     const exitPrivacyNotice = useCallback(() => setShowPrivacyNotice(false), [setShowPrivacyNotice]);
     const uiActions = useMemo(() => ({
@@ -1265,6 +1338,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         handleApiKeyCancel,
         setBannerVisible,
         setEmbeddedShellFocused,
+        setAuthContext,
     }), [
         handleThemeSelect,
         closeThemeDialog,
@@ -1299,7 +1373,14 @@ Logging in with Google... Restarting Cell CLI to continue.
         handleApiKeyCancel,
         setBannerVisible,
         setEmbeddedShellFocused,
+        setAuthContext,
     ]);
+    if (authState === AuthState.AwaitingGoogleLoginRestart) {
+        return (_jsx(LoginWithGoogleRestartDialog, { onDismiss: () => {
+                setAuthContext({});
+                setAuthState(AuthState.Updating);
+            } }));
+    }
     return (_jsx(UIStateContext.Provider, { value: uiState, children: _jsx(UIActionsContext.Provider, { value: uiActions, children: _jsx(ConfigContext.Provider, { value: config, children: _jsx(AppContext.Provider, { value: {
                         version: props.version,
                         startupWarnings: props.startupWarnings || [],