@machina.ai/cell-cli 1.10.0-rc1 → 1.13.0-rc1

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 { DEFAULT_GEMINI_FLASH_MODEL, IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, ShellExecutionService, } from '@google/gemini-cli-core';
+import { DEFAULT_GEMINI_FLASH_MODEL, IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import { loadHierarchicalGeminiMemory } from '../config/config.js';
 import process from 'node:process';
@@ -57,13 +57,16 @@ import { ConsolePatcher } from './utils/ConsolePatcher.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
-import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js';
 import { useSessionStats } from './contexts/SessionContext.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
-import { useExtensionUpdates } from './hooks/useExtensionUpdates.js';
 import { FeedbackService } from '../services/FeedbackService.js';
+import { useConfirmUpdateRequests, useExtensionUpdates, } from './hooks/useExtensionUpdates.js';
 import { ShellFocusContext } from './contexts/ShellFocusContext.js';
+import {} from '../config/extension-manager.js';
+import { requestConsentInteractive } from '../config/extensions/consent.js';
+import { disableMouseEvents, enableMouseEvents } from './utils/mouse.js';
 const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
+const QUEUE_ERROR_DISPLAY_DURATION_MS = 3000;
 function isToolExecuting(pendingHistoryItems) {
     return pendingHistoryItems.some((item) => {
         if (item && item.type === 'tool_group') {
@@ -95,14 +98,20 @@ export const AppContainer = (props) => {
     const [isProcessing, setIsProcessing] = useState(false);
     const [embeddedShellFocused, setEmbeddedShellFocused] = useState(false);
     const [showDebugProfiler, setShowDebugProfiler] = useState(false);
+    const [copyModeEnabled, setCopyModeEnabled] = useState(false);
     const [geminiMdFileCount, setGeminiMdFileCount] = useState(initializationResult.geminiMdFileCount);
     const [shellModeActive, setShellModeActive] = useState(false);
     const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = useState(false);
     const [historyRemountKey, setHistoryRemountKey] = useState(0);
     const [updateInfo, setUpdateInfo] = useState(null);
     const [isTrustedFolder, setIsTrustedFolder] = useState(config.isTrustedFolder());
-    const extensions = config.getExtensions();
-    const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate, confirmUpdateExtensionRequests, addConfirmUpdateExtensionRequest, } = useExtensionUpdates(extensions, historyManager.addItem, config.getWorkingDir());
+    const [queueErrorMessage, setQueueErrorMessage] = useState(null);
+    const extensionManager = config.getExtensionLoader();
+    // We are in the interactive CLI, update how we request consent and settings.
+    extensionManager.setRequestConsent((description) => requestConsentInteractive(description, addConfirmUpdateExtensionRequest));
+    extensionManager.setRequestSetting();
+    const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } = useConfirmUpdateRequests();
+    const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate, } = useExtensionUpdates(extensionManager, historyManager.addItem, config.getEnableExtensionReloading());
     const [isPermissionsDialogOpen, setPermissionsDialogOpen] = useState(false);
     const openPermissionsDialog = useCallback(() => setPermissionsDialogOpen(true), []);
     const closePermissionsDialog = useCallback(() => setPermissionsDialogOpen(false), []);
@@ -143,23 +152,29 @@ export const AppContainer = (props) => {
             setConfigInitialized(true);
         })();
         registerCleanup(async () => {
+            // Turn off mouse scroll.
+            disableMouseEvents();
             const ideClient = await IdeClient.getInstance();
             await ideClient.disconnect();
         });
     }, [config]);
     useEffect(() => setUpdateHandler(historyManager.addItem, setUpdateInfo), [historyManager.addItem]);
