@machina.ai/cell-cli 1.36.0-rc1 → 1.38.1-rc2

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 } from 'react';
-import { ResizeObserver, useApp, useStdout, useStdin, } 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 { 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, ProjectIdRequiredError, buildUserSteeringHintPrompt, logBillingEvent, ApiKeyUpdatedEvent, } 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';
@@ -39,7 +40,7 @@ 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';
@@ -77,7 +78,7 @@ 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 { 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';
@@ -89,10 +90,11 @@ 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 { isToolExecuting, isToolAwaitingConfirmation, getAllToolCalls, } from './utils/historyUtils.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.
@@ -110,11 +112,25 @@ export const AppContainer = (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 = 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('');
@@ -128,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);
@@ -246,6 +289,12 @@ export const AppContainer = (props) => {
             }
             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;
@@ -279,7 +328,7 @@ export const AppContainer = (props) => {
             // Turn off mouse scroll.
             disableMouseEvents();
             // Kill all background shells
-            await Promise.all(Array.from(backgroundShellsRef.current.keys()).map((pid) => 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)
@@ -369,11 +418,11 @@ export const AppContainer = (props) => {
         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 (shouldUseAlternateScreen) {
@@ -449,7 +498,7 @@ 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) => {
@@ -553,7 +602,7 @@ 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(() => ({
@@ -600,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);
                 }
             }
         },
@@ -662,7 +711,8 @@ Logging in with Google... Restarting Cell CLI to continue.
             let flattenedMemory;
             let fileCount;
             if (config.isJitContextEnabled()) {
-                await config.getContextManager()?.refresh();
+                await config.getMemoryContextManager()?.refresh();
+                config.updateSystemInstructionIfInitialized();
                 flattenedMemory = flattenMemory(config.getUserMemory());
                 fileCount = config.getGeminiMdFileCount();
             }
@@ -725,7 +775,7 @@ Logging in with Google... Restarting Cell CLI to continue.
     }, []);
     useEffect(() => {
         const hintListener = (text, source) => {
-            if (source !== 'user_steering') {
+            if (source !== 'user_steering' && source !== 'background_completion') {
                 return;
             }
             pendingHintsRef.current.push(text);
@@ -736,22 +786,21 @@ Logging in with Google... Restarting Cell CLI to continue.
             config.injectionService.offInjection(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);
+    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]);
-    const hasPendingToolConfirmation = useMemo(() => isToolAwaitingConfirmation(pendingHistoryItems), [pendingHistoryItems]);
-    toggleBackgroundShellRef.current = toggleBackgroundShell;
-    isBackgroundShellVisibleRef.current = isBackgroundShellVisible;
-    backgroundShellsRef.current = backgroundShells;
-    const { activeBackgroundShellPid, setIsBackgroundShellListOpen, isBackgroundShellListOpen, setActiveBackgroundShellPid, backgroundShellHeight, } = useBackgroundShellManager({
-        backgroundShells,
-        backgroundShellCount,
-        isBackgroundShellVisible,
+    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;
@@ -935,7 +984,19 @@ Logging in with Google... Restarting Cell CLI to continue.
             streamingState === StreamingState.WaitingForConfirmation) &&
         !proQuotaRequest;
     const observerRef = useRef(null);
+    useEffect(() => () => {
+        observerRef.current?.disconnect();
+    }, []);
     const [controlsHeight, setControlsHeight] = useState(0);
+    const [lastNonCopyControlsHeight, setLastNonCopyControlsHeight] = useState(0);
+    useLayoutEffect(() => {
+        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();
@@ -953,8 +1014,8 @@ Logging in with Google... Restarting Cell CLI to continue.
             observerRef.current = observer;
         }
     }, []);
-    // Compute available terminal height based on controls measurement
-    const availableTerminalHeight = Math.max(0, terminalHeight - controlsHeight - backgroundShellHeight - 1);
+    // 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),
@@ -1142,6 +1203,13 @@ Logging in with Google... Restarting Cell CLI to continue.
         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();
@@ -1166,6 +1234,33 @@ Logging in with Google... Restarting Cell CLI to continue.
         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({
@@ -1174,13 +1269,19 @@ Logging in with Google... Restarting Cell CLI to continue.
             });
             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)) {
-                // If the user manually collapses the view, show the hint and reset the x-second timer.
-                triggerExpandHint(true);
+                toggleLastTurnTools();
             }
             if (!isAlternateBuffer) {
                 refreshStatic();
@@ -1221,16 +1322,13 @@ Logging in with Google... Restarting Cell 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.
-            triggerExpandHint(true);
-            if (!isAlternateBuffer) {
-                refreshStatic();
-            }
+            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)
@@ -1249,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);
@@ -1271,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 {
@@ -1290,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;
         }
@@ -1318,11 +1416,11 @@ Logging in with Google... Restarting Cell CLI to continue.
         tabFocusTimeoutRef,
         isAlternateBuffer,
         shortcutsHelpVisible,
-        backgroundCurrentShell,
-        toggleBackgroundShell,
-        backgroundShells,
-        isBackgroundShellVisible,
-        setIsBackgroundShellListOpen,
+        backgroundCurrentExecution,
+        toggleBackgroundTasks,
+        backgroundTasks,
+        isBackgroundTaskVisible,
+        setIsBackgroundTaskListOpen,
         lastOutputTimeRef,
         showTransientMessage,
         settings.merged.general.devtools,
@@ -1330,6 +1428,13 @@ Logging in with Google... Restarting Cell CLI to continue.
         triggerExpandHint,
         keyMatchers,
         isHelpDismissKey,
+        historyManager.history,
+        pendingHistoryItems,
+        toggleAllExpansion,
+        dumpCurrentFrame,
+        startRecording,
+        stopRecording,
+        mouseMode,
     ]);
     useKeypress(handleGlobalKeypress, { isActive: true, priority: true });
     useKeypress((key) => {
@@ -1342,7 +1447,9 @@ Logging in with Google... Restarting Cell CLI to continue.
             return false;
         }
         setCopyModeEnabled(false);
-        enableMouseEvents();
+        if (mouseMode) {
+            enableMouseEvents();
+        }
         return true;
     }, {
         isActive: copyModeEnabled,
@@ -1406,12 +1513,21 @@ 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 nightly = props.version.includes('nightly');
@@ -1443,6 +1559,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         isSessionBrowserOpen ||
         authState === AuthState.AwaitingApiKeyInput ||
         !!newAgents;
+    const hasPendingToolConfirmation = useMemo(() => isToolAwaitingConfirmation(pendingHistoryItems), [pendingHistoryItems]);
     const hasConfirmUpdateExtensionRequests = confirmUpdateExtensionRequests.length > 0;
     const hasLoopDetectionConfirmationRequest = !!loopDetectionConfirmationRequest;
     const hasPendingActionRequired = hasPendingToolConfirmation ||
@@ -1458,7 +1575,7 @@ Logging in with Google... Restarting Cell CLI to continue.
     const loadingPhrases = settings.merged.ui.loadingPhrases;
     const showStatusTips = loadingPhrases === 'tips' || loadingPhrases === 'all';
     const showStatusWit = loadingPhrases === 'witty' || loadingPhrases === 'all';
-    const showLoadingIndicator = (!embeddedShellFocused || isBackgroundShellVisible) &&
+    const showLoadingIndicator = (!embeddedShellFocused || isBackgroundTaskVisible) &&
         streamingState === StreamingState.Responding &&
         !hasPendingActionRequired;
     let estimatedStatusLength = 0;
@@ -1577,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,
@@ -1593,6 +1727,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         editorError,
         isEditorDialogOpen,
         showPrivacyNotice,
+        mouseMode,
         corgiMode,
         debugMessage,
         awaitingFeedback,
@@ -1623,11 +1758,6 @@ Logging in with Google... Restarting Cell CLI to continue.
         initError,
         pendingGeminiHistoryItems,
         thought,
-        shellModeActive,
-        userMessages: inputHistory,
-        buffer,
-        inputWidth,
-        suggestionsWidth,
         isInputActive,
         isResuming,
         shouldShowIdePrompt,
@@ -1643,7 +1773,6 @@ Logging in with Google... Restarting Cell CLI to continue.
         renderMarkdown,
         ctrlCPressedOnce: ctrlCPressCount >= 1,
         ctrlDPressedOnce: ctrlDPressCount >= 1,
-        showEscapePrompt,
         shortcutsHelpVisible,
         cleanUiDetailsVisible,
         isFocused,
@@ -1670,6 +1799,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         contextFileNames,
         errorCount,
         availableTerminalHeight,
+        stableControlsHeight,
         mainAreaWidth,
         staticAreaMaxItemHeight,
         staticExtraHeight,
@@ -1689,21 +1819,20 @@ 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,
@@ -1721,6 +1850,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         editorError,
         isEditorDialogOpen,
         showPrivacyNotice,
+        mouseMode,
         corgiMode,
         debugMessage,
         quittingMessages,
@@ -1746,11 +1876,6 @@ Logging in with Google... Restarting Cell CLI to continue.
         initError,
         pendingGeminiHistoryItems,
         thought,
-        shellModeActive,
-        inputHistory,
-        buffer,
-        inputWidth,
-        suggestionsWidth,
         isInputActive,
         isResuming,
         shouldShowIdePrompt,
@@ -1766,7 +1891,6 @@ Logging in with Google... Restarting Cell CLI to continue.
         renderMarkdown,
         ctrlCPressCount,
         ctrlDPressCount,
-        showEscapePrompt,
         shortcutsHelpVisible,
         cleanUiDetailsVisible,
         isFocused,
@@ -1789,6 +1913,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         contextFileNames,
         errorCount,
         availableTerminalHeight,
+        stableControlsHeight,
         mainAreaWidth,
         staticAreaMaxItemHeight,
         staticExtraHeight,
@@ -1809,8 +1934,8 @@ Logging in with Google... Restarting Cell CLI to continue.
         currentModel,
         extensionsUpdateState,
         activePtyId,
-        backgroundShellCount,
-        isBackgroundShellVisible,
+        backgroundTaskCount,
+        isBackgroundTaskVisible,
         historyManager,
         embeddedShellFocused,
         awaitingFeedback,
@@ -1818,16 +1943,15 @@ 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,
@@ -1869,6 +1993,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         handleResumeSession,
         handleDeleteSession,
         setQueueErrorMessage,
+        addMessage,
         popAllMessages,
         handleApiKeySubmit,
         handleApiKeyCancel,
@@ -1879,9 +2004,9 @@ Logging in with Google... Restarting Cell CLI to continue.
         revealCleanUiDetailsTemporarily,
         handleWarning,
         setEmbeddedShellFocused,
-        dismissBackgroundShell,
-        setActiveBackgroundShellPid,
-        setIsBackgroundShellListOpen,
+        dismissBackgroundTask,
+        setActiveBackgroundTaskPid,
+        setIsBackgroundTaskListOpen,
         setAuthContext,
         onHintInput: () => { },
         onHintBackspace: () => { },
@@ -1955,6 +2080,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         handleResumeSession,
         handleDeleteSession,
         setQueueErrorMessage,
+        addMessage,
         popAllMessages,
         handleApiKeySubmit,
         handleApiKeyCancel,
@@ -1965,9 +2091,9 @@ Logging in with Google... Restarting Cell CLI to continue.
         revealCleanUiDetailsTemporarily,
         handleWarning,
         setEmbeddedShellFocused,
-        dismissBackgroundShell,
-        setActiveBackgroundShellPid,
-        setIsBackgroundShellListOpen,
+        dismissBackgroundTask,
+        setActiveBackgroundTaskPid,
+        setIsBackgroundTaskListOpen,
         setAuthContext,
         setAccountSuspensionInfo,
         newAgents,
@@ -1981,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, {}, `app-${forceRerenderKey}`) }) }) }) }) }) }));
+    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