@google/gemini-cli 0.0.77777772 → 0.0.77777773
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/README.md +108 -71
- package/dist/package.json +8 -2
- package/dist/src/commands/extensions/examples/context/GEMINI.md +9 -3
- package/dist/src/commands/extensions/examples/context/gemini-extension.json +1 -2
- package/dist/src/commands/extensions/install.d.ts +2 -2
- package/dist/src/commands/extensions/install.js +35 -36
- package/dist/src/commands/extensions/install.js.map +1 -1
- package/dist/src/commands/extensions/install.test.js +22 -31
- package/dist/src/commands/extensions/install.test.js.map +1 -1
- package/dist/src/commands/extensions/link.js +2 -2
- package/dist/src/commands/extensions/link.js.map +1 -1
- package/dist/src/commands/extensions/new.js +22 -7
- package/dist/src/commands/extensions/new.js.map +1 -1
- package/dist/src/commands/extensions/new.test.js +14 -7
- 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/update.js +18 -8
- package/dist/src/commands/extensions/update.js.map +1 -1
- package/dist/src/commands/mcp/list.js +5 -4
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/config/config.d.ts +5 -4
- package/dist/src/config/config.js +62 -22
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.d.ts +24 -20
- package/dist/src/config/extension.js +107 -102
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/extensions/extensionEnablement.d.ts +12 -9
- package/dist/src/config/extensions/extensionEnablement.js +36 -9
- package/dist/src/config/extensions/extensionEnablement.js.map +1 -1
- package/dist/src/config/extensions/extensionEnablement.test.js +74 -1
- package/dist/src/config/extensions/extensionEnablement.test.js.map +1 -1
- package/dist/src/config/extensions/github.d.ts +9 -1
- package/dist/src/config/extensions/github.js +49 -79
- package/dist/src/config/extensions/github.js.map +1 -1
- package/dist/src/config/extensions/github.test.js +119 -12
- package/dist/src/config/extensions/github.test.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.d.ts +7 -0
- package/dist/src/config/extensions/github_fetch.js +34 -0
- package/dist/src/config/extensions/github_fetch.js.map +1 -0
- package/dist/src/config/extensions/update.d.ts +4 -5
- package/dist/src/config/extensions/update.js +61 -44
- package/dist/src/config/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +84 -69
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/keyBindings.js +1 -1
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/policy.js +2 -2
- package/dist/src/config/policy.js.map +1 -1
- package/dist/src/config/settings.d.ts +10 -1
- package/dist/src/config/settings.js +3 -3
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +80 -6
- package/dist/src/config/settingsSchema.js +79 -5
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +9 -1
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +0 -1
- package/dist/src/config/trustedFolders.js +2 -3
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/gemini.js +31 -23
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +21 -9
- 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/services/BuiltinCommandLoader.js +3 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +37 -0
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/FileCommandLoader.d.ts +1 -1
- package/dist/src/services/FileCommandLoader.js +4 -4
- package/dist/src/services/FileCommandLoader.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.js +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
- package/dist/src/test-utils/render.d.ts +11 -2
- package/dist/src/test-utils/render.js +55 -1
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/App.js +7 -9
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/AppContainer.js +68 -16
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +269 -7
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.js +3 -0
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.js +8 -1
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +1 -0
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/AuthInProgress.js +2 -2
- package/dist/src/ui/auth/AuthInProgress.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.js +7 -24
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +39 -37
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +78 -260
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.js +23 -5
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/profileCommand.d.ts +7 -0
- package/dist/src/ui/commands/profileCommand.js +23 -0
- package/dist/src/ui/commands/profileCommand.js.map +1 -0
- package/dist/src/ui/commands/setupGithubCommand.test.js +2 -1
- package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
- package/dist/src/ui/commands/toolsCommand.js +10 -24
- package/dist/src/ui/commands/toolsCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +7 -5
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/AnsiOutput.d.ts +1 -0
- package/dist/src/ui/components/AnsiOutput.js +5 -5
- package/dist/src/ui/components/AnsiOutput.js.map +1 -1
- package/dist/src/ui/components/AnsiOutput.test.js +6 -6
- package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
- package/dist/src/ui/components/CliSpinner.d.ts +10 -0
- package/dist/src/ui/components/CliSpinner.js +20 -0
- package/dist/src/ui/components/CliSpinner.js.map +1 -0
- package/dist/src/ui/components/Composer.js +7 -27
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/ConsentPrompt.d.ts +13 -0
- package/dist/src/ui/components/ConsentPrompt.js +19 -0
- package/dist/src/ui/components/ConsentPrompt.js.map +1 -0
- package/dist/src/ui/components/ConsentPrompt.test.d.ts +6 -0
- package/dist/src/ui/components/ConsentPrompt.test.js +67 -0
- package/dist/src/ui/components/ConsentPrompt.test.js.map +1 -0
- package/dist/src/ui/components/ContextSummaryDisplay.js +2 -2
- package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.d.ts +2 -1
- package/dist/src/ui/components/ContextUsageDisplay.js +4 -2
- package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/DebugProfiler.d.ts +18 -0
- package/dist/src/ui/components/DebugProfiler.js +158 -12
- package/dist/src/ui/components/DebugProfiler.js.map +1 -1
- package/dist/src/ui/components/DebugProfiler.test.d.ts +6 -0
- package/dist/src/ui/components/DebugProfiler.test.js +140 -0
- package/dist/src/ui/components/DebugProfiler.test.js.map +1 -0
- package/dist/src/ui/components/DialogManager.d.ts +2 -1
- package/dist/src/ui/components/DialogManager.js +9 -9
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/EditorSettingsDialog.js +11 -2
- package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
- package/dist/src/ui/components/ExitWarning.d.ts +7 -0
- package/dist/src/ui/components/ExitWarning.js +9 -0
- package/dist/src/ui/components/ExitWarning.js.map +1 -0
- package/dist/src/ui/components/FolderTrustDialog.js +3 -0
- package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +2 -2
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.d.ts +1 -19
- package/dist/src/ui/components/Footer.js +35 -17
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.js +2 -2
- package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
- package/dist/src/ui/components/Help.js +1 -1
- package/dist/src/ui/components/Help.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.d.ts +1 -0
- package/dist/src/ui/components/HistoryItemDisplay.js +6 -2
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +50 -10
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/IdeTrustChangeDialog.d.ts +11 -0
- package/dist/src/ui/components/IdeTrustChangeDialog.js +32 -0
- package/dist/src/ui/components/IdeTrustChangeDialog.js.map +1 -0
- package/dist/src/ui/components/IdeTrustChangeDialog.test.d.ts +6 -0
- package/dist/src/ui/components/IdeTrustChangeDialog.test.js +57 -0
- package/dist/src/ui/components/IdeTrustChangeDialog.test.js.map +1 -0
- package/dist/src/ui/components/InputPrompt.d.ts +7 -1
- package/dist/src/ui/components/InputPrompt.js +50 -25
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/LoopDetectionConfirmation.js +2 -0
- package/dist/src/ui/components/LoopDetectionConfirmation.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +7 -2
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +4 -0
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/Notifications.js +12 -4
- package/dist/src/ui/components/Notifications.js.map +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js +3 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js.map +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js +0 -4
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.js +2 -0
- package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +2 -0
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +5 -2
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js +3 -0
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.js +2 -0
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/WorkspaceMigrationDialog.d.ts +2 -2
- package/dist/src/ui/components/WorkspaceMigrationDialog.js +4 -4
- package/dist/src/ui/components/WorkspaceMigrationDialog.js.map +1 -1
- package/dist/src/ui/components/messages/CompressionMessage.js +2 -2
- package/dist/src/ui/components/messages/CompressionMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +15 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.js +26 -3
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/UserMessage.js +1 -2
- package/dist/src/ui/components/messages/UserMessage.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.d.ts +5 -10
- package/dist/src/ui/components/shared/BaseSelectionList.js +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.test.js +7 -5
- package/dist/src/ui/components/shared/BaseSelectionList.test.js.map +1 -1
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.d.ts +2 -3
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.js +1 -1
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.js +13 -2
- package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.d.ts +2 -3
- package/dist/src/ui/components/shared/RadioButtonSelect.js +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.test.js +5 -3
- package/dist/src/ui/components/shared/RadioButtonSelect.test.js.map +1 -1
- package/dist/src/ui/components/shared/ScopeSelector.js +4 -1
- package/dist/src/ui/components/shared/ScopeSelector.js.map +1 -1
- package/dist/src/ui/components/views/ChatList.d.ts +12 -0
- package/dist/src/ui/components/views/ChatList.js +17 -0
- package/dist/src/ui/components/views/ChatList.js.map +1 -0
- package/dist/src/ui/components/views/ChatList.test.d.ts +6 -0
- package/dist/src/ui/components/views/ChatList.test.js +42 -0
- package/dist/src/ui/components/views/ChatList.test.js.map +1 -0
- package/dist/src/ui/components/views/McpStatus.d.ts +27 -0
- package/dist/src/ui/components/views/McpStatus.js +77 -0
- package/dist/src/ui/components/views/McpStatus.js.map +1 -0
- package/dist/src/ui/components/views/McpStatus.test.d.ts +6 -0
- package/dist/src/ui/components/views/McpStatus.test.js +117 -0
- package/dist/src/ui/components/views/McpStatus.test.js.map +1 -0
- package/dist/src/ui/components/views/ToolsList.d.ts +14 -0
- package/dist/src/ui/components/views/ToolsList.js +7 -0
- package/dist/src/ui/components/views/ToolsList.js.map +1 -0
- package/dist/src/ui/components/views/ToolsList.test.d.ts +6 -0
- package/dist/src/ui/components/views/ToolsList.test.js +45 -0
- package/dist/src/ui/components/views/ToolsList.test.js.map +1 -0
- package/dist/src/ui/contexts/UIStateContext.d.ts +6 -1
- 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 +5 -6
- package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.js +19 -32
- package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +6 -5
- package/dist/src/ui/hooks/slashCommandProcessor.js +5 -2
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.d.ts +10 -1
- package/dist/src/ui/hooks/useExtensionUpdates.js +145 -49
- package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +161 -80
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useFlickerDetector.d.ts +14 -0
- package/dist/src/ui/hooks/useFlickerDetector.js +37 -0
- package/dist/src/ui/hooks/useFlickerDetector.js.map +1 -0
- package/dist/src/ui/hooks/useFlickerDetector.test.d.ts +6 -0
- package/dist/src/ui/hooks/useFlickerDetector.test.js +102 -0
- package/dist/src/ui/hooks/useFlickerDetector.test.js.map +1 -0
- package/dist/src/ui/hooks/useFolderTrust.d.ts +2 -1
- package/dist/src/ui/hooks/useFolderTrust.js +12 -3
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +33 -2
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useHistoryManager.js +3 -3
- package/dist/src/ui/hooks/useHistoryManager.js.map +1 -1
- package/dist/src/ui/hooks/useIdeTrustListener.d.ts +4 -2
- package/dist/src/ui/hooks/useIdeTrustListener.js +40 -14
- package/dist/src/ui/hooks/useIdeTrustListener.js.map +1 -1
- package/dist/src/ui/hooks/useIdeTrustListener.test.d.ts +6 -0
- package/dist/src/ui/hooks/useIdeTrustListener.test.js +183 -0
- package/dist/src/ui/hooks/useIdeTrustListener.test.js.map +1 -0
- package/dist/src/ui/hooks/usePhraseCycler.js +1 -0
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +3 -17
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +13 -43
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.d.ts +1 -0
- package/dist/src/ui/hooks/useSelectionList.js +63 -43
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.test.js +111 -37
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
- package/dist/src/ui/hooks/useShellHistory.test.js +12 -8
- package/dist/src/ui/hooks/useShellHistory.test.js.map +1 -1
- package/dist/src/ui/hooks/useTerminalSize.js +2 -3
- package/dist/src/ui/hooks/useTerminalSize.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +2 -2
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/hooks/useWorkspaceMigration.d.ts +2 -2
- package/dist/src/ui/hooks/useWorkspaceMigration.js +13 -8
- package/dist/src/ui/hooks/useWorkspaceMigration.js.map +1 -1
- package/dist/src/ui/layouts/DefaultAppLayout.d.ts +7 -0
- package/dist/src/ui/layouts/DefaultAppLayout.js +16 -0
- package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -0
- package/dist/src/ui/layouts/ScreenReaderAppLayout.d.ts +7 -0
- package/dist/src/ui/layouts/ScreenReaderAppLayout.js +17 -0
- package/dist/src/ui/layouts/ScreenReaderAppLayout.js.map +1 -0
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +3 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js +2 -2
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js.map +1 -1
- package/dist/src/ui/state/extensions.d.ts +46 -0
- package/dist/src/ui/state/extensions.js +67 -0
- package/dist/src/ui/state/extensions.js.map +1 -1
- package/dist/src/ui/types.d.ts +54 -3
- package/dist/src/ui/types.js +3 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.js +1 -2
- package/dist/src/ui/utils/MarkdownDisplay.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.test.js +94 -91
- package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
- package/dist/src/ui/utils/displayUtils.d.ts +1 -0
- package/dist/src/ui/utils/displayUtils.js +3 -0
- package/dist/src/ui/utils/displayUtils.js.map +1 -1
- package/dist/src/ui/utils/displayUtils.test.js +36 -17
- package/dist/src/ui/utils/displayUtils.test.js.map +1 -1
- package/dist/src/ui/utils/ui-sizing.d.ts +7 -0
- package/dist/src/ui/utils/ui-sizing.js +23 -0
- package/dist/src/ui/utils/ui-sizing.js.map +1 -0
- package/dist/src/utils/commentJson.js +95 -13
- package/dist/src/utils/commentJson.js.map +1 -1
- package/dist/src/utils/commentJson.test.js +161 -0
- package/dist/src/utils/commentJson.test.js.map +1 -1
- package/dist/src/utils/errors.d.ts +8 -3
- package/dist/src/utils/errors.js +23 -13
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors.test.js +40 -46
- package/dist/src/utils/errors.test.js.map +1 -1
- 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/handleAutoUpdate.js +4 -1
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/installationInfo.d.ts +1 -0
- package/dist/src/utils/installationInfo.js +2 -0
- package/dist/src/utils/installationInfo.js.map +1 -1
- package/dist/src/utils/math.d.ts +13 -0
- package/dist/src/utils/math.js +14 -0
- package/dist/src/utils/math.js.map +1 -0
- package/dist/src/utils/sandbox.js +8 -8
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sessionCleanup.d.ts +22 -0
- package/dist/src/utils/sessionCleanup.integration.test.d.ts +6 -0
- package/dist/src/utils/sessionCleanup.integration.test.js +182 -0
- package/dist/src/utils/sessionCleanup.integration.test.js.map +1 -0
- package/dist/src/utils/sessionCleanup.js +214 -0
- package/dist/src/utils/sessionCleanup.js.map +1 -0
- package/dist/src/utils/sessionCleanup.test.d.ts +6 -0
- package/dist/src/utils/sessionCleanup.test.js +1232 -0
- package/dist/src/utils/sessionCleanup.test.js.map +1 -0
- package/dist/src/utils/sessionUtils.d.ts +37 -0
- package/dist/src/utils/sessionUtils.js +71 -0
- package/dist/src/utils/sessionUtils.js.map +1 -0
- package/dist/src/utils/windowTitle.d.ts +12 -0
- package/dist/src/utils/windowTitle.js +19 -0
- package/dist/src/utils/windowTitle.js.map +1 -0
- package/dist/src/utils/windowTitle.test.d.ts +6 -0
- package/dist/src/utils/windowTitle.test.js +49 -0
- package/dist/src/utils/windowTitle.test.js.map +1 -0
- package/dist/src/validateNonInterActiveAuth.js +6 -7
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/zed-integration/acp.js +1 -2
- package/dist/src/zed-integration/acp.js.map +1 -1
- package/dist/src/zed-integration/fileSystemService.d.ts +1 -0
- package/dist/src/zed-integration/fileSystemService.js +3 -0
- package/dist/src/zed-integration/fileSystemService.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +48 -48
- package/dist/src/zed-integration/zedIntegration.d.ts +2 -3
- package/dist/src/zed-integration/zedIntegration.js +10 -27
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -3
|
@@ -7,30 +7,15 @@ import { vi } from 'vitest';
|
|
|
7
7
|
import * as fs from 'node:fs';
|
|
8
8
|
import * as os from 'node:os';
|
|
9
9
|
import * as path from 'node:path';
|
|
10
|
-
import {
|
|
10
|
+
import { ExtensionStorage, annotateActiveExtensions, loadExtension, } from '../../config/extension.js';
|
|
11
11
|
import { createExtension } from '../../test-utils/createExtension.js';
|
|
12
12
|
import { useExtensionUpdates } from './useExtensionUpdates.js';
|
|
13
13
|
import { GEMINI_DIR } from '@google/gemini-cli-core';
|
|
14
|
-
import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
|
|
15
14
|
import { renderHook, waitFor } from '@testing-library/react';
|
|
16
15
|
import { MessageType } from '../types.js';
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
fetch: vi.fn(),
|
|
21
|
-
checkout: vi.fn(),
|
|
22
|
-
listRemote: vi.fn(),
|
|
23
|
-
revparse: vi.fn(),
|
|
24
|
-
// Not a part of the actual API, but we need to use this to do the correct
|
|
25
|
-
// file system interactions.
|
|
26
|
-
path: vi.fn(),
|
|
27
|
-
};
|
|
28
|
-
vi.mock('simple-git', () => ({
|
|
29
|
-
simpleGit: vi.fn((path) => {
|
|
30
|
-
mockGit.path.mockReturnValue(path);
|
|
31
|
-
return mockGit;
|
|
32
|
-
}),
|
|
33
|
-
}));
|
|
16
|
+
import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
|
|
17
|
+
import { checkForAllExtensionUpdates, updateExtension, } from '../../config/extensions/update.js';
|
|
18
|
+
import { ExtensionUpdateState } from '../state/extensions.js';
|
|
34
19
|
vi.mock('os', async (importOriginal) => {
|
|
35
20
|
const mockedOs = await importOriginal();
|
|
36
21
|
return {
|
|
@@ -38,39 +23,9 @@ vi.mock('os', async (importOriginal) => {
|
|
|
38
23
|
homedir: vi.fn(),
|
|
39
24
|
};
|
|
40
25
|
});
|
|
41
|
-
vi.mock('../../config/
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
...actual,
|
|
45
|
-
isWorkspaceTrusted: vi.fn(),
|
|
46
|
-
};
|
|
47
|
-
});
|
|
48
|
-
const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn());
|
|
49
|
-
const mockLogExtensionUninstall = vi.hoisted(() => vi.fn());
|
|
50
|
-
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
51
|
-
const actual = await importOriginal();
|
|
52
|
-
return {
|
|
53
|
-
...actual,
|
|
54
|
-
logExtensionInstallEvent: mockLogExtensionInstallEvent,
|
|
55
|
-
logExtensionUninstall: mockLogExtensionUninstall,
|
|
56
|
-
ExtensionInstallEvent: vi.fn(),
|
|
57
|
-
ExtensionUninstallEvent: vi.fn(),
|
|
58
|
-
};
|
|
59
|
-
});
|
|
60
|
-
vi.mock('child_process', async (importOriginal) => {
|
|
61
|
-
const actual = await importOriginal();
|
|
62
|
-
return {
|
|
63
|
-
...actual,
|
|
64
|
-
execSync: vi.fn(),
|
|
65
|
-
};
|
|
66
|
-
});
|
|
67
|
-
const mockQuestion = vi.hoisted(() => vi.fn());
|
|
68
|
-
const mockClose = vi.hoisted(() => vi.fn());
|
|
69
|
-
vi.mock('node:readline', () => ({
|
|
70
|
-
createInterface: vi.fn(() => ({
|
|
71
|
-
question: mockQuestion,
|
|
72
|
-
close: mockClose,
|
|
73
|
-
})),
|
|
26
|
+
vi.mock('../../config/extensions/update.js', () => ({
|
|
27
|
+
checkForAllExtensionUpdates: vi.fn(),
|
|
28
|
+
updateExtension: vi.fn(),
|
|
74
29
|
}));
|
|
75
30
|
describe('useExtensionUpdates', () => {
|
|
76
31
|
let tempHomeDir;
|
|
@@ -80,7 +35,8 @@ describe('useExtensionUpdates', () => {
|
|
|
80
35
|
vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
|
|
81
36
|
userExtensionsDir = path.join(tempHomeDir, GEMINI_DIR, 'extensions');
|
|
82
37
|
fs.mkdirSync(userExtensionsDir, { recursive: true });
|
|
83
|
-
|
|
38
|
+
vi.mocked(checkForAllExtensionUpdates).mockReset();
|
|
39
|
+
vi.mocked(updateExtension).mockReset();
|
|
84
40
|
});
|
|
85
41
|
afterEach(() => {
|
|
86
42
|
fs.rmSync(tempHomeDir, { recursive: true, force: true });
|
|
@@ -98,20 +54,20 @@ describe('useExtensionUpdates', () => {
|
|
|
98
54
|
source: 'https://some/repo',
|
|
99
55
|
autoUpdate: false,
|
|
100
56
|
},
|
|
57
|
+
contextFiles: [],
|
|
101
58
|
},
|
|
102
59
|
];
|
|
103
60
|
const addItem = vi.fn();
|
|
104
61
|
const cwd = '/test/cwd';
|
|
105
|
-
|
|
106
|
-
{
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
62
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
63
|
+
dispatch({
|
|
64
|
+
type: 'SET_STATE',
|
|
65
|
+
payload: {
|
|
66
|
+
name: 'test-extension',
|
|
67
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
110
68
|
},
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
mockGit.revparse.mockResolvedValue('local-hash');
|
|
114
|
-
mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
|
|
69
|
+
});
|
|
70
|
+
});
|
|
115
71
|
renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
|
|
116
72
|
await waitFor(() => {
|
|
117
73
|
expect(addItem).toHaveBeenCalledWith({
|
|
@@ -131,27 +87,21 @@ describe('useExtensionUpdates', () => {
|
|
|
131
87
|
autoUpdate: true,
|
|
132
88
|
},
|
|
133
89
|
});
|
|
134
|
-
const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })],
|
|
90
|
+
const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()))[0];
|
|
135
91
|
const addItem = vi.fn();
|
|
136
|
-
|
|
137
|
-
{
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
92
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
93
|
+
dispatch({
|
|
94
|
+
type: 'SET_STATE',
|
|
95
|
+
payload: {
|
|
96
|
+
name: 'test-extension',
|
|
97
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
141
98
|
},
|
|
142
|
-
},
|
|
143
|
-
]);
|
|
144
|
-
mockGit.revparse.mockResolvedValue('local-hash');
|
|
145
|
-
mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
|
|
146
|
-
mockGit.clone.mockImplementation(async (_, destination) => {
|
|
147
|
-
fs.mkdirSync(path.join(mockGit.path(), destination), {
|
|
148
|
-
recursive: true,
|
|
149
99
|
});
|
|
150
|
-
fs.writeFileSync(path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), JSON.stringify({ name: 'test-extension', version: '1.1.0' }));
|
|
151
100
|
});
|
|
152
|
-
vi.mocked(
|
|
153
|
-
|
|
154
|
-
|
|
101
|
+
vi.mocked(updateExtension).mockResolvedValue({
|
|
102
|
+
originalVersion: '1.0.0',
|
|
103
|
+
updatedVersion: '1.1.0',
|
|
104
|
+
name: '',
|
|
155
105
|
});
|
|
156
106
|
renderHook(() => useExtensionUpdates([extension], addItem, tempHomeDir));
|
|
157
107
|
await waitFor(() => {
|
|
@@ -159,7 +109,138 @@ describe('useExtensionUpdates', () => {
|
|
|
159
109
|
type: MessageType.INFO,
|
|
160
110
|
text: 'Extension "test-extension" successfully updated: 1.0.0 → 1.1.0.',
|
|
161
111
|
}, expect.any(Number));
|
|
162
|
-
}, { timeout:
|
|
112
|
+
}, { timeout: 4000 });
|
|
113
|
+
});
|
|
114
|
+
it('should batch update notifications for multiple extensions', async () => {
|
|
115
|
+
const extensionDir1 = createExtension({
|
|
116
|
+
extensionsDir: userExtensionsDir,
|
|
117
|
+
name: 'test-extension-1',
|
|
118
|
+
version: '1.0.0',
|
|
119
|
+
installMetadata: {
|
|
120
|
+
source: 'https://some.git/repo1',
|
|
121
|
+
type: 'git',
|
|
122
|
+
autoUpdate: true,
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
const extensionDir2 = createExtension({
|
|
126
|
+
extensionsDir: userExtensionsDir,
|
|
127
|
+
name: 'test-extension-2',
|
|
128
|
+
version: '2.0.0',
|
|
129
|
+
installMetadata: {
|
|
130
|
+
source: 'https://some.git/repo2',
|
|
131
|
+
type: 'git',
|
|
132
|
+
autoUpdate: true,
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
const extensions = annotateActiveExtensions([
|
|
136
|
+
loadExtension({
|
|
137
|
+
extensionDir: extensionDir1,
|
|
138
|
+
workspaceDir: tempHomeDir,
|
|
139
|
+
}),
|
|
140
|
+
loadExtension({
|
|
141
|
+
extensionDir: extensionDir2,
|
|
142
|
+
workspaceDir: tempHomeDir,
|
|
143
|
+
}),
|
|
144
|
+
], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
|
|
145
|
+
const addItem = vi.fn();
|
|
146
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
147
|
+
dispatch({
|
|
148
|
+
type: 'SET_STATE',
|
|
149
|
+
payload: {
|
|
150
|
+
name: 'test-extension-1',
|
|
151
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
152
|
+
},
|
|
153
|
+
});
|
|
154
|
+
dispatch({
|
|
155
|
+
type: 'SET_STATE',
|
|
156
|
+
payload: {
|
|
157
|
+
name: 'test-extension-2',
|
|
158
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
159
|
+
},
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
vi.mocked(updateExtension)
|
|
163
|
+
.mockResolvedValueOnce({
|
|
164
|
+
originalVersion: '1.0.0',
|
|
165
|
+
updatedVersion: '1.1.0',
|
|
166
|
+
name: '',
|
|
167
|
+
})
|
|
168
|
+
.mockResolvedValueOnce({
|
|
169
|
+
originalVersion: '2.0.0',
|
|
170
|
+
updatedVersion: '2.1.0',
|
|
171
|
+
name: '',
|
|
172
|
+
});
|
|
173
|
+
renderHook(() => useExtensionUpdates(extensions, addItem, tempHomeDir));
|
|
174
|
+
await waitFor(() => {
|
|
175
|
+
expect(addItem).toHaveBeenCalledTimes(2);
|
|
176
|
+
expect(addItem).toHaveBeenCalledWith({
|
|
177
|
+
type: MessageType.INFO,
|
|
178
|
+
text: 'Extension "test-extension-1" successfully updated: 1.0.0 → 1.1.0.',
|
|
179
|
+
}, expect.any(Number));
|
|
180
|
+
expect(addItem).toHaveBeenCalledWith({
|
|
181
|
+
type: MessageType.INFO,
|
|
182
|
+
text: 'Extension "test-extension-2" successfully updated: 2.0.0 → 2.1.0.',
|
|
183
|
+
}, expect.any(Number));
|
|
184
|
+
}, { timeout: 4000 });
|
|
185
|
+
});
|
|
186
|
+
it('should batch update notifications for multiple extensions with autoUpdate: false', async () => {
|
|
187
|
+
const extensions = [
|
|
188
|
+
{
|
|
189
|
+
name: 'test-extension-1',
|
|
190
|
+
type: 'git',
|
|
191
|
+
version: '1.0.0',
|
|
192
|
+
path: '/some/path1',
|
|
193
|
+
isActive: true,
|
|
194
|
+
installMetadata: {
|
|
195
|
+
type: 'git',
|
|
196
|
+
source: 'https://some/repo1',
|
|
197
|
+
autoUpdate: false,
|
|
198
|
+
},
|
|
199
|
+
contextFiles: [],
|
|
200
|
+
},
|
|
201
|
+
{
|
|
202
|
+
name: 'test-extension-2',
|
|
203
|
+
type: 'git',
|
|
204
|
+
version: '2.0.0',
|
|
205
|
+
path: '/some/path2',
|
|
206
|
+
isActive: true,
|
|
207
|
+
installMetadata: {
|
|
208
|
+
type: 'git',
|
|
209
|
+
source: 'https://some/repo2',
|
|
210
|
+
autoUpdate: false,
|
|
211
|
+
},
|
|
212
|
+
contextFiles: [],
|
|
213
|
+
},
|
|
214
|
+
];
|
|
215
|
+
const addItem = vi.fn();
|
|
216
|
+
const cwd = '/test/cwd';
|
|
217
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
218
|
+
dispatch({ type: 'BATCH_CHECK_START' });
|
|
219
|
+
dispatch({
|
|
220
|
+
type: 'SET_STATE',
|
|
221
|
+
payload: {
|
|
222
|
+
name: 'test-extension-1',
|
|
223
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
224
|
+
},
|
|
225
|
+
});
|
|
226
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
227
|
+
dispatch({
|
|
228
|
+
type: 'SET_STATE',
|
|
229
|
+
payload: {
|
|
230
|
+
name: 'test-extension-2',
|
|
231
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
232
|
+
},
|
|
233
|
+
});
|
|
234
|
+
dispatch({ type: 'BATCH_CHECK_END' });
|
|
235
|
+
});
|
|
236
|
+
renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
|
|
237
|
+
await waitFor(() => {
|
|
238
|
+
expect(addItem).toHaveBeenCalledTimes(1);
|
|
239
|
+
expect(addItem).toHaveBeenCalledWith({
|
|
240
|
+
type: MessageType.INFO,
|
|
241
|
+
text: 'You have 2 extensions with an update available, run "/extensions list" for more information.',
|
|
242
|
+
}, expect.any(Number));
|
|
243
|
+
});
|
|
163
244
|
});
|
|
164
245
|
});
|
|
165
246
|
//# sourceMappingURL=useExtensionUpdates.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { type DOMElement } from 'ink';
|
|
7
|
+
/**
|
|
8
|
+
* A hook that detects when the UI flickers (renders taller than the terminal).
|
|
9
|
+
* This is a sign of a rendering bug that should be fixed.
|
|
10
|
+
*
|
|
11
|
+
* @param rootUiRef A ref to the root UI element.
|
|
12
|
+
* @param terminalHeight The height of the terminal.
|
|
13
|
+
*/
|
|
14
|
+
export declare function useFlickerDetector(rootUiRef: React.RefObject<DOMElement | null>, terminalHeight: number): void;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { measureElement } from 'ink';
|
|
7
|
+
import { useEffect } from 'react';
|
|
8
|
+
import { useConfig } from '../contexts/ConfigContext.js';
|
|
9
|
+
import { recordFlickerFrame } from '@google/gemini-cli-core';
|
|
10
|
+
import { appEvents, AppEvent } from '../../utils/events.js';
|
|
11
|
+
import { useUIState } from '../contexts/UIStateContext.js';
|
|
12
|
+
/**
|
|
13
|
+
* A hook that detects when the UI flickers (renders taller than the terminal).
|
|
14
|
+
* This is a sign of a rendering bug that should be fixed.
|
|
15
|
+
*
|
|
16
|
+
* @param rootUiRef A ref to the root UI element.
|
|
17
|
+
* @param terminalHeight The height of the terminal.
|
|
18
|
+
*/
|
|
19
|
+
export function useFlickerDetector(rootUiRef, terminalHeight) {
|
|
20
|
+
const config = useConfig();
|
|
21
|
+
const { constrainHeight } = useUIState();
|
|
22
|
+
useEffect(() => {
|
|
23
|
+
if (rootUiRef.current) {
|
|
24
|
+
const measurement = measureElement(rootUiRef.current);
|
|
25
|
+
if (measurement.height > terminalHeight) {
|
|
26
|
+
// If we are not constraining the height, we are intentionally
|
|
27
|
+
// overflowing the screen.
|
|
28
|
+
if (!constrainHeight) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
recordFlickerFrame(config);
|
|
32
|
+
appEvents.emit(AppEvent.Flicker);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=useFlickerDetector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useFlickerDetector.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFlickerDetector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAmB,cAAc,EAAE,MAAM,KAAK,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,SAA6C,EAC7C,cAAsB;IAEtB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,EAAE,CAAC;IAEzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACtD,IAAI,WAAW,CAAC,MAAM,GAAG,cAAc,EAAE,CAAC;gBACxC,8DAA8D;gBAC9D,0BAA0B;gBAC1B,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,OAAO;gBACT,CAAC;gBAED,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC3B,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { renderHook } from '@testing-library/react';
|
|
7
|
+
import { vi } from 'vitest';
|
|
8
|
+
import { useFlickerDetector } from './useFlickerDetector.js';
|
|
9
|
+
import { useConfig } from '../contexts/ConfigContext.js';
|
|
10
|
+
import { recordFlickerFrame } from '@google/gemini-cli-core';
|
|
11
|
+
import {} from '@google/gemini-cli-core';
|
|
12
|
+
import { measureElement } from 'ink';
|
|
13
|
+
import { useUIState } from '../contexts/UIStateContext.js';
|
|
14
|
+
import { appEvents, AppEvent } from '../../utils/events.js';
|
|
15
|
+
// Mock dependencies
|
|
16
|
+
vi.mock('../contexts/ConfigContext.js');
|
|
17
|
+
vi.mock('../contexts/UIStateContext.js');
|
|
18
|
+
vi.mock('@google/gemini-cli-core', () => ({
|
|
19
|
+
recordFlickerFrame: vi.fn(),
|
|
20
|
+
GEMINI_DIR: '.gemini',
|
|
21
|
+
}));
|
|
22
|
+
vi.mock('ink', async (importOriginal) => {
|
|
23
|
+
const original = await importOriginal();
|
|
24
|
+
return {
|
|
25
|
+
...original,
|
|
26
|
+
measureElement: vi.fn(),
|
|
27
|
+
};
|
|
28
|
+
});
|
|
29
|
+
vi.mock('../../utils/events.js', () => ({
|
|
30
|
+
appEvents: {
|
|
31
|
+
emit: vi.fn(),
|
|
32
|
+
},
|
|
33
|
+
AppEvent: {
|
|
34
|
+
Flicker: 'flicker',
|
|
35
|
+
},
|
|
36
|
+
}));
|
|
37
|
+
const mockUseConfig = useConfig;
|
|
38
|
+
const mockUseUIState = useUIState;
|
|
39
|
+
const mockRecordFlickerFrame = recordFlickerFrame;
|
|
40
|
+
const mockMeasureElement = measureElement;
|
|
41
|
+
const mockAppEventsEmit = appEvents.emit;
|
|
42
|
+
describe('useFlickerDetector', () => {
|
|
43
|
+
const mockConfig = {};
|
|
44
|
+
let mockRef;
|
|
45
|
+
beforeEach(() => {
|
|
46
|
+
mockUseConfig.mockReturnValue(mockConfig);
|
|
47
|
+
mockRef = { current: { yogaNode: {} } };
|
|
48
|
+
// Default UI state
|
|
49
|
+
mockUseUIState.mockReturnValue({ constrainHeight: true });
|
|
50
|
+
});
|
|
51
|
+
afterEach(() => {
|
|
52
|
+
vi.clearAllMocks();
|
|
53
|
+
});
|
|
54
|
+
it('should not record a flicker when height is less than terminal height', () => {
|
|
55
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 20 });
|
|
56
|
+
renderHook(() => useFlickerDetector(mockRef, 25));
|
|
57
|
+
expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
|
|
58
|
+
expect(mockAppEventsEmit).not.toHaveBeenCalled();
|
|
59
|
+
});
|
|
60
|
+
it('should not record a flicker when height is equal to terminal height', () => {
|
|
61
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 25 });
|
|
62
|
+
renderHook(() => useFlickerDetector(mockRef, 25));
|
|
63
|
+
expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
|
|
64
|
+
expect(mockAppEventsEmit).not.toHaveBeenCalled();
|
|
65
|
+
});
|
|
66
|
+
it('should record a flicker when height is greater than terminal height and height is constrained', () => {
|
|
67
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
|
|
68
|
+
renderHook(() => useFlickerDetector(mockRef, 25));
|
|
69
|
+
expect(mockRecordFlickerFrame).toHaveBeenCalledTimes(1);
|
|
70
|
+
expect(mockRecordFlickerFrame).toHaveBeenCalledWith(mockConfig);
|
|
71
|
+
expect(mockAppEventsEmit).toHaveBeenCalledTimes(1);
|
|
72
|
+
expect(mockAppEventsEmit).toHaveBeenCalledWith(AppEvent.Flicker);
|
|
73
|
+
});
|
|
74
|
+
it('should NOT record a flicker when height is greater than terminal height but height is NOT constrained', () => {
|
|
75
|
+
// Override default UI state for this test
|
|
76
|
+
mockUseUIState.mockReturnValue({ constrainHeight: false });
|
|
77
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
|
|
78
|
+
renderHook(() => useFlickerDetector(mockRef, 25));
|
|
79
|
+
expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
|
|
80
|
+
expect(mockAppEventsEmit).not.toHaveBeenCalled();
|
|
81
|
+
});
|
|
82
|
+
it('should not check for flicker if the ref is not set', () => {
|
|
83
|
+
mockRef.current = null;
|
|
84
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
|
|
85
|
+
renderHook(() => useFlickerDetector(mockRef, 25));
|
|
86
|
+
expect(mockMeasureElement).not.toHaveBeenCalled();
|
|
87
|
+
expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
|
|
88
|
+
expect(mockAppEventsEmit).not.toHaveBeenCalled();
|
|
89
|
+
});
|
|
90
|
+
it('should re-evaluate on re-render', () => {
|
|
91
|
+
// Start with a valid height
|
|
92
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 20 });
|
|
93
|
+
const { rerender } = renderHook(() => useFlickerDetector(mockRef, 25));
|
|
94
|
+
expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
|
|
95
|
+
// Now, simulate a re-render where the height is too great
|
|
96
|
+
mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
|
|
97
|
+
rerender();
|
|
98
|
+
expect(mockRecordFlickerFrame).toHaveBeenCalledTimes(1);
|
|
99
|
+
expect(mockAppEventsEmit).toHaveBeenCalledTimes(1);
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
//# sourceMappingURL=useFlickerDetector.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useFlickerDetector.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFlickerDetector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import type { LoadedSettings } from '../../config/settings.js';
|
|
7
7
|
import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
|
|
8
|
-
|
|
8
|
+
import { type HistoryItemWithoutId } from '../types.js';
|
|
9
|
+
export declare const useFolderTrust: (settings: LoadedSettings, onTrustChange: (isTrusted: boolean | undefined) => void, addItem: (item: HistoryItemWithoutId, timestamp: number) => number) => {
|
|
9
10
|
isTrusted: boolean | undefined;
|
|
10
11
|
isFolderTrustDialogOpen: boolean;
|
|
11
12
|
handleFolderTrustSelect: (choice: FolderTrustChoice) => void;
|
|
@@ -3,21 +3,30 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { useState, useCallback, useEffect } from 'react';
|
|
6
|
+
import { useState, useCallback, useEffect, useRef } from 'react';
|
|
7
7
|
import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
|
|
8
8
|
import { loadTrustedFolders, TrustLevel, isWorkspaceTrusted, } from '../../config/trustedFolders.js';
|
|
9
9
|
import * as process from 'node:process';
|
|
10
|
-
|
|
10
|
+
import { MessageType } from '../types.js';
|
|
11
|
+
export const useFolderTrust = (settings, onTrustChange, addItem) => {
|
|
11
12
|
const [isTrusted, setIsTrusted] = useState(undefined);
|
|
12
13
|
const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(false);
|
|
13
14
|
const [isRestarting, setIsRestarting] = useState(false);
|
|
15
|
+
const startupMessageSent = useRef(false);
|
|
14
16
|
const folderTrust = settings.merged.security?.folderTrust?.enabled;
|
|
15
17
|
useEffect(() => {
|
|
16
18
|
const { isTrusted: trusted } = isWorkspaceTrusted(settings.merged);
|
|
17
19
|
setIsTrusted(trusted);
|
|
18
20
|
setIsFolderTrustDialogOpen(trusted === undefined);
|
|
19
21
|
onTrustChange(trusted);
|
|
20
|
-
|
|
22
|
+
if (trusted === false && !startupMessageSent.current) {
|
|
23
|
+
addItem({
|
|
24
|
+
type: MessageType.INFO,
|
|
25
|
+
text: 'This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.',
|
|
26
|
+
}, Date.now());
|
|
27
|
+
startupMessageSent.current = true;
|
|
28
|
+
}
|
|
29
|
+
}, [folderTrust, onTrustChange, settings.merged, addItem]);
|
|
21
30
|
const handleFolderTrustSelect = useCallback((choice) => {
|
|
22
31
|
const trustedFolders = loadTrustedFolders();
|
|
23
32
|
const cwd = process.cwd();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"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"}
|