@google/gemini-cli 0.24.0-preview.3 → 0.25.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/README.md +1 -1
- package/dist/package.json +2 -2
- package/dist/src/commands/extensions/configure.d.ts +13 -0
- package/dist/src/commands/extensions/configure.js +124 -0
- package/dist/src/commands/extensions/configure.js.map +1 -0
- package/dist/src/commands/extensions/configure.test.d.ts +1 -0
- package/dist/src/commands/extensions/configure.test.js +197 -0
- package/dist/src/commands/extensions/configure.test.js.map +1 -0
- package/dist/src/commands/extensions/utils.d.ts +2 -1
- package/dist/src/commands/extensions/utils.js +5 -1
- package/dist/src/commands/extensions/utils.js.map +1 -1
- package/dist/src/commands/extensions.js +2 -2
- package/dist/src/commands/extensions.js.map +1 -1
- package/dist/src/commands/skills/disable.d.ts +2 -2
- package/dist/src/commands/skills/disable.js +9 -11
- package/dist/src/commands/skills/disable.js.map +1 -1
- package/dist/src/commands/skills/disable.test.js +8 -8
- package/dist/src/commands/skills/disable.test.js.map +1 -1
- package/dist/src/commands/skills/enable.d.ts +0 -2
- package/dist/src/commands/skills/enable.js +9 -21
- package/dist/src/commands/skills/enable.js.map +1 -1
- package/dist/src/commands/skills/enable.test.js +39 -12
- package/dist/src/commands/skills/enable.test.js.map +1 -1
- package/dist/src/commands/skills/install.d.ts +14 -0
- package/dist/src/commands/skills/install.js +61 -0
- package/dist/src/commands/skills/install.js.map +1 -0
- package/dist/src/commands/skills/install.test.d.ts +6 -0
- package/dist/src/commands/skills/install.test.js +57 -0
- package/dist/src/commands/skills/install.test.js.map +1 -0
- package/dist/src/commands/skills/list.d.ts +3 -1
- package/dist/src/commands/skills/list.js +21 -7
- package/dist/src/commands/skills/list.js.map +1 -1
- package/dist/src/commands/skills/list.test.js +38 -4
- package/dist/src/commands/skills/list.test.js.map +1 -1
- package/dist/src/commands/skills/uninstall.d.ts +13 -0
- package/dist/src/commands/skills/uninstall.js +56 -0
- package/dist/src/commands/skills/uninstall.js.map +1 -0
- package/dist/src/commands/skills/uninstall.test.d.ts +6 -0
- package/dist/src/commands/skills/uninstall.test.js +61 -0
- package/dist/src/commands/skills/uninstall.test.js.map +1 -0
- package/dist/src/commands/skills.js +4 -0
- package/dist/src/commands/skills.js.map +1 -1
- package/dist/src/config/config.js +11 -4
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +33 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager-agents.test.d.ts +6 -0
- package/dist/src/config/extension-manager-agents.test.js +115 -0
- package/dist/src/config/extension-manager-agents.test.js.map +1 -0
- package/dist/src/config/extension-manager-scope.test.js +155 -0
- package/dist/src/config/extension-manager-scope.test.js.map +1 -0
- package/dist/src/config/extension-manager-skills.test.js +95 -43
- package/dist/src/config/extension-manager-skills.test.js.map +1 -1
- package/dist/src/config/extension-manager.js +63 -15
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +75 -1
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/extensionSettings.d.ts +5 -4
- package/dist/src/config/extensions/extensionSettings.js +20 -14
- package/dist/src/config/extensions/extensionSettings.js.map +1 -1
- package/dist/src/config/extensions/extensionSettings.test.js +8 -8
- package/dist/src/config/extensions/extensionSettings.test.js.map +1 -1
- package/dist/src/config/extensions/extensionUpdates.test.js +5 -21
- package/dist/src/config/extensions/extensionUpdates.test.js.map +1 -1
- package/dist/src/config/extensions/storage.js +2 -2
- package/dist/src/config/extensions/storage.js.map +1 -1
- package/dist/src/config/keyBindings.d.ts +14 -2
- package/dist/src/config/keyBindings.js +85 -10
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/settings.d.ts +3 -0
- package/dist/src/config/settings.js +31 -3
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +146 -0
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +86 -12
- package/dist/src/config/settingsSchema.js +122 -13
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settings_validation_warning.test.js +10 -5
- package/dist/src/config/settings_validation_warning.test.js.map +1 -1
- package/dist/src/config/trustedFolders.js +1 -2
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.js +7 -0
- package/dist/src/config/trustedFolders.test.js.map +1 -1
- package/dist/src/gemini.js +71 -58
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +36 -83
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +2 -0
- package/dist/src/gemini_cleanup.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/nonInteractiveCli.js +2 -2
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +2 -1
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +47 -7
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +55 -1
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.js +13 -11
- package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.test.js +93 -61
- package/dist/src/services/prompt-processors/shellProcessor.test.js.map +1 -1
- package/dist/src/test-utils/render.js +1 -0
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +125 -70
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +214 -41
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.d.ts +4 -1
- package/dist/src/ui/auth/AuthDialog.js +8 -2
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +17 -0
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.d.ts +10 -0
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.js +27 -0
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.js.map +1 -0
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.d.ts +6 -0
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js +68 -0
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js.map +1 -0
- package/dist/src/ui/commands/aboutCommand.js +1 -1
- package/dist/src/ui/commands/aboutCommand.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.test.js +4 -4
- package/dist/src/ui/commands/aboutCommand.test.js.map +1 -1
- package/dist/src/ui/commands/agentsCommand.d.ts +7 -0
- package/dist/src/ui/commands/agentsCommand.js +79 -0
- package/dist/src/ui/commands/agentsCommand.js.map +1 -0
- package/dist/src/ui/commands/agentsCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/agentsCommand.test.js +91 -0
- package/dist/src/ui/commands/agentsCommand.test.js.map +1 -0
- package/dist/src/ui/commands/bugCommand.js +27 -4
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.test.js +70 -2
- package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.d.ts +1 -2
- package/dist/src/ui/commands/chatCommand.js +39 -31
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.test.js +80 -53
- package/dist/src/ui/commands/chatCommand.test.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +7 -11
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.test.js +4 -0
- package/dist/src/ui/commands/clearCommand.test.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +9 -9
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.test.js +9 -9
- package/dist/src/ui/commands/directoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +100 -32
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.test.js +102 -35
- package/dist/src/ui/commands/extensionsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/helpCommand.js +1 -1
- package/dist/src/ui/commands/helpCommand.js.map +1 -1
- package/dist/src/ui/commands/helpCommand.test.js +1 -1
- package/dist/src/ui/commands/helpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.js +154 -19
- package/dist/src/ui/commands/hooksCommand.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.test.js +188 -17
- package/dist/src/ui/commands/hooksCommand.test.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +6 -6
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js +3 -3
- package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.js +18 -43
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.test.js +85 -15
- package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.js +47 -34
- package/dist/src/ui/commands/skillsCommand.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.test.js +116 -13
- package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/statsCommand.js +4 -4
- package/dist/src/ui/commands/statsCommand.js.map +1 -1
- package/dist/src/ui/commands/statsCommand.test.js +4 -4
- package/dist/src/ui/commands/statsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/toolsCommand.js +2 -2
- package/dist/src/ui/commands/toolsCommand.js.map +1 -1
- package/dist/src/ui/commands/toolsCommand.test.js +2 -2
- package/dist/src/ui/commands/toolsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +2 -1
- package/dist/src/ui/commands/types.js +1 -0
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +1 -0
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +2 -2
- package/dist/src/ui/components/DialogManager.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.js +2 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +21 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +18 -7
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +64 -3
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +12 -10
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/MainContent.test.js +19 -9
- package/dist/src/ui/components/MainContent.test.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +1 -1
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.d.ts +2 -2
- package/dist/src/ui/components/MultiFolderTrustDialog.js +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js +2 -2
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Notifications.js +2 -3
- package/dist/src/ui/components/Notifications.js.map +1 -1
- package/dist/src/ui/components/Notifications.test.js +1 -0
- package/dist/src/ui/components/Notifications.test.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.d.ts +1 -3
- package/dist/src/ui/components/ProQuotaDialog.js +8 -21
- package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +31 -11
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +5 -4
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.js +2 -2
- package/dist/src/ui/components/StatusDisplay.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.test.js +1 -0
- package/dist/src/ui/components/StatusDisplay.test.js.map +1 -1
- package/dist/src/ui/components/StickyHeader.d.ts +2 -0
- package/dist/src/ui/components/StickyHeader.js +1 -1
- package/dist/src/ui/components/StickyHeader.js.map +1 -1
- package/dist/src/ui/components/SuggestionsDisplay.js +7 -2
- package/dist/src/ui/components/SuggestionsDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.js +5 -13
- package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.js +26 -17
- package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -1
- package/dist/src/ui/components/messages/ShellToolMessage.js +8 -5
- package/dist/src/ui/components/messages/ShellToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +1 -5
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.js +6 -2
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js +1 -0
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.js +22 -16
- package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js +36 -18
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolStickyHeaderRegression.test.d.ts +6 -0
- package/dist/src/ui/components/messages/ToolStickyHeaderRegression.test.js +134 -0
- package/dist/src/ui/components/messages/ToolStickyHeaderRegression.test.js.map +1 -0
- package/dist/src/ui/components/shared/MaxSizedBox.d.ts +2 -38
- package/dist/src/ui/components/shared/MaxSizedBox.js +34 -419
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js +48 -133
- package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.d.ts +4 -4
- package/dist/src/ui/components/shared/text-buffer.js +35 -38
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/views/AgentsStatus.d.ts +13 -0
- package/dist/src/ui/components/views/AgentsStatus.js +23 -0
- package/dist/src/ui/components/views/AgentsStatus.js.map +1 -0
- package/dist/src/ui/components/views/ExtensionsList.js +2 -1
- package/dist/src/ui/components/views/ExtensionsList.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.test.js +12 -1
- package/dist/src/ui/components/views/ExtensionsList.test.js.map +1 -1
- package/dist/src/ui/components/views/HooksList.js +25 -16
- package/dist/src/ui/components/views/HooksList.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.js +9 -7
- package/dist/src/ui/components/views/SkillsList.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.test.js +15 -0
- package/dist/src/ui/components/views/SkillsList.test.js.map +1 -1
- package/dist/src/ui/constants/tips.js +1 -1
- package/dist/src/ui/constants/tips.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 +30 -25
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +59 -9
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +15 -1
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.d.ts +6 -0
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.js +183 -0
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.js.map +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.js +31 -0
- package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion_agents.test.d.ts +6 -0
- package/dist/src/ui/hooks/useAtCompletion_agents.test.js +85 -0
- package/dist/src/ui/hooks/useAtCompletion_agents.test.js.map +1 -0
- package/dist/src/ui/hooks/useAutoAcceptIndicator.d.ts +2 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js +5 -4
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.d.ts +1 -0
- package/dist/src/ui/hooks/useCommandCompletion.js +13 -8
- package/dist/src/ui/hooks/useCommandCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js +88 -2
- package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +18 -2
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +2 -1
- package/dist/src/ui/hooks/useGeminiStream.js +40 -20
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +132 -12
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useHistoryManager.d.ts +1 -1
- package/dist/src/ui/hooks/useHistoryManager.js +1 -1
- package/dist/src/ui/hooks/useHistoryManager.js.map +1 -1
- package/dist/src/ui/hooks/useHistoryManager.test.js +16 -0
- package/dist/src/ui/hooks/useHistoryManager.test.js.map +1 -1
- package/dist/src/ui/hooks/useIncludeDirsTrust.js +2 -2
- package/dist/src/ui/hooks/useIncludeDirsTrust.js.map +1 -1
- package/dist/src/ui/hooks/useIncludeDirsTrust.test.js +2 -2
- package/dist/src/ui/hooks/useIncludeDirsTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +2 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +7 -3
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +14 -4
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +10 -3
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.d.ts +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js +2 -2
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +15 -10
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +13 -8
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/hooks/useRewind.d.ts +14 -0
- package/dist/src/ui/hooks/useRewind.js +31 -0
- package/dist/src/ui/hooks/useRewind.js.map +1 -0
- package/dist/src/ui/hooks/useRewind.test.d.ts +6 -0
- package/dist/src/ui/hooks/useRewind.test.js +100 -0
- package/dist/src/ui/hooks/useRewind.test.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js +10 -2
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +79 -53
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.js +2 -3
- package/dist/src/ui/themes/theme-manager.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.test.js +7 -0
- package/dist/src/ui/themes/theme-manager.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +10 -3
- package/dist/src/ui/types.js +3 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +2 -2
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.js +1 -3
- package/dist/src/ui/utils/commandUtils.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.test.js +15 -2
- package/dist/src/ui/utils/commandUtils.test.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.js +4 -4
- package/dist/src/ui/utils/directoryUtils.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.test.js +1 -0
- package/dist/src/ui/utils/directoryUtils.test.js.map +1 -1
- package/dist/src/ui/utils/historyExportUtils.d.ts +21 -0
- package/dist/src/ui/utils/historyExportUtils.js +59 -0
- package/dist/src/ui/utils/historyExportUtils.js.map +1 -0
- package/dist/src/ui/utils/rewindFileOps.d.ts +47 -0
- package/dist/src/ui/utils/rewindFileOps.js +190 -0
- package/dist/src/ui/utils/rewindFileOps.js.map +1 -0
- package/dist/src/ui/utils/rewindFileOps.test.d.ts +6 -0
- package/dist/src/ui/utils/rewindFileOps.test.js +375 -0
- package/dist/src/ui/utils/rewindFileOps.test.js.map +1 -0
- package/dist/src/ui/utils/terminalCapabilityManager.d.ts +3 -10
- package/dist/src/ui/utils/terminalCapabilityManager.js +11 -35
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.test.js +13 -34
- package/dist/src/ui/utils/terminalCapabilityManager.test.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.d.ts +1 -1
- package/dist/src/ui/utils/terminalSetup.js +19 -4
- package/dist/src/ui/utils/terminalSetup.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.test.js +7 -0
- package/dist/src/ui/utils/terminalSetup.test.js.map +1 -1
- package/dist/src/ui/utils/textUtils.js +9 -1
- package/dist/src/ui/utils/textUtils.js.map +1 -1
- package/dist/src/ui/utils/textUtils.test.js +12 -1
- package/dist/src/ui/utils/textUtils.test.js.map +1 -1
- package/dist/src/utils/activityLogger.d.ts +47 -0
- package/dist/src/utils/activityLogger.js +297 -0
- package/dist/src/utils/activityLogger.js.map +1 -0
- package/dist/src/utils/cleanup.d.ts +5 -0
- package/dist/src/utils/cleanup.js +17 -0
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/cleanup.test.js +21 -31
- package/dist/src/utils/cleanup.test.js.map +1 -1
- package/dist/src/utils/resolvePath.js +3 -3
- package/dist/src/utils/resolvePath.js.map +1 -1
- package/dist/src/utils/resolvePath.test.js +3 -0
- package/dist/src/utils/resolvePath.test.js.map +1 -1
- package/dist/src/utils/sandbox.js +17 -10
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sandbox.test.js +17 -5
- package/dist/src/utils/sandbox.test.js.map +1 -1
- package/dist/src/utils/sessionCleanup.js +12 -0
- package/dist/src/utils/sessionCleanup.js.map +1 -1
- package/dist/src/utils/skillSettings.d.ts +33 -0
- package/dist/src/utils/skillSettings.js +101 -0
- package/dist/src/utils/skillSettings.js.map +1 -0
- package/dist/src/utils/skillUtils.d.ts +29 -0
- package/dist/src/utils/skillUtils.js +144 -0
- package/dist/src/utils/skillUtils.js.map +1 -0
- package/dist/src/utils/skillUtils.test.d.ts +6 -0
- package/dist/src/utils/skillUtils.test.js +57 -0
- package/dist/src/utils/skillUtils.test.js.map +1 -0
- package/dist/src/utils/userStartupWarnings.d.ts +2 -1
- package/dist/src/utils/userStartupWarnings.js +17 -7
- package/dist/src/utils/userStartupWarnings.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.test.js +37 -6
- package/dist/src/utils/userStartupWarnings.test.js.map +1 -1
- package/dist/src/utils/windowTitle.d.ts +13 -4
- package/dist/src/utils/windowTitle.js +65 -7
- package/dist/src/utils/windowTitle.js.map +1 -1
- package/dist/src/utils/windowTitle.test.js +183 -40
- package/dist/src/utils/windowTitle.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.24.0-preview.2.tgz +0 -0
- package/dist/src/commands/extensions/settings.d.ts +0 -7
- package/dist/src/commands/extensions/settings.js +0 -115
- package/dist/src/commands/extensions/settings.js.map +0 -1
- package/dist/src/commands/extensions/settings.test.js +0 -170
- package/dist/src/commands/extensions/settings.test.js.map +0 -1
- /package/dist/src/{commands/extensions/settings.test.d.ts → config/extension-manager-scope.test.d.ts} +0 -0
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import * as fs from 'node:fs/promises';
|
|
8
|
+
import * as path from 'node:path';
|
|
9
|
+
import * as os from 'node:os';
|
|
10
|
+
import { installSkill } from './skillUtils.js';
|
|
11
|
+
describe('skillUtils', () => {
|
|
12
|
+
let tempDir;
|
|
13
|
+
const projectRoot = path.resolve(__dirname, '../../../../../');
|
|
14
|
+
beforeEach(async () => {
|
|
15
|
+
tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'skill-utils-test-'));
|
|
16
|
+
vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
|
|
17
|
+
});
|
|
18
|
+
afterEach(async () => {
|
|
19
|
+
await fs.rm(tempDir, { recursive: true, force: true });
|
|
20
|
+
vi.restoreAllMocks();
|
|
21
|
+
});
|
|
22
|
+
it('should successfully install from a .skill file', async () => {
|
|
23
|
+
const skillPath = path.join(projectRoot, 'weather-skill.skill');
|
|
24
|
+
// Ensure the file exists
|
|
25
|
+
const exists = await fs.stat(skillPath).catch(() => null);
|
|
26
|
+
if (!exists) {
|
|
27
|
+
// If we can't find it in CI or other environments, we skip or use a mock.
|
|
28
|
+
// For now, since it exists in the user's environment, this test will pass there.
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const skills = await installSkill(skillPath, 'workspace', undefined, () => { });
|
|
32
|
+
expect(skills.length).toBeGreaterThan(0);
|
|
33
|
+
expect(skills[0].name).toBe('weather-skill');
|
|
34
|
+
// Verify it was copied to the workspace skills dir
|
|
35
|
+
const installedPath = path.join(tempDir, '.gemini/skills', 'weather-skill');
|
|
36
|
+
const installedExists = await fs.stat(installedPath).catch(() => null);
|
|
37
|
+
expect(installedExists?.isDirectory()).toBe(true);
|
|
38
|
+
const skillMdExists = await fs
|
|
39
|
+
.stat(path.join(installedPath, 'SKILL.md'))
|
|
40
|
+
.catch(() => null);
|
|
41
|
+
expect(skillMdExists?.isFile()).toBe(true);
|
|
42
|
+
});
|
|
43
|
+
it('should successfully install from a local directory', async () => {
|
|
44
|
+
// Create a mock skill directory
|
|
45
|
+
const mockSkillDir = path.join(tempDir, 'mock-skill-source');
|
|
46
|
+
const skillSubDir = path.join(mockSkillDir, 'test-skill');
|
|
47
|
+
await fs.mkdir(skillSubDir, { recursive: true });
|
|
48
|
+
await fs.writeFile(path.join(skillSubDir, 'SKILL.md'), '---\nname: test-skill\ndescription: test\n---\nbody');
|
|
49
|
+
const skills = await installSkill(mockSkillDir, 'workspace', undefined, () => { });
|
|
50
|
+
expect(skills.length).toBe(1);
|
|
51
|
+
expect(skills[0].name).toBe('test-skill');
|
|
52
|
+
const installedPath = path.join(tempDir, '.gemini/skills', 'test-skill');
|
|
53
|
+
const installedExists = await fs.stat(installedPath).catch(() => null);
|
|
54
|
+
expect(installedExists?.isDirectory()).toBe(true);
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=skillUtils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skillUtils.test.js","sourceRoot":"","sources":["../../../src/utils/skillUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,5 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
|
|
6
|
+
import type { Settings } from '../config/settingsSchema.js';
|
|
7
|
+
export declare function getUserStartupWarnings(settings: Settings, workspaceRoot?: string): Promise<string[]>;
|
|
@@ -4,19 +4,29 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import fs from 'node:fs/promises';
|
|
7
|
-
import * as os from 'node:os';
|
|
8
7
|
import path from 'node:path';
|
|
8
|
+
import process from 'node:process';
|
|
9
|
+
import { homedir } from '@google/gemini-cli-core';
|
|
10
|
+
import { isFolderTrustEnabled, isWorkspaceTrusted, } from '../config/trustedFolders.js';
|
|
9
11
|
// Individual warning checks
|
|
10
12
|
const homeDirectoryCheck = {
|
|
11
13
|
id: 'home-directory',
|
|
12
|
-
check: async (workspaceRoot) => {
|
|
14
|
+
check: async (workspaceRoot, settings) => {
|
|
15
|
+
if (settings.ui?.showHomeDirectoryWarning === false) {
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
13
18
|
try {
|
|
14
19
|
const [workspaceRealPath, homeRealPath] = await Promise.all([
|
|
15
20
|
fs.realpath(workspaceRoot),
|
|
16
|
-
fs.realpath(
|
|
21
|
+
fs.realpath(homedir()),
|
|
17
22
|
]);
|
|
18
23
|
if (workspaceRealPath === homeRealPath) {
|
|
19
|
-
|
|
24
|
+
// If folder trust is enabled and the user trusts the home directory, don't show the warning.
|
|
25
|
+
if (isFolderTrustEnabled(settings) &&
|
|
26
|
+
isWorkspaceTrusted(settings).isTrusted) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
return 'Warning you are running Gemini CLI in your home directory.\nThis warning can be disabled in /settings';
|
|
20
30
|
}
|
|
21
31
|
return null;
|
|
22
32
|
}
|
|
@@ -27,7 +37,7 @@ const homeDirectoryCheck = {
|
|
|
27
37
|
};
|
|
28
38
|
const rootDirectoryCheck = {
|
|
29
39
|
id: 'root-directory',
|
|
30
|
-
check: async (workspaceRoot) => {
|
|
40
|
+
check: async (workspaceRoot, _settings) => {
|
|
31
41
|
try {
|
|
32
42
|
const workspaceRealPath = await fs.realpath(workspaceRoot);
|
|
33
43
|
const errorMessage = 'Warning: You are running Gemini CLI in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.';
|
|
@@ -47,8 +57,8 @@ const WARNING_CHECKS = [
|
|
|
47
57
|
homeDirectoryCheck,
|
|
48
58
|
rootDirectoryCheck,
|
|
49
59
|
];
|
|
50
|
-
export async function getUserStartupWarnings(workspaceRoot = process.cwd()) {
|
|
51
|
-
const results = await Promise.all(WARNING_CHECKS.map((check) => check.check(workspaceRoot)));
|
|
60
|
+
export async function getUserStartupWarnings(settings, workspaceRoot = process.cwd()) {
|
|
61
|
+
const results = await Promise.all(WARNING_CHECKS.map((check) => check.check(workspaceRoot, settings)));
|
|
52
62
|
return results.filter((msg) => msg !== null);
|
|
53
63
|
}
|
|
54
64
|
//# sourceMappingURL=userStartupWarnings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userStartupWarnings.js","sourceRoot":"","sources":["../../../src/utils/userStartupWarnings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"userStartupWarnings.js","sourceRoot":"","sources":["../../../src/utils/userStartupWarnings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AAOrC,4BAA4B;AAC5B,MAAM,kBAAkB,GAAiB;IACvC,EAAE,EAAE,gBAAgB;IACpB,KAAK,EAAE,KAAK,EAAE,aAAqB,EAAE,QAAkB,EAAE,EAAE;QACzD,IAAI,QAAQ,CAAC,EAAE,EAAE,wBAAwB,KAAK,KAAK,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,MAAM,CAAC,iBAAiB,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1D,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAC1B,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aACvB,CAAC,CAAC;YAEH,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;gBACvC,6FAA6F;gBAC7F,IACE,oBAAoB,CAAC,QAAQ,CAAC;oBAC9B,kBAAkB,CAAC,QAAQ,CAAC,CAAC,SAAS,EACtC,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,uGAAuG,CAAC;YACjH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,IAAa,EAAE,CAAC;YACvB,OAAO,oEAAoE,CAAC;QAC9E,CAAC;IACH,CAAC;CACF,CAAC;AAEF,MAAM,kBAAkB,GAAiB;IACvC,EAAE,EAAE,gBAAgB;IACpB,KAAK,EAAE,KAAK,EAAE,aAAqB,EAAE,SAAmB,EAAE,EAAE;QAC1D,IAAI,CAAC;YACH,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC3D,MAAM,YAAY,GAChB,sLAAsL,CAAC;YAEzL,gCAAgC;YAChC,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,iBAAiB,EAAE,CAAC;gBAC1D,OAAO,YAAY,CAAC;YACtB,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,IAAa,EAAE,CAAC;YACvB,OAAO,oEAAoE,CAAC;QAC9E,CAAC;IACH,CAAC;CACF,CAAC;AAEF,qBAAqB;AACrB,MAAM,cAAc,GAA4B;IAC9C,kBAAkB;IAClB,kBAAkB;CACnB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAkB,EAClB,gBAAwB,OAAO,CAAC,GAAG,EAAE;IAErC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CACpE,CAAC;IACF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { getUserStartupWarnings } from './userStartupWarnings.js';
|
|
|
8
8
|
import * as os from 'node:os';
|
|
9
9
|
import fs from 'node:fs/promises';
|
|
10
10
|
import path from 'node:path';
|
|
11
|
+
import { isFolderTrustEnabled, isWorkspaceTrusted, } from '../config/trustedFolders.js';
|
|
11
12
|
// Mock os.homedir to control the home directory in tests
|
|
12
13
|
vi.mock('os', async (importOriginal) => {
|
|
13
14
|
const actualOs = await importOriginal();
|
|
@@ -16,6 +17,17 @@ vi.mock('os', async (importOriginal) => {
|
|
|
16
17
|
homedir: vi.fn(),
|
|
17
18
|
};
|
|
18
19
|
});
|
|
20
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
21
|
+
const actual = await importOriginal();
|
|
22
|
+
return {
|
|
23
|
+
...actual,
|
|
24
|
+
homedir: () => os.homedir(),
|
|
25
|
+
};
|
|
26
|
+
});
|
|
27
|
+
vi.mock('../config/trustedFolders.js', () => ({
|
|
28
|
+
isFolderTrustEnabled: vi.fn(),
|
|
29
|
+
isWorkspaceTrusted: vi.fn(),
|
|
30
|
+
}));
|
|
19
31
|
describe('getUserStartupWarnings', () => {
|
|
20
32
|
let testRootDir;
|
|
21
33
|
let homeDir;
|
|
@@ -24,6 +36,11 @@ describe('getUserStartupWarnings', () => {
|
|
|
24
36
|
homeDir = path.join(testRootDir, 'home');
|
|
25
37
|
await fs.mkdir(homeDir, { recursive: true });
|
|
26
38
|
vi.mocked(os.homedir).mockReturnValue(homeDir);
|
|
39
|
+
vi.mocked(isFolderTrustEnabled).mockReturnValue(false);
|
|
40
|
+
vi.mocked(isWorkspaceTrusted).mockReturnValue({
|
|
41
|
+
isTrusted: false,
|
|
42
|
+
source: undefined,
|
|
43
|
+
});
|
|
27
44
|
});
|
|
28
45
|
afterEach(async () => {
|
|
29
46
|
await fs.rm(testRootDir, { recursive: true, force: true });
|
|
@@ -31,34 +48,48 @@ describe('getUserStartupWarnings', () => {
|
|
|
31
48
|
});
|
|
32
49
|
describe('home directory check', () => {
|
|
33
50
|
it('should return a warning when running in home directory', async () => {
|
|
34
|
-
const warnings = await getUserStartupWarnings(homeDir);
|
|
35
|
-
expect(warnings).toContainEqual(expect.stringContaining('home directory'));
|
|
51
|
+
const warnings = await getUserStartupWarnings({}, homeDir);
|
|
52
|
+
expect(warnings).toContainEqual(expect.stringContaining('Warning you are running Gemini CLI in your home directory'));
|
|
53
|
+
expect(warnings).toContainEqual(expect.stringContaining('warning can be disabled in /settings'));
|
|
36
54
|
});
|
|
37
55
|
it('should not return a warning when running in a project directory', async () => {
|
|
38
56
|
const projectDir = path.join(testRootDir, 'project');
|
|
39
57
|
await fs.mkdir(projectDir);
|
|
40
|
-
const warnings = await getUserStartupWarnings(projectDir);
|
|
58
|
+
const warnings = await getUserStartupWarnings({}, projectDir);
|
|
59
|
+
expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
|
|
60
|
+
});
|
|
61
|
+
it('should not return a warning when showHomeDirectoryWarning is false', async () => {
|
|
62
|
+
const warnings = await getUserStartupWarnings({ ui: { showHomeDirectoryWarning: false } }, homeDir);
|
|
63
|
+
expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
|
|
64
|
+
});
|
|
65
|
+
it('should not return a warning when folder trust is enabled and workspace is trusted', async () => {
|
|
66
|
+
vi.mocked(isFolderTrustEnabled).mockReturnValue(true);
|
|
67
|
+
vi.mocked(isWorkspaceTrusted).mockReturnValue({
|
|
68
|
+
isTrusted: true,
|
|
69
|
+
source: 'file',
|
|
70
|
+
});
|
|
71
|
+
const warnings = await getUserStartupWarnings({}, homeDir);
|
|
41
72
|
expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
|
|
42
73
|
});
|
|
43
74
|
});
|
|
44
75
|
describe('root directory check', () => {
|
|
45
76
|
it('should return a warning when running in a root directory', async () => {
|
|
46
77
|
const rootDir = path.parse(testRootDir).root;
|
|
47
|
-
const warnings = await getUserStartupWarnings(rootDir);
|
|
78
|
+
const warnings = await getUserStartupWarnings({}, rootDir);
|
|
48
79
|
expect(warnings).toContainEqual(expect.stringContaining('root directory'));
|
|
49
80
|
expect(warnings).toContainEqual(expect.stringContaining('folder structure will be used'));
|
|
50
81
|
});
|
|
51
82
|
it('should not return a warning when running in a non-root directory', async () => {
|
|
52
83
|
const projectDir = path.join(testRootDir, 'project');
|
|
53
84
|
await fs.mkdir(projectDir);
|
|
54
|
-
const warnings = await getUserStartupWarnings(projectDir);
|
|
85
|
+
const warnings = await getUserStartupWarnings({}, projectDir);
|
|
55
86
|
expect(warnings).not.toContainEqual(expect.stringContaining('root directory'));
|
|
56
87
|
});
|
|
57
88
|
});
|
|
58
89
|
describe('error handling', () => {
|
|
59
90
|
it('should handle errors when checking directory', async () => {
|
|
60
91
|
const nonExistentPath = path.join(testRootDir, 'non-existent');
|
|
61
|
-
const warnings = await getUserStartupWarnings(nonExistentPath);
|
|
92
|
+
const warnings = await getUserStartupWarnings({}, nonExistentPath);
|
|
62
93
|
const expectedWarning = 'Could not verify the current directory due to a file system error.';
|
|
63
94
|
expect(warnings).toEqual([expectedWarning, expectedWarning]);
|
|
64
95
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userStartupWarnings.test.js","sourceRoot":"","sources":["../../../src/utils/userStartupWarnings.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"userStartupWarnings.test.js","sourceRoot":"","sources":["../../../src/utils/userStartupWarnings.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,19 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { StreamingState } from '../ui/types.js';
|
|
7
|
+
export interface TerminalTitleOptions {
|
|
8
|
+
streamingState: StreamingState;
|
|
9
|
+
thoughtSubject?: string;
|
|
10
|
+
isConfirming: boolean;
|
|
11
|
+
folderName: string;
|
|
12
|
+
showThoughts: boolean;
|
|
13
|
+
useDynamicTitle: boolean;
|
|
14
|
+
}
|
|
6
15
|
/**
|
|
7
|
-
* Computes the window title
|
|
16
|
+
* Computes the dynamic terminal window title based on the current CLI state.
|
|
8
17
|
*
|
|
9
|
-
* @param
|
|
10
|
-
* @returns
|
|
18
|
+
* @param options - The current state of the CLI and environment context
|
|
19
|
+
* @returns A formatted string padded to 80 characters for the terminal title
|
|
11
20
|
*/
|
|
12
|
-
export declare function
|
|
21
|
+
export declare function computeTerminalTitle({ streamingState, thoughtSubject, isConfirming, folderName, showThoughts, useDynamicTitle, }: TerminalTitleOptions): string;
|
|
@@ -3,17 +3,75 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { StreamingState } from '../ui/types.js';
|
|
7
|
+
function truncate(text, maxLen) {
|
|
8
|
+
if (text.length <= maxLen) {
|
|
9
|
+
return text;
|
|
10
|
+
}
|
|
11
|
+
return text.substring(0, maxLen - 1) + '…';
|
|
12
|
+
}
|
|
6
13
|
/**
|
|
7
|
-
* Computes the window title
|
|
14
|
+
* Computes the dynamic terminal window title based on the current CLI state.
|
|
8
15
|
*
|
|
9
|
-
* @param
|
|
10
|
-
* @returns
|
|
16
|
+
* @param options - The current state of the CLI and environment context
|
|
17
|
+
* @returns A formatted string padded to 80 characters for the terminal title
|
|
11
18
|
*/
|
|
12
|
-
export function
|
|
13
|
-
const
|
|
19
|
+
export function computeTerminalTitle({ streamingState, thoughtSubject, isConfirming, folderName, showThoughts, useDynamicTitle, }) {
|
|
20
|
+
const MAX_LEN = 80;
|
|
21
|
+
// Use CLI_TITLE env var if available, otherwise use the provided folder name
|
|
22
|
+
let displayContext = process.env['CLI_TITLE'] || folderName;
|
|
23
|
+
if (!useDynamicTitle) {
|
|
24
|
+
const base = 'Gemini CLI ';
|
|
25
|
+
// Max context length is 80 - base.length - 2 (for brackets)
|
|
26
|
+
const maxContextLen = MAX_LEN - base.length - 2;
|
|
27
|
+
displayContext = truncate(displayContext, maxContextLen);
|
|
28
|
+
return `${base}(${displayContext})`.padEnd(MAX_LEN, ' ');
|
|
29
|
+
}
|
|
30
|
+
// Pre-calculate suffix but keep it flexible
|
|
31
|
+
const getSuffix = (context) => ` (${context})`;
|
|
32
|
+
let title;
|
|
33
|
+
if (isConfirming ||
|
|
34
|
+
streamingState === StreamingState.WaitingForConfirmation) {
|
|
35
|
+
const base = '✋ Action Required';
|
|
36
|
+
// Max context length is 80 - base.length - 3 (for ' (' and ')')
|
|
37
|
+
const maxContextLen = MAX_LEN - base.length - 3;
|
|
38
|
+
const context = truncate(displayContext, maxContextLen);
|
|
39
|
+
title = `${base}${getSuffix(context)}`;
|
|
40
|
+
}
|
|
41
|
+
else if (streamingState === StreamingState.Idle) {
|
|
42
|
+
const base = '◇ Ready';
|
|
43
|
+
// Max context length is 80 - base.length - 3 (for ' (' and ')')
|
|
44
|
+
const maxContextLen = MAX_LEN - base.length - 3;
|
|
45
|
+
const context = truncate(displayContext, maxContextLen);
|
|
46
|
+
title = `${base}${getSuffix(context)}`;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
// Active/Working state
|
|
50
|
+
const cleanSubject = showThoughts && thoughtSubject?.replace(/[\r\n]+/g, ' ').trim();
|
|
51
|
+
// If we have a thought subject and it's too long to fit with the suffix,
|
|
52
|
+
// we drop the suffix to maximize space for the thought.
|
|
53
|
+
// Otherwise, we keep the suffix.
|
|
54
|
+
const suffix = getSuffix(displayContext);
|
|
55
|
+
const suffixLen = suffix.length;
|
|
56
|
+
const canFitThoughtWithSuffix = cleanSubject
|
|
57
|
+
? cleanSubject.length + suffixLen + 3 <= MAX_LEN
|
|
58
|
+
: true;
|
|
59
|
+
let activeSuffix = '';
|
|
60
|
+
let maxStatusLen = MAX_LEN - 3; // Subtract icon prefix "✦ " (3 chars)
|
|
61
|
+
if (!cleanSubject || canFitThoughtWithSuffix) {
|
|
62
|
+
activeSuffix = suffix;
|
|
63
|
+
maxStatusLen -= activeSuffix.length;
|
|
64
|
+
}
|
|
65
|
+
const displayStatus = cleanSubject
|
|
66
|
+
? truncate(cleanSubject, maxStatusLen)
|
|
67
|
+
: 'Working…';
|
|
68
|
+
title = `✦ ${displayStatus}${activeSuffix}`;
|
|
69
|
+
}
|
|
14
70
|
// Remove control characters that could cause issues in terminal titles
|
|
15
|
-
return title.replace(
|
|
16
71
|
// eslint-disable-next-line no-control-regex
|
|
17
|
-
/[\x00-\x1F\x7F]/g, '');
|
|
72
|
+
const safeTitle = title.replace(/[\x00-\x1F\x7F]/g, '');
|
|
73
|
+
// Pad the title to a fixed width to prevent taskbar icon resizing/jitter.
|
|
74
|
+
// We also slice it to ensure it NEVER exceeds MAX_LEN.
|
|
75
|
+
return safeTitle.padEnd(MAX_LEN, ' ').substring(0, MAX_LEN);
|
|
18
76
|
}
|
|
19
77
|
//# sourceMappingURL=windowTitle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowTitle.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"windowTitle.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,47 +3,190 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { describe, it, expect, vi,
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
beforeEach(() => {
|
|
11
|
-
originalEnv = process.env;
|
|
12
|
-
vi.stubEnv('CLI_TITLE', undefined);
|
|
13
|
-
});
|
|
6
|
+
import { describe, it, expect, vi, afterEach } from 'vitest';
|
|
7
|
+
import { computeTerminalTitle } from './windowTitle.js';
|
|
8
|
+
import { StreamingState } from '../ui/types.js';
|
|
9
|
+
describe('computeTerminalTitle', () => {
|
|
14
10
|
afterEach(() => {
|
|
15
|
-
|
|
16
|
-
});
|
|
17
|
-
it(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
11
|
+
vi.unstubAllEnvs();
|
|
12
|
+
});
|
|
13
|
+
it.each([
|
|
14
|
+
{
|
|
15
|
+
description: 'idle state title with folder name',
|
|
16
|
+
args: {
|
|
17
|
+
streamingState: StreamingState.Idle,
|
|
18
|
+
isConfirming: false,
|
|
19
|
+
folderName: 'my-project',
|
|
20
|
+
showThoughts: false,
|
|
21
|
+
useDynamicTitle: true,
|
|
22
|
+
},
|
|
23
|
+
expected: '◇ Ready (my-project)',
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
description: 'legacy title when useDynamicTitle is false',
|
|
27
|
+
args: {
|
|
28
|
+
streamingState: StreamingState.Responding,
|
|
29
|
+
isConfirming: false,
|
|
30
|
+
folderName: 'my-project',
|
|
31
|
+
showThoughts: true,
|
|
32
|
+
useDynamicTitle: false,
|
|
33
|
+
},
|
|
34
|
+
expected: 'Gemini CLI (my-project)'.padEnd(80, ' '),
|
|
35
|
+
exact: true,
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
description: 'active state title with "Working…" when thoughts are disabled',
|
|
39
|
+
args: {
|
|
40
|
+
streamingState: StreamingState.Responding,
|
|
41
|
+
thoughtSubject: 'Reading files',
|
|
42
|
+
isConfirming: false,
|
|
43
|
+
folderName: 'my-project',
|
|
44
|
+
showThoughts: false,
|
|
45
|
+
useDynamicTitle: true,
|
|
46
|
+
},
|
|
47
|
+
expected: '✦ Working… (my-project)',
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
description: 'active state title with thought subject and suffix when thoughts are short enough',
|
|
51
|
+
args: {
|
|
52
|
+
streamingState: StreamingState.Responding,
|
|
53
|
+
thoughtSubject: 'Short thought',
|
|
54
|
+
isConfirming: false,
|
|
55
|
+
folderName: 'my-project',
|
|
56
|
+
showThoughts: true,
|
|
57
|
+
useDynamicTitle: true,
|
|
58
|
+
},
|
|
59
|
+
expected: '✦ Short thought (my-project)',
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
description: 'fallback active title with suffix if no thought subject is provided even when thoughts are enabled',
|
|
63
|
+
args: {
|
|
64
|
+
streamingState: StreamingState.Responding,
|
|
65
|
+
thoughtSubject: undefined,
|
|
66
|
+
isConfirming: false,
|
|
67
|
+
folderName: 'my-project',
|
|
68
|
+
showThoughts: true,
|
|
69
|
+
useDynamicTitle: true,
|
|
70
|
+
},
|
|
71
|
+
expected: '✦ Working… (my-project)'.padEnd(80, ' '),
|
|
72
|
+
exact: true,
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
description: 'action required state when confirming',
|
|
76
|
+
args: {
|
|
77
|
+
streamingState: StreamingState.Idle,
|
|
78
|
+
isConfirming: true,
|
|
79
|
+
folderName: 'my-project',
|
|
80
|
+
showThoughts: false,
|
|
81
|
+
useDynamicTitle: true,
|
|
82
|
+
},
|
|
83
|
+
expected: '✋ Action Required (my-project)',
|
|
84
|
+
},
|
|
85
|
+
])('should return $description', ({ args, expected, exact }) => {
|
|
86
|
+
const title = computeTerminalTitle(args);
|
|
87
|
+
if (exact) {
|
|
88
|
+
expect(title).toBe(expected);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
expect(title).toContain(expected);
|
|
92
|
+
}
|
|
93
|
+
expect(title.length).toBe(80);
|
|
94
|
+
});
|
|
95
|
+
it('should return active state title with thought subject and NO suffix when thoughts are very long', () => {
|
|
96
|
+
const longThought = 'A'.repeat(70);
|
|
97
|
+
const title = computeTerminalTitle({
|
|
98
|
+
streamingState: StreamingState.Responding,
|
|
99
|
+
thoughtSubject: longThought,
|
|
100
|
+
isConfirming: false,
|
|
101
|
+
folderName: 'my-project',
|
|
102
|
+
showThoughts: true,
|
|
103
|
+
useDynamicTitle: true,
|
|
104
|
+
});
|
|
105
|
+
expect(title).not.toContain('(my-project)');
|
|
106
|
+
expect(title).toContain('✦ AAAAAAAAAAAAAAAA');
|
|
107
|
+
expect(title.length).toBe(80);
|
|
108
|
+
});
|
|
109
|
+
it('should truncate long thought subjects when thoughts are enabled', () => {
|
|
110
|
+
const longThought = 'A'.repeat(100);
|
|
111
|
+
const title = computeTerminalTitle({
|
|
112
|
+
streamingState: StreamingState.Responding,
|
|
113
|
+
thoughtSubject: longThought,
|
|
114
|
+
isConfirming: false,
|
|
115
|
+
folderName: 'my-project',
|
|
116
|
+
showThoughts: true,
|
|
117
|
+
useDynamicTitle: true,
|
|
118
|
+
});
|
|
119
|
+
expect(title.length).toBe(80);
|
|
120
|
+
expect(title).toContain('…');
|
|
121
|
+
expect(title.trimEnd().length).toBe(80);
|
|
122
|
+
});
|
|
123
|
+
it('should strip control characters from the title', () => {
|
|
124
|
+
const title = computeTerminalTitle({
|
|
125
|
+
streamingState: StreamingState.Responding,
|
|
126
|
+
thoughtSubject: 'BadTitle\x00 With\x07Control\x1BChars',
|
|
127
|
+
isConfirming: false,
|
|
128
|
+
folderName: 'my-project',
|
|
129
|
+
showThoughts: true,
|
|
130
|
+
useDynamicTitle: true,
|
|
131
|
+
});
|
|
132
|
+
expect(title).toContain('BadTitle WithControlChars');
|
|
133
|
+
expect(title).not.toContain('\x00');
|
|
134
|
+
expect(title).not.toContain('\x07');
|
|
135
|
+
expect(title).not.toContain('\x1B');
|
|
136
|
+
expect(title.length).toBe(80);
|
|
137
|
+
});
|
|
138
|
+
it('should prioritize CLI_TITLE environment variable over folder name when thoughts are disabled', () => {
|
|
139
|
+
vi.stubEnv('CLI_TITLE', 'EnvOverride');
|
|
140
|
+
const title = computeTerminalTitle({
|
|
141
|
+
streamingState: StreamingState.Idle,
|
|
142
|
+
isConfirming: false,
|
|
143
|
+
folderName: 'my-project',
|
|
144
|
+
showThoughts: false,
|
|
145
|
+
useDynamicTitle: true,
|
|
146
|
+
});
|
|
147
|
+
expect(title).toContain('◇ Ready (EnvOverride)');
|
|
148
|
+
expect(title).not.toContain('my-project');
|
|
149
|
+
expect(title.length).toBe(80);
|
|
150
|
+
});
|
|
151
|
+
it.each([
|
|
152
|
+
{
|
|
153
|
+
name: 'folder name',
|
|
154
|
+
folderName: 'A'.repeat(100),
|
|
155
|
+
expected: '◇ Ready (AAAAA',
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
name: 'CLI_TITLE',
|
|
159
|
+
folderName: 'my-project',
|
|
160
|
+
envTitle: 'B'.repeat(100),
|
|
161
|
+
expected: '◇ Ready (BBBBB',
|
|
162
|
+
},
|
|
163
|
+
])('should truncate very long $name to fit within 80 characters', ({ folderName, envTitle, expected }) => {
|
|
164
|
+
if (envTitle) {
|
|
165
|
+
vi.stubEnv('CLI_TITLE', envTitle);
|
|
166
|
+
}
|
|
167
|
+
const title = computeTerminalTitle({
|
|
168
|
+
streamingState: StreamingState.Idle,
|
|
169
|
+
isConfirming: false,
|
|
170
|
+
folderName,
|
|
171
|
+
showThoughts: false,
|
|
172
|
+
useDynamicTitle: true,
|
|
173
|
+
});
|
|
174
|
+
expect(title.length).toBe(80);
|
|
175
|
+
expect(title).toContain(expected);
|
|
176
|
+
expect(title).toContain('…)');
|
|
177
|
+
});
|
|
178
|
+
it('should truncate long folder name when useDynamicTitle is false', () => {
|
|
179
|
+
const longFolderName = 'C'.repeat(100);
|
|
180
|
+
const title = computeTerminalTitle({
|
|
181
|
+
streamingState: StreamingState.Responding,
|
|
182
|
+
isConfirming: false,
|
|
183
|
+
folderName: longFolderName,
|
|
184
|
+
showThoughts: true,
|
|
185
|
+
useDynamicTitle: false,
|
|
186
|
+
});
|
|
187
|
+
expect(title.length).toBe(80);
|
|
188
|
+
expect(title).toContain('Gemini CLI (CCCCC');
|
|
189
|
+
expect(title).toContain('…)');
|
|
47
190
|
});
|
|
48
191
|
});
|
|
49
192
|
//# sourceMappingURL=windowTitle.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowTitle.test.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"windowTitle.test.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.test.ts"],"names":[],"mappings":"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"}
|