@google/gemini-cli 0.30.1 → 0.31.0-preview.1

package/dist/src/ui/AppContainer.js

@@ -15,7 +15,7 @@ import { AuthState, } from './types.js';
 import { checkPermissions } from './hooks/atCommandProcessor.js';
 import { MessageType, StreamingState } from './types.js';
 import { ToolActionsProvider } from './contexts/ToolActionsContext.js';
-import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, flattenMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, generateSummary, ChangeAuthRequestedError, CoreToolCallStatus, } from '@google/gemini-cli-core';
+import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, flattenMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, generateSummary, ChangeAuthRequestedError, CoreToolCallStatus, generateSteeringAckMessage, buildUserSteeringHintPrompt, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
@@ -28,6 +28,7 @@ import { useSettingsCommand } from './hooks/useSettingsCommand.js';
 import { useModelCommand } from './hooks/useModelCommand.js';
 import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
 import { useVimMode } from './contexts/VimModeContext.js';
+import { useOverflowActions, useOverflowState, } from './contexts/OverflowContext.js';
 import { useConsoleMessages } from './hooks/useConsoleMessages.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { calculatePromptWidths } from './components/InputPrompt.js';
@@ -75,9 +76,10 @@ import { useSettings } from './contexts/SettingsContext.js';
 import { terminalCapabilityManager } from './utils/terminalCapabilityManager.js';
 import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
 import { useBanner } from './hooks/useBanner.js';
+import { useTerminalSetupPrompt } from './utils/terminalSetup.js';
 import { useHookDisplayState } from './hooks/useHookDisplayState.js';
 import { useBackgroundShellManager } from './hooks/useBackgroundShellManager.js';
-import { WARNING_PROMPT_DURATION_MS, QUEUE_ERROR_DISPLAY_DURATION_MS, } from './constants.js';
+import { WARNING_PROMPT_DURATION_MS, QUEUE_ERROR_DISPLAY_DURATION_MS, EXPAND_HINT_DURATION_MS, } from './constants.js';
 import { LoginWithGoogleRestartDialog } from './auth/LoginWithGoogleRestartDialog.js';
 import { NewAgentsChoice } from './components/NewAgentsNotification.js';
 import { isSlashCommand } from './utils/commandUtils.js';
@@ -85,6 +87,8 @@ import { useTerminalTheme } from './hooks/useTerminalTheme.js';
 import { useTimedMessage } from './hooks/useTimedMessage.js';
 import { shouldDismissShortcutsHelpOnHotkey } from './utils/shortcutsHelp.js';
 import { useSuspend } from './hooks/useSuspend.js';
