@machina.ai/cell-cli 1.8.2-rc1 → 1.11.0-rc1

package/dist/src/ui/App.js

@@ -5,37 +5,21 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useIsScreenReaderEnabled } from 'ink';
-import { useTerminalSize } from './hooks/useTerminalSize.js';
-import { lerp } from '../utils/math.js';
 import { useUIState } from './contexts/UIStateContext.js';
 import { StreamingContext } from './contexts/StreamingContext.js';
 import { QuittingDisplay } from './components/QuittingDisplay.js';
 import { SessionSummaryDisplay } from './components/SessionSummaryDisplay.js';
 import { ScreenReaderAppLayout } from './layouts/ScreenReaderAppLayout.js';
 import { DefaultAppLayout } from './layouts/DefaultAppLayout.js';
-const getContainerWidth = (terminalWidth) => {
-    if (terminalWidth <= 80) {
-        return '98%';
-    }
-    if (terminalWidth >= 132) {
-        return '90%';
-    }
-    // Linearly interpolate between 80 columns (98%) and 132 columns (90%).
-    const t = (terminalWidth - 80) / (132 - 80);
-    const percentage = lerp(98, 90, t);
-    return `${Math.round(percentage)}%`;
-};
 export const App = () => {
     const uiState = useUIState();
     const isScreenReaderEnabled = useIsScreenReaderEnabled();
-    const { columns } = useTerminalSize();
-    const containerWidth = getContainerWidth(columns);
     if (uiState.awaitingFeedback) {
         return (_jsx(SessionSummaryDisplay, { duration: uiState.duration, onFeedbackSubmit: uiState.onFeedbackSubmit }));
     }
     if (uiState.quittingMessages) {
         return _jsx(QuittingDisplay, {});
     }
-    return (_jsx(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? (_jsx(ScreenReaderAppLayout, {})) : (_jsx(DefaultAppLayout, { width: containerWidth })) }));
+    return (_jsx(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? _jsx(ScreenReaderAppLayout, {}) : _jsx(DefaultAppLayout, {}) }));
 };
 //# sourceMappingURL=App.js.map

package/dist/src/ui/App.js.map

