@blackbox_ai/blackbox-cli 0.8.6 → 1.0.2

package/dist/src/ui/App.js

@@ -24,6 +24,7 @@ import { useDialogCloseAnimation } from './hooks/useDialogCloseAnimation.js';
 import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
 import { useSubagentCreateDialog } from './hooks/useSubagentCreateDialog.js';
 import { useAgentsManagerDialog } from './hooks/useAgentsManagerDialog.js';
+import { useSingleAgentCommand } from './hooks/useSingleAgentCommand.js';
 import { useMultiAgentConfigCommand } from './hooks/useMultiAgentConfigCommand.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
@@ -42,7 +43,6 @@ import { BlackboxOAuthProgress } from './components/BlackboxOAuthProgress.js';
 import { EditorSettingsDialog } from './components/EditorSettingsDialog.js';
 import { FolderTrustDialog } from './components/FolderTrustDialog.js';
 import { ShellConfirmationDialog } from './components/ShellConfirmationDialog.js';
-import { QuitConfirmationDialog } from './components/QuitConfirmationDialog.js';
 import { RadioButtonSelect } from './components/shared/RadioButtonSelect.js';
 import { ModelSelectionDialog } from './components/ModelSelectionDialog.js';
 import { ModelSwitchDialog, } from './components/ModelSwitchDialog.js';
@@ -50,19 +50,20 @@ import { getOpenAIAvailableModelFromEnv, getFilteredBlackboxModels, } from './mo
 import { HistoryBrowserDialog } from './components/HistoryBrowserDialog.js';
 import { processVisionSwitchOutcome } from './hooks/useVisionAutoSwitch.js';
 import { AgentCreationWizard, AgentsManagerDialog, } from './components/subagents/index.js';
+import { SingleAgentDialog } from './components/agents/SingleAgentDialog.js';
 import { MultiAgentConfigDialog } from './components/multiagent/MultiAgentConfigDialog.js';
 import { Colors } from './colors.js';
+import { convertHistoryToConversationString } from './utils/agentConversationUtils.js';
 import { loadHierarchicalGeminiMemory } from '../config/config.js';
-import { SettingScope } from '../config/settings.js';
+import { SettingScope, settingsChangeEmitter } from '../config/settings.js';
 import { Tips } from './components/Tips.js';
 import { ConsolePatcher } from './utils/ConsolePatcher.js';
 import { registerCleanup } from '../utils/cleanup.js';
 import { DetailedMessagesDisplay } from './components/DetailedMessagesDisplay.js';
 import { HistoryItemDisplay } from './components/HistoryItemDisplay.js';
-import { ContextSummaryDisplay } from './components/ContextSummaryDisplay.js';
 import { useHistory } from './hooks/useHistoryManager.js';
 import process from 'node:process';
-import { ApprovalMode, getAllGeminiMdFilenames, isEditorAvailable, getErrorMessage, AuthType, logFlashFallback, FlashFallbackEvent, ideContext, isProQuotaExceededError, isGenericQuotaExceededError, UserTierId, } from '@blackbox_ai/blackbox-cli-core';
+import { ApprovalMode, isEditorAvailable, getErrorMessage, AuthType, logFlashFallback, FlashFallbackEvent, ideContext, isProQuotaExceededError, isGenericQuotaExceededError, UserTierId, } from '@blackbox_ai/blackbox-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import { useLogger } from './hooks/useLogger.js';
 import { StreamingContext } from './contexts/StreamingContext.js';
@@ -95,6 +96,8 @@ import { WelcomeBackDialog } from './components/WelcomeBackDialog.js';
 import { TodoListDialog } from './components/TodoListDialog.js';
 import { ConfigureUI } from '../commands/configure/ConfigureUI.js';
 import { VoiceConfigDialog } from './components/VoiceConfigDialog.js';
+import { QuitConfirmationDialog } from './components/QuitConfirmationDialog.js';
+import { AgentSetDialog } from './components/AgentSetDialog.js';
 // Maximum number of queued messages to display in UI to prevent performance issues
 const MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 function isToolExecuting(pendingHistoryItems) {
@@ -130,6 +133,7 @@ const ShellConfirmationDialogWithAnimation = ({ request }) => {
     return (_jsx(ShellConfirmationDialog, { request: wrappedRequest, isClosing: shellDialogAnimation.isClosing }));
 };
 const App = ({ config, settings, startupWarnings = [], version, initialSlashCommand, }) => {
+    const [_geminiMdFileCount, setGeminiMdFileCount] = useState(0);
     const isFocused = useFocus();
     useBracketedPaste();
     const [updateInfo, _setUpdateInfo] = useState(null);
@@ -149,7 +153,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         consolePatcher.patch();
         registerCleanup(consolePatcher.cleanup);
     }, [handleNewMessage, config]);
-    const { stats: sessionStats, initializeProgressiveAutoSave, setProgressiveAutoSaveEnabled } = useSessionStats();
+    const { stats: sessionStats, initializeProgressiveAutoSave, setProgressiveAutoSaveEnabled, setAgentRoutingDisabled, setActiveAgentSession } = useSessionStats();
     // Initialize progressive auto-save service
     useEffect(() => {
         const progressiveAutoSaveEnabled = settings.merged.general?.progressiveAutoSave?.enabled ?? true;
@@ -160,13 +164,29 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         const enabled = settings.merged.general?.progressiveAutoSave?.enabled ?? true;
         setProgressiveAutoSaveEnabled(enabled);
     }, [settings.merged.general?.progressiveAutoSave?.enabled, setProgressiveAutoSaveEnabled]);
