@google/gemini-cli 0.31.0-preview.2 → 0.32.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +2 -2
- package/dist/src/commands/extensions/examples/policies/README.md +41 -0
- package/dist/src/commands/extensions/examples/policies/gemini-extension.json +5 -0
- package/dist/src/commands/extensions/examples/policies/policies/policies.toml +28 -0
- package/dist/src/commands/extensions/link.test.js +5 -21
- package/dist/src/commands/extensions/link.test.js.map +1 -1
- package/dist/src/commands/extensions/list.test.js +10 -24
- package/dist/src/commands/extensions/list.test.js.map +1 -1
- package/dist/src/commands/mcp/list.js +32 -14
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp/list.test.js +22 -1
- package/dist/src/commands/mcp/list.test.js.map +1 -1
- package/dist/src/commands/skills/disable.test.js +4 -7
- package/dist/src/commands/skills/disable.test.js.map +1 -1
- package/dist/src/commands/skills/enable.test.js +4 -7
- package/dist/src/commands/skills/enable.test.js.map +1 -1
- package/dist/src/commands/skills/install.test.js +12 -9
- package/dist/src/commands/skills/install.test.js.map +1 -1
- package/dist/src/commands/skills/link.test.js +5 -2
- package/dist/src/commands/skills/link.test.js.map +1 -1
- package/dist/src/commands/skills/list.test.js +16 -29
- package/dist/src/commands/skills/list.test.js.map +1 -1
- package/dist/src/commands/skills/uninstall.test.js +9 -6
- package/dist/src/commands/skills/uninstall.test.js.map +1 -1
- package/dist/src/config/config.js +3 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +55 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager.d.ts +8 -1
- package/dist/src/config/extension-manager.js +88 -23
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension-manager.test.d.ts +6 -0
- package/dist/src/config/extension-manager.test.js +138 -0
- package/dist/src/config/extension-manager.test.js.map +1 -0
- package/dist/src/config/extension.test.js +93 -4
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/consent.test.js +35 -43
- package/dist/src/config/extensions/consent.test.js.map +1 -1
- package/dist/src/config/keyBindings.js +1 -1
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/policy-engine.integration.test.js +12 -12
- package/dist/src/config/policy.d.ts +20 -0
- package/dist/src/config/policy.js +35 -7
- package/dist/src/config/policy.js.map +1 -1
- package/dist/src/config/policy.test.js +71 -24
- package/dist/src/config/policy.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +98 -3
- package/dist/src/config/settingsSchema.js +92 -1
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +49 -0
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/workspace-policy-cli.test.js +48 -19
- package/dist/src/config/workspace-policy-cli.test.js.map +1 -1
- package/dist/src/gemini.js +7 -8
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +5 -1
- 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/test-utils/AppRig.d.ts +26 -0
- package/dist/src/test-utils/AppRig.js +128 -6
- package/dist/src/test-utils/AppRig.js.map +1 -1
- package/dist/src/test-utils/customMatchers.d.ts +25 -5
- package/dist/src/test-utils/customMatchers.js +46 -0
- package/dist/src/test-utils/customMatchers.js.map +1 -1
- package/dist/src/test-utils/mockConfig.js +4 -0
- package/dist/src/test-utils/mockConfig.js.map +1 -1
- package/dist/src/test-utils/mockDebugLogger.d.ts +35 -0
- package/dist/src/test-utils/mockDebugLogger.js +67 -0
- package/dist/src/test-utils/mockDebugLogger.js.map +1 -0
- package/dist/src/test-utils/render.d.ts +13 -0
- package/dist/src/test-utils/render.js +48 -8
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/test-utils/svg.d.ts +7 -0
- package/dist/src/test-utils/svg.js +163 -0
- package/dist/src/test-utils/svg.js.map +1 -0
- package/dist/src/ui/AppContainer.js +48 -66
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +89 -0
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +17 -3
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js +10 -3
- package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.js +2 -0
- package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
- package/dist/src/ui/commands/statsCommand.js +10 -4
- package/dist/src/ui/commands/statsCommand.js.map +1 -1
- package/dist/src/ui/commands/statsCommand.test.js +12 -3
- package/dist/src/ui/commands/statsCommand.test.js.map +1 -1
- package/dist/src/ui/components/AnsiOutput.test.js +3 -3
- package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
- package/dist/src/ui/components/AskUserDialog.d.ts +4 -0
- package/dist/src/ui/components/AskUserDialog.js +5 -5
- package/dist/src/ui/components/AskUserDialog.js.map +1 -1
- package/dist/src/ui/components/AskUserDialog.test.js +6 -7
- package/dist/src/ui/components/AskUserDialog.test.js.map +1 -1
- package/dist/src/ui/components/Composer.js +17 -6
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +47 -6
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.js +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.js.map +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.test.js +6 -6
- package/dist/src/ui/components/ConfigInitDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +6 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js +43 -4
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +9 -1
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/DialogManager.test.js +4 -0
- package/dist/src/ui/components/DialogManager.test.js.map +1 -1
- package/dist/src/ui/components/EmptyWalletDialog.d.ts +22 -0
- package/dist/src/ui/components/EmptyWalletDialog.js +33 -0
- package/dist/src/ui/components/EmptyWalletDialog.js.map +1 -0
- package/dist/src/ui/components/EmptyWalletDialog.test.d.ts +6 -0
- package/dist/src/ui/components/EmptyWalletDialog.test.js +127 -0
- package/dist/src/ui/components/EmptyWalletDialog.test.js.map +1 -0
- package/dist/src/ui/components/ExitPlanModeDialog.d.ts +2 -1
- package/dist/src/ui/components/ExitPlanModeDialog.js +34 -7
- package/dist/src/ui/components/ExitPlanModeDialog.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.test.js +31 -2
- package/dist/src/ui/components/ExitPlanModeDialog.test.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +3 -1
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Footer.test.js +63 -1
- package/dist/src/ui/components/Footer.test.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.d.ts +0 -5
- package/dist/src/ui/components/GeminiRespondingSpinner.js +1 -32
- package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.test.js +5 -10
- package/dist/src/ui/components/GeminiRespondingSpinner.test.js.map +1 -1
- package/dist/src/ui/components/GeminiSpinner.d.ts +13 -0
- package/dist/src/ui/components/GeminiSpinner.js +35 -0
- package/dist/src/ui/components/GeminiSpinner.js.map +1 -0
- package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +31 -3
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +82 -18
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/OverageMenuDialog.d.ts +22 -0
- package/dist/src/ui/components/OverageMenuDialog.js +32 -0
- package/dist/src/ui/components/OverageMenuDialog.js.map +1 -0
- package/dist/src/ui/components/OverageMenuDialog.test.d.ts +6 -0
- package/dist/src/ui/components/OverageMenuDialog.test.js +129 -0
- package/dist/src/ui/components/OverageMenuDialog.test.js.map +1 -0
- package/dist/src/ui/components/ProQuotaDialog.d.ts +3 -1
- package/dist/src/ui/components/ProQuotaDialog.js +11 -6
- package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +27 -14
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +9 -11
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatsDisplay.d.ts +1 -0
- package/dist/src/ui/components/StatsDisplay.js +2 -2
- package/dist/src/ui/components/StatsDisplay.js.map +1 -1
- package/dist/src/ui/components/Table.test.js +23 -4
- package/dist/src/ui/components/Table.test.js.map +1 -1
- package/dist/src/ui/components/ToastDisplay.js +1 -1
- package/dist/src/ui/components/ToastDisplay.js.map +1 -1
- package/dist/src/ui/components/ToastDisplay.test.js +2 -2
- package/dist/src/ui/components/ToastDisplay.test.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.js +3 -1
- package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.test.js +3 -2
- package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
- package/dist/src/ui/components/messages/RedirectionConfirmation.test.js +1 -1
- package/dist/src/ui/components/messages/RedirectionConfirmation.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.d.ts +2 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +3 -2
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +17 -17
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +17 -7
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +88 -5
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolOverflowConsistencyChecks.test.js +1 -1
- package/dist/src/ui/components/messages/ToolOverflowConsistencyChecks.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplayOverflow.test.js +11 -4
- package/dist/src/ui/components/messages/ToolResultDisplayOverflow.test.js.map +1 -1
- package/dist/src/ui/components/shared/DialogFooter.d.ts +2 -0
- package/dist/src/ui/components/shared/DialogFooter.js +2 -1
- package/dist/src/ui/components/shared/DialogFooter.js.map +1 -1
- package/dist/src/ui/components/shared/ExpandableText.test.js +21 -16
- package/dist/src/ui/components/shared/ExpandableText.test.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.js +10 -1
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js +8 -8
- package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -1
- package/dist/src/ui/components/shared/Scrollable.d.ts +1 -1
- package/dist/src/ui/components/shared/Scrollable.js +76 -43
- package/dist/src/ui/components/shared/Scrollable.js.map +1 -1
- package/dist/src/ui/components/shared/Scrollable.test.js +15 -20
- package/dist/src/ui/components/shared/Scrollable.test.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.js +14 -9
- package/dist/src/ui/components/shared/ScrollableList.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.test.js +153 -0
- package/dist/src/ui/components/shared/ScrollableList.test.js.map +1 -1
- package/dist/src/ui/components/shared/VirtualizedList.js +133 -88
- package/dist/src/ui/components/shared/VirtualizedList.js.map +1 -1
- package/dist/src/ui/components/shared/VirtualizedList.test.js +6 -3
- package/dist/src/ui/components/shared/VirtualizedList.test.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.js +3 -30
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/views/McpStatus.d.ts +1 -0
- package/dist/src/ui/components/views/McpStatus.js +2 -2
- package/dist/src/ui/components/views/McpStatus.js.map +1 -1
- package/dist/src/ui/components/views/McpStatus.test.js +7 -0
- package/dist/src/ui/components/views/McpStatus.test.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +24 -1
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +4 -0
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/creditsFlowHandler.d.ts +35 -0
- package/dist/src/ui/hooks/creditsFlowHandler.js +144 -0
- package/dist/src/ui/hooks/creditsFlowHandler.js.map +1 -0
- package/dist/src/ui/hooks/creditsFlowHandler.test.d.ts +6 -0
- package/dist/src/ui/hooks/creditsFlowHandler.test.js +180 -0
- package/dist/src/ui/hooks/creditsFlowHandler.test.js.map +1 -0
- package/dist/src/ui/hooks/shell-completions/gitProvider.d.ts +7 -0
- package/dist/src/ui/hooks/shell-completions/gitProvider.js +73 -0
- package/dist/src/ui/hooks/shell-completions/gitProvider.js.map +1 -0
- package/dist/src/ui/hooks/shell-completions/gitProvider.test.d.ts +6 -0
- package/dist/src/ui/hooks/shell-completions/gitProvider.test.js +73 -0
- package/dist/src/ui/hooks/shell-completions/gitProvider.test.js.map +1 -0
- package/dist/src/ui/hooks/shell-completions/index.d.ts +7 -0
- package/dist/src/ui/hooks/shell-completions/index.js +16 -0
- package/dist/src/ui/hooks/shell-completions/index.js.map +1 -0
- package/dist/src/ui/hooks/shell-completions/npmProvider.d.ts +7 -0
- package/dist/src/ui/hooks/shell-completions/npmProvider.js +67 -0
- package/dist/src/ui/hooks/shell-completions/npmProvider.js.map +1 -0
- package/dist/src/ui/hooks/shell-completions/npmProvider.test.d.ts +6 -0
- package/dist/src/ui/hooks/shell-completions/npmProvider.test.js +69 -0
- package/dist/src/ui/hooks/shell-completions/npmProvider.test.js.map +1 -0
- package/dist/src/ui/hooks/shell-completions/types.d.ts +16 -0
- package/dist/src/ui/hooks/shell-completions/types.js +7 -0
- package/dist/src/ui/hooks/shell-completions/types.js.map +1 -0
- package/dist/src/ui/hooks/shellCommandProcessor.js +1 -0
- package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/toolMapping.js +1 -0
- package/dist/src/ui/hooks/toolMapping.js.map +1 -1
- package/dist/src/ui/hooks/toolMapping.test.js +25 -0
- package/dist/src/ui/hooks/toolMapping.test.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.d.ts +2 -2
- package/dist/src/ui/hooks/useAlternateBuffer.js +5 -4
- package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.test.d.ts +6 -0
- package/dist/src/ui/hooks/useAlternateBuffer.test.js +57 -0
- package/dist/src/ui/hooks/useAlternateBuffer.test.js.map +1 -0
- package/dist/src/ui/hooks/useCommandCompletion.d.ts +2 -1
- package/dist/src/ui/hooks/useCommandCompletion.js +37 -5
- package/dist/src/ui/hooks/useCommandCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js +23 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +83 -5
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +110 -4
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +2 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +7 -2
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +25 -4
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.test.js.map +1 -1
- package/dist/src/ui/hooks/usePrivacySettings.js +9 -3
- package/dist/src/ui/hooks/usePrivacySettings.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +11 -3
- package/dist/src/ui/hooks/useQuotaAndFallback.js +84 -12
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +278 -16
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/hooks/useShellCompletion.d.ts +49 -0
- package/dist/src/ui/hooks/useShellCompletion.js +489 -0
- package/dist/src/ui/hooks/useShellCompletion.js.map +1 -0
- package/dist/src/ui/hooks/useShellCompletion.test.d.ts +6 -0
- package/dist/src/ui/hooks/useShellCompletion.test.js +354 -0
- package/dist/src/ui/hooks/useShellCompletion.test.js.map +1 -0
- package/dist/src/ui/hooks/useTimedMessage.d.ts +1 -1
- package/dist/src/ui/hooks/useTimedMessage.js +5 -3
- package/dist/src/ui/hooks/useTimedMessage.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.js +5 -0
- package/dist/src/ui/hooks/useToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +28 -19
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +3 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.js +4 -86
- package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.test.js +2 -2
- package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
- package/dist/src/ui/utils/TableRenderer.js +18 -12
- package/dist/src/ui/utils/TableRenderer.js.map +1 -1
- package/dist/src/ui/utils/TableRenderer.test.js +152 -22
- package/dist/src/ui/utils/TableRenderer.test.js.map +1 -1
- package/dist/src/ui/utils/borderStyles.js +4 -1
- package/dist/src/ui/utils/borderStyles.js.map +1 -1
- package/dist/src/ui/utils/borderStyles.test.d.ts +6 -0
- package/dist/src/ui/utils/borderStyles.test.js +141 -0
- package/dist/src/ui/utils/borderStyles.test.js.map +1 -0
- package/dist/src/ui/utils/editorUtils.d.ts +17 -0
- package/dist/src/ui/utils/editorUtils.js +104 -0
- package/dist/src/ui/utils/editorUtils.js.map +1 -0
- package/dist/src/ui/utils/markdownParsingUtils.d.ts +10 -0
- package/dist/src/ui/utils/markdownParsingUtils.js +150 -0
- package/dist/src/ui/utils/markdownParsingUtils.js.map +1 -0
- package/dist/src/ui/utils/markdownParsingUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/markdownParsingUtils.test.js +163 -0
- package/dist/src/ui/utils/markdownParsingUtils.test.js.map +1 -0
- package/dist/src/ui/utils/ui-sizing.d.ts +2 -2
- package/dist/src/ui/utils/ui-sizing.js +2 -3
- package/dist/src/ui/utils/ui-sizing.js.map +1 -1
- package/dist/src/ui/utils/ui-sizing.test.js +5 -19
- package/dist/src/ui/utils/ui-sizing.test.js.map +1 -1
- package/dist/src/utils/cleanup.d.ts +2 -0
- package/dist/src/utils/cleanup.js +51 -1
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/cleanup.test.js +130 -2
- package/dist/src/utils/cleanup.test.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.d.ts +2 -1
- package/dist/src/zed-integration/zedIntegration.js +35 -11
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.test.js +17 -1
- package/dist/src/zed-integration/zedIntegration.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.31.0-preview.1.tgz +0 -0
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useState, useEffect, useCallback } from 'react';
|
|
7
|
-
import { UserTierId, getCodeAssistServer, } from '@google/gemini-cli-core';
|
|
7
|
+
import { UserTierId, getCodeAssistServer, debugLogger, } from '@google/gemini-cli-core';
|
|
8
8
|
export const usePrivacySettings = (config) => {
|
|
9
9
|
const [privacyState, setPrivacyState] = useState({
|
|
10
10
|
isLoading: true,
|
|
@@ -81,7 +81,10 @@ function getCodeAssistServerOrFail(config) {
|
|
|
81
81
|
async function getRemoteDataCollectionOptIn(server) {
|
|
82
82
|
try {
|
|
83
83
|
const resp = await server.getCodeAssistGlobalUserSetting();
|
|
84
|
-
|
|
84
|
+
if (resp.freeTierDataCollectionOptin === undefined) {
|
|
85
|
+
debugLogger.warn('Warning: Code Assist API did not return freeTierDataCollectionOptin. Defaulting to true.');
|
|
86
|
+
}
|
|
87
|
+
return resp.freeTierDataCollectionOptin ?? true;
|
|
85
88
|
}
|
|
86
89
|
catch (error) {
|
|
87
90
|
if (error && typeof error === 'object' && 'response' in error) {
|
|
@@ -99,6 +102,9 @@ async function setRemoteDataCollectionOptIn(server, optIn) {
|
|
|
99
102
|
cloudaicompanionProject: server.projectId,
|
|
100
103
|
freeTierDataCollectionOptin: optIn,
|
|
101
104
|
});
|
|
102
|
-
|
|
105
|
+
if (resp.freeTierDataCollectionOptin === undefined) {
|
|
106
|
+
debugLogger.warn(`Warning: Code Assist API did not return freeTierDataCollectionOptin. Defaulting to ${optIn}.`);
|
|
107
|
+
}
|
|
108
|
+
return resp.freeTierDataCollectionOptin ?? optIn;
|
|
103
109
|
}
|
|
104
110
|
//# sourceMappingURL=usePrivacySettings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePrivacySettings.js","sourceRoot":"","sources":["../../../../src/ui/hooks/usePrivacySettings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAGL,UAAU,EACV,mBAAmB,
|
|
1
|
+
{"version":3,"file":"usePrivacySettings.js","sourceRoot":"","sources":["../../../../src/ui/hooks/usePrivacySettings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAGL,UAAU,EACV,mBAAmB,EACnB,WAAW,GACZ,MAAM,yBAAyB,CAAC;AASjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,EAAE;IACnD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAe;QAC7D,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;YACnC,eAAe,CAAC;gBACd,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YACH,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;gBACjD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAC7B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,CAAC;gBACD,IAAI,IAAI,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;oBAC7B,0DAA0D;oBAC1D,uDAAuD;oBACvD,eAAe,CAAC;wBACd,SAAS,EAAE,KAAK;wBAChB,UAAU,EAAE,KAAK;qBAClB,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;gBAED,MAAM,KAAK,GAAG,MAAM,4BAA4B,CAAC,MAAM,CAAC,CAAC;gBACzD,eAAe,CAAC;oBACd,SAAS,EAAE,KAAK;oBAChB,UAAU,EAAE,IAAI;oBAChB,mBAAmB,EAAE,KAAK;iBAC3B,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,eAAe,CAAC;oBACd,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;iBAClD,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QACF,mEAAmE;QACnE,iBAAiB,EAAE,CAAC;IACtB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,yBAAyB,GAAG,WAAW,CAC3C,KAAK,EAAE,KAAc,EAAE,EAAE;QACvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,YAAY,GAAG,MAAM,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACvE,eAAe,CAAC;gBACd,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,IAAI;gBAChB,mBAAmB,EAAE,YAAY;aAClC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,eAAe,CAAC;gBACd,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EACD,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,OAAO;QACL,YAAY;QACZ,yBAAyB;KAC1B,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,yBAAyB,CAAC,MAAc;IAC/C,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;SAAM,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,MAAwB;IAExB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,8BAA8B,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,2BAA2B,KAAK,SAAS,EAAE,CAAC;YACnD,WAAW,CAAC,IAAI,CACd,0FAA0F,CAC3F,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,2BAA2B,IAAI,IAAI,CAAC;IAClD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YAC9D,uEAAuE;YACvE,MAAM,WAAW,GAAG,KAInB,CAAC;YACF,IAAI,WAAW,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,MAAwB,EACxB,KAAc;IAEd,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,8BAA8B,CAAC;QACvD,uBAAuB,EAAE,MAAM,CAAC,SAAS;QACzC,2BAA2B,EAAE,KAAK;KACnC,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,2BAA2B,KAAK,SAAS,EAAE,CAAC;QACnD,WAAW,CAAC,IAAI,CACd,sFAAsF,KAAK,GAAG,CAC/F,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC,2BAA2B,IAAI,KAAK,CAAC;AACnD,CAAC"}
|
|
@@ -3,20 +3,28 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { type Config, type FallbackIntent, type ValidationIntent, type UserTierId } from '@google/gemini-cli-core';
|
|
6
|
+
import { type Config, type FallbackIntent, type ValidationIntent, type UserTierId, type GeminiUserTier } from '@google/gemini-cli-core';
|
|
7
7
|
import { type UseHistoryManagerReturn } from './useHistoryManager.js';
|
|
8
|
-
import { type ProQuotaDialogRequest, type ValidationDialogRequest } from '../contexts/UIStateContext.js';
|
|
8
|
+
import { type ProQuotaDialogRequest, type ValidationDialogRequest, type OverageMenuDialogRequest, type OverageMenuIntent, type EmptyWalletDialogRequest, type EmptyWalletIntent } from '../contexts/UIStateContext.js';
|
|
9
|
+
import type { LoadedSettings } from '../../config/settings.js';
|
|
9
10
|
interface UseQuotaAndFallbackArgs {
|
|
10
11
|
config: Config;
|
|
11
12
|
historyManager: UseHistoryManagerReturn;
|
|
12
13
|
userTier: UserTierId | undefined;
|
|
14
|
+
paidTier: GeminiUserTier | null | undefined;
|
|
15
|
+
settings: LoadedSettings;
|
|
13
16
|
setModelSwitchedFromQuotaError: (value: boolean) => void;
|
|
14
17
|
onShowAuthSelection: () => void;
|
|
18
|
+
errorVerbosity?: 'low' | 'full';
|
|
15
19
|
}
|
|
16
|
-
export declare function useQuotaAndFallback({ config, historyManager, userTier, setModelSwitchedFromQuotaError, onShowAuthSelection, }: UseQuotaAndFallbackArgs): {
|
|
20
|
+
export declare function useQuotaAndFallback({ config, historyManager, userTier, paidTier, settings, setModelSwitchedFromQuotaError, onShowAuthSelection, errorVerbosity, }: UseQuotaAndFallbackArgs): {
|
|
17
21
|
proQuotaRequest: ProQuotaDialogRequest | null;
|
|
18
22
|
handleProQuotaChoice: (choice: FallbackIntent) => void;
|
|
19
23
|
validationRequest: ValidationDialogRequest | null;
|
|
20
24
|
handleValidationChoice: (choice: ValidationIntent) => void;
|
|
25
|
+
overageMenuRequest: OverageMenuDialogRequest | null;
|
|
26
|
+
handleOverageMenuChoice: (choice: OverageMenuIntent) => void;
|
|
27
|
+
emptyWalletRequest: EmptyWalletDialogRequest | null;
|
|
28
|
+
handleEmptyWalletChoice: (choice: EmptyWalletIntent) => void;
|
|
21
29
|
};
|
|
22
30
|
export {};
|
|
@@ -3,25 +3,26 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { AuthType, TerminalQuotaError, ModelNotFoundError, VALID_GEMINI_MODELS, isProModel, getDisplayString, } from '@google/gemini-cli-core';
|
|
6
|
+
import { AuthType, TerminalQuotaError, ModelNotFoundError, VALID_GEMINI_MODELS, isProModel, isOverageEligibleModel, getDisplayString, } from '@google/gemini-cli-core';
|
|
7
7
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
8
8
|
import {} from './useHistoryManager.js';
|
|
9
9
|
import { MessageType } from '../types.js';
|
|
10
10
|
import {} from '../contexts/UIStateContext.js';
|
|
11
|
-
|
|
11
|
+
import { handleCreditsFlow } from './creditsFlowHandler.js';
|
|
12
|
+
export function useQuotaAndFallback({ config, historyManager, userTier, paidTier, settings, setModelSwitchedFromQuotaError, onShowAuthSelection, errorVerbosity = 'full', }) {
|
|
12
13
|
const [proQuotaRequest, setProQuotaRequest] = useState(null);
|
|
13
14
|
const [validationRequest, setValidationRequest] = useState(null);
|
|
15
|
+
// G1 AI Credits dialog states
|
|
16
|
+
const [overageMenuRequest, setOverageMenuRequest] = useState(null);
|
|
17
|
+
const [emptyWalletRequest, setEmptyWalletRequest] = useState(null);
|
|
14
18
|
const isDialogPending = useRef(false);
|
|
15
19
|
const isValidationPending = useRef(false);
|
|
20
|
+
// Initial overage strategy from settings; runtime value read from config at call time.
|
|
21
|
+
const initialOverageStrategy = settings.merged.billing?.overageStrategy ?? 'ask';
|
|
16
22
|
// Set up Flash fallback handler
|
|
17
23
|
useEffect(() => {
|
|
18
24
|
const fallbackHandler = async (failedModel, fallbackModel, error) => {
|
|
19
|
-
// Fallbacks are currently only handled for OAuth users.
|
|
20
25
|
const contentGeneratorConfig = config.getContentGeneratorConfig();
|
|
21
|
-
if (!contentGeneratorConfig ||
|
|
22
|
-
contentGeneratorConfig.authType !== AuthType.LOGIN_WITH_GOOGLE) {
|
|
23
|
-
return null;
|
|
24
|
-
}
|
|
25
26
|
let message;
|
|
26
27
|
let isTerminalQuotaError = false;
|
|
27
28
|
let isModelNotFoundError = false;
|
|
@@ -30,13 +31,47 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
|
|
|
30
31
|
: failedModel;
|
|
31
32
|
if (error instanceof TerminalQuotaError) {
|
|
32
33
|
isTerminalQuotaError = true;
|
|
33
|
-
|
|
34
|
+
const isInsufficientCredits = error.isInsufficientCredits;
|
|
35
|
+
// G1 Credits Flow: Only apply if user has a tier that supports credits
|
|
36
|
+
// (paidTier?.availableCredits indicates the user is a G1 subscriber)
|
|
37
|
+
// Skip if the error explicitly says they have insufficient credits (e.g. they
|
|
38
|
+
// just exhausted them or zero balance cache is delayed).
|
|
39
|
+
if (!isInsufficientCredits &&
|
|
40
|
+
paidTier?.availableCredits &&
|
|
41
|
+
isOverageEligibleModel(failedModel)) {
|
|
42
|
+
const resetTime = error.retryDelayMs
|
|
43
|
+
? getResetTimeMessage(error.retryDelayMs)
|
|
44
|
+
: undefined;
|
|
45
|
+
const overageStrategy = config.getBillingSettings().overageStrategy ??
|
|
46
|
+
initialOverageStrategy;
|
|
47
|
+
const creditsResult = await handleCreditsFlow({
|
|
48
|
+
config,
|
|
49
|
+
paidTier,
|
|
50
|
+
overageStrategy,
|
|
51
|
+
failedModel,
|
|
52
|
+
fallbackModel,
|
|
53
|
+
usageLimitReachedModel,
|
|
54
|
+
resetTime,
|
|
55
|
+
historyManager,
|
|
56
|
+
setModelSwitchedFromQuotaError,
|
|
57
|
+
isDialogPending,
|
|
58
|
+
setOverageMenuRequest,
|
|
59
|
+
setEmptyWalletRequest,
|
|
60
|
+
});
|
|
61
|
+
if (creditsResult)
|
|
62
|
+
return creditsResult;
|
|
63
|
+
}
|
|
64
|
+
// Default: Show existing ProQuotaDialog (for overageStrategy: 'never' or non-G1 users)
|
|
34
65
|
const messageLines = [
|
|
35
66
|
`Usage limit reached for ${usageLimitReachedModel}.`,
|
|
36
|
-
error.retryDelayMs
|
|
67
|
+
error.retryDelayMs
|
|
68
|
+
? `Access resets at ${getResetTimeMessage(error.retryDelayMs)}.`
|
|
69
|
+
: null,
|
|
37
70
|
`/stats model for usage details`,
|
|
38
71
|
`/model to switch models.`,
|
|
39
|
-
|
|
72
|
+
contentGeneratorConfig?.authType === AuthType.LOGIN_WITH_GOOGLE
|
|
73
|
+
? `/auth to switch to API key.`
|
|
74
|
+
: null,
|
|
40
75
|
].filter(Boolean);
|
|
41
76
|
message = messageLines.join('\n');
|
|
42
77
|
}
|
|
@@ -65,6 +100,13 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
|
|
|
65
100
|
];
|
|
66
101
|
message = messageLines.join('\n');
|
|
67
102
|
}
|
|
103
|
+
// In low verbosity mode, auto-retry transient capacity failures
|
|
104
|
+
// without interrupting with a dialog.
|
|
105
|
+
if (errorVerbosity === 'low' &&
|
|
106
|
+
!isTerminalQuotaError &&
|
|
107
|
+
!isModelNotFoundError) {
|
|
108
|
+
return 'retry_once';
|
|
109
|
+
}
|
|
68
110
|
setModelSwitchedFromQuotaError(true);
|
|
69
111
|
config.setQuotaErrorOccurred(true);
|
|
70
112
|
if (isDialogPending.current) {
|
|
@@ -79,12 +121,23 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
|
|
|
79
121
|
message,
|
|
80
122
|
isTerminalQuotaError,
|
|
81
123
|
isModelNotFoundError,
|
|
124
|
+
authType: contentGeneratorConfig?.authType,
|
|
82
125
|
});
|
|
83
126
|
});
|
|
84
127
|
return intent;
|
|
85
128
|
};
|
|
86
129
|
config.setFallbackModelHandler(fallbackHandler);
|
|
87
|
-
}, [
|
|
130
|
+
}, [
|
|
131
|
+
config,
|
|
132
|
+
historyManager,
|
|
133
|
+
userTier,
|
|
134
|
+
paidTier,
|
|
135
|
+
settings,
|
|
136
|
+
initialOverageStrategy,
|
|
137
|
+
setModelSwitchedFromQuotaError,
|
|
138
|
+
onShowAuthSelection,
|
|
139
|
+
errorVerbosity,
|
|
140
|
+
]);
|
|
88
141
|
// Set up validation handler for 403 VALIDATION_REQUIRED errors
|
|
89
142
|
useEffect(() => {
|
|
90
143
|
const validationHandler = async (validationLink, validationDescription, learnMoreUrl) => {
|
|
@@ -136,11 +189,30 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
|
|
|
136
189
|
onShowAuthSelection();
|
|
137
190
|
}
|
|
138
191
|
}, [validationRequest, onShowAuthSelection]);
|
|
192
|
+
// Handler for overage menu dialog (G1 AI Credits flow)
|
|
193
|
+
const handleOverageMenuChoice = useCallback((choice) => {
|
|
194
|
+
if (!overageMenuRequest)
|
|
195
|
+
return;
|
|
196
|
+
overageMenuRequest.resolve(choice);
|
|
197
|
+
// State will be cleared by the effect callback after the promise resolves
|
|
198
|
+
}, [overageMenuRequest]);
|
|
199
|
+
// Handler for empty wallet dialog (G1 AI Credits flow)
|
|
200
|
+
const handleEmptyWalletChoice = useCallback((choice) => {
|
|
201
|
+
if (!emptyWalletRequest)
|
|
202
|
+
return;
|
|
203
|
+
emptyWalletRequest.resolve(choice);
|
|
204
|
+
// State will be cleared by the effect callback after the promise resolves
|
|
205
|
+
}, [emptyWalletRequest]);
|
|
139
206
|
return {
|
|
140
207
|
proQuotaRequest,
|
|
141
208
|
handleProQuotaChoice,
|
|
142
209
|
validationRequest,
|
|
143
210
|
handleValidationChoice,
|
|
211
|
+
// G1 AI Credits
|
|
212
|
+
overageMenuRequest,
|
|
213
|
+
handleOverageMenuChoice,
|
|
214
|
+
emptyWalletRequest,
|
|
215
|
+
handleEmptyWalletChoice,
|
|
144
216
|
};
|
|
145
217
|
}
|
|
146
218
|
function getResetTimeMessage(delayMs) {
|
|
@@ -150,6 +222,6 @@ function getResetTimeMessage(delayMs) {
|
|
|
150
222
|
minute: '2-digit',
|
|
151
223
|
timeZoneName: 'short',
|
|
152
224
|
});
|
|
153
|
-
return
|
|
225
|
+
return timeFormatter.format(resetDate);
|
|
154
226
|
}
|
|
155
227
|
//# sourceMappingURL=useQuotaAndFallback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EAMR,kBAAkB,EAClB,kBAAkB,EAElB,mBAAmB,EACnB,UAAU,EACV,gBAAgB,
|
|
1
|
+
{"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"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"}
|