@machina.ai/cell-cli 1.0.21-rc4 → 1.4.0-rc1

package/dist/src/ui/App.js

@@ -6,13 +6,14 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  */
 import { useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import { Box, measureElement, Static, Text, useStdin, useStdout, } from 'ink';
-import { StreamingState, MessageType } from './types.js';
+import { StreamingState, MessageType, ToolCallStatus, } from './types.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { useGeminiStream } from './hooks/useGeminiStream.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
 import { useThemeCommand } from './hooks/useThemeCommand.js';
 import { useAuthCommand } from './hooks/useAuthCommand.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
+import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import { useEditorSettings } from './hooks/useEditorSettings.js';
 import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
@@ -41,9 +42,10 @@ import { DetailedMessagesDisplay } from './components/DetailedMessagesDisplay.js
 import { HistoryItemDisplay } from './components/HistoryItemDisplay.js';
 import { ContextSummaryDisplay } from './components/ContextSummaryDisplay.js';
 import { useHistory } from './hooks/useHistoryManager.js';
+import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
 import process from 'node:process';
-import { getErrorMessage, getAllGeminiMdFilenames, ApprovalMode, isEditorAvailable, FlashFallbackEvent, logFlashFallback, AuthType, ideContext, } from '@machina.ai/cell-cli-core';
-import { IdeIntegrationNudge, } from './IdeIntegrationNudge.js';
+import { ApprovalMode, getAllGeminiMdFilenames, isEditorAvailable, getErrorMessage, AuthType, logFlashFallback, FlashFallbackEvent, ideContext, isProQuotaExceededError, isGenericQuotaExceededError, UserTierId, DEFAULT_GEMINI_FLASH_MODEL, IdeClient, } from '@google/gemini-cli-core';
+import { IdeIntegrationNudge } from './IdeIntegrationNudge.js';
 import { validateAuthMethod } from '../config/auth.js';
 import { useLogger } from './hooks/useLogger.js';
 import { StreamingContext } from './contexts/StreamingContext.js';
@@ -58,24 +60,35 @@ import { useKeypress } from './hooks/useKeypress.js';
 import { KeypressProvider } from './contexts/KeypressContext.js';
 import { useKittyKeyboardProtocol } from './hooks/useKittyKeyboardProtocol.js';
 import { keyMatchers, Command } from './keyMatchers.js';
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import { UpdateNotification } from './components/UpdateNotification.js';
-import { isProQuotaExceededError, isGenericQuotaExceededError, UserTierId, } from '@machina.ai/cell-cli-core';
 import ansiEscapes from 'ansi-escapes';
 import { OverflowProvider } from './contexts/OverflowContext.js';
 import { ShowMoreLines } from './components/ShowMoreLines.js';
 import { PrivacyNotice } from './privacy/PrivacyNotice.js';
 import { useSettingsCommand } from './hooks/useSettingsCommand.js';
 import { SettingsDialog } from './components/SettingsDialog.js';
+import { ProQuotaDialog } from './components/ProQuotaDialog.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { appEvents, AppEvent } from '../utils/events.js';
 import { isNarrowWidth } from './utils/isNarrowWidth.js';
+import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js';
+import { WorkspaceMigrationDialog } from './components/WorkspaceMigrationDialog.js';
+import { isWorkspaceTrusted } from '../config/trustedFolders.js';
 const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
 // Maximum number of queued messages to display in UI to prevent performance issues
 const MAX_DISPLAYED_QUEUED_MESSAGES = 3;
+function isToolExecuting(pendingHistoryItems) {
+    return pendingHistoryItems.some((item) => {
+        if (item && item.type === 'tool_group') {
+            return item.tools.some((tool) => ToolCallStatus.Executing === tool.status);
+        }
+        return false;
+    });
+}
 export const AppWrapper = (props) => {
     const kittyProtocolStatus = useKittyKeyboardProtocol();
-    return (_jsx(KeypressProvider, { kittyProtocolEnabled: kittyProtocolStatus.enabled, config: props.config, children: _jsx(SessionStatsProvider, { children: _jsx(VimModeProvider, { settings: props.settings, children: _jsx(App, { ...props }) }) }) }));
+    return (_jsx(KeypressProvider, { kittyProtocolEnabled: kittyProtocolStatus.enabled, config: props.config, debugKeystrokeLogging: props.settings.merged.general?.debugKeystrokeLogging, children: _jsx(SessionStatsProvider, { children: _jsx(VimModeProvider, { settings: props.settings, children: _jsx(App, { ...props }) }) }) }));
 };
 const App = ({ config, settings, startupWarnings = [], version }) => {
     const isFocused = useFocus();
@@ -85,13 +98,20 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     const nightly = version.includes('nightly');
     const { history, addItem, clearItems, loadHistory } = useHistory();
     const [idePromptAnswered, setIdePromptAnswered] = useState(false);
-    const currentIDE = config.getIdeClient().getCurrentIde();
+    const [currentIDE, setCurrentIDE] = useState();
     useEffect(() => {
-        registerCleanup(() => config.getIdeClient().disconnect());
+        (async () => {
+            const ideClient = await IdeClient.getInstance();
+            setCurrentIDE(ideClient.getCurrentIde());
+        })();
+        registerCleanup(async () => {
+            const ideClient = await IdeClient.getInstance();
+            ideClient.disconnect();
+        });
     }, [config]);
     const shouldShowIdePrompt = currentIDE &&
         !config.getIdeMode() &&
-        !settings.merged.hasSeenIdeIntegrationNudge &&
+        !settings.merged.ide?.hasSeenNudge &&
         !idePromptAnswered;
     useEffect(() => {
         const cleanup = setUpdateHandler(addItem, setUpdateInfo);
@@ -120,7 +140,7 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     const [editorError, setEditorError] = useState(null);
     const [footerHeight, setFooterHeight] = useState(0);
     const [corgiMode, setCorgiMode] = useState(false);
-    const [isTrustedFolderState, setIsTrustedFolder] = useState(config.isTrustedFolder());
+    const [isTrustedFolderState, setIsTrustedFolder] = useState(isWorkspaceTrusted(settings.merged));
     const [currentModel, setCurrentModel] = useState(config.getModel());
     const [shellModeActive, setShellModeActive] = useState(false);
     const [showErrorDetails, setShowErrorDetails] = useState(false);
@@ -136,7 +156,11 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     const [userTier, setUserTier] = useState(undefined);
     const [ideContextState, setIdeContextState] = useState();
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
+    const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
     const [isProcessing, setIsProcessing] = useState(false);
+    const { showWorkspaceMigrationDialog, workspaceExtensions, onWorkspaceMigrationDialogOpen, onWorkspaceMigrationDialogClose, } = useWorkspaceMigration(settings);
+    const [isProQuotaDialogOpen, setIsProQuotaDialogOpen] = useState(false);
+    const [proQuotaDialogResolver, setProQuotaDialogResolver] = useState(null);
     useEffect(() => {
         const unsubscribe = ideContext.subscribeToIdeContext(setIdeContextState);
         // Set the initial value
@@ -174,19 +198,40 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         .reduce((total, msg) => total + msg.count, 0), [consoleMessages]);
     const { isThemeDialogOpen, openThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, addItem);
     const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
-    const { isFolderTrustDialogOpen, handleFolderTrustSelect } = useFolderTrust(settings, setIsTrustedFolder);
+    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder);
+    const { needsRestart: ideNeedsRestart } = useIdeTrustListener();
+    useEffect(() => {
+        if (ideNeedsRestart) {
+            // IDE trust changed, force a restart.
+            setShowIdeRestartPrompt(true);
+        }
+    }, [ideNeedsRestart]);
+    useKeypress((key) => {
+        if (key.name === 'r' || key.name === 'R') {
+            process.exit(0);
+        }
+    }, { isActive: showIdeRestartPrompt });
     const { isAuthDialogOpen, openAuthDialog, handleAuthSelect, isAuthenticating, cancelAuthentication, authMessage, } = useAuthCommand(settings, setAuthError, config);
     useEffect(() => {
-        if (settings.merged.selectedAuthType && !settings.merged.useExternalAuth) {
-            const error = validateAuthMethod(settings.merged.selectedAuthType);
+        if (settings.merged.security?.auth?.enforcedType &&
+            settings.merged.security?.auth.selectedType &&
+            settings.merged.security?.auth.enforcedType !==
+                settings.merged.security?.auth.selectedType) {
+            setAuthError(`Authentication is enforced to be ${settings.merged.security?.auth.enforcedType}, but you are currently using ${settings.merged.security?.auth.selectedType}.`);
+            openAuthDialog();
+        }
+        else if (settings.merged.security?.auth?.selectedType &&
+            !settings.merged.security?.auth?.useExternal) {
+            const error = validateAuthMethod(settings.merged.security.auth.selectedType);
             if (error) {
                 setAuthError(error);
                 openAuthDialog();
             }
         }
     }, [
-        settings.merged.selectedAuthType,
-        settings.merged.useExternalAuth,
+        settings.merged.security?.auth?.selectedType,
+        settings.merged.security?.auth?.enforcedType,
+        settings.merged.security?.auth?.useExternal,
         openAuthDialog,
         setAuthError,
     ]);
@@ -207,9 +252,9 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
             text: 'Refreshing hierarchical memory (GEMINI.md or other context files)...',
         }, Date.now());
         try {
-            const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(process.cwd(), settings.merged.loadMemoryFromIncludeDirectories
+            const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(process.cwd(), settings.merged.context?.loadMemoryFromIncludeDirectories
                 ? config.getWorkspaceContext().getDirectories()
-                : [], config.getDebugMode(), config.getFileService(), settings.merged, config.getExtensionContextFilePaths(), settings.merged.memoryImportFormat || 'tree', // Use setting or default to 'tree'
+                : [], config.getDebugMode(), config.getFileService(), settings.merged, config.getExtensionContextFilePaths(), config.getFolderTrust(), settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
             config.getFileFilteringOptions());
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);
@@ -247,6 +292,11 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     // Set up Flash fallback handler
     useEffect(() => {
         const flashFallbackHandler = async (currentModel, fallbackModel, error) => {
+            // Check if we've already switched to the fallback model
+            if (config.isInFallbackMode()) {
+                // If we're already in fallback mode, don't show the dialog again
+                return false;
+            }
             let message;
             if (config.getContentGeneratorConfig().authType ===
                 AuthType.LOGIN_WITH_GOOGLE) {
@@ -256,12 +306,12 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
                 if (error && isProQuotaExceededError(error)) {
                     if (isPaidTier) {
                         message = `⚡ You have reached your daily ${currentModel} quota limit.
-⚡ Automatically switching from ${currentModel} to ${fallbackModel} for the remainder of this session.
+⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
 ⚡ To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
                     }
                     else {
                         message = `⚡ You have reached your daily ${currentModel} quota limit.
-⚡ Automatically switching from ${currentModel} to ${fallbackModel} for the remainder of this session.
+⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
 ⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
 ⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
 ⚡ You can switch authentication methods by typing /auth`;
@@ -302,6 +352,29 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
                     type: MessageType.INFO,
                     text: message,
                 }, Date.now());
+                // For Pro quota errors, show the dialog and wait for user's choice
+                if (error && isProQuotaExceededError(error)) {
+                    // Set the flag to prevent tool continuation
+                    setModelSwitchedFromQuotaError(true);
+                    // Set global quota error flag to prevent Flash model calls
+                    config.setQuotaErrorOccurred(true);
+                    // Show the ProQuotaDialog and wait for user's choice
+                    const shouldContinueWithFallback = await new Promise((resolve) => {
+                        setIsProQuotaDialogOpen(true);
+                        setProQuotaDialogResolver(() => resolve);
+                    });
+                    // If user chose to continue with fallback, we don't need to stop the current prompt
+                    if (shouldContinueWithFallback) {
+                        // Switch to fallback model for future use
+                        config.setModel(fallbackModel);
+                        config.setFallbackMode(true);
+                        logFlashFallback(config, new FlashFallbackEvent(config.getContentGeneratorConfig().authType));
+                        return true; // Continue with current prompt using fallback model
+                    }
+                    // If user chose to authenticate, stop current prompt
+                    return false;
+                }
+                // For other quota errors, automatically switch to fallback model
                 // Set the flag to prevent tool continuation
                 setModelSwitchedFromQuotaError(true);
                 // Set global quota error flag to prevent Flash model calls
@@ -333,7 +406,7 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         }
     }, []);
     const getPreferredEditor = useCallback(() => {
-        const editorType = settings.merged.preferredEditor;
+        const editorType = settings.merged.general?.preferredEditor;
         const isValidEditor = isEditorAvailable(editorType);
         if (!isValidEditor) {
             openEditorDialog();
@@ -356,10 +429,12 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         isValidPath,
         shellModeActive,
     });
-    const [userMessages, setUserMessages] = useState([]);
+    // Independent input history management (unaffected by /clear)
+    const inputHistoryStore = useInputHistoryStore();
     // Stable reference for cancel handler to avoid circular dependency
     const cancelHandlerRef = useRef(() => { });
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, } = useGeminiStream(config.getGeminiClient(), history, addItem, config, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, () => cancelHandlerRef.current());
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, } = useGeminiStream(config.getGeminiClient(), history, addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, () => cancelHandlerRef.current());
+    const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
     // Message queue for handling input during streaming
     const { messageQueue, addMessage, clearQueue, getQueuedMessagesText } = useMessageQueue({
         streamingState,
@@ -367,7 +442,11 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     });
     // Update the cancel handler with message queue support
     cancelHandlerRef.current = useCallback(() => {
-        const lastUserMessage = userMessages.at(-1);
+        if (isToolExecuting(pendingHistoryItems)) {
+            buffer.setText(''); // Just clear the prompt
+            return;
+        }
+        const lastUserMessage = inputHistoryStore.inputHistory.at(-1);
         let textToSet = lastUserMessage || '';
         // Append queued messages if any exist
         const queuedText = getQueuedMessagesText();
@@ -378,11 +457,23 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         if (textToSet) {
             buffer.setText(textToSet);
         }
-    }, [buffer, userMessages, getQueuedMessagesText, clearQueue]);
+    }, [
+        buffer,
+        inputHistoryStore.inputHistory,
+        getQueuedMessagesText,
+        clearQueue,
+        pendingHistoryItems,
+    ]);
     // Input handling - queue messages for processing
     const handleFinalSubmit = useCallback((submittedValue) => {
+        const trimmedValue = submittedValue.trim();
+        if (trimmedValue.length > 0) {
+            // Add to independent input history
+            inputHistoryStore.addInput(trimmedValue);
+        }
+        // Always add to message queue
         addMessage(submittedValue);
-    }, [addMessage]);
+    }, [addMessage, inputHistoryStore]);
     const handleIdePromptComplete = useCallback((result) => {
         if (result.userSelection === 'yes') {
             if (result.isExtensionPreInstalled) {
@@ -399,10 +490,8 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
     const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
-    const pendingHistoryItems = [...pendingSlashCommandHistoryItems];
-    pendingHistoryItems.push(...pendingGeminiHistoryItems);
-    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState);
-    const showAutoAcceptIndicator = useAutoAcceptIndicator({ config });
+    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui?.customWittyPhrases);
+    const showAutoAcceptIndicator = useAutoAcceptIndicator({ config, addItem });
     const handleExit = useCallback((pressedOnce, setPressedOnce, timerRef) => {
         if (pressedOnce) {
             if (timerRef.current) {
@@ -420,6 +509,10 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         }
     }, [handleSlashCommand]);
     const handleGlobalKeypress = useCallback((key) => {
+        // Debug log keystrokes if enabled
+        if (settings.merged.general?.debugKeystrokeLogging) {
+            console.log('[DEBUG] Keystroke:', JSON.stringify(key));
+        }
         let enteringConstrainHeightMode = false;
         if (!constrainHeight) {
             enteringConstrainHeightMode = true;
@@ -481,6 +574,7 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
         handleSlashCommand,
         isAuthenticating,
         cancelOngoingRequest,
+        settings.merged.general?.debugKeystrokeLogging,
     ]);
     useKeypress(handleGlobalKeypress, {
         isActive: true,
@@ -490,40 +584,16 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
             setGeminiMdFileCount(config.getGeminiMdFileCount());
         }
     }, [config, config.getGeminiMdFileCount]);
-    const logger = useLogger();
+    const logger = useLogger(config.storage);
+    // Initialize independent input history from logger
     useEffect(() => {
-        const fetchUserMessages = async () => {
-            const pastMessagesRaw = (await logger?.getPreviousUserMessages()) || []; // Newest first
-            const currentSessionUserMessages = history
-                .filter((item) => item.type === 'user' &&
-                typeof item.text === 'string' &&
-                item.text.trim() !== '')
-                .map((item) => item.text)
-                .reverse(); // Newest first, to match pastMessagesRaw sorting
-            // Combine, with current session messages being more recent
-            const combinedMessages = [
-                ...currentSessionUserMessages,
-                ...pastMessagesRaw,
-            ];
-            // Deduplicate consecutive identical messages from the combined list (still newest first)
-            const deduplicatedMessages = [];
-            if (combinedMessages.length > 0) {
-                deduplicatedMessages.push(combinedMessages[0]); // Add the newest one unconditionally
-                for (let i = 1; i < combinedMessages.length; i++) {
-                    if (combinedMessages[i] !== combinedMessages[i - 1]) {
-                        deduplicatedMessages.push(combinedMessages[i]);
-                    }
-                }
-            }
-            // Reverse to oldest first for useInputHistory
-            setUserMessages(deduplicatedMessages.reverse());
-        };
-        fetchUserMessages();
-    }, [history, logger]);
+        inputHistoryStore.initializeFromLogger(logger);
+    }, [logger, inputHistoryStore]);
     const isInputActive = (streamingState === StreamingState.Idle ||
         streamingState === StreamingState.Responding) &&
         !initError &&
-        !isProcessing;
+        !isProcessing &&
+        !isProQuotaDialogOpen;
     const handleClearScreen = useCallback(() => {
         clearItems();
         clearConsoleMessagesState();
@@ -569,12 +639,12 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     }, [consoleMessages, config]);
     const branchName = useGitBranchName(config.getTargetDir());
     const contextFileNames = useMemo(() => {
-        const fromSettings = settings.merged.contextFileName;
+        const fromSettings = settings.merged.context?.fileName;
         if (fromSettings) {
             return Array.isArray(fromSettings) ? fromSettings : [fromSettings];
         }
         return getAllGeminiMdFilenames();
-    }, [settings.merged.contextFileName]);
+    }, [settings.merged.context?.fileName]);
     const initialPrompt = useMemo(() => config.getQuestion(), [config]);
     const geminiClient = config.getGeminiClient();
     useEffect(() => {
@@ -610,13 +680,30 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
     const placeholder = vimModeEnabled
         ? "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode."
         : '  Type your message or @path/to/file';
+    const hideContextSummary = settings.merged.ui?.hideContextSummary ?? false;
     return (_jsx(StreamingContext.Provider, { value: streamingState, children: _jsxs(Box, { flexDirection: "column", width: "90%", children: [_jsx(Static, { items: [
-                        _jsxs(Box, { flexDirection: "column", children: [!settings.merged.hideBanner && (_jsx(Header, { version: version, nightly: nightly })), !settings.merged.hideTips && _jsx(Tips, { config: config })] }, "header"),
+                        _jsxs(Box, { flexDirection: "column", children: [!(settings.merged.ui?.hideBanner || config.getScreenReader()) && _jsx(Header, { version: version, nightly: nightly }), !(settings.merged.ui?.hideTips || config.getScreenReader()) && (_jsx(Tips, { config: config }))] }, "header"),
                         ...history.map((h) => (_jsx(HistoryItemDisplay, { terminalWidth: mainAreaWidth, availableTerminalHeight: staticAreaMaxItemHeight, item: h, isPending: false, config: config, commands: slashCommands }, h.id))),
                     ], children: (item) => item }, staticKey), _jsx(OverflowProvider, { children: _jsxs(Box, { ref: pendingHistoryItemRef, flexDirection: "column", children: [pendingHistoryItems.map((item, i) => (_jsx(HistoryItemDisplay, { availableTerminalHeight: constrainHeight ? availableTerminalHeight : undefined, terminalWidth: mainAreaWidth, 
                                 // TODO(taehykim): It seems like references to ids aren't necessary in
                                 // HistoryItemDisplay. Refactor later. Use a fake id for now.
-                                item: { ...item, id: 0 }, isPending: true, config: config, isFocused: !isEditorDialogOpen }, i))), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }), _jsxs(Box, { flexDirection: "column", ref: mainControlsRef, children: [updateInfo && _jsx(UpdateNotification, { message: updateInfo.message }), startupWarnings.length > 0 && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentYellow, paddingX: 1, marginY: 1, flexDirection: "column", children: startupWarnings.map((warning, index) => (_jsx(Text, { color: Colors.AccentYellow, children: warning }, index))) })), shouldShowIdePrompt && currentIDE ? (_jsx(IdeIntegrationNudge, { ide: currentIDE, onComplete: handleIdePromptComplete })) : isFolderTrustDialogOpen ? (_jsx(FolderTrustDialog, { onSelect: handleFolderTrustSelect })) : shellConfirmationRequest ? (_jsx(ShellConfirmationDialog, { request: shellConfirmationRequest })) : confirmationRequest ? (_jsxs(Box, { flexDirection: "column", children: [confirmationRequest.prompt, _jsx(Box, { paddingY: 1, children: _jsx(RadioButtonSelect, { isFocused: !!confirmationRequest, items: [
+                                item: { ...item, id: 0 }, isPending: true, config: config, isFocused: !isEditorDialogOpen }, i))), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }), _jsxs(Box, { flexDirection: "column", ref: mainControlsRef, children: [updateInfo && _jsx(UpdateNotification, { message: updateInfo.message }), startupWarnings.length > 0 && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentYellow, paddingX: 1, marginY: 1, flexDirection: "column", children: startupWarnings.map((warning, index) => (_jsx(Text, { color: Colors.AccentYellow, children: warning }, index))) })), showWorkspaceMigrationDialog ? (_jsx(WorkspaceMigrationDialog, { workspaceExtensions: workspaceExtensions, onOpen: onWorkspaceMigrationDialogOpen, onClose: onWorkspaceMigrationDialogClose })) : shouldShowIdePrompt && currentIDE ? (_jsx(IdeIntegrationNudge, { ide: currentIDE, onComplete: handleIdePromptComplete })) : isProQuotaDialogOpen ? (_jsx(ProQuotaDialog, { currentModel: config.getModel(), fallbackModel: DEFAULT_GEMINI_FLASH_MODEL, onChoice: (choice) => {
+                                setIsProQuotaDialogOpen(false);
+                                if (!proQuotaDialogResolver)
+                                    return;
+                                const resolveValue = choice !== 'auth';
+                                proQuotaDialogResolver(resolveValue);
+                                setProQuotaDialogResolver(null);
+                                if (choice === 'auth') {
+                                    openAuthDialog();
+                                }
+                                else {
+                                    addItem({
+                                        type: MessageType.INFO,
+                                        text: 'Switched to fallback model. Tip: Press Ctrl+P to recall your previous prompt and submit it again if you wish.',
+                                    }, Date.now());
+                                }
+                            } })) : showIdeRestartPrompt ? (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentYellow, paddingX: 1, children: _jsx(Text, { color: Colors.AccentYellow, children: "Workspace trust has changed. Press 'r' to restart Gemini to apply the changes." }) })) : isFolderTrustDialogOpen ? (_jsx(FolderTrustDialog, { onSelect: handleFolderTrustSelect, isRestarting: isRestarting })) : shellConfirmationRequest ? (_jsx(ShellConfirmationDialog, { request: shellConfirmationRequest })) : confirmationRequest ? (_jsxs(Box, { flexDirection: "column", children: [confirmationRequest.prompt, _jsx(Box, { paddingY: 1, children: _jsx(RadioButtonSelect, { isFocused: !!confirmationRequest, items: [
                                             { label: 'Yes', value: true },
                                             { label: 'No', value: false },
                                         ], onSelect: (value) => {
@@ -628,9 +715,11 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
                                         cancelAuthentication();
                                         openAuthDialog();
                                     }, authMessage: authMessage }), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }))] })) : isAuthDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AuthDialog, { onSelect: handleAuthSelect, settings: settings, initialErrorMessage: authError }) })) : isEditorDialogOpen ? (_jsxs(Box, { flexDirection: "column", children: [editorError && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: Colors.AccentRed, children: editorError }) })), _jsx(EditorSettingsDialog, { onSelect: handleEditorSelect, settings: settings, onExit: exitEditorDialog })] })) : showPrivacyNotice ? (_jsx(PrivacyNotice, { onExit: () => setShowPrivacyNotice(false), config: config })) : (_jsxs(_Fragment, { children: [_jsx(LoadingIndicator, { thought: streamingState === StreamingState.WaitingForConfirmation ||
-                                        config.getAccessibility()?.disableLoadingPhrases
+                                        config.getAccessibility()?.disableLoadingPhrases ||
+                                        config.getScreenReader()
                                         ? undefined
-                                        : thought, currentLoadingPhrase: config.getAccessibility()?.disableLoadingPhrases
+                                        : thought, currentLoadingPhrase: config.getAccessibility()?.disableLoadingPhrases ||
+                                        config.getScreenReader()
                                         ? undefined
                                         : currentLoadingPhrase, elapsedTime: elapsedTime }), messageQueue.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [messageQueue
                                             .slice(0, MAX_DISPLAYED_QUEUED_MESSAGES)
@@ -641,10 +730,9 @@ const App = ({ config, settings, startupWarnings = [], version }) => {
                                             return (
                                             // Ensure the Box takes full width so truncation calculates correctly
                                             _jsx(Box, { paddingLeft: 2, width: "100%", children: _jsx(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index));
-                                        }), messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (_jsx(Box, { paddingLeft: 2, children: _jsxs(Text, { dimColor: true, children: ["... (+", messageQueue.length -
-                                                        MAX_DISPLAYED_QUEUED_MESSAGES, ' ', "more)"] }) }))] })), _jsxs(Box, { marginTop: 1, justifyContent: "space-between", width: "100%", flexDirection: isNarrow ? 'column' : 'row', alignItems: isNarrow ? 'flex-start' : 'center', children: [_jsxs(Box, { children: [process.env['GEMINI_SYSTEM_MD'] && (_jsx(Text, { color: Colors.AccentRed, children: "|\u2310\u25A0_\u25A0| " })), ctrlCPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+C again to exit." })) : ctrlDPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+D again to exit." })) : showEscapePrompt ? (_jsx(Text, { color: Colors.Gray, children: "Press Esc again to clear." })) : (_jsx(ContextSummaryDisplay, { ideContext: ideContextState, geminiMdFileCount: geminiMdFileCount, contextFileNames: contextFileNames, mcpServers: config.getMcpServers(), blockedMcpServers: config.getBlockedMcpServers(), showToolDescriptions: showToolDescriptions }))] }), _jsxs(Box, { paddingTop: isNarrow ? 1 : 0, children: [showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
-                                                    !shellModeActive && (_jsx(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator })), shellModeActive && _jsx(ShellModeIndicator, {})] })] }), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) })), isInputActive && (_jsx(InputPrompt, { buffer: buffer, inputWidth: inputWidth, suggestionsWidth: suggestionsWidth, onSubmit: handleFinalSubmit, userMessages: userMessages, onClearScreen: handleClearScreen, config: config, slashCommands: slashCommands, commandContext: commandContext, shellModeActive: shellModeActive, setShellModeActive: setShellModeActive, onEscapePromptChange: handleEscapePromptChange, focus: isFocused, vimHandleInput: vimHandleInput, placeholder: placeholder }))] })), initError && streamingState !== StreamingState.Responding && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentRed, paddingX: 1, marginBottom: 1, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text ? (_jsx(Text, { color: Colors.AccentRed, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: Colors.AccentRed, children: ["Initialization Error: ", initError] }), _jsxs(Text, { color: Colors.AccentRed, children: [' ', "Please check API key and configuration."] })] })) })), !settings.merged.hideFooter && (_jsx(Footer, { model: currentModel, targetDir: config.getTargetDir(), debugMode: config.getDebugMode(), branchName: branchName, debugMessage: debugMessage, corgiMode: corgiMode, errorCount: errorCount, showErrorDetails: showErrorDetails, showMemoryUsage: config.getDebugMode() ||
-                                settings.merged.showMemoryUsage ||
-                                false, promptTokenCount: sessionStats.lastPromptTokenCount, nightly: nightly, vimMode: vimModeEnabled ? vimMode : undefined, isTrustedFolder: isTrustedFolderState }))] })] }) }));
+                                        }), messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (_jsx(Box, { paddingLeft: 2, children: _jsxs(Text, { dimColor: true, children: ["... (+", messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES, "more)"] }) }))] })), _jsxs(Box, { marginTop: 1, justifyContent: hideContextSummary ? 'flex-start' : 'space-between', width: "100%", flexDirection: isNarrow ? 'column' : 'row', alignItems: isNarrow ? 'flex-start' : 'center', children: [_jsxs(Box, { children: [process.env['CELL_SYSTEM_MD'] && (_jsx(Text, { color: Colors.AccentRed, children: "|\u2310\u25A0_\u25A0| " })), ctrlCPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+C again to exit." })) : ctrlDPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+D again to exit." })) : showEscapePrompt ? (_jsx(Text, { color: Colors.Gray, children: "Press Esc again to clear." })) : !hideContextSummary ? (_jsx(ContextSummaryDisplay, { ideContext: ideContextState, geminiMdFileCount: geminiMdFileCount, contextFileNames: contextFileNames, mcpServers: config.getMcpServers(), blockedMcpServers: config.getBlockedMcpServers(), showToolDescriptions: showToolDescriptions })) : null] }), _jsxs(Box, { paddingTop: isNarrow ? 1 : 0, marginLeft: hideContextSummary ? 1 : 2, children: [showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
+                                                    !shellModeActive && (_jsx(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator })), shellModeActive && _jsx(ShellModeIndicator, {})] })] }), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) })), isInputActive && (_jsx(InputPrompt, { buffer: buffer, inputWidth: inputWidth, suggestionsWidth: suggestionsWidth, onSubmit: handleFinalSubmit, userMessages: inputHistoryStore.inputHistory, onClearScreen: handleClearScreen, config: config, slashCommands: slashCommands, commandContext: commandContext, shellModeActive: shellModeActive, setShellModeActive: setShellModeActive, onEscapePromptChange: handleEscapePromptChange, focus: isFocused, vimHandleInput: vimHandleInput, placeholder: placeholder }))] })), initError && streamingState !== StreamingState.Responding && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentRed, paddingX: 1, marginBottom: 1, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text ? (_jsx(Text, { color: Colors.AccentRed, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: Colors.AccentRed, children: ["Initialization Error: ", initError] }), _jsxs(Text, { color: Colors.AccentRed, children: [' ', "Please check API key and configuration."] })] })) })), !settings.merged.ui?.hideFooter && (_jsx(Footer, { model: currentModel, targetDir: config.getTargetDir(), debugMode: config.getDebugMode(), branchName: branchName, debugMessage: debugMessage, corgiMode: corgiMode, errorCount: errorCount, showErrorDetails: showErrorDetails, showMemoryUsage: config.getDebugMode() ||
+                                settings.merged.ui?.showMemoryUsage ||
+                                false, promptTokenCount: sessionStats.lastPromptTokenCount, nightly: nightly, vimMode: vimModeEnabled ? vimMode : undefined, isTrustedFolder: isTrustedFolderState, hideCWD: settings.merged.ui?.footer?.hideCWD, hideSandboxStatus: settings.merged.ui?.footer?.hideSandboxStatus, hideModelInfo: settings.merged.ui?.footer?.hideModelInfo }))] })] }) }));
 };
 //# sourceMappingURL=App.js.map