+    // Initialize agent routing disabled state from settings on startup
+    useEffect(() => {
+        const routingDisabled = settings.merged.singleAgent?.routingDisabled ?? false;
+        setAgentRoutingDisabled(routingDisabled);
+    }, [settings.merged.singleAgent?.routingDisabled, setAgentRoutingDisabled, settings.merged.singleAgent]);
+    // Watch for changes in singleAgent settings and update local state for Footer
+    useEffect(() => {
+        const selectedAgent = settings.merged.singleAgent?.selectedAgent;
+        setSelectedAgentForFooter(selectedAgent);
+        // Get model from per-agent configuration
+        const agentModel = selectedAgent
+            ? settings.merged.singleAgent?.agents?.[selectedAgent]?.model
+            : undefined;
+        setAgentModelForFooter(agentModel);
+    }, [settings.merged.singleAgent?.selectedAgent, settings.merged.singleAgent?.agents]);
     const [staticNeedsRefresh, setStaticNeedsRefresh] = useState(false);
     const [staticKey, setStaticKey] = useState(0);
     const refreshStatic = useCallback(() => {
-        stdout.write(ansiEscapes.clearTerminal);
+        // Use cursor repositioning + erase instead of full terminal clear to reduce flickering
+        // This moves cursor to top-left and clears from there, which is less jarring than clearTerminal
+        stdout.write(ansiEscapes.cursorTo(0, 0) + ansiEscapes.eraseDown);
         setStaticKey((prev) => prev + 1);
     }, [setStaticKey, stdout]);
-    const [geminiMdFileCount, setGeminiMdFileCount] = useState(0);
     const [debugMessage, setDebugMessage] = useState('');
     const [themeError, setThemeError] = useState(null);
     const [authError, setAuthError] = useState(null);
@@ -192,6 +212,80 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     const [isProcessing, setIsProcessing] = useState(false);
     const [showTodoListDialog, setShowTodoListDialog] = useState(false);
     const [isVoiceConfigDialogOpen, setIsVoiceConfigDialogOpen] = useState(false);
+    const [showHelpTip, setShowHelpTip] = useState(true);
+    // Hide help tip if history is loaded (e.g., from previous session)
+    useEffect(() => {
+        if (history.length > 0) {
+            setShowHelpTip(false);
+        }
+    }, [history.length]);
+    const [isAgentSetDialogOpen, setIsAgentSetDialogOpen] = useState(false);
+    const [voiceRecordingActive, setVoiceRecordingActive] = useState(false);
+    // State for agent configuration to ensure Footer updates when /agent model changes
+    const [selectedAgentForFooter, setSelectedAgentForFooter] = useState(settings.merged.singleAgent?.selectedAgent);
+    const [agentModelForFooter, setAgentModelForFooter] = useState(() => {
+        const selectedAgent = settings.merged.singleAgent?.selectedAgent;
+        return selectedAgent
+            ? settings.merged.singleAgent?.agents?.[selectedAgent]?.model
+            : undefined;
+    });
+    // Listen for settings changes via event emitter to ensure UI reactivity
+    useEffect(() => {
+        const handleSettingsChange = (changeData) => {
+            // If singleAgent settings changed, update local state immediately
+            if (changeData.key === 'singleAgent') {
+                const singleAgentConfig = changeData.merged.singleAgent;
+                // Check if we should preserve the active session
+                // Only clear the session if the agent type changed, not just the model
+                const currentSession = sessionStats.activeAgentSession;
+                const newSelectedAgent = singleAgentConfig?.selectedAgent;
+                // Sync conversation history from UI history when switching agents
+                // This ensures CLI agents (claude, codex, gemini) have access to the full conversation
+                // that was built up while using blackbox (which uses Gemini client internal history)
+                const syncedConversationHistory = convertHistoryToConversationString(history);
+                // Get the model for the new agent
+                const newModel = newSelectedAgent
+                    ? singleAgentConfig?.agents?.[newSelectedAgent]?.model
+                    : currentSession?.model;
+                // Always preserve conversation history when switching agents
+                // History should only be cleared via /agent exit command
+                if (currentSession) {
+                    // Update the existing session with new agent type, model, and synced conversation history
+                    setActiveAgentSession({
+                        ...currentSession,
+                        agentType: newSelectedAgent,
+                        model: newModel || currentSession.model,
+                        conversationHistory: syncedConversationHistory,
+                    });
+                }
+                else if (history.length > 0 && newSelectedAgent) {
+                    // No current session but there's UI history - create a new session with synced history
+                    // This handles the case where user was using blackbox (direct Gemini client) and switches to another agent
+                    setActiveAgentSession({
+                        agentType: newSelectedAgent,
+                        model: newModel || 'default',
+                        task: '', // No specific task, just continuing conversation
+                        conversationHistory: syncedConversationHistory,
+                    });
+                }
+                // If no current session and no history, don't set one - let the user start a new conversation
+                const selectedAgent = singleAgentConfig?.selectedAgent;
+                setSelectedAgentForFooter(selectedAgent);
+                // Get model from per-agent configuration
+                const agentModel = selectedAgent
+                    ? singleAgentConfig?.agents?.[selectedAgent]?.model
+                    : undefined;
+                setAgentModelForFooter(agentModel);
+                // Also update agent routing disabled state
+                const routingDisabled = singleAgentConfig?.routingDisabled ?? false;
+                setAgentRoutingDisabled(routingDisabled);
+            }
+        };
+        settingsChangeEmitter.on('settingsChanged', handleSettingsChange);
+        return () => {
+            settingsChangeEmitter.off('settingsChanged', handleSettingsChange);
+        };
+    }, [setAgentRoutingDisabled, setActiveAgentSession, sessionStats.activeAgentSession, history]);
     // Releases dialog hook
     const { isReleasesDialogOpen, openReleasesDialog, closeReleasesDialog, releasesVersions, isReleasesLoading, } = useReleasesDialog();
     const { showWorkspaceMigrationDialog, workspaceExtensions, onWorkspaceMigrationDialogOpen, onWorkspaceMigrationDialogClose, } = useWorkspaceMigration(settings);
