@machina.ai/cell-cli 1.33.0-rc1 → 1.38.1-rc1

package/dist/src/ui/AppContainer.js

@@ -4,18 +4,19 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useMemo, useState, useCallback, useEffect, useRef, useLayoutEffect, } from 'react';
-import { measureElement } from 'ink';
+import { useMemo, useState, useCallback, useEffect, useRef, useLayoutEffect, useContext, } from 'react';
+import { ResizeObserver, useApp, useStdout, useStdin, AppContext as InkAppContext, } from 'ink';
 import { App } from './App.js';
 import { AppContext } from './contexts/AppContext.js';
 import { UIStateContext } from './contexts/UIStateContext.js';
 import { UIActionsContext, } from './contexts/UIActionsContext.js';
 import { ConfigContext } from './contexts/ConfigContext.js';
-import { ToolCallStatus, AuthState, } from './types.js';
+import { AuthState, MessageType, StreamingState, } 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, } from '@google/gemini-cli-core';
+import { MouseProvider } from './contexts/MouseContext.js';
+import { ScrollProvider } from './contexts/ScrollProvider.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, ProjectIdRequiredError, buildUserSteeringHintPrompt, logBillingEvent, ApiKeyUpdatedEvent, startMemoryService, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
@@ -28,10 +29,10 @@ 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 { useConsoleMessages } from './hooks/useConsoleMessages.js';
+import { useOverflowActions, useOverflowState, } from './contexts/OverflowContext.js';
+import { useErrorCount } from './hooks/useConsoleMessages.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { calculatePromptWidths } from './components/InputPrompt.js';
-import { useApp, useStdout, useStdin } from 'ink';
 import { calculateMainAreaWidth } from './utils/ui-sizing.js';
 import ansiEscapes from 'ansi-escapes';
 import { basename } from 'node:path';
@@ -39,13 +40,14 @@ import { computeTerminalTitle } from '../utils/windowTitle.js';
 import { useTextBuffer } from './components/shared/text-buffer.js';
 import { useLogger } from './hooks/useLogger.js';
 import { useGeminiStream } from './hooks/useGeminiStream.js';
-import {} from './hooks/shellCommandProcessor.js';
+import {} from './hooks/useExecutionLifecycle.js';
 import { useVim } from './hooks/vim.js';
 import { SettingScope } from '../config/settings.js';
 import {} from '../core/initializer.js';
 import { useFocus } from './hooks/useFocus.js';
 import { useKeypress } from './hooks/useKeypress.js';
-import { keyMatchers, Command } from './keyMatchers.js';
+import { KeypressPriority } from './contexts/KeypressContext.js';
+import { Command } from './key/keyMatchers.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
 import { useShellInactivityStatus } from './hooks/useShellInactivityStatus.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
@@ -55,7 +57,7 @@ import { appEvents, AppEvent, TransientMessageType } from '../utils/events.js';
 import {} from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
-import { RELAUNCH_EXIT_CODE } from '../utils/processUtils.js';
+import { relaunchApp } from '../utils/processUtils.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useMcpStatus } from './hooks/useMcpStatus.js';
 import { useApprovalModeIndicator } from './hooks/useApprovalModeIndicator.js';
@@ -70,33 +72,29 @@ import { useSessionBrowser } from './hooks/useSessionBrowser.js';
 import { useSessionResume } from './hooks/useSessionResume.js';
 import { useIncludeDirsTrust } from './hooks/useIncludeDirsTrust.js';
 import { isWorkspaceTrusted } from '../config/trustedFolders.js';