+import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
+import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
 function isToolExecuting(pendingHistoryItems) {
     return pendingHistoryItems.some((item) => {
         if (item && item.type === 'tool_group') {
@@ -113,6 +117,8 @@ const SHELL_HEIGHT_PADDING = 10;
 export const AppContainer = (props) => {
     const { config, initializationResult, resumedSessionData } = props;
     const settings = useSettings();
+    const { reset } = useOverflowActions();
+    const notificationsEnabled = isNotificationsEnabled(settings);
     const historyManager = useHistory({
         chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
     });
@@ -143,6 +149,48 @@ export const AppContainer = (props) => {
     const [isTrustedFolder, setIsTrustedFolder] = useState(() => isWorkspaceTrusted(settings.merged).isTrusted);
     const [queueErrorMessage, setQueueErrorMessage] = useState(null);
     const [newAgents, setNewAgents] = useState(null);
+    const [constrainHeight, setConstrainHeight] = useState(true);
+    const [showIsExpandableHint, setShowIsExpandableHint] = useState(false);
+    const expandHintTimerRef = useRef(null);
+    const overflowState = useOverflowState();
+    const overflowingIdsSize = overflowState?.overflowingIds.size ?? 0;
+    const hasOverflowState = overflowingIdsSize > 0 || !constrainHeight;
+    /**
+     * Manages the visibility and x-second timer for the expansion hint.
+     *
+     * This effect triggers the timer countdown whenever an overflow is detected
+     * or the user manually toggles the expansion state with Ctrl+O. We use a stable
+     * boolean dependency (hasOverflowState) to ensure the timer only resets on
+     * genuine state transitions, preventing it from infinitely resetting during
+     * active text streaming.
+     */
+    useEffect(() => {
+        if (isAlternateBuffer) {
+            setShowIsExpandableHint(false);
+            if (expandHintTimerRef.current) {
+                clearTimeout(expandHintTimerRef.current);
+            }
+            return;
+        }
+        if (hasOverflowState) {
+            setShowIsExpandableHint(true);
+            if (expandHintTimerRef.current) {
+                clearTimeout(expandHintTimerRef.current);
+            }
+            expandHintTimerRef.current = setTimeout(() => {
+                setShowIsExpandableHint(false);
+            }, EXPAND_HINT_DURATION_MS);
+        }
+    }, [hasOverflowState, isAlternateBuffer, constrainHeight]);
+    /**
+     * Safe cleanup to ensure the expansion hint timer is cancelled when the
+     * component unmounts, preventing memory leaks.
+     */
+    useEffect(() => () => {
+        if (expandHintTimerRef.current) {
+            clearTimeout(expandHintTimerRef.current);
+        }
+    }, []);
     const [defaultBannerText, setDefaultBannerText] = useState('');
     const [warningBannerText, setWarningBannerText] = useState('');
     const [bannerVisible, setBannerVisible] = useState(true);
@@ -343,6 +391,11 @@ export const AppContainer = (props) => {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         initializeFromLogger(logger);
     }, [logger, initializeFromLogger]);
+    // One-time prompt to suggest running /terminal-setup when it would help.
+    useTerminalSetupPrompt({
+        addConfirmUpdateExtensionRequest,
+        addItem: historyManager.addItem,
+    });
     const refreshStatic = useCallback(() => {
         if (!isAlternateBuffer) {
             stdout.write(ansiEscapes.clearTerminal);
@@ -636,7 +689,28 @@ Logging in with Google... Restarting Gemini CLI to continue.
             }
         }
     }, [pendingRestorePrompt, inputHistory, historyManager.history]);
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, pendingToolCalls, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, backgroundShellCount, isBackgroundShellVisible, toggleBackgroundShell, backgroundCurrentShell, backgroundShells, dismissBackgroundShell, retryStatus, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
+    const pendingHintsRef = useRef([]);
+    const [pendingHintCount, setPendingHintCount] = useState(0);
+    const consumePendingHints = useCallback(() => {
+        if (pendingHintsRef.current.length === 0) {
+            return null;
+        }
+        const hint = pendingHintsRef.current.join('\n');
+        pendingHintsRef.current = [];
+        setPendingHintCount(0);
+        return hint;
+    }, []);
+    useEffect(() => {
+        const hintListener = (hint) => {
+            pendingHintsRef.current.push(hint);
+            setPendingHintCount((prev) => prev + 1);
+        };
+        config.userHintService.onUserHint(hintListener);
+        return () => {
+            config.userHintService.offUserHint(hintListener);
+        };
+    }, [config]);
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, pendingToolCalls, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, backgroundShellCount, isBackgroundShellVisible, toggleBackgroundShell, backgroundCurrentShell, backgroundShells, dismissBackgroundShell, retryStatus, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused, consumePendingHints);
     toggleBackgroundShellRef.current = toggleBackgroundShell;
     isBackgroundShellVisibleRef.current = isBackgroundShellVisible;
     backgroundShellsRef.current = backgroundShells;
@@ -711,9 +785,43 @@ Logging in with Google... Restarting Gemini CLI to continue.
         pendingSlashCommandHistoryItems,
         pendingGeminiHistoryItems,
     ]);
+    const handleHintSubmit = useCallback((hint) => {
+        const trimmed = hint.trim();
+        if (!trimmed) {
+            return;
+        }
+        config.userHintService.addUserHint(trimmed);
+        // Render hints with a distinct style.
+        historyManager.addItem({
+            type: 'hint',
+            text: trimmed,
+        });
+    }, [config, historyManager]);
     const handleFinalSubmit = useCallback(async (submittedValue) => {
+        reset();
+        // Explicitly hide the expansion hint and clear its x-second timer when a new turn begins.
+        setShowIsExpandableHint(false);
+        if (expandHintTimerRef.current) {
+            clearTimeout(expandHintTimerRef.current);
+        }
+        if (!constrainHeight) {
+            setConstrainHeight(true);
+            if (!isAlternateBuffer) {
+                refreshStatic();
+            }
+        }
         const isSlash = isSlashCommand(submittedValue.trim());
         const isIdle = streamingState === StreamingState.Idle;
+        const isAgentRunning = streamingState === StreamingState.Responding ||
+            isToolExecuting([
+                ...pendingSlashCommandHistoryItems,
+                ...pendingGeminiHistoryItems,
+            ]);
+        if (config.isModelSteeringEnabled() && isAgentRunning && !isSlash) {
+            handleHintSubmit(submittedValue);
+            addInput(submittedValue);
+            return;
+        }
         if (isSlash || (isIdle && isMcpReady)) {
             if (!isSlash) {
                 const permissions = await checkPermissions(submittedValue, config);
@@ -749,13 +857,33 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isMcpReady,
         streamingState,
         messageQueue.length,
+        pendingSlashCommandHistoryItems,
+        pendingGeminiHistoryItems,
         config,
+        constrainHeight,
+        setConstrainHeight,
+        isAlternateBuffer,
+        refreshStatic,
+        reset,
+        handleHintSubmit,
     ]);
     const handleClearScreen = useCallback(() => {
+        reset();
+        // Explicitly hide the expansion hint and clear its x-second timer when clearing the screen.
+        setShowIsExpandableHint(false);
+        if (expandHintTimerRef.current) {
+            clearTimeout(expandHintTimerRef.current);
+        }
         historyManager.clearItems();
         clearConsoleMessagesState();
         refreshStatic();
-    }, [historyManager, clearConsoleMessagesState, refreshStatic]);
+    }, [
+        historyManager,
+        clearConsoleMessagesState,
+        refreshStatic,
+        reset,
+        setShowIsExpandableHint,
+    ]);
     const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
     /**
      * Determines if the input prompt should be active and accept user input.
@@ -796,7 +924,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         showColor: settings.merged.tools.shell.showColor,
         sanitizationConfig: config.sanitizationConfig,
     });
-    const isFocused = useFocus();
+    const { isFocused, hasReceivedFocusEvent } = useFocus();
     // Context file names computation
     const contextFileNames = useMemo(() => {
         const fromSettings = settings.merged.context.fileName;
@@ -883,12 +1011,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
         windowMs: WARNING_PROMPT_DURATION_MS,
         onRepeat: handleExitRepeat,
     });
-    const [constrainHeight, setConstrainHeight] = useState(true);
     const [ideContextState, setIdeContextState] = useState();
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
     const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
     const [transientMessage, showTransientMessage] = useTimedMessage(WARNING_PROMPT_DURATION_MS);
-    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
+    const { isFolderTrustDialogOpen, discoveryResults: folderDiscoveryResults, handleFolderTrustSelect, isRestarting, } = useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
+    const policyUpdateConfirmationRequest = config.getPolicyUpdateConfirmationRequest();
+    const [isPolicyUpdateDialogOpen, setIsPolicyUpdateDialogOpen] = useState(!!policyUpdateConfirmationRequest);
     const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason, } = useIdeTrustListener();
     const isInitialMount = useRef(true);
     useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
@@ -1005,6 +1134,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
         streamingState,
         shouldShowFocusHint,
         retryStatus,
+        loadingPhrasesMode: settings.merged.ui.loadingPhrases,
+        customWittyPhrases: settings.merged.ui.customWittyPhrases,
     });
     const handleGlobalKeypress = useCallback((key) => {
         // Debug log keystrokes if enabled
@@ -1045,6 +1176,19 @@ Logging in with Google... Restarting Gemini CLI to continue.
         if (!constrainHeight) {
             enteringConstrainHeightMode = true;
             setConstrainHeight(true);
+            if (keyMatchers[Command.SHOW_MORE_LINES](key)) {
+                // If the user manually collapses the view, show the hint and reset the x-second timer.
+                setShowIsExpandableHint(true);
+                if (expandHintTimerRef.current) {
+                    clearTimeout(expandHintTimerRef.current);
+                }
+                expandHintTimerRef.current = setTimeout(() => {
+                    setShowIsExpandableHint(false);
+                }, EXPAND_HINT_DURATION_MS);
+            }
+            if (!isAlternateBuffer) {
+                refreshStatic();
+            }
         }
         if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
             if (settings.merged.general.devtools) {
@@ -1081,6 +1225,17 @@ Logging in with Google... Restarting Gemini CLI to continue.
         else if (keyMatchers[Command.SHOW_MORE_LINES](key) &&
             !enteringConstrainHeightMode) {
             setConstrainHeight(false);
+            // If the user manually expands the view, show the hint and reset the x-second timer.
+            setShowIsExpandableHint(true);
+            if (expandHintTimerRef.current) {
+                clearTimeout(expandHintTimerRef.current);
+            }
+            expandHintTimerRef.current = setTimeout(() => {
+                setShowIsExpandableHint(false);
+            }, EXPAND_HINT_DURATION_MS);
+            if (!isAlternateBuffer) {
+                refreshStatic();
+            }
             return true;
         }
         else if ((keyMatchers[Command.FOCUS_SHELL_INPUT](key) ||
@@ -1272,6 +1427,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     const dialogsVisible = (shouldShowRetentionWarning && retentionCheckComplete) ||
         shouldShowIdePrompt ||
         isFolderTrustDialogOpen ||
+        isPolicyUpdateDialogOpen ||
         adminSettingsChanged ||
         !!commandConfirmationRequest ||
         !!authConsentRequest ||
@@ -1296,11 +1452,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
         !!newAgents;
     const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
     const hasPendingToolConfirmation = useMemo(() => isToolAwaitingConfirmation(pendingHistoryItems), [pendingHistoryItems]);
+    const hasConfirmUpdateExtensionRequests = confirmUpdateExtensionRequests.length > 0;
+    const hasLoopDetectionConfirmationRequest = !!loopDetectionConfirmationRequest;
     const hasPendingActionRequired = hasPendingToolConfirmation ||
         !!commandConfirmationRequest ||
         !!authConsentRequest ||
-        confirmUpdateExtensionRequests.length > 0 ||
-        !!loopDetectionConfirmationRequest ||
+        hasConfirmUpdateExtensionRequests ||
+        hasLoopDetectionConfirmationRequest ||
         !!proQuotaRequest ||
         !!validationRequest ||
         !!customDialog;
@@ -1314,6 +1472,19 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isActive: !embeddedShellFocused,
         allowPlanMode,
     });
+    useRunEventNotifications({
+        notificationsEnabled,
+        isFocused,
+        hasReceivedFocusEvent,
+        streamingState,
+        hasPendingActionRequired,
+        pendingHistoryItems,
+        commandConfirmationRequest,
+        authConsentRequest,
+        permissionConfirmationRequest,
+        hasConfirmUpdateExtensionRequests,
+        hasLoopDetectionConfirmationRequest,
+    });
     const isPassiveShortcutsHelpState = isInputActive &&
         streamingState === StreamingState.Idle &&
         !hasPendingActionRequired;
@@ -1326,6 +1497,36 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isPassiveShortcutsHelpState,
         setShortcutsHelpVisible,
     ]);
+    useEffect(() => {
+        if (!isConfigInitialized ||
+            !config.isModelSteeringEnabled() ||
+            streamingState !== StreamingState.Idle ||
+            !isMcpReady ||
+            isToolAwaitingConfirmation(pendingHistoryItems)) {
+            return;
+        }
+        const pendingHint = consumePendingHints();
+        if (!pendingHint) {
+            return;
+        }
+        void generateSteeringAckMessage(config.getBaseLlmClient(), pendingHint).then((ackText) => {
+            historyManager.addItem({
+                type: 'info',
+                text: ackText,
+            });
+        });
+        void submitQuery([{ text: buildUserSteeringHintPrompt(pendingHint) }]);
+    }, [
+        config,
+        historyManager,
+        isConfigInitialized,
+        isMcpReady,
+        streamingState,
+        submitQuery,
+        consumePendingHints,
+        pendingHistoryItems,
+        pendingHintCount,
+    ]);
     const allToolCalls = useMemo(() => pendingHistoryItems
         .filter((item) => item.type === 'tool_group')
         .flatMap((item) => item.tools), [pendingHistoryItems]);
@@ -1343,8 +1544,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         let isMounted = true;
         const fetchBannerTexts = async () => {
             const [defaultBanner, warningBanner] = await Promise.all([
-                // TODO: temporarily disabling the banner, it will be re-added.
-                '',
+                config.getBannerTextNoCapacityIssues(),
                 config.getBannerTextCapacityIssues(),
             ]);
             if (isMounted) {
@@ -1409,6 +1609,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isResuming,
         shouldShowIdePrompt,
         isFolderTrustDialogOpen: isFolderTrustDialogOpen ?? false,
+        folderDiscoveryResults,
+        isPolicyUpdateDialogOpen,
+        policyUpdateConfirmationRequest,
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
@@ -1476,6 +1679,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isBackgroundShellListOpen,
         adminSettingsChanged,
         newAgents,
+        showIsExpandableHint,
+        hintMode: config.isModelSteeringEnabled() &&
+            isToolExecuting([
+                ...pendingSlashCommandHistoryItems,
+                ...pendingGeminiHistoryItems,
+            ]),
+        hintBuffer: '',
     }), [
         isThemeDialogOpen,
         shouldShowRetentionWarning,
@@ -1523,6 +1733,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isResuming,
         shouldShowIdePrompt,
         isFolderTrustDialogOpen,
+        folderDiscoveryResults,
+        isPolicyUpdateDialogOpen,
+        policyUpdateConfirmationRequest,
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
@@ -1591,6 +1804,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         backgroundShells,
         adminSettingsChanged,
         newAgents,
+        showIsExpandableHint,
     ]);
     const exitPrivacyNotice = useCallback(() => setShowPrivacyNotice(false), [setShowPrivacyNotice]);
     const uiActions = useMemo(() => ({
@@ -1613,6 +1827,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         vimHandleInput,
         handleIdePromptComplete,
         handleFolderTrustSelect,
+        setIsPolicyUpdateDialogOpen,
         setConstrainHeight,
         onEscapePromptChange: handleEscapePromptChange,
         refreshStatic,
@@ -1639,6 +1854,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
         setActiveBackgroundShellPid,
         setIsBackgroundShellListOpen,
         setAuthContext,
+        onHintInput: () => { },
+        onHintBackspace: () => { },
+        onHintClear: () => { },
+        onHintSubmit: () => { },
         handleRestart: async () => {
             if (process.send) {
                 const remoteSettings = config.getRemoteAdminSettings();
@@ -1688,6 +1907,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         vimHandleInput,
         handleIdePromptComplete,
         handleFolderTrustSelect,
+        setIsPolicyUpdateDialogOpen,
         setConstrainHeight,
         handleEscapePromptChange,
         refreshStatic,