@@ -1 +1 @@
-{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/ui/App.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,KAAK,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,iBAAiB,GAAG,CAAC,aAAqB,EAAU,EAAE;IAC1D,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,aAAa,IAAI,GAAG,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uEAAuE;IACvE,MAAM,CAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAEnC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,EAAE;IACtB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,OAAO,CACL,KAAC,qBAAqB,IACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,GAC1C,CACH,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,OAAO,KAAC,eAAe,KAAG,CAAC;IAC7B,CAAC;IAED,OAAO,CACL,KAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,OAAO,CAAC,cAAc,YACrD,qBAAqB,CAAC,CAAC,CAAC,CACvB,KAAC,qBAAqB,KAAG,CAC1B,CAAC,CAAC,CAAC,CACF,KAAC,gBAAgB,IAAC,KAAK,EAAE,cAAc,GAAI,CAC5C,GACyB,CAC7B,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/ui/App.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,KAAK,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,EAAE;IACtB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IAEzD,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,OAAO,CACL,KAAC,qBAAqB,IACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,GAC1C,CACH,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,OAAO,KAAC,eAAe,KAAG,CAAC;IAC7B,CAAC;IAED,OAAO,CACL,KAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,OAAO,CAAC,cAAc,YACrD,qBAAqB,CAAC,CAAC,CAAC,KAAC,qBAAqB,KAAG,CAAC,CAAC,CAAC,KAAC,gBAAgB,KAAG,GAC/C,CAC7B,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/App.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/App.test.js

@@ -0,0 +1,110 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi } from 'vitest';
+import { render } from 'ink-testing-library';
+import { Text, useIsScreenReaderEnabled } from 'ink';
+import { makeFakeConfig } from '@google/gemini-cli-core';
+import { App } from './App.js';
+import { UIStateContext } from './contexts/UIStateContext.js';
+import { StreamingState } from './types.js';
+import { ConfigContext } from './contexts/ConfigContext.js';
+vi.mock('ink', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        useIsScreenReaderEnabled: vi.fn(),
+    };
+});
+vi.mock('./components/MainContent.js', () => ({
+    MainContent: () => _jsx(Text, { children: "MainContent" }),
+}));
+vi.mock('./components/DialogManager.js', () => ({
+    DialogManager: () => _jsx(Text, { children: "DialogManager" }),
+}));
+vi.mock('./components/Composer.js', () => ({
+    Composer: () => _jsx(Text, { children: "Composer" }),
+}));
+vi.mock('./components/Notifications.js', () => ({
+    Notifications: () => _jsx(Text, { children: "Notifications" }),
+}));
+vi.mock('./components/QuittingDisplay.js', () => ({
+    QuittingDisplay: () => _jsx(Text, { children: "Quitting..." }),
+}));
+vi.mock('./components/Footer.js', () => ({
+    Footer: () => _jsx(Text, { children: "Footer" }),
+}));
+describe('App', () => {
+    const mockUIState = {
+        streamingState: StreamingState.Idle,
+        quittingMessages: null,
+        dialogsVisible: false,
+        mainControlsRef: { current: null },
+        rootUiRef: { current: null },
+        historyManager: {
+            addItem: vi.fn(),
+            history: [],
+            updateItem: vi.fn(),
+            clearItems: vi.fn(),
+            loadHistory: vi.fn(),
+        },
+    };
+    const mockConfig = makeFakeConfig();
+    const renderWithProviders = (ui, state) => render(_jsx(ConfigContext.Provider, { value: mockConfig, children: _jsx(UIStateContext.Provider, { value: state, children: ui }) }));
+    it('should render main content and composer when not quitting', () => {
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
+        expect(lastFrame()).toContain('MainContent');
+        expect(lastFrame()).toContain('Notifications');
+        expect(lastFrame()).toContain('Composer');
+    });
+    it('should render quitting display when quittingMessages is set', () => {
+        const quittingUIState = {
+            ...mockUIState,
+            quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
+        };
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), quittingUIState);
+        expect(lastFrame()).toContain('Quitting...');
+    });
+    it('should render dialog manager when dialogs are visible', () => {
+        const dialogUIState = {
+            ...mockUIState,
+            dialogsVisible: true,
+        };
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), dialogUIState);
+        expect(lastFrame()).toContain('MainContent');
+        expect(lastFrame()).toContain('Notifications');
+        expect(lastFrame()).toContain('DialogManager');
+    });
+    it('should show Ctrl+C exit prompt when dialogs are visible and ctrlCPressedOnce is true', () => {
+        const ctrlCUIState = {
+            ...mockUIState,
+            dialogsVisible: true,
+            ctrlCPressedOnce: true,
+        };
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), ctrlCUIState);
+        expect(lastFrame()).toContain('Press Ctrl+C again to exit.');
+    });
+    it('should show Ctrl+D exit prompt when dialogs are visible and ctrlDPressedOnce is true', () => {
+        const ctrlDUIState = {
+            ...mockUIState,
+            dialogsVisible: true,
+            ctrlDPressedOnce: true,
+        };
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), ctrlDUIState);
+        expect(lastFrame()).toContain('Press Ctrl+D again to exit.');
+    });
+    it('should render ScreenReaderAppLayout when screen reader is enabled', () => {
+        useIsScreenReaderEnabled.mockReturnValue(true);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
+        expect(lastFrame()).toContain('Notifications\nFooter\nMainContent\nComposer');
+    });
+    it('should render DefaultAppLayout when screen reader is not enabled', () => {
+        useIsScreenReaderEnabled.mockReturnValue(false);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
+        expect(lastFrame()).toContain('MainContent\nNotifications\nComposer');
+    });
+});
+//# sourceMappingURL=App.test.js.map

