@vybestack/llxprt-code 0.2.25 → 0.3.4-nightly.250912.5e46408e

package/dist/src/services/McpPromptLoader.test.js

@@ -0,0 +1,114 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { McpPromptLoader } from './McpPromptLoader.js';
+import { describe, it, expect } from 'vitest';
+describe('McpPromptLoader', () => {
+    const mockConfig = {};
+    describe('parseArgs', () => {
+        it('should handle multi-word positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'arg1', required: true },
+                { name: 'arg2', required: true },
+            ];
+            const userArgs = 'hello world';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello', arg2: 'world' });
+        });
+        it('should handle quoted multi-word positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'arg1', required: true },
+                { name: 'arg2', required: true },
+            ];
+            const userArgs = '"hello world" foo';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello world', arg2: 'foo' });
+        });
+        it('should handle a single positional argument with multiple words', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [{ name: 'arg1', required: true }];
+            const userArgs = 'hello world';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello world' });
+        });
+        it('should handle escaped quotes in positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [{ name: 'arg1', required: true }];
+            const userArgs = '"hello \\"world\\""';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello "world"' });
+        });
+        it('should handle escaped backslashes in positional arguments', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [{ name: 'arg1', required: true }];
+            const userArgs = '"hello\\\\world"';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: 'hello\\world' });
+        });
+        it('should handle named args followed by positional args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'named', required: true },
+                { name: 'pos', required: true },
+            ];
+            const userArgs = '--named="value" positional';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ named: 'value', pos: 'positional' });
+        });
+        it('should handle positional args followed by named args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'pos', required: true },
+                { name: 'named', required: true },
+            ];
+            const userArgs = 'positional --named="value"';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ pos: 'positional', named: 'value' });
+        });
+        it('should handle positional args interspersed with named args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'pos1', required: true },
+                { name: 'named', required: true },
+                { name: 'pos2', required: true },
+            ];
+            const userArgs = 'p1 --named="value" p2';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ pos1: 'p1', named: 'value', pos2: 'p2' });
+        });
+        it('should treat an escaped quote at the start as a literal', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'arg1', required: true },
+                { name: 'arg2', required: true },
+            ];
+            const userArgs = '\\"hello world';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({ arg1: '"hello', arg2: 'world' });
+        });
+        it('should handle a complex mix of args', () => {
+            const loader = new McpPromptLoader(mockConfig);
+            const promptArgs = [
+                { name: 'pos1', required: true },
+                { name: 'named1', required: true },
+                { name: 'pos2', required: true },
+                { name: 'named2', required: true },
+                { name: 'pos3', required: true },
+            ];
+            const userArgs = 'p1 --named1="value 1" "p2 has spaces" --named2=value2 "p3 \\"with quotes\\""';
+            const result = loader.parseArgs(userArgs, promptArgs);
+            expect(result).toEqual({
+                pos1: 'p1',
+                named1: 'value 1',
+                pos2: 'p2 has spaces',
+                named2: 'value2',
+                pos3: 'p3 "with quotes"',
+            });
+        });
+    });
+});
+//# sourceMappingURL=McpPromptLoader.test.js.map

package/dist/src/services/McpPromptLoader.test.js.map

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

package/dist/src/services/prompt-processors/argumentProcessor.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { IPromptProcessor } from './types.js';

