@google/gemini-cli 0.26.0-preview.4 → 0.27.0-nightly.20260126.cb772a5b7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -1
- package/dist/google-gemini-cli-0.27.0-nightly.20260121.97aac696f.tgz +0 -0
- package/dist/package.json +3 -4
- package/dist/src/commands/extensions.js +4 -1
- package/dist/src/commands/extensions.js.map +1 -1
- package/dist/src/commands/hooks.js +4 -1
- package/dist/src/commands/hooks.js.map +1 -1
- package/dist/src/commands/mcp/enableDisable.d.ts +13 -0
- package/dist/src/commands/mcp/enableDisable.js +122 -0
- package/dist/src/commands/mcp/enableDisable.js.map +1 -0
- package/dist/src/commands/mcp/list.d.ts +2 -0
- package/dist/src/commands/mcp/list.js +1 -1
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp.js +7 -1
- package/dist/src/commands/mcp.js.map +1 -1
- package/dist/src/commands/mcp.test.js +3 -1
- package/dist/src/commands/mcp.test.js.map +1 -1
- package/dist/src/commands/skills.js +4 -1
- package/dist/src/commands/skills.js.map +1 -1
- package/dist/src/config/config.d.ts +4 -0
- package/dist/src/config/config.js +41 -20
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +181 -15
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/keyBindings.d.ts +8 -5
- package/dist/src/config/keyBindings.js +38 -32
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/keyBindings.test.js +8 -5
- package/dist/src/config/keyBindings.test.js.map +1 -1
- package/dist/src/config/mcp/index.d.ts +6 -0
- package/dist/src/config/mcp/index.js +7 -0
- package/dist/src/config/mcp/index.js.map +1 -0
- package/dist/src/config/mcp/mcpServerEnablement.d.ts +145 -0
- package/dist/src/config/mcp/mcpServerEnablement.js +254 -0
- package/dist/src/config/mcp/mcpServerEnablement.js.map +1 -0
- package/dist/src/config/mcp/mcpServerEnablement.test.js +147 -0
- package/dist/src/config/mcp/mcpServerEnablement.test.js.map +1 -0
- package/dist/src/config/sandboxConfig.test.js +11 -5
- package/dist/src/config/sandboxConfig.test.js.map +1 -1
- package/dist/src/config/settings.js +76 -0
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +44 -0
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +21 -78
- package/dist/src/config/settingsSchema.js +21 -79
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +1 -1
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/settings_repro.test.js +6 -2
- package/dist/src/config/settings_repro.test.js.map +1 -1
- package/dist/src/gemini.js +12 -7
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +140 -10
- 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 +11 -3
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +193 -3
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/nonInteractiveCliCommands.js +6 -1
- package/dist/src/nonInteractiveCliCommands.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +2 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/FileCommandLoader.js +12 -4
- package/dist/src/services/FileCommandLoader.js.map +1 -1
- package/dist/src/services/FileCommandLoader.test.js +56 -0
- package/dist/src/services/FileCommandLoader.test.js.map +1 -1
- package/dist/src/test-utils/mockCommandContext.js +2 -0
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/test-utils/persistentStateFake.d.ts +26 -0
- package/dist/src/test-utils/persistentStateFake.js +39 -0
- package/dist/src/test-utils/persistentStateFake.js.map +1 -0
- package/dist/src/test-utils/render.d.ts +10 -1
- package/dist/src/test-utils/render.js +45 -16
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/App.test.js +96 -38
- package/dist/src/ui/App.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +78 -18
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +185 -19
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/ApiAuthDialog.test.js +5 -5
- package/dist/src/ui/auth/ApiAuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +13 -9
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js +6 -6
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.js +2 -0
- package/dist/src/ui/commands/aboutCommand.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.test.js +12 -0
- package/dist/src/ui/commands/aboutCommand.test.js.map +1 -1
- package/dist/src/ui/commands/agentsCommand.js +75 -4
- package/dist/src/ui/commands/agentsCommand.js.map +1 -1
- package/dist/src/ui/commands/agentsCommand.test.js +114 -0
- package/dist/src/ui/commands/agentsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +53 -49
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.test.js +79 -23
- package/dist/src/ui/commands/directoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/initCommand.test.js +8 -4
- package/dist/src/ui/commands/initCommand.test.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +136 -5
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/policiesCommand.js +33 -20
- package/dist/src/ui/commands/policiesCommand.js.map +1 -1
- package/dist/src/ui/commands/policiesCommand.test.js +7 -4
- package/dist/src/ui/commands/policiesCommand.test.js.map +1 -1
- package/dist/src/ui/commands/rewindCommand.d.ts +7 -0
- package/dist/src/ui/commands/rewindCommand.js +132 -0
- package/dist/src/ui/commands/rewindCommand.js.map +1 -0
- package/dist/src/ui/commands/rewindCommand.test.js +242 -0
- package/dist/src/ui/commands/rewindCommand.test.js.map +1 -0
- package/dist/src/ui/commands/skillsCommand.js +6 -4
- package/dist/src/ui/commands/skillsCommand.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.test.js +17 -3
- package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +5 -3
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/AboutBox.d.ts +1 -0
- package/dist/src/ui/components/AboutBox.js +5 -1
- package/dist/src/ui/components/AboutBox.js.map +1 -1
- package/dist/src/ui/components/AboutBox.test.js +8 -2
- package/dist/src/ui/components/AboutBox.test.js.map +1 -1
- package/dist/src/ui/components/AgentConfigDialog.d.ts +18 -0
- package/dist/src/ui/components/AgentConfigDialog.js +296 -0
- package/dist/src/ui/components/AgentConfigDialog.js.map +1 -0
- package/dist/src/ui/components/AgentConfigDialog.test.js +241 -0
- package/dist/src/ui/components/AgentConfigDialog.test.js.map +1 -0
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.js +9 -2
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.js.map +1 -1
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js +54 -25
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js.map +1 -1
- package/dist/src/ui/components/AppHeader.js +4 -1
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/AppHeader.test.js +95 -22
- package/dist/src/ui/components/AppHeader.test.js.map +1 -1
- package/dist/src/ui/components/{AutoAcceptIndicator.d.ts → ApprovalModeIndicator.d.ts} +2 -2
- package/dist/src/ui/components/{AutoAcceptIndicator.js → ApprovalModeIndicator.js} +8 -3
- package/dist/src/ui/components/ApprovalModeIndicator.js.map +1 -0
- package/dist/src/ui/components/ApprovalModeIndicator.test.d.ts +6 -0
- package/dist/src/ui/components/{AutoAcceptIndicator.test.js → ApprovalModeIndicator.test.js} +13 -7
- package/dist/src/ui/components/ApprovalModeIndicator.test.js.map +1 -0
- package/dist/src/ui/components/AskUserDialog.d.ts +39 -0
- package/dist/src/ui/components/AskUserDialog.js +618 -0
- package/dist/src/ui/components/AskUserDialog.js.map +1 -0
- package/dist/src/ui/components/AskUserDialog.test.d.ts +6 -0
- package/dist/src/ui/components/AskUserDialog.test.js +598 -0
- package/dist/src/ui/components/AskUserDialog.test.js.map +1 -0
- package/dist/src/ui/components/Composer.d.ts +3 -1
- package/dist/src/ui/components/Composer.js +5 -5
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +6 -6
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.js +3 -4
- package/dist/src/ui/components/ConfigInitDisplay.js.map +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.test.js +13 -29
- package/dist/src/ui/components/ConfigInitDisplay.test.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.test.js +7 -3
- package/dist/src/ui/components/ContextUsageDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +13 -0
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/DialogManager.test.js +24 -0
- package/dist/src/ui/components/DialogManager.test.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +3 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.test.js +7 -0
- package/dist/src/ui/components/Footer.test.js.map +1 -1
- package/dist/src/ui/components/Help.js +5 -2
- package/dist/src/ui/components/Help.js.map +1 -1
- 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 +32 -20
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +75 -1
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.js +2 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js +12 -10
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Notifications.js +14 -20
- package/dist/src/ui/components/Notifications.js.map +1 -1
- package/dist/src/ui/components/Notifications.test.js +45 -35
- package/dist/src/ui/components/Notifications.test.js.map +1 -1
- package/dist/src/ui/components/RewindViewer.d.ts +1 -1
- package/dist/src/ui/components/RewindViewer.js +65 -17
- package/dist/src/ui/components/RewindViewer.js.map +1 -1
- package/dist/src/ui/components/RewindViewer.test.js +5 -3
- package/dist/src/ui/components/RewindViewer.test.js.map +1 -1
- package/dist/src/ui/components/SessionBrowser.js +3 -2
- package/dist/src/ui/components/SessionBrowser.js.map +1 -1
- package/dist/src/ui/components/SessionBrowser.test.js +10 -3
- package/dist/src/ui/components/SessionBrowser.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.d.ts +1 -1
- package/dist/src/ui/components/SettingsDialog.js +266 -516
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +2 -2
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/ShellInputPrompt.test.js +17 -8
- package/dist/src/ui/components/ShellInputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/SuggestionsDisplay.d.ts +1 -1
- package/dist/src/ui/components/SuggestionsDisplay.js +4 -3
- package/dist/src/ui/components/SuggestionsDisplay.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.d.ts +12 -0
- package/dist/src/ui/components/ToolConfirmationQueue.js +30 -0
- package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -0
- package/dist/src/ui/components/ToolConfirmationQueue.test.d.ts +6 -0
- package/dist/src/ui/components/ToolConfirmationQueue.test.js +71 -0
- package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -0
- package/dist/src/ui/components/messages/RedirectionConfirmation.test.js +2 -4
- package/dist/src/ui/components/messages/RedirectionConfirmation.test.js.map +1 -1
- package/dist/src/ui/components/messages/ShellToolMessage.js +6 -41
- package/dist/src/ui/components/messages/ShellToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.d.ts +3 -2
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +61 -76
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +20 -7
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +34 -18
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +209 -24
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.d.ts +1 -1
- package/dist/src/ui/components/messages/ToolMessage.js +7 -29
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessageFocusHint.test.d.ts +6 -0
- package/dist/src/ui/components/messages/ToolMessageFocusHint.test.js +89 -0
- package/dist/src/ui/components/messages/ToolMessageFocusHint.test.js.map +1 -0
- package/dist/src/ui/components/messages/ToolShared.d.ts +26 -0
- package/dist/src/ui/components/messages/ToolShared.js +59 -6
- package/dist/src/ui/components/messages/ToolShared.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.d.ts +3 -1
- package/dist/src/ui/components/shared/BaseSelectionList.js +4 -2
- package/dist/src/ui/components/shared/BaseSelectionList.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.test.js +1 -0
- package/dist/src/ui/components/shared/BaseSelectionList.test.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSettingsDialog.d.ts +72 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.js +293 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.js.map +1 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.test.d.ts +6 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.test.js +434 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.test.js.map +1 -0
- package/dist/src/ui/components/shared/ExpandableText.d.ts +17 -0
- package/dist/src/ui/components/{PrepareLabel.js → shared/ExpandableText.js} +30 -15
- package/dist/src/ui/components/shared/ExpandableText.js.map +1 -0
- package/dist/src/ui/components/shared/ExpandableText.test.d.ts +6 -0
- package/dist/src/ui/components/{PrepareLabel.test.js → shared/ExpandableText.test.js} +22 -11
- package/dist/src/ui/components/shared/ExpandableText.test.js.map +1 -0
- package/dist/src/ui/components/shared/TabHeader.d.ts +51 -0
- package/dist/src/ui/components/shared/TabHeader.js +42 -0
- package/dist/src/ui/components/shared/TabHeader.js.map +1 -0
- package/dist/src/ui/components/shared/TabHeader.test.d.ts +6 -0
- package/dist/src/ui/components/shared/TabHeader.test.js +106 -0
- package/dist/src/ui/components/shared/TabHeader.test.js.map +1 -0
- package/dist/src/ui/components/shared/TextInput.test.js +32 -24
- package/dist/src/ui/components/shared/TextInput.test.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.d.ts +13 -0
- package/dist/src/ui/components/shared/text-buffer.js +173 -14
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.test.js +256 -44
- package/dist/src/ui/components/shared/text-buffer.test.js.map +1 -1
- package/dist/src/ui/components/shared/vim-buffer-actions.test.js +4 -1
- package/dist/src/ui/components/shared/vim-buffer-actions.test.js.map +1 -1
- package/dist/src/ui/components/views/McpStatus.d.ts +1 -0
- package/dist/src/ui/components/views/McpStatus.js +30 -18
- 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/constants/tips.js +2 -2
- package/dist/src/ui/constants/tips.js.map +1 -1
- package/dist/src/ui/constants.d.ts +1 -0
- package/dist/src/ui/constants.js +1 -0
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.d.ts +3 -2
- package/dist/src/ui/contexts/KeypressContext.js +33 -25
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +151 -41
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/MouseContext.test.js +8 -8
- package/dist/src/ui/contexts/MouseContext.test.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.d.ts +20 -0
- package/dist/src/ui/contexts/ToolActionsContext.js +74 -0
- package/dist/src/ui/contexts/ToolActionsContext.js.map +1 -0
- package/dist/src/ui/contexts/ToolActionsContext.test.d.ts +6 -0
- package/dist/src/ui/contexts/ToolActionsContext.test.js +135 -0
- package/dist/src/ui/contexts/ToolActionsContext.test.js.map +1 -0
- package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -1
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +6 -2
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +19 -4
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/keyToAnsi.js +1 -1
- package/dist/src/ui/hooks/keyToAnsi.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +3 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +24 -7
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +126 -30
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/toolMapping.js +8 -11
- package/dist/src/ui/hooks/toolMapping.js.map +1 -1
- package/dist/src/ui/hooks/toolMapping.test.js +27 -6
- package/dist/src/ui/hooks/toolMapping.test.js.map +1 -1
- package/dist/src/ui/hooks/{useAutoAcceptIndicator.d.ts → useApprovalModeIndicator.d.ts} +2 -2
- package/dist/src/ui/hooks/{useAutoAcceptIndicator.js → useApprovalModeIndicator.js} +25 -11
- package/dist/src/ui/hooks/useApprovalModeIndicator.js.map +1 -0
- package/dist/src/ui/hooks/useApprovalModeIndicator.test.d.ts +6 -0
- package/dist/src/ui/hooks/{useAutoAcceptIndicator.test.js → useApprovalModeIndicator.test.js} +56 -31
- package/dist/src/ui/hooks/useApprovalModeIndicator.test.js.map +1 -0
- package/dist/src/ui/hooks/useConfirmingTool.d.ts +16 -0
- package/dist/src/ui/hooks/useConfirmingTool.js +39 -0
- package/dist/src/ui/hooks/useConfirmingTool.js.map +1 -0
- package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +20 -8
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +79 -19
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useIncludeDirsTrust.d.ts +1 -1
- package/dist/src/ui/hooks/useIncludeDirsTrust.js +9 -20
- package/dist/src/ui/hooks/useIncludeDirsTrust.js.map +1 -1
- package/dist/src/ui/hooks/useIncludeDirsTrust.test.js +33 -12
- package/dist/src/ui/hooks/useIncludeDirsTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useKeypress.test.js +10 -3
- package/dist/src/ui/hooks/useKeypress.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +7 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +3 -3
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +17 -9
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.d.ts +2 -2
- package/dist/src/ui/hooks/usePhraseCycler.js +4 -14
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.test.js +13 -42
- package/dist/src/ui/hooks/usePhraseCycler.test.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.d.ts +4 -1
- package/dist/src/ui/hooks/useSelectionList.js +51 -13
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.test.js +35 -3
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
- package/dist/src/ui/hooks/useSessionResume.test.js +3 -2
- package/dist/src/ui/hooks/useSessionResume.test.js.map +1 -1
- package/dist/src/ui/hooks/useShellInactivityStatus.d.ts +26 -0
- package/dist/src/ui/hooks/useShellInactivityStatus.js +46 -0
- package/dist/src/ui/hooks/useShellInactivityStatus.js.map +1 -0
- package/dist/src/ui/hooks/useShellInactivityStatus.test.d.ts +6 -0
- package/dist/src/ui/hooks/useShellInactivityStatus.test.js +84 -0
- package/dist/src/ui/hooks/useShellInactivityStatus.test.js.map +1 -0
- package/dist/src/ui/hooks/useTabbedNavigation.d.ts +53 -0
- package/dist/src/ui/hooks/useTabbedNavigation.js +150 -0
- package/dist/src/ui/hooks/useTabbedNavigation.js.map +1 -0
- package/dist/src/ui/hooks/useTabbedNavigation.test.d.ts +6 -0
- package/dist/src/ui/hooks/useTabbedNavigation.test.js +187 -0
- package/dist/src/ui/hooks/useTabbedNavigation.test.js.map +1 -0
- package/dist/src/ui/hooks/useTips.d.ts +10 -0
- package/dist/src/ui/hooks/useTips.js +18 -0
- package/dist/src/ui/hooks/useTips.js.map +1 -0
- package/dist/src/ui/hooks/useTips.test.d.ts +6 -0
- package/dist/src/ui/hooks/useTips.test.js +33 -0
- package/dist/src/ui/hooks/useTips.test.js.map +1 -0
- package/dist/src/ui/hooks/useToolExecutionScheduler.d.ts +30 -0
- package/dist/src/ui/hooks/useToolExecutionScheduler.js +113 -0
- package/dist/src/ui/hooks/useToolExecutionScheduler.js.map +1 -0
- package/dist/src/ui/hooks/useToolExecutionScheduler.test.d.ts +6 -0
- package/dist/src/ui/hooks/useToolExecutionScheduler.test.js +296 -0
- package/dist/src/ui/hooks/useToolExecutionScheduler.test.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.d.ts +29 -0
- package/dist/src/ui/hooks/useToolScheduler.js +30 -0
- package/dist/src/ui/hooks/useToolScheduler.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolSchedulerFacade.test.d.ts +6 -0
- package/dist/src/ui/hooks/useToolSchedulerFacade.test.js +45 -0
- package/dist/src/ui/hooks/useToolSchedulerFacade.test.js.map +1 -0
- package/dist/src/ui/hooks/useTurnActivityMonitor.d.ts +16 -0
- package/dist/src/ui/hooks/useTurnActivityMonitor.js +49 -0
- package/dist/src/ui/hooks/useTurnActivityMonitor.js.map +1 -0
- package/dist/src/ui/hooks/useTurnActivityMonitor.test.d.ts +6 -0
- package/dist/src/ui/hooks/useTurnActivityMonitor.test.js +97 -0
- package/dist/src/ui/hooks/useTurnActivityMonitor.test.js.map +1 -0
- package/dist/src/ui/hooks/vim.js +5 -3
- package/dist/src/ui/hooks/vim.js.map +1 -1
- package/dist/src/ui/hooks/vim.test.js +4 -2
- package/dist/src/ui/hooks/vim.test.js.map +1 -1
- package/dist/src/ui/keyMatchers.js +5 -13
- package/dist/src/ui/keyMatchers.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +23 -20
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/layouts/DefaultAppLayout.js +10 -2
- package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +1 -0
- package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
- package/dist/src/ui/types.d.ts +11 -3
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.d.ts +4 -4
- package/dist/src/ui/utils/clipboardUtils.js +198 -12
- package/dist/src/ui/utils/clipboardUtils.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.test.js +219 -47
- package/dist/src/ui/utils/clipboardUtils.test.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.windows.test.js +3 -0
- package/dist/src/ui/utils/clipboardUtils.windows.test.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.test.js +11 -3
- package/dist/src/ui/utils/commandUtils.test.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.d.ts +10 -0
- package/dist/src/ui/utils/directoryUtils.js +12 -0
- package/dist/src/ui/utils/directoryUtils.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.test.js +8 -4
- package/dist/src/ui/utils/directoryUtils.test.js.map +1 -1
- package/dist/src/ui/utils/formatters.d.ts +1 -1
- package/dist/src/ui/utils/formatters.js +2 -3
- package/dist/src/ui/utils/formatters.js.map +1 -1
- package/dist/src/ui/utils/highlight.d.ts +2 -2
- package/dist/src/ui/utils/highlight.js +9 -3
- package/dist/src/ui/utils/highlight.js.map +1 -1
- package/dist/src/ui/utils/highlight.test.js +3 -0
- package/dist/src/ui/utils/highlight.test.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.d.ts +1 -2
- package/dist/src/ui/utils/terminalCapabilityManager.js +2 -8
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.test.js +2 -3
- package/dist/src/ui/utils/terminalCapabilityManager.test.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.test.js +5 -3
- package/dist/src/ui/utils/terminalSetup.test.js.map +1 -1
- package/dist/src/ui/utils/textUtils.d.ts +5 -0
- package/dist/src/ui/utils/textUtils.js +14 -0
- package/dist/src/ui/utils/textUtils.js.map +1 -1
- package/dist/src/ui/utils/textUtils.test.js +19 -1
- package/dist/src/ui/utils/textUtils.test.js.map +1 -1
- package/dist/src/utils/cleanup.js +15 -0
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/events.d.ts +1 -6
- package/dist/src/utils/events.js +0 -2
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/events.test.js +4 -4
- package/dist/src/utils/events.test.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +3 -0
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/installationInfo.js +4 -2
- package/dist/src/utils/installationInfo.js.map +1 -1
- package/dist/src/utils/persistentState.d.ts +2 -0
- package/dist/src/utils/persistentState.js.map +1 -1
- package/dist/src/utils/windowTitle.d.ts +2 -1
- package/dist/src/utils/windowTitle.js +8 -1
- package/dist/src/utils/windowTitle.js.map +1 -1
- package/dist/src/utils/windowTitle.test.js +25 -1
- package/dist/src/utils/windowTitle.test.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.js +26 -5
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -5
- package/dist/google-gemini-cli-0.26.0-preview.3.tgz +0 -0
- package/dist/src/ui/components/AutoAcceptIndicator.js.map +0 -1
- package/dist/src/ui/components/AutoAcceptIndicator.test.js.map +0 -1
- package/dist/src/ui/components/PrepareLabel.d.ts +0 -15
- package/dist/src/ui/components/PrepareLabel.js.map +0 -1
- package/dist/src/ui/components/PrepareLabel.test.js.map +0 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js.map +0 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js.map +0 -1
- /package/dist/src/{ui/components/AutoAcceptIndicator.test.d.ts → config/mcp/mcpServerEnablement.test.d.ts} +0 -0
- /package/dist/src/ui/{components/PrepareLabel.test.d.ts → commands/rewindCommand.test.d.ts} +0 -0
- /package/dist/src/ui/{hooks/useAutoAcceptIndicator.test.d.ts → components/AgentConfigDialog.test.d.ts} +0 -0
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { MessageBusType, ToolConfirmationOutcome, Scheduler, } from '@google/gemini-cli-core';
|
|
7
|
+
import { useCallback, useState, useMemo, useEffect, useRef } from 'react';
|
|
8
|
+
/**
|
|
9
|
+
* Modern tool scheduler hook using the event-driven Core Scheduler.
|
|
10
|
+
*
|
|
11
|
+
* This hook acts as an Adapter between the new MessageBus-driven Core
|
|
12
|
+
* and the legacy callback-based UI components.
|
|
13
|
+
*/
|
|
14
|
+
export function useToolExecutionScheduler(onComplete, config, getPreferredEditor) {
|
|
15
|
+
// State stores Core objects, not Display objects
|
|
16
|
+
const [toolCalls, setToolCalls] = useState([]);
|
|
17
|
+
const [lastToolOutputTime, setLastToolOutputTime] = useState(0);
|
|
18
|
+
const messageBus = useMemo(() => config.getMessageBus(), [config]);
|
|
19
|
+
const onCompleteRef = useRef(onComplete);
|
|
20
|
+
useEffect(() => {
|
|
21
|
+
onCompleteRef.current = onComplete;
|
|
22
|
+
}, [onComplete]);
|
|
23
|
+
const getPreferredEditorRef = useRef(getPreferredEditor);
|
|
24
|
+
useEffect(() => {
|
|
25
|
+
getPreferredEditorRef.current = getPreferredEditor;
|
|
26
|
+
}, [getPreferredEditor]);
|
|
27
|
+
const scheduler = useMemo(() => new Scheduler({
|
|
28
|
+
config,
|
|
29
|
+
messageBus,
|
|
30
|
+
getPreferredEditor: () => getPreferredEditorRef.current(),
|
|
31
|
+
}), [config, messageBus]);
|
|
32
|
+
const internalAdaptToolCalls = useCallback((coreCalls, prevTracked) => adaptToolCalls(coreCalls, prevTracked, messageBus), [messageBus]);
|
|
33
|
+
useEffect(() => {
|
|
34
|
+
const handler = (event) => {
|
|
35
|
+
setToolCalls((prev) => {
|
|
36
|
+
const adapted = internalAdaptToolCalls(event.toolCalls, prev);
|
|
37
|
+
// Update output timer for UI spinners
|
|
38
|
+
if (event.toolCalls.some((tc) => tc.status === 'executing')) {
|
|
39
|
+
setLastToolOutputTime(Date.now());
|
|
40
|
+
}
|
|
41
|
+
return adapted;
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, handler);
|
|
45
|
+
return () => {
|
|
46
|
+
messageBus.unsubscribe(MessageBusType.TOOL_CALLS_UPDATE, handler);
|
|
47
|
+
};
|
|
48
|
+
}, [messageBus, internalAdaptToolCalls]);
|
|
49
|
+
const schedule = useCallback(async (request, signal) => {
|
|
50
|
+
// Clear state for new run
|
|
51
|
+
setToolCalls([]);
|
|
52
|
+
// 1. Await Core Scheduler directly
|
|
53
|
+
const results = await scheduler.schedule(request, signal);
|
|
54
|
+
// 2. Trigger legacy reinjection logic (useGeminiStream loop)
|
|
55
|
+
await onCompleteRef.current(results);
|
|
56
|
+
return results;
|
|
57
|
+
}, [scheduler]);
|
|
58
|
+
const cancelAll = useCallback((_signal) => {
|
|
59
|
+
scheduler.cancelAll();
|
|
60
|
+
}, [scheduler]);
|
|
61
|
+
const markToolsAsSubmitted = useCallback((callIdsToMark) => {
|
|
62
|
+
setToolCalls((prevCalls) => prevCalls.map((tc) => callIdsToMark.includes(tc.request.callId)
|
|
63
|
+
? { ...tc, responseSubmittedToGemini: true }
|
|
64
|
+
: tc));
|
|
65
|
+
}, []);
|
|
66
|
+
return [
|
|
67
|
+
toolCalls,
|
|
68
|
+
schedule,
|
|
69
|
+
markToolsAsSubmitted,
|
|
70
|
+
setToolCalls,
|
|
71
|
+
cancelAll,
|
|
72
|
+
lastToolOutputTime,
|
|
73
|
+
];
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* ADAPTER: Merges UI metadata (submitted flag) and injects legacy callbacks.
|
|
77
|
+
*/
|
|
78
|
+
function adaptToolCalls(coreCalls, prevTracked, messageBus) {
|
|
79
|
+
const prevMap = new Map(prevTracked.map((t) => [t.request.callId, t]));
|
|
80
|
+
return coreCalls.map((coreCall) => {
|
|
81
|
+
const prev = prevMap.get(coreCall.request.callId);
|
|
82
|
+
const responseSubmittedToGemini = prev?.responseSubmittedToGemini ?? false;
|
|
83
|
+
// Inject onConfirm adapter for tools awaiting approval.
|
|
84
|
+
// The Core provides data-only (serializable) confirmationDetails. We must
|
|
85
|
+
// inject the legacy callback function that proxies responses back to the
|
|
86
|
+
// MessageBus.
|
|
87
|
+
if (coreCall.status === 'awaiting_approval' && coreCall.correlationId) {
|
|
88
|
+
const correlationId = coreCall.correlationId;
|
|
89
|
+
return {
|
|
90
|
+
...coreCall,
|
|
91
|
+
confirmationDetails: {
|
|
92
|
+
...coreCall.confirmationDetails,
|
|
93
|
+
onConfirm: async (outcome, payload) => {
|
|
94
|
+
await messageBus.publish({
|
|
95
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
96
|
+
correlationId,
|
|
97
|
+
confirmed: outcome !== ToolConfirmationOutcome.Cancel,
|
|
98
|
+
requiresUserConfirmation: false,
|
|
99
|
+
outcome,
|
|
100
|
+
payload,
|
|
101
|
+
});
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
responseSubmittedToGemini,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
return {
|
|
108
|
+
...coreCall,
|
|
109
|
+
responseSubmittedToGemini,
|
|
110
|
+
};
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=useToolExecutionScheduler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useToolExecutionScheduler.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolExecutionScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAOL,cAAc,EACd,uBAAuB,EACvB,SAAS,GAGV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAmB1E;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAyD,EACzD,MAAc,EACd,kBAAgD;IAShD,iDAAiD;IACjD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAoB,EAAE,CAAC,CAAC;IAClE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAExE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,EAAE;QACb,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC;IACrC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,MAAM,qBAAqB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACzD,SAAS,CAAC,GAAG,EAAE;QACb,qBAAqB,CAAC,OAAO,GAAG,kBAAkB,CAAC;IACrD,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CACH,IAAI,SAAS,CAAC;QACZ,MAAM;QACN,UAAU;QACV,kBAAkB,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,OAAO,EAAE;KAC1D,CAAC,EACJ,CAAC,MAAM,EAAE,UAAU,CAAC,CACrB,CAAC;IAEF,MAAM,sBAAsB,GAAG,WAAW,CACxC,CAAC,SAAqB,EAAE,WAA8B,EAAE,EAAE,CACxD,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,EACpD,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,CAAC,KAA6B,EAAE,EAAE;YAChD,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpB,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAE9D,sCAAsC;gBACtC,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,WAAW,CAAC,EAAE,CAAC;oBAC5D,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACpC,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAChE,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAEzC,MAAM,QAAQ,GAAe,WAAW,CACtC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACxB,0BAA0B;QAC1B,YAAY,CAAC,EAAE,CAAC,CAAC;QAEjB,mCAAmC;QACnC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAE1D,6DAA6D;QAC7D,MAAM,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErC,OAAO,OAAO,CAAC;IACjB,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAC;IAEF,MAAM,SAAS,GAAgB,WAAW,CACxC,CAAC,OAAO,EAAE,EAAE;QACV,SAAS,CAAC,SAAS,EAAE,CAAC;IACxB,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAC;IAEF,MAAM,oBAAoB,GAA2B,WAAW,CAC9D,CAAC,aAAuB,EAAE,EAAE;QAC1B,YAAY,CAAC,CAAC,SAAS,EAAE,EAAE,CACzB,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;YACvC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,yBAAyB,EAAE,IAAI,EAAE;YAC5C,CAAC,CAAC,EAAE,CACP,CACF,CAAC;IACJ,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO;QACL,SAAS;QACT,QAAQ;QACR,oBAAoB;QACpB,YAAY;QACZ,SAAS;QACT,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CACrB,SAAqB,EACrB,WAA8B,EAC9B,UAAsB;IAEtB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAmB,EAAE;QACjD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,yBAAyB,GAAG,IAAI,EAAE,yBAAyB,IAAI,KAAK,CAAC;QAE3E,wDAAwD;QACxD,0EAA0E;QAC1E,yEAAyE;QACzE,cAAc;QACd,IAAI,QAAQ,CAAC,MAAM,KAAK,mBAAmB,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YACtE,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;YAC7C,OAAO;gBACL,GAAG,QAAQ;gBACX,mBAAmB,EAAE;oBACnB,GAAG,QAAQ,CAAC,mBAAmB;oBAC/B,SAAS,EAAE,KAAK,EACd,OAAgC,EAChC,OAAiC,EACjC,EAAE;wBACF,MAAM,UAAU,CAAC,OAAO,CAAC;4BACvB,IAAI,EAAE,cAAc,CAAC,0BAA0B;4BAC/C,aAAa;4BACb,SAAS,EAAE,OAAO,KAAK,uBAAuB,CAAC,MAAM;4BACrD,wBAAwB,EAAE,KAAK;4BAC/B,OAAO;4BACP,OAAO;yBACR,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD,yBAAyB;aAC1B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,QAAQ;YACX,yBAAyB;SAC1B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,296 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
|
+
import { act } from 'react';
|
|
8
|
+
import { renderHook } from '../../test-utils/render.js';
|
|
9
|
+
import { useToolExecutionScheduler } from './useToolExecutionScheduler.js';
|
|
10
|
+
import { MessageBusType, ToolConfirmationOutcome, Scheduler, } from '@google/gemini-cli-core';
|
|
11
|
+
import { createMockMessageBus } from '@google/gemini-cli-core/src/test-utils/mock-message-bus.js';
|
|
12
|
+
// Mock Core Scheduler
|
|
13
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
14
|
+
const actual = await importOriginal();
|
|
15
|
+
return {
|
|
16
|
+
...actual,
|
|
17
|
+
Scheduler: vi.fn().mockImplementation(() => ({
|
|
18
|
+
schedule: vi.fn().mockResolvedValue([]),
|
|
19
|
+
cancelAll: vi.fn(),
|
|
20
|
+
})),
|
|
21
|
+
};
|
|
22
|
+
});
|
|
23
|
+
const createMockTool = (overrides = {}) => ({
|
|
24
|
+
name: 'test_tool',
|
|
25
|
+
displayName: 'Test Tool',
|
|
26
|
+
description: 'A test tool',
|
|
27
|
+
kind: 'function',
|
|
28
|
+
parameterSchema: {},
|
|
29
|
+
isOutputMarkdown: false,
|
|
30
|
+
build: vi.fn(),
|
|
31
|
+
...overrides,
|
|
32
|
+
});
|
|
33
|
+
const createMockInvocation = (overrides = {}) => ({
|
|
34
|
+
getDescription: () => 'Executing test tool',
|
|
35
|
+
shouldConfirmExecute: vi.fn(),
|
|
36
|
+
execute: vi.fn(),
|
|
37
|
+
params: {},
|
|
38
|
+
toolLocations: [],
|
|
39
|
+
...overrides,
|
|
40
|
+
});
|
|
41
|
+
describe('useToolExecutionScheduler', () => {
|
|
42
|
+
let mockConfig;
|
|
43
|
+
let mockMessageBus;
|
|
44
|
+
beforeEach(() => {
|
|
45
|
+
vi.clearAllMocks();
|
|
46
|
+
mockMessageBus = createMockMessageBus();
|
|
47
|
+
mockConfig = {
|
|
48
|
+
getMessageBus: () => mockMessageBus,
|
|
49
|
+
};
|
|
50
|
+
});
|
|
51
|
+
it('initializes with empty tool calls', () => {
|
|
52
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
53
|
+
const [toolCalls] = result.current;
|
|
54
|
+
expect(toolCalls).toEqual([]);
|
|
55
|
+
});
|
|
56
|
+
it('updates tool calls when MessageBus emits TOOL_CALLS_UPDATE', () => {
|
|
57
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
58
|
+
const mockToolCall = {
|
|
59
|
+
status: 'executing',
|
|
60
|
+
request: {
|
|
61
|
+
callId: 'call-1',
|
|
62
|
+
name: 'test_tool',
|
|
63
|
+
args: {},
|
|
64
|
+
isClientInitiated: false,
|
|
65
|
+
prompt_id: 'p1',
|
|
66
|
+
},
|
|
67
|
+
tool: createMockTool(),
|
|
68
|
+
invocation: createMockInvocation(),
|
|
69
|
+
liveOutput: 'Loading...',
|
|
70
|
+
};
|
|
71
|
+
act(() => {
|
|
72
|
+
void mockMessageBus.publish({
|
|
73
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
74
|
+
toolCalls: [mockToolCall],
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
const [toolCalls] = result.current;
|
|
78
|
+
expect(toolCalls).toHaveLength(1);
|
|
79
|
+
// Expect Core Object structure, not Display Object
|
|
80
|
+
expect(toolCalls[0]).toMatchObject({
|
|
81
|
+
request: { callId: 'call-1', name: 'test_tool' },
|
|
82
|
+
status: 'executing', // Core status
|
|
83
|
+
liveOutput: 'Loading...',
|
|
84
|
+
responseSubmittedToGemini: false,
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
it('injects onConfirm callback for awaiting_approval tools (Adapter Pattern)', async () => {
|
|
88
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
89
|
+
const mockToolCall = {
|
|
90
|
+
status: 'awaiting_approval',
|
|
91
|
+
request: {
|
|
92
|
+
callId: 'call-1',
|
|
93
|
+
name: 'test_tool',
|
|
94
|
+
args: {},
|
|
95
|
+
isClientInitiated: false,
|
|
96
|
+
prompt_id: 'p1',
|
|
97
|
+
},
|
|
98
|
+
tool: createMockTool(),
|
|
99
|
+
invocation: createMockInvocation({
|
|
100
|
+
getDescription: () => 'Confirming test tool',
|
|
101
|
+
}),
|
|
102
|
+
confirmationDetails: { type: 'info', title: 'Confirm', prompt: 'Sure?' },
|
|
103
|
+
correlationId: 'corr-123',
|
|
104
|
+
};
|
|
105
|
+
act(() => {
|
|
106
|
+
void mockMessageBus.publish({
|
|
107
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
108
|
+
toolCalls: [mockToolCall],
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
const [toolCalls] = result.current;
|
|
112
|
+
const call = toolCalls[0];
|
|
113
|
+
if (call.status !== 'awaiting_approval') {
|
|
114
|
+
throw new Error('Expected status to be awaiting_approval');
|
|
115
|
+
}
|
|
116
|
+
const confirmationDetails = call.confirmationDetails;
|
|
117
|
+
expect(confirmationDetails).toBeDefined();
|
|
118
|
+
expect(typeof confirmationDetails.onConfirm).toBe('function');
|
|
119
|
+
// Test that onConfirm publishes to MessageBus
|
|
120
|
+
const publishSpy = vi.spyOn(mockMessageBus, 'publish');
|
|
121
|
+
await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
|
|
122
|
+
expect(publishSpy).toHaveBeenCalledWith({
|
|
123
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
124
|
+
correlationId: 'corr-123',
|
|
125
|
+
confirmed: true,
|
|
126
|
+
requiresUserConfirmation: false,
|
|
127
|
+
outcome: ToolConfirmationOutcome.ProceedOnce,
|
|
128
|
+
payload: undefined,
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
it('injects onConfirm with payload (Inline Edit support)', async () => {
|
|
132
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
133
|
+
const mockToolCall = {
|
|
134
|
+
status: 'awaiting_approval',
|
|
135
|
+
request: {
|
|
136
|
+
callId: 'call-1',
|
|
137
|
+
name: 'test_tool',
|
|
138
|
+
args: {},
|
|
139
|
+
isClientInitiated: false,
|
|
140
|
+
prompt_id: 'p1',
|
|
141
|
+
},
|
|
142
|
+
tool: createMockTool(),
|
|
143
|
+
invocation: createMockInvocation(),
|
|
144
|
+
confirmationDetails: { type: 'edit', title: 'Edit', filePath: 'test.ts' },
|
|
145
|
+
correlationId: 'corr-edit',
|
|
146
|
+
};
|
|
147
|
+
act(() => {
|
|
148
|
+
void mockMessageBus.publish({
|
|
149
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
150
|
+
toolCalls: [mockToolCall],
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
const [toolCalls] = result.current;
|
|
154
|
+
const call = toolCalls[0];
|
|
155
|
+
if (call.status !== 'awaiting_approval') {
|
|
156
|
+
throw new Error('Expected awaiting_approval');
|
|
157
|
+
}
|
|
158
|
+
const confirmationDetails = call.confirmationDetails;
|
|
159
|
+
const publishSpy = vi.spyOn(mockMessageBus, 'publish');
|
|
160
|
+
const mockPayload = { newContent: 'updated code' };
|
|
161
|
+
await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce, mockPayload);
|
|
162
|
+
expect(publishSpy).toHaveBeenCalledWith({
|
|
163
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
164
|
+
correlationId: 'corr-edit',
|
|
165
|
+
confirmed: true,
|
|
166
|
+
requiresUserConfirmation: false,
|
|
167
|
+
outcome: ToolConfirmationOutcome.ProceedOnce,
|
|
168
|
+
payload: mockPayload,
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
it('preserves responseSubmittedToGemini flag across updates', () => {
|
|
172
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
173
|
+
const mockToolCall = {
|
|
174
|
+
status: 'success',
|
|
175
|
+
request: {
|
|
176
|
+
callId: 'call-1',
|
|
177
|
+
name: 'test',
|
|
178
|
+
args: {},
|
|
179
|
+
isClientInitiated: false,
|
|
180
|
+
prompt_id: 'p1',
|
|
181
|
+
},
|
|
182
|
+
tool: createMockTool(),
|
|
183
|
+
invocation: createMockInvocation(),
|
|
184
|
+
response: {
|
|
185
|
+
callId: 'call-1',
|
|
186
|
+
resultDisplay: 'OK',
|
|
187
|
+
responseParts: [],
|
|
188
|
+
error: undefined,
|
|
189
|
+
errorType: undefined,
|
|
190
|
+
},
|
|
191
|
+
};
|
|
192
|
+
// 1. Initial success
|
|
193
|
+
act(() => {
|
|
194
|
+
void mockMessageBus.publish({
|
|
195
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
196
|
+
toolCalls: [mockToolCall],
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
// 2. Mark as submitted
|
|
200
|
+
act(() => {
|
|
201
|
+
const [, , markAsSubmitted] = result.current;
|
|
202
|
+
markAsSubmitted(['call-1']);
|
|
203
|
+
});
|
|
204
|
+
expect(result.current[0][0].responseSubmittedToGemini).toBe(true);
|
|
205
|
+
// 3. Receive another update (should preserve the true flag)
|
|
206
|
+
act(() => {
|
|
207
|
+
void mockMessageBus.publish({
|
|
208
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
209
|
+
toolCalls: [mockToolCall],
|
|
210
|
+
});
|
|
211
|
+
});
|
|
212
|
+
expect(result.current[0][0].responseSubmittedToGemini).toBe(true);
|
|
213
|
+
});
|
|
214
|
+
it('updates lastToolOutputTime when tools are executing', () => {
|
|
215
|
+
vi.useFakeTimers();
|
|
216
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
217
|
+
const startTime = Date.now();
|
|
218
|
+
vi.advanceTimersByTime(1000);
|
|
219
|
+
act(() => {
|
|
220
|
+
void mockMessageBus.publish({
|
|
221
|
+
type: MessageBusType.TOOL_CALLS_UPDATE,
|
|
222
|
+
toolCalls: [
|
|
223
|
+
{
|
|
224
|
+
status: 'executing',
|
|
225
|
+
request: {
|
|
226
|
+
callId: 'call-1',
|
|
227
|
+
name: 'test',
|
|
228
|
+
args: {},
|
|
229
|
+
isClientInitiated: false,
|
|
230
|
+
prompt_id: 'p1',
|
|
231
|
+
},
|
|
232
|
+
tool: createMockTool(),
|
|
233
|
+
invocation: createMockInvocation(),
|
|
234
|
+
},
|
|
235
|
+
],
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
const [, , , , , lastOutputTime] = result.current;
|
|
239
|
+
expect(lastOutputTime).toBeGreaterThan(startTime);
|
|
240
|
+
vi.useRealTimers();
|
|
241
|
+
});
|
|
242
|
+
it('delegates cancelAll to the Core Scheduler', () => {
|
|
243
|
+
const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
|
|
244
|
+
const [, , , , cancelAll] = result.current;
|
|
245
|
+
const signal = new AbortController().signal;
|
|
246
|
+
// We need to find the mock instance of Scheduler
|
|
247
|
+
// Since we used vi.mock at top level, we can get it from vi.mocked(Scheduler)
|
|
248
|
+
const schedulerInstance = vi.mocked(Scheduler).mock.results[0].value;
|
|
249
|
+
cancelAll(signal);
|
|
250
|
+
expect(schedulerInstance.cancelAll).toHaveBeenCalled();
|
|
251
|
+
});
|
|
252
|
+
it('resolves the schedule promise when scheduler resolves', async () => {
|
|
253
|
+
const onComplete = vi.fn().mockResolvedValue(undefined);
|
|
254
|
+
const completedToolCall = {
|
|
255
|
+
status: 'success',
|
|
256
|
+
request: {
|
|
257
|
+
callId: 'call-1',
|
|
258
|
+
name: 'test',
|
|
259
|
+
args: {},
|
|
260
|
+
isClientInitiated: false,
|
|
261
|
+
prompt_id: 'p1',
|
|
262
|
+
},
|
|
263
|
+
tool: createMockTool(),
|
|
264
|
+
invocation: createMockInvocation(),
|
|
265
|
+
response: {
|
|
266
|
+
callId: 'call-1',
|
|
267
|
+
responseParts: [],
|
|
268
|
+
resultDisplay: 'Success',
|
|
269
|
+
error: undefined,
|
|
270
|
+
errorType: undefined,
|
|
271
|
+
},
|
|
272
|
+
};
|
|
273
|
+
// Mock the specific return value for this test
|
|
274
|
+
const { Scheduler } = await import('@google/gemini-cli-core');
|
|
275
|
+
vi.mocked(Scheduler).mockImplementation(() => ({
|
|
276
|
+
schedule: vi.fn().mockResolvedValue([completedToolCall]),
|
|
277
|
+
cancelAll: vi.fn(),
|
|
278
|
+
}));
|
|
279
|
+
const { result } = renderHook(() => useToolExecutionScheduler(onComplete, mockConfig, () => undefined));
|
|
280
|
+
const [, schedule] = result.current;
|
|
281
|
+
const signal = new AbortController().signal;
|
|
282
|
+
let completedResult = [];
|
|
283
|
+
await act(async () => {
|
|
284
|
+
completedResult = await schedule({
|
|
285
|
+
callId: 'call-1',
|
|
286
|
+
name: 'test',
|
|
287
|
+
args: {},
|
|
288
|
+
isClientInitiated: false,
|
|
289
|
+
prompt_id: 'p1',
|
|
290
|
+
}, signal);
|
|
291
|
+
});
|
|
292
|
+
expect(completedResult).toEqual([completedToolCall]);
|
|
293
|
+
expect(onComplete).toHaveBeenCalledWith([completedToolCall]);
|
|
294
|
+
});
|
|
295
|
+
});
|
|
296
|
+
//# sourceMappingURL=useToolExecutionScheduler.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useToolExecutionScheduler.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolExecutionScheduler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { Config, EditorType, CompletedToolCall, ToolCallRequestInfo } from '@google/gemini-cli-core';
|
|
7
|
+
import { type TrackedToolCall as LegacyTrackedToolCall, type TrackedScheduledToolCall, type TrackedValidatingToolCall, type TrackedWaitingToolCall, type TrackedExecutingToolCall, type TrackedCompletedToolCall, type TrackedCancelledToolCall, type MarkToolsAsSubmittedFn, type CancelAllFn } from './useReactToolScheduler.js';
|
|
8
|
+
import { type TrackedToolCall as NewTrackedToolCall } from './useToolExecutionScheduler.js';
|
|
9
|
+
export type { TrackedScheduledToolCall, TrackedValidatingToolCall, TrackedWaitingToolCall, TrackedExecutingToolCall, TrackedCompletedToolCall, TrackedCancelledToolCall, };
|
|
10
|
+
export type TrackedToolCall = LegacyTrackedToolCall | NewTrackedToolCall;
|
|
11
|
+
export type ScheduleFn = (request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => Promise<void | CompletedToolCall[]>;
|
|
12
|
+
export type UseToolSchedulerReturn = [
|
|
13
|
+
TrackedToolCall[],
|
|
14
|
+
ScheduleFn,
|
|
15
|
+
MarkToolsAsSubmittedFn,
|
|
16
|
+
React.Dispatch<React.SetStateAction<TrackedToolCall[]>>,
|
|
17
|
+
CancelAllFn,
|
|
18
|
+
number
|
|
19
|
+
];
|
|
20
|
+
/**
|
|
21
|
+
* Facade hook that switches between the Legacy and Event-Driven schedulers
|
|
22
|
+
* based on configuration.
|
|
23
|
+
*
|
|
24
|
+
* Note: This conditionally calls hooks, which technically violates the standard
|
|
25
|
+
* Rules of Hooks linting. However, this is safe here because
|
|
26
|
+
* `config.isEventDrivenSchedulerEnabled()` is static for the lifetime of the
|
|
27
|
+
* application session (it essentially acts as a compile-time feature flag).
|
|
28
|
+
*/
|
|
29
|
+
export declare function useToolScheduler(onComplete: (tools: CompletedToolCall[]) => Promise<void>, config: Config, getPreferredEditor: () => EditorType | undefined): UseToolSchedulerReturn;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { useReactToolScheduler, } from './useReactToolScheduler.js';
|
|
7
|
+
import { useToolExecutionScheduler, } from './useToolExecutionScheduler.js';
|
|
8
|
+
/**
|
|
9
|
+
* Facade hook that switches between the Legacy and Event-Driven schedulers
|
|
10
|
+
* based on configuration.
|
|
11
|
+
*
|
|
12
|
+
* Note: This conditionally calls hooks, which technically violates the standard
|
|
13
|
+
* Rules of Hooks linting. However, this is safe here because
|
|
14
|
+
* `config.isEventDrivenSchedulerEnabled()` is static for the lifetime of the
|
|
15
|
+
* application session (it essentially acts as a compile-time feature flag).
|
|
16
|
+
*/
|
|
17
|
+
export function useToolScheduler(onComplete, config, getPreferredEditor) {
|
|
18
|
+
const isEventDriven = config.isEventDrivenSchedulerEnabled();
|
|
19
|
+
// Note: We return the hooks directly without casting. They return compatible
|
|
20
|
+
// tuple structures, but use explicit tuple signatures rather than the
|
|
21
|
+
// UseToolSchedulerReturn named type to avoid circular dependencies back to
|
|
22
|
+
// this facade.
|
|
23
|
+
if (isEventDriven) {
|
|
24
|
+
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
25
|
+
return useToolExecutionScheduler(onComplete, config, getPreferredEditor);
|
|
26
|
+
}
|
|
27
|
+
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
28
|
+
return useReactToolScheduler(onComplete, config, getPreferredEditor);
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=useToolScheduler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useToolScheduler.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EACL,qBAAqB,GAUtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,yBAAyB,GAE1B,MAAM,gCAAgC,CAAC;AA+BxC;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAC9B,UAAyD,EACzD,MAAc,EACd,kBAAgD;IAEhD,MAAM,aAAa,GAAG,MAAM,CAAC,6BAA6B,EAAE,CAAC;IAE7D,6EAA6E;IAC7E,sEAAsE;IACtE,2EAA2E;IAC3E,eAAe;IACf,IAAI,aAAa,EAAE,CAAC;QAClB,sDAAsD;QACtD,OAAO,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC3E,CAAC;IAED,sDAAsD;IACtD,OAAO,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -702,7 +702,7 @@ describe('mapToDisplay', () => {
|
|
|
702
702
|
name: 'validating',
|
|
703
703
|
status: 'validating',
|
|
704
704
|
extraProps: { tool: baseTool, invocation: baseInvocation },
|
|
705
|
-
expectedStatus: ToolCallStatus.
|
|
705
|
+
expectedStatus: ToolCallStatus.Pending,
|
|
706
706
|
expectedName: baseTool.displayName,
|
|
707
707
|
expectedDescription: baseInvocation.getDescription(),
|
|
708
708
|
},
|