@google/gemini-cli 0.0.3-preview.4 → 0.0.4
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/LICENSE +2 -2
- package/README.md +12 -2
- package/dist/package.json +6 -7
- package/dist/src/commands/extensions/disable.d.ts +1 -1
- package/dist/src/commands/extensions/disable.js +3 -3
- package/dist/src/commands/extensions/disable.js.map +1 -1
- package/dist/src/commands/extensions/enable.d.ts +1 -1
- package/dist/src/commands/extensions/enable.js +6 -8
- package/dist/src/commands/extensions/enable.js.map +1 -1
- package/dist/src/commands/extensions/examples/context/GEMINI.md +8 -0
- package/dist/src/commands/extensions/examples/context/gemini-extension.json +5 -0
- package/dist/src/commands/extensions/examples/custom-commands/commands/fs/grep-code.toml +6 -0
- package/dist/src/commands/extensions/examples/custom-commands/gemini-extension.json +4 -0
- package/dist/src/commands/extensions/examples/exclude-tools/gemini-extension.json +5 -0
- package/dist/src/commands/extensions/examples/mcp-server/example.js +46 -0
- package/dist/src/commands/extensions/examples/mcp-server/example.js.map +1 -0
- package/dist/src/commands/extensions/examples/mcp-server/example.ts +60 -0
- package/dist/src/commands/extensions/examples/mcp-server/gemini-extension.json +10 -0
- package/dist/src/commands/extensions/install.d.ts +1 -0
- package/dist/src/commands/extensions/install.js +41 -12
- package/dist/src/commands/extensions/install.js.map +1 -1
- package/dist/src/commands/extensions/install.test.js +79 -3
- package/dist/src/commands/extensions/install.test.js.map +1 -1
- package/dist/src/commands/extensions/link.d.ts +12 -0
- package/dist/src/commands/extensions/link.js +37 -0
- package/dist/src/commands/extensions/link.js.map +1 -0
- package/dist/src/commands/extensions/new.d.ts +7 -0
- package/dist/src/commands/extensions/new.js +70 -0
- package/dist/src/commands/extensions/new.js.map +1 -0
- package/dist/src/commands/extensions/new.test.d.ts +6 -0
- package/dist/src/commands/extensions/new.test.js +50 -0
- package/dist/src/commands/extensions/new.test.js.map +1 -0
- 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.d.ts +2 -1
- package/dist/src/commands/extensions/update.js +46 -15
- package/dist/src/commands/extensions/update.js.map +1 -1
- package/dist/src/commands/extensions.js +4 -0
- package/dist/src/commands/extensions.js.map +1 -1
- package/dist/src/commands/mcp/add.js +1 -1
- package/dist/src/commands/mcp/add.js.map +1 -1
- package/dist/src/commands/mcp/list.js +2 -2
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp/remove.js +1 -1
- package/dist/src/commands/mcp/remove.js.map +1 -1
- package/dist/src/config/auth.d.ts +1 -1
- package/dist/src/config/auth.js +4 -4
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/auth.test.js +15 -7
- package/dist/src/config/auth.test.js.map +1 -1
- package/dist/src/config/config.d.ts +4 -1
- package/dist/src/config/config.js +57 -23
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.d.ts +20 -13
- package/dist/src/config/extension.js +261 -109
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/extensions/extensionEnablement.d.ts +30 -0
- package/dist/src/config/extensions/extensionEnablement.js +113 -0
- package/dist/src/config/extensions/extensionEnablement.js.map +1 -0
- package/dist/src/config/extensions/extensionEnablement.test.d.ts +6 -0
- package/dist/src/config/extensions/extensionEnablement.test.js +116 -0
- package/dist/src/config/extensions/extensionEnablement.test.js.map +1 -0
- package/dist/src/config/extensions/github.d.ts +25 -0
- package/dist/src/config/extensions/github.js +258 -0
- package/dist/src/config/extensions/github.js.map +1 -0
- package/dist/src/config/extensions/github.test.d.ts +6 -0
- package/dist/src/config/extensions/github.test.js +232 -0
- package/dist/src/config/extensions/github.test.js.map +1 -0
- package/dist/src/config/extensions/variableSchema.d.ts +8 -0
- package/dist/src/config/extensions/variableSchema.js +4 -0
- package/dist/src/config/extensions/variableSchema.js.map +1 -1
- package/dist/src/config/keyBindings.d.ts +5 -1
- package/dist/src/config/keyBindings.js +14 -25
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/policy-engine.integration.test.d.ts +6 -0
- package/dist/src/config/policy-engine.integration.test.js +270 -0
- package/dist/src/config/policy-engine.integration.test.js.map +1 -0
- package/dist/src/config/policy.d.ts +8 -0
- package/dist/src/config/policy.js +150 -0
- package/dist/src/config/policy.js.map +1 -0
- package/dist/src/config/policy.test.d.ts +6 -0
- package/dist/src/config/policy.test.js +336 -0
- package/dist/src/config/policy.test.js.map +1 -0
- package/dist/src/config/settings.d.ts +8 -5
- package/dist/src/config/settings.js +148 -251
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +232 -23
- package/dist/src/config/settingsSchema.js +222 -20
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +68 -55
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +13 -3
- package/dist/src/config/trustedFolders.js +66 -42
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.js +107 -12
- package/dist/src/config/trustedFolders.test.js.map +1 -1
- package/dist/src/core/auth.d.ts +13 -0
- package/dist/src/core/auth.js +27 -0
- package/dist/src/core/auth.js.map +1 -0
- package/dist/src/core/initializer.d.ts +21 -0
- package/dist/src/core/initializer.js +33 -0
- package/dist/src/core/initializer.js.map +1 -0
- package/dist/src/core/theme.d.ts +12 -0
- package/dist/src/core/theme.js +20 -0
- package/dist/src/core/theme.js.map +1 -0
- package/dist/src/gemini.d.ts +2 -1
- package/dist/src/gemini.js +96 -51
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +113 -42
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/nonInteractiveCli.js +87 -71
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +1 -1
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +16 -17
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/FileCommandLoader.d.ts +2 -0
- package/dist/src/services/FileCommandLoader.js +7 -0
- package/dist/src/services/FileCommandLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.js +43 -8
- package/dist/src/services/McpPromptLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.test.js +228 -1
- package/dist/src/services/McpPromptLoader.test.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.js +8 -1
- package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
- package/dist/src/ui/App.d.ts +1 -10
- package/dist/src/ui/App.js +13 -667
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/AppContainer.d.ts +17 -0
- package/dist/src/ui/AppContainer.js +879 -0
- package/dist/src/ui/AppContainer.js.map +1 -0
- package/dist/src/ui/AppContainer.test.d.ts +6 -0
- package/dist/src/ui/AppContainer.test.js +414 -0
- package/dist/src/ui/AppContainer.test.js.map +1 -0
- package/dist/src/ui/IdeIntegrationNudge.d.ts +2 -2
- package/dist/src/ui/IdeIntegrationNudge.js +3 -3
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.d.ts +18 -0
- package/dist/src/ui/auth/AuthDialog.js +99 -0
- package/dist/src/ui/auth/AuthDialog.js.map +1 -0
- package/dist/src/ui/auth/AuthDialog.test.d.ts +6 -0
- package/dist/src/ui/auth/AuthDialog.test.js +184 -0
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -0
- package/dist/src/ui/{components → auth}/AuthInProgress.js +2 -2
- package/dist/src/ui/auth/AuthInProgress.js.map +1 -0
- package/dist/src/ui/auth/useAuth.d.ts +15 -0
- package/dist/src/ui/auth/useAuth.js +73 -0
- package/dist/src/ui/auth/useAuth.js.map +1 -0
- package/dist/src/ui/commands/aboutCommand.js +9 -3
- package/dist/src/ui/commands/aboutCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.js +9 -4
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.d.ts +2 -0
- package/dist/src/ui/commands/chatCommand.js +82 -3
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +1 -1
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/corgiCommand.js +1 -0
- package/dist/src/ui/commands/corgiCommand.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +1 -1
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +70 -16
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/ideCommand.d.ts +1 -2
- package/dist/src/ui/commands/ideCommand.js +19 -10
- package/dist/src/ui/commands/ideCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +14 -5
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.js +1 -1
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +5 -1
- package/dist/src/ui/commands/types.js +0 -1
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/AboutBox.js +2 -2
- package/dist/src/ui/components/AboutBox.js.map +1 -1
- package/dist/src/ui/components/AnsiOutput.d.ts +13 -0
- package/dist/src/ui/components/AnsiOutput.js +12 -0
- package/dist/src/ui/components/AnsiOutput.js.map +1 -0
- package/dist/src/ui/components/AnsiOutput.test.d.ts +6 -0
- package/dist/src/ui/components/AnsiOutput.test.js +97 -0
- package/dist/src/ui/components/AnsiOutput.test.js.map +1 -0
- package/dist/src/ui/components/AppHeader.d.ts +10 -0
- package/dist/src/ui/components/AppHeader.js +22 -0
- package/dist/src/ui/components/AppHeader.js.map +1 -0
- package/dist/src/ui/components/AutoAcceptIndicator.js +4 -4
- package/dist/src/ui/components/AutoAcceptIndicator.js.map +1 -1
- package/dist/src/ui/components/Composer.d.ts +6 -0
- package/dist/src/ui/components/Composer.js +73 -0
- package/dist/src/ui/components/Composer.js.map +1 -0
- package/dist/src/ui/components/Composer.test.d.ts +6 -0
- package/dist/src/ui/components/Composer.test.js +337 -0
- package/dist/src/ui/components/Composer.test.js.map +1 -0
- package/dist/src/ui/components/ConfigInitDisplay.d.ts +6 -0
- package/dist/src/ui/components/ConfigInitDisplay.js +38 -0
- package/dist/src/ui/components/ConfigInitDisplay.js.map +1 -0
- package/dist/src/ui/components/ConsoleSummaryDisplay.js +2 -2
- package/dist/src/ui/components/ConsoleSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/ContextSummaryDisplay.js +3 -3
- package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.js +2 -2
- package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/DebugProfiler.js +2 -2
- package/dist/src/ui/components/DebugProfiler.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +7 -7
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/DialogManager.d.ts +6 -0
- package/dist/src/ui/components/DialogManager.js +85 -0
- package/dist/src/ui/components/DialogManager.js.map +1 -0
- package/dist/src/ui/components/EditorSettingsDialog.js +5 -5
- package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.js +19 -9
- package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +35 -10
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.d.ts +4 -2
- package/dist/src/ui/components/Footer.js +8 -3
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.d.ts +5 -0
- package/dist/src/ui/components/GeminiRespondingSpinner.js +7 -2
- package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
- package/dist/src/ui/components/Header.js +2 -2
- package/dist/src/ui/components/Header.js.map +1 -1
- package/dist/src/ui/components/Help.d.ts +1 -1
- package/dist/src/ui/components/Help.js +9 -6
- package/dist/src/ui/components/Help.js.map +1 -1
- package/dist/src/ui/components/Help.test.d.ts +6 -0
- package/dist/src/ui/components/Help.test.js +57 -0
- package/dist/src/ui/components/Help.test.js.map +1 -0
- package/dist/src/ui/components/HistoryItemDisplay.d.ts +2 -2
- package/dist/src/ui/components/HistoryItemDisplay.js +3 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.d.ts +9 -0
- package/dist/src/ui/components/InputPrompt.js +180 -42
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.js +2 -2
- package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
- package/dist/src/ui/components/LoopDetectionConfirmation.d.ts +13 -0
- package/dist/src/ui/components/LoopDetectionConfirmation.js +35 -0
- package/dist/src/ui/components/LoopDetectionConfirmation.js.map +1 -0
- package/dist/src/ui/components/LoopDetectionConfirmation.test.d.ts +6 -0
- package/dist/src/ui/components/LoopDetectionConfirmation.test.js +25 -0
- package/dist/src/ui/components/LoopDetectionConfirmation.test.js.map +1 -0
- package/dist/src/ui/components/MainContent.d.ts +6 -0
- package/dist/src/ui/components/MainContent.js +23 -0
- package/dist/src/ui/components/MainContent.js.map +1 -0
- package/dist/src/ui/components/MemoryUsageDisplay.js +6 -4
- package/dist/src/ui/components/MemoryUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/ModelStatsDisplay.js +7 -7
- package/dist/src/ui/components/ModelStatsDisplay.js.map +1 -1
- package/dist/src/ui/components/Notifications.d.ts +6 -0
- package/dist/src/ui/components/Notifications.js +23 -0
- package/dist/src/ui/components/Notifications.js.map +1 -0
- package/dist/src/ui/components/PrepareLabel.d.ts +5 -5
- package/dist/src/ui/components/PrepareLabel.js +67 -11
- package/dist/src/ui/components/PrepareLabel.js.map +1 -1
- package/dist/src/ui/components/PrepareLabel.test.d.ts +6 -0
- package/dist/src/ui/components/PrepareLabel.test.js +71 -0
- package/dist/src/ui/components/PrepareLabel.test.js.map +1 -0
- package/dist/src/ui/components/ProQuotaDialog.d.ts +13 -0
- package/dist/src/ui/components/ProQuotaDialog.js +21 -0
- package/dist/src/ui/components/ProQuotaDialog.js.map +1 -0
- package/dist/src/ui/components/ProQuotaDialog.test.d.ts +6 -0
- package/dist/src/ui/components/ProQuotaDialog.test.js +56 -0
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -0
- package/dist/src/ui/components/QueuedMessageDisplay.d.ts +9 -0
- package/dist/src/ui/components/QueuedMessageDisplay.js +20 -0
- package/dist/src/ui/components/QueuedMessageDisplay.js.map +1 -0
- package/dist/src/ui/components/QueuedMessageDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/QueuedMessageDisplay.test.js +56 -0
- package/dist/src/ui/components/QueuedMessageDisplay.test.js.map +1 -0
- package/dist/src/ui/components/QuittingDisplay.d.ts +6 -0
- package/dist/src/ui/components/QuittingDisplay.js +20 -0
- package/dist/src/ui/components/QuittingDisplay.js.map +1 -0
- package/dist/src/ui/components/SettingsDialog.d.ts +2 -1
- package/dist/src/ui/components/SettingsDialog.js +93 -22
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +436 -80
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js +2 -2
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
- package/dist/src/ui/components/ShellInputPrompt.d.ts +11 -0
- package/dist/src/ui/components/ShellInputPrompt.js +36 -0
- package/dist/src/ui/components/ShellInputPrompt.js.map +1 -0
- package/dist/src/ui/components/ShellModeIndicator.js +2 -2
- package/dist/src/ui/components/ShellModeIndicator.js.map +1 -1
- package/dist/src/ui/components/ShowMoreLines.js +2 -2
- package/dist/src/ui/components/ShowMoreLines.js.map +1 -1
- package/dist/src/ui/components/StatsDisplay.js +6 -6
- package/dist/src/ui/components/StatsDisplay.js.map +1 -1
- package/dist/src/ui/components/SuggestionsDisplay.d.ts +7 -2
- package/dist/src/ui/components/SuggestionsDisplay.js +17 -17
- package/dist/src/ui/components/SuggestionsDisplay.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.js +12 -29
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.test.d.ts +6 -0
- package/dist/src/ui/components/ThemeDialog.test.js +75 -0
- package/dist/src/ui/components/ThemeDialog.test.js.map +1 -0
- package/dist/src/ui/components/Tips.js +2 -2
- package/dist/src/ui/components/Tips.js.map +1 -1
- package/dist/src/ui/components/ToolStatsDisplay.js +4 -4
- package/dist/src/ui/components/ToolStatsDisplay.js.map +1 -1
- package/dist/src/ui/components/UpdateNotification.js +2 -2
- package/dist/src/ui/components/UpdateNotification.js.map +1 -1
- 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.d.ts +1 -2
- package/dist/src/ui/components/messages/CompressionMessage.js +37 -8
- package/dist/src/ui/components/messages/CompressionMessage.js.map +1 -1
- package/dist/src/ui/components/messages/CompressionMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/CompressionMessage.test.js +160 -0
- package/dist/src/ui/components/messages/CompressionMessage.test.js.map +1 -0
- package/dist/src/ui/components/messages/DiffRenderer.d.ts +2 -1
- package/dist/src/ui/components/messages/DiffRenderer.js +14 -22
- package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
- package/dist/src/ui/components/messages/ErrorMessage.js +2 -2
- package/dist/src/ui/components/messages/ErrorMessage.js.map +1 -1
- package/dist/src/ui/components/messages/GeminiMessage.js +2 -2
- package/dist/src/ui/components/messages/GeminiMessage.js.map +1 -1
- package/dist/src/ui/components/messages/InfoMessage.js +2 -2
- package/dist/src/ui/components/messages/InfoMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +33 -21
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +0 -8
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.d.ts +3 -2
- package/dist/src/ui/components/messages/ToolGroupMessage.js +17 -9
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +17 -15
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.d.ts +4 -0
- package/dist/src/ui/components/messages/ToolMessage.js +24 -10
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js +33 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/UserMessage.js +3 -3
- package/dist/src/ui/components/messages/UserMessage.js.map +1 -1
- package/dist/src/ui/components/messages/UserShellMessage.js +2 -2
- package/dist/src/ui/components/messages/UserShellMessage.js.map +1 -1
- package/dist/src/ui/components/messages/WarningMessage.d.ts +11 -0
- package/dist/src/ui/components/messages/WarningMessage.js +10 -0
- package/dist/src/ui/components/messages/WarningMessage.js.map +1 -0
- package/dist/src/ui/components/shared/EnumSelector.d.ts +18 -0
- package/dist/src/ui/components/shared/EnumSelector.js +44 -0
- package/dist/src/ui/components/shared/EnumSelector.js.map +1 -0
- package/dist/src/ui/components/shared/EnumSelector.test.d.ts +6 -0
- package/dist/src/ui/components/shared/EnumSelector.test.js +70 -0
- package/dist/src/ui/components/shared/EnumSelector.test.js.map +1 -0
- package/dist/src/ui/components/shared/MaxSizedBox.js +2 -2
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.js +12 -12
- package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/ScopeSelector.d.ts +19 -0
- package/dist/src/ui/components/shared/ScopeSelector.js +11 -0
- package/dist/src/ui/components/shared/ScopeSelector.js.map +1 -0
- package/dist/src/ui/components/shared/text-buffer.d.ts +25 -2
- package/dist/src/ui/components/shared/text-buffer.js +296 -187
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.d.ts +6 -0
- package/dist/src/ui/components/views/ExtensionsList.js +47 -0
- package/dist/src/ui/components/views/ExtensionsList.js.map +1 -0
- package/dist/src/ui/components/views/ExtensionsList.test.d.ts +6 -0
- package/dist/src/ui/components/views/ExtensionsList.test.js +97 -0
- package/dist/src/ui/components/views/ExtensionsList.test.js.map +1 -0
- 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/AppContext.d.ts +11 -0
- package/dist/src/ui/contexts/AppContext.js +15 -0
- package/dist/src/ui/contexts/AppContext.js.map +1 -0
- package/dist/src/ui/contexts/ConfigContext.d.ts +9 -0
- package/dist/src/ui/contexts/ConfigContext.js +16 -0
- package/dist/src/ui/contexts/ConfigContext.js.map +1 -0
- package/dist/src/ui/contexts/FocusContext.d.ts +7 -0
- package/dist/src/ui/contexts/FocusContext.js +9 -0
- package/dist/src/ui/contexts/FocusContext.js.map +1 -0
- package/dist/src/ui/contexts/KeypressContext.d.ts +3 -0
- package/dist/src/ui/contexts/KeypressContext.js +306 -44
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +288 -2
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/SessionContext.d.ts +6 -0
- package/dist/src/ui/contexts/SessionContext.js +107 -5
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +36 -0
- package/dist/src/ui/contexts/UIActionsContext.js +20 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -0
- package/dist/src/ui/contexts/UIStateContext.d.ts +95 -0
- package/dist/src/ui/contexts/UIStateContext.js +15 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -0
- package/dist/src/ui/hooks/atCommandProcessor.test.js +7 -5
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/keyToAnsi.d.ts +15 -0
- package/dist/src/ui/hooks/keyToAnsi.js +67 -0
- package/dist/src/ui/hooks/keyToAnsi.js.map +1 -0
- package/dist/src/ui/hooks/shellCommandProcessor.d.ts +2 -1
- package/dist/src/ui/hooks/shellCommandProcessor.js +60 -15
- package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.js +196 -17
- package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +15 -2
- package/dist/src/ui/hooks/slashCommandProcessor.js +36 -73
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.d.ts +3 -2
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js +9 -5
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js +69 -0
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.d.ts +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js +12 -11
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +13 -2
- package/dist/src/ui/hooks/useGeminiStream.js +150 -60
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.js +15 -18
- package/dist/src/ui/hooks/useGitBranchName.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.test.js +49 -53
- package/dist/src/ui/hooks/useGitBranchName.test.js.map +1 -1
- package/dist/src/ui/hooks/useIdeTrustListener.d.ts +14 -0
- package/dist/src/ui/hooks/useIdeTrustListener.js +39 -0
- package/dist/src/ui/hooks/useIdeTrustListener.js.map +1 -0
- package/dist/src/ui/hooks/useInputHistoryStore.d.ts +19 -0
- package/dist/src/ui/hooks/useInputHistoryStore.js +81 -0
- package/dist/src/ui/hooks/useInputHistoryStore.js.map +1 -0
- package/dist/src/ui/hooks/useInputHistoryStore.test.d.ts +6 -0
- package/dist/src/ui/hooks/useInputHistoryStore.test.js +234 -0
- package/dist/src/ui/hooks/useInputHistoryStore.test.js.map +1 -0
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +2 -2
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +2 -2
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useMemoryMonitor.d.ts +13 -0
- package/dist/src/ui/hooks/useMemoryMonitor.js +28 -0
- package/dist/src/ui/hooks/useMemoryMonitor.js.map +1 -0
- package/dist/src/ui/hooks/useMemoryMonitor.test.d.ts +6 -0
- package/dist/src/ui/hooks/useMemoryMonitor.test.js +57 -0
- package/dist/src/ui/hooks/useMemoryMonitor.test.js.map +1 -0
- package/dist/src/ui/hooks/useMessageQueue.d.ts +2 -1
- package/dist/src/ui/hooks/useMessageQueue.js +5 -3
- package/dist/src/ui/hooks/useMessageQueue.js.map +1 -1
- package/dist/src/ui/hooks/useMessageQueue.test.js +9 -0
- package/dist/src/ui/hooks/useMessageQueue.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.d.ts +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js +11 -8
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/usePrivacySettings.d.ts +1 -1
- package/dist/src/ui/hooks/usePrivacySettings.js +8 -13
- package/dist/src/ui/hooks/usePrivacySettings.js.map +1 -1
- package/dist/src/ui/hooks/usePrivacySettings.test.js +33 -97
- package/dist/src/ui/hooks/usePrivacySettings.test.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +21 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.js +122 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.test.d.ts +6 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +267 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -0
- package/dist/src/ui/hooks/useReactToolScheduler.d.ts +3 -2
- package/dist/src/ui/hooks/useReactToolScheduler.js +23 -17
- package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.d.ts +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.js +67 -20
- package/dist/src/ui/hooks/useReverseSearchCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.d.ts +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.js +276 -67
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.d.ts +4 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +357 -65
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useStateAndRef.d.ts +1 -1
- package/dist/src/ui/hooks/useStateAndRef.js +2 -2
- package/dist/src/ui/hooks/useStateAndRef.js.map +1 -1
- package/dist/src/ui/hooks/useThemeCommand.d.ts +1 -1
- package/dist/src/ui/hooks/useThemeCommand.js +3 -14
- package/dist/src/ui/hooks/useThemeCommand.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +66 -61
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/hooks/useWorkspaceMigration.js +2 -1
- package/dist/src/ui/hooks/useWorkspaceMigration.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +17 -0
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js +5 -5
- package/dist/src/ui/privacy/CloudFreePrivacyNotice.js.map +1 -1
- package/dist/src/ui/privacy/CloudPaidPrivacyNotice.js +2 -2
- package/dist/src/ui/privacy/CloudPaidPrivacyNotice.js.map +1 -1
- package/dist/src/ui/privacy/GeminiPrivacyNotice.js +2 -2
- package/dist/src/ui/privacy/GeminiPrivacyNotice.js.map +1 -1
- package/dist/src/ui/state/extensions.d.ts +14 -0
- package/dist/src/ui/state/extensions.js +16 -0
- package/dist/src/ui/state/extensions.js.map +1 -0
- package/dist/src/ui/themes/ayu.js +1 -1
- package/dist/src/ui/themes/dracula.js +2 -2
- package/dist/src/ui/themes/github-dark.js +1 -1
- package/dist/src/ui/themes/theme.js +17 -17
- package/dist/src/ui/themes/theme.js.map +1 -1
- package/dist/src/ui/types.d.ts +34 -3
- package/dist/src/ui/types.js +12 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +3 -2
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.js +7 -7
- package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.js +10 -10
- package/dist/src/ui/utils/MarkdownDisplay.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.test.js +6 -2
- package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
- package/dist/src/ui/utils/TableRenderer.js +4 -4
- package/dist/src/ui/utils/TableRenderer.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.js +5 -6
- package/dist/src/ui/utils/clipboardUtils.js.map +1 -1
- package/dist/src/ui/utils/displayUtils.js +4 -4
- package/dist/src/ui/utils/displayUtils.js.map +1 -1
- package/dist/src/ui/utils/highlight.d.ts +11 -0
- package/dist/src/ui/utils/highlight.js +78 -0
- package/dist/src/ui/utils/highlight.js.map +1 -0
- package/dist/src/ui/utils/highlight.test.d.ts +6 -0
- package/dist/src/ui/utils/highlight.test.js +120 -0
- package/dist/src/ui/utils/highlight.test.js.map +1 -0
- package/dist/src/ui/utils/kittyProtocolDetector.js +39 -29
- package/dist/src/ui/utils/kittyProtocolDetector.js.map +1 -1
- package/dist/src/ui/utils/platformConstants.d.ts +24 -1
- package/dist/src/ui/utils/platformConstants.js +26 -1
- package/dist/src/ui/utils/platformConstants.js.map +1 -1
- package/dist/src/ui/utils/textUtils.d.ts +9 -0
- package/dist/src/ui/utils/textUtils.js +52 -3
- package/dist/src/ui/utils/textUtils.js.map +1 -1
- package/dist/src/utils/commands.d.ts +20 -0
- package/dist/src/utils/commands.js +53 -0
- package/dist/src/utils/commands.js.map +1 -0
- package/dist/src/utils/commands.test.d.ts +6 -0
- package/dist/src/utils/commands.test.js +115 -0
- package/dist/src/utils/commands.test.js.map +1 -0
- package/dist/src/utils/commentJson.d.ts +9 -0
- package/dist/src/utils/commentJson.js +48 -0
- package/dist/src/utils/commentJson.js.map +1 -0
- package/dist/src/utils/commentJson.test.d.ts +6 -0
- package/dist/src/utils/commentJson.test.js +146 -0
- package/dist/src/utils/commentJson.test.js.map +1 -0
- package/dist/src/utils/deepMerge.d.ts +10 -0
- package/dist/src/utils/deepMerge.js +58 -0
- package/dist/src/utils/deepMerge.js.map +1 -0
- package/dist/src/utils/deepMerge.test.d.ts +6 -0
- package/dist/src/utils/deepMerge.test.js +143 -0
- package/dist/src/utils/deepMerge.test.js.map +1 -0
- package/dist/src/utils/envVarResolver.d.ts +39 -0
- package/dist/src/utils/envVarResolver.js +97 -0
- package/dist/src/utils/envVarResolver.js.map +1 -0
- package/dist/src/utils/envVarResolver.test.d.ts +6 -0
- package/dist/src/utils/envVarResolver.test.js +221 -0
- package/dist/src/utils/envVarResolver.test.js.map +1 -0
- package/dist/src/utils/errors.d.ts +21 -0
- package/dist/src/utils/errors.js +93 -0
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors.test.d.ts +6 -0
- package/dist/src/utils/errors.test.js +303 -0
- package/dist/src/utils/errors.test.js.map +1 -0
- 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/processUtils.d.ts +13 -0
- package/dist/src/utils/processUtils.js +18 -0
- package/dist/src/utils/processUtils.js.map +1 -0
- package/dist/src/utils/processUtils.test.d.ts +6 -0
- package/dist/src/utils/processUtils.test.js +20 -0
- package/dist/src/utils/processUtils.test.js.map +1 -0
- package/dist/src/utils/sandbox.d.ts +1 -1
- package/dist/src/utils/sandbox.js +19 -8
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/settingsUtils.d.ts +16 -6
- package/dist/src/utils/settingsUtils.js +35 -25
- package/dist/src/utils/settingsUtils.js.map +1 -1
- package/dist/src/utils/settingsUtils.test.js +455 -158
- package/dist/src/utils/settingsUtils.test.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.d.ts +1 -1
- package/dist/src/utils/userStartupWarnings.js +1 -1
- package/dist/src/utils/userStartupWarnings.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.d.ts +2 -1
- package/dist/src/validateNonInterActiveAuth.js +33 -12
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +578 -578
- package/dist/src/zed-integration/zedIntegration.js +17 -12
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +17168 -0
- package/package.json +7 -8
- package/dist/google-gemini-cli-0.3.0-preview.3.tgz +0 -0
- package/dist/src/ui/components/AuthDialog.d.ts +0 -16
- package/dist/src/ui/components/AuthDialog.js +0 -92
- package/dist/src/ui/components/AuthDialog.js.map +0 -1
- package/dist/src/ui/components/AuthDialog.test.js +0 -276
- package/dist/src/ui/components/AuthDialog.test.js.map +0 -1
- package/dist/src/ui/components/AuthInProgress.js.map +0 -1
- package/dist/src/ui/hooks/useAuthCommand.d.ts +0 -14
- package/dist/src/ui/hooks/useAuthCommand.js +0 -66
- package/dist/src/ui/hooks/useAuthCommand.js.map +0 -1
- /package/dist/src/{ui/components/AuthDialog.test.d.ts → commands/extensions/examples/mcp-server/example.d.ts} +0 -0
- /package/dist/src/ui/{components → auth}/AuthInProgress.d.ts +0 -0
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { useCallback } from 'react';
|
|
3
|
+
import { Box, Text } from 'ink';
|
|
4
|
+
import { theme } from '../semantic-colors.js';
|
|
5
|
+
import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
|
|
6
|
+
import { SettingScope } from '../../config/settings.js';
|
|
7
|
+
import { AuthType, clearCachedCredentialFile, } from '@google/gemini-cli-core';
|
|
8
|
+
import { useKeypress } from '../hooks/useKeypress.js';
|
|
9
|
+
import { AuthState } from '../types.js';
|
|
10
|
+
import { runExitCleanup } from '../../utils/cleanup.js';
|
|
11
|
+
import { validateAuthMethodWithSettings } from './useAuth.js';
|
|
12
|
+
export function AuthDialog({ config, settings, setAuthState, authError, onAuthError, }) {
|
|
13
|
+
let items = [
|
|
14
|
+
{
|
|
15
|
+
label: 'Login with Google',
|
|
16
|
+
value: AuthType.LOGIN_WITH_GOOGLE,
|
|
17
|
+
},
|
|
18
|
+
...(process.env['CLOUD_SHELL'] === 'true'
|
|
19
|
+
? [
|
|
20
|
+
{
|
|
21
|
+
label: 'Use Cloud Shell user credentials',
|
|
22
|
+
value: AuthType.CLOUD_SHELL,
|
|
23
|
+
},
|
|
24
|
+
]
|
|
25
|
+
: []),
|
|
26
|
+
{
|
|
27
|
+
label: 'Use Gemini API Key',
|
|
28
|
+
value: AuthType.USE_GEMINI,
|
|
29
|
+
},
|
|
30
|
+
{ label: 'Vertex AI', value: AuthType.USE_VERTEX_AI },
|
|
31
|
+
];
|
|
32
|
+
if (settings.merged.security?.auth?.enforcedType) {
|
|
33
|
+
items = items.filter((item) => item.value === settings.merged.security?.auth?.enforcedType);
|
|
34
|
+
}
|
|
35
|
+
let defaultAuthType = null;
|
|
36
|
+
const defaultAuthTypeEnv = process.env['GEMINI_DEFAULT_AUTH_TYPE'];
|
|
37
|
+
if (defaultAuthTypeEnv &&
|
|
38
|
+
Object.values(AuthType).includes(defaultAuthTypeEnv)) {
|
|
39
|
+
defaultAuthType = defaultAuthTypeEnv;
|
|
40
|
+
}
|
|
41
|
+
let initialAuthIndex = items.findIndex((item) => {
|
|
42
|
+
if (settings.merged.security?.auth?.selectedType) {
|
|
43
|
+
return item.value === settings.merged.security.auth.selectedType;
|
|
44
|
+
}
|
|
45
|
+
if (defaultAuthType) {
|
|
46
|
+
return item.value === defaultAuthType;
|
|
47
|
+
}
|
|
48
|
+
if (process.env['GEMINI_API_KEY']) {
|
|
49
|
+
return item.value === AuthType.USE_GEMINI;
|
|
50
|
+
}
|
|
51
|
+
return item.value === AuthType.LOGIN_WITH_GOOGLE;
|
|
52
|
+
});
|
|
53
|
+
if (settings.merged.security?.auth?.enforcedType) {
|
|
54
|
+
initialAuthIndex = 0;
|
|
55
|
+
}
|
|
56
|
+
const onSelect = useCallback(async (authType, scope) => {
|
|
57
|
+
if (authType) {
|
|
58
|
+
await clearCachedCredentialFile();
|
|
59
|
+
settings.setValue(scope, 'security.auth.selectedType', authType);
|
|
60
|
+
if (authType === AuthType.LOGIN_WITH_GOOGLE &&
|
|
61
|
+
config.isBrowserLaunchSuppressed()) {
|
|
62
|
+
runExitCleanup();
|
|
63
|
+
console.log(`
|
|
64
|
+
----------------------------------------------------------------
|
|
65
|
+
Logging in with Google... Please restart Gemini CLI to continue.
|
|
66
|
+
----------------------------------------------------------------
|
|
67
|
+
`);
|
|
68
|
+
process.exit(0);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
setAuthState(AuthState.Unauthenticated);
|
|
72
|
+
}, [settings, config, setAuthState]);
|
|
73
|
+
const handleAuthSelect = (authMethod) => {
|
|
74
|
+
const error = validateAuthMethodWithSettings(authMethod, settings);
|
|
75
|
+
if (error) {
|
|
76
|
+
onAuthError(error);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
onSelect(authMethod, SettingScope.User);
|
|
80
|
+
}
|
|
81
|
+
};
|
|
82
|
+
useKeypress((key) => {
|
|
83
|
+
if (key.name === 'escape') {
|
|
84
|
+
// Prevent exit if there is an error message.
|
|
85
|
+
// This means they user is not authenticated yet.
|
|
86
|
+
if (authError) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
if (settings.merged.security?.auth?.selectedType === undefined) {
|
|
90
|
+
// Prevent exiting if no auth method is set
|
|
91
|
+
onAuthError('You must select an auth method to proceed. Press Ctrl+C twice to exit.');
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
onSelect(undefined, SettingScope.User);
|
|
95
|
+
}
|
|
96
|
+
}, { isActive: true });
|
|
97
|
+
return (_jsxs(Box, { borderStyle: "round", borderColor: theme.border.default, flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Text, { bold: true, color: theme.text.primary, children: "Get started" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.text.primary, children: "How would you like to authenticate for this project?" }) }), _jsx(Box, { marginTop: 1, children: _jsx(RadioButtonSelect, { items: items, initialIndex: initialAuthIndex, onSelect: handleAuthSelect }) }), authError && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.status.error, children: authError }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.text.secondary, children: "(Use Enter to select)" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.text.primary, children: "Terms of Services and Privacy Notice for Gemini CLI" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.text.link, children: 'https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md' }) })] }));
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=AuthDialog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuthDialog.js","sourceRoot":"","sources":["../../../../src/ui/auth/AuthDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { renderWithProviders } from '../../test-utils/render.js';
|
|
8
|
+
import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
|
|
9
|
+
import { AuthDialog } from './AuthDialog.js';
|
|
10
|
+
import { AuthType } from '@google/gemini-cli-core';
|
|
11
|
+
import { SettingScope } from '../../config/settings.js';
|
|
12
|
+
import { AuthState } from '../types.js';
|
|
13
|
+
import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
|
|
14
|
+
import { useKeypress } from '../hooks/useKeypress.js';
|
|
15
|
+
import { validateAuthMethodWithSettings } from './useAuth.js';
|
|
16
|
+
import { runExitCleanup } from '../../utils/cleanup.js';
|
|
17
|
+
import { clearCachedCredentialFile } from '@google/gemini-cli-core';
|
|
18
|
+
import { Text } from 'ink';
|
|
19
|
+
// Mocks
|
|
20
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
21
|
+
const actual = await importOriginal();
|
|
22
|
+
return {
|
|
23
|
+
...actual,
|
|
24
|
+
clearCachedCredentialFile: vi.fn(),
|
|
25
|
+
};
|
|
26
|
+
});
|
|
27
|
+
vi.mock('../../utils/cleanup.js', () => ({
|
|
28
|
+
runExitCleanup: vi.fn(),
|
|
29
|
+
}));
|
|
30
|
+
vi.mock('./useAuth.js', () => ({
|
|
31
|
+
validateAuthMethodWithSettings: vi.fn(),
|
|
32
|
+
}));
|
|
33
|
+
vi.mock('../hooks/useKeypress.js', () => ({
|
|
34
|
+
useKeypress: vi.fn(),
|
|
35
|
+
}));
|
|
36
|
+
vi.mock('../components/shared/RadioButtonSelect.js', () => ({
|
|
37
|
+
RadioButtonSelect: vi.fn(({ items, initialIndex }) => (_jsx(_Fragment, { children: items.map((item, index) => (_jsxs(Text, { children: [index === initialIndex ? '(selected)' : '(not selected)', ' ', item.label] }, item.value))) }))),
|
|
38
|
+
}));
|
|
39
|
+
const mockedUseKeypress = useKeypress;
|
|
40
|
+
const mockedRadioButtonSelect = RadioButtonSelect;
|
|
41
|
+
const mockedValidateAuthMethod = validateAuthMethodWithSettings;
|
|
42
|
+
const mockedRunExitCleanup = runExitCleanup;
|
|
43
|
+
const mockedClearCachedCredentialFile = clearCachedCredentialFile;
|
|
44
|
+
describe('AuthDialog', () => {
|
|
45
|
+
let props;
|
|
46
|
+
const originalEnv = { ...process.env };
|
|
47
|
+
beforeEach(() => {
|
|
48
|
+
vi.resetAllMocks();
|
|
49
|
+
process.env = {};
|
|
50
|
+
props = {
|
|
51
|
+
config: {
|
|
52
|
+
isBrowserLaunchSuppressed: vi.fn().mockReturnValue(false),
|
|
53
|
+
},
|
|
54
|
+
settings: {
|
|
55
|
+
merged: {
|
|
56
|
+
security: {
|
|
57
|
+
auth: {},
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
setValue: vi.fn(),
|
|
61
|
+
},
|
|
62
|
+
setAuthState: vi.fn(),
|
|
63
|
+
authError: null,
|
|
64
|
+
onAuthError: vi.fn(),
|
|
65
|
+
};
|
|
66
|
+
});
|
|
67
|
+
afterEach(() => {
|
|
68
|
+
process.env = originalEnv;
|
|
69
|
+
});
|
|
70
|
+
it('shows Cloud Shell option when in Cloud Shell environment', () => {
|
|
71
|
+
process.env['CLOUD_SHELL'] = 'true';
|
|
72
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
73
|
+
const items = mockedRadioButtonSelect.mock.calls[0][0].items;
|
|
74
|
+
expect(items).toContainEqual({
|
|
75
|
+
label: 'Use Cloud Shell user credentials',
|
|
76
|
+
value: AuthType.CLOUD_SHELL,
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
it('filters auth types when enforcedType is set', () => {
|
|
80
|
+
props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
|
|
81
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
82
|
+
const items = mockedRadioButtonSelect.mock.calls[0][0].items;
|
|
83
|
+
expect(items).toHaveLength(1);
|
|
84
|
+
expect(items[0].value).toBe(AuthType.USE_GEMINI);
|
|
85
|
+
});
|
|
86
|
+
it('sets initial index to 0 when enforcedType is set', () => {
|
|
87
|
+
props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
|
|
88
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
89
|
+
const { initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
90
|
+
expect(initialIndex).toBe(0);
|
|
91
|
+
});
|
|
92
|
+
it('selects initial auth type from settings', () => {
|
|
93
|
+
props.settings.merged.security.auth.selectedType = AuthType.USE_VERTEX_AI;
|
|
94
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
95
|
+
const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
96
|
+
expect(items[initialIndex].value).toBe(AuthType.USE_VERTEX_AI);
|
|
97
|
+
});
|
|
98
|
+
it('selects initial auth type from GEMINI_DEFAULT_AUTH_TYPE env var', () => {
|
|
99
|
+
process.env['GEMINI_DEFAULT_AUTH_TYPE'] = AuthType.USE_GEMINI;
|
|
100
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
101
|
+
const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
102
|
+
expect(items[initialIndex].value).toBe(AuthType.USE_GEMINI);
|
|
103
|
+
});
|
|
104
|
+
it('selects initial auth type from GEMINI_API_KEY env var', () => {
|
|
105
|
+
process.env['GEMINI_API_KEY'] = 'test-key';
|
|
106
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
107
|
+
const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
108
|
+
expect(items[initialIndex].value).toBe(AuthType.USE_GEMINI);
|
|
109
|
+
});
|
|
110
|
+
it('defaults to Login with Google', () => {
|
|
111
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
112
|
+
const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
113
|
+
expect(items[initialIndex].value).toBe(AuthType.LOGIN_WITH_GOOGLE);
|
|
114
|
+
});
|
|
115
|
+
describe('handleAuthSelect', () => {
|
|
116
|
+
it('calls onAuthError if validation fails', () => {
|
|
117
|
+
mockedValidateAuthMethod.mockReturnValue('Invalid method');
|
|
118
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
119
|
+
const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
120
|
+
handleAuthSelect(AuthType.USE_GEMINI);
|
|
121
|
+
expect(mockedValidateAuthMethod).toHaveBeenCalledWith(AuthType.USE_GEMINI, props.settings);
|
|
122
|
+
expect(props.onAuthError).toHaveBeenCalledWith('Invalid method');
|
|
123
|
+
expect(props.settings.setValue).not.toHaveBeenCalled();
|
|
124
|
+
});
|
|
125
|
+
it('calls onSelect if validation passes', async () => {
|
|
126
|
+
mockedValidateAuthMethod.mockReturnValue(null);
|
|
127
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
128
|
+
const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
129
|
+
await handleAuthSelect(AuthType.USE_GEMINI);
|
|
130
|
+
expect(mockedValidateAuthMethod).toHaveBeenCalledWith(AuthType.USE_GEMINI, props.settings);
|
|
131
|
+
expect(props.onAuthError).not.toHaveBeenCalled();
|
|
132
|
+
expect(mockedClearCachedCredentialFile).toHaveBeenCalled();
|
|
133
|
+
expect(props.settings.setValue).toHaveBeenCalledWith(SettingScope.User, 'security.auth.selectedType', AuthType.USE_GEMINI);
|
|
134
|
+
expect(props.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
|
|
135
|
+
});
|
|
136
|
+
it('exits process for Login with Google when browser is suppressed', async () => {
|
|
137
|
+
const exitSpy = vi
|
|
138
|
+
.spyOn(process, 'exit')
|
|
139
|
+
.mockImplementation(() => undefined);
|
|
140
|
+
const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
141
|
+
vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
|
|
142
|
+
mockedValidateAuthMethod.mockReturnValue(null);
|
|
143
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
144
|
+
const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
|
|
145
|
+
await handleAuthSelect(AuthType.LOGIN_WITH_GOOGLE);
|
|
146
|
+
expect(mockedRunExitCleanup).toHaveBeenCalled();
|
|
147
|
+
expect(logSpy).toHaveBeenCalledWith(expect.stringContaining('Please restart Gemini CLI'));
|
|
148
|
+
expect(exitSpy).toHaveBeenCalledWith(0);
|
|
149
|
+
exitSpy.mockRestore();
|
|
150
|
+
logSpy.mockRestore();
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
it('displays authError when provided', () => {
|
|
154
|
+
props.authError = 'Something went wrong';
|
|
155
|
+
const { lastFrame } = renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
156
|
+
expect(lastFrame()).toContain('Something went wrong');
|
|
157
|
+
});
|
|
158
|
+
describe('useKeypress', () => {
|
|
159
|
+
it('does nothing on escape if authError is present', () => {
|
|
160
|
+
props.authError = 'Some error';
|
|
161
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
162
|
+
const keypressHandler = mockedUseKeypress.mock.calls[0][0];
|
|
163
|
+
keypressHandler({ name: 'escape' });
|
|
164
|
+
expect(props.onAuthError).not.toHaveBeenCalled();
|
|
165
|
+
expect(props.setAuthState).not.toHaveBeenCalled();
|
|
166
|
+
});
|
|
167
|
+
it('calls onAuthError on escape if no auth method is set', () => {
|
|
168
|
+
props.settings.merged.security.auth.selectedType = undefined;
|
|
169
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
170
|
+
const keypressHandler = mockedUseKeypress.mock.calls[0][0];
|
|
171
|
+
keypressHandler({ name: 'escape' });
|
|
172
|
+
expect(props.onAuthError).toHaveBeenCalledWith('You must select an auth method to proceed. Press Ctrl+C twice to exit.');
|
|
173
|
+
});
|
|
174
|
+
it('calls onSelect(undefined) on escape if auth method is set', () => {
|
|
175
|
+
props.settings.merged.security.auth.selectedType = AuthType.USE_GEMINI;
|
|
176
|
+
renderWithProviders(_jsx(AuthDialog, { ...props }));
|
|
177
|
+
const keypressHandler = mockedUseKeypress.mock.calls[0][0];
|
|
178
|
+
keypressHandler({ name: 'escape' });
|
|
179
|
+
expect(props.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
|
|
180
|
+
expect(props.settings.setValue).not.toHaveBeenCalled();
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
});
|
|
184
|
+
//# sourceMappingURL=AuthDialog.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuthDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/auth/AuthDialog.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { useState, useEffect } from 'react';
|
|
3
3
|
import { Box, Text } from 'ink';
|
|
4
4
|
import Spinner from 'ink-spinner';
|
|
5
|
-
import {
|
|
5
|
+
import { theme } from '../semantic-colors.js';
|
|
6
6
|
import { useKeypress } from '../hooks/useKeypress.js';
|
|
7
7
|
export function AuthInProgress({ onTimeout, }) {
|
|
8
8
|
const [timedOut, setTimedOut] = useState(false);
|
|
@@ -18,6 +18,6 @@ export function AuthInProgress({ onTimeout, }) {
|
|
|
18
18
|
}, 180000);
|
|
19
19
|
return () => clearTimeout(timer);
|
|
20
20
|
}, [onTimeout]);
|
|
21
|
-
return (_jsx(Box, { borderStyle: "round", borderColor:
|
|
21
|
+
return (_jsx(Box, { borderStyle: "round", borderColor: theme.border.default, flexDirection: "column", padding: 1, width: "100%", children: timedOut ? (_jsx(Text, { color: theme.status.error, children: "Authentication timed out. Please try again." })) : (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Spinner, { type: "dots" }), " Waiting for auth... (Press ESC or CTRL+C to cancel)"] }) })) }));
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=AuthInProgress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuthInProgress.js","sourceRoot":"","sources":["../../../../src/ui/auth/AuthInProgress.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAMtD,MAAM,UAAU,cAAc,CAAC,EAC7B,SAAS,GACW;IACpB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhD,WAAW,CACT,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YAC5D,SAAS,EAAE,CAAC;QACd,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACnB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,WAAW,CAAC,IAAI,CAAC,CAAC;YAClB,SAAS,EAAE,CAAC;QACd,CAAC,EAAE,MAAM,CAAC,CAAC;QAEX,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,CACL,KAAC,GAAG,IACF,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EACjC,aAAa,EAAC,QAAQ,EACtB,OAAO,EAAE,CAAC,EACV,KAAK,EAAC,MAAM,YAEX,QAAQ,CAAC,CAAC,CAAC,CACV,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,4DAExB,CACR,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,cACF,MAAC,IAAI,eACH,KAAC,OAAO,IAAC,IAAI,EAAC,MAAM,GAAG,4DAElB,GACH,CACP,GACG,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { LoadedSettings } from '../../config/settings.js';
|
|
7
|
+
import { AuthType, type Config } from '@google/gemini-cli-core';
|
|
8
|
+
import { AuthState } from '../types.js';
|
|
9
|
+
export declare function validateAuthMethodWithSettings(authType: AuthType, settings: LoadedSettings): string | null;
|
|
10
|
+
export declare const useAuthCommand: (settings: LoadedSettings, config: Config) => {
|
|
11
|
+
authState: AuthState;
|
|
12
|
+
setAuthState: import("react").Dispatch<import("react").SetStateAction<AuthState>>;
|
|
13
|
+
authError: string | null;
|
|
14
|
+
onAuthError: (error: string) => void;
|
|
15
|
+
};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { useState, useEffect, useCallback } from 'react';
|
|
7
|
+
import { AuthType } from '@google/gemini-cli-core';
|
|
8
|
+
import { getErrorMessage } from '@google/gemini-cli-core';
|
|
9
|
+
import { AuthState } from '../types.js';
|
|
10
|
+
import { validateAuthMethod } from '../../config/auth.js';
|
|
11
|
+
export function validateAuthMethodWithSettings(authType, settings) {
|
|
12
|
+
const enforcedType = settings.merged.security?.auth?.enforcedType;
|
|
13
|
+
if (enforcedType && enforcedType !== authType) {
|
|
14
|
+
return `Authentication is enforced to be ${enforcedType}, but you are currently using ${authType}.`;
|
|
15
|
+
}
|
|
16
|
+
if (settings.merged.security?.auth?.useExternal) {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
return validateAuthMethod(authType);
|
|
20
|
+
}
|
|
21
|
+
export const useAuthCommand = (settings, config) => {
|
|
22
|
+
const [authState, setAuthState] = useState(AuthState.Unauthenticated);
|
|
23
|
+
const [authError, setAuthError] = useState(null);
|
|
24
|
+
const onAuthError = useCallback((error) => {
|
|
25
|
+
setAuthError(error);
|
|
26
|
+
setAuthState(AuthState.Updating);
|
|
27
|
+
}, [setAuthError, setAuthState]);
|
|
28
|
+
useEffect(() => {
|
|
29
|
+
(async () => {
|
|
30
|
+
if (authState !== AuthState.Unauthenticated) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const authType = settings.merged.security?.auth?.selectedType;
|
|
34
|
+
if (!authType) {
|
|
35
|
+
if (process.env['GEMINI_API_KEY']) {
|
|
36
|
+
onAuthError('Existing API key detected (GEMINI_API_KEY). Select "Gemini API Key" option to use it.');
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
onAuthError('No authentication method selected.');
|
|
40
|
+
}
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const error = validateAuthMethodWithSettings(authType, settings);
|
|
44
|
+
if (error) {
|
|
45
|
+
onAuthError(error);
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const defaultAuthType = process.env['GEMINI_DEFAULT_AUTH_TYPE'];
|
|
49
|
+
if (defaultAuthType &&
|
|
50
|
+
!Object.values(AuthType).includes(defaultAuthType)) {
|
|
51
|
+
onAuthError(`Invalid value for GEMINI_DEFAULT_AUTH_TYPE: "${defaultAuthType}". ` +
|
|
52
|
+
`Valid values are: ${Object.values(AuthType).join(', ')}.`);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
try {
|
|
56
|
+
await config.refreshAuth(authType);
|
|
57
|
+
console.log(`Authenticated via "${authType}".`);
|
|
58
|
+
setAuthError(null);
|
|
59
|
+
setAuthState(AuthState.Authenticated);
|
|
60
|
+
}
|
|
61
|
+
catch (e) {
|
|
62
|
+
onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
|
|
63
|
+
}
|
|
64
|
+
})();
|
|
65
|
+
}, [settings, config, authState, setAuthState, setAuthError, onAuthError]);
|
|
66
|
+
return {
|
|
67
|
+
authState,
|
|
68
|
+
setAuthState,
|
|
69
|
+
authError,
|
|
70
|
+
onAuthError,
|
|
71
|
+
};
|
|
72
|
+
};
|
|
73
|
+
//# sourceMappingURL=useAuth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useAuth.js","sourceRoot":"","sources":["../../../../src/ui/auth/useAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { getCliVersion } from '../../utils/version.js';
|
|
|
7
7
|
import { CommandKind } from './types.js';
|
|
8
8
|
import process from 'node:process';
|
|
9
9
|
import { MessageType } from '../types.js';
|
|
10
|
+
import { IdeClient } from '@google/gemini-cli-core';
|
|
10
11
|
export const aboutCommand = {
|
|
11
12
|
name: 'about',
|
|
12
13
|
description: 'show version info',
|
|
@@ -24,9 +25,7 @@ export const aboutCommand = {
|
|
|
24
25
|
const cliVersion = await getCliVersion();
|
|
25
26
|
const selectedAuthType = context.services.settings.merged.security?.auth?.selectedType || '';
|
|
26
27
|
const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
|
|
27
|
-
const ideClient = (context
|
|
28
|
-
context.services.config?.getIdeClient()?.getDetectedIdeDisplayName()) ||
|
|
29
|
-
'';
|
|
28
|
+
const ideClient = await getIdeClientName(context);
|
|
30
29
|
const aboutItem = {
|
|
31
30
|
type: MessageType.ABOUT,
|
|
32
31
|
cliVersion,
|
|
@@ -40,4 +39,11 @@ export const aboutCommand = {
|
|
|
40
39
|
context.ui.addItem(aboutItem, Date.now());
|
|
41
40
|
},
|
|
42
41
|
};
|
|
42
|
+
async function getIdeClientName(context) {
|
|
43
|
+
if (!context.services.config?.getIdeMode()) {
|
|
44
|
+
return '';
|
|
45
|
+
}
|
|
46
|
+
const ideClient = await IdeClient.getInstance();
|
|
47
|
+
return ideClient?.getDetectedIdeDisplayName() ?? '';
|
|
48
|
+
}
|
|
43
49
|
//# sourceMappingURL=aboutCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aboutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"aboutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,MAAM,SAAS,GAAiC;YAC9C,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,UAAU;YACV,SAAS;YACT,UAAU;YACV,YAAY;YACZ,gBAAgB;YAChB,UAAU;YACV,SAAS;SACV,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC"}
|
|
@@ -10,7 +10,7 @@ import { MessageType } from '../types.js';
|
|
|
10
10
|
import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
|
|
11
11
|
import { formatMemoryUsage } from '../utils/formatters.js';
|
|
12
12
|
import { getCliVersion } from '../../utils/version.js';
|
|
13
|
-
import { sessionId } from '@google/gemini-cli-core';
|
|
13
|
+
import { IdeClient, sessionId } from '@google/gemini-cli-core';
|
|
14
14
|
export const bugCommand = {
|
|
15
15
|
name: 'bug',
|
|
16
16
|
description: 'submit a bug report',
|
|
@@ -29,9 +29,7 @@ export const bugCommand = {
|
|
|
29
29
|
const modelVersion = config?.getModel() || 'Unknown';
|
|
30
30
|
const cliVersion = await getCliVersion();
|
|
31
31
|
const memoryUsage = formatMemoryUsage(process.memoryUsage().rss);
|
|
32
|
-
const ideClient = (context
|
|
33
|
-
context.services.config?.getIdeClient()?.getDetectedIdeDisplayName()) ||
|
|
34
|
-
'';
|
|
32
|
+
const ideClient = await getIdeClientName(context);
|
|
35
33
|
let info = `
|
|
36
34
|
* **CLI Version:** ${cliVersion}
|
|
37
35
|
* **Git Commit:** ${GIT_COMMIT_INFO}
|
|
@@ -68,4 +66,11 @@ export const bugCommand = {
|
|
|
68
66
|
}
|
|
69
67
|
},
|
|
70
68
|
};
|
|
69
|
+
async function getIdeClientName(context) {
|
|
70
|
+
if (!context.services.config?.getIdeMode()) {
|
|
71
|
+
return '';
|
|
72
|
+
}
|
|
73
|
+
const ideClient = await IdeClient.getInstance();
|
|
74
|
+
return ideClient.getDetectedIdeDisplayName() ?? '';
|
|
75
|
+
}
|
|
71
76
|
//# sourceMappingURL=bugCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bugCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/bugCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAGL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"bugCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/bugCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAGL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,CAAC,MAAM,UAAU,GAAiB;IACtC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,qBAAqB;IAClC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EAAE,OAAuB,EAAE,IAAa,EAAiB,EAAE;QACtE,MAAM,cAAc,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;QAEpC,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3D,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,IAAI,IAAI,GAAG;qBACM,UAAU;oBACX,eAAe;oBACf,SAAS;0BACH,SAAS;6BACN,UAAU;uBAChB,YAAY;sBACb,WAAW;CAChC,CAAC;QACE,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,IAAI,qBAAqB,SAAS,IAAI,CAAC;QAC7C,CAAC;QAED,IAAI,YAAY,GACd,0GAA0G,CAAC;QAE7G,MAAM,kBAAkB,GAAG,MAAM,EAAE,aAAa,EAAE,CAAC;QACnD,IAAI,kBAAkB,EAAE,WAAW,EAAE,CAAC;YACpC,YAAY,GAAG,kBAAkB,CAAC,WAAW,CAAC;QAChD,CAAC;QAED,YAAY,GAAG,YAAY;aACxB,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;aACtD,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;YACE,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,8EAA8E,YAAY,EAAE;SACnG,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;gBACE,IAAI,EAAE,WAAW,CAAC,KAAK;gBACvB,IAAI,EAAE,kCAAkC,YAAY,EAAE;aACvD,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,CAAC,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACrD,CAAC"}
|
|
@@ -4,4 +4,6 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import type { SlashCommand } from './types.js';
|
|
7
|
+
import type { Content } from '@google/genai';
|
|
8
|
+
export declare function serializeHistoryToMarkdown(history: Content[]): string;
|
|
7
9
|
export declare const chatCommand: SlashCommand;
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import * as fsPromises from 'node:fs/promises';
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import { Text } from 'ink';
|
|
9
|
-
import {
|
|
9
|
+
import { theme } from '../semantic-colors.js';
|
|
10
10
|
import { CommandKind } from './types.js';
|
|
11
11
|
import { decodeTagName } from '@google/gemini-cli-core';
|
|
12
12
|
import path from 'node:path';
|
|
@@ -92,7 +92,7 @@ const saveCommand = {
|
|
|
92
92
|
if (exists) {
|
|
93
93
|
return {
|
|
94
94
|
type: 'confirm_action',
|
|
95
|
-
prompt: React.createElement(Text, null, 'A checkpoint with the tag ', React.createElement(Text, { color:
|
|
95
|
+
prompt: React.createElement(Text, null, 'A checkpoint with the tag ', React.createElement(Text, { color: theme.text.accent }, tag), ' already exists. Do you want to overwrite it?'),
|
|
96
96
|
originalInvocation: {
|
|
97
97
|
raw: context.invocation?.raw || `/chat save ${tag}`,
|
|
98
98
|
},
|
|
@@ -226,10 +226,89 @@ const deleteCommand = {
|
|
|
226
226
|
.filter((name) => name.startsWith(partialArg));
|
|
227
227
|
},
|
|
228
228
|
};
|
|
229
|
+
export function serializeHistoryToMarkdown(history) {
|
|
230
|
+
return history
|
|
231
|
+
.map((item) => {
|
|
232
|
+
const text = item.parts
|
|
233
|
+
?.filter((m) => !!m.text)
|
|
234
|
+
.map((m) => m.text)
|
|
235
|
+
.join('') || '';
|
|
236
|
+
return `**${item.role}**:\n\n${text}`;
|
|
237
|
+
})
|
|
238
|
+
.join('\n\n---\n\n');
|
|
239
|
+
}
|
|
240
|
+
const shareCommand = {
|
|
241
|
+
name: 'share',
|
|
242
|
+
description: 'Share the current conversation to a markdown or json file. Usage: /chat share <file>',
|
|
243
|
+
kind: CommandKind.BUILT_IN,
|
|
244
|
+
action: async (context, args) => {
|
|
245
|
+
let filePathArg = args.trim();
|
|
246
|
+
if (!filePathArg) {
|
|
247
|
+
filePathArg = `gemini-conversation-${Date.now()}.json`;
|
|
248
|
+
}
|
|
249
|
+
const filePath = path.resolve(filePathArg);
|
|
250
|
+
const extension = path.extname(filePath);
|
|
251
|
+
if (extension !== '.md' && extension !== '.json') {
|
|
252
|
+
return {
|
|
253
|
+
type: 'message',
|
|
254
|
+
messageType: 'error',
|
|
255
|
+
content: 'Invalid file format. Only .md and .json are supported.',
|
|
256
|
+
};
|
|
257
|
+
}
|
|
258
|
+
const chat = await context.services.config?.getGeminiClient()?.getChat();
|
|
259
|
+
if (!chat) {
|
|
260
|
+
return {
|
|
261
|
+
type: 'message',
|
|
262
|
+
messageType: 'error',
|
|
263
|
+
content: 'No chat client available to share conversation.',
|
|
264
|
+
};
|
|
265
|
+
}
|
|
266
|
+
const history = chat.getHistory();
|
|
267
|
+
// An empty conversation has two hidden messages that setup the context for
|
|
268
|
+
// the chat. Thus, to check whether a conversation has been started, we
|
|
269
|
+
// can't check for length 0.
|
|
270
|
+
if (history.length <= 2) {
|
|
271
|
+
return {
|
|
272
|
+
type: 'message',
|
|
273
|
+
messageType: 'info',
|
|
274
|
+
content: 'No conversation found to share.',
|
|
275
|
+
};
|
|
276
|
+
}
|
|
277
|
+
let content = '';
|
|
278
|
+
if (extension === '.json') {
|
|
279
|
+
content = JSON.stringify(history, null, 2);
|
|
280
|
+
}
|
|
281
|
+
else {
|
|
282
|
+
content = serializeHistoryToMarkdown(history);
|
|
283
|
+
}
|
|
284
|
+
try {
|
|
285
|
+
await fsPromises.writeFile(filePath, content);
|
|
286
|
+
return {
|
|
287
|
+
type: 'message',
|
|
288
|
+
messageType: 'info',
|
|
289
|
+
content: `Conversation shared to ${filePath}`,
|
|
290
|
+
};
|
|
291
|
+
}
|
|
292
|
+
catch (err) {
|
|
293
|
+
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
294
|
+
return {
|
|
295
|
+
type: 'message',
|
|
296
|
+
messageType: 'error',
|
|
297
|
+
content: `Error sharing conversation: ${errorMessage}`,
|
|
298
|
+
};
|
|
299
|
+
}
|
|
300
|
+
},
|
|
301
|
+
};
|
|
229
302
|
export const chatCommand = {
|
|
230
303
|
name: 'chat',
|
|
231
304
|
description: 'Manage conversation history.',
|
|
232
305
|
kind: CommandKind.BUILT_IN,
|
|
233
|
-
subCommands: [
|
|
306
|
+
subCommands: [
|
|
307
|
+
listCommand,
|
|
308
|
+
saveCommand,
|
|
309
|
+
resumeCommand,
|
|
310
|
+
deleteCommand,
|
|
311
|
+
shareCommand,
|
|
312
|
+
],
|
|
234
313
|
};
|
|
235
314
|
//# sourceMappingURL=chatCommand.js.map
|