@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
|
@@ -3,8 +3,13 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
// Mock 'os' first.
|
|
7
6
|
import * as osActual from 'node:os';
|
|
7
|
+
import { ideContextStore } from '@google/gemini-cli-core';
|
|
8
|
+
import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
|
|
9
|
+
import * as fs from 'node:fs';
|
|
10
|
+
import stripJsonComments from 'strip-json-comments';
|
|
11
|
+
import * as path from 'node:path';
|
|
12
|
+
import { loadTrustedFolders, getTrustedFoldersPath, TrustLevel, isWorkspaceTrusted, } from './trustedFolders.js';
|
|
8
13
|
vi.mock('os', async (importOriginal) => {
|
|
9
14
|
const actualOs = await importOriginal();
|
|
10
15
|
return {
|
|
@@ -13,11 +18,6 @@ vi.mock('os', async (importOriginal) => {
|
|
|
13
18
|
platform: vi.fn(() => 'linux'),
|
|
14
19
|
};
|
|
15
20
|
});
|
|
16
|
-
import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
|
|
17
|
-
import * as fs from 'node:fs';
|
|
18
|
-
import stripJsonComments from 'strip-json-comments';
|
|
19
|
-
import * as path from 'node:path';
|
|
20
|
-
import { loadTrustedFolders, USER_TRUSTED_FOLDERS_PATH, TrustLevel, isWorkspaceTrusted, } from './trustedFolders.js';
|
|
21
21
|
vi.mock('fs', async (importOriginal) => {
|
|
22
22
|
const actualFs = await importOriginal();
|
|
23
23
|
return {
|
|
@@ -53,8 +53,42 @@ describe('Trusted Folders Loading', () => {
|
|
|
53
53
|
expect(rules).toEqual([]);
|
|
54
54
|
expect(errors).toEqual([]);
|
|
55
55
|
});
|
|
56
|
+
describe('isPathTrusted', () => {
|
|
57
|
+
function setup({ config = {} } = {}) {
|
|
58
|
+
mockFsExistsSync.mockImplementation((p) => p === getTrustedFoldersPath());
|
|
59
|
+
fs.readFileSync.mockImplementation((p) => {
|
|
60
|
+
if (p === getTrustedFoldersPath())
|
|
61
|
+
return JSON.stringify(config);
|
|
62
|
+
return '{}';
|
|
63
|
+
});
|
|
64
|
+
const folders = loadTrustedFolders();
|
|
65
|
+
return { folders };
|
|
66
|
+
}
|
|
67
|
+
it('provides a method to determine if a path is trusted', () => {
|
|
68
|
+
const { folders } = setup({
|
|
69
|
+
config: {
|
|
70
|
+
'./myfolder': TrustLevel.TRUST_FOLDER,
|
|
71
|
+
'/trustedparent/trustme': TrustLevel.TRUST_PARENT,
|
|
72
|
+
'/user/folder': TrustLevel.TRUST_FOLDER,
|
|
73
|
+
'/secret': TrustLevel.DO_NOT_TRUST,
|
|
74
|
+
'/secret/publickeys': TrustLevel.TRUST_FOLDER,
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
expect(folders.isPathTrusted('/secret')).toBe(false);
|
|
78
|
+
expect(folders.isPathTrusted('/user/folder')).toBe(true);
|
|
79
|
+
expect(folders.isPathTrusted('/secret/publickeys/public.pem')).toBe(true);
|
|
80
|
+
expect(folders.isPathTrusted('/user/folder/harhar')).toBe(true);
|
|
81
|
+
expect(folders.isPathTrusted('myfolder/somefile.jpg')).toBe(true);
|
|
82
|
+
expect(folders.isPathTrusted('/trustedparent/someotherfolder')).toBe(true);
|
|
83
|
+
expect(folders.isPathTrusted('/trustedparent/trustme')).toBe(true);
|
|
84
|
+
// No explicit rule covers this file
|
|
85
|
+
expect(folders.isPathTrusted('/secret/bankaccounts.json')).toBe(undefined);
|
|
86
|
+
expect(folders.isPathTrusted('/secret/mine/privatekey.pem')).toBe(undefined);
|
|
87
|
+
expect(folders.isPathTrusted('/user/someotherfolder')).toBe(undefined);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
56
90
|
it('should load user rules if only user file exists', () => {
|
|
57
|
-
const userPath =
|
|
91
|
+
const userPath = getTrustedFoldersPath();
|
|
58
92
|
mockFsExistsSync.mockImplementation((p) => p === userPath);
|
|
59
93
|
const userContent = {
|
|
60
94
|
'/user/folder': TrustLevel.TRUST_FOLDER,
|
|
@@ -71,7 +105,7 @@ describe('Trusted Folders Loading', () => {
|
|
|
71
105
|
expect(errors).toEqual([]);
|
|
72
106
|
});
|
|
73
107
|
it('should handle JSON parsing errors gracefully', () => {
|
|
74
|
-
const userPath =
|
|
108
|
+
const userPath = getTrustedFoldersPath();
|
|
75
109
|
mockFsExistsSync.mockImplementation((p) => p === userPath);
|
|
76
110
|
fs.readFileSync.mockImplementation((p) => {
|
|
77
111
|
if (p === userPath)
|
|
@@ -84,11 +118,33 @@ describe('Trusted Folders Loading', () => {
|
|
|
84
118
|
expect(errors[0].path).toBe(userPath);
|
|
85
119
|
expect(errors[0].message).toContain('Unexpected token');
|
|
86
120
|
});
|
|
121
|
+
it('should use GEMINI_CLI_TRUSTED_FOLDERS_PATH env var if set', () => {
|
|
122
|
+
const customPath = '/custom/path/to/trusted_folders.json';
|
|
123
|
+
process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'] = customPath;
|
|
124
|
+
mockFsExistsSync.mockImplementation((p) => p === customPath);
|
|
125
|
+
const userContent = {
|
|
126
|
+
'/user/folder/from/env': TrustLevel.TRUST_FOLDER,
|
|
127
|
+
};
|
|
128
|
+
fs.readFileSync.mockImplementation((p) => {
|
|
129
|
+
if (p === customPath)
|
|
130
|
+
return JSON.stringify(userContent);
|
|
131
|
+
return '{}';
|
|
132
|
+
});
|
|
133
|
+
const { rules, errors } = loadTrustedFolders();
|
|
134
|
+
expect(rules).toEqual([
|
|
135
|
+
{
|
|
136
|
+
path: '/user/folder/from/env',
|
|
137
|
+
trustLevel: TrustLevel.TRUST_FOLDER,
|
|
138
|
+
},
|
|
139
|
+
]);
|
|
140
|
+
expect(errors).toEqual([]);
|
|
141
|
+
delete process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'];
|
|
142
|
+
});
|
|
87
143
|
it('setValue should update the user config and save it', () => {
|
|
88
144
|
const loadedFolders = loadTrustedFolders();
|
|
89
145
|
loadedFolders.setValue('/new/path', TrustLevel.TRUST_FOLDER);
|
|
90
146
|
expect(loadedFolders.user.config['/new/path']).toBe(TrustLevel.TRUST_FOLDER);
|
|
91
|
-
expect(mockFsWriteFileSync).toHaveBeenCalledWith(
|
|
147
|
+
expect(mockFsWriteFileSync).toHaveBeenCalledWith(getTrustedFoldersPath(), JSON.stringify({ '/new/path': TrustLevel.TRUST_FOLDER }, null, 2), { encoding: 'utf-8', mode: 0o600 });
|
|
92
148
|
});
|
|
93
149
|
});
|
|
94
150
|
describe('isWorkspaceTrusted', () => {
|
|
@@ -97,7 +153,6 @@ describe('isWorkspaceTrusted', () => {
|
|
|
97
153
|
const mockSettings = {
|
|
98
154
|
security: {
|
|
99
155
|
folderTrust: {
|
|
100
|
-
featureEnabled: true,
|
|
101
156
|
enabled: true,
|
|
102
157
|
},
|
|
103
158
|
},
|
|
@@ -105,12 +160,12 @@ describe('isWorkspaceTrusted', () => {
|
|
|
105
160
|
beforeEach(() => {
|
|
106
161
|
vi.spyOn(process, 'cwd').mockImplementation(() => mockCwd);
|
|
107
162
|
vi.spyOn(fs, 'readFileSync').mockImplementation((p) => {
|
|
108
|
-
if (p ===
|
|
163
|
+
if (p === getTrustedFoldersPath()) {
|
|
109
164
|
return JSON.stringify(mockRules);
|
|
110
165
|
}
|
|
111
166
|
return '{}';
|
|
112
167
|
});
|
|
113
|
-
vi.spyOn(fs, 'existsSync').mockImplementation((p) => p ===
|
|
168
|
+
vi.spyOn(fs, 'existsSync').mockImplementation((p) => p === getTrustedFoldersPath());
|
|
114
169
|
});
|
|
115
170
|
afterEach(() => {
|
|
116
171
|
vi.restoreAllMocks();
|
|
@@ -161,4 +216,44 @@ describe('isWorkspaceTrusted', () => {
|
|
|
161
216
|
expect(isWorkspaceTrusted(mockSettings)).toBe(true);
|
|
162
217
|
});
|
|
163
218
|
});
|
|
219
|
+
describe('isWorkspaceTrusted with IDE override', () => {
|
|
220
|
+
afterEach(() => {
|
|
221
|
+
ideContextStore.clear();
|
|
222
|
+
});
|
|
223
|
+
const mockSettings = {
|
|
224
|
+
security: {
|
|
225
|
+
folderTrust: {
|
|
226
|
+
enabled: true,
|
|
227
|
+
},
|
|
228
|
+
},
|
|
229
|
+
};
|
|
230
|
+
it('should return true when ideTrust is true, ignoring config', () => {
|
|
231
|
+
ideContextStore.set({ workspaceState: { isTrusted: true } });
|
|
232
|
+
// Even if config says don't trust, ideTrust should win.
|
|
233
|
+
vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({ [process.cwd()]: TrustLevel.DO_NOT_TRUST }));
|
|
234
|
+
expect(isWorkspaceTrusted(mockSettings)).toBe(true);
|
|
235
|
+
});
|
|
236
|
+
it('should return false when ideTrust is false, ignoring config', () => {
|
|
237
|
+
ideContextStore.set({ workspaceState: { isTrusted: false } });
|
|
238
|
+
// Even if config says trust, ideTrust should win.
|
|
239
|
+
vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({ [process.cwd()]: TrustLevel.TRUST_FOLDER }));
|
|
240
|
+
expect(isWorkspaceTrusted(mockSettings)).toBe(false);
|
|
241
|
+
});
|
|
242
|
+
it('should fall back to config when ideTrust is undefined', () => {
|
|
243
|
+
vi.spyOn(fs, 'existsSync').mockReturnValue(true);
|
|
244
|
+
vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({ [process.cwd()]: TrustLevel.TRUST_FOLDER }));
|
|
245
|
+
expect(isWorkspaceTrusted(mockSettings)).toBe(true);
|
|
246
|
+
});
|
|
247
|
+
it('should always return true if folderTrust setting is disabled', () => {
|
|
248
|
+
const settings = {
|
|
249
|
+
security: {
|
|
250
|
+
folderTrust: {
|
|
251
|
+
enabled: false,
|
|
252
|
+
},
|
|
253
|
+
},
|
|
254
|
+
};
|
|
255
|
+
ideContextStore.set({ workspaceState: { isTrusted: false } });
|
|
256
|
+
expect(isWorkspaceTrusted(settings)).toBe(true);
|
|
257
|
+
});
|
|
258
|
+
});
|
|
164
259
|
//# sourceMappingURL=trustedFolders.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trustedFolders.test.js","sourceRoot":"","sources":["../../../src/config/trustedFolders.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"trustedFolders.test.js","sourceRoot":"","sources":["../../../src/config/trustedFolders.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { type AuthType, type Config } from '@google/gemini-cli-core';
|
|
7
|
+
/**
|
|
8
|
+
* Handles the initial authentication flow.
|
|
9
|
+
* @param config The application config.
|
|
10
|
+
* @param authType The selected auth type.
|
|
11
|
+
* @returns An error message if authentication fails, otherwise null.
|
|
12
|
+
*/
|
|
13
|
+
export declare function performInitialAuth(config: Config, authType: AuthType | undefined): Promise<string | null>;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { getErrorMessage, } from '@google/gemini-cli-core';
|
|
7
|
+
/**
|
|
8
|
+
* Handles the initial authentication flow.
|
|
9
|
+
* @param config The application config.
|
|
10
|
+
* @param authType The selected auth type.
|
|
11
|
+
* @returns An error message if authentication fails, otherwise null.
|
|
12
|
+
*/
|
|
13
|
+
export async function performInitialAuth(config, authType) {
|
|
14
|
+
if (!authType) {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
try {
|
|
18
|
+
await config.refreshAuth(authType);
|
|
19
|
+
// The console.log is intentionally left out here.
|
|
20
|
+
// We can add a dedicated startup message later if needed.
|
|
21
|
+
}
|
|
22
|
+
catch (e) {
|
|
23
|
+
return `Failed to login. Message: ${getErrorMessage(e)}`;
|
|
24
|
+
}
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/core/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAGL,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAEjC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,QAA8B;IAE9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,kDAAkD;QAClD,0DAA0D;IAC5D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,6BAA6B,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { type Config } from '@google/gemini-cli-core';
|
|
7
|
+
import { type LoadedSettings } from '../config/settings.js';
|
|
8
|
+
export interface InitializationResult {
|
|
9
|
+
authError: string | null;
|
|
10
|
+
themeError: string | null;
|
|
11
|
+
shouldOpenAuthDialog: boolean;
|
|
12
|
+
geminiMdFileCount: number;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Orchestrates the application's startup initialization.
|
|
16
|
+
* This runs BEFORE the React UI is rendered.
|
|
17
|
+
* @param config The application config.
|
|
18
|
+
* @param settings The loaded application settings.
|
|
19
|
+
* @returns The results of the initialization.
|
|
20
|
+
*/
|
|
21
|
+
export declare function initializeApp(config: Config, settings: LoadedSettings): Promise<InitializationResult>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { IdeClient, IdeConnectionEvent, IdeConnectionType, logIdeConnection, } from '@google/gemini-cli-core';
|
|
7
|
+
import {} from '../config/settings.js';
|
|
8
|
+
import { performInitialAuth } from './auth.js';
|
|
9
|
+
import { validateTheme } from './theme.js';
|
|
10
|
+
/**
|
|
11
|
+
* Orchestrates the application's startup initialization.
|
|
12
|
+
* This runs BEFORE the React UI is rendered.
|
|
13
|
+
* @param config The application config.
|
|
14
|
+
* @param settings The loaded application settings.
|
|
15
|
+
* @returns The results of the initialization.
|
|
16
|
+
*/
|
|
17
|
+
export async function initializeApp(config, settings) {
|
|
18
|
+
const authError = await performInitialAuth(config, settings.merged.security?.auth?.selectedType);
|
|
19
|
+
const themeError = validateTheme(settings);
|
|
20
|
+
const shouldOpenAuthDialog = settings.merged.security?.auth?.selectedType === undefined || !!authError;
|
|
21
|
+
if (config.getIdeMode()) {
|
|
22
|
+
const ideClient = await IdeClient.getInstance();
|
|
23
|
+
await ideClient.connect();
|
|
24
|
+
logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.START));
|
|
25
|
+
}
|
|
26
|
+
return {
|
|
27
|
+
authError,
|
|
28
|
+
themeError,
|
|
29
|
+
shouldOpenAuthDialog,
|
|
30
|
+
geminiMdFileCount: config.getGeminiMdFileCount(),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=initializer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../../src/core/initializer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,GAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAS3C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,QAAwB;IAExB,MAAM,SAAS,GAAG,MAAM,kBAAkB,CACxC,MAAM,EACN,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAC7C,CAAC;IACF,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,oBAAoB,GACxB,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC;IAE5E,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,gBAAgB,CAAC,MAAM,EAAE,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO;QACL,SAAS;QACT,UAAU;QACV,oBAAoB;QACpB,iBAAiB,EAAE,MAAM,CAAC,oBAAoB,EAAE;KACjD,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
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
|
+
/**
|
|
8
|
+
* Validates the configured theme.
|
|
9
|
+
* @param settings The loaded application settings.
|
|
10
|
+
* @returns An error message if the theme is not found, otherwise null.
|
|
11
|
+
*/
|
|
12
|
+
export declare function validateTheme(settings: LoadedSettings): string | null;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { themeManager } from '../ui/themes/theme-manager.js';
|
|
7
|
+
import {} from '../config/settings.js';
|
|
8
|
+
/**
|
|
9
|
+
* Validates the configured theme.
|
|
10
|
+
* @param settings The loaded application settings.
|
|
11
|
+
* @returns An error message if the theme is not found, otherwise null.
|
|
12
|
+
*/
|
|
13
|
+
export function validateTheme(settings) {
|
|
14
|
+
const effectiveTheme = settings.merged.ui?.theme;
|
|
15
|
+
if (effectiveTheme && !themeManager.findThemeByName(effectiveTheme)) {
|
|
16
|
+
return `Theme "${effectiveTheme}" not found.`;
|
|
17
|
+
}
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=theme.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../src/core/theme.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAwB;IACpD,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC;IACjD,IAAI,cAAc,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC;QACpE,OAAO,UAAU,cAAc,cAAc,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/src/gemini.d.ts
CHANGED
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import type { DnsResolutionOrder, LoadedSettings } from './config/settings.js';
|
|
7
7
|
import type { Config } from '@google/gemini-cli-core';
|
|
8
|
+
import { type InitializationResult } from './core/initializer.js';
|
|
8
9
|
export declare function validateDnsResolutionOrder(order: string | undefined): DnsResolutionOrder;
|
|
9
10
|
export declare function setupUnhandledRejectionHandler(): void;
|
|
10
|
-
export declare function startInteractiveUI(config: Config, settings: LoadedSettings, startupWarnings: string[], workspaceRoot: string): Promise<void>;
|
|
11
|
+
export declare function startInteractiveUI(config: Config, settings: LoadedSettings, startupWarnings: string[], workspaceRoot: string | undefined, initializationResult: InitializationResult): Promise<void>;
|
|
11
12
|
export declare function main(): Promise<void>;
|
package/dist/src/gemini.js
CHANGED
|
@@ -6,7 +6,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
6
6
|
*/
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import { render } from 'ink';
|
|
9
|
-
import {
|
|
9
|
+
import { AppContainer } from './ui/AppContainer.js';
|
|
10
10
|
import { loadCliConfig, parseArguments } from './config/config.js';
|
|
11
11
|
import { readStdin } from './utils/readStdin.js';
|
|
12
12
|
import { basename } from 'node:path';
|
|
@@ -15,16 +15,18 @@ import os from 'node:os';
|
|
|
15
15
|
import dns from 'node:dns';
|
|
16
16
|
import { spawn } from 'node:child_process';
|
|
17
17
|
import { start_sandbox } from './utils/sandbox.js';
|
|
18
|
-
import {
|
|
18
|
+
import { RELAUNCH_EXIT_CODE } from './utils/processUtils.js';
|
|
19
|
+
import { loadSettings, migrateDeprecatedSettings, SettingScope, } from './config/settings.js';
|
|
19
20
|
import { themeManager } from './ui/themes/theme-manager.js';
|
|
20
21
|
import { getStartupWarnings } from './utils/startupWarnings.js';
|
|
21
22
|
import { getUserStartupWarnings } from './utils/userStartupWarnings.js';
|
|
22
23
|
import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
|
|
23
24
|
import { runNonInteractive } from './nonInteractiveCli.js';
|
|
24
25
|
import { loadExtensions } from './config/extension.js';
|
|
25
|
-
import { cleanupCheckpoints, registerCleanup } from './utils/cleanup.js';
|
|
26
|
+
import { cleanupCheckpoints, registerCleanup, runExitCleanup, } from './utils/cleanup.js';
|
|
26
27
|
import { getCliVersion } from './utils/version.js';
|
|
27
|
-
import { sessionId, logUserPrompt, AuthType, getOauthClient,
|
|
28
|
+
import { sessionId, logUserPrompt, AuthType, getOauthClient, } from '@google/gemini-cli-core';
|
|
29
|
+
import { initializeApp, } from './core/initializer.js';
|
|
28
30
|
import { validateAuthMethod } from './config/auth.js';
|
|
29
31
|
import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js';
|
|
30
32
|
import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
|
|
@@ -33,6 +35,10 @@ import { checkForUpdates } from './ui/utils/updateCheck.js';
|
|
|
33
35
|
import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
|
|
34
36
|
import { appEvents, AppEvent } from './utils/events.js';
|
|
35
37
|
import { SettingsContext } from './ui/contexts/SettingsContext.js';
|
|
38
|
+
import { SessionStatsProvider } from './ui/contexts/SessionContext.js';
|
|
39
|
+
import { VimModeProvider } from './ui/contexts/VimModeContext.js';
|
|
40
|
+
import { KeypressProvider } from './ui/contexts/KeypressContext.js';
|
|
41
|
+
import { useKittyKeyboardProtocol } from './ui/hooks/useKittyKeyboardProtocol.js';
|
|
36
42
|
export function validateDnsResolutionOrder(order) {
|
|
37
43
|
const defaultValue = 'ipv4first';
|
|
38
44
|
if (order === undefined) {
|
|
@@ -65,15 +71,44 @@ function getNodeMemoryArgs(config) {
|
|
|
65
71
|
}
|
|
66
72
|
return [];
|
|
67
73
|
}
|
|
68
|
-
async function
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
async function relaunchOnExitCode(runner) {
|
|
75
|
+
while (true) {
|
|
76
|
+
try {
|
|
77
|
+
const exitCode = await runner();
|
|
78
|
+
if (exitCode !== RELAUNCH_EXIT_CODE) {
|
|
79
|
+
process.exit(exitCode);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
process.stdin.resume();
|
|
84
|
+
console.error('Fatal error: Failed to relaunch the CLI process.', error);
|
|
85
|
+
process.exit(1);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
async function relaunchAppInChildProcess(additionalArgs) {
|
|
90
|
+
if (process.env['GEMINI_CLI_NO_RELAUNCH']) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
const runner = () => {
|
|
94
|
+
const nodeArgs = [...additionalArgs, ...process.argv.slice(1)];
|
|
95
|
+
const newEnv = { ...process.env, GEMINI_CLI_NO_RELAUNCH: 'true' };
|
|
96
|
+
// The parent process should not be reading from stdin while the child is running.
|
|
97
|
+
process.stdin.pause();
|
|
98
|
+
const child = spawn(process.execPath, nodeArgs, {
|
|
99
|
+
stdio: 'inherit',
|
|
100
|
+
env: newEnv,
|
|
101
|
+
});
|
|
102
|
+
return new Promise((resolve, reject) => {
|
|
103
|
+
child.on('error', reject);
|
|
104
|
+
child.on('close', (code) => {
|
|
105
|
+
// Resume stdin before the parent process exits.
|
|
106
|
+
process.stdin.resume();
|
|
107
|
+
resolve(code ?? 1);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
};
|
|
111
|
+
await relaunchOnExitCode(runner);
|
|
77
112
|
}
|
|
78
113
|
import { runZedIntegration } from './zed-integration/zedIntegration.js';
|
|
79
114
|
export function setupUnhandledRejectionHandler() {
|
|
@@ -95,12 +130,18 @@ ${reason.stack}`
|
|
|
95
130
|
}
|
|
96
131
|
});
|
|
97
132
|
}
|
|
98
|
-
export async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot) {
|
|
133
|
+
export async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult) {
|
|
99
134
|
const version = await getCliVersion();
|
|
100
|
-
// Detect and enable Kitty keyboard protocol once at startup
|
|
101
|
-
await detectAndEnableKittyProtocol();
|
|
102
135
|
setWindowTitle(basename(workspaceRoot), settings);
|
|
103
|
-
|
|
136
|
+
// Create wrapper component to use hooks inside render
|
|
137
|
+
const AppWrapper = () => {
|
|
138
|
+
const kittyProtocolStatus = useKittyKeyboardProtocol();
|
|
139
|
+
return (_jsx(SettingsContext.Provider, { value: settings, children: _jsx(KeypressProvider, { kittyProtocolEnabled: kittyProtocolStatus.enabled, config: config, debugKeystrokeLogging: settings.merged.general?.debugKeystrokeLogging, children: _jsx(SessionStatsProvider, { children: _jsx(VimModeProvider, { settings: settings, children: _jsx(AppContainer, { config: config, settings: settings, startupWarnings: startupWarnings, version: version, initializationResult: initializationResult }) }) }) }) }));
|
|
140
|
+
};
|
|
141
|
+
const instance = render(process.env['DEBUG'] ? (_jsx(React.StrictMode, { children: _jsx(AppWrapper, {}) })) : (_jsx(AppWrapper, {})), {
|
|
142
|
+
exitOnCtrlC: false,
|
|
143
|
+
isScreenReaderEnabled: config.getScreenReader(),
|
|
144
|
+
});
|
|
104
145
|
checkForUpdates()
|
|
105
146
|
.then((info) => {
|
|
106
147
|
handleAutoUpdate(info, settings, config.getProjectRoot());
|
|
@@ -115,16 +156,33 @@ export async function startInteractiveUI(config, settings, startupWarnings, work
|
|
|
115
156
|
}
|
|
116
157
|
export async function main() {
|
|
117
158
|
setupUnhandledRejectionHandler();
|
|
118
|
-
const
|
|
119
|
-
|
|
159
|
+
const settings = loadSettings();
|
|
160
|
+
migrateDeprecatedSettings(settings);
|
|
120
161
|
await cleanupCheckpoints();
|
|
121
|
-
if (settings.errors.length > 0) {
|
|
122
|
-
const errorMessages = settings.errors.map((error) => `Error in ${error.path}: ${error.message}`);
|
|
123
|
-
throw new FatalConfigError(`${errorMessages.join('\n')}\nPlease fix the configuration file(s) and try again.`);
|
|
124
|
-
}
|
|
125
162
|
const argv = await parseArguments(settings.merged);
|
|
126
|
-
const extensions = loadExtensions(
|
|
163
|
+
const extensions = loadExtensions();
|
|
127
164
|
const config = await loadCliConfig(settings.merged, extensions, sessionId, argv);
|
|
165
|
+
// Check for invalid input combinations early to prevent crashes
|
|
166
|
+
if (argv.promptInteractive && !process.stdin.isTTY) {
|
|
167
|
+
console.error('Error: The --prompt-interactive flag cannot be used when input is piped from stdin.');
|
|
168
|
+
process.exit(1);
|
|
169
|
+
}
|
|
170
|
+
const wasRaw = process.stdin.isRaw;
|
|
171
|
+
let kittyProtocolDetectionComplete;
|
|
172
|
+
if (config.isInteractive() && !wasRaw && process.stdin.isTTY) {
|
|
173
|
+
// Set this as early as possible to avoid spurious characters from
|
|
174
|
+
// input showing up in the output.
|
|
175
|
+
process.stdin.setRawMode(true);
|
|
176
|
+
// This cleanup isn't strictly needed but may help in certain situations.
|
|
177
|
+
process.on('SIGTERM', () => {
|
|
178
|
+
process.stdin.setRawMode(wasRaw);
|
|
179
|
+
});
|
|
180
|
+
process.on('SIGINT', () => {
|
|
181
|
+
process.stdin.setRawMode(wasRaw);
|
|
182
|
+
});
|
|
183
|
+
// Detect and enable Kitty keyboard protocol once at startup.
|
|
184
|
+
kittyProtocolDetectionComplete = detectAndEnableKittyProtocol();
|
|
185
|
+
}
|
|
128
186
|
const consolePatcher = new ConsolePatcher({
|
|
129
187
|
stderr: true,
|
|
130
188
|
debugMode: config.getDebugMode(),
|
|
@@ -132,10 +190,6 @@ export async function main() {
|
|
|
132
190
|
consolePatcher.patch();
|
|
133
191
|
registerCleanup(consolePatcher.cleanup);
|
|
134
192
|
dns.setDefaultResultOrder(validateDnsResolutionOrder(settings.merged.advanced?.dnsResolutionOrder));
|
|
135
|
-
if (argv.promptInteractive && !process.stdin.isTTY) {
|
|
136
|
-
console.error('Error: The --prompt-interactive flag is not supported when piping input from stdin.');
|
|
137
|
-
process.exit(1);
|
|
138
|
-
}
|
|
139
193
|
if (config.getListExtensions()) {
|
|
140
194
|
console.log('Installed extensions:');
|
|
141
195
|
for (const extension of extensions) {
|
|
@@ -149,28 +203,17 @@ export async function main() {
|
|
|
149
203
|
settings.setValue(SettingScope.User, 'selectedAuthType', AuthType.CLOUD_SHELL);
|
|
150
204
|
}
|
|
151
205
|
}
|
|
152
|
-
// Empty key causes issues with the GoogleGenAI package.
|
|
153
|
-
if (process.env['GEMINI_API_KEY']?.trim() === '') {
|
|
154
|
-
delete process.env['GEMINI_API_KEY'];
|
|
155
|
-
}
|
|
156
|
-
if (process.env['GOOGLE_API_KEY']?.trim() === '') {
|
|
157
|
-
delete process.env['GOOGLE_API_KEY'];
|
|
158
|
-
}
|
|
159
206
|
setMaxSizedBoxDebugging(config.getDebugMode());
|
|
160
|
-
await config.initialize();
|
|
161
|
-
if (config.getIdeMode()) {
|
|
162
|
-
await config.getIdeClient().connect();
|
|
163
|
-
logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.START));
|
|
164
|
-
}
|
|
165
207
|
// Load custom themes from settings
|
|
166
208
|
themeManager.loadCustomThemes(settings.merged.ui?.customThemes);
|
|
167
209
|
if (settings.merged.ui?.theme) {
|
|
168
210
|
if (!themeManager.setActiveTheme(settings.merged.ui?.theme)) {
|
|
169
211
|
// If the theme is not found during initial load, log a warning and continue.
|
|
170
|
-
// The useThemeCommand hook in
|
|
212
|
+
// The useThemeCommand hook in AppContainer.tsx will handle opening the dialog.
|
|
171
213
|
console.warn(`Warning: Theme "${settings.merged.ui?.theme}" not found.`);
|
|
172
214
|
}
|
|
173
215
|
}
|
|
216
|
+
const initializationResult = await initializeApp(config, settings);
|
|
174
217
|
// hop into sandbox if we are outside and sandboxing is enabled
|
|
175
218
|
if (!process.env['SANDBOX']) {
|
|
176
219
|
const memoryArgs = settings.merged.advanced?.autoConfigureMemory
|
|
@@ -216,16 +259,13 @@ export async function main() {
|
|
|
216
259
|
return finalArgs;
|
|
217
260
|
};
|
|
218
261
|
const sandboxArgs = injectStdinIntoArgs(process.argv, stdinData);
|
|
219
|
-
await start_sandbox(sandboxConfig, memoryArgs, config, sandboxArgs);
|
|
262
|
+
await relaunchOnExitCode(() => start_sandbox(sandboxConfig, memoryArgs, config, sandboxArgs));
|
|
220
263
|
process.exit(0);
|
|
221
264
|
}
|
|
222
265
|
else {
|
|
223
|
-
//
|
|
224
|
-
//
|
|
225
|
-
|
|
226
|
-
await relaunchWithAdditionalArgs(memoryArgs);
|
|
227
|
-
process.exit(0);
|
|
228
|
-
}
|
|
266
|
+
// Relaunch app so we always have a child process that can be internally
|
|
267
|
+
// restarted if needed.
|
|
268
|
+
await relaunchAppInChildProcess(memoryArgs);
|
|
229
269
|
}
|
|
230
270
|
}
|
|
231
271
|
if (settings.merged.security?.auth?.selectedType ===
|
|
@@ -240,13 +280,16 @@ export async function main() {
|
|
|
240
280
|
let input = config.getQuestion();
|
|
241
281
|
const startupWarnings = [
|
|
242
282
|
...(await getStartupWarnings()),
|
|
243
|
-
...(await getUserStartupWarnings(
|
|
283
|
+
...(await getUserStartupWarnings()),
|
|
244
284
|
];
|
|
245
285
|
// Render UI, passing necessary config values. Check that there is no command line question.
|
|
246
286
|
if (config.isInteractive()) {
|
|
247
|
-
|
|
287
|
+
// Need kitty detection to be complete before we can start the interactive UI.
|
|
288
|
+
await kittyProtocolDetectionComplete;
|
|
289
|
+
await startInteractiveUI(config, settings, startupWarnings, process.cwd(), initializationResult);
|
|
248
290
|
return;
|
|
249
291
|
}
|
|
292
|
+
await config.initialize();
|
|
250
293
|
// If not a TTY, read from stdin
|
|
251
294
|
// This is for cases where the user pipes input directly into the command
|
|
252
295
|
if (!process.stdin.isTTY) {
|
|
@@ -268,11 +311,13 @@ export async function main() {
|
|
|
268
311
|
auth_type: config.getContentGeneratorConfig()?.authType,
|
|
269
312
|
prompt_length: input.length,
|
|
270
313
|
});
|
|
271
|
-
const nonInteractiveConfig = await validateNonInteractiveAuth(settings.merged.security?.auth?.selectedType, settings.merged.security?.auth?.useExternal, config);
|
|
314
|
+
const nonInteractiveConfig = await validateNonInteractiveAuth(settings.merged.security?.auth?.selectedType, settings.merged.security?.auth?.useExternal, config, settings);
|
|
272
315
|
if (config.getDebugMode()) {
|
|
273
316
|
console.log('Session ID: %s', sessionId);
|
|
274
317
|
}
|
|
275
318
|
await runNonInteractive(nonInteractiveConfig, input, prompt_id);
|
|
319
|
+
// Call cleanup before process.exit, which causes cleanup to not run
|
|
320
|
+
await runExitCleanup();
|
|
276
321
|
process.exit(0);
|
|
277
322
|
}
|
|
278
323
|
function setWindowTitle(title, settings) {
|