-import { useAlternateBuffer } from './hooks/useAlternateBuffer.js';
 import { useSettings } from './contexts/SettingsContext.js';
 import { 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 { useBackgroundTaskManager } from './hooks/useBackgroundTaskManager.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';
+import { parseSlashCommand } from '../utils/commands.js';
 import { useTerminalTheme } from './hooks/useTerminalTheme.js';
 import { useTimedMessage } from './hooks/useTimedMessage.js';
-import { isITerm2 } from './utils/terminalUtils.js';
-function isToolExecuting(pendingHistoryItems) {
-    return pendingHistoryItems.some((item) => {
-        if (item && item.type === 'tool_group') {
-            return item.tools.some((tool) => ToolCallStatus.Executing === tool.status);
-        }
-        return false;
-    });
-}
-function isToolAwaitingConfirmation(pendingHistoryItems) {
-    return pendingHistoryItems
-        .filter((item) => item.type === 'tool_group')
-        .some((item) => item.tools.some((tool) => ToolCallStatus.Confirming === tool.status));
-}
+import { useIsHelpDismissKey } from './utils/shortcutsHelp.js';
+import { useSuspend } from './hooks/useSuspend.js';
+import { useRunEventNotifications } from './hooks/useRunEventNotifications.js';
+import { isNotificationsEnabled } from '../utils/terminalNotifications.js';
+import { getLastTurnToolCallIds, isToolExecuting, isToolAwaitingConfirmation, getAllToolCalls, } from './utils/historyUtils.js';
+import { useRepeatedKeyPress } from './hooks/useRepeatedKeyPress.js';
+import { useVisibilityToggle, APPROVAL_MODE_REVEAL_DURATION_MS, } from './hooks/useVisibilityToggle.js';
+import { useKeyMatchers } from './hooks/useKeyMatchers.js';
+import { InputContext } from './contexts/InputContext.js';
 /**
  * The fraction of the terminal width to allocate to the shell.
  * This provides horizontal padding.
@@ -108,14 +106,33 @@ const SHELL_WIDTH_FRACTION = 0.89;
  */
 const SHELL_HEIGHT_PADDING = 10;
 export const AppContainer = (props) => {
+    const isHelpDismissKey = useIsHelpDismissKey();
+    const keyMatchers = useKeyMatchers();
     const { config, initializationResult, resumedSessionData } = props;
     const settings = useSettings();
+    const { reset } = useOverflowActions();
+    const notificationsEnabled = isNotificationsEnabled(settings);
+    const { setOptions, dumpCurrentFrame, startRecording, stopRecording } = useContext(InkAppContext);
+    const recordingFilenameRef = useRef(null);
     const historyManager = useHistory({
         chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
     });
     useMemoryMonitor(historyManager);
-    const isAlternateBuffer = useAlternateBuffer();
+    const isAlternateBuffer = config.getUseAlternateBuffer();
+    const [mouseMode, setMouseMode] = useState(() => config.getUseAlternateBuffer());
+    useEffect(() => {
+        setOptions({
+            stickyHeadersInBackbuffer: mouseMode,
+        });
+        if (mouseMode) {
+            enableMouseEvents();
+        }
+        else {
+            disableMouseEvents();
+        }
+    }, [mouseMode, setOptions]);
     const [corgiMode, setCorgiMode] = useState(false);
+    const [forceRerenderKey, setForceRerenderKey] = useState(0);
     const [debugMessage, setDebugMessage] = useState('');
     const [awaitingFeedback, setAwaitingFeedback] = useState(false);
     const [quittingMessages, setQuittingMessages] = useState(null);
@@ -127,10 +144,37 @@ export const AppContainer = (props) => {
     const [customDialog, setCustomDialog] = useState(null);
     const [copyModeEnabled, setCopyModeEnabled] = useState(false);
     const [pendingRestorePrompt, setPendingRestorePrompt] = useState(false);
-    const toggleBackgroundShellRef = useRef(() => { });
-    const isBackgroundShellVisibleRef = useRef(false);
-    const backgroundShellsRef = useRef(new Map());
+    const toggleBackgroundTasksRef = useRef(() => { });
+    const isBackgroundTaskVisibleRef = useRef(false);
+    const backgroundTasksRef = useRef(new Map());
     const [adminSettingsChanged, setAdminSettingsChanged] = useState(false);
+    const [expandedTools, setExpandedTools] = useState(new Set());
+    const toggleExpansion = useCallback((callId) => {
+        setExpandedTools((prev) => {
+            const next = new Set(prev);
+            if (next.has(callId)) {
+                next.delete(callId);
+            }
+            else {
+                next.add(callId);
+            }
+            return next;
+        });
+    }, []);
+    const toggleAllExpansion = useCallback((callIds) => {
+        setExpandedTools((prev) => {
+            const next = new Set(prev);
+            const anyCollapsed = callIds.some((id) => !next.has(id));
+            if (anyCollapsed) {
+                callIds.forEach((id) => next.add(id));
+            }
+            else {
+                callIds.forEach((id) => next.delete(id));
+            }
+            return next;
+        });
+    }, []);
+    const isExpanded = useCallback((callId) => expandedTools.has(callId), [expandedTools]);
     const [shellModeActive, setShellModeActive] = useState(false);
     const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = useState(false);
     const [historyRemountKey, setHistoryRemountKey] = useState(0);
@@ -138,8 +182,30 @@ export const AppContainer = (props) => {
     const activeHooks = useHookDisplayState();
     const [updateInfo, setUpdateInfo] = useState(null);
     const [isTrustedFolder, setIsTrustedFolder] = useState(() => isWorkspaceTrusted(settings.merged).isTrusted);
-    const [queueErrorMessage, setQueueErrorMessage] = useState(null);
+    const [queueErrorMessage, setQueueErrorMessage] = useTimedMessage(QUEUE_ERROR_DISPLAY_DURATION_MS);
     const [newAgents, setNewAgents] = useState(null);
+    const [constrainHeight, setConstrainHeight] = useState(true);
+    const [expandHintTrigger, triggerExpandHint] = useTimedMessage(EXPAND_HINT_DURATION_MS);
+    const showIsExpandableHint = Boolean(expandHintTrigger);
+    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.
+     * By depending on overflowingIdsSize, the timer resets when *new* views
+     * overflow, but avoids infinitely resetting during single-view streaming.
+     *
+     * In alternate buffer mode, we don't trigger the hint automatically on overflow
+     * to avoid noise, but the user can still trigger it manually with Ctrl+O.
+     */
+    useEffect(() => {
+        if (hasOverflowState) {
+            triggerExpandHint(true);
+        }
+    }, [hasOverflowState, overflowingIdsSize, triggerExpandHint]);
     const [defaultBannerText, setDefaultBannerText] = useState('');
     const [warningBannerText, setWarningBannerText] = useState('');
     const [bannerVisible, setBannerVisible] = useState(true);
@@ -194,6 +260,7 @@ export const AppContainer = (props) => {
             ? { remaining, limit, resetTime }
             : undefined;
     });
+    const [paidTier, setPaidTier] = useState(undefined);
     const [isConfigInitialized, setConfigInitialized] = useState(false);
     const logger = useLogger(config.storage);
     const { inputHistory, addInput, initializeFromLogger } = useInputHistoryStore();
@@ -208,7 +275,6 @@ export const AppContainer = (props) => {
     const feedbackService = useMemo(() => new FeedbackService(config), [config]);
     const feedbackPromiseResolveRef = useRef(() => { });
     // Layout measurements
-    const mainControlsRef = useRef(null);
     // For performance profiling only
     const rootUiRef = useRef(null);
     const lastTitleRef = useRef(null);
@@ -218,9 +284,17 @@ export const AppContainer = (props) => {
         (async () => {
             // Note: the program will not work if this fails so let errors be
             // handled by the global catch.
-            await config.initialize();
+            if (!config.isInitialized()) {
+                await config.initialize();
+            }
             setConfigInitialized(true);
             startupProfiler.flush(config);
+            // Fire-and-forget memory service (skill extraction from past sessions)
+            if (config.isMemoryManagerEnabled()) {
+                startMemoryService(config).catch((e) => {
+                    debugLogger.error('Failed to start memory service:', e);
+                });
+            }
             const sessionStartSource = resumedSessionData
                 ? SessionStartSource.Resume
                 : SessionStartSource.Startup;
@@ -254,9 +328,7 @@ export const AppContainer = (props) => {
             // Turn off mouse scroll.
             disableMouseEvents();
             // Kill all background shells
-            for (const pid of backgroundShellsRef.current.keys()) {
-                ShellExecutionService.kill(pid);
-            }
+            await Promise.all(Array.from(backgroundTasksRef.current.keys()).map((pid) => ShellExecutionService.kill(pid)));
             const ideClient = await IdeClient.getInstance();
             await ideClient.disconnect();
             // Fire SessionEnd hook on cleanup (only if hooks are enabled)
@@ -307,9 +379,9 @@ export const AppContainer = (props) => {
             coreEvents.off(CoreEvent.AdminSettingsChanged, handleAdminSettingsChanged);
             coreEvents.off(CoreEvent.AgentsDiscovered, handleAgentsDiscovered);
         };
-    }, []);
-    const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } = useConsoleMessages();
-    const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
+    }, [settings]);
+    const { errorCount, clearErrorCount } = useErrorCount();
+    const mainAreaWidth = calculateMainAreaWidth(terminalWidth, config);
     // Derive widths for InputPrompt using shared helper
     const { inputWidth, suggestionsWidth } = useMemo(() => {
         const { inputWidth, suggestionsWidth } = calculatePromptWidths(mainAreaWidth);
@@ -340,14 +412,20 @@ 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) {
+        if (!isAlternateBuffer && !config.getUseTerminalBuffer()) {
             stdout.write(ansiEscapes.clearTerminal);
+            setHistoryRemountKey((prev) => prev + 1);
         }
-        setHistoryRemountKey((prev) => prev + 1);
-    }, [setHistoryRemountKey, isAlternateBuffer, stdout]);
+    }, [setHistoryRemountKey, isAlternateBuffer, stdout, config]);
+    const shouldUseAlternateScreen = shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader());
     const handleEditorClose = useCallback(() => {
-        if (shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader())) {
+        if (shouldUseAlternateScreen) {
             // The editor may have exited alternate buffer mode so we need to
             // enter it again to be safe.
             enterAlternateScreen();
@@ -357,7 +435,7 @@ export const AppContainer = (props) => {
         }
         terminalCapabilityManager.enableSupportedModes();
         refreshStatic();
-    }, [refreshStatic, isAlternateBuffer, app, config]);
+    }, [refreshStatic, shouldUseAlternateScreen, app]);
     const [editorError, setEditorError] = useState(null);
     const { isEditorDialogOpen, openEditorDialog, handleEditorSelect, exitEditorDialog, } = useEditorSettings(settings, setEditorError, historyManager.addItem);
     useEffect(() => {
@@ -378,10 +456,10 @@ export const AppContainer = (props) => {
         }
     }, [bannerVisible, bannerText, settings, config, refreshStatic]);
     const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