package/dist/src/services/prompt-processors/argumentProcessor.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 /**

package/dist/src/services/prompt-processors/shellProcessor.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandContext } from '../../ui/commands/types.js';

package/dist/src/services/prompt-processors/shellProcessor.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ApprovalMode, checkCommandPermissions, escapeShellArg, getShellConfiguration, ShellExecutionService, } from '@vybestack/llxprt-code-core';

package/dist/src/services/prompt-processors/types.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandContext } from '../../ui/commands/types.js';

package/dist/src/services/prompt-processors/types.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 /**

package/dist/src/services/types.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { SlashCommand } from '../ui/commands/types.js';

package/dist/src/services/types.js

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

package/dist/src/test-utils/customMatchers.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 declare module 'vitest' {

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 /// <reference types="vitest/globals" />

package/dist/src/test-utils/mockCommandContext.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandContext } from '../ui/commands/types.js';

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { vi } from 'vitest';

package/dist/src/test-utils/mockCommandContext.test.d.ts

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

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { vi, describe, it, expect } from 'vitest';

package/dist/src/test-utils/render.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { render } from 'ink-testing-library';

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { render } from 'ink-testing-library';

package/dist/src/test-utils/responsive-testing.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import React from 'react';

package/dist/src/test-utils/responsive-testing.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { render } from '@testing-library/react';

package/dist/src/test-utils/responsive-testing.test.d.ts

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

package/dist/src/test-utils/responsive-testing.test.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, beforeEach } from 'vitest';

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { LoadedSettings } from '../config/settings.js';

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

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

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

@@ -1,7 +1,7 @@
 /**
  * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier:Apache-2.0
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect } from 'vitest';
 /**

package/dist/src/ui/App.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useCallback, useEffect, useMemo, useState, useRef, useReducer, } from 'react';
 import { Box, measureElement, Static, Text, useStdin, useStdout, } from 'ink';
-import { StreamingState, MessageType } from './types.js';
+import { StreamingState, MessageType, ToolCallStatus, } from './types.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { useGeminiStream } from './hooks/useGeminiStream.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
@@ -65,6 +65,8 @@ import { AppDispatchProvider } from './contexts/AppDispatchContext.js';
 import { UpdateNotification } from './components/UpdateNotification.js';
 import { isProQuotaExceededError, isGenericQuotaExceededError, UserTierId, } from '@vybestack/llxprt-code-core';
 import ansiEscapes from 'ansi-escapes';
+import { TodoProvider } from './contexts/TodoProvider.js';
+import { ToolCallProvider } from './contexts/ToolCallProvider.js';
 import { OverflowProvider } from './contexts/OverflowContext.js';
 import { ShowMoreLines } from './components/ShowMoreLines.js';
 import { PrivacyNotice } from './privacy/PrivacyNotice.js';
@@ -84,12 +86,20 @@ import { ToolsDialog } from './components/ToolsDialog.js';
 // Todo UI imports
 import { TodoPanel } from './components/TodoPanel.js';
 import { useTodoContext } from './contexts/TodoContext.js';
+import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js';
+import { WorkspaceMigrationDialog } from './components/WorkspaceMigrationDialog.js';
 const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
-import { TodoProvider } from './contexts/TodoProvider.js';
-import { ToolCallProvider } from './contexts/ToolCallProvider.js';
+function isToolExecuting(pendingHistoryItems) {
+    return pendingHistoryItems.some((item) => {
+        if (item && item.type === 'tool_group') {
+            return item.tools.some((tool) => ToolCallStatus.Executing === tool.status);
+        }
+        return false;
+    });
+}
 export const AppWrapper = (props) => {
     const kittyProtocolStatus = useKittyKeyboardProtocol();
-    return (_jsx(KeypressProvider, { kittyProtocolEnabled: kittyProtocolStatus.enabled, config: props.config, children: _jsx(SessionStatsProvider, { children: _jsx(VimModeProvider, { settings: props.settings, children: _jsx(ToolCallProvider, { sessionId: props.config.getSessionId(), children: _jsx(TodoProvider, { sessionId: props.config.getSessionId(), children: _jsx(AppWithState, { ...props }) }) }) }) }) }));
+    return (_jsx(KeypressProvider, { kittyProtocolEnabled: kittyProtocolStatus.enabled, config: props.config, debugKeystrokeLogging: props.settings.merged.debugKeystrokeLogging, children: _jsx(SessionStatsProvider, { children: _jsx(VimModeProvider, { settings: props.settings, children: _jsx(ToolCallProvider, { sessionId: props.config.getSessionId(), children: _jsx(TodoProvider, { sessionId: props.config.getSessionId(), children: _jsx(AppWithState, { ...props }) }) }) }) }) }));
 };
 // New intermediate component that manages state and provides context
 const AppWithState = (props) => {
@@ -210,6 +220,7 @@ const App = (props) => {
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
     const [isProcessing, setIsProcessing] = useState(false);
     const [providerModels, setProviderModels] = useState([]);
+    const { showWorkspaceMigrationDialog, workspaceExtensions, onWorkspaceMigrationDialogOpen, onWorkspaceMigrationDialogClose, } = useWorkspaceMigration(settings);
     useEffect(() => {
         const unsubscribe = ideContext.subscribeToIdeContext(setIdeContextState);
         // Set the initial value
@@ -279,7 +290,7 @@ const App = (props) => {
         .reduce((total, msg) => total + msg.count, 0), [consoleMessages]);
     const { isThemeDialogOpen, openThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, appState, addItem);
     const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
-    const { isFolderTrustDialogOpen, handleFolderTrustSelect } = useFolderTrust(settings, config);
+    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, config);
     const { isAuthDialogOpen, openAuthDialog, handleAuthSelect, isAuthenticating, cancelAuthentication, } = useAuthCommand(settings, appState, config);
     useEffect(() => {
         if (settings.merged.selectedAuthType && !settings.merged.useExternalAuth) {
@@ -510,13 +521,17 @@ You can switch authentication methods by typing /auth or switch to a different m
         // Open the auth dialog when authentication errors occur
         appDispatch({ type: 'OPEN_DIALOG', payload: 'auth' });
     }, [setAuthError, appDispatch]);
-    const onOAuthCodeNeeded = useCallback((provider) => {
-        // Store provider for the dialog
-        global.__oauth_provider =
-            provider;
-        // Open the OAuth code input dialog
-        appDispatch({ type: 'OPEN_DIALOG', payload: 'oauthCode' });
-    }, [appDispatch]);
+    // Commented out unused onOAuthCodeNeeded
+    // const onOAuthCodeNeeded = useCallback(
+    //   (provider: string) => {
+    //     // Store provider for the dialog
+    //     (global as unknown as { __oauth_provider: string }).__oauth_provider =
+    //       provider;
+    //     // Open the OAuth code input dialog
+    //     appDispatch({ type: 'OPEN_DIALOG', payload: 'oauthCode' });
+    //   },
+    //   [appDispatch],
+    // );
     const handleAuthTimeout = useCallback(() => {
         setAuthError('Authentication timed out. Please try again.');
         cancelAuthentication();
@@ -562,8 +577,24 @@ You can switch authentication methods by typing /auth or switch to a different m
             }
         }
     }, []);
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, } = useGeminiStream(config.getGeminiClient(), history, addItem, setShowHelp, config, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, handleUserCancel, onOAuthCodeNeeded);
-    // Input handling
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, } = useGeminiStream(config.getGeminiClient(), history, addItem, config, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, handleUserCancel);
+    const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
+    // Message queue functionality removed - not implemented
+    // Update the cancel handler with message queue support
+    const cancelHandlerRef = useRef(null);
+    cancelHandlerRef.current = useCallback(() => {
+        if (isToolExecuting(pendingHistoryItems)) {
+            buffer.setText(''); // Just clear the prompt
+            return;
+        }
+        const lastUserMessage = userMessages.at(-1);
+        const textToSet = lastUserMessage || '';
+        // Queue functionality removed - no queued messages to append
+        if (textToSet) {
+            buffer.setText(textToSet);
+        }
+    }, [buffer, userMessages, pendingHistoryItems]);
+    // Input handling - queue messages for processing
     const handleFinalSubmit = useCallback((submittedValue) => {
         const trimmedValue = submittedValue.trim();
         if (trimmedValue.length > 0) {
@@ -590,11 +621,9 @@ You can switch authentication methods by typing /auth or switch to a different m
         }
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
-    const { handleInput: vimHandleInput } = useVim(buffer, handleUserInputSubmit);
-    const pendingHistoryItems = [...pendingSlashCommandHistoryItems];
-    pendingHistoryItems.push(...pendingGeminiHistoryItems);
+    const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
     const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState);
-    const showAutoAcceptIndicator = useAutoAcceptIndicator({ config });
+    const showAutoAcceptIndicator = useAutoAcceptIndicator({ config, addItem });
     const handleExit = useCallback((pressedOnce, setPressedOnce, timerRef) => {
         if (pressedOnce) {
             if (timerRef.current) {
@@ -615,6 +644,10 @@ You can switch authentication methods by typing /auth or switch to a different m
         handleSlashCommand('/quit');
     }, [handleSlashCommand]);
     const handleGlobalKeypress = useCallback((key) => {
+        // Debug log keystrokes if enabled
+        if (settings.merged.debugKeystrokeLogging) {
+            console.log('[DEBUG] Keystroke:', JSON.stringify(key));
+        }
         let enteringConstrainHeightMode = false;
         if (!constrainHeight) {
             enteringConstrainHeightMode = true;
@@ -676,6 +709,7 @@ You can switch authentication methods by typing /auth or switch to a different m
         handleSlashCommand,
         isAuthenticating,
         cancelOngoingRequest,
+        settings.merged.debugKeystrokeLogging,
     ]);
     useKeypress(handleGlobalKeypress, {
         isActive: true,
@@ -685,7 +719,7 @@ You can switch authentication methods by typing /auth or switch to a different m
             setLlxprtMdFileCount(config.getLlxprtMdFileCount());
         }
     }, [config, config.getLlxprtMdFileCount]);
-    const logger = useLogger();
+    const logger = useLogger(config.storage);
     useEffect(() => {
         const fetchUserMessages = async () => {
             const pastMessagesRaw = (await logger?.getPreviousUserMessages()) || []; // Newest first
@@ -819,21 +853,23 @@ You can switch authentication methods by typing /auth or switch to a different m
             ? '  Type your message, @path/to/file or +path/to/file'
             : '  Type your message or @path/to/file';
     return (_jsx(StreamingContext.Provider, { value: streamingState, children: _jsxs(Box, { flexDirection: "column", width: "90%", children: [_jsx(Static, { items: [
-                        _jsxs(Box, { flexDirection: "column", children: [!settings.merged.hideBanner && (_jsx(Header, { terminalWidth: terminalWidth, version: version, nightly: nightly })), !settings.merged.hideTips && _jsx(Tips, { config: config })] }, "header"),
+                        _jsxs(Box, { flexDirection: "column", children: [!(settings.merged.hideBanner || config.getScreenReader()) && (_jsx(Header, { terminalWidth: terminalWidth, version: version, nightly: nightly })), !(settings.merged.hideTips || config.getScreenReader()) && (_jsx(Tips, { config: config }))] }, "header"),
                         ...history.map((h) => (_jsx(HistoryItemDisplay, { terminalWidth: mainAreaWidth, availableTerminalHeight: staticAreaMaxItemHeight, item: h, isPending: false, config: config }, h.id))),
                     ], children: (item) => item }, staticKey), _jsx(OverflowProvider, { children: _jsxs(Box, { ref: pendingHistoryItemRef, flexDirection: "column", children: [pendingHistoryItems.map((item, i) => (_jsx(HistoryItemDisplay, { availableTerminalHeight: constrainHeight ? availableTerminalHeight : undefined, terminalWidth: mainAreaWidth, 
                                 // TODO(taehykim): It seems like references to ids aren't necessary in
                                 // HistoryItemDisplay. Refactor later. Use a fake id for now.
-                                item: { ...item, id: 0 }, isPending: true, config: config, isFocused: !isEditorDialogOpen }, i))), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }), showHelp && _jsx(Help, { commands: slashCommands }), _jsxs(Box, { flexDirection: "column", ref: mainControlsRef, children: [updateInfo && _jsx(UpdateNotification, { message: updateInfo.message }), startupWarnings.length > 0 && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentYellow, paddingX: 1, marginY: 1, flexDirection: "column", children: startupWarnings.map((warning, index) => (_jsx(Text, { color: Colors.AccentYellow, children: warning }, index))) })), _jsx(TodoPanel, { width: inputWidth }), shouldShowIdePrompt && currentIDE ? (_jsx(IdeIntegrationNudge, { ide: currentIDE, onComplete: handleIdePromptComplete })) : isFolderTrustDialogOpen ? (_jsx(FolderTrustDialog, { onSelect: handleFolderTrustSelect })) : shellConfirmationRequest ? (_jsx(ShellConfirmationDialog, { request: shellConfirmationRequest })) : confirmationRequest ? (_jsxs(Box, { flexDirection: "column", children: [confirmationRequest.prompt, _jsx(Box, { paddingY: 1, children: _jsx(RadioButtonSelect, { isFocused: !!confirmationRequest, items: [
+                                item: { ...item, id: 0 }, isPending: true, config: config, isFocused: !isEditorDialogOpen }, i))), _jsx(ShowMoreLines, { constrainHeight: constrainHeight })] }) }), showHelp && _jsx(Help, { commands: slashCommands }), _jsxs(Box, { flexDirection: "column", ref: mainControlsRef, children: [updateInfo && _jsx(UpdateNotification, { message: updateInfo.message }), startupWarnings.length > 0 && (_jsx(Box, { borderStyle: "round", borderColor: Colors.AccentYellow, paddingX: 1, marginY: 1, flexDirection: "column", children: startupWarnings.map((warning, index) => (_jsx(Text, { color: Colors.AccentYellow, children: warning }, index))) })), _jsx(TodoPanel, { width: inputWidth }), showWorkspaceMigrationDialog ? (_jsx(WorkspaceMigrationDialog, { workspaceExtensions: workspaceExtensions, onOpen: onWorkspaceMigrationDialogOpen, onClose: onWorkspaceMigrationDialogClose })) : shouldShowIdePrompt && currentIDE ? (_jsx(IdeIntegrationNudge, { ide: currentIDE, onComplete: handleIdePromptComplete })) : isFolderTrustDialogOpen ? (_jsx(FolderTrustDialog, { onSelect: handleFolderTrustSelect, isRestarting: isRestarting })) : shellConfirmationRequest ? (_jsx(ShellConfirmationDialog, { request: shellConfirmationRequest })) : confirmationRequest ? (_jsxs(Box, { flexDirection: "column", children: [confirmationRequest.prompt, _jsx(Box, { paddingY: 1, children: _jsx(RadioButtonSelect, { isFocused: !!confirmationRequest, items: [
                                             { label: 'Yes', value: true },
                                             { label: 'No', value: false },
                                         ], onSelect: handleConfirmationSelect }) })] })) : isThemeDialogOpen ? (_jsxs(Box, { flexDirection: "column", children: [_themeError && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: Colors.AccentRed, children: _themeError }) })), _jsx(ThemeDialog, { onSelect: handleThemeSelect, onHighlight: handleThemeHighlight, settings: settings, availableTerminalHeight: constrainHeight
                                         ? terminalHeight - staticExtraHeight
                                         : undefined, terminalWidth: mainAreaWidth })] })) : isSettingsDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(SettingsDialog, { settings: settings, onSelect: closeSettingsDialog, onRestartRequest: handleSettingsRestart }) })) : isAuthenticating ? (_jsxs(_Fragment, { children: [_jsx(AuthInProgress, { onTimeout: handleAuthTimeout }), 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 }) })) : appState.openDialogs.oauthCode ? (_jsx(Box, { flexDirection: "column", children: _jsx(OAuthCodeDialog, { provider: global
                                     .__oauth_provider || 'anthropic', onClose: handleOAuthCodeDialogClose, onSubmit: handleOAuthCodeSubmit }) })) : 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 })] })) : isProviderDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(ProviderDialog, { providers: providerManager.listProviders(), currentProvider: providerManager.getActiveProviderName(), onSelect: handleProviderSelect, onClose: exitProviderDialog }) })) : isProviderModelDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(ProviderModelDialog, { models: providerModels, currentModel: currentModel, onSelect: handleProviderModelChange, onClose: exitProviderModelDialog }) })) : isLoadProfileDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(LoadProfileDialog, { profiles: profiles, onSelect: handleProfileSelect, onClose: exitLoadProfileDialog }) })) : isToolsDialogOpen ? (_jsx(Box, { flexDirection: "column", children: _jsx(ToolsDialog, { tools: toolsDialogTools, action: toolsDialogAction, disabledTools: toolsDialogDisabledTools, onSelect: handleToolsSelect, onClose: exitToolsDialog }) })) : showPrivacyNotice ? (_jsx(PrivacyNotice, { onExit: handlePrivacyNoticeExit, config: config })) : (_jsxs(_Fragment, { children: [_jsx(LoadingIndicator, { thought: streamingState === StreamingState.WaitingForConfirmation ||
-                                        config.getAccessibility()?.disableLoadingPhrases
+                                        config.getAccessibility()?.disableLoadingPhrases ||
+                                        config.getScreenReader()
                                         ? undefined
-                                        : thought, currentLoadingPhrase: config.getAccessibility()?.disableLoadingPhrases
+                                        : thought, currentLoadingPhrase: config.getAccessibility()?.disableLoadingPhrases ||
+                                        config.getScreenReader()
                                         ? undefined
                                         : currentLoadingPhrase, elapsedTime: elapsedTime }), _jsxs(Box, { marginTop: 1, display: "flex", justifyContent: "space-between", width: "100%", 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 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, llxprtMdFileCount: llxprtMdFileCount, contextFileNames: contextFileNames, mcpServers: config.getMcpServers(), blockedMcpServers: config.getBlockedMcpServers(), showToolDescriptions: showToolDescriptions }))] }), _jsxs(Box, { 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(_Fragment, { children: _jsx(InputPrompt, { buffer: buffer, inputWidth: inputWidth, suggestionsWidth: suggestionsWidth, onSubmit: handleUserInputSubmit, 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.hideFooter && (_jsx(Footer, { model: currentModel, targetDir: config.getTargetDir(), debugMode: config.getDebugMode(), branchName: branchName, debugMessage: debugMessage, errorCount: errorCount, showErrorDetails: showErrorDetails, showMemoryUsage: config.getDebugMode() ||