@machina.ai/cell-cli 1.16.0-rc1 → 1.18.4-rc1

package/dist/src/test-utils/render.js

@@ -6,7 +6,8 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
  */
 import { render as inkRender } from 'ink-testing-library';
 import { Box } from 'ink';
-import { act } from 'react';
+import { vi } from 'vitest';
+import { act, useState } from 'react';
 import { LoadedSettings } from '../config/settings.js';
 import { KeypressProvider } from '../ui/contexts/KeypressContext.js';
 import { SettingsContext } from '../ui/contexts/SettingsContext.js';
@@ -19,6 +20,7 @@ import { VimModeProvider } from '../ui/contexts/VimModeContext.js';
 import { MouseProvider } from '../ui/contexts/MouseContext.js';
 import { ScrollProvider } from '../ui/contexts/ScrollProvider.js';
 import { StreamingContext } from '../ui/contexts/StreamingContext.js';
+import { UIActionsContext, } from '../ui/contexts/UIActionsContext.js';
 import {} from '@google/gemini-cli-core';
 // Wrapper around ink-testing-library's render that ensures act() is called
 export const render = (tree, terminalWidth) => {
@@ -53,6 +55,13 @@ export const render = (tree, terminalWidth) => {
         },
     };
 };
+export const simulateClick = async (stdin, col, row, button = 0) => {
+    // Terminal mouse events are 1-based, so convert if necessary.
+    const mouseEventString = `\x1b[<${button};${col};${row}M`;
+    await act(async () => {
+        stdin.write(mouseEventString);
+    });
+};
 const mockConfig = {
     getModel: () => 'gemini-pro',
     getTargetDir: () => '/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long',
@@ -83,7 +92,38 @@ const baseMockUiState = {
     terminalWidth: 120,
     currentModel: 'gemini-pro',
 };
-export const renderWithProviders = (component, { shellFocus = true, settings = mockSettings, uiState: providedUiState, width, mouseEventsEnabled = false, config = configProxy, useAlternateBuffer, } = {}) => {
+const mockUIActions = {
+    handleThemeSelect: vi.fn(),
+    closeThemeDialog: vi.fn(),
+    handleThemeHighlight: vi.fn(),
+    handleAuthSelect: vi.fn(),
+    setAuthState: vi.fn(),
+    onAuthError: vi.fn(),
+    handleEditorSelect: vi.fn(),
+    exitEditorDialog: vi.fn(),
+    exitPrivacyNotice: vi.fn(),
+    closeSettingsDialog: vi.fn(),
+    closeModelDialog: vi.fn(),
+    openPermissionsDialog: vi.fn(),
+    closePermissionsDialog: vi.fn(),
+    setShellModeActive: vi.fn(),
+    vimHandleInput: vi.fn(),
+    handleIdePromptComplete: vi.fn(),
+    handleFolderTrustSelect: vi.fn(),
+    setConstrainHeight: vi.fn(),
+    onEscapePromptChange: vi.fn(),
+    refreshStatic: vi.fn(),
+    handleFinalSubmit: vi.fn(),
+    handleClearScreen: vi.fn(),
+    handleProQuotaChoice: vi.fn(),
+    setQueueErrorMessage: vi.fn(),
+    popAllMessages: vi.fn(),
+    handleApiKeySubmit: vi.fn(),
+    handleApiKeyCancel: vi.fn(),
+    setBannerVisible: vi.fn(),
+    setEmbeddedShellFocused: vi.fn(),
+};
+export const renderWithProviders = (component, { shellFocus = true, settings = mockSettings, uiState: providedUiState, width, mouseEventsEnabled = false, config = configProxy, useAlternateBuffer = true, uiActions, } = {}) => {
     const baseState = new Proxy({ ...baseMockUiState, ...providedUiState }, {
         get(target, prop) {
             if (prop in target) {
@@ -115,7 +155,9 @@ export const renderWithProviders = (component, { shellFocus = true, settings = m
         terminalWidth,
         mainAreaWidth,
     };
-    return render(_jsx(ConfigContext.Provider, { value: config, children: _jsx(SettingsContext.Provider, { value: finalSettings, children: _jsx(UIStateContext.Provider, { value: finalUiState, children: _jsx(VimModeProvider, { settings: finalSettings, children: _jsx(ShellFocusContext.Provider, { value: shellFocus, children: _jsx(StreamingContext.Provider, { value: finalUiState.streamingState, children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: mouseEventsEnabled, children: _jsx(ScrollProvider, { children: _jsx(Box, { width: terminalWidth, flexShrink: 0, flexGrow: 0, flexDirection: "column", children: component }) }) }) }) }) }) }) }) }) }), terminalWidth);
+    const finalUIActions = { ...mockUIActions, ...uiActions };
+    const renderResult = render(_jsx(ConfigContext.Provider, { value: config, children: _jsx(SettingsContext.Provider, { value: finalSettings, children: _jsx(UIStateContext.Provider, { value: finalUiState, children: _jsx(VimModeProvider, { settings: finalSettings, children: _jsx(ShellFocusContext.Provider, { value: shellFocus, children: _jsx(StreamingContext.Provider, { value: finalUiState.streamingState, children: _jsx(UIActionsContext.Provider, { value: finalUIActions, children: _jsx(KeypressProvider, { children: _jsx(MouseProvider, { mouseEventsEnabled: mouseEventsEnabled, children: _jsx(ScrollProvider, { children: _jsx(Box, { width: terminalWidth, flexShrink: 0, flexGrow: 0, flexDirection: "column", children: component }) }) }) }) }) }) }) }) }) }) }), terminalWidth);
+    return { ...renderResult, simulateClick };
 };
 export function renderHook(renderCallback, options) {
     const result = { current: undefined };
@@ -142,4 +184,35 @@ export function renderHook(renderCallback, options) {
     }
     return { result, rerender, unmount };
 }
+export function renderHookWithProviders(renderCallback, options = {}) {
+    const result = { current: undefined };
+    let setPropsFn;
+    function TestComponent({ initialProps }) {
+        const [props, setProps] = useState(initialProps);
+        setPropsFn = setProps;
+        result.current = renderCallback(props);
+        return null;
+    }
+    const Wrapper = options.wrapper || (({ children }) => _jsx(_Fragment, { children: children }));
+    let renderResult;
+    act(() => {
+        renderResult = renderWithProviders(_jsx(Wrapper, { children: _jsx(TestComponent, { initialProps: options.initialProps }) }), options);
+    });
+    function rerender(newProps) {
+        act(() => {
+            if (setPropsFn && newProps) {
+                setPropsFn(newProps);
+            }
+        });
+    }
+    return {
+        result,
+        rerender,
+        unmount: () => {
+            act(() => {
+                renderResult.unmount();
+            });
+        },
+    };
+}
 //# sourceMappingURL=render.js.map

package/dist/src/test-utils/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/test-utils/render.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/test-utils/render.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/AppContainer.js

@@ -13,7 +13,7 @@ import { UIActionsContext, } from './contexts/UIActionsContext.js';
 import { ConfigContext } from './contexts/ConfigContext.js';
 import { ToolCallStatus, AuthState, } from './types.js';
 import { MessageType, StreamingState } from './types.js';
-import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, resolveModel, IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, } from '@google/gemini-cli-core';
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, resolveModel, IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
@@ -29,7 +29,7 @@ import { useVimMode } from './contexts/VimModeContext.js';
 import { useConsoleMessages } from './hooks/useConsoleMessages.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { calculatePromptWidths } from './components/InputPrompt.js';
-import { useStdout, useStdin } from 'ink';
+import { useApp, useStdout, useStdin } from 'ink';
 import { calculateMainAreaWidth } from './utils/ui-sizing.js';
 import ansiEscapes from 'ansi-escapes';
 import * as fs from 'node:fs';
@@ -52,8 +52,8 @@ import {} from './IdeIntegrationNudge.js';
 import { appEvents, AppEvent } from '../utils/events.js';
 import {} from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
-import { ConsolePatcher } from './utils/ConsolePatcher.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
+import { RELAUNCH_EXIT_CODE } from '../utils/processUtils.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
 import { useSessionStats } from './contexts/SessionContext.js';
@@ -64,9 +64,11 @@ import { ShellFocusContext } from './contexts/ShellFocusContext.js';
 import { useSessionResume } from './hooks/useSessionResume.js';
 import {} from '../config/extension-manager.js';
 import { requestConsentInteractive } from '../config/extensions/consent.js';
-import { disableMouseEvents, enableMouseEvents } from './utils/mouse.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 { enableSupportedProtocol } from './utils/kittyProtocolDetector.js';
 const WARNING_PROMPT_DURATION_MS = 1000;
 const QUEUE_ERROR_DISPLAY_DURATION_MS = 3000;
 function isToolExecuting(pendingHistoryItems) {
@@ -89,7 +91,9 @@ const SHELL_WIDTH_FRACTION = 0.89;
 const SHELL_HEIGHT_PADDING = 10;
 export const AppContainer = (props) => {
     const { config, initializationResult, resumedSessionData } = props;
-    const historyManager = useHistory();
+    const historyManager = useHistory({
+        chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
+    });
     useMemoryMonitor(historyManager);
     const settings = useSettings();
     const isAlternateBuffer = useAlternateBuffer();
@@ -102,12 +106,14 @@ export const AppContainer = (props) => {
     const [isProcessing, setIsProcessing] = useState(false);
     const [embeddedShellFocused, setEmbeddedShellFocused] = useState(false);
     const [showDebugProfiler, setShowDebugProfiler] = useState(false);
+    const [customDialog, setCustomDialog] = useState(null);
     const [copyModeEnabled, setCopyModeEnabled] = useState(false);
+    const [pendingRestorePrompt, setPendingRestorePrompt] = useState(false);
     const [shellModeActive, setShellModeActive] = useState(false);
     const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = useState(false);
     const [historyRemountKey, setHistoryRemountKey] = useState(0);
     const [updateInfo, setUpdateInfo] = useState(null);
-    const [isTrustedFolder, setIsTrustedFolder] = useState(config.isTrustedFolder());
+    const [isTrustedFolder, setIsTrustedFolder] = useState(isWorkspaceTrusted(settings.merged).isTrusted);
     const [queueErrorMessage, setQueueErrorMessage] = useState(null);
     const [defaultBannerText, setDefaultBannerText] = useState('');
     const [warningBannerText, setWarningBannerText] = useState('');
@@ -119,8 +125,15 @@ export const AppContainer = (props) => {
     const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } = useConfirmUpdateRequests();
     const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate, } = useExtensionUpdates(extensionManager, historyManager.addItem, config.getEnableExtensionReloading());
     const [isPermissionsDialogOpen, setPermissionsDialogOpen] = useState(false);
-    const openPermissionsDialog = useCallback(() => setPermissionsDialogOpen(true), []);
-    const closePermissionsDialog = useCallback(() => setPermissionsDialogOpen(false), []);
+    const [permissionsDialogProps, setPermissionsDialogProps] = useState(null);
+    const openPermissionsDialog = useCallback((props) => {
+        setPermissionsDialogOpen(true);
+        setPermissionsDialogProps(props ?? null);
+    }, []);
+    const closePermissionsDialog = useCallback(() => {
+        setPermissionsDialogOpen(false);
+        setPermissionsDialogProps(null);
+    }, []);
     const toggleDebugProfiler = useCallback(() => setShowDebugProfiler((prev) => !prev), []);
     // Helper to determine the effective model, considering the fallback state.
     const getEffectiveModel = useCallback(() => {
@@ -146,6 +159,7 @@ export const AppContainer = (props) => {
     const { columns: terminalWidth, rows: terminalHeight } = useTerminalSize();
     const { stdin, setRawMode } = useStdin();
     const { stdout } = useStdout();
+    const app = useApp();
     // Additional hooks moved from App.tsx
     const { stats: sessionStats } = useSessionStats();
     const branchName = useGitBranchName(config.getTargetDir());
@@ -189,15 +203,7 @@ export const AppContainer = (props) => {
             coreEvents.off(CoreEvent.ModelChanged, handleModelChanged);
         };
     }, [getEffectiveModel]);
-    const { consoleMessages, handleNewMessage, clearConsoleMessages: clearConsoleMessagesState, } = useConsoleMessages();
-    useEffect(() => {
-        const consolePatcher = new ConsolePatcher({
-            onNewMessage: handleNewMessage,
-            debugMode: config.getDebugMode(),
-        });
-        consolePatcher.patch();
-        registerCleanup(consolePatcher.cleanup);
-    }, [handleNewMessage, config]);
+    const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } = useConsoleMessages();
     const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
     // Derive widths for InputPrompt using shared helper
     const { inputWidth, suggestionsWidth } = useMemo(() => {
@@ -252,7 +258,25 @@ export const AppContainer = (props) => {
             stdout.write(ansiEscapes.clearTerminal);
         }
         setHistoryRemountKey((prev) => prev + 1);
-    }, [setHistoryRemountKey, stdout, isAlternateBuffer]);
+    }, [setHistoryRemountKey, isAlternateBuffer, stdout]);
+    const handleEditorClose = useCallback(() => {
+        if (shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader())) {
+            // The editor may have exited alternate buffer mode so we need to
+            // enter it again to be safe.
+            enterAlternateScreen();
+            enableMouseEvents();
+            disableLineWrapping();
+            app.rerender();
+        }
+        enableSupportedProtocol();
+        refreshStatic();
+    }, [refreshStatic, isAlternateBuffer, app, config]);
+    useEffect(() => {
+        coreEvents.on(CoreEvent.ExternalEditorClosed, handleEditorClose);
+        return () => {
+            coreEvents.off(CoreEvent.ExternalEditorClosed, handleEditorClose);
+        };
+    }, [handleEditorClose]);
     const { isThemeDialogOpen, openThemeDialog, closeThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
     const { authState, setAuthState, authError, onAuthError, apiKeyDefaultValue, reloadApiKey, } = useAuthCommand(settings, config);
     const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
@@ -291,12 +315,12 @@ export const AppContainer = (props) => {
             if (authType === AuthType.LOGIN_WITH_GOOGLE &&
                 config.isBrowserLaunchSuppressed()) {
                 await runExitCleanup();
-                debugLogger.log(`
+                writeToStdout(`
 ----------------------------------------------------------------
-Logging in with Google... Please restart Cell CLI to continue.
+Logging in with Google... Restarting Cell CLI to continue.
 ----------------------------------------------------------------
           `);
-                process.exit(0);
+                process.exit(RELAUNCH_EXIT_CODE);
             }
         }
         setAuthState(AuthState.Authenticated);
@@ -413,7 +437,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         feedbackService,
         toggleDebugProfiler,
     ]);
-    const { handleSlashCommand, slashCommands, pendingHistoryItems: pendingSlashCommandHistoryItems, commandContext, shellConfirmationRequest, confirmationRequest, } = useSlashCommandProcessor(config, settings, historyManager.addItem, historyManager.clearItems, historyManager.loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, slashCommandActions, extensionsUpdateStateInternal, isConfigInitialized, setBannerVisible);
+    const { handleSlashCommand, slashCommands, pendingHistoryItems: pendingSlashCommandHistoryItems, commandContext, shellConfirmationRequest, confirmationRequest, } = useSlashCommandProcessor(config, settings, historyManager.addItem, historyManager.clearItems, historyManager.loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, slashCommandActions, extensionsUpdateStateInternal, isConfigInitialized, setBannerVisible, setCustomDialog);
     const performMemoryRefresh = useCallback(async () => {
         historyManager.addItem({
             type: MessageType.INFO,
@@ -442,10 +466,28 @@ Logging in with Google... Please restart Cell CLI to continue.
     }, [config, historyManager]);
     const cancelHandlerRef = useRef(() => { });
     const getPreferredEditor = useCallback(() => settings.merged.general?.preferredEditor, [settings.merged.general?.preferredEditor]);
-    const onCancelSubmit = useCallback(() => {
-        cancelHandlerRef.current();
+    const onCancelSubmit = useCallback((shouldRestorePrompt) => {
+        if (shouldRestorePrompt) {
+            setPendingRestorePrompt(true);
+        }
+        else {
+            setPendingRestorePrompt(false);
+            cancelHandlerRef.current(false);
+        }
     }, []);
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
+    useEffect(() => {
+        if (pendingRestorePrompt) {
+            const lastHistoryUserMsg = historyManager.history.findLast((h) => h.type === 'user');
+            const lastUserMsg = userMessages.at(-1);
+            if (!lastHistoryUserMsg ||
+                (typeof lastHistoryUserMsg.text === 'string' &&
+                    lastHistoryUserMsg.text === lastUserMsg)) {
+                cancelHandlerRef.current(true);
+                setPendingRestorePrompt(false);
+            }
+        }
+    }, [pendingRestorePrompt, userMessages, historyManager.history]);
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
     // Auto-accept indicator
     const showAutoAcceptIndicator = useAutoAcceptIndicator({
         config,
@@ -457,7 +499,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         streamingState,
         submitQuery,
     });
-    cancelHandlerRef.current = useCallback(() => {
+    cancelHandlerRef.current = useCallback((shouldRestorePrompt = true) => {
         const pendingHistoryItems = [
             ...pendingSlashCommandHistoryItems,
             ...pendingGeminiHistoryItems,
@@ -467,13 +509,13 @@ Logging in with Google... Please restart Cell CLI to continue.
             return;
         }
         const lastUserMessage = userMessages.at(-1);
-        let textToSet = lastUserMessage || '';
+        let textToSet = shouldRestorePrompt ? lastUserMessage || '' : '';
         const queuedText = getQueuedMessagesText();
         if (queuedText) {
             textToSet = textToSet ? `${textToSet}\n\n${queuedText}` : queuedText;
             clearQueue();
         }
-        if (textToSet) {
+        if (textToSet || !shouldRestorePrompt) {
             buffer.setText(textToSet);
         }
     }, [
@@ -615,6 +657,34 @@ Logging in with Google... Please restart Cell CLI to continue.
     const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
     const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason, } = useIdeTrustListener();
     const isInitialMount = useRef(true);
+    useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
+    useEffect(() => {
+        let timeoutId;
+        const handleWarning = (message) => {
+            setWarningMessage(message);
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            timeoutId = setTimeout(() => {
+                setWarningMessage(null);
+            }, WARNING_PROMPT_DURATION_MS);
+        };
+        const handleSelectionWarning = () => {
+            handleWarning('Press Ctrl-S to enter selection mode to copy text.');
+        };
+        const handlePasteTimeout = () => {
+            handleWarning('Paste Timed out. Possibly due to slow connection.');
+        };
+        appEvents.on(AppEvent.SelectionWarning, handleSelectionWarning);
+        appEvents.on(AppEvent.PasteTimeout, handlePasteTimeout);
+        return () => {
+            appEvents.off(AppEvent.SelectionWarning, handleSelectionWarning);
+            appEvents.off(AppEvent.PasteTimeout, handlePasteTimeout);
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+        };
+    }, []);
     useEffect(() => {
         let timeoutId;
         const handleWarning = (message) => {
@@ -680,19 +750,10 @@ Logging in with Google... Please restart Cell CLI to continue.
             setConstrainHeight(false);
         };
         appEvents.on(AppEvent.OpenDebugConsole, openDebugConsole);
-        const logErrorHandler = (errorMessage) => {
-            handleNewMessage({
-                type: 'error',
-                content: String(errorMessage),
-                count: 1,
-            });
-        };
-        appEvents.on(AppEvent.LogError, logErrorHandler);
         return () => {
             appEvents.off(AppEvent.OpenDebugConsole, openDebugConsole);
-            appEvents.off(AppEvent.LogError, logErrorHandler);
         };
-    }, [handleNewMessage, config]);
+    }, [config]);
     useEffect(() => {
         if (ctrlCTimerRef.current) {
             clearTimeout(ctrlCTimerRef.current);
@@ -702,7 +763,7 @@ Logging in with Google... Please restart Cell CLI to continue.
             recordExitFail(config);
         }
         if (ctrlCPressCount > 1) {
-            handleSlashCommand('/quit');
+            handleSlashCommand('/quit', undefined, undefined, false);
         }
         else {
             ctrlCTimerRef.current = setTimeout(() => {
@@ -720,7 +781,7 @@ Logging in with Google... Please restart Cell CLI to continue.
             recordExitFail(config);
         }
         if (ctrlDPressCount > 1) {
-            handleSlashCommand('/quit');
+            handleSlashCommand('/quit', undefined, undefined, false);
         }
         else {
             ctrlDTimerRef.current = setTimeout(() => {
@@ -742,7 +803,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         }
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
-    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui?.customWittyPhrases);
+    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui?.customWittyPhrases, !!activePtyId && !embeddedShellFocused, lastOutputTime);
     const handleGlobalKeypress = useCallback((key) => {
         if (copyModeEnabled) {
             setCopyModeEnabled(false);
@@ -885,7 +946,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
         // Flush any messages that happened during startup before this component
         // mounted.
-        coreEvents.drainFeedbackBacklog();
+        coreEvents.drainBacklogs();
         return () => {
             coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
         };
@@ -905,6 +966,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         isFolderTrustDialogOpen ||
         !!shellConfirmationRequest ||
         !!confirmationRequest ||
+        !!customDialog ||
         confirmUpdateExtensionRequests.length > 0 ||
         !!loopDetectionConfirmationRequest ||
         isThemeDialogOpen ||
@@ -980,6 +1042,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         isSettingsDialogOpen,
         isModelDialogOpen,
         isPermissionsDialogOpen,
+        permissionsDialogProps,
         slashCommands,
         pendingSlashCommandHistoryItems,
         commandContext,
@@ -1044,6 +1107,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         activePtyId,
         embeddedShellFocused,
         showDebugProfiler,
+        customDialog,
         copyModeEnabled,
         warningMessage,
         bannerData: {
@@ -1067,6 +1131,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         isSettingsDialogOpen,
         isModelDialogOpen,
         isPermissionsDialogOpen,
+        permissionsDialogProps,
         slashCommands,
         pendingSlashCommandHistoryItems,
         commandContext,
@@ -1133,6 +1198,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         embeddedShellFocused,
         awaitingFeedback,
         showDebugProfiler,
+        customDialog,
         apiKeyDefaultValue,
         authState,
         copyModeEnabled,
@@ -1154,6 +1220,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         exitPrivacyNotice,
         closeSettingsDialog,
         closeModelDialog,
+        openPermissionsDialog,
         closePermissionsDialog,
         setShellModeActive,
         vimHandleInput,
@@ -1170,6 +1237,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         handleApiKeySubmit,
         handleApiKeyCancel,
         setBannerVisible,
+        setEmbeddedShellFocused,
     }), [
         handleThemeSelect,
         closeThemeDialog,
@@ -1182,6 +1250,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         exitPrivacyNotice,
         closeSettingsDialog,
         closeModelDialog,
+        openPermissionsDialog,
         closePermissionsDialog,
         setShellModeActive,
         vimHandleInput,
@@ -1198,6 +1267,7 @@ Logging in with Google... Please restart Cell CLI to continue.
         handleApiKeySubmit,
         handleApiKeyCancel,
         setBannerVisible,
+        setEmbeddedShellFocused,
     ]);
     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,