@google/gemini-cli 0.7.0-nightly.20250918.2722473a → 0.7.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +4 -3
- package/dist/src/commands/extensions/disable.d.ts +1 -2
- package/dist/src/commands/extensions/disable.js +17 -3
- package/dist/src/commands/extensions/disable.js.map +1 -1
- package/dist/src/commands/extensions/enable.d.ts +1 -2
- package/dist/src/commands/extensions/enable.js +17 -4
- package/dist/src/commands/extensions/enable.js.map +1 -1
- package/dist/src/commands/extensions/install.d.ts +1 -0
- package/dist/src/commands/extensions/install.js +10 -2
- package/dist/src/commands/extensions/install.js.map +1 -1
- package/dist/src/commands/extensions/install.test.js +12 -2
- package/dist/src/commands/extensions/install.test.js.map +1 -1
- package/dist/src/commands/extensions/link.js +1 -1
- package/dist/src/commands/extensions/link.js.map +1 -1
- package/dist/src/commands/extensions/new.test.js +2 -2
- package/dist/src/commands/extensions/new.test.js.map +1 -1
- package/dist/src/commands/extensions/uninstall.js +1 -1
- package/dist/src/commands/extensions/uninstall.js.map +1 -1
- package/dist/src/commands/extensions/uninstall.test.js +4 -1
- package/dist/src/commands/extensions/uninstall.test.js.map +1 -1
- package/dist/src/commands/extensions/update.js +38 -17
- package/dist/src/commands/extensions/update.js.map +1 -1
- package/dist/src/commands/mcp/add.js +6 -1
- package/dist/src/commands/mcp/add.js.map +1 -1
- package/dist/src/config/config.d.ts +2 -0
- package/dist/src/config/config.js +84 -64
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.d.ts +5 -18
- package/dist/src/config/extension.js +95 -201
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/extensions/extensionEnablement.d.ts +14 -0
- package/dist/src/config/extensions/extensionEnablement.js +81 -33
- package/dist/src/config/extensions/extensionEnablement.js.map +1 -1
- package/dist/src/config/extensions/extensionEnablement.test.js +164 -19
- package/dist/src/config/extensions/extensionEnablement.test.js.map +1 -1
- package/dist/src/config/extensions/github.d.ts +29 -0
- package/dist/src/config/extensions/github.js +301 -0
- package/dist/src/config/extensions/github.js.map +1 -0
- package/dist/src/config/extensions/github.test.d.ts +6 -0
- package/dist/src/config/extensions/github.test.js +271 -0
- package/dist/src/config/extensions/github.test.js.map +1 -0
- package/dist/src/config/extensions/update.d.ts +20 -0
- package/dist/src/config/extensions/update.js +94 -0
- package/dist/src/config/extensions/update.js.map +1 -0
- package/dist/src/config/extensions/update.test.d.ts +6 -0
- package/dist/src/config/extensions/update.test.js +327 -0
- package/dist/src/config/extensions/update.test.js.map +1 -0
- package/dist/src/config/policy-engine.integration.test.d.ts +6 -0
- package/dist/src/config/policy-engine.integration.test.js +270 -0
- package/dist/src/config/policy-engine.integration.test.js.map +1 -0
- package/dist/src/config/policy.d.ts +8 -0
- package/dist/src/config/policy.js +150 -0
- package/dist/src/config/policy.js.map +1 -0
- package/dist/src/config/policy.test.d.ts +6 -0
- package/dist/src/config/policy.test.js +336 -0
- package/dist/src/config/policy.test.js.map +1 -0
- package/dist/src/config/settings.js +19 -4
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +27 -9
- package/dist/src/config/settingsSchema.js +27 -9
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +10 -1
- package/dist/src/config/trustedFolders.js +40 -14
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.js +95 -14
- package/dist/src/config/trustedFolders.test.js.map +1 -1
- package/dist/src/gemini.js +102 -127
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +74 -5
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/nonInteractiveCli.d.ts +2 -1
- package/dist/src/nonInteractiveCli.js +29 -16
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCliCommands.d.ts +17 -0
- package/dist/src/nonInteractiveCliCommands.js +79 -0
- package/dist/src/nonInteractiveCliCommands.js.map +1 -0
- package/dist/src/services/BuiltinCommandLoader.js +4 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +50 -1
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/test-utils/createExtension.d.ts +15 -0
- package/dist/src/test-utils/createExtension.js +25 -0
- package/dist/src/test-utils/createExtension.js.map +1 -0
- package/dist/src/test-utils/mockCommandContext.js +2 -0
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/test-utils/render.d.ts +3 -1
- package/dist/src/test-utils/render.js +2 -1
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/App.js +3 -2
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/AppContainer.js +55 -42
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +130 -0
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.d.ts +2 -2
- package/dist/src/ui/IdeIntegrationNudge.js +1 -2
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.js +14 -3
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +1 -1
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +22 -6
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/ideCommand.js +1 -1
- package/dist/src/ui/commands/ideCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +9 -2
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/modelCommand.d.ts +7 -0
- package/dist/src/ui/commands/modelCommand.js +16 -0
- package/dist/src/ui/commands/modelCommand.js.map +1 -0
- package/dist/src/ui/commands/modelCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/modelCommand.test.js +30 -0
- package/dist/src/ui/commands/modelCommand.test.js.map +1 -0
- package/dist/src/ui/commands/permissionsCommand.d.ts +7 -0
- package/dist/src/ui/commands/permissionsCommand.js +16 -0
- package/dist/src/ui/commands/permissionsCommand.js.map +1 -0
- package/dist/src/ui/commands/permissionsCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/permissionsCommand.test.js +30 -0
- package/dist/src/ui/commands/permissionsCommand.test.js.map +1 -0
- package/dist/src/ui/commands/types.d.ts +3 -3
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/AppHeader.js +2 -5
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/Composer.js +4 -10
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +13 -21
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.d.ts +6 -1
- package/dist/src/ui/components/DialogManager.js +10 -1
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.d.ts +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.d.ts +1 -1
- package/dist/src/ui/components/InputPrompt.js +17 -8
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +1 -1
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.d.ts +11 -0
- package/dist/src/ui/components/ModelDialog.js +53 -0
- package/dist/src/ui/components/ModelDialog.js.map +1 -0
- package/dist/src/ui/components/ModelDialog.test.d.ts +6 -0
- package/dist/src/ui/components/ModelDialog.test.js +153 -0
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.d.ts +13 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js +45 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js.map +1 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.d.ts +6 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js +158 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js.map +1 -0
- package/dist/src/ui/components/QueuedMessageDisplay.d.ts +9 -0
- package/dist/src/ui/components/QueuedMessageDisplay.js +20 -0
- package/dist/src/ui/components/QueuedMessageDisplay.js.map +1 -0
- package/dist/src/ui/components/QueuedMessageDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/QueuedMessageDisplay.test.js +56 -0
- package/dist/src/ui/components/QueuedMessageDisplay.test.js.map +1 -0
- package/dist/src/ui/components/SettingsDialog.js +1 -1
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +50 -16
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.d.ts +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +11 -9
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.d.ts +1 -1
- package/dist/src/ui/components/messages/ToolMessage.js +13 -6
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.d.ts +43 -0
- package/dist/src/ui/components/shared/BaseSelectionList.js +72 -0
- package/dist/src/ui/components/shared/BaseSelectionList.js.map +1 -0
- package/dist/src/ui/components/shared/BaseSelectionList.test.d.ts +6 -0
- package/dist/src/ui/components/shared/BaseSelectionList.test.js +374 -0
- package/dist/src/ui/components/shared/BaseSelectionList.test.js.map +1 -0
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.d.ts +36 -0
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.js +13 -0
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.js.map +1 -0
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.d.ts +6 -0
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.js +68 -0
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.js.map +1 -0
- package/dist/src/ui/components/shared/RadioButtonSelect.js +9 -104
- package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.test.js +113 -92
- package/dist/src/ui/components/shared/RadioButtonSelect.test.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.js +63 -2
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/constants.d.ts +1 -0
- package/dist/src/ui/constants.js +1 -0
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.js +3 -0
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/SessionContext.d.ts +6 -0
- package/dist/src/ui/contexts/SessionContext.js +107 -5
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/contexts/ShellFocusContext.d.ts +7 -0
- package/dist/src/ui/contexts/ShellFocusContext.js +9 -0
- package/dist/src/ui/contexts/ShellFocusContext.js.map +1 -0
- package/dist/src/ui/contexts/UIActionsContext.d.ts +2 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +7 -4
- package/dist/src/ui/contexts/UIStateContext.js +1 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.js +7 -5
- package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.js +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +4 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +7 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.d.ts +12 -0
- package/dist/src/ui/hooks/useExtensionUpdates.js +64 -0
- package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -0
- package/dist/src/ui/hooks/useExtensionUpdates.test.d.ts +6 -0
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +165 -0
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -0
- package/dist/src/ui/hooks/useFocus.js +10 -0
- package/dist/src/ui/hooks/useFocus.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.d.ts +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js +2 -7
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +7 -6
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.test.js.map +1 -1
- package/dist/src/ui/hooks/useModelCommand.d.ts +12 -0
- package/dist/src/ui/hooks/useModelCommand.js +21 -0
- package/dist/src/ui/hooks/useModelCommand.js.map +1 -0
- package/dist/src/ui/hooks/useModelCommand.test.d.ts +6 -0
- package/dist/src/ui/hooks/useModelCommand.test.js +35 -0
- package/dist/src/ui/hooks/useModelCommand.test.js.map +1 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.d.ts +17 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.js +78 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.js.map +1 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.d.ts +6 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +182 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -0
- package/dist/src/ui/hooks/useSelectionList.d.ts +33 -0
- package/dist/src/ui/hooks/useSelectionList.js +252 -0
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -0
- package/dist/src/ui/hooks/useSelectionList.test.d.ts +6 -0
- package/dist/src/ui/hooks/useSelectionList.test.js +651 -0
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -0
- package/dist/src/ui/hooks/useSlashCompletion.js +7 -2
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +33 -0
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useStateAndRef.d.ts +1 -1
- package/dist/src/ui/hooks/useStateAndRef.js +2 -2
- package/dist/src/ui/hooks/useStateAndRef.js.map +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.d.ts +12 -0
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +27 -0
- package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -0
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js +3 -3
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js.map +1 -1
- package/dist/src/ui/state/extensions.d.ts +2 -1
- package/dist/src/ui/state/extensions.js +1 -0
- package/dist/src/ui/state/extensions.js.map +1 -1
- package/dist/src/utils/deepMerge.d.ts +2 -3
- package/dist/src/utils/events.d.ts +2 -1
- package/dist/src/utils/events.js +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/relaunch.d.ts +7 -0
- package/dist/src/utils/relaunch.js +57 -0
- package/dist/src/utils/relaunch.js.map +1 -0
- package/dist/src/utils/relaunch.test.d.ts +6 -0
- package/dist/src/utils/relaunch.test.js +273 -0
- package/dist/src/utils/relaunch.test.js.map +1 -0
- package/dist/src/zed-integration/schema.d.ts +22 -22
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -4
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { render, cleanup } from '@testing-library/react';
|
|
8
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
9
|
+
import { DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, } from '@google/gemini-cli-core';
|
|
10
|
+
import { ModelDialog } from './ModelDialog.js';
|
|
11
|
+
import { useKeypress } from '../hooks/useKeypress.js';
|
|
12
|
+
import { DescriptiveRadioButtonSelect } from './shared/DescriptiveRadioButtonSelect.js';
|
|
13
|
+
import { ConfigContext } from '../contexts/ConfigContext.js';
|
|
14
|
+
vi.mock('../hooks/useKeypress.js', () => ({
|
|
15
|
+
useKeypress: vi.fn(),
|
|
16
|
+
}));
|
|
17
|
+
const mockedUseKeypress = vi.mocked(useKeypress);
|
|
18
|
+
vi.mock('./shared/DescriptiveRadioButtonSelect.js', () => ({
|
|
19
|
+
DescriptiveRadioButtonSelect: vi.fn(() => null),
|
|
20
|
+
}));
|
|
21
|
+
const mockedSelect = vi.mocked(DescriptiveRadioButtonSelect);
|
|
22
|
+
const renderComponent = (props = {}, contextValue = undefined) => {
|
|
23
|
+
const defaultProps = {
|
|
24
|
+
onClose: vi.fn(),
|
|
25
|
+
};
|
|
26
|
+
const combinedProps = { ...defaultProps, ...props };
|
|
27
|
+
const mockConfig = contextValue
|
|
28
|
+
? {
|
|
29
|
+
// --- Functions used by ModelDialog ---
|
|
30
|
+
getModel: vi.fn(() => DEFAULT_GEMINI_MODEL_AUTO),
|
|
31
|
+
setModel: vi.fn(),
|
|
32
|
+
// --- Functions used by ClearcutLogger ---
|
|
33
|
+
getUsageStatisticsEnabled: vi.fn(() => true),
|
|
34
|
+
getSessionId: vi.fn(() => 'mock-session-id'),
|
|
35
|
+
getDebugMode: vi.fn(() => false),
|
|
36
|
+
getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
|
|
37
|
+
getUseSmartEdit: vi.fn(() => false),
|
|
38
|
+
getUseModelRouter: vi.fn(() => false),
|
|
39
|
+
getProxy: vi.fn(() => undefined),
|
|
40
|
+
// --- Spread test-specific overrides ---
|
|
41
|
+
...contextValue,
|
|
42
|
+
}
|
|
43
|
+
: undefined;
|
|
44
|
+
const renderResult = render(_jsx(ConfigContext.Provider, { value: mockConfig, children: _jsx(ModelDialog, { ...combinedProps }) }));
|
|
45
|
+
return {
|
|
46
|
+
...renderResult,
|
|
47
|
+
props: combinedProps,
|
|
48
|
+
mockConfig,
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
describe('<ModelDialog />', () => {
|
|
52
|
+
beforeEach(() => {
|
|
53
|
+
vi.clearAllMocks();
|
|
54
|
+
});
|
|
55
|
+
afterEach(() => {
|
|
56
|
+
cleanup();
|
|
57
|
+
});
|
|
58
|
+
it('renders the title and help text', () => {
|
|
59
|
+
const { getByText } = renderComponent();
|
|
60
|
+
expect(getByText('Select Model')).toBeDefined();
|
|
61
|
+
expect(getByText('(Press Esc to close)')).toBeDefined();
|
|
62
|
+
expect(getByText('> To use a specific Gemini model, use the --model flag.')).toBeDefined();
|
|
63
|
+
});
|
|
64
|
+
it('passes all model options to DescriptiveRadioButtonSelect', () => {
|
|
65
|
+
renderComponent();
|
|
66
|
+
expect(mockedSelect).toHaveBeenCalledTimes(1);
|
|
67
|
+
const props = mockedSelect.mock.calls[0][0];
|
|
68
|
+
expect(props.items).toHaveLength(4);
|
|
69
|
+
expect(props.items[0].value).toBe(DEFAULT_GEMINI_MODEL_AUTO);
|
|
70
|
+
expect(props.items[1].value).toBe(DEFAULT_GEMINI_MODEL);
|
|
71
|
+
expect(props.items[2].value).toBe(DEFAULT_GEMINI_FLASH_MODEL);
|
|
72
|
+
expect(props.items[3].value).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
|
|
73
|
+
expect(props.showNumbers).toBe(true);
|
|
74
|
+
});
|
|
75
|
+
it('initializes with the model from ConfigContext', () => {
|
|
76
|
+
const mockGetModel = vi.fn(() => DEFAULT_GEMINI_FLASH_MODEL);
|
|
77
|
+
renderComponent({}, { getModel: mockGetModel });
|
|
78
|
+
expect(mockGetModel).toHaveBeenCalled();
|
|
79
|
+
expect(mockedSelect).toHaveBeenCalledWith(expect.objectContaining({
|
|
80
|
+
initialIndex: 2,
|
|
81
|
+
}), undefined);
|
|
82
|
+
});
|
|
83
|
+
it('initializes with "auto" model if context is not provided', () => {
|
|
84
|
+
renderComponent({}, undefined);
|
|
85
|
+
expect(mockedSelect).toHaveBeenCalledWith(expect.objectContaining({
|
|
86
|
+
initialIndex: 0,
|
|
87
|
+
}), undefined);
|
|
88
|
+
});
|
|
89
|
+
it('initializes with "auto" model if getModel returns undefined', () => {
|
|
90
|
+
const mockGetModel = vi.fn(() => undefined);
|
|
91
|
+
// @ts-expect-error This test validates component robustness when getModel
|
|
92
|
+
// returns an unexpected undefined value.
|
|
93
|
+
renderComponent({}, { getModel: mockGetModel });
|
|
94
|
+
expect(mockGetModel).toHaveBeenCalled();
|
|
95
|
+
// When getModel returns undefined, preferredModel falls back to DEFAULT_GEMINI_MODEL_AUTO
|
|
96
|
+
// which has index 0, so initialIndex should be 0
|
|
97
|
+
expect(mockedSelect).toHaveBeenCalledWith(expect.objectContaining({
|
|
98
|
+
initialIndex: 0,
|
|
99
|
+
}), undefined);
|
|
100
|
+
expect(mockedSelect).toHaveBeenCalledTimes(1);
|
|
101
|
+
});
|
|
102
|
+
it('calls config.setModel and onClose when DescriptiveRadioButtonSelect.onSelect is triggered', () => {
|
|
103
|
+
const { props, mockConfig } = renderComponent({}, {}); // Pass empty object for contextValue
|
|
104
|
+
const childOnSelect = mockedSelect.mock.calls[0][0].onSelect;
|
|
105
|
+
expect(childOnSelect).toBeDefined();
|
|
106
|
+
childOnSelect(DEFAULT_GEMINI_MODEL);
|
|
107
|
+
// Assert against the default mock provided by renderComponent
|
|
108
|
+
expect(mockConfig?.setModel).toHaveBeenCalledWith(DEFAULT_GEMINI_MODEL);
|
|
109
|
+
expect(props.onClose).toHaveBeenCalledTimes(1);
|
|
110
|
+
});
|
|
111
|
+
it('does not pass onHighlight to DescriptiveRadioButtonSelect', () => {
|
|
112
|
+
renderComponent();
|
|
113
|
+
const childOnHighlight = mockedSelect.mock.calls[0][0].onHighlight;
|
|
114
|
+
expect(childOnHighlight).toBeUndefined();
|
|
115
|
+
});
|
|
116
|
+
it('calls onClose prop when "escape" key is pressed', () => {
|
|
117
|
+
const { props } = renderComponent();
|
|
118
|
+
expect(mockedUseKeypress).toHaveBeenCalled();
|
|
119
|
+
const keyPressHandler = mockedUseKeypress.mock.calls[0][0];
|
|
120
|
+
const options = mockedUseKeypress.mock.calls[0][1];
|
|
121
|
+
expect(options).toEqual({ isActive: true });
|
|
122
|
+
keyPressHandler({
|
|
123
|
+
name: 'escape',
|
|
124
|
+
ctrl: false,
|
|
125
|
+
meta: false,
|
|
126
|
+
shift: false,
|
|
127
|
+
paste: false,
|
|
128
|
+
sequence: '',
|
|
129
|
+
});
|
|
130
|
+
expect(props.onClose).toHaveBeenCalledTimes(1);
|
|
131
|
+
keyPressHandler({
|
|
132
|
+
name: 'a',
|
|
133
|
+
ctrl: false,
|
|
134
|
+
meta: false,
|
|
135
|
+
shift: false,
|
|
136
|
+
paste: false,
|
|
137
|
+
sequence: '',
|
|
138
|
+
});
|
|
139
|
+
expect(props.onClose).toHaveBeenCalledTimes(1);
|
|
140
|
+
});
|
|
141
|
+
it('updates initialIndex when config context changes', () => {
|
|
142
|
+
const mockGetModel = vi.fn(() => DEFAULT_GEMINI_MODEL_AUTO);
|
|
143
|
+
const { rerender } = render(_jsx(ConfigContext.Provider, { value: { getModel: mockGetModel }, children: _jsx(ModelDialog, { onClose: vi.fn() }) }));
|
|
144
|
+
expect(mockedSelect.mock.calls[0][0].initialIndex).toBe(0);
|
|
145
|
+
mockGetModel.mockReturnValue(DEFAULT_GEMINI_FLASH_LITE_MODEL);
|
|
146
|
+
const newMockConfig = { getModel: mockGetModel };
|
|
147
|
+
rerender(_jsx(ConfigContext.Provider, { value: newMockConfig, children: _jsx(ModelDialog, { onClose: vi.fn() }) }));
|
|
148
|
+
// Should be called at least twice: initial render + re-render after context change
|
|
149
|
+
expect(mockedSelect).toHaveBeenCalledTimes(2);
|
|
150
|
+
expect(mockedSelect.mock.calls[1][0].initialIndex).toBe(3);
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
//# sourceMappingURL=ModelDialog.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ModelDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/components/ModelDialog.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type React from 'react';
|
|
7
|
+
import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
|
|
8
|
+
interface PermissionsModifyTrustDialogProps {
|
|
9
|
+
onExit: () => void;
|
|
10
|
+
addItem: UseHistoryManagerReturn['addItem'];
|
|
11
|
+
}
|
|
12
|
+
export declare function PermissionsModifyTrustDialog({ onExit, addItem, }: PermissionsModifyTrustDialogProps): React.JSX.Element;
|
|
13
|
+
export {};
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { Box, Text } from 'ink';
|
|
8
|
+
import { TrustLevel } from '../../config/trustedFolders.js';
|
|
9
|
+
import { useKeypress } from '../hooks/useKeypress.js';
|
|
10
|
+
import { usePermissionsModifyTrust } from '../hooks/usePermissionsModifyTrust.js';
|
|
11
|
+
import { theme } from '../semantic-colors.js';
|
|
12
|
+
import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
|
|
13
|
+
import { relaunchApp } from '../../utils/processUtils.js';
|
|
14
|
+
import {} from '../hooks/useHistoryManager.js';
|
|
15
|
+
const TRUST_LEVEL_ITEMS = [
|
|
16
|
+
{
|
|
17
|
+
label: 'Trust this folder',
|
|
18
|
+
value: TrustLevel.TRUST_FOLDER,
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
label: 'Trust parent folder',
|
|
22
|
+
value: TrustLevel.TRUST_PARENT,
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
label: "Don't trust",
|
|
26
|
+
value: TrustLevel.DO_NOT_TRUST,
|
|
27
|
+
},
|
|
28
|
+
];
|
|
29
|
+
export function PermissionsModifyTrustDialog({ onExit, addItem, }) {
|
|
30
|
+
const { cwd, currentTrustLevel, isInheritedTrustFromParent, isInheritedTrustFromIde, needsRestart, updateTrustLevel, commitTrustLevelChange, } = usePermissionsModifyTrust(onExit, addItem);
|
|
31
|
+
useKeypress((key) => {
|
|
32
|
+
if (key.name === 'escape') {
|
|
33
|
+
onExit();
|
|
34
|
+
}
|
|
35
|
+
if (needsRestart && key.name === 'r') {
|
|
36
|
+
commitTrustLevelChange();
|
|
37
|
+
relaunchApp();
|
|
38
|
+
onExit();
|
|
39
|
+
}
|
|
40
|
+
}, { isActive: true });
|
|
41
|
+
const index = TRUST_LEVEL_ITEMS.findIndex((item) => item.value === currentTrustLevel);
|
|
42
|
+
const initialIndex = index === -1 ? 0 : index;
|
|
43
|
+
return (_jsxs(_Fragment, { children: [_jsxs(Box, { borderStyle: "round", borderColor: theme.border.default, flexDirection: "column", padding: 1, children: [_jsxs(Box, { flexDirection: "column", paddingBottom: 1, children: [_jsxs(Text, { bold: true, children: ['> ', "Modify Trust Level"] }), _jsx(Box, { marginTop: 1 }), _jsxs(Text, { children: ["Folder: ", cwd] }), _jsxs(Text, { children: ["Current Level: ", _jsx(Text, { bold: true, children: currentTrustLevel || 'Not Set' })] }), isInheritedTrustFromParent && (_jsx(Text, { color: theme.text.secondary, children: "Note: This folder behaves as a trusted folder because one of the parent folders is trusted. It will remain trusted even if you set a different trust level here. To change this, you need to modify the trust setting in the parent folder." })), isInheritedTrustFromIde && (_jsx(Text, { color: theme.text.secondary, children: "Note: This folder behaves as a trusted folder because the connected IDE workspace is trusted. It will remain trusted even if you set a different trust level here." }))] }), _jsx(RadioButtonSelect, { items: TRUST_LEVEL_ITEMS, onSelect: updateTrustLevel, isFocused: true, initialIndex: initialIndex }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.text.secondary, children: "(Use Enter to select)" }) })] }), needsRestart && (_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: theme.status.warning, children: "To apply the trust changes, Gemini CLI must be restarted. Press 'r' to restart CLI now." }) }))] }));
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=PermissionsModifyTrustDialog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PermissionsModifyTrustDialog.js","sourceRoot":"","sources":["../../../../src/ui/components/PermissionsModifyTrustDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
/// <reference types="vitest/globals" />
|
|
8
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
9
|
+
import { renderWithProviders } from '../../test-utils/render.js';
|
|
10
|
+
import { PermissionsModifyTrustDialog } from './PermissionsModifyTrustDialog.js';
|
|
11
|
+
import { TrustLevel } from '../../config/trustedFolders.js';
|
|
12
|
+
import { waitFor, act } from '@testing-library/react';
|
|
13
|
+
import * as processUtils from '../../utils/processUtils.js';
|
|
14
|
+
import { usePermissionsModifyTrust } from '../hooks/usePermissionsModifyTrust.js';
|
|
15
|
+
// Hoist mocks for dependencies of the usePermissionsModifyTrust hook
|
|
16
|
+
const mockedCwd = vi.hoisted(() => vi.fn());
|
|
17
|
+
const mockedLoadTrustedFolders = vi.hoisted(() => vi.fn());
|
|
18
|
+
const mockedIsWorkspaceTrusted = vi.hoisted(() => vi.fn());
|
|
19
|
+
const mockedUseSettings = vi.hoisted(() => vi.fn());
|
|
20
|
+
// Mock the modules themselves
|
|
21
|
+
vi.mock('node:process', async (importOriginal) => {
|
|
22
|
+
const actual = await importOriginal();
|
|
23
|
+
return {
|
|
24
|
+
...actual,
|
|
25
|
+
cwd: mockedCwd,
|
|
26
|
+
};
|
|
27
|
+
});
|
|
28
|
+
vi.mock('../../config/trustedFolders.js', () => ({
|
|
29
|
+
loadTrustedFolders: mockedLoadTrustedFolders,
|
|
30
|
+
isWorkspaceTrusted: mockedIsWorkspaceTrusted,
|
|
31
|
+
TrustLevel: {
|
|
32
|
+
TRUST_FOLDER: 'TRUST_FOLDER',
|
|
33
|
+
TRUST_PARENT: 'TRUST_PARENT',
|
|
34
|
+
DO_NOT_TRUST: 'DO_NOT_TRUST',
|
|
35
|
+
},
|
|
36
|
+
}));
|
|
37
|
+
vi.mock('../contexts/SettingsContext.js', () => ({
|
|
38
|
+
useSettings: mockedUseSettings,
|
|
39
|
+
}));
|
|
40
|
+
vi.mock('../hooks/usePermissionsModifyTrust.js');
|
|
41
|
+
describe('PermissionsModifyTrustDialog', () => {
|
|
42
|
+
let mockUpdateTrustLevel;
|
|
43
|
+
let mockCommitTrustLevelChange;
|
|
44
|
+
beforeEach(() => {
|
|
45
|
+
mockUpdateTrustLevel = vi.fn();
|
|
46
|
+
mockCommitTrustLevelChange = vi.fn();
|
|
47
|
+
vi.mocked(usePermissionsModifyTrust).mockReturnValue({
|
|
48
|
+
cwd: '/test/dir',
|
|
49
|
+
currentTrustLevel: TrustLevel.DO_NOT_TRUST,
|
|
50
|
+
isInheritedTrustFromParent: false,
|
|
51
|
+
isInheritedTrustFromIde: false,
|
|
52
|
+
needsRestart: false,
|
|
53
|
+
updateTrustLevel: mockUpdateTrustLevel,
|
|
54
|
+
commitTrustLevelChange: mockCommitTrustLevelChange,
|
|
55
|
+
isFolderTrustEnabled: true,
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
afterEach(() => {
|
|
59
|
+
vi.resetAllMocks();
|
|
60
|
+
});
|
|
61
|
+
it('should render the main dialog with current trust level', async () => {
|
|
62
|
+
const { lastFrame } = renderWithProviders(_jsx(PermissionsModifyTrustDialog, { onExit: vi.fn(), addItem: vi.fn() }));
|
|
63
|
+
await waitFor(() => {
|
|
64
|
+
expect(lastFrame()).toContain('Modify Trust Level');
|
|
65
|
+
expect(lastFrame()).toContain('Folder: /test/dir');
|
|
66
|
+
expect(lastFrame()).toContain('Current Level: DO_NOT_TRUST');
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
it('should display the inherited trust note from parent', async () => {
|
|
70
|
+
vi.mocked(usePermissionsModifyTrust).mockReturnValue({
|
|
71
|
+
cwd: '/test/dir',
|
|
72
|
+
currentTrustLevel: TrustLevel.DO_NOT_TRUST,
|
|
73
|
+
isInheritedTrustFromParent: true,
|
|
74
|
+
isInheritedTrustFromIde: false,
|
|
75
|
+
needsRestart: false,
|
|
76
|
+
updateTrustLevel: mockUpdateTrustLevel,
|
|
77
|
+
commitTrustLevelChange: mockCommitTrustLevelChange,
|
|
78
|
+
isFolderTrustEnabled: true,
|
|
79
|
+
});
|
|
80
|
+
const { lastFrame } = renderWithProviders(_jsx(PermissionsModifyTrustDialog, { onExit: vi.fn(), addItem: vi.fn() }));
|
|
81
|
+
await waitFor(() => {
|
|
82
|
+
expect(lastFrame()).toContain('Note: This folder behaves as a trusted folder because one of the parent folders is trusted.');
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
it('should display the inherited trust note from IDE', async () => {
|
|
86
|
+
vi.mocked(usePermissionsModifyTrust).mockReturnValue({
|
|
87
|
+
cwd: '/test/dir',
|
|
88
|
+
currentTrustLevel: TrustLevel.DO_NOT_TRUST,
|
|
89
|
+
isInheritedTrustFromParent: false,
|
|
90
|
+
isInheritedTrustFromIde: true,
|
|
91
|
+
needsRestart: false,
|
|
92
|
+
updateTrustLevel: mockUpdateTrustLevel,
|
|
93
|
+
commitTrustLevelChange: mockCommitTrustLevelChange,
|
|
94
|
+
isFolderTrustEnabled: true,
|
|
95
|
+
});
|
|
96
|
+
const { lastFrame } = renderWithProviders(_jsx(PermissionsModifyTrustDialog, { onExit: vi.fn(), addItem: vi.fn() }));
|
|
97
|
+
await waitFor(() => {
|
|
98
|
+
expect(lastFrame()).toContain('Note: This folder behaves as a trusted folder because the connected IDE workspace is trusted.');
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
it('should call onExit when escape is pressed', async () => {
|
|
102
|
+
const onExit = vi.fn();
|
|
103
|
+
const { stdin, lastFrame } = renderWithProviders(_jsx(PermissionsModifyTrustDialog, { onExit: onExit, addItem: vi.fn() }));
|
|
104
|
+
await waitFor(() => expect(lastFrame()).not.toContain('Loading...'));
|
|
105
|
+
act(() => {
|
|
106
|
+
stdin.write('\x1b'); // escape key
|
|
107
|
+
});
|
|
108
|
+
await waitFor(() => {
|
|
109
|
+
expect(onExit).toHaveBeenCalled();
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
it('should commit, restart, and exit on `r` keypress', async () => {
|
|
113
|
+
const mockRelaunchApp = vi
|
|
114
|
+
.spyOn(processUtils, 'relaunchApp')
|
|
115
|
+
.mockResolvedValue(undefined);
|
|
116
|
+
vi.mocked(usePermissionsModifyTrust).mockReturnValue({
|
|
117
|
+
cwd: '/test/dir',
|
|
118
|
+
currentTrustLevel: TrustLevel.DO_NOT_TRUST,
|
|
119
|
+
isInheritedTrustFromParent: false,
|
|
120
|
+
isInheritedTrustFromIde: false,
|
|
121
|
+
needsRestart: true,
|
|
122
|
+
updateTrustLevel: mockUpdateTrustLevel,
|
|
123
|
+
commitTrustLevelChange: mockCommitTrustLevelChange,
|
|
124
|
+
isFolderTrustEnabled: true,
|
|
125
|
+
});
|
|
126
|
+
const onExit = vi.fn();
|
|
127
|
+
const { stdin, lastFrame } = renderWithProviders(_jsx(PermissionsModifyTrustDialog, { onExit: onExit, addItem: vi.fn() }));
|
|
128
|
+
await waitFor(() => expect(lastFrame()).not.toContain('Loading...'));
|
|
129
|
+
act(() => stdin.write('r')); // Press 'r' to restart
|
|
130
|
+
await waitFor(() => {
|
|
131
|
+
expect(mockCommitTrustLevelChange).toHaveBeenCalled();
|
|
132
|
+
expect(mockRelaunchApp).toHaveBeenCalled();
|
|
133
|
+
expect(onExit).toHaveBeenCalled();
|
|
134
|
+
});
|
|
135
|
+
mockRelaunchApp.mockRestore();
|
|
136
|
+
});
|
|
137
|
+
it('should not commit when escape is pressed during restart prompt', async () => {
|
|
138
|
+
vi.mocked(usePermissionsModifyTrust).mockReturnValue({
|
|
139
|
+
cwd: '/test/dir',
|
|
140
|
+
currentTrustLevel: TrustLevel.DO_NOT_TRUST,
|
|
141
|
+
isInheritedTrustFromParent: false,
|
|
142
|
+
isInheritedTrustFromIde: false,
|
|
143
|
+
needsRestart: true,
|
|
144
|
+
updateTrustLevel: mockUpdateTrustLevel,
|
|
145
|
+
commitTrustLevelChange: mockCommitTrustLevelChange,
|
|
146
|
+
isFolderTrustEnabled: true,
|
|
147
|
+
});
|
|
148
|
+
const onExit = vi.fn();
|
|
149
|
+
const { stdin, lastFrame } = renderWithProviders(_jsx(PermissionsModifyTrustDialog, { onExit: onExit, addItem: vi.fn() }));
|
|
150
|
+
await waitFor(() => expect(lastFrame()).not.toContain('Loading...'));
|
|
151
|
+
act(() => stdin.write('\x1b')); // Press escape
|
|
152
|
+
await waitFor(() => {
|
|
153
|
+
expect(mockCommitTrustLevelChange).not.toHaveBeenCalled();
|
|
154
|
+
expect(onExit).toHaveBeenCalled();
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
});
|
|
158
|
+
//# sourceMappingURL=PermissionsModifyTrustDialog.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PermissionsModifyTrustDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/components/PermissionsModifyTrustDialog.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
export interface QueuedMessageDisplayProps {
|
|
7
|
+
messageQueue: string[];
|
|
8
|
+
}
|
|
9
|
+
export declare const QueuedMessageDisplay: ({ messageQueue, }: QueuedMessageDisplayProps) => import("react/jsx-runtime").JSX.Element | null;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { Box, Text } from 'ink';
|
|
8
|
+
const MAX_DISPLAYED_QUEUED_MESSAGES = 3;
|
|
9
|
+
export const QueuedMessageDisplay = ({ messageQueue, }) => {
|
|
10
|
+
if (messageQueue.length === 0) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [messageQueue
|
|
14
|
+
.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES)
|
|
15
|
+
.map((message, index) => {
|
|
16
|
+
const preview = message.replace(/\s+/g, ' ');
|
|
17
|
+
return (_jsx(Box, { paddingLeft: 2, width: "100%", children: _jsx(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index));
|
|
18
|
+
}), messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (_jsx(Box, { paddingLeft: 2, children: _jsxs(Text, { dimColor: true, children: ["... (+", messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES, " more)"] }) }))] }));
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=QueuedMessageDisplay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QueuedMessageDisplay.js","sourceRoot":"","sources":["../../../../src/ui/components/QueuedMessageDisplay.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAMxC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,YAAY,GACc,EAAE,EAAE;IAC9B,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aACrC,YAAY;iBACV,KAAK,CAAC,CAAC,EAAE,6BAA6B,CAAC;iBACvC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBACtB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAE7C,OAAO,CACL,KAAC,GAAG,IAAa,WAAW,EAAE,CAAC,EAAE,KAAK,EAAC,MAAM,YAC3C,KAAC,IAAI,IAAC,QAAQ,QAAC,IAAI,EAAC,UAAU,YAC3B,OAAO,GACH,IAHC,KAAK,CAIT,CACP,CAAC;YACJ,CAAC,CAAC,EACH,YAAY,CAAC,MAAM,GAAG,6BAA6B,IAAI,CACtD,KAAC,GAAG,IAAC,WAAW,EAAE,CAAC,YACjB,MAAC,IAAI,IAAC,QAAQ,6BAEX,YAAY,CAAC,MAAM,GAAG,6BAA6B,cAC/C,GACH,CACP,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { describe, it, expect } from 'vitest';
|
|
8
|
+
import { render } from 'ink-testing-library';
|
|
9
|
+
import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
|
|
10
|
+
describe('QueuedMessageDisplay', () => {
|
|
11
|
+
it('renders nothing when message queue is empty', () => {
|
|
12
|
+
const { lastFrame } = render(_jsx(QueuedMessageDisplay, { messageQueue: [] }));
|
|
13
|
+
expect(lastFrame()).toBe('');
|
|
14
|
+
});
|
|
15
|
+
it('displays single queued message', () => {
|
|
16
|
+
const { lastFrame } = render(_jsx(QueuedMessageDisplay, { messageQueue: ['First message'] }));
|
|
17
|
+
const output = lastFrame();
|
|
18
|
+
expect(output).toContain('First message');
|
|
19
|
+
});
|
|
20
|
+
it('displays multiple queued messages', () => {
|
|
21
|
+
const messageQueue = [
|
|
22
|
+
'First queued message',
|
|
23
|
+
'Second queued message',
|
|
24
|
+
'Third queued message',
|
|
25
|
+
];
|
|
26
|
+
const { lastFrame } = render(_jsx(QueuedMessageDisplay, { messageQueue: messageQueue }));
|
|
27
|
+
const output = lastFrame();
|
|
28
|
+
expect(output).toContain('First queued message');
|
|
29
|
+
expect(output).toContain('Second queued message');
|
|
30
|
+
expect(output).toContain('Third queued message');
|
|
31
|
+
});
|
|
32
|
+
it('shows overflow indicator when more than 3 messages are queued', () => {
|
|
33
|
+
const messageQueue = [
|
|
34
|
+
'Message 1',
|
|
35
|
+
'Message 2',
|
|
36
|
+
'Message 3',
|
|
37
|
+
'Message 4',
|
|
38
|
+
'Message 5',
|
|
39
|
+
];
|
|
40
|
+
const { lastFrame } = render(_jsx(QueuedMessageDisplay, { messageQueue: messageQueue }));
|
|
41
|
+
const output = lastFrame();
|
|
42
|
+
expect(output).toContain('Message 1');
|
|
43
|
+
expect(output).toContain('Message 2');
|
|
44
|
+
expect(output).toContain('Message 3');
|
|
45
|
+
expect(output).toContain('... (+2 more)');
|
|
46
|
+
expect(output).not.toContain('Message 4');
|
|
47
|
+
expect(output).not.toContain('Message 5');
|
|
48
|
+
});
|
|
49
|
+
it('normalizes whitespace in messages', () => {
|
|
50
|
+
const messageQueue = ['Message with\tmultiple\n whitespace'];
|
|
51
|
+
const { lastFrame } = render(_jsx(QueuedMessageDisplay, { messageQueue: messageQueue }));
|
|
52
|
+
const output = lastFrame();
|
|
53
|
+
expect(output).toContain('Message with multiple whitespace');
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
//# sourceMappingURL=QueuedMessageDisplay.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QueuedMessageDisplay.test.js","sourceRoot":"","sources":["../../../../src/ui/components/QueuedMessageDisplay.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -616,6 +616,6 @@ export function SettingsDialog({ settings, onSelect, onRestartRequest, available
|
|
|
616
616
|
: shouldBeGreyedOut
|
|
617
617
|
? theme.text.secondary
|
|
618
618
|
: theme.text.primary, children: displayValue })] }), _jsx(Box, { height: 1 })] }, item.value));
|
|
619
|
-
}), showScrollDown && _jsx(Text, { color: theme.text.secondary, children: "\u25BC" }), _jsx(Box, { height: 1 }), showScopeSelection && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { bold: focusSection === 'scope', wrap: "truncate", children: [focusSection === 'scope' ? '> ' : ' ', "Apply To"] }), _jsx(RadioButtonSelect, { items: scopeItems, initialIndex:
|
|
619
|
+
}), showScrollDown && _jsx(Text, { color: theme.text.secondary, children: "\u25BC" }), _jsx(Box, { height: 1 }), showScopeSelection && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { bold: focusSection === 'scope', wrap: "truncate", children: [focusSection === 'scope' ? '> ' : ' ', "Apply To"] }), _jsx(RadioButtonSelect, { items: scopeItems, initialIndex: scopeItems.findIndex((item) => item.value === selectedScope), onSelect: handleScopeSelect, onHighlight: handleScopeHighlight, isFocused: focusSection === 'scope', showNumbers: focusSection === 'scope' })] })), _jsx(Box, { height: 1 }), _jsxs(Text, { color: theme.text.secondary, children: ["(Use Enter to select", showScopeSelection ? ', Tab to change focus' : '', ")"] }), showRestartPrompt && (_jsx(Text, { color: theme.status.warning, children: "To see changes, Gemini CLI must be restarted. Press r to exit and apply changes now." }))] }) }));
|
|
620
620
|
}
|
|
621
621
|
//# sourceMappingURL=SettingsDialog.js.map
|