package/dist/src/ui/App.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"App.test.js","sourceRoot":"","sources":["../../../src/ui/App.test.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, IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, ShellExecutionService, } from '@google/gemini-cli-core';
+import { DEFAULT_GEMINI_FLASH_MODEL, IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, ShellExecutionService, debugLogger, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import { loadHierarchicalGeminiMemory } from '../config/config.js';
 import process from 'node:process';
@@ -30,7 +30,8 @@ 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 { useStdin, useStdout } from 'ink';
+import { useStdout, useStdin } from 'ink';
+import { calculateMainAreaWidth } from './utils/ui-sizing.js';
 import ansiEscapes from 'ansi-escapes';
 import * as fs from 'node:fs';
 import { basename } from 'node:path';
@@ -56,13 +57,14 @@ import { ConsolePatcher } from './utils/ConsolePatcher.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
-import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js';
 import { useSessionStats } from './contexts/SessionContext.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
 import { useExtensionUpdates } from './hooks/useExtensionUpdates.js';
 import { FeedbackService } from '../services/FeedbackService.js';
 import { ShellFocusContext } from './contexts/ShellFocusContext.js';
+import { ExtensionEnablementManager } from '../config/extensions/extensionEnablement.js';
 const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
+const QUEUE_ERROR_DISPLAY_DURATION_MS = 3000;
 function isToolExecuting(pendingHistoryItems) {
     return pendingHistoryItems.some((item) => {
         if (item && item.type === 'tool_group') {
@@ -93,17 +95,21 @@ export const AppContainer = (props) => {
     const [themeError, setThemeError] = useState(initializationResult.themeError);
     const [isProcessing, setIsProcessing] = useState(false);
     const [embeddedShellFocused, setEmbeddedShellFocused] = useState(false);
+    const [showDebugProfiler, setShowDebugProfiler] = useState(false);
     const [geminiMdFileCount, setGeminiMdFileCount] = useState(initializationResult.geminiMdFileCount);
     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 [queueErrorMessage, setQueueErrorMessage] = useState(null);
     const extensions = config.getExtensions();
-    const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate, confirmUpdateExtensionRequests, addConfirmUpdateExtensionRequest, } = useExtensionUpdates(extensions, historyManager.addItem, config.getWorkingDir());
+    const [extensionEnablementManager] = useState(new ExtensionEnablementManager(config.getEnabledExtensions()));
+    const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate, confirmUpdateExtensionRequests, addConfirmUpdateExtensionRequest, } = useExtensionUpdates(extensions, extensionEnablementManager, historyManager.addItem, config.getWorkingDir());
     const [isPermissionsDialogOpen, setPermissionsDialogOpen] = useState(false);
     const openPermissionsDialog = useCallback(() => setPermissionsDialogOpen(true), []);
     const closePermissionsDialog = useCallback(() => setPermissionsDialogOpen(false), []);
+    const toggleDebugProfiler = useCallback(() => setShowDebugProfiler((prev) => !prev), []);
     // Helper to determine the effective model, considering the fallback state.
     const getEffectiveModel = useCallback(() => {
         if (config.isInFallbackMode()) {
@@ -127,6 +133,8 @@ export const AppContainer = (props) => {
     const feedbackPromiseResolveRef = useRef(() => { });
     // Layout measurements
     const mainControlsRef = useRef(null);
+    // For performance profiling only
+    const rootUiRef = useRef(null);
     const originalTitleRef = useRef(computeWindowTitle(basename(config.getTargetDir())));
     const lastTitleRef = useRef(null);
     const staticExtraHeight = 3;
@@ -164,12 +172,12 @@ export const AppContainer = (props) => {
         consolePatcher.patch();
         registerCleanup(consolePatcher.cleanup);
     }, [handleNewMessage, config]);
+    const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
     // Derive widths for InputPrompt using shared helper
     const { inputWidth, suggestionsWidth } = useMemo(() => {
-        const { inputWidth, suggestionsWidth } = calculatePromptWidths(terminalWidth);
+        const { inputWidth, suggestionsWidth } = calculatePromptWidths(mainAreaWidth);
         return { inputWidth, suggestionsWidth };
-    }, [terminalWidth]);
-    const mainAreaWidth = Math.floor(terminalWidth * 0.9);
+    }, [mainAreaWidth]);
     const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
     const isValidPath = useCallback((filePath) => {
         try {
@@ -217,7 +225,7 @@ export const AppContainer = (props) => {
         stdout.write(ansiEscapes.clearTerminal);
         setHistoryRemountKey((prev) => prev + 1);
     }, [setHistoryRemountKey, stdout]);
-    const { isThemeDialogOpen, openThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
+    const { isThemeDialogOpen, openThemeDialog, closeThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
     const { authState, setAuthState, authError, onAuthError } = useAuthCommand(settings, config);
     const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
         config,
@@ -245,7 +253,7 @@ export const AppContainer = (props) => {
             if (authType === AuthType.LOGIN_WITH_GOOGLE &&
                 config.isBrowserLaunchSuppressed()) {
                 await runExitCleanup();
-                console.log(`
+                debugLogger.log(`
 ----------------------------------------------------------------
 Logging in with Google... Please restart Gemini CLI to continue.
 ----------------------------------------------------------------
@@ -287,7 +295,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const { isEditorDialogOpen, openEditorDialog, handleEditorSelect, exitEditorDialog, } = useEditorSettings(settings, setEditorError, historyManager.addItem);
     const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
     const { isModelDialogOpen, openModelDialog, closeModelDialog } = useModelCommand();
-    const { showWorkspaceMigrationDialog, workspaceExtensions, onWorkspaceMigrationDialogOpen, onWorkspaceMigrationDialogClose, } = useWorkspaceMigration(settings);
     const { toggleVimEnabled } = useVimMode();
     const slashCommandActions = useMemo(() => ({
         openAuthDialog: () => setAuthState(AuthState.Updating),
@@ -328,6 +335,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         },
         setDebugMessage,
         toggleCorgiMode: () => setCorgiMode((prev) => !prev),
+        toggleDebugProfiler,
         dispatchExtensionStateUpdate,
         addConfirmUpdateExtensionRequest,
     }), [
@@ -345,6 +353,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         addConfirmUpdateExtensionRequest,
         sessionStats,
         feedbackService,
+        toggleDebugProfiler,
     ]);
     const { handleSlashCommand, slashCommands, pendingHistoryItems: pendingSlashCommandHistoryItems, commandContext, shellConfirmationRequest, confirmationRequest, } = useSlashCommandProcessor(config, settings, historyManager.addItem, historyManager.clearItems, historyManager.loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, setGeminiMdFileCount, slashCommandActions, extensionsUpdateStateInternal, isConfigInitialized);
     const performMemoryRefresh = useCallback(async () => {
@@ -353,12 +362,13 @@ Logging in with Google... Please restart Gemini CLI to continue.
             text: 'Refreshing hierarchical memory (GEMINI.md or other context files)...',
         }, Date.now());
         try {
-            const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(process.cwd(), settings.merged.context?.loadMemoryFromIncludeDirectories
+            const { memoryContent, fileCount, filePaths } = await loadHierarchicalGeminiMemory(process.cwd(), settings.merged.context?.loadMemoryFromIncludeDirectories
                 ? config.getWorkspaceContext().getDirectories()
-                : [], config.getDebugMode(), config.getFileService(), settings.merged, config.getExtensionContextFilePaths(), config.isTrustedFolder(), settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
+                : [], config.getDebugMode(), config.getFileService(), settings.merged, config.getExtensions(), config.isTrustedFolder(), settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
             config.getFileFilteringOptions());
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);
+            config.setGeminiMdFilePaths(filePaths);
             setGeminiMdFileCount(fileCount);
             historyManager.addItem({
                 type: MessageType.INFO,
@@ -367,7 +377,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
                     : 'No memory content found.'}`,
             }, Date.now());
             if (config.getDebugMode()) {
-                console.log(`[DEBUG] Refreshed memory content in config: ${memoryContent.substring(0, 200)}...`);
+                debugLogger.log(`[DEBUG] Refreshed memory content in config: ${memoryContent.substring(0, 200)}...`);
             }
         }
         catch (error) {
@@ -387,7 +397,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         addItem: historyManager.addItem,
         onApprovalModeChange: handleApprovalModeChange,
     });
-    const { messageQueue, addMessage, clearQueue, getQueuedMessagesText } = useMessageQueue({
+    const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, popAllMessages, } = useMessageQueue({
         isConfigInitialized,
         streamingState,
         submitQuery,
@@ -439,6 +449,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
      */
     const isInputActive = !initError &&
         !isProcessing &&
+        !!slashCommands &&
         (streamingState === StreamingState.Idle ||
             streamingState === StreamingState.Responding) &&
         !proQuotaRequest;
@@ -518,7 +529,8 @@ Logging in with Google... Please restart Gemini CLI to continue.
         !settings.merged.ide?.hasSeenNudge &&
         !idePromptAnswered);
     const [showErrorDetails, setShowErrorDetails] = useState(false);
-    const [showToolDescriptions, setShowToolDescriptions] = useState(false);
+    const [showFullTodos, setShowFullTodos] = useState(false);
+    const [renderMarkdown, setRenderMarkdown] = useState(true);
     const [ctrlCPressedOnce, setCtrlCPressedOnce] = useState(false);
     const ctrlCTimerRef = useRef(null);
     const [ctrlDPressedOnce, setCtrlDPressedOnce] = useState(false);
@@ -527,7 +539,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const [ideContextState, setIdeContextState] = useState();
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
     const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
-    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder);
+    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
     const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason, } = useIdeTrustListener();
     const isInitialMount = useRef(true);
     useEffect(() => {
@@ -536,6 +548,15 @@ Logging in with Google... Please restart Gemini CLI to continue.
             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;
@@ -604,7 +625,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const handleGlobalKeypress = useCallback((key) => {
         // Debug log keystrokes if enabled
         if (settings.merged.general?.debugKeystrokeLogging) {
-            console.log('[DEBUG] Keystroke:', JSON.stringify(key));
+            debugLogger.log('[DEBUG] Keystroke:', JSON.stringify(key));
         }
         if (keyMatchers[Command.QUIT](key)) {
             if (!ctrlCPressedOnce) {
@@ -636,13 +657,16 @@ Logging in with Google... Please restart Gemini CLI to continue.
         if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
             setShowErrorDetails((prev) => !prev);
         }
-        else if (keyMatchers[Command.TOGGLE_TOOL_DESCRIPTIONS](key)) {
-            const newValue = !showToolDescriptions;
-            setShowToolDescriptions(newValue);
-            const mcpServers = config.getMcpServers();
-            if (Object.keys(mcpServers || {}).length > 0) {
-                handleSlashCommand(newValue ? '/mcp desc' : '/mcp nodesc');
-            }
+        else if (keyMatchers[Command.SHOW_FULL_TODOS](key)) {
+            setShowFullTodos((prev) => !prev);
+        }
+        else if (keyMatchers[Command.TOGGLE_MARKDOWN](key)) {
+            setRenderMarkdown((prev) => {
+                const newValue = !prev;
+                // Force re-render of static content
+                refreshStatic();
+                return newValue;
+            });
         }
         else if (keyMatchers[Command.TOGGLE_IDE_CONTEXT_DETAIL](key) &&
             config.getIdeMode() &&
@@ -662,8 +686,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
         constrainHeight,
         setConstrainHeight,
         setShowErrorDetails,
-        showToolDescriptions,
-        setShowToolDescriptions,
         config,
         ideContextState,
         handleExit,
@@ -679,6 +701,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         activePtyId,
         embeddedShellFocused,
         settings.merged.general?.debugKeystrokeLogging,
+        refreshStatic,
     ]);
     useKeypress(handleGlobalKeypress, { isActive: true });
     // Update terminal title with Gemini CLI status and thoughts
@@ -723,8 +746,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         .filter((msg) => msg.type === 'error')
         .reduce((total, msg) => total + msg.count, 0), [filteredConsoleMessages]);
     const nightly = props.version.includes('nightly');
-    const dialogsVisible = showWorkspaceMigrationDialog ||
-        shouldShowIdePrompt ||
+    const dialogsVisible = shouldShowIdePrompt ||
         isFolderTrustDialogOpen ||
         !!shellConfirmationRequest ||
         !!confirmationRequest ||
@@ -788,9 +810,10 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
+        showFullTodos,
         filteredConsoleMessages,
         ideContextState,
-        showToolDescriptions,
+        renderMarkdown,
         ctrlCPressedOnce,
         ctrlDPressedOnce,
         showEscapePrompt,
@@ -799,9 +822,8 @@ Logging in with Google... Please restart Gemini CLI to continue.
         currentLoadingPhrase,
         historyRemountKey,
         messageQueue,
+        queueErrorMessage,
         showAutoAcceptIndicator,
-        showWorkspaceMigrationDialog,
-        workspaceExtensions,
         currentModel,
         userTier,
         proQuotaRequest,
@@ -819,6 +841,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         terminalWidth,
         terminalHeight,
         mainControlsRef,
+        rootUiRef,
         currentIDE,
         updateInfo,
         showIdeRestartPrompt,
@@ -827,6 +850,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         extensionsUpdateState,
         activePtyId,
         embeddedShellFocused,
+        showDebugProfiler,
     }), [
         isThemeDialogOpen,
         themeError,
@@ -866,9 +890,10 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isTrustedFolder,
         constrainHeight,
         showErrorDetails,
+        showFullTodos,
         filteredConsoleMessages,
         ideContextState,
-        showToolDescriptions,
+        renderMarkdown,
         ctrlCPressedOnce,
         ctrlDPressedOnce,
         showEscapePrompt,
@@ -877,9 +902,8 @@ Logging in with Google... Please restart Gemini CLI to continue.
         currentLoadingPhrase,
         historyRemountKey,
         messageQueue,
+        queueErrorMessage,
         showAutoAcceptIndicator,
-        showWorkspaceMigrationDialog,
-        workspaceExtensions,
         userTier,
         proQuotaRequest,
         contextFileNames,
@@ -896,6 +920,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         terminalWidth,
         terminalHeight,
         mainControlsRef,
+        rootUiRef,
         currentIDE,
         updateInfo,
         showIdeRestartPrompt,
@@ -907,16 +932,19 @@ Logging in with Google... Please restart Gemini CLI to continue.
         historyManager,
         embeddedShellFocused,
         awaitingFeedback,
+        showDebugProfiler,
     ]);
+    const exitPrivacyNotice = useCallback(() => setShowPrivacyNotice(false), [setShowPrivacyNotice]);
     const uiActions = useMemo(() => ({
         handleThemeSelect,
+        closeThemeDialog,
         handleThemeHighlight,
         handleAuthSelect,
         setAuthState,
         onAuthError,
         handleEditorSelect,
         exitEditorDialog,
-        exitPrivacyNotice: () => setShowPrivacyNotice(false),
+        exitPrivacyNotice,
         closeSettingsDialog,
         closeModelDialog,
         closePermissionsDialog,
@@ -929,17 +957,19 @@ Logging in with Google... Please restart Gemini CLI to continue.
         refreshStatic,
         handleFinalSubmit,
         handleClearScreen,
-        onWorkspaceMigrationDialogOpen,
-        onWorkspaceMigrationDialogClose,
         handleProQuotaChoice,
+        setQueueErrorMessage,
+        popAllMessages,
     }), [
         handleThemeSelect,
+        closeThemeDialog,
         handleThemeHighlight,
         handleAuthSelect,
         setAuthState,
         onAuthError,
         handleEditorSelect,
         exitEditorDialog,
+        exitPrivacyNotice,
         closeSettingsDialog,
         closeModelDialog,
         closePermissionsDialog,
@@ -952,9 +982,9 @@ Logging in with Google... Please restart Gemini CLI to continue.
         refreshStatic,
         handleFinalSubmit,
         handleClearScreen,
-        onWorkspaceMigrationDialogOpen,
-        onWorkspaceMigrationDialogClose,
         handleProQuotaChoice,
+        setQueueErrorMessage,
+        popAllMessages,
     ]);
     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,