-    // Watch for model changes (e.g., from Flash fallback)
+    // Subscribe to fallback mode and model changes from core
     useEffect(() => {
-        const checkModelChange = () => {
+        const handleFallbackModeChanged = () => {
             const effectiveModel = getEffectiveModel();
-            if (effectiveModel !== currentModel) {
-                setCurrentModel(effectiveModel);
-            }
+            setCurrentModel(effectiveModel);
+        };
+        const handleModelChanged = (payload) => {
+            setCurrentModel(payload.model);
+        };
+        coreEvents.on(CoreEvent.FallbackModeChanged, handleFallbackModeChanged);
+        coreEvents.on(CoreEvent.ModelChanged, handleModelChanged);
+        return () => {
+            coreEvents.off(CoreEvent.FallbackModeChanged, handleFallbackModeChanged);
+            coreEvents.off(CoreEvent.ModelChanged, handleModelChanged);
         };
-        checkModelChange();
-        const interval = setInterval(checkModelChange, 1000); // Check every second
-        return () => clearInterval(interval);
-    }, [config, currentModel, getEffectiveModel]);
+    }, [getEffectiveModel]);
     const { consoleMessages, handleNewMessage, clearConsoleMessages: clearConsoleMessagesState, } = useConsoleMessages();
     useEffect(() => {
         const consolePatcher = new ConsolePatcher({
@@ -219,11 +234,13 @@ export const AppContainer = (props) => {
         fetchUserMessages();
     }, [historyManager.history, logger]);
     const refreshStatic = useCallback(() => {
-        stdout.write(ansiEscapes.clearTerminal);
+        if (settings.merged.ui?.useAlternateBuffer === false) {
+            stdout.write(ansiEscapes.clearTerminal);
+        }
         setHistoryRemountKey((prev) => prev + 1);
-    }, [setHistoryRemountKey, stdout]);
-    const { isThemeDialogOpen, openThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
-    const { authState, setAuthState, authError, onAuthError } = useAuthCommand(settings, config);
+    }, [setHistoryRemountKey, stdout, settings]);
+    const { isThemeDialogOpen, openThemeDialog, closeThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
+    const { authState, setAuthState, authError, onAuthError, apiKeyDefaultValue, reloadApiKey, } = useAuthCommand(settings, config);
     const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
         config,
         historyManager,
@@ -250,7 +267,7 @@ export const AppContainer = (props) => {
             if (authType === AuthType.LOGIN_WITH_GOOGLE &&
                 config.isBrowserLaunchSuppressed()) {
                 await runExitCleanup();
-                console.log(`
+                debugLogger.log(`
 ----------------------------------------------------------------
 Logging in with Google... Please restart Gemini CLI to continue.
 ----------------------------------------------------------------
@@ -260,6 +277,26 @@ Logging in with Google... Please restart Gemini CLI to continue.
         }
         setAuthState(AuthState.Authenticated);
     }, [settings, config, setAuthState, onAuthError]);
+    const handleApiKeySubmit = useCallback(async (apiKey) => {
+        try {
+            onAuthError(null);
+            if (!apiKey.trim() && apiKey.length > 1) {
+                onAuthError('API key cannot be empty string with length greater than 1.');
+                return;
+            }
+            await saveApiKey(apiKey);
+            await reloadApiKey();
+            await config.refreshAuth(AuthType.USE_GEMINI);
+            setAuthState(AuthState.Authenticated);
+        }
+        catch (e) {
+            onAuthError(`Failed to save API key: ${e instanceof Error ? e.message : String(e)}`);
+        }
+    }, [setAuthState, onAuthError, reloadApiKey, config]);
+    const handleApiKeyCancel = useCallback(() => {
+        // Go back to auth method selection
+        setAuthState(AuthState.Updating);
+    }, [setAuthState]);
     // Sync user tier from config when authentication changes
     useEffect(() => {
         // Only sync when not currently authenticating
@@ -292,7 +329,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const { isEditorDialogOpen, openEditorDialog, handleEditorSelect, exitEditorDialog, } = useEditorSettings(settings, setEditorError, historyManager.addItem);
     const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
     const { isModelDialogOpen, openModelDialog, closeModelDialog } = useModelCommand();
-    const { showWorkspaceMigrationDialog, workspaceExtensions, onWorkspaceMigrationDialogOpen, onWorkspaceMigrationDialogClose, } = useWorkspaceMigration(settings);
     const { toggleVimEnabled } = useVimMode();
     const slashCommandActions = useMemo(() => ({
         openAuthDialog: () => setAuthState(AuthState.Updating),
@@ -362,7 +398,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         try {
             const { memoryContent, fileCount, filePaths } = await loadHierarchicalGeminiMemory(process.cwd(), settings.merged.context?.loadMemoryFromIncludeDirectories
                 ? config.getWorkspaceContext().getDirectories()
-                : [], config.getDebugMode(), config.getFileService(), settings.merged, config.getExtensionContextFilePaths(), config.isTrustedFolder(), settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
+                : [], config.getDebugMode(), config.getFileService(), settings.merged, config.getExtensionLoader(), config.isTrustedFolder(), settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
             config.getFileFilteringOptions());
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);
@@ -375,7 +411,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
                     : 'No memory content found.'}`,
             }, Date.now());
             if (config.getDebugMode()) {
-                console.log(`[DEBUG] Refreshed memory content in config: ${memoryContent.substring(0, 200)}...`);
+                debugLogger.log(`[DEBUG] Refreshed memory content in config: ${memoryContent.substring(0, 200)}...`);
             }
         }
         catch (error) {
@@ -384,18 +420,22 @@ Logging in with Google... Please restart Gemini CLI to continue.
                 type: MessageType.ERROR,
                 text: `Error refreshing memory: ${errorMessage}`,
             }, Date.now());
-            console.error('Error refreshing memory:', error);
+            debugLogger.warn('Error refreshing memory:', error);
         }
     }, [config, historyManager, settings.merged]);
     const cancelHandlerRef = useRef(() => { });
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, () => settings.merged.general?.preferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, () => cancelHandlerRef.current(), setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
+    const getPreferredEditor = useCallback(() => settings.merged.general?.preferredEditor, [settings.merged.general?.preferredEditor]);
+    const onCancelSubmit = useCallback(() => {
+        cancelHandlerRef.current();
+    }, []);
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
     // Auto-accept indicator
     const showAutoAcceptIndicator = useAutoAcceptIndicator({
         config,
         addItem: historyManager.addItem,
         onApprovalModeChange: handleApprovalModeChange,
     });
-    const { messageQueue, addMessage, clearQueue, getQueuedMessagesText } = useMessageQueue({
+    const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, popAllMessages, } = useMessageQueue({
         isConfigInitialized,
         streamingState,
         submitQuery,
@@ -485,7 +525,17 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const geminiClient = config.getGeminiClient();
     useEffect(() => {
         if (activePtyId) {
-            ShellExecutionService.resizePty(activePtyId, Math.floor(terminalWidth * SHELL_WIDTH_FRACTION), Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1));
+            try {
+                ShellExecutionService.resizePty(activePtyId, Math.floor(terminalWidth * SHELL_WIDTH_FRACTION), Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1));
+            }
+            catch (e) {
+                // This can happen in a race condition where the pty exits
+                // right before we try to resize it.
+                if (!(e instanceof Error &&
+                    e.message.includes('Cannot resize a pty that has already exited'))) {
+                    throw e;
+                }
+            }
         }
     }, [terminalWidth, availableTerminalHeight, activePtyId]);
     useEffect(() => {
@@ -527,10 +577,11 @@ Logging in with Google... Please restart Gemini CLI to continue.
         !settings.merged.ide?.hasSeenNudge &&
         !idePromptAnswered);
     const [showErrorDetails, setShowErrorDetails] = useState(false);
-    const [showToolDescriptions, setShowToolDescriptions] = useState(false);
-    const [ctrlCPressedOnce, setCtrlCPressedOnce] = useState(false);
+    const [showFullTodos, setShowFullTodos] = useState(false);
+    const [renderMarkdown, setRenderMarkdown] = useState(true);
+    const [ctrlCPressCount, setCtrlCPressCount] = useState(0);
     const ctrlCTimerRef = useRef(null);
-    const [ctrlDPressedOnce, setCtrlDPressedOnce] = useState(false);
+    const [ctrlDPressCount, setCtrlDPressCount] = useState(0);
     const ctrlDTimerRef = useRef(null);
     const [constrainHeight, setConstrainHeight] = useState(true);
     const [ideContextState, setIdeContextState] = useState();
@@ -545,6 +596,15 @@ Logging in with Google... Please restart Gemini CLI to continue.
             setShowIdeRestartPrompt(true);
         }
     }, [ideNeedsRestart]);
+    useEffect(() => {
+        if (queueErrorMessage) {
+            const timer = setTimeout(() => {
+                setQueueErrorMessage(null);
+            }, QUEUE_ERROR_DISPLAY_DURATION_MS);
+            return () => clearTimeout(timer);
+        }
+        return undefined;
+    }, [queueErrorMessage, setQueueErrorMessage]);
     useEffect(() => {
         if (isInitialMount.current) {
             isInitialMount.current = false;
@@ -580,7 +640,43 @@ Logging in with Google... Please restart Gemini CLI to continue.
             appEvents.off(AppEvent.OpenDebugConsole, openDebugConsole);
             appEvents.off(AppEvent.LogError, logErrorHandler);
         };
-    }, [handleNewMessage]);
+    }, [handleNewMessage, config]);
+    useEffect(() => {
+        if (ctrlCTimerRef.current) {
+            clearTimeout(ctrlCTimerRef.current);
+            ctrlCTimerRef.current = null;
+        }
+        if (ctrlCPressCount > 2) {
+            recordExitFail(config);
+        }
+        if (ctrlCPressCount > 1) {
+            handleSlashCommand('/quit');
+        }
+        else {
+            ctrlCTimerRef.current = setTimeout(() => {
+                setCtrlCPressCount(0);
+                ctrlCTimerRef.current = null;
+            }, CTRL_EXIT_PROMPT_DURATION_MS);
+        }
+    }, [ctrlCPressCount, config, setCtrlCPressCount, handleSlashCommand]);
+    useEffect(() => {
+        if (ctrlDTimerRef.current) {
+            clearTimeout(ctrlDTimerRef.current);
+            ctrlCTimerRef.current = null;
+        }
+        if (ctrlDPressCount > 2) {
+            recordExitFail(config);
+        }
+        if (ctrlDPressCount > 1) {
+            handleSlashCommand('/quit');
+        }
+        else {
+            ctrlDTimerRef.current = setTimeout(() => {
+                setCtrlDPressCount(0);
+                ctrlDTimerRef.current = null;
+            }, CTRL_EXIT_PROMPT_DURATION_MS);
+        }
+    }, [ctrlDPressCount, config, setCtrlDPressCount, handleSlashCommand]);
     const handleEscapePromptChange = useCallback((showPrompt) => {
         setShowEscapePrompt(showPrompt);
     }, []);
@@ -595,46 +691,35 @@ Logging in with Google... Please restart Gemini CLI to continue.
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
     const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui?.customWittyPhrases);
-    const handleExit = useCallback((pressedOnce, setPressedOnce, timerRef) => {
-        if (pressedOnce) {
-            if (timerRef.current) {
-                clearTimeout(timerRef.current);
-            }
-            handleSlashCommand('/quit');
-        }
-        else {
-            setPressedOnce(true);
-            timerRef.current = setTimeout(() => {
-                setPressedOnce(false);
-                timerRef.current = null;
-            }, CTRL_EXIT_PROMPT_DURATION_MS);
-        }
-    }, [handleSlashCommand]);
     const handleGlobalKeypress = useCallback((key) => {
+        if (copyModeEnabled) {
+            setCopyModeEnabled(false);
+            enableMouseEvents();
+            // We don't want to process any other keys if we're in copy mode.
+            return;
+        }
         // Debug log keystrokes if enabled
         if (settings.merged.general?.debugKeystrokeLogging) {
-            console.log('[DEBUG] Keystroke:', JSON.stringify(key));
+            debugLogger.log('[DEBUG] Keystroke:', JSON.stringify(key));
+        }
+        if (settings.merged.ui?.useAlternateBuffer &&
+            keyMatchers[Command.TOGGLE_COPY_MODE](key)) {
+            setCopyModeEnabled(true);
+            disableMouseEvents();
+            return;
         }
         if (keyMatchers[Command.QUIT](key)) {
-            if (!ctrlCPressedOnce) {
-                cancelOngoingRequest?.();
-            }
-            if (!ctrlCPressedOnce) {
-                setCtrlCPressedOnce(true);
-                ctrlCTimerRef.current = setTimeout(() => {
-                    setCtrlCPressedOnce(false);
-                    ctrlCTimerRef.current = null;
-                }, CTRL_EXIT_PROMPT_DURATION_MS);
-                return;
-            }
-            handleExit(ctrlCPressedOnce, setCtrlCPressedOnce, ctrlCTimerRef);
+            // If the user presses Ctrl+C, we want to cancel any ongoing requests.
+            // This should happen regardless of the count.
+            cancelOngoingRequest?.();
+            setCtrlCPressCount((prev) => prev + 1);
             return;
         }
         else if (keyMatchers[Command.EXIT](key)) {
             if (buffer.text.length > 0) {
                 return;
             }
-            handleExit(ctrlDPressedOnce, setCtrlDPressedOnce, ctrlDTimerRef);
+            setCtrlDPressCount((prev) => prev + 1);
             return;
         }
         let enteringConstrainHeightMode = false;
@@ -645,13 +730,16 @@ Logging in with Google... Please restart Gemini CLI to continue.
         if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
             setShowErrorDetails((prev) => !prev);
         }
-        else if (keyMatchers[Command.TOGGLE_TOOL_DESCRIPTIONS](key)) {
-            const newValue = !showToolDescriptions;
-            setShowToolDescriptions(newValue);
-            const mcpServers = config.getMcpServers();
-            if (Object.keys(mcpServers || {}).length > 0) {
-                handleSlashCommand(newValue ? '/mcp desc' : '/mcp nodesc');
-            }
+        else if (keyMatchers[Command.SHOW_FULL_TODOS](key)) {
+            setShowFullTodos((prev) => !prev);
+        }
+        else if (keyMatchers[Command.TOGGLE_MARKDOWN](key)) {
+            setRenderMarkdown((prev) => {
+                const newValue = !prev;
+                // Force re-render of static content
+                refreshStatic();
+                return newValue;
+            });
         }
         else if (keyMatchers[Command.TOGGLE_IDE_CONTEXT_DETAIL](key) &&
             config.getIdeMode() &&
@@ -671,23 +759,20 @@ Logging in with Google... Please restart Gemini CLI to continue.
         constrainHeight,
         setConstrainHeight,
         setShowErrorDetails,
-        showToolDescriptions,
-        setShowToolDescriptions,
         config,
         ideContextState,
-        handleExit,
-        ctrlCPressedOnce,
-        setCtrlCPressedOnce,
-        ctrlCTimerRef,
+        setCtrlCPressCount,
         buffer.text.length,
-        ctrlDPressedOnce,
-        setCtrlDPressedOnce,
-        ctrlDTimerRef,
+        setCtrlDPressCount,
         handleSlashCommand,
         cancelOngoingRequest,
         activePtyId,
         embeddedShellFocused,
         settings.merged.general?.debugKeystrokeLogging,
+        refreshStatic,
+        setCopyModeEnabled,
+        copyModeEnabled,
+        settings.merged.ui?.useAlternateBuffer,
     ]);
     useKeypress(handleGlobalKeypress, { isActive: true });
     // Update terminal title with Gemini CLI status and thoughts
@@ -721,6 +806,39 @@ Logging in with Google... Please restart Gemini CLI to continue.
         settings.merged.ui?.hideWindowTitle,
         stdout,
     ]);
+    useEffect(() => {
+        const handleUserFeedback = (payload) => {
+            let type;
+            switch (payload.severity) {
+                case 'error':
+                    type = MessageType.ERROR;
+                    break;
+                case 'warning':
+                    type = MessageType.WARNING;
+                    break;
+                case 'info':
+                    type = MessageType.INFO;
+                    break;
+                default:
+                    throw new Error(`Unexpected severity for user feedback: ${payload.severity}`);
+            }
+            historyManager.addItem({
+                type,
+                text: payload.message,
+            }, Date.now());
+            // If there is an attached error object, log it to the debug drawer.
+            if (payload.error) {
+                debugLogger.warn(`[Feedback Details for "${payload.message}"]`, payload.error);
+            }
+        };
+        coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
+        // Flush any messages that happened during startup before this component
+        // mounted.
+        coreEvents.drainFeedbackBacklog();
+        return () => {
+            coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
+        };
+    }, [historyManager]);
     const filteredConsoleMessages = useMemo(() => {
         if (config.getDebugMode()) {
             return consoleMessages;
@@ -732,8 +850,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         .filter((msg) => msg.type === 'error')
         .reduce((total, msg) => total + msg.count, 0), [filteredConsoleMessages]);
     const nightly = props.version.includes('nightly');
-    const dialogsVisible = showWorkspaceMigrationDialog ||
-        shouldShowIdePrompt ||
+    const dialogsVisible = shouldShowIdePrompt ||
         isFolderTrustDialogOpen ||
         !!shellConfirmationRequest ||
         !!confirmationRequest ||
@@ -748,7 +865,9 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isEditorDialogOpen ||
         showPrivacyNotice ||
         showIdeRestartPrompt ||
-        !!proQuotaRequest;
+        !!proQuotaRequest ||
+        isAuthDialogOpen ||
+        authState === AuthState.AwaitingApiKeyInput;
     const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
     const uiState = useMemo(() => ({
         history: historyManager.history,
@@ -760,6 +879,8 @@ Logging in with Google... Please restart Gemini CLI to continue.
         authError,
         authMessage: authError ?? '',
         isAuthDialogOpen,
+        isAwaitingApiKeyInput: authState === AuthState.AwaitingApiKeyInput,
+        apiKeyDefaultValue,
         editorError,
         isEditorDialogOpen,
         showPrivacyNotice,
@@ -797,20 +918,20 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
+        showFullTodos,
         filteredConsoleMessages,
         ideContextState,
-        showToolDescriptions,
-        ctrlCPressedOnce,
-        ctrlDPressedOnce,
+        renderMarkdown,
+        ctrlCPressedOnce: ctrlCPressCount >= 1,
+        ctrlDPressedOnce: ctrlDPressCount >= 1,
         showEscapePrompt,
         isFocused,
         elapsedTime,
         currentLoadingPhrase,
         historyRemountKey,
         messageQueue,
+        queueErrorMessage,
         showAutoAcceptIndicator,
-        showWorkspaceMigrationDialog,
-        workspaceExtensions,
         currentModel,
         userTier,
         proQuotaRequest,
@@ -838,6 +959,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         activePtyId,
         embeddedShellFocused,
         showDebugProfiler,
+        copyModeEnabled,
     }), [
         isThemeDialogOpen,
         themeError,
@@ -877,20 +999,20 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
+        showFullTodos,
         filteredConsoleMessages,
         ideContextState,
-        showToolDescriptions,
-        ctrlCPressedOnce,
-        ctrlDPressedOnce,
+        renderMarkdown,
+        ctrlCPressCount,
+        ctrlDPressCount,
         showEscapePrompt,
         isFocused,
         elapsedTime,
         currentLoadingPhrase,
         historyRemountKey,
         messageQueue,
+        queueErrorMessage,
         showAutoAcceptIndicator,
-        showWorkspaceMigrationDialog,
-        workspaceExtensions,
         userTier,
         proQuotaRequest,
         contextFileNames,
@@ -920,10 +1042,14 @@ Logging in with Google... Please restart Gemini CLI to continue.
         embeddedShellFocused,
         awaitingFeedback,
         showDebugProfiler,
+        apiKeyDefaultValue,
+        authState,
+        copyModeEnabled,
     ]);
     const exitPrivacyNotice = useCallback(() => setShowPrivacyNotice(false), [setShowPrivacyNotice]);
     const uiActions = useMemo(() => ({
         handleThemeSelect,
+        closeThemeDialog,
         handleThemeHighlight,
         handleAuthSelect,
         setAuthState,
@@ -943,11 +1069,14 @@ Logging in with Google... Please restart Gemini CLI to continue.
         refreshStatic,
         handleFinalSubmit,
         handleClearScreen,
-        onWorkspaceMigrationDialogOpen,
-        onWorkspaceMigrationDialogClose,
         handleProQuotaChoice,
+        setQueueErrorMessage,
+        popAllMessages,
+        handleApiKeySubmit,
+        handleApiKeyCancel,
     }), [
         handleThemeSelect,
+        closeThemeDialog,
         handleThemeHighlight,
         handleAuthSelect,
         setAuthState,
@@ -967,9 +1096,11 @@ Logging in with Google... Please restart Gemini CLI to continue.
         refreshStatic,
         handleFinalSubmit,
         handleClearScreen,
-        onWorkspaceMigrationDialogOpen,
-        onWorkspaceMigrationDialogClose,
         handleProQuotaChoice,
+        setQueueErrorMessage,
+        popAllMessages,
+        handleApiKeySubmit,
+        handleApiKeyCancel,
     ]);
     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,