@@ -350,8 +444,63 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     const closeVoiceConfigDialog = useCallback(() => {
         voiceConfigDialogAnimation.startClosing();
     }, [voiceConfigDialogAnimation]);
+    // Agent set dialog handlers
+    const openAgentSetDialog = useCallback(() => {
+        setIsAgentSetDialogOpen(true);
+    }, []);
+    const closeAgentSetDialogOriginal = useCallback(() => {
+        setIsAgentSetDialogOpen(false);
+    }, []);
+    // Animation hook for agent set dialog
+    const agentSetDialogAnimation = useDialogCloseAnimation(() => {
+        closeAgentSetDialogOriginal();
+    });
+    const closeAgentSetDialog = useCallback(() => {
+        agentSetDialogAnimation.startClosing();
+    }, [agentSetDialogAnimation]);
+    const handleAgentSelected = useCallback((agentType, model) => {
+        // Get the stored model for this agent, or use default
+        const currentAgentConfigs = settings.merged?.singleAgent?.agents || {};
+        const storedModel = currentAgentConfigs[agentType]?.model;
+        const finalModel = storedModel || model;
+        // Update UI state immediately for instant visual feedback
+        setSelectedAgentForFooter(agentType);
+        setAgentModelForFooter(finalModel);
+        // Defer ALL operations to avoid blocking the dialog close
+        setTimeout(() => {
+            // Show success message
+            addItem({
+                type: MessageType.INFO,
+                text: `✓ Switched to ${agentType.charAt(0).toUpperCase() + agentType.slice(1)} agent with model: ${finalModel}`,
+            }, Date.now());
+            // Build the complete singleAgent config object and save it
+            const updatedAgentConfigs = {
+                ...currentAgentConfigs,
+                [agentType]: { model: finalModel },
+            };
+            const singleAgentConfig = {
+                ...settings.merged?.singleAgent,
+                selectedAgent: agentType,
+                model: finalModel,
+                routingDisabled: false,
+                agents: updatedAgentConfigs,
+            };
+            // Save settings in the background - this will trigger the settings change event
+            // which will update other parts of the UI that depend on settings
+            settings.setValue(SettingScope.User, 'singleAgent', singleAgentConfig);
+        }, 0);
+    }, [addItem, settings, setSelectedAgentForFooter, setAgentModelForFooter]);
     const { isSubagentCreateDialogOpen, openSubagentCreateDialog, closeSubagentCreateDialog, } = useSubagentCreateDialog();
     const { isAgentsManagerDialogOpen, openAgentsManagerDialog, closeAgentsManagerDialog, } = useAgentsManagerDialog();
+    const { isSingleAgentDialogOpen, openSingleAgentDialog, closeSingleAgentDialog, } = useSingleAgentCommand();
+    // State for single agent model-only dialog
+    const [isSingleAgentModelDialogOpen, setIsSingleAgentModelDialogOpen] = useState(false);
+    const openSingleAgentModelDialog = useCallback(() => {
+        setIsSingleAgentModelDialogOpen(true);
+    }, []);
+    const closeSingleAgentModelDialog = useCallback(() => {
+        setIsSingleAgentModelDialogOpen(false);
+    }, []);
     const { isMultiAgentConfigDialogOpen, openMultiAgentConfigDialog, closeMultiAgentConfigDialog, } = useMultiAgentConfigCommand();
     const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder);
     const { showQuitConfirmation, handleQuitConfirmationSelect } = useQuitConfirmation();
@@ -365,7 +514,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         if (reloadCommandsRef.current) {
             reloadCommandsRef.current();
         }
-    });
+    }, setActiveAgentSession);
     // Animation hook for auth dialog
     const authDialogAnimation = useDialogCloseAnimation(() => {
         // Close handler - for ESC case
@@ -542,6 +691,29 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     const isNarrow = isNarrowWidth(terminalWidth);
     const { stdin, setRawMode } = useStdin();
     const isInitialMount = useRef(true);
+    // Clear stdin on mount to prevent background detection leaks
+    useEffect(() => {
+        if (!process.stdin.isTTY) {
+            return;
+        }
+        // Drain any buffered data from stdin that might have leaked from background detection
+        const drainStdin = () => {
+            try {
+                // Read and discard any buffered data
+                while (process.stdin.read() !== null) {
+                    // Keep reading until buffer is empty
+                }
+            }
+            catch (_err) {
+                // Ignore errors
+            }
+        };
+        // Drain immediately on mount
+        drainStdin();
+        // Also drain after a short delay to catch any late-arriving data
+        const timeoutId = setTimeout(drainStdin, 50);
+        return () => clearTimeout(timeoutId);
+    }, []);
     const widthFraction = 0.9;
     const inputWidth = Math.max(20, Math.floor(terminalWidth * widthFraction) - 3);
     const suggestionsWidth = Math.max(20, Math.floor(terminalWidth * 0.8));
@@ -559,7 +731,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         const isValidEditor = isEditorAvailable(editorType);
         if (!isValidEditor) {
             openEditorDialog();
-            return;
+            return undefined;
         }
         return editorType;
     }, [settings, openEditorDialog]);
