@google/gemini-cli 0.21.0-nightly.20251216.bb0c0d8ee → 0.21.0-nightly.20251218.739c02bd6

package/dist/src/ui/components/LogoutConfirmationDialog.test.js

@@ -0,0 +1,59 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { renderWithProviders } from '../../test-utils/render.js';
+import { act } from 'react';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { LogoutConfirmationDialog, LogoutChoice, } from './LogoutConfirmationDialog.js';
+import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+vi.mock('./shared/RadioButtonSelect.js', () => ({
+    RadioButtonSelect: vi.fn(() => null),
+}));
+describe('LogoutConfirmationDialog', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should render the dialog with title, description, and hint', () => {
+        const { lastFrame } = renderWithProviders(_jsx(LogoutConfirmationDialog, { onSelect: vi.fn() }));
+        expect(lastFrame()).toContain('You are now logged out.');
+        expect(lastFrame()).toContain('Login again to continue using Gemini CLI, or exit the application.');
+        expect(lastFrame()).toContain('(Use Enter to select, Esc to close)');
+    });
+    it('should render RadioButtonSelect with Login and Exit options', () => {
+        renderWithProviders(_jsx(LogoutConfirmationDialog, { onSelect: vi.fn() }));
+        expect(RadioButtonSelect).toHaveBeenCalled();
+        const mockCall = vi.mocked(RadioButtonSelect).mock.calls[0][0];
+        expect(mockCall.items).toEqual([
+            { label: 'Login', value: LogoutChoice.LOGIN, key: 'login' },
+            { label: 'Exit', value: LogoutChoice.EXIT, key: 'exit' },
+        ]);
+        expect(mockCall.isFocused).toBe(true);
+    });
+    it('should call onSelect with LOGIN when Login is selected', () => {
+        const onSelect = vi.fn();
+        renderWithProviders(_jsx(LogoutConfirmationDialog, { onSelect: onSelect }));
+        const mockCall = vi.mocked(RadioButtonSelect).mock.calls[0][0];
+        mockCall.onSelect(LogoutChoice.LOGIN);
+        expect(onSelect).toHaveBeenCalledWith(LogoutChoice.LOGIN);
+    });
+    it('should call onSelect with EXIT when Exit is selected', () => {
+        const onSelect = vi.fn();
+        renderWithProviders(_jsx(LogoutConfirmationDialog, { onSelect: onSelect }));
+        const mockCall = vi.mocked(RadioButtonSelect).mock.calls[0][0];
+        mockCall.onSelect(LogoutChoice.EXIT);
+        expect(onSelect).toHaveBeenCalledWith(LogoutChoice.EXIT);
+    });
+    it('should call onSelect with EXIT when escape key is pressed', () => {
+        const onSelect = vi.fn();
+        const { stdin } = renderWithProviders(_jsx(LogoutConfirmationDialog, { onSelect: onSelect }));
+        act(() => {
+            // Send kitty escape key sequence
+            stdin.write('\u001b[27u');
+        });
+        expect(onSelect).toHaveBeenCalledWith(LogoutChoice.EXIT);
+    });
+});
+//# sourceMappingURL=LogoutConfirmationDialog.test.js.map

package/dist/src/ui/components/LogoutConfirmationDialog.test.js.map

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

package/dist/src/ui/components/ModelDialog.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useCallback, useContext, useMemo } from 'react';
+import { useCallback, useContext, useMemo, useState } from 'react';
 import { Box, Text } from 'ink';
-import { PREVIEW_GEMINI_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, GEMINI_MODEL_ALIAS_PRO, ModelSlashCommandEvent, logModelSlashCommand, } from '@google/gemini-cli-core';
+import { PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_MODEL_AUTO, ModelSlashCommandEvent, logModelSlashCommand, getDisplayString, } from '@google/gemini-cli-core';
 import { useKeypress } from '../hooks/useKeypress.js';
 import { theme } from '../semantic-colors.js';
 import { DescriptiveRadioButtonSelect } from './shared/DescriptiveRadioButtonSelect.js';