-    const { isThemeDialogOpen, openThemeDialog, closeThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
+    const { isThemeDialogOpen, openThemeDialog, closeThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError, refreshStatic);
     // Poll for terminal background color changes to auto-switch theme
-    useTerminalTheme(handleThemeSelect, config);
-    const { authState, setAuthState, authError, authInfo, setAuthInfo, onAuthError, apiKeyDefaultValue, reloadApiKey, } = useAuthCommand(settings, config, initializationResult.authError);
+    useTerminalTheme(handleThemeSelect, config, refreshStatic);
+    const { authState, setAuthState, authError, authInfo, setAuthInfo, onAuthError, apiKeyDefaultValue, reloadApiKey, accountSuspensionInfo, setAccountSuspensionInfo, } = useAuthCommand(settings, config, initializationResult.authError, initializationResult.accountSuspensionInfo);
     const [authContext, setAuthContext] = useState({});
     useEffect(() => {
         if (authState === AuthState.Authenticated && authContext.requiresRestart) {
@@ -389,16 +467,23 @@ export const AppContainer = (props) => {
             setAuthContext({});
         }
     }, [authState, authContext, setAuthState]);
-    const { proQuotaRequest, handleProQuotaChoice, validationRequest, handleValidationChoice, } = useQuotaAndFallback({
+    const { proQuotaRequest, handleProQuotaChoice, validationRequest, handleValidationChoice, 
+    // G1 AI Credits
+    overageMenuRequest, handleOverageMenuChoice, emptyWalletRequest, handleEmptyWalletChoice, } = useQuotaAndFallback({
         config,
         historyManager,
         userTier,
+        paidTier,
+        settings,
         setModelSwitchedFromQuotaError,
         onShowAuthSelection: () => setAuthState(AuthState.Updating),
+        errorVerbosity: settings.merged.ui.errorVerbosity,
     });
     // Derive auth state variables for backward compatibility with UIStateContext
     const isAuthDialogOpen = authState === AuthState.Updating;
-    const isAuthenticating = authState === AuthState.Unauthenticated;
+    // TODO: Consider handling other auth types that should also skip the blocking screen
+    const isAuthenticating = authState === AuthState.Unauthenticated &&
+        settings.merged.security.auth.selectedType !== AuthType.USE_GEMINI;
     // Session browser and resume functionality
     const isGeminiClientInitialized = config.getGeminiClient()?.isInitialized();
     const { loadHistoryForResume, isResuming } = useSessionResume({
@@ -413,11 +498,12 @@ export const AppContainer = (props) => {
     const { isSessionBrowserOpen, openSessionBrowser, closeSessionBrowser, handleResumeSession, handleDeleteSession: handleDeleteSessionSync, } = useSessionBrowser(config, loadHistoryForResume);
     // Wrap handleDeleteSession to return a Promise for UIActions interface
     const handleDeleteSession = useCallback(async (session) => {
-        handleDeleteSessionSync(session);
+        await handleDeleteSessionSync(session);
     }, [handleDeleteSessionSync]);
     // Create handleAuthSelect wrapper for backward compatibility
     const handleAuthSelect = useCallback(async (authType, scope) => {
         if (authType) {
+            const previousAuthType = config.getContentGeneratorConfig()?.authType ?? 'unknown';
             if (authType === AuthType.LOGIN_WITH_GOOGLE) {
                 setAuthContext({ requiresRestart: true });
             }
@@ -427,27 +513,34 @@ export const AppContainer = (props) => {
             await clearCachedCredentialFile();
             settings.setValue(scope, 'security.auth.selectedType', authType);
             try {
+                config.setRemoteAdminSettings(undefined);
                 setAuthInfo(null);
                 await config.refreshAuth(authType, (msg) => setAuthInfo(msg));
                 setAuthInfo(null);
                 setAuthState(AuthState.Authenticated);
+                logBillingEvent(config, new ApiKeyUpdatedEvent(previousAuthType, authType));
             }
             catch (e) {
                 if (e instanceof ChangeAuthRequestedError) {
                     return;
                 }
+                if (e instanceof ProjectIdRequiredError) {
+                    // OAuth succeeded but account setup requires project ID
+                    // Show the error message directly without "Failed to authenticate" prefix
+                    onAuthError(getErrorMessage(e));
+                    return;
+                }
                 onAuthError(`Failed to authenticate: ${e instanceof Error ? e.message : String(e)}`);
                 return;
             }
             if (authType === AuthType.LOGIN_WITH_GOOGLE &&
                 config.isBrowserLaunchSuppressed()) {
-                await runExitCleanup();
                 writeToStdout(`
 ----------------------------------------------------------------
 Logging in with Google... Restarting Cell CLI to continue.
 ----------------------------------------------------------------
           `);
-                process.exit(RELAUNCH_EXIT_CODE);
+                await relaunchApp();
             }
         }
         setAuthState(AuthState.Authenticated);
@@ -477,6 +570,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         // Only sync when not currently authenticating
         if (authState === AuthState.Authenticated) {
             setUserTier(config.getUserTier());
+            setPaidTier(config.getUserPaidTier());
         }
     }, [config, authState]);
     // Check for enforced auth type mismatch
@@ -508,8 +602,9 @@ Logging in with Google... Restarting Cell CLI to continue.
     ]);
     const { isModelDialogOpen, openModelDialog, closeModelDialog } = useModelCommand();
     const { toggleVimEnabled } = useVimMode();
-    const setIsBackgroundShellListOpenRef = useRef(() => { });
+    const setIsBackgroundTaskListOpenRef = useRef(() => { });
     const [shortcutsHelpVisible, setShortcutsHelpVisible] = useState(false);
+    const { cleanUiDetailsVisible, setCleanUiDetailsVisible, toggleCleanUiDetailsVisible, revealCleanUiDetailsTemporarily, } = useVisibilityToggle();
     const slashCommandActions = useMemo(() => ({
         openAuthDialog: () => setAuthState(AuthState.Updating),
         openThemeDialog,
@@ -554,15 +649,15 @@ Logging in with Google... Restarting Cell CLI to continue.
         toggleDebugProfiler,
         dispatchExtensionStateUpdate,
         addConfirmUpdateExtensionRequest,
-        toggleBackgroundShell: () => {
-            toggleBackgroundShellRef.current();
-            if (!isBackgroundShellVisibleRef.current) {
+        toggleBackgroundTasks: () => {
+            toggleBackgroundTasksRef.current();
+            if (!isBackgroundTaskVisibleRef.current) {
                 setEmbeddedShellFocused(true);
-                if (backgroundShellsRef.current.size > 1) {
-                    setIsBackgroundShellListOpenRef.current(true);
+                if (backgroundTasksRef.current.size > 1) {
+                    setIsBackgroundTaskListOpenRef.current(true);
                 }
                 else {
-                    setIsBackgroundShellListOpenRef.current(false);
+                    setIsBackgroundTaskListOpenRef.current(false);
                 }
             }
         },
@@ -613,13 +708,24 @@ Logging in with Google... Restarting Cell CLI to continue.
             text: 'Refreshing hierarchical memory (GEMINI.md or other context files)...',
         }, Date.now());
         try {
-            const { memoryContent, fileCount } = await refreshServerHierarchicalMemory(config);
-            const flattenedMemory = flattenMemory(memoryContent);
+            let flattenedMemory;
+            let fileCount;
+            if (config.isJitContextEnabled()) {
+                await config.getMemoryContextManager()?.refresh();
+                config.updateSystemInstructionIfInitialized();
+                flattenedMemory = flattenMemory(config.getUserMemory());
+                fileCount = config.getGeminiMdFileCount();
+            }
+            else {
+                const result = await refreshServerHierarchicalMemory(config);
+                flattenedMemory = flattenMemory(result.memoryContent);
+                fileCount = result.fileCount;
+            }
             historyManager.addItem({
                 type: MessageType.INFO,
-                text: `Memory refreshed successfully. ${flattenedMemory.length > 0
-                    ? `Loaded ${flattenedMemory.length} characters from ${fileCount} file(s).`
-                    : 'No memory content found.'}`,
+                text: `Memory reloaded successfully. ${flattenedMemory.length > 0
+                    ? `Loaded ${flattenedMemory.length} characters from ${fileCount} file(s)`
+                    : 'No memory content found'}`,
             }, Date.now());
             if (config.getDebugMode()) {
                 debugLogger.log(`[DEBUG] Refreshed memory content in config: ${flattenedMemory.substring(0, 200)}...`);
@@ -656,20 +762,45 @@ Logging in with Google... Restarting Cell 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);
-    toggleBackgroundShellRef.current = toggleBackgroundShell;
-    isBackgroundShellVisibleRef.current = isBackgroundShellVisible;
-    backgroundShellsRef.current = backgroundShells;
-    const { activeBackgroundShellPid, setIsBackgroundShellListOpen, isBackgroundShellListOpen, setActiveBackgroundShellPid, backgroundShellHeight, } = useBackgroundShellManager({
-        backgroundShells,
-        backgroundShellCount,
-        isBackgroundShellVisible,
+    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 = (text, source) => {
+            if (source !== 'user_steering' && source !== 'background_completion') {
+                return;
+            }
+            pendingHintsRef.current.push(text);
+            setPendingHintCount((prev) => prev + 1);
+        };
+        config.injectionService.onInjection(hintListener);
+        return () => {
+            config.injectionService.offInjection(hintListener);
+        };
+    }, [config]);
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, pendingToolCalls, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, backgroundTaskCount, isBackgroundTaskVisible, toggleBackgroundTasks, backgroundCurrentExecution, backgroundTasks, dismissBackgroundTask, retryStatus, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused, consumePendingHints);
+    const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
+    toggleBackgroundTasksRef.current = toggleBackgroundTasks;
+    isBackgroundTaskVisibleRef.current = isBackgroundTaskVisible;
+    backgroundTasksRef.current = backgroundTasks;
+    const { activeBackgroundTaskPid, setIsBackgroundTaskListOpen, isBackgroundTaskListOpen, setActiveBackgroundTaskPid, backgroundTaskHeight, } = useBackgroundTaskManager({
+        backgroundTasks,
+        backgroundTaskCount,
+        isBackgroundTaskVisible,
         activePtyId,
         embeddedShellFocused,
         setEmbeddedShellFocused,
         terminalHeight,
     });
-    setIsBackgroundShellListOpenRef.current = setIsBackgroundShellListOpen;
+    setIsBackgroundTaskListOpenRef.current = setIsBackgroundTaskListOpen;
     const lastOutputTimeRef = useRef(0);
     useEffect(() => {
         lastOutputTimeRef.current = lastOutputTime;
@@ -684,13 +815,16 @@ Logging in with Google... Restarting Cell CLI to continue.
     });
     const shouldShowActionRequiredTitle = inactivityStatus === 'action_required';
     const shouldShowSilentWorkingTitle = inactivityStatus === 'silent_working';
-    // Auto-accept indicator
-    const showApprovalModeIndicator = useApprovalModeIndicator({
-        config,
-        addItem: historyManager.addItem,
-        onApprovalModeChange: handleApprovalModeChange,
-        isActive: !embeddedShellFocused,
-    });
+    const handleApprovalModeChangeWithUiReveal = useCallback((mode) => {
+        void handleApprovalModeChange(mode);
+        if (!cleanUiDetailsVisible) {
+            revealCleanUiDetailsTemporarily(APPROVAL_MODE_REVEAL_DURATION_MS);
+        }
+    }, [
+        handleApprovalModeChange,
+        cleanUiDetailsVisible,
+        revealCleanUiDetailsTemporarily,
+    ]);
     const { isMcpReady } = useMcpStatus(config);
     const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, popAllMessages, } = useMessageQueue({
         isConfigInitialized,
@@ -699,10 +833,6 @@ Logging in with Google... Restarting Cell CLI to continue.
         isMcpReady,
     });
     cancelHandlerRef.current = useCallback((shouldRestorePrompt = true) => {
-        const pendingHistoryItems = [
-            ...pendingSlashCommandHistoryItems,
-            ...pendingGeminiHistoryItems,
-        ];
         if (isToolAwaitingConfirmation(pendingHistoryItems)) {
             return; // Don't clear - user may be composing a follow-up message
         }
@@ -710,14 +840,20 @@ Logging in with Google... Restarting Cell CLI to continue.
             buffer.setText(''); // Clear for Ctrl+C cancellation
             return;
         }
+        // If cancelling (shouldRestorePrompt=false), never modify the buffer
+        // User is in control - preserve whatever text they typed, pasted, or restored
+        if (!shouldRestorePrompt) {
+            return;
+        }
+        // Restore the last message when shouldRestorePrompt=true
         const lastUserMessage = inputHistory.at(-1);
-        let textToSet = shouldRestorePrompt ? lastUserMessage || '' : '';
+        let textToSet = lastUserMessage || '';
         const queuedText = getQueuedMessagesText();
         if (queuedText) {
             textToSet = textToSet ? `${textToSet}\n\n${queuedText}` : queuedText;
             clearQueue();
         }
-        if (textToSet || !shouldRestorePrompt) {
+        if (textToSet) {
             buffer.setText(textToSet);
         }
     }, [
@@ -725,13 +861,49 @@ Logging in with Google... Restarting Cell CLI to continue.
         inputHistory,
         getQueuedMessagesText,
         clearQueue,
-        pendingSlashCommandHistoryItems,
-        pendingGeminiHistoryItems,
+        pendingHistoryItems,
     ]);
+    const handleHintSubmit = useCallback((hint) => {
+        const trimmed = hint.trim();
+        if (!trimmed) {
+            return;
+        }
+        config.injectionService.addInjection(trimmed, 'user_steering');
+        // 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.
+        triggerExpandHint(null);
+        if (!constrainHeight) {
+            setConstrainHeight(true);
+            if (!isAlternateBuffer) {
+                refreshStatic();
+            }
+        }
         const isSlash = isSlashCommand(submittedValue.trim());
         const isIdle = streamingState === StreamingState.Idle;
-        if (isSlash || (isIdle && isMcpReady)) {
+        const isAgentRunning = streamingState === StreamingState.Responding ||
+            isToolExecuting(pendingHistoryItems);
+        if (isSlash && isAgentRunning) {
+            const { commandToExecute } = parseSlashCommand(submittedValue, slashCommands ?? []);
+            if (commandToExecute?.isSafeConcurrent) {
+                void handleSlashCommand(submittedValue);
+                addInput(submittedValue);
+                return;
+            }
+        }
+        if (config.isModelSteeringEnabled() && isAgentRunning && !isSlash) {
+            handleHintSubmit(submittedValue);
+            addInput(submittedValue);
+            return;
+        }
+        const isMcpOrConfigReady = isConfigInitialized && isMcpReady;
+        if ((isSlash && isConfigInitialized) || (isIdle && isMcpOrConfigReady)) {
             if (!isSlash) {
                 const permissions = await checkPermissions(submittedValue, config);
                 if (permissions.length > 0) {
@@ -753,8 +925,10 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
         else {
             // Check messageQueue.length === 0 to only notify on the first queued item
-            if (isIdle && !isMcpReady && messageQueue.length === 0) {
-                coreEvents.emitFeedback('info', 'Waiting for MCP servers to initialize... Slash commands are still available and prompts will be queued.');
+            if (isIdle && !isMcpOrConfigReady && messageQueue.length === 0) {
+                coreEvents.emitFeedback('info', !isConfigInitialized
+                    ? 'Initializing... Prompts will be queued.'
+                    : 'Waiting for MCP servers to initialize... Slash commands are still available and prompts will be queued.');
             }
             addMessage(submittedValue);
         }
@@ -763,16 +937,36 @@ Logging in with Google... Restarting Cell CLI to continue.
         addMessage,
         addInput,
         submitQuery,
+        handleSlashCommand,
+        slashCommands,
         isMcpReady,
         streamingState,
         messageQueue.length,
+        pendingHistoryItems,
         config,
+        constrainHeight,
+        setConstrainHeight,
+        isAlternateBuffer,
+        refreshStatic,
+        reset,
+        handleHintSubmit,
+        isConfigInitialized,
+        triggerExpandHint,
     ]);
     const handleClearScreen = useCallback(() => {
+        reset();
+        // Explicitly hide the expansion hint and clear its x-second timer when clearing the screen.
+        triggerExpandHint(null);
         historyManager.clearItems();
-        clearConsoleMessagesState();
+        clearErrorCount();
         refreshStatic();
-    }, [historyManager, clearConsoleMessagesState, refreshStatic]);
+    }, [
+        historyManager,
+        clearErrorCount,
+        refreshStatic,
+        reset,
+        triggerExpandHint,
+    ]);
     const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
     /**
      * Determines if the input prompt should be active and accept user input.
@@ -782,38 +976,55 @@ Logging in with Google... Restarting Cell CLI to continue.
      * - Tool confirmations (WaitingForConfirmation state)
      * - Any future streaming states not explicitly allowed
      */
-    const isInputActive = isConfigInitialized &&
-        !initError &&
+    const isInputActive = !initError &&
         !isProcessing &&
         !isResuming &&
-        !!slashCommands &&
         (streamingState === StreamingState.Idle ||
-            streamingState === StreamingState.Responding) &&
+            streamingState === StreamingState.Responding ||
+            streamingState === StreamingState.WaitingForConfirmation) &&
         !proQuotaRequest;
+    const observerRef = useRef(null);
+    useEffect(() => () => {
+        observerRef.current?.disconnect();
+    }, []);
     const [controlsHeight, setControlsHeight] = useState(0);
+    const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = useState(0);
     useLayoutEffect(() => {
-        if (mainControlsRef.current) {
-            const fullFooterMeasurement = measureElement(mainControlsRef.current);
-            const roundedHeight = Math.round(fullFooterMeasurement.height);
-            if (roundedHeight > 0 && roundedHeight !== controlsHeight) {
-                setControlsHeight(roundedHeight);
-            }
+        if (!copyModeEnabled && controlsHeight > 0) {
+            setLastNonCopyControlsHeight(controlsHeight);
+        }
+    }, [copyModeEnabled, controlsHeight]);
+    const stableControlsHeight = copyModeEnabled && lastNonCopyControlsHeight > 0
+        ? lastNonCopyControlsHeight
+        : controlsHeight;
+    const mainControlsRef = useCallback((node) => {
+        if (observerRef.current) {
+            observerRef.current.disconnect();
+            observerRef.current = null;
         }
-    }, [buffer, terminalWidth, terminalHeight, controlsHeight]);
-    // Compute available terminal height based on controls measurement
-    const availableTerminalHeight = Math.max(0, terminalHeight -
-        controlsHeight -
-        staticExtraHeight -
-        2 -
-        backgroundShellHeight);
+        if (node) {
+            const observer = new ResizeObserver((entries) => {
+                const entry = entries[0];
+                if (entry) {
+                    const roundedHeight = Math.round(entry.contentRect.height);
+                    setControlsHeight((prev) => roundedHeight !== prev ? roundedHeight : prev);
+                }
+            });
+            observer.observe(node);
+            observerRef.current = observer;
+        }
+    }, []);
+    // Compute available terminal height based on stable controls measurement
+    const availableTerminalHeight = Math.max(0, terminalHeight - stableControlsHeight - backgroundTaskHeight - 1);
     config.setShellExecutionConfig({
         terminalWidth: Math.floor(terminalWidth * SHELL_WIDTH_FRACTION),
         terminalHeight: Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1),
         pager: settings.merged.tools.shell.pager,
         showColor: settings.merged.tools.shell.showColor,
         sanitizationConfig: config.sanitizationConfig,
+        sandboxManager: config.sandboxManager,
     });
-    const isFocused = useFocus();
+    const { isFocused, hasReceivedFocusEvent } = useFocus();
     // Context file names computation
     const contextFileNames = useMemo(() => {
         const fromSettings = settings.merged.context.fileName;
@@ -827,21 +1038,6 @@ Logging in with Google... Restarting Cell CLI to continue.
     const initialPrompt = useMemo(() => config.getQuestion(), [config]);
     const initialPromptSubmitted = useRef(false);
     const geminiClient = config.getGeminiClient();
-    useEffect(() => {
-        if (activePtyId) {
-            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(() => {
         if (initialPrompt &&
             isConfigInitialized &&
@@ -884,16 +1080,29 @@ Logging in with Google... Restarting Cell CLI to continue.
     const [showErrorDetails, setShowErrorDetails] = useState(false);
     const [showFullTodos, setShowFullTodos] = useState(false);
     const [renderMarkdown, setRenderMarkdown] = useState(true);
-    const [ctrlCPressCount, setCtrlCPressCount] = useState(0);
-    const ctrlCTimerRef = useRef(null);
-    const [ctrlDPressCount, setCtrlDPressCount] = useState(0);
-    const ctrlDTimerRef = useRef(null);
-    const [constrainHeight, setConstrainHeight] = useState(true);
+    const handleExitRepeat = useCallback((count) => {
+        if (count > 2) {
+            recordExitFail(config);
+        }
+        if (count > 1) {
+            void handleSlashCommand('/quit', undefined, undefined, false);
+        }
+    }, [config, handleSlashCommand]);
+    const { pressCount: ctrlCPressCount, handlePress: handleCtrlCPress } = useRepeatedKeyPress({
+        windowMs: WARNING_PROMPT_DURATION_MS,
+        onRepeat: handleExitRepeat,
+    });
+    const { pressCount: ctrlDPressCount, handlePress: handleCtrlDPress } = useRepeatedKeyPress({
+        windowMs: WARNING_PROMPT_DURATION_MS,
+        onRepeat: handleExitRepeat,
+    });
     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);
@@ -926,21 +1135,25 @@ Logging in with Google... Restarting Cell CLI to continue.
             }
         };
     }, [showTransientMessage]);
+    const handleWarning = useCallback((message) => {
+        showTransientMessage({
+            text: message,
+            type: TransientMessageType.Warning,
+        });
+    }, [showTransientMessage]);
+    const { handleSuspend } = useSuspend({
+        handleWarning,
+        setRawMode,
+        refreshStatic,
+        setForceRerenderKey,
+        shouldUseAlternateScreen,
+    });
     useEffect(() => {
         if (ideNeedsRestart) {
             // IDE trust changed, force a restart.
             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;
@@ -968,44 +1181,6 @@ Logging in with Google... Restarting Cell CLI to continue.
             appEvents.off(AppEvent.OpenDebugConsole, openDebugConsole);
         };
     }, [config]);
-    useEffect(() => {
-        if (ctrlCTimerRef.current) {
-            clearTimeout(ctrlCTimerRef.current);
-            ctrlCTimerRef.current = null;
-        }
-        if (ctrlCPressCount > 2) {
-            recordExitFail(config);
-        }
-        if (ctrlCPressCount > 1) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            handleSlashCommand('/quit', undefined, undefined, false);
-        }
-        else if (ctrlCPressCount > 0) {
-            ctrlCTimerRef.current = setTimeout(() => {
-                setCtrlCPressCount(0);
-                ctrlCTimerRef.current = null;
-            }, WARNING_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) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            handleSlashCommand('/quit', undefined, undefined, false);
-        }
-        else if (ctrlDPressCount > 0) {
-            ctrlDTimerRef.current = setTimeout(() => {
-                setCtrlDPressCount(0);
-                ctrlDTimerRef.current = null;
-            }, WARNING_PROMPT_DURATION_MS);
-        }
-    }, [ctrlDPressCount, config, setCtrlDPressCount, handleSlashCommand]);
     const handleEscapePromptChange = useCallback((showPrompt) => {
         setShowEscapePrompt(showPrompt);
     }, []);
@@ -1020,22 +1195,21 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
-    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator({
-        streamingState,
-        shouldShowFocusHint,
-        retryStatus,
-    });
     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 true;
-        }
         // Debug log keystrokes if enabled
         if (settings.merged.general.debugKeystrokeLogging) {
             debugLogger.log('[DEBUG] Keystroke:', JSON.stringify(key));
         }
+        if (shortcutsHelpVisible && isHelpDismissKey(key)) {
+            setShortcutsHelpVisible(false);
+        }
+        if (keyMatchers[Command.TOGGLE_MOUSE_MODE](key)) {
+            setMouseMode((prev) => !prev);
+            if (mouseMode && !isAlternateBuffer) {
+                appEvents.emit(AppEvent.ScrollToBottom);
+            }
+            return true;
+        }
         if (isAlternateBuffer && keyMatchers[Command.TOGGLE_COPY_MODE](key)) {
             setCopyModeEnabled(true);
             disableMouseEvents();
@@ -1046,42 +1220,78 @@ Logging in with Google... Restarting Cell CLI to continue.
             // This should happen regardless of the count.
             cancelOngoingRequest?.();
             feedbackPromiseResolveRef.current(null);
-            setCtrlCPressCount((prev) => prev + 1);
+            handleCtrlCPress();
             return true;
         }
         else if (keyMatchers[Command.EXIT](key)) {
-            setCtrlDPressCount((prev) => prev + 1);
+            // If the input field is non-empty, do not exit.
+            if (bufferRef.current.text.length > 0) {
+                return false;
+            }
+            handleCtrlDPress();
+            return true;
+        }
+        else if (keyMatchers[Command.SUSPEND_APP](key)) {
+            handleSuspend();
+        }
+        else if (keyMatchers[Command.DUMP_FRAME](key)) {
+            const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+            const filename = `snapshot-${timestamp}.json`;
+            if (dumpCurrentFrame) {
+                dumpCurrentFrame(filename);
+                debugLogger.log(`Dumped frame to: ${filename}`);
+            }
+            return true;
+        }
+        else if (keyMatchers[Command.START_RECORDING](key)) {
+            const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+            const filename = `recording-${timestamp}.json`;
+            if (startRecording) {
+                startRecording(filename);
+                recordingFilenameRef.current = filename;
+                debugLogger.log(`Started recording to: ${filename}`);
+            }
+            return true;
+        }
+        else if (keyMatchers[Command.STOP_RECORDING](key)) {
+            if (stopRecording) {
+                stopRecording();
+                debugLogger.log(`Stopped recording, saved to: ${recordingFilenameRef.current ?? 'unknown'}`);
+                recordingFilenameRef.current = null;
+            }
             return true;
         }
+        else if (keyMatchers[Command.TOGGLE_COPY_MODE](key) &&
+            !isAlternateBuffer) {
+            showTransientMessage({
+                text: 'Use Ctrl+O to expand and collapse blocks of content.',
+                type: TransientMessageType.Warning,
+            });
+            return true;
+        }
+        const toggleLastTurnTools = () => {
+            triggerExpandHint(true);
+            const targetToolCallIds = getLastTurnToolCallIds(historyManager.history, pendingHistoryItems);
+            if (targetToolCallIds.length > 0) {
+                toggleAllExpansion(targetToolCallIds);
+            }
+        };
         let enteringConstrainHeightMode = false;
         if (!constrainHeight) {
             enteringConstrainHeightMode = true;
             setConstrainHeight(true);
+            if (keyMatchers[Command.SHOW_MORE_LINES](key)) {
+                toggleLastTurnTools();
+            }
+            if (!isAlternateBuffer) {
+                refreshStatic();
+            }
         }
         if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
             if (settings.merged.general.devtools) {
                 void (async () => {
-                    try {
-                        const { startDevToolsServer } = await import('../utils/devtoolsService.js');
-                        const { openBrowserSecurely, shouldLaunchBrowser } = await import('@google/gemini-cli-core');
-                        const url = await startDevToolsServer(config);
-                        if (shouldLaunchBrowser()) {
-                            try {
-                                await openBrowserSecurely(url);
-                            }
-                            catch (e) {
-                                setShowErrorDetails((prev) => !prev);
-                                debugLogger.warn('Failed to open browser securely:', e);
-                            }
-                        }
-                        else {
-                            setShowErrorDetails((prev) => !prev);
-                        }
-                    }
-                    catch (e) {
-                        setShowErrorDetails(true);
-                        debugLogger.error('Failed to start DevTools server:', e);
-                    }
+                    const { toggleDevToolsPanel } = await import('../utils/devtoolsService.js');
+                    await toggleDevToolsPanel(config, showErrorDetails, () => setShowErrorDetails((prev) => !prev), () => setShowErrorDetails(true));
                 })();
             }
             else {
@@ -1089,16 +1299,6 @@ Logging in with Google... Restarting Cell CLI to continue.
             }
             return true;
         }
-        else if (keyMatchers[Command.SUSPEND_APP](key)) {
-            const undoMessage = isITerm2()
-                ? 'Undo has been moved to Option + Z'
-                : 'Undo has been moved to Alt/Option + Z or Cmd + Z';
-            showTransientMessage({
-                text: undoMessage,
-                type: TransientMessageType.Warning,
-            });
-            return true;
-        }
         else if (keyMatchers[Command.SHOW_FULL_TODOS](key)) {
             setShowFullTodos((prev) => !prev);
             return true;
@@ -1122,11 +1322,13 @@ Logging in with Google... Restarting Cell CLI to continue.
         else if (keyMatchers[Command.SHOW_MORE_LINES](key) &&
             !enteringConstrainHeightMode) {
             setConstrainHeight(false);
+            toggleLastTurnTools();
+            refreshStatic();
             return true;
         }
         else if ((keyMatchers[Command.FOCUS_SHELL_INPUT](key) ||
             keyMatchers[Command.UNFOCUS_BACKGROUND_SHELL_LIST](key)) &&
-            (activePtyId || (isBackgroundShellVisible && backgroundShells.size > 0))) {
+            (activePtyId || (isBackgroundTaskVisible && backgroundTasks.size > 0))) {
             if (embeddedShellFocused) {
                 const capturedTime = lastOutputTimeRef.current;
                 if (tabFocusTimeoutRef.current)
@@ -1145,13 +1347,13 @@ Logging in with Google... Restarting Cell CLI to continue.
                 return false;
             }
             const isIdle = Date.now() - lastOutputTimeRef.current >= 100;
-            if (isIdle && !activePtyId && !isBackgroundShellVisible) {
+            if (isIdle && !activePtyId && !isBackgroundTaskVisible) {
                 if (tabFocusTimeoutRef.current)
                     clearTimeout(tabFocusTimeoutRef.current);
-                toggleBackgroundShell();
+                toggleBackgroundTasks();
                 setEmbeddedShellFocused(true);
-                if (backgroundShells.size > 1)
-                    setIsBackgroundShellListOpen(true);
+                if (backgroundTasks.size > 1)
+                    setIsBackgroundTaskListOpen(true);
                 return true;
             }
             setEmbeddedShellFocused(true);
@@ -1167,16 +1369,16 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
         else if (keyMatchers[Command.TOGGLE_BACKGROUND_SHELL](key)) {
             if (activePtyId) {
-                backgroundCurrentShell();
+                backgroundCurrentExecution();
                 // After backgrounding, we explicitly do NOT show or focus the background UI.
             }
             else {
-                toggleBackgroundShell();
+                toggleBackgroundTasks();
                 // Toggle focus based on intent: if we were hiding, unfocus; if showing, focus.
-                if (!isBackgroundShellVisible && backgroundShells.size > 0) {
+                if (!isBackgroundTaskVisible && backgroundTasks.size > 0) {
                     setEmbeddedShellFocused(true);
-                    if (backgroundShells.size > 1) {
-                        setIsBackgroundShellListOpen(true);
+                    if (backgroundTasks.size > 1) {
+                        setIsBackgroundTaskListOpen(true);
                     }
                 }
                 else {
@@ -1186,11 +1388,11 @@ Logging in with Google... Restarting Cell CLI to continue.
             return true;
         }
         else if (keyMatchers[Command.TOGGLE_BACKGROUND_SHELL_LIST](key)) {
-            if (backgroundShells.size > 0 && isBackgroundShellVisible) {
+            if (backgroundTasks.size > 0 && isBackgroundTaskVisible) {
                 if (!embeddedShellFocused) {
                     setEmbeddedShellFocused(true);
                 }
-                setIsBackgroundShellListOpen(true);
+                setIsBackgroundTaskListOpen(true);
             }
             return true;
         }
@@ -1201,28 +1403,60 @@ Logging in with Google... Restarting Cell CLI to continue.
         setShowErrorDetails,
         config,
         ideContextState,
-        setCtrlCPressCount,
-        setCtrlDPressCount,
+        handleCtrlCPress,
+        handleCtrlDPress,
         handleSlashCommand,
         cancelOngoingRequest,
         activePtyId,
+        handleSuspend,
         embeddedShellFocused,
         settings.merged.general.debugKeystrokeLogging,
         refreshStatic,
         setCopyModeEnabled,
-        copyModeEnabled,
+        tabFocusTimeoutRef,
         isAlternateBuffer,
-        backgroundCurrentShell,
-        toggleBackgroundShell,
-        backgroundShells,
-        isBackgroundShellVisible,
-        setIsBackgroundShellListOpen,
+        shortcutsHelpVisible,
+        backgroundCurrentExecution,
+        toggleBackgroundTasks,
+        backgroundTasks,
+        isBackgroundTaskVisible,
+        setIsBackgroundTaskListOpen,
         lastOutputTimeRef,
-        tabFocusTimeoutRef,
         showTransientMessage,
         settings.merged.general.devtools,
+        showErrorDetails,
+        triggerExpandHint,
+        keyMatchers,
+        isHelpDismissKey,
+        historyManager.history,
+        pendingHistoryItems,
+        toggleAllExpansion,
+        dumpCurrentFrame,
+        startRecording,
+        stopRecording,
+        mouseMode,
     ]);
     useKeypress(handleGlobalKeypress, { isActive: true, priority: true });
+    useKeypress((key) => {
+        if (keyMatchers[Command.SCROLL_UP](key) ||
+            keyMatchers[Command.SCROLL_DOWN](key) ||
+            keyMatchers[Command.PAGE_UP](key) ||
+            keyMatchers[Command.PAGE_DOWN](key) ||
+            keyMatchers[Command.SCROLL_HOME](key) ||
+            keyMatchers[Command.SCROLL_END](key)) {
+            return false;
+        }
+        setCopyModeEnabled(false);
+        if (mouseMode) {
+            enableMouseEvents();
+        }
+        return true;
+    }, {
+        isActive: copyModeEnabled,
+        // We need to receive keypresses first so they do not bubble to other
+        // handlers.
+        priority: KeypressPriority.Critical,
+    });
     useEffect(() => {
         // Respect hideWindowTitle settings
         if (settings.merged.ui.hideWindowTitle)
@@ -1279,27 +1513,28 @@ Logging in with Google... Restarting Cell CLI to continue.
                 debugLogger.warn(`[Feedback Details for "${payload.message}"]`, payload.error);
             }
         };
+        const handleHookSystemMessage = (payload) => {
+            historyManager.addItem({
+                type: MessageType.INFO,
+                text: payload.message,
+                source: payload.hookName,
+            }, Date.now());
+        };
         coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
+        coreEvents.on(CoreEvent.HookSystemMessage, handleHookSystemMessage);
         // Flush any messages that happened during startup before this component
         // mounted.
         coreEvents.drainBacklogs();
         return () => {
             coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
+            coreEvents.off(CoreEvent.HookSystemMessage, handleHookSystemMessage);
         };
     }, [historyManager]);
-    const filteredConsoleMessages = useMemo(() => {
-        if (config.getDebugMode()) {
-            return consoleMessages;
-        }
-        return consoleMessages.filter((msg) => msg.type !== 'debug');
-    }, [consoleMessages, config]);
-    // Computed values
-    const errorCount = useMemo(() => filteredConsoleMessages
-        .filter((msg) => msg.type === 'error')
-        .reduce((total, msg) => total + msg.count, 0), [filteredConsoleMessages]);
     const nightly = props.version.includes('nightly');
     const dialogsVisible = shouldShowIdePrompt ||
+        shouldShowIdePrompt ||
         isFolderTrustDialogOpen ||
+        isPolicyUpdateDialogOpen ||
         adminSettingsChanged ||
         !!commandConfirmationRequest ||
         !!authConsentRequest ||
@@ -1319,13 +1554,117 @@ Logging in with Google... Restarting Cell CLI to continue.
         showIdeRestartPrompt ||
         !!proQuotaRequest ||
         !!validationRequest ||
+        !!overageMenuRequest ||
+        !!emptyWalletRequest ||
         isSessionBrowserOpen ||
         authState === AuthState.AwaitingApiKeyInput ||
         !!newAgents;
-    const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
-    const allToolCalls = useMemo(() => pendingHistoryItems
-        .filter((item) => item.type === 'tool_group')
-        .flatMap((item) => item.tools), [pendingHistoryItems]);
+    const hasPendingToolConfirmation = useMemo(() => isToolAwaitingConfirmation(pendingHistoryItems), [pendingHistoryItems]);
+    const hasConfirmUpdateExtensionRequests = confirmUpdateExtensionRequests.length > 0;
+    const hasLoopDetectionConfirmationRequest = !!loopDetectionConfirmationRequest;
+    const hasPendingActionRequired = hasPendingToolConfirmation ||
+        !!commandConfirmationRequest ||
+        !!authConsentRequest ||
+        hasConfirmUpdateExtensionRequests ||
+        hasLoopDetectionConfirmationRequest ||
+        !!proQuotaRequest ||
+        !!validationRequest ||
+        !!overageMenuRequest ||
+        !!emptyWalletRequest ||
+        !!customDialog;
+    const loadingPhrases = settings.merged.ui.loadingPhrases;
+    const showStatusTips = loadingPhrases === 'tips' || loadingPhrases === 'all';
+    const showStatusWit = loadingPhrases === 'witty' || loadingPhrases === 'all';
+    const showLoadingIndicator = (!embeddedShellFocused || isBackgroundTaskVisible) &&
+        streamingState === StreamingState.Responding &&
+        !hasPendingActionRequired;
+    let estimatedStatusLength = 0;
+    if (activeHooks.length > 0 && settings.merged.hooksConfig.notifications) {
+        const hookLabel = activeHooks.length > 1 ? 'Executing Hooks' : 'Executing Hook';
+        const hookNames = activeHooks
+            .map((h) => h.name +
+            (h.index && h.total && h.total > 1 ? ` (${h.index}/${h.total})` : ''))
+            .join(', ');
+        estimatedStatusLength = hookLabel.length + hookNames.length + 10;
+    }
+    else if (showLoadingIndicator) {
+        const thoughtText = thought?.subject || 'Waiting for model...';
+        estimatedStatusLength = thoughtText.length + 25;
+    }
+    else if (hasPendingActionRequired) {
+        estimatedStatusLength = 35;
+    }
+    const maxLength = terminalWidth - estimatedStatusLength - 5;
+    const { elapsedTime, currentLoadingPhrase, currentTip, currentWittyPhrase } = useLoadingIndicator({
+        streamingState,
+        shouldShowFocusHint,
+        retryStatus,
+        showTips: showStatusTips,
+        showWit: showStatusWit,
+        customWittyPhrases: settings.merged.ui.customWittyPhrases,
+        errorVerbosity: settings.merged.ui.errorVerbosity,
+        maxLength,
+    });
+    const allowPlanMode = config.isPlanEnabled() &&
+        streamingState === StreamingState.Idle &&
+        !hasPendingActionRequired;
+    const showApprovalModeIndicator = useApprovalModeIndicator({
+        config,
+        addItem: historyManager.addItem,
+        onApprovalModeChange: handleApprovalModeChangeWithUiReveal,
+        isActive: !embeddedShellFocused,
+        allowPlanMode,
+    });
+    useRunEventNotifications({
+        notificationsEnabled,
+        isFocused,
+        hasReceivedFocusEvent,
+        streamingState,
+        hasPendingActionRequired,
+        pendingHistoryItems,
+        commandConfirmationRequest,
+        authConsentRequest,
+        permissionConfirmationRequest,
+        hasConfirmUpdateExtensionRequests,
+        hasLoopDetectionConfirmationRequest,
+    });
+    const isPassiveShortcutsHelpState = isInputActive &&
+        streamingState === StreamingState.Idle &&
+        !hasPendingActionRequired;
+    useEffect(() => {
+        if (shortcutsHelpVisible && !isPassiveShortcutsHelpState) {
+            setShortcutsHelpVisible(false);
+        }
+    }, [
+        shortcutsHelpVisible,
+        isPassiveShortcutsHelpState,
+        setShortcutsHelpVisible,
+    ]);
+    useEffect(() => {
+        if (!isConfigInitialized ||
+            !config.isModelSteeringEnabled() ||
+            streamingState !== StreamingState.Idle ||
+            !isMcpReady ||
+            isToolAwaitingConfirmation(pendingHistoryItems)) {
+            return;
+        }
+        const pendingHint = consumePendingHints();
+        if (!pendingHint) {
+            return;
+        }
+        void submitQuery([{ text: buildUserSteeringHintPrompt(pendingHint) }]);
+    }, [
+        config,
+        historyManager,
+        isConfigInitialized,
+        isMcpReady,
+        streamingState,
+        submitQuery,
+        consumePendingHints,
+        pendingHistoryItems,
+        pendingHintCount,
+    ]);
+    const allToolCalls = useMemo(() => getAllToolCalls(pendingHistoryItems), [pendingHistoryItems]);
     const [geminiMdFileCount, setGeminiMdFileCount] = useState(config.getGeminiMdFileCount());
     useEffect(() => {
         const handleMemoryChanged = (result) => {
@@ -1340,8 +1679,7 @@ Logging in with Google... Restarting Cell 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) {
@@ -1356,6 +1694,23 @@ Logging in with Google... Restarting Cell CLI to continue.
             isMounted = false;
         };
     }, [config, refreshStatic]);
+    const inputState = useMemo(() => ({
+        buffer,
+        userMessages: inputHistory,
+        shellModeActive,
+        showEscapePrompt,
+        copyModeEnabled,
+        inputWidth,
+        suggestionsWidth,
+    }), [
+        buffer,
+        inputHistory,
+        shellModeActive,
+        showEscapePrompt,
+        copyModeEnabled,
+        inputWidth,
+        suggestionsWidth,
+    ]);
     const uiState = useMemo(() => ({
         history: historyManager.history,
         historyManager,
@@ -1365,12 +1720,14 @@ Logging in with Google... Restarting Cell CLI to continue.
         isConfigInitialized,
         authError,
         authMessage: authError ?? authInfo ?? '',
+        accountSuspensionInfo,
         isAuthDialogOpen,
         isAwaitingApiKeyInput: authState === AuthState.AwaitingApiKeyInput,
         apiKeyDefaultValue,
         editorError,
         isEditorDialogOpen,
         showPrivacyNotice,
+        mouseMode,
         corgiMode,
         debugMessage,
         awaitingFeedback,
@@ -1401,44 +1758,48 @@ Logging in with Google... Restarting Cell CLI to continue.
         initError,
         pendingGeminiHistoryItems,
         thought,
-        shellModeActive,
-        userMessages: inputHistory,
-        buffer,
-        inputWidth,
-        suggestionsWidth,
         isInputActive,
         isResuming,
         shouldShowIdePrompt,
         isFolderTrustDialogOpen: isFolderTrustDialogOpen ?? false,
+        folderDiscoveryResults,
+        isPolicyUpdateDialogOpen,
+        policyUpdateConfirmationRequest,
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
         showFullTodos,
-        filteredConsoleMessages,
         ideContextState,
         renderMarkdown,
         ctrlCPressedOnce: ctrlCPressCount >= 1,
         ctrlDPressedOnce: ctrlDPressCount >= 1,
-        showEscapePrompt,
         shortcutsHelpVisible,
+        cleanUiDetailsVisible,
         isFocused,
         elapsedTime,
         currentLoadingPhrase,
+        currentTip,
+        currentWittyPhrase,
         historyRemountKey,
         activeHooks,
         messageQueue,
         queueErrorMessage,
         showApprovalModeIndicator,
+        allowPlanMode,
         currentModel,
         quota: {
             userTier,
             stats: quotaStats,
             proQuotaRequest,
             validationRequest,
+            // G1 AI Credits dialog state
+            overageMenuRequest,
+            emptyWalletRequest,
         },
         contextFileNames,
         errorCount,
         availableTerminalHeight,
+        stableControlsHeight,
         mainAreaWidth,
         staticAreaMaxItemHeight,
         staticExtraHeight,
@@ -1458,23 +1819,25 @@ Logging in with Google... Restarting Cell CLI to continue.
         isRestarting,
         extensionsUpdateState,
         activePtyId,
-        backgroundShellCount,
-        isBackgroundShellVisible,
+        backgroundTaskCount,
+        isBackgroundTaskVisible,
         embeddedShellFocused,
         showDebugProfiler,
         customDialog,
-        copyModeEnabled,
         transientMessage,
         bannerData,
         bannerVisible,
         terminalBackgroundColor: config.getTerminalBackground(),
         settingsNonce,
-        backgroundShells,
-        activeBackgroundShellPid,
-        backgroundShellHeight,
-        isBackgroundShellListOpen,
+        backgroundTasks,
+        activeBackgroundTaskPid,
+        backgroundTaskHeight,
+        isBackgroundTaskListOpen,
         adminSettingsChanged,
         newAgents,
+        showIsExpandableHint,
+        hintMode: config.isModelSteeringEnabled() && isToolExecuting(pendingHistoryItems),
+        hintBuffer: '',
     }), [
         isThemeDialogOpen,
         themeError,
@@ -1482,10 +1845,12 @@ Logging in with Google... Restarting Cell CLI to continue.
         isConfigInitialized,
         authError,
         authInfo,
+        accountSuspensionInfo,
         isAuthDialogOpen,
         editorError,
         isEditorDialogOpen,
         showPrivacyNotice,
+        mouseMode,
         corgiMode,
         debugMessage,
         quittingMessages,
@@ -1511,41 +1876,44 @@ Logging in with Google... Restarting Cell CLI to continue.
         initError,
         pendingGeminiHistoryItems,
         thought,
-        shellModeActive,
-        inputHistory,
-        buffer,
-        inputWidth,
-        suggestionsWidth,
         isInputActive,
         isResuming,
         shouldShowIdePrompt,
         isFolderTrustDialogOpen,
+        folderDiscoveryResults,
+        isPolicyUpdateDialogOpen,
+        policyUpdateConfirmationRequest,
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
         showFullTodos,
-        filteredConsoleMessages,
         ideContextState,
         renderMarkdown,
         ctrlCPressCount,
         ctrlDPressCount,
-        showEscapePrompt,
         shortcutsHelpVisible,
+        cleanUiDetailsVisible,
         isFocused,
         elapsedTime,
         currentLoadingPhrase,
+        currentTip,
+        currentWittyPhrase,
         historyRemountKey,
         activeHooks,
         messageQueue,
         queueErrorMessage,
         showApprovalModeIndicator,
+        allowPlanMode,
         userTier,
         quotaStats,
         proQuotaRequest,
         validationRequest,
+        overageMenuRequest,
+        emptyWalletRequest,
         contextFileNames,
         errorCount,
         availableTerminalHeight,
+        stableControlsHeight,
         mainAreaWidth,
         staticAreaMaxItemHeight,
         staticExtraHeight,
@@ -1566,8 +1934,8 @@ Logging in with Google... Restarting Cell CLI to continue.
         currentModel,
         extensionsUpdateState,
         activePtyId,
-        backgroundShellCount,
-        isBackgroundShellVisible,
+        backgroundTaskCount,
+        isBackgroundTaskVisible,
         historyManager,
         embeddedShellFocused,
         awaitingFeedback,
@@ -1575,18 +1943,18 @@ Logging in with Google... Restarting Cell CLI to continue.
         customDialog,
         apiKeyDefaultValue,
         authState,
-        copyModeEnabled,
         transientMessage,
         bannerData,
         bannerVisible,
         config,
         settingsNonce,
-        backgroundShellHeight,
-        isBackgroundShellListOpen,
-        activeBackgroundShellPid,
-        backgroundShells,
+        backgroundTaskHeight,
+        isBackgroundTaskListOpen,
+        activeBackgroundTaskPid,
+        backgroundTasks,
         adminSettingsChanged,
         newAgents,
+        showIsExpandableHint,
     ]);
     const exitPrivacyNotice = useCallback(() => setShowPrivacyNotice(false), [setShowPrivacyNotice]);
     const uiActions = useMemo(() => ({
@@ -1609,6 +1977,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         vimHandleInput,
         handleIdePromptComplete,
         handleFolderTrustSelect,
+        setIsPolicyUpdateDialogOpen,
         setConstrainHeight,
         onEscapePromptChange: handleEscapePromptChange,
         refreshStatic,
@@ -1616,21 +1985,33 @@ Logging in with Google... Restarting Cell CLI to continue.
         handleClearScreen,
         handleProQuotaChoice,
         handleValidationChoice,
+        // G1 AI Credits handlers
+        handleOverageMenuChoice,
+        handleEmptyWalletChoice,
         openSessionBrowser,
         closeSessionBrowser,
         handleResumeSession,
         handleDeleteSession,
         setQueueErrorMessage,
+        addMessage,
         popAllMessages,
         handleApiKeySubmit,
         handleApiKeyCancel,
         setBannerVisible,
         setShortcutsHelpVisible,
+        setCleanUiDetailsVisible,
+        toggleCleanUiDetailsVisible,
+        revealCleanUiDetailsTemporarily,
+        handleWarning,
         setEmbeddedShellFocused,
-        dismissBackgroundShell,
-        setActiveBackgroundShellPid,
-        setIsBackgroundShellListOpen,
+        dismissBackgroundTask,
+        setActiveBackgroundTaskPid,
+        setIsBackgroundTaskListOpen,
         setAuthContext,
+        onHintInput: () => { },
+        onHintBackspace: () => { },
+        onHintClear: () => { },
+        onHintSubmit: () => { },
         handleRestart: async () => {
             if (process.send) {
                 const remoteSettings = config.getRemoteAdminSettings();
@@ -1641,8 +2022,7 @@ Logging in with Google... Restarting Cell CLI to continue.
                     });
                 }
             }
-            await runExitCleanup();
-            process.exit(RELAUNCH_EXIT_CODE);
+            await relaunchApp();
         },
         handleNewAgentsSelect: async (choice) => {
             if (newAgents && choice === NewAgentsChoice.ACKNOWLEDGE) {
@@ -1660,6 +2040,11 @@ Logging in with Google... Restarting Cell CLI to continue.
             }
             setNewAgents(null);
         },
+        getPreferredEditor,
+        clearAccountSuspension: () => {
+            setAccountSuspensionInfo(null);
+            setAuthState(AuthState.Updating);
+        },
     }), [
         handleThemeSelect,
         closeThemeDialog,
@@ -1680,6 +2065,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         vimHandleInput,
         handleIdePromptComplete,
         handleFolderTrustSelect,
+        setIsPolicyUpdateDialogOpen,
         setConstrainHeight,
         handleEscapePromptChange,
         refreshStatic,
@@ -1687,24 +2073,33 @@ Logging in with Google... Restarting Cell CLI to continue.
         handleClearScreen,
         handleProQuotaChoice,
         handleValidationChoice,
+        handleOverageMenuChoice,
+        handleEmptyWalletChoice,
         openSessionBrowser,
         closeSessionBrowser,
         handleResumeSession,
         handleDeleteSession,
         setQueueErrorMessage,
+        addMessage,
         popAllMessages,
         handleApiKeySubmit,
         handleApiKeyCancel,
         setBannerVisible,
         setShortcutsHelpVisible,
+        setCleanUiDetailsVisible,
+        toggleCleanUiDetailsVisible,
+        revealCleanUiDetailsTemporarily,
+        handleWarning,
         setEmbeddedShellFocused,
-        dismissBackgroundShell,
-        setActiveBackgroundShellPid,
-        setIsBackgroundShellListOpen,
+        dismissBackgroundTask,
+        setActiveBackgroundTaskPid,
+        setIsBackgroundTaskListOpen,
         setAuthContext,
+        setAccountSuspensionInfo,
         newAgents,
         config,
         historyManager,
+        getPreferredEditor,
     ]);
     if (authState === AuthState.AwaitingGoogleLoginRestart) {
         return (_jsx(LoginWithGoogleRestartDialog, { onDismiss: () => {
@@ -1712,9 +2107,9 @@ Logging in with Google... Restarting Cell CLI to continue.
                 setAuthState(AuthState.Updating);
             }, config: config }));
     }
-    return (_jsx(UIStateContext.Provider, { value: uiState, children: _jsx(UIActionsContext.Provider, { value: uiActions, children: _jsx(ConfigContext.Provider, { value: config, children: _jsx(AppContext.Provider, { value: {
-                        version: props.version,
-                        startupWarnings: props.startupWarnings || [],
-                    }, children: _jsx(ToolActionsProvider, { config: config, toolCalls: allToolCalls, children: _jsx(ShellFocusContext.Provider, { value: isFocused, children: _jsx(App, {}) }) }) }) }) }) }));
+    return (_jsx(UIStateContext.Provider, { value: uiState, children: _jsx(InputContext.Provider, { value: inputState, children: _jsx(UIActionsContext.Provider, { value: uiActions, children: _jsx(ConfigContext.Provider, { value: config, children: _jsx(AppContext.Provider, { value: {
+                            version: props.version,
+                            startupWarnings: props.startupWarnings || [],
+                        }, children: _jsx(ToolActionsProvider, { config: config, toolCalls: allToolCalls, isExpanded: isExpanded, toggleExpansion: toggleExpansion, toggleAllExpansion: toggleAllExpansion, children: _jsx(ShellFocusContext.Provider, { value: isFocused, children: _jsx(MouseProvider, { mouseEventsEnabled: mouseMode, children: _jsx(ScrollProvider, { children: _jsx(App, {}, `app-${forceRerenderKey}`) }) }) }) }) }) }) }) }) }));
 };
 //# sourceMappingURL=AppContainer.js.map