@@ -674,7 +846,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     }, [isModelSelectionDialogOpen, getAvailableModelsForCurrentAuth]);
     // Core hooks and processors
     const { vimEnabled: vimModeEnabled, vimMode, toggleVimEnabled, } = useVimMode();
-    const { handleSlashCommand, slashCommands, pendingHistoryItems: pendingSlashCommandHistoryItems, commandContext, shellConfirmationRequest, confirmationRequest, quitConfirmationRequest, } = useSlashCommandProcessor(config, settings, addItem, clearItems, loadHistory, refreshStatic, setDebugMessage, openThemeDialog, openAuthDialog, openEditorDialog, toggleCorgiMode, setQuittingMessages, openPrivacyNotice, openSettingsDialog, openExtensionsDialog, handleModelSelectionOpen, openSubagentCreateDialog, openAgentsManagerDialog, openMultiAgentConfigDialog, openHistoryBrowser, openDbConfigureDialog, toggleVimEnabled, setIsProcessing, setGeminiMdFileCount, showQuitConfirmation, openVoiceConfigDialog, openReleasesDialog);
+    const { handleSlashCommand, slashCommands, pendingHistoryItems: pendingSlashCommandHistoryItems, commandContext, shellConfirmationRequest, confirmationRequest, quitConfirmationRequest, } = useSlashCommandProcessor(config, settings, addItem, clearItems, loadHistory, refreshStatic, setDebugMessage, openThemeDialog, openAuthDialog, openEditorDialog, toggleCorgiMode, setQuittingMessages, openPrivacyNotice, openSettingsDialog, openExtensionsDialog, handleModelSelectionOpen, openSubagentCreateDialog, openAgentsManagerDialog, openSingleAgentDialog, openSingleAgentModelDialog, openMultiAgentConfigDialog, openHistoryBrowser, openDbConfigureDialog, toggleVimEnabled, setIsProcessing, setGeminiMdFileCount, showQuitConfirmation, openVoiceConfigDialog, openReleasesDialog, openAgentSetDialog, setVoiceRecordingActive);
     // Set the reloadCommands ref when commandContext is available
     useEffect(() => {
         if (commandContext?.ui?.reloadCommands) {
@@ -692,7 +864,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     const [userMessages, setUserMessages] = useState([]);
     // Stable reference for cancel handler to avoid circular dependency
     const cancelHandlerRef = useRef(() => { });
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, isEncryptedMode: _isEncryptedMode, } = useAdaptiveStream(config, history, addItem, setDebugMessage, () => cancelHandlerRef.current(), {
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, isEncryptedMode: _isEncryptedMode, } = useAdaptiveStream(config, history, addItem, setDebugMessage, () => cancelHandlerRef.current(), settings, {
         handleSlashCommand,
         shellModeActive,
         getPreferredEditor,
@@ -740,6 +912,8 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         closeExtensionsDialog,
         isVoiceConfigDialogOpen,
         closeVoiceConfigDialog,
+        isAgentSetDialogOpen,
+        closeAgentSetDialog,
         isReleasesDialogOpen,
         closeReleasesDialog,
         isFolderTrustDialogOpen,
@@ -784,8 +958,12 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     ]);
     // Input handling - queue messages for processing
     const handleFinalSubmit = useCallback((submittedValue) => {
+        // Hide help tip on first command submission
+        if (showHelpTip) {
+            setShowHelpTip(false);
+        }
         addMessage(submittedValue);
-    }, [addMessage]);
+    }, [addMessage, showHelpTip]);
     const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
     const { todos, currentTodo, nextTodo } = useTodoList(config.getSessionId());
     const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, currentTodo?.content || null);
@@ -865,6 +1043,10 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
             if (isAuthenticating) {
                 return;
             }
+            // When voice recording is active, let the voice command handle Ctrl+C.
+            if (voiceRecordingActive) {
+                return;
+            }
             handleExit(ctrlCPressedOnce, setCtrlCPressedOnce, ctrlCTimerRef);
         }
         else if (keyMatchers[Command.EXIT](key)) {
@@ -895,6 +1077,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         ctrlDTimerRef,
         handleSlashCommand,
         isAuthenticating,
+        voiceRecordingActive,
         settings.merged.general?.debugKeystrokeLogging,
     ]);
     useKeypress(handleGlobalKeypress, {
@@ -943,7 +1126,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     const handleClearScreen = useCallback(() => {
         clearItems();
         clearConsoleMessagesState();
-        console.clear();
+        // Removed redundant console.clear() - refreshStatic() already handles screen clearing
         refreshStatic();
     }, [clearItems, clearConsoleMessagesState, refreshStatic]);
     const mainControlsRef = useRef(null);
@@ -984,13 +1167,6 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
         return consoleMessages.filter((msg) => msg.type !== 'debug');
     }, [consoleMessages, config]);
     const branchName = useGitBranchName(config.getTargetDir());