@@ -9,45 +9,110 @@ import { ConfigContext } from '../contexts/ConfigContext.js';
 import { ThemedGradient } from './ThemedGradient.js';
 export function ModelDialog({ onClose }) {
     const config = useContext(ConfigContext);
+    const [view, setView] = useState('main');
     // Determine the Preferred Model (read once when the dialog opens).
     const preferredModel = config?.getModel() || DEFAULT_GEMINI_MODEL_AUTO;
+    const shouldShowPreviewModels = config?.getPreviewFeatures() && config.getHasAccessToPreviewModel();
+    const manualModelSelected = useMemo(() => {
+        const manualModels = [
+            DEFAULT_GEMINI_MODEL,
+            DEFAULT_GEMINI_FLASH_MODEL,
+            DEFAULT_GEMINI_FLASH_LITE_MODEL,
+            PREVIEW_GEMINI_MODEL,
+            PREVIEW_GEMINI_FLASH_MODEL,
+        ];
+        if (manualModels.includes(preferredModel)) {
+            return preferredModel;
+        }
+        return '';
+    }, [preferredModel]);
     useKeypress((key) => {
         if (key.name === 'escape') {
-            onClose();
+            if (view === 'manual') {
+                setView('main');
+            }
+            else {
+                onClose();
+            }
         }
     }, { isActive: true });
-    const options = useMemo(() => [
-        {
-            value: DEFAULT_GEMINI_MODEL_AUTO,
-            title: 'Auto',
-            description: 'Let the system choose the best model for your task.',
-            key: DEFAULT_GEMINI_MODEL_AUTO,
-        },
-        {
-            value: GEMINI_MODEL_ALIAS_PRO,
-            title: config?.getPreviewFeatures()
-                ? `Pro (${PREVIEW_GEMINI_MODEL}, ${DEFAULT_GEMINI_MODEL})`
-                : `Pro (${DEFAULT_GEMINI_MODEL})`,
-            description: 'For complex tasks that require deep reasoning and creativity',
-            key: GEMINI_MODEL_ALIAS_PRO,
-        },
-        {
-            value: GEMINI_MODEL_ALIAS_FLASH,
-            title: `Flash (${DEFAULT_GEMINI_FLASH_MODEL})`,
-            description: 'For tasks that need a balance of speed and reasoning',
-            key: GEMINI_MODEL_ALIAS_FLASH,
-        },
-        {
-            value: GEMINI_MODEL_ALIAS_FLASH_LITE,
-            title: `Flash-Lite (${DEFAULT_GEMINI_FLASH_LITE_MODEL})`,
-            description: 'For simple tasks that need to be done quickly',
-            key: GEMINI_MODEL_ALIAS_FLASH_LITE,
-        },
-    ], [config]);
+    const mainOptions = useMemo(() => {
+        const list = [
+            {
+                value: DEFAULT_GEMINI_MODEL_AUTO,
+                title: getDisplayString(DEFAULT_GEMINI_MODEL_AUTO),
+                description: 'Let Gemini CLI decide the best model for the task: gemini-2.5-pro, gemini-2.5-flash',
+                key: DEFAULT_GEMINI_MODEL_AUTO,
+            },
+            {
+                value: 'Manual',
+                title: manualModelSelected
+                    ? `Manual (${manualModelSelected})`
+                    : 'Manual',
+                description: 'Manually select a model',
+                key: 'Manual',
+            },
+        ];
+        if (shouldShowPreviewModels) {
+            list.unshift({
+                value: PREVIEW_GEMINI_MODEL_AUTO,
+                title: getDisplayString(PREVIEW_GEMINI_MODEL_AUTO),
+                description: 'Let Gemini CLI decide the best model for the task: gemini-3-pro, gemini-3-flash',
+                key: PREVIEW_GEMINI_MODEL_AUTO,
+            });
+        }
+        return list;
+    }, [shouldShowPreviewModels, manualModelSelected]);
+    const manualOptions = useMemo(() => {
+        const list = [
+            {
+                value: DEFAULT_GEMINI_MODEL,
+                title: DEFAULT_GEMINI_MODEL,
+                key: DEFAULT_GEMINI_MODEL,
+            },
+            {
+                value: DEFAULT_GEMINI_FLASH_MODEL,
+                title: DEFAULT_GEMINI_FLASH_MODEL,
+                key: DEFAULT_GEMINI_FLASH_MODEL,
+            },
+            {
+                value: DEFAULT_GEMINI_FLASH_LITE_MODEL,
+                title: DEFAULT_GEMINI_FLASH_LITE_MODEL,
+                key: DEFAULT_GEMINI_FLASH_LITE_MODEL,
+            },
+        ];
+        if (shouldShowPreviewModels) {
+            list.unshift({
+                value: PREVIEW_GEMINI_MODEL,
+                title: PREVIEW_GEMINI_MODEL,
+                key: PREVIEW_GEMINI_MODEL,
+            }, {
+                value: PREVIEW_GEMINI_FLASH_MODEL,
+                title: PREVIEW_GEMINI_FLASH_MODEL,
+                key: PREVIEW_GEMINI_FLASH_MODEL,
+            });
+        }
+        return list;
+    }, [shouldShowPreviewModels]);
+    const options = view === 'main' ? mainOptions : manualOptions;
     // Calculate the initial index based on the preferred model.
-    const initialIndex = useMemo(() => options.findIndex((option) => option.value === preferredModel), [preferredModel, options]);
+    const initialIndex = useMemo(() => {
+        const idx = options.findIndex((option) => option.value === preferredModel);
+        if (idx !== -1) {
+            return idx;
+        }
+        if (view === 'main') {
+            const manualIdx = options.findIndex((o) => o.value === 'Manual');
+            return manualIdx !== -1 ? manualIdx : 0;
+        }
+        return 0;
+    }, [preferredModel, options, view]);
     // Handle selection internally (Autonomous Dialog).
     const handleSelect = useCallback((model) => {
+        if (model === 'Manual') {
+            setView('manual');
+            return;
+        }
         if (config) {
             config.setModel(model);
             const event = new ModelSlashCommandEvent(model);
@@ -55,12 +120,24 @@ export function ModelDialog({ onClose }) {
         }
         onClose();
     }, [config, onClose]);
-    const header = config?.getPreviewFeatures()
-        ? 'Gemini 3 is now enabled.'
-        : 'Gemini 3 is now available.';
-    const subheader = config?.getPreviewFeatures()
-        ? `To disable Gemini 3, disable "Preview features" in /settings.\nLearn more at https://goo.gle/enable-preview-features\n\nWhen you select Auto or Pro, Gemini CLI will attempt to use ${PREVIEW_GEMINI_MODEL} first, before falling back to ${DEFAULT_GEMINI_MODEL}.`
-        : `To use Gemini 3, enable "Preview features" in /settings.\nLearn more at https://goo.gle/enable-preview-features`;
-    return (_jsxs(Box, { borderStyle: "round", borderColor: theme.border.default, flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Text, { bold: true, children: "Select Model" }), _jsxs(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column", children: [_jsx(ThemedGradient, { children: _jsx(Text, { children: header }) }), _jsx(Text, { children: subheader })] }), _jsx(Box, { marginTop: 1, children: _jsx(DescriptiveRadioButtonSelect, { items: options, onSelect: handleSelect, initialIndex: initialIndex, showNumbers: true }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { color: theme.text.secondary, children: 'To use a specific Gemini model on startup, use the --model flag.' }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { color: theme.text.secondary, children: "(Press Esc to close)" }) })] }));
+    let header;
+    let subheader;
+    // Do not show any header or subheader since it's already showing preview model
+    // options
+    if (shouldShowPreviewModels) {
+        header = undefined;
+        subheader = undefined;
+        // When a user has the access but has not enabled the preview features.
+    }
+    else if (config?.getHasAccessToPreviewModel()) {
+        header = 'Gemini 3 is now available.';
+        subheader =
+            'Enable "Preview features" in /settings.\nLearn more at https://goo.gle/enable-preview-features';
+    }
+    else {
+        header = 'Gemini 3 is coming soon.';
+        subheader = undefined;
+    }
+    return (_jsxs(Box, { borderStyle: "round", borderColor: theme.border.default, flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Text, { bold: true, children: "Select Model" }), _jsxs(Box, { flexDirection: "column", children: [header && (_jsx(Box, { marginTop: 1, children: _jsx(ThemedGradient, { children: _jsx(Text, { children: header }) }) })), subheader && _jsx(Text, { children: subheader })] }), _jsx(Box, { marginTop: 1, children: _jsx(DescriptiveRadioButtonSelect, { items: options, onSelect: handleSelect, initialIndex: initialIndex, showNumbers: true }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { color: theme.text.secondary, children: 'To use a specific Gemini model on startup, use the --model flag.' }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { color: theme.text.secondary, children: "(Press Esc to close)" }) })] }));
 }
 //# sourceMappingURL=ModelDialog.js.map

package/dist/src/ui/components/ModelDialog.js.map

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

package/dist/src/ui/components/ModelDialog.test.js

@@ -4,171 +4,180 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { render } from '../../test-utils/render.js';
-import { cleanup } from 'ink-testing-library';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { GEMINI_MODEL_ALIAS_FLASH_LITE, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_PRO, DEFAULT_GEMINI_MODEL_AUTO, } from '@google/gemini-cli-core';
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ModelDialog } from './ModelDialog.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { DescriptiveRadioButtonSelect } from './shared/DescriptiveRadioButtonSelect.js';
 import { ConfigContext } from '../contexts/ConfigContext.js';
-vi.mock('../hooks/useKeypress.js', () => ({
-    useKeypress: vi.fn(),
-}));
-const mockedUseKeypress = vi.mocked(useKeypress);
-vi.mock('./shared/DescriptiveRadioButtonSelect.js', () => ({
-    DescriptiveRadioButtonSelect: vi.fn(() => null),
-}));
-const mockedSelect = vi.mocked(DescriptiveRadioButtonSelect);
-const renderComponent = (props = {}, contextValue = undefined) => {
-    const defaultProps = {
-        onClose: vi.fn(),
-    };
-    const combinedProps = { ...defaultProps, ...props };
-    const mockConfig = contextValue
-        ? {
-            // --- Functions used by ModelDialog ---
-            getModel: vi.fn(() => DEFAULT_GEMINI_MODEL_AUTO),
-            setModel: vi.fn(),
-            getPreviewFeatures: vi.fn(() => false),
-            // --- Functions used by ClearcutLogger ---
-            getUsageStatisticsEnabled: vi.fn(() => true),
-            getSessionId: vi.fn(() => 'mock-session-id'),
-            getDebugMode: vi.fn(() => false),
-            getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
-            getUseSmartEdit: vi.fn(() => false),
-            getProxy: vi.fn(() => undefined),
-            isInteractive: vi.fn(() => false),
-            getExperiments: () => { },
-            // --- Spread test-specific overrides ---
-            ...contextValue,
-        }
-        : undefined;
-    const renderResult = render(_jsx(ConfigContext.Provider, { value: mockConfig, children: _jsx(ModelDialog, { ...combinedProps }) }));
+import { KeypressProvider } from '../contexts/KeypressContext.js';
+import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_MODEL_AUTO, } from '@google/gemini-cli-core';
+// Mock dependencies
+const mockGetDisplayString = vi.fn();
+const mockLogModelSlashCommand = vi.fn();
+const mockModelSlashCommandEvent = vi.fn();
+vi.mock('@google/gemini-cli-core', async () => {
+    const actual = await vi.importActual('@google/gemini-cli-core');
     return {
-        ...renderResult,
-        props: combinedProps,
-        mockConfig,
+        ...actual,
+        getDisplayString: (val) => mockGetDisplayString(val),
+        logModelSlashCommand: (config, event) => mockLogModelSlashCommand(config, event),
+        ModelSlashCommandEvent: class {
+            constructor(model) {
+                mockModelSlashCommandEvent(model);
+            }
+        },
     };
-};
+});
 describe('<ModelDialog />', () => {
+    const mockSetModel = vi.fn();
+    const mockGetModel = vi.fn();
+    const mockGetPreviewFeatures = vi.fn();
+    const mockOnClose = vi.fn();
+    const mockGetHasAccessToPreviewModel = vi.fn();
+    const mockConfig = {
+        setModel: mockSetModel,
+        getModel: mockGetModel,
+        getPreviewFeatures: mockGetPreviewFeatures,
+        getHasAccessToPreviewModel: mockGetHasAccessToPreviewModel,
+    };
     beforeEach(() => {
-        vi.clearAllMocks();
-    });
-    afterEach(() => {
-        cleanup();
+        vi.resetAllMocks();
+        mockGetModel.mockReturnValue(DEFAULT_GEMINI_MODEL_AUTO);
+        mockGetPreviewFeatures.mockReturnValue(false);
+        mockGetHasAccessToPreviewModel.mockReturnValue(false);
+        // Default implementation for getDisplayString
+        mockGetDisplayString.mockImplementation((val) => {
+            if (val === 'auto-gemini-2.5')
+                return 'Auto (Gemini 2.5)';
+            if (val === 'auto-gemini-3')
+                return 'Auto (Preview)';
+            return val;
+        });
     });
-    it('renders the title and help text', () => {
-        const { lastFrame, unmount } = renderComponent();
+    const renderComponent = (contextValue = mockConfig) => render(_jsx(KeypressProvider, { children: _jsx(ConfigContext.Provider, { value: contextValue, children: _jsx(ModelDialog, { onClose: mockOnClose }) }) }));
+    const waitForUpdate = () => new Promise((resolve) => setTimeout(resolve, 150));
+    it('renders the initial "main" view correctly', () => {
+        const { lastFrame } = renderComponent();
         expect(lastFrame()).toContain('Select Model');
-        expect(lastFrame()).toContain('(Press Esc to close)');
-        expect(lastFrame()).toContain('To use a specific Gemini model on startup, use the --model flag.');
-        unmount();
+        expect(lastFrame()).toContain('Auto');
+        expect(lastFrame()).toContain('Manual');
+    });
+    it('renders "main" view with preview options when preview features are enabled', () => {
+        mockGetPreviewFeatures.mockReturnValue(true);
+        mockGetHasAccessToPreviewModel.mockReturnValue(true); // Must have access
+        const { lastFrame } = renderComponent();
+        expect(lastFrame()).toContain('Auto (Preview)');
     });
-    it('passes all model options to DescriptiveRadioButtonSelect', () => {
-        const { unmount } = renderComponent();
-        expect(mockedSelect).toHaveBeenCalledTimes(1);
-        const props = mockedSelect.mock.calls[0][0];
-        expect(props.items).toHaveLength(4);
-        expect(props.items[0].value).toBe(DEFAULT_GEMINI_MODEL_AUTO);
-        expect(props.items[1].value).toBe(GEMINI_MODEL_ALIAS_PRO);
-        expect(props.items[2].value).toBe(GEMINI_MODEL_ALIAS_FLASH);
-        expect(props.items[3].value).toBe(GEMINI_MODEL_ALIAS_FLASH_LITE);
-        expect(props.showNumbers).toBe(true);
-        unmount();
+    it('switches to "manual" view when "Manual" is selected', async () => {
+        const { lastFrame, stdin } = renderComponent();
+        // Select "Manual" (index 1)
+        // Press down arrow to move to "Manual"
+        stdin.write('\u001B[B'); // Arrow Down
+        await waitForUpdate();
+        // Press enter to select
+        stdin.write('\r');
+        await waitForUpdate();
+        // Should now show manual options
+        expect(lastFrame()).toContain(DEFAULT_GEMINI_MODEL);
+        expect(lastFrame()).toContain(DEFAULT_GEMINI_FLASH_MODEL);
+        expect(lastFrame()).toContain(DEFAULT_GEMINI_FLASH_LITE_MODEL);
     });
-    it('initializes with the model from ConfigContext', () => {
-        const mockGetModel = vi.fn(() => GEMINI_MODEL_ALIAS_FLASH);
-        const { unmount } = renderComponent({}, { getModel: mockGetModel });
-        expect(mockGetModel).toHaveBeenCalled();
-        expect(mockedSelect).toHaveBeenCalledWith(expect.objectContaining({
-            initialIndex: 2,
-        }), undefined);
-        unmount();
+    it('renders "manual" view with preview options when preview features are enabled', async () => {
+        mockGetPreviewFeatures.mockReturnValue(true);
+        mockGetHasAccessToPreviewModel.mockReturnValue(true); // Must have access
+        mockGetModel.mockReturnValue(PREVIEW_GEMINI_MODEL_AUTO);
+        const { lastFrame, stdin } = renderComponent();
+        // Select "Manual" (index 2 because Preview Auto is first, then Auto (Gemini 2.5))
+        // Press down enough times to ensure we reach the bottom (Manual)
+        stdin.write('\u001B[B'); // Arrow Down
+        await waitForUpdate();
+        stdin.write('\u001B[B'); // Arrow Down
+        await waitForUpdate();
+        // Press enter to select Manual
+        stdin.write('\r');
+        await waitForUpdate();
+        expect(lastFrame()).toContain(PREVIEW_GEMINI_MODEL);
     });
-    it('initializes with "auto" model if context is not provided', () => {
-        const { unmount } = renderComponent({}, undefined);
-        expect(mockedSelect).toHaveBeenCalledWith(expect.objectContaining({
-            initialIndex: 0,
-        }), undefined);
-        unmount();
+    it('sets model and closes when a model is selected in "main" view', async () => {
+        const { stdin } = renderComponent();
+        // Select "Auto" (index 0)
+        stdin.write('\r');
+        await waitForUpdate();
+        expect(mockSetModel).toHaveBeenCalledWith(DEFAULT_GEMINI_MODEL_AUTO);
+        expect(mockOnClose).toHaveBeenCalled();
     });
-    it('initializes with "auto" model if getModel returns undefined', () => {
-        const mockGetModel = vi.fn(() => undefined);
-        // @ts-expect-error This test validates component robustness when getModel
-        // returns an unexpected undefined value.
-        const { unmount } = renderComponent({}, { getModel: mockGetModel });
-        expect(mockGetModel).toHaveBeenCalled();
-        // When getModel returns undefined, preferredModel falls back to DEFAULT_GEMINI_MODEL_AUTO
-        // which has index 0, so initialIndex should be 0
-        expect(mockedSelect).toHaveBeenCalledWith(expect.objectContaining({
-            initialIndex: 0,
-        }), undefined);
-        expect(mockedSelect).toHaveBeenCalledTimes(1);
-        unmount();
+    it('sets model and closes when a model is selected in "manual" view', async () => {
+        const { stdin } = renderComponent();
+        // Navigate to Manual (index 1) and select
+        stdin.write('\u001B[B');
+        await waitForUpdate();
+        stdin.write('\r');
+        await waitForUpdate();
+        // Now in manual view. Default selection is first item (DEFAULT_GEMINI_MODEL)
+        stdin.write('\r');
+        await waitForUpdate();
+        expect(mockSetModel).toHaveBeenCalledWith(DEFAULT_GEMINI_MODEL);
+        expect(mockOnClose).toHaveBeenCalled();
     });
-    it('calls config.setModel and onClose when DescriptiveRadioButtonSelect.onSelect is triggered', () => {
-        const { props, mockConfig, unmount } = renderComponent({}, {}); // Pass empty object for contextValue
-        const childOnSelect = mockedSelect.mock.calls[0][0].onSelect;
-        expect(childOnSelect).toBeDefined();
-        childOnSelect(GEMINI_MODEL_ALIAS_PRO);
-        // Assert against the default mock provided by renderComponent
-        expect(mockConfig?.setModel).toHaveBeenCalledWith(GEMINI_MODEL_ALIAS_PRO);
-        expect(props.onClose).toHaveBeenCalledTimes(1);
-        unmount();
+    it('closes dialog on escape in "main" view', async () => {
+        const { stdin } = renderComponent();
+        stdin.write('\u001B'); // Escape
+        await waitForUpdate();
+        expect(mockOnClose).toHaveBeenCalled();
     });
-    it('does not pass onHighlight to DescriptiveRadioButtonSelect', () => {
-        const { unmount } = renderComponent();
-        const childOnHighlight = mockedSelect.mock.calls[0][0].onHighlight;
-        expect(childOnHighlight).toBeUndefined();
-        unmount();
+    it('goes back to "main" view on escape in "manual" view', async () => {
+        const { lastFrame, stdin } = renderComponent();
+        // Go to manual view
+        stdin.write('\u001B[B');
+        await waitForUpdate();
+        stdin.write('\r');
+        await waitForUpdate();
+        expect(lastFrame()).toContain(DEFAULT_GEMINI_MODEL);
+        // Press Escape
+        stdin.write('\u001B');
+        await waitForUpdate();
+        expect(mockOnClose).not.toHaveBeenCalled();
+        // Should be back to main view (Manual option visible)
+        expect(lastFrame()).toContain('Manual');
     });
-    it('calls onClose prop when "escape" key is pressed', () => {
-        const { props, unmount } = renderComponent();
-        expect(mockedUseKeypress).toHaveBeenCalled();
-        const keyPressHandler = mockedUseKeypress.mock.calls[0][0];
-        const options = mockedUseKeypress.mock.calls[0][1];
-        expect(options).toEqual({ isActive: true });
-        keyPressHandler({
-            name: 'escape',
-            ctrl: false,
-            meta: false,
-            shift: false,
-            paste: false,
-            insertable: false,
-            sequence: '',
+    describe('Preview Logic', () => {
+        it('should NOT show preview options if user has no access', () => {
+            mockGetHasAccessToPreviewModel.mockReturnValue(false);
+            mockGetPreviewFeatures.mockReturnValue(true); // Even if enabled
+            const { lastFrame } = renderComponent();
+            expect(lastFrame()).not.toContain('Auto (Preview)');
         });
-        expect(props.onClose).toHaveBeenCalledTimes(1);
-        keyPressHandler({
-            name: 'a',
-            ctrl: false,
-            meta: false,
-            shift: false,
-            paste: false,
-            insertable: true,
-            sequence: '',
+        it('should NOT show preview options if user has access but preview features are disabled', () => {
+            mockGetHasAccessToPreviewModel.mockReturnValue(true);
+            mockGetPreviewFeatures.mockReturnValue(false);
+            const { lastFrame } = renderComponent();
+            expect(lastFrame()).not.toContain('Auto (Preview)');
+        });
+        it('should show preview options if user has access AND preview features are enabled', () => {
+            mockGetHasAccessToPreviewModel.mockReturnValue(true);
+            mockGetPreviewFeatures.mockReturnValue(true);
+            const { lastFrame } = renderComponent();
+            expect(lastFrame()).toContain('Auto (Preview)');
+        });
+        it('should show "Gemini 3 is now available" header if user has access but preview features disabled', () => {
+            mockGetHasAccessToPreviewModel.mockReturnValue(true);
+            mockGetPreviewFeatures.mockReturnValue(false);
+            const { lastFrame } = renderComponent();
+            expect(lastFrame()).toContain('Gemini 3 is now available.');
+            expect(lastFrame()).toContain('Enable "Preview features" in /settings');
+        });
+        it('should show "Gemini 3 is coming soon" header if user has no access', () => {
+            mockGetHasAccessToPreviewModel.mockReturnValue(false);
+            mockGetPreviewFeatures.mockReturnValue(false);
+            const { lastFrame } = renderComponent();
+            expect(lastFrame()).toContain('Gemini 3 is coming soon.');
+        });
+        it('should NOT show header/subheader if preview options are shown', () => {
+            mockGetHasAccessToPreviewModel.mockReturnValue(true);
+            mockGetPreviewFeatures.mockReturnValue(true);
+            const { lastFrame } = renderComponent();
+            expect(lastFrame()).not.toContain('Gemini 3 is now available.');
+            expect(lastFrame()).not.toContain('Gemini 3 is coming soon.');
         });
-        expect(props.onClose).toHaveBeenCalledTimes(1);
-        unmount();
-    });
-    it('updates initialIndex when config context changes', () => {
-        const mockGetModel = vi.fn(() => DEFAULT_GEMINI_MODEL_AUTO);
-        const oldMockConfig = {
-            getModel: mockGetModel,
-            getPreviewFeatures: vi.fn(() => false),
-        };
-        const { rerender, unmount } = render(_jsx(ConfigContext.Provider, { value: oldMockConfig, children: _jsx(ModelDialog, { onClose: vi.fn() }) }));
-        expect(mockedSelect.mock.calls[0][0].initialIndex).toBe(0);
-        mockGetModel.mockReturnValue(GEMINI_MODEL_ALIAS_FLASH_LITE);
-        const newMockConfig = {
-            getModel: mockGetModel,
-            getPreviewFeatures: vi.fn(() => false),
-        };
-        rerender(_jsx(ConfigContext.Provider, { value: newMockConfig, children: _jsx(ModelDialog, { onClose: vi.fn() }) }));
-        // Should be called at least twice: initial render + re-render after context change
-        expect(mockedSelect).toHaveBeenCalledTimes(2);
-        expect(mockedSelect.mock.calls[1][0].initialIndex).toBe(3);
-        unmount();
     });
 });
 //# sourceMappingURL=ModelDialog.test.js.map