-    const contextFileNames = useMemo(() => {
-        const fromSettings = settings.merged.context?.fileName;
-        if (fromSettings) {
-            return Array.isArray(fromSettings) ? fromSettings : [fromSettings];
-        }
-        return getAllGeminiMdFilenames();
-    }, [settings.merged.context?.fileName]);
     const initialPrompt = useMemo(() => config.getQuestion(), [config]);
     const geminiClient = config.getGeminiClient();
     useEffect(() => {
@@ -1067,7 +1243,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
     const placeholder = vimModeEnabled
         ? "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode."
         : '  Type your message or @path/to/file';
-    return (_jsx(StreamingContext.Provider, { value: streamingState, children: _jsxs(Box, { flexDirection: "column", width: "90%", children: [_jsx(Static, { items: [
+    return (_jsx(StreamingContext.Provider, { value: streamingState, children: _jsxs(Box, { flexDirection: "column", width: "99%", children: [_jsx(Static, { items: [
                         _jsxs(Box, { flexDirection: "column", children: [!(settings.merged.ui?.hideBanner || config.getScreenReader()) && _jsx(Header, { version: version, nightly: nightly }), !(settings.merged.ui?.hideTips || config.getScreenReader()) && (_jsx(Tips, { config: config }))] }, "header"),
                         ...history.map((h) => (_jsx(HistoryItemDisplay, { terminalWidth: mainAreaWidth, availableTerminalHeight: staticAreaMaxItemHeight, item: h, isPending: false, config: config, commands: slashCommands }, h.id))),
                     ], children: (item) => item }, staticKey), _jsx(OverflowProvider, { children: _jsxs(Box, { ref: pendingHistoryItemRef, flexDirection: "column", children: [pendingHistoryItems.map((item) => (_jsx(HistoryItemDisplay, { availableTerminalHeight: constrainHeight ? availableTerminalHeight : undefined, terminalWidth: mainAreaWidth, item: item, isPending: true, config: config, isFocused: !isEditorDialogOpen }, item.id))), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }), _jsxs(Box, { flexDirection: "column", ref: mainControlsRef, children: [updateInfo && _jsx(UpdateNotification, { message: updateInfo.message }), startupWarnings.length > 0 && (_jsx(Box, { borderStyle: "round", borderColor: Colors.Gray, paddingX: 1, marginY: 1, flexDirection: "column", children: startupWarnings.map((warning, index) => (_jsx(Text, { color: Colors.Gray, children: warning }, index))) })), showWelcomeBackDialog && welcomeBackInfo?.hasHistory && (_jsx(WelcomeBackDialog, { welcomeBackInfo: welcomeBackInfo, onSelect: handleWelcomeBackSelection, onClose: handleWelcomeBackClose })), showWorkspaceMigrationDialog ? (_jsx(WorkspaceMigrationDialog, { workspaceExtensions: workspaceExtensions, onOpen: onWorkspaceMigrationDialogOpen, onClose: onWorkspaceMigrationDialogClose })) : isFolderTrustDialogOpen ? (_jsx(FolderTrustDialog, { onSelect: handleFolderTrustSelect, isRestarting: isRestarting })) : quitConfirmationRequest ? (_jsx(QuitConfirmationDialog, { onSelect: (choice) => {
@@ -1087,7 +1263,97 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
                                         ? terminalHeight - staticExtraHeight
                                         : undefined, terminalWidth: mainAreaWidth, isClosing: themeDialogAnimation.isClosing })] })) : isReleasesDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(ReleaseNotesDialog, { versions: releasesVersions, onClose: closeReleasesDialog, availableTerminalHeight: constrainHeight
                                     ? terminalHeight - staticExtraHeight
-                                    : undefined, terminalWidth: mainAreaWidth, isLoading: isReleasesLoading }) })) : isSettingsDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(SettingsDialog, { settings: settings, onSelect: () => closeSettingsDialog(), onRestartRequest: () => process.exit(0), isClosing: settingsDialogAnimation.isClosing }) })) : isExtensionsDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(ExtensionsDialog, { onClose: () => closeExtensionsDialog() }) })) : isSubagentCreateDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AgentCreationWizard, { onClose: closeSubagentCreateDialog, config: config }) })) : isAgentsManagerDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AgentsManagerDialog, { onClose: closeAgentsManagerDialog, config: config }) })) : isMultiAgentConfigDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(MultiAgentConfigDialog, { onComplete: (multiAgentConfig) => {
+                                    : undefined, terminalWidth: mainAreaWidth, isLoading: isReleasesLoading }) })) : isSettingsDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(SettingsDialog, { settings: settings, onSelect: () => closeSettingsDialog(), onRestartRequest: () => process.exit(0), isClosing: settingsDialogAnimation.isClosing }) })) : isExtensionsDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(ExtensionsDialog, { onClose: () => closeExtensionsDialog() }) })) : isSubagentCreateDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AgentCreationWizard, { onClose: closeSubagentCreateDialog, config: config }) })) : isAgentsManagerDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AgentsManagerDialog, { onClose: closeAgentsManagerDialog, config: config }) })) : isSingleAgentDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(SingleAgentDialog, { onComplete: async (singleAgentConfig) => {
+                                    // Always preserve conversation history when switching agents
+                                    // History should only be cleared via /agent exit command
+                                    const currentSession = sessionStats.activeAgentSession;
+                                    if (currentSession) {
+                                        // Update the session with new agent type and model, preserving conversation history
+                                        setActiveAgentSession({
+                                            ...currentSession,
+                                            agentType: singleAgentConfig.selectedAgent,
+                                            model: singleAgentConfig.model,
+                                        });
+                                    }
+                                    // If no current session, don't set one - let the user start a new conversation
+                                    // Get current agent configurations
+                                    const currentAgentConfigs = settings.merged.singleAgent?.agents || {};
+                                    // Update the model for the specific agent in the agents config
+                                    const updatedAgentConfigs = {
+                                        ...currentAgentConfigs,
+                                        [singleAgentConfig.selectedAgent]: {
+                                            model: singleAgentConfig.model,
+                                        },
+                                    };
+                                    // Save configuration to settings with per-agent model storage
+                                    settings.setValue(SettingScope.User, 'singleAgent', {
+                                        selectedAgent: singleAgentConfig.selectedAgent,
+                                        agents: updatedAgentConfigs,
+                                        routingDisabled: false,
+                                    });
+                                    // Re-enable agent routing when configuration is saved
+                                    setAgentRoutingDisabled(false);
+                                    // Update local state to trigger Footer re-render
+                                    setSelectedAgentForFooter(singleAgentConfig.selectedAgent);
+                                    setAgentModelForFooter(singleAgentConfig.model);
+                                    closeSingleAgentDialog();
+                                    // Show appropriate message based on whether history was preserved
+                                    const historyPreserved = currentSession && currentSession.agentType === singleAgentConfig.selectedAgent;
+                                    addItem({
+                                        type: MessageType.INFO,
+                                        text: historyPreserved
+                                            ? `Agent model changed to ${singleAgentConfig.model} for ${singleAgentConfig.selectedAgent}. Conversation context preserved.`
+                                            : `Agent configuration saved: ${singleAgentConfig.selectedAgent} with model ${singleAgentConfig.model}. You're now working with ${singleAgentConfig.selectedAgent}.`,
+                                    }, Date.now());
+                                }, onCancel: closeSingleAgentDialog, initialConfig: {
+                                    selectedAgent: (settings.merged.singleAgent?.selectedAgent === 'blackbox' ? 'claude' : settings.merged.singleAgent?.selectedAgent || 'claude'),
+                                    model: settings.merged.singleAgent?.agents?.[settings.merged.singleAgent?.selectedAgent === 'blackbox' ? 'claude' : settings.merged.singleAgent?.selectedAgent || 'claude']?.model ||
+                                        settings.merged.singleAgent?.model ||
+                                        'blackboxai/anthropic/claude-sonnet-4.5',
+                                }, settings: settings }) })) : isSingleAgentModelDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(SingleAgentDialog, { onComplete: async (singleAgentConfig) => {
+                                    // Always preserve conversation history when switching agents
+                                    // History should only be cleared via /agent exit command
+                                    const currentSession = sessionStats.activeAgentSession;
+                                    if (currentSession) {
+                                        // Update the session with new agent type and model, preserving conversation history
+                                        setActiveAgentSession({
+                                            ...currentSession,
+                                            agentType: singleAgentConfig.selectedAgent,
+                                            model: singleAgentConfig.model,
+                                        });
+                                    }
+                                    // If no current session, don't set one - let the user start a new conversation
+                                    // Get current agent configurations
+                                    const currentAgentConfigs = settings.merged.singleAgent?.agents || {};
+                                    // Update the model for the specific agent in the agents config
+                                    const updatedAgentConfigs = {
+                                        ...currentAgentConfigs,
+                                        [singleAgentConfig.selectedAgent]: {
+                                            model: singleAgentConfig.model,
+                                        },
+                                    };
+                                    // Save the updated per-agent configuration
+                                    settings.setValue(SettingScope.User, 'singleAgent', {
+                                        selectedAgent: singleAgentConfig.selectedAgent,
+                                        agents: updatedAgentConfigs,
+                                        routingDisabled: false,
+                                    });
+                                    // Re-enable agent routing when configuration is saved
+                                    setAgentRoutingDisabled(false);
+                                    // Update local state to trigger Footer re-render
+                                    setSelectedAgentForFooter(singleAgentConfig.selectedAgent);
+                                    setAgentModelForFooter(singleAgentConfig.model);
+                                    closeSingleAgentModelDialog();
+                                    addItem({
+                                        type: MessageType.INFO,
+                                        text: `Agent model changed to ${singleAgentConfig.model} for ${singleAgentConfig.selectedAgent}. Conversation context preserved.`,
+                                    }, Date.now());
+                                }, onCancel: closeSingleAgentModelDialog, initialConfig: {
+                                    selectedAgent: (settings.merged.singleAgent?.selectedAgent === 'blackbox' ? 'claude' : settings.merged.singleAgent?.selectedAgent || 'claude'),
+                                    model: settings.merged.singleAgent?.agents?.[settings.merged.singleAgent?.selectedAgent === 'blackbox' ? 'claude' : settings.merged.singleAgent?.selectedAgent || 'claude']?.model ||
+                                        settings.merged.singleAgent?.model ||
+                                        'blackboxai/anthropic/claude-sonnet-4.5',
+                                }, settings: settings, startAtModelStep: true }) })) : isMultiAgentConfigDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(MultiAgentConfigDialog, { onComplete: (multiAgentConfig) => {
                                     // Save configuration to settings
                                     settings.setValue(SettingScope.User, 'multiAgent', multiAgentConfig);
                                     closeMultiAgentConfigDialog();
@@ -1137,7 +1403,7 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
                                     } })) : (_jsx(AuthInProgress, { onTimeout: () => {
                                         // User cancelled - just return to agent without showing dialog
                                         cancelAuthentication();
-                                    } })), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }))] })) : isAuthDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AuthDialog, { onSelect: handleAuthSelect, settings: settings, initialErrorMessage: authError, isClosing: authDialogAnimation.isClosing }) })) : isEditorDialogOpen ? (_jsxs(Box, { flexDirection: "column", children: [editorError && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: Colors.AccentRed, children: editorError }) })), _jsx(EditorSettingsDialog, { onSelect: handleEditorSelect, settings: settings, onExit: exitEditorDialog })] })) : isModelSelectionDialogOpen ? (_jsx(ModelSelectionDialog, { availableModels: availableModelsForDialog, currentModel: currentModel, onSelect: handleModelSelect, onCancel: handleModelSelectionClose, isClosing: modelDialogAnimation.isClosing })) : isVisionSwitchDialogOpen ? (_jsx(ModelSwitchDialog, { onSelect: handleVisionSwitchSelect })) : isVoiceConfigDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(VoiceConfigDialog, { settings: settings, onClose: closeVoiceConfigDialog, isClosing: voiceConfigDialogAnimation.isClosing, onConfigComplete: handleVoiceConfigComplete }) })) : showPrivacyNotice ? (_jsx(PrivacyNotice, { onExit: () => setShowPrivacyNotice(false), config: config })) : (_jsxs(_Fragment, { children: [showTodoListDialog && (_jsx(TodoListDialog, { todos: todos, onClose: () => setShowTodoListDialog(false) })), _jsx(LoadingIndicator, { thought: streamingState === StreamingState.WaitingForConfirmation ||
+                                    } })), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }))] })) : isAuthDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AuthDialog, { onSelect: handleAuthSelect, settings: settings, initialErrorMessage: authError, isClosing: authDialogAnimation.isClosing }) })) : isEditorDialogOpen ? (_jsxs(Box, { flexDirection: "column", children: [editorError && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: Colors.AccentRed, children: editorError }) })), _jsx(EditorSettingsDialog, { onSelect: handleEditorSelect, settings: settings, onExit: exitEditorDialog })] })) : isModelSelectionDialogOpen ? (_jsx(ModelSelectionDialog, { availableModels: availableModelsForDialog, currentModel: currentModel, onSelect: handleModelSelect, onCancel: handleModelSelectionClose, isClosing: modelDialogAnimation.isClosing })) : isVisionSwitchDialogOpen ? (_jsx(ModelSwitchDialog, { onSelect: handleVisionSwitchSelect })) : isVoiceConfigDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(VoiceConfigDialog, { settings: settings, onClose: closeVoiceConfigDialog, isClosing: voiceConfigDialogAnimation.isClosing, onConfigComplete: handleVoiceConfigComplete }) })) : isAgentSetDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(AgentSetDialog, { settings: settings, onClose: closeAgentSetDialog, onAgentSelected: handleAgentSelected }) })) : showPrivacyNotice ? (_jsx(PrivacyNotice, { onExit: () => setShowPrivacyNotice(false), config: config })) : (_jsxs(_Fragment, { children: [showTodoListDialog && (_jsx(TodoListDialog, { todos: todos, onClose: () => setShowTodoListDialog(false) })), _jsx(LoadingIndicator, { thought: streamingState === StreamingState.WaitingForConfirmation ||
                                         config.getAccessibility()?.disableLoadingPhrases ||
                                         config.getScreenReader()
                                         ? undefined
@@ -1153,9 +1419,9 @@ const App = ({ config, settings, startupWarnings = [], version, initialSlashComm
                                             return (
                                             // Ensure the Box takes full width so truncation calculates correctly
                                             _jsx(Box, { paddingLeft: 2, width: "100%", children: _jsx(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index));
-                                        }), messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (_jsx(Box, { paddingLeft: 2, children: _jsxs(Text, { dimColor: true, children: ["... (+", messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES, "more)"] }) }))] })), _jsxs(Box, { marginTop: 1, justifyContent: "space-between", width: "100%", flexDirection: isNarrow ? 'column' : 'row', alignItems: isNarrow ? 'flex-start' : 'center', children: [_jsxs(Box, { children: [process.env['GEMINI_SYSTEM_MD'] && (_jsx(Text, { color: Colors.AccentRed, children: "|\u2310\u25A0_\u25A0| " })), ctrlCPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+C again to confirm exit." })) : ctrlDPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+D again to exit." })) : showEscapePrompt ? (_jsx(Text, { color: Colors.Gray, children: "Press Esc again to clear." })) : (_jsx(ContextSummaryDisplay, { ideContext: ideContextState, geminiMdFileCount: geminiMdFileCount, contextFileNames: contextFileNames, mcpServers: config.getMcpServers(), blockedMcpServers: config.getBlockedMcpServers(), showToolDescriptions: showToolDescriptions }))] }), _jsxs(Box, { paddingTop: isNarrow ? 1 : 0, children: [showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
-                                                    !shellModeActive && (_jsx(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator })), shellModeActive && _jsx(ShellModeIndicator, {})] })] }), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) })), isInputActive && (_jsx(InputPrompt, { buffer: buffer, inputWidth: inputWidth, suggestionsWidth: suggestionsWidth, onSubmit: handleFinalSubmit, userMessages: userMessages, onClearScreen: handleClearScreen, config: config, slashCommands: slashCommands, commandContext: commandContext, shellModeActive: shellModeActive, setShellModeActive: setShellModeActive, onEscapePromptChange: handleEscapePromptChange, focus: isFocused, vimHandleInput: vimHandleInput, placeholder: placeholder }))] })), initError && streamingState !== StreamingState.Responding && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentRed, paddingX: 1, marginBottom: 1, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text ? (_jsx(Text, { color: Colors.AccentRed, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: Colors.AccentRed, children: ["Initialization Error: ", initError] }), _jsxs(Text, { color: Colors.AccentRed, children: [' ', "Please check API key and configuration."] })] })) })), !settings.merged.ui?.hideFooter && (_jsx(Footer, { model: currentModel, targetDir: config.getTargetDir(), debugMode: config.getDebugMode(), branchName: branchName, debugMessage: debugMessage, corgiMode: corgiMode, errorCount: errorCount, showErrorDetails: showErrorDetails, showMemoryUsage: config.getDebugMode() ||
+                                        }), messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (_jsx(Box, { paddingLeft: 2, children: _jsxs(Text, { dimColor: true, children: ["... (+", messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES, "more)"] }) }))] })), _jsxs(Box, { marginTop: 1, justifyContent: "space-between", width: "100%", flexDirection: isNarrow ? 'column' : 'row', alignItems: isNarrow ? 'flex-start' : 'center', children: [_jsxs(Box, { children: [process.env['GEMINI_SYSTEM_MD'] && (_jsx(Text, { color: Colors.AccentRed, children: "|\u2310\u25A0_\u25A0| " })), ctrlCPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+C again to confirm exit." })) : ctrlDPressedOnce ? (_jsx(Text, { color: Colors.AccentYellow, children: "Press Ctrl+D again to exit." })) : showEscapePrompt ? (_jsx(Text, { color: Colors.Gray, children: "Press Esc again to clear." })) : null] }), _jsxs(Box, { paddingTop: isNarrow ? 1 : 0, children: [showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
+                                                    !shellModeActive && (_jsx(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator })), shellModeActive && _jsx(ShellModeIndicator, {})] })] }), showErrorDetails && (_jsx(OverflowProvider, { children: _jsxs(Box, { flexDirection: "column", children: [_jsx(DetailedMessagesDisplay, { messages: filteredConsoleMessages, maxHeight: constrainHeight ? debugConsoleMaxHeight : undefined, width: inputWidth }), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) })), isInputActive && (_jsx(InputPrompt, { buffer: buffer, inputWidth: inputWidth, suggestionsWidth: suggestionsWidth, onSubmit: handleFinalSubmit, userMessages: userMessages, onClearScreen: handleClearScreen, config: config, slashCommands: slashCommands, commandContext: commandContext, shellModeActive: shellModeActive, setShellModeActive: setShellModeActive, onEscapePromptChange: handleEscapePromptChange, focus: isFocused, vimHandleInput: vimHandleInput, placeholder: placeholder })), showHelpTip && isInputActive && history.length === 0 && (_jsxs(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { color: Colors.Gray, children: "Run /help for tips" }), _jsx(Text, { color: Colors.Gray, children: "Use Ctrl+J to newline" })] }))] })), initError && streamingState !== StreamingState.Responding && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentRed, paddingX: 1, marginBottom: 1, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text ? (_jsx(Text, { color: Colors.AccentRed, children: history.find((item) => item.type === 'error' && item.text?.includes(initError))?.text })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: Colors.AccentRed, children: ["Initialization Error: ", initError] }), _jsxs(Text, { color: Colors.AccentRed, children: [' ', "Please check API key and configuration."] })] })) })), !settings.merged.ui?.hideFooter && (_jsx(Footer, { model: currentModel, targetDir: config.getTargetDir(), debugMode: config.getDebugMode(), branchName: branchName, debugMessage: debugMessage, corgiMode: corgiMode, errorCount: errorCount, showErrorDetails: showErrorDetails, showMemoryUsage: config.getDebugMode() ||
                                 settings.merged.ui?.showMemoryUsage ||
-                                false, promptTokenCount: sessionStats.lastPromptTokenCount, nightly: nightly, vimMode: vimModeEnabled ? vimMode : undefined, isTrustedFolder: isTrustedFolderState }))] })] }) }));
+                                false, promptTokenCount: sessionStats.lastPromptTokenCount, nightly: nightly, vimMode: vimModeEnabled ? vimMode : undefined, isTrustedFolder: isTrustedFolderState, selectedAgent: selectedAgentForFooter, agentModel: agentModelForFooter, activeAgentSession: sessionStats.activeAgentSession, agentRoutingDisabled: sessionStats.agentRoutingDisabled }))] })] }) }));
 };
 //# sourceMappingURL=App.js.map