@machina.ai/cell-cli 1.38.1-rc2 → 1.40.1-rc2
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/index.js +124 -29
- package/dist/index.js.map +1 -1
- package/dist/package.json +4 -4
- package/dist/src/acp/acpClient.js +8 -3
- package/dist/src/acp/acpClient.js.map +1 -1
- package/dist/src/acp/acpClient.test.js +27 -0
- package/dist/src/acp/acpClient.test.js.map +1 -1
- package/dist/src/acp/acpResume.test.js +1 -0
- package/dist/src/acp/acpResume.test.js.map +1 -1
- package/dist/src/acp/commands/memory.d.ts +6 -1
- package/dist/src/acp/commands/memory.js +40 -1
- package/dist/src/acp/commands/memory.js.map +1 -1
- package/dist/src/commands/gemma/constants.d.ts +17 -0
- package/dist/src/commands/gemma/constants.js +35 -0
- package/dist/src/commands/gemma/constants.js.map +1 -0
- package/dist/src/commands/gemma/logs.d.ts +13 -0
- package/dist/src/commands/gemma/logs.js +154 -0
- package/dist/src/commands/gemma/logs.js.map +1 -0
- package/dist/src/commands/gemma/logs.test.d.ts +6 -0
- package/dist/src/commands/gemma/logs.test.js +122 -0
- package/dist/src/commands/gemma/logs.test.js.map +1 -0
- package/dist/src/commands/gemma/platform.d.ts +38 -0
- package/dist/src/commands/gemma/platform.js +220 -0
- package/dist/src/commands/gemma/platform.js.map +1 -0
- package/dist/src/commands/gemma/platform.test.d.ts +6 -0
- package/dist/src/commands/gemma/platform.test.js +108 -0
- package/dist/src/commands/gemma/platform.test.js.map +1 -0
- package/dist/src/commands/gemma/setup.d.ts +9 -0
- package/dist/src/commands/gemma/setup.js +392 -0
- package/dist/src/commands/gemma/setup.js.map +1 -0
- package/dist/src/commands/gemma/setup.test.d.ts +6 -0
- package/dist/src/commands/gemma/setup.test.js +36 -0
- package/dist/src/commands/gemma/setup.test.js.map +1 -0
- package/dist/src/commands/gemma/start.d.ts +8 -0
- package/dist/src/commands/gemma/start.js +87 -0
- package/dist/src/commands/gemma/start.js.map +1 -0
- package/dist/src/commands/gemma/status.d.ts +19 -0
- package/dist/src/commands/gemma/status.js +110 -0
- package/dist/src/commands/gemma/status.js.map +1 -0
- package/dist/src/commands/gemma/stop.d.ts +9 -0
- package/dist/src/commands/gemma/stop.js +110 -0
- package/dist/src/commands/gemma/stop.js.map +1 -0
- package/dist/src/commands/gemma/stop.test.d.ts +6 -0
- package/dist/src/commands/gemma/stop.test.js +89 -0
- package/dist/src/commands/gemma/stop.test.js.map +1 -0
- package/dist/src/commands/gemma.d.ts +7 -0
- package/dist/src/commands/gemma.js +30 -0
- package/dist/src/commands/gemma.js.map +1 -0
- package/dist/src/config/config.d.ts +1 -0
- package/dist/src/config/config.js +37 -15
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +12 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension.test.js +3 -2
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.js +2 -1
- package/dist/src/config/extensions/github_fetch.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.test.js +2 -0
- package/dist/src/config/extensions/github_fetch.test.js.map +1 -1
- package/dist/src/config/footerItems.d.ts +2 -2
- package/dist/src/config/footerItems.js +2 -2
- package/dist/src/config/footerItems.js.map +1 -1
- package/dist/src/config/footerItems.test.js +38 -0
- package/dist/src/config/footerItems.test.js.map +1 -1
- package/dist/src/config/policy-engine.integration.test.js +14 -5
- package/dist/src/config/policy-engine.integration.test.js.map +1 -1
- package/dist/src/config/settings.js +20 -11
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +10 -4
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +142 -11
- package/dist/src/config/settingsSchema.js +135 -10
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +28 -1
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +11 -54
- package/dist/src/config/trustedFolders.js +13 -267
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.js +35 -31
- package/dist/src/config/trustedFolders.test.js.map +1 -1
- package/dist/src/gemini.d.ts +4 -0
- package/dist/src/gemini.js +61 -37
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +15 -0
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +6 -0
- package/dist/src/gemini_cleanup.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/interactiveCli.js +48 -9
- package/dist/src/interactiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.js +1 -1
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCliAgentSession.js +6 -4
- package/dist/src/nonInteractiveCliAgentSession.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/SkillCommandLoader.js +3 -1
- package/dist/src/services/SkillCommandLoader.js.map +1 -1
- package/dist/src/services/SkillCommandLoader.test.js +1 -1
- package/dist/src/services/SkillCommandLoader.test.js.map +1 -1
- package/dist/src/services/liteRtServerManager.d.ts +9 -0
- package/dist/src/services/liteRtServerManager.js +43 -0
- package/dist/src/services/liteRtServerManager.js.map +1 -0
- package/dist/src/services/liteRtServerManager.test.d.ts +6 -0
- package/dist/src/services/liteRtServerManager.test.js +54 -0
- package/dist/src/services/liteRtServerManager.test.js.map +1 -0
- package/dist/src/test-utils/mockConfig.js +4 -1
- package/dist/src/test-utils/mockConfig.js.map +1 -1
- package/dist/src/test-utils/render.d.ts +3 -1
- package/dist/src/test-utils/render.js +13 -3
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +55 -33
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +9 -4
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/ToolConfirmationFullFrame.test.js +7 -9
- package/dist/src/ui/ToolConfirmationFullFrame.test.js.map +1 -1
- package/dist/src/ui/auth/ApiAuthDialog.js +1 -1
- package/dist/src/ui/auth/ApiAuthDialog.js.map +1 -1
- package/dist/src/ui/auth/ApiAuthDialog.test.js +15 -11
- package/dist/src/ui/auth/ApiAuthDialog.test.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.js +2 -2
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.test.js +3 -0
- package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +3 -2
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.test.js +2 -1
- package/dist/src/ui/commands/clearCommand.test.js.map +1 -1
- package/dist/src/ui/commands/gemmaStatusCommand.d.ts +7 -0
- package/dist/src/ui/commands/gemmaStatusCommand.js +34 -0
- package/dist/src/ui/commands/gemmaStatusCommand.js.map +1 -0
- package/dist/src/ui/commands/memoryCommand.js +36 -0
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.test.js +60 -0
- package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/settingsCommand.js +0 -1
- package/dist/src/ui/commands/settingsCommand.js.map +1 -1
- package/dist/src/ui/components/AppHeader.js +3 -2
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/AppHeader.test.js +1 -1
- package/dist/src/ui/components/AppHeader.test.js.map +1 -1
- package/dist/src/ui/components/AsciiArt.d.ts +6 -6
- package/dist/src/ui/components/AsciiArt.js +6 -6
- package/dist/src/ui/components/AskUserDialog.js +19 -3
- package/dist/src/ui/components/AskUserDialog.js.map +1 -1
- package/dist/src/ui/components/CodiMascot.d.ts +6 -0
- package/dist/src/ui/components/CodiMascot.js +18 -0
- package/dist/src/ui/components/CodiMascot.js.map +1 -0
- package/dist/src/ui/components/Composer.test.js +12 -8
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +10 -8
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/DialogManager.test.js +11 -23
- package/dist/src/ui/components/DialogManager.test.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.js +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.test.js +4 -0
- package/dist/src/ui/components/ExitPlanModeDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +5 -3
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Footer.test.js +21 -35
- package/dist/src/ui/components/Footer.test.js.map +1 -1
- package/dist/src/ui/components/FooterConfigDialog.js +8 -10
- package/dist/src/ui/components/FooterConfigDialog.js.map +1 -1
- package/dist/src/ui/components/FooterConfigDialog.test.js +1 -1
- package/dist/src/ui/components/FooterConfigDialog.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.d.ts +0 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +3 -10
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +4 -4
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +6 -19
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +2 -119
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +4 -34
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +1 -0
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/SkillInboxDialog.d.ts +14 -0
- package/dist/src/ui/components/SkillInboxDialog.js +420 -0
- package/dist/src/ui/components/SkillInboxDialog.js.map +1 -0
- package/dist/src/ui/components/SkillInboxDialog.test.d.ts +6 -0
- package/dist/src/ui/components/SkillInboxDialog.test.js +467 -0
- package/dist/src/ui/components/SkillInboxDialog.test.js.map +1 -0
- package/dist/src/ui/components/ThemeDialog.js +4 -4
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.test.js +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.js +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.test.js +32 -0
- package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.js +4 -17
- package/dist/src/ui/components/messages/DenseToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.test.js +29 -6
- package/dist/src/ui/components/messages/DenseToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.d.ts +0 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +12 -51
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.js +44 -27
- package/dist/src/ui/components/shared/BaseSelectionList.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.test.js +57 -1
- package/dist/src/ui/components/shared/BaseSelectionList.test.js.map +1 -1
- package/dist/src/ui/components/shared/HalfLinePaddedBox.js +7 -12
- package/dist/src/ui/components/shared/HalfLinePaddedBox.js.map +1 -1
- package/dist/src/ui/components/shared/HalfLinePaddedBox.test.d.ts +0 -5
- package/dist/src/ui/components/shared/HalfLinePaddedBox.test.js +13 -5
- package/dist/src/ui/components/shared/HalfLinePaddedBox.test.js.map +1 -1
- package/dist/src/ui/components/shared/TextInput.js +11 -3
- package/dist/src/ui/components/shared/TextInput.js.map +1 -1
- package/dist/src/ui/components/shared/TextInput.test.js +17 -0
- package/dist/src/ui/components/shared/TextInput.test.js.map +1 -1
- package/dist/src/ui/components/views/GemmaStatus.d.ts +10 -0
- package/dist/src/ui/components/views/GemmaStatus.js +11 -0
- package/dist/src/ui/components/views/GemmaStatus.js.map +1 -0
- package/dist/src/ui/contexts/QuotaContext.d.ts +18 -0
- package/dist/src/ui/contexts/QuotaContext.js +15 -0
- package/dist/src/ui/contexts/QuotaContext.js.map +1 -0
- package/dist/src/ui/contexts/ScrollProvider.js +59 -18
- package/dist/src/ui/contexts/ScrollProvider.js.map +1 -1
- package/dist/src/ui/contexts/SessionContext.d.ts +1 -0
- package/dist/src/ui/contexts/SessionContext.js +2 -2
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/contexts/SessionContext.test.js +4 -4
- package/dist/src/ui/contexts/SessionContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +2 -11
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +8 -5
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +40 -0
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAgentStream.d.ts +44 -0
- package/dist/src/ui/hooks/useAgentStream.js +377 -0
- package/dist/src/ui/hooks/useAgentStream.js.map +1 -0
- package/dist/src/ui/hooks/useAgentStream.test.d.ts +6 -0
- package/dist/src/ui/hooks/useAgentStream.test.js +161 -0
- package/dist/src/ui/hooks/useAgentStream.test.js.map +1 -0
- package/dist/src/ui/hooks/useAtCompletion.js +24 -5
- package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.test.js +25 -0
- package/dist/src/ui/hooks/useAtCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useComposerStatus.js +4 -2
- package/dist/src/ui/hooks/useComposerStatus.js.map +1 -1
- package/dist/src/ui/hooks/useExecutionLifecycle.js +27 -16
- package/dist/src/ui/hooks/useExecutionLifecycle.js.map +1 -1
- package/dist/src/ui/hooks/useExecutionLifecycle.test.js +38 -9
- package/dist/src/ui/hooks/useExecutionLifecycle.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +8 -32
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useLogger.d.ts +2 -2
- package/dist/src/ui/hooks/useLogger.js +6 -11
- package/dist/src/ui/hooks/useLogger.js.map +1 -1
- package/dist/src/ui/hooks/useLogger.test.js +4 -17
- package/dist/src/ui/hooks/useLogger.test.js.map +1 -1
- package/dist/src/ui/hooks/useRunEventNotifications.d.ts +3 -1
- package/dist/src/ui/hooks/useRunEventNotifications.js +5 -3
- package/dist/src/ui/hooks/useRunEventNotifications.js.map +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.js +5 -4
- package/dist/src/ui/hooks/useSessionBrowser.js.map +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.test.js +6 -7
- package/dist/src/ui/hooks/useSessionBrowser.test.js.map +1 -1
- package/dist/src/ui/hooks/useShellInactivityStatus.d.ts +2 -2
- package/dist/src/ui/hooks/useShellInactivityStatus.js +1 -2
- package/dist/src/ui/hooks/useShellInactivityStatus.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.d.ts +3 -2
- package/dist/src/ui/hooks/useToolScheduler.js +4 -3
- package/dist/src/ui/hooks/useToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useTurnActivityMonitor.d.ts +6 -2
- package/dist/src/ui/hooks/useTurnActivityMonitor.js +1 -2
- package/dist/src/ui/hooks/useTurnActivityMonitor.js.map +1 -1
- package/dist/src/ui/key/keyBindings.js +5 -2
- package/dist/src/ui/key/keyBindings.js.map +1 -1
- package/dist/src/ui/themes/builtin/dark/github-dark-colorblind.d.ts +7 -0
- package/dist/src/ui/themes/builtin/dark/github-dark-colorblind.js +140 -0
- package/dist/src/ui/themes/builtin/dark/github-dark-colorblind.js.map +1 -0
- package/dist/src/ui/themes/builtin/light/github-light-colorblind.d.ts +7 -0
- package/dist/src/ui/themes/builtin/light/github-light-colorblind.js +140 -0
- package/dist/src/ui/themes/builtin/light/github-light-colorblind.js.map +1 -0
- package/dist/src/ui/themes/theme-manager.js +4 -0
- package/dist/src/ui/themes/theme-manager.js.map +1 -1
- package/dist/src/ui/types.d.ts +16 -2
- package/dist/src/ui/types.js +1 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/borderStyles.d.ts +2 -2
- package/dist/src/ui/utils/borderStyles.js.map +1 -1
- package/dist/src/ui/utils/confirmingTool.js +5 -4
- package/dist/src/ui/utils/confirmingTool.js.map +1 -1
- package/dist/src/ui/utils/historyUtils.d.ts +5 -0
- package/dist/src/ui/utils/historyUtils.js +15 -0
- package/dist/src/ui/utils/historyUtils.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.d.ts +7 -2
- package/dist/src/ui/utils/terminalCapabilityManager.js +23 -16
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.test.js +86 -65
- package/dist/src/ui/utils/terminalCapabilityManager.test.js.map +1 -1
- package/dist/src/ui/utils/textUtils.d.ts +10 -2
- package/dist/src/ui/utils/textUtils.js +18 -9
- package/dist/src/ui/utils/textUtils.js.map +1 -1
- package/dist/src/ui/utils/textUtils.test.js +14 -0
- package/dist/src/ui/utils/textUtils.test.js.map +1 -1
- package/dist/src/utils/autoMemory.d.ts +7 -0
- package/dist/src/utils/autoMemory.js +15 -0
- package/dist/src/utils/autoMemory.js.map +1 -0
- package/dist/src/utils/cleanup.d.ts +2 -0
- package/dist/src/utils/cleanup.js +12 -0
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/devtoolsService.d.ts +2 -2
- package/dist/src/utils/devtoolsService.js +3 -17
- package/dist/src/utils/devtoolsService.js.map +1 -1
- package/dist/src/utils/devtoolsService.test.js +8 -37
- package/dist/src/utils/devtoolsService.test.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +2 -2
- package/dist/src/utils/sandbox.js +10 -2
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sandbox.test.js +54 -1
- package/dist/src/utils/sandbox.test.js.map +1 -1
- package/dist/src/utils/sessionUtils.d.ts +3 -3
- package/dist/src/utils/sessionUtils.js +26 -19
- package/dist/src/utils/sessionUtils.js.map +1 -1
- package/dist/src/utils/sessionUtils.test.js +16 -22
- package/dist/src/utils/sessionUtils.test.js.map +1 -1
- package/dist/src/utils/sessions.js +2 -2
- package/dist/src/utils/sessions.js.map +1 -1
- package/dist/src/utils/terminalNotifications.d.ts +8 -1
- package/dist/src/utils/terminalNotifications.js +73 -17
- package/dist/src/utils/terminalNotifications.js.map +1 -1
- package/dist/src/utils/terminalNotifications.test.js +125 -31
- package/dist/src/utils/terminalNotifications.test.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.js +21 -1
- package/dist/src/utils/userStartupWarnings.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.test.js +34 -0
- package/dist/src/utils/userStartupWarnings.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -4,8 +4,10 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { StreamingState, type ConfirmationRequest, type HistoryItemWithoutId, type PermissionConfirmationRequest } from '../types.js';
|
|
7
|
+
import { type TerminalNotificationMethod } from '../../utils/terminalNotifications.js';
|
|
7
8
|
interface RunEventNotificationParams {
|
|
8
9
|
notificationsEnabled: boolean;
|
|
10
|
+
notificationMethod: TerminalNotificationMethod;
|
|
9
11
|
isFocused: boolean;
|
|
10
12
|
hasReceivedFocusEvent: boolean;
|
|
11
13
|
streamingState: StreamingState;
|
|
@@ -18,5 +20,5 @@ interface RunEventNotificationParams {
|
|
|
18
20
|
hasLoopDetectionConfirmationRequest: boolean;
|
|
19
21
|
terminalName?: string;
|
|
20
22
|
}
|
|
21
|
-
export declare function useRunEventNotifications({ notificationsEnabled, isFocused, hasReceivedFocusEvent, streamingState, hasPendingActionRequired, pendingHistoryItems, commandConfirmationRequest, authConsentRequest, permissionConfirmationRequest, hasConfirmUpdateExtensionRequests, hasLoopDetectionConfirmationRequest, }: RunEventNotificationParams): void;
|
|
23
|
+
export declare function useRunEventNotifications({ notificationsEnabled, notificationMethod, isFocused, hasReceivedFocusEvent, streamingState, hasPendingActionRequired, pendingHistoryItems, commandConfirmationRequest, authConsentRequest, permissionConfirmationRequest, hasConfirmUpdateExtensionRequests, hasLoopDetectionConfirmationRequest, }: RunEventNotificationParams): void;
|
|
22
24
|
export {};
|
|
@@ -8,7 +8,7 @@ import { StreamingState, } from '../types.js';
|
|
|
8
8
|
import { getPendingAttentionNotification } from '../utils/pendingAttentionNotification.js';
|
|
9
9
|
import { buildRunEventNotificationContent, notifyViaTerminal, } from '../../utils/terminalNotifications.js';
|
|
10
10
|
const ATTENTION_NOTIFICATION_COOLDOWN_MS = 20_000;
|
|
11
|
-
export function useRunEventNotifications({ notificationsEnabled, isFocused, hasReceivedFocusEvent, streamingState, hasPendingActionRequired, pendingHistoryItems, commandConfirmationRequest, authConsentRequest, permissionConfirmationRequest, hasConfirmUpdateExtensionRequests, hasLoopDetectionConfirmationRequest, }) {
|
|
11
|
+
export function useRunEventNotifications({ notificationsEnabled, notificationMethod, isFocused, hasReceivedFocusEvent, streamingState, hasPendingActionRequired, pendingHistoryItems, commandConfirmationRequest, authConsentRequest, permissionConfirmationRequest, hasConfirmUpdateExtensionRequests, hasLoopDetectionConfirmationRequest, }) {
|
|
12
12
|
const pendingAttentionNotification = useMemo(() => getPendingAttentionNotification(pendingHistoryItems, commandConfirmationRequest, authConsentRequest, permissionConfirmationRequest, hasConfirmUpdateExtensionRequests, hasLoopDetectionConfirmationRequest), [
|
|
13
13
|
pendingHistoryItems,
|
|
14
14
|
commandConfirmationRequest,
|
|
@@ -57,11 +57,12 @@ export function useRunEventNotifications({ notificationsEnabled, isFocused, hasR
|
|
|
57
57
|
key: currentKey,
|
|
58
58
|
sentAt: now,
|
|
59
59
|
};
|
|
60
|
-
void notifyViaTerminal(notificationsEnabled, buildRunEventNotificationContent(pendingAttentionNotification.event));
|
|
60
|
+
void notifyViaTerminal(notificationsEnabled, buildRunEventNotificationContent(pendingAttentionNotification.event), notificationMethod);
|
|
61
61
|
}, [
|
|
62
62
|
isFocused,
|
|
63
63
|
hasReceivedFocusEvent,
|
|
64
64
|
notificationsEnabled,
|
|
65
|
+
notificationMethod,
|
|
65
66
|
pendingAttentionNotification,
|
|
66
67
|
]);
|
|
67
68
|
useEffect(() => {
|
|
@@ -81,12 +82,13 @@ export function useRunEventNotifications({ notificationsEnabled, isFocused, hasR
|
|
|
81
82
|
void notifyViaTerminal(notificationsEnabled, buildRunEventNotificationContent({
|
|
82
83
|
type: 'session_complete',
|
|
83
84
|
detail: 'Cell CLI finished responding.',
|
|
84
|
-
}));
|
|
85
|
+
}), notificationMethod);
|
|
85
86
|
}, [
|
|
86
87
|
streamingState,
|
|
87
88
|
isFocused,
|
|
88
89
|
hasReceivedFocusEvent,
|
|
89
90
|
notificationsEnabled,
|
|
91
|
+
notificationMethod,
|
|
90
92
|
hasPendingActionRequired,
|
|
91
93
|
]);
|
|
92
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRunEventNotifications.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useRunEventNotifications.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EACL,cAAc,GAIf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,EACL,gCAAgC,EAChC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"useRunEventNotifications.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useRunEventNotifications.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useState, useCallback } from 'react';
|
|
7
|
-
import * as fs from 'node:fs/promises';
|
|
8
7
|
import path from 'node:path';
|
|
9
|
-
import { coreEvents, convertSessionToClientHistory, uiTelemetryService, } from '@google/gemini-cli-core';
|
|
8
|
+
import { coreEvents, convertSessionToClientHistory, uiTelemetryService, loadConversationRecord, } from '@google/gemini-cli-core';
|
|
10
9
|
import { convertSessionToHistoryFormats, } from '../../utils/sessionUtils.js';
|
|
11
10
|
export { convertSessionToHistoryFormats };
|
|
12
11
|
export const useSessionBrowser = (config, onLoadHistory) => {
|
|
@@ -28,8 +27,10 @@ export const useSessionBrowser = (config, onLoadHistory) => {
|
|
|
28
27
|
const fileName = session.fileName;
|
|
29
28
|
const originalFilePath = path.join(chatsDir, fileName);
|
|
30
29
|
// Load up the conversation.
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
const conversation = await loadConversationRecord(originalFilePath);
|
|
31
|
+
if (!conversation) {
|
|
32
|
+
throw new Error(`Failed to parse conversation from ${originalFilePath}`);
|
|
33
|
+
}
|
|
33
34
|
// Use the old session's ID to continue it.
|
|
34
35
|
const existingSessionId = conversation.sessionId;
|
|
35
36
|
config.setSessionId(existingSessionId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSessionBrowser.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useSessionBrowser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAE9C,OAAO,
|
|
1
|
+
{"version":3,"file":"useSessionBrowser.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useSessionBrowser.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,9 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
|
7
7
|
import { renderHook } from '../../test-utils/render.js';
|
|
8
8
|
import { act } from 'react';
|
|
9
9
|
import { useSessionBrowser, convertSessionToHistoryFormats, } from './useSessionBrowser.js';
|
|
10
|
-
import * as fs from 'node:fs/promises';
|
|
11
10
|
import path from 'node:path';
|
|
12
11
|
import { getSessionFiles } from '../../utils/sessionUtils.js';
|
|
13
|
-
import { CoreToolCallStatus, } from '@google/gemini-cli-core';
|
|
12
|
+
import { CoreToolCallStatus, loadConversationRecord, } from '@google/gemini-cli-core';
|
|
14
13
|
import { coreEvents, convertSessionToClientHistory, uiTelemetryService, } from '@google/gemini-cli-core';
|
|
15
14
|
// Mock modules
|
|
16
15
|
vi.mock('fs/promises');
|
|
@@ -30,6 +29,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
|
30
29
|
clear: vi.fn(),
|
|
31
30
|
hydrate: vi.fn(),
|
|
32
31
|
},
|
|
32
|
+
loadConversationRecord: vi.fn(),
|
|
33
33
|
};
|
|
34
34
|
});
|
|
35
35
|
const MOCKED_PROJECT_TEMP_DIR = '/test/project/temp';
|
|
@@ -37,7 +37,6 @@ const MOCKED_CHATS_DIR = '/test/project/temp/chats';
|
|
|
37
37
|
const MOCKED_SESSION_ID = 'test-session-123';
|
|
38
38
|
const MOCKED_CURRENT_SESSION_ID = 'current-session-id';
|
|
39
39
|
describe('useSessionBrowser', () => {
|
|
40
|
-
const mockedFs = vi.mocked(fs);
|
|
41
40
|
const mockedPath = vi.mocked(path);
|
|
42
41
|
const mockedGetSessionFiles = vi.mocked(getSessionFiles);
|
|
43
42
|
const mockConfig = {
|
|
@@ -71,12 +70,12 @@ describe('useSessionBrowser', () => {
|
|
|
71
70
|
fileName: MOCKED_FILENAME,
|
|
72
71
|
};
|
|
73
72
|
mockedGetSessionFiles.mockResolvedValue([mockSession]);
|
|
74
|
-
|
|
73
|
+
vi.mocked(loadConversationRecord).mockResolvedValue(mockConversation);
|
|
75
74
|
const { result } = await renderHook(() => useSessionBrowser(mockConfig, mockOnLoadHistory));
|
|
76
75
|
await act(async () => {
|
|
77
76
|
await result.current.handleResumeSession(mockSession);
|
|
78
77
|
});
|
|
79
|
-
expect(
|
|
78
|
+
expect(loadConversationRecord).toHaveBeenCalledWith(`${MOCKED_CHATS_DIR}/${MOCKED_FILENAME}`);
|
|
80
79
|
expect(mockConfig.setSessionId).toHaveBeenCalledWith('existing-session-456');
|
|
81
80
|
expect(uiTelemetryService.hydrate).toHaveBeenCalledWith(mockConversation);
|
|
82
81
|
expect(result.current.isSessionBrowserOpen).toBe(false);
|
|
@@ -88,7 +87,7 @@ describe('useSessionBrowser', () => {
|
|
|
88
87
|
id: MOCKED_SESSION_ID,
|
|
89
88
|
fileName: MOCKED_FILENAME,
|
|
90
89
|
};
|
|
91
|
-
|
|
90
|
+
vi.mocked(loadConversationRecord).mockRejectedValue(new Error('File not found'));
|
|
92
91
|
const { result } = await renderHook(() => useSessionBrowser(mockConfig, mockOnLoadHistory));
|
|
93
92
|
await act(async () => {
|
|
94
93
|
await result.current.handleResumeSession(mockSession);
|
|
@@ -102,7 +101,7 @@ describe('useSessionBrowser', () => {
|
|
|
102
101
|
id: MOCKED_SESSION_ID,
|
|
103
102
|
fileName: MOCKED_FILENAME,
|
|
104
103
|
};
|
|
105
|
-
|
|
104
|
+
vi.mocked(loadConversationRecord).mockResolvedValue(null);
|
|
106
105
|
const { result } = await renderHook(() => useSessionBrowser(mockConfig, mockOnLoadHistory));
|
|
107
106
|
await act(async () => {
|
|
108
107
|
await result.current.handleResumeSession(mockSession);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSessionBrowser.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useSessionBrowser.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EACL,iBAAiB,EACjB,8BAA8B,GAC/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"useSessionBrowser.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useSessionBrowser.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { type MinimalTrackedToolCall } from './useTurnActivityMonitor.js';
|
|
6
7
|
import type { StreamingState } from '../types.js';
|
|
7
|
-
import { type TrackedToolCall } from './useToolScheduler.js';
|
|
8
8
|
interface ShellInactivityStatusProps {
|
|
9
9
|
activePtyId: number | string | null | undefined;
|
|
10
10
|
lastOutputTime: number;
|
|
11
11
|
streamingState: StreamingState;
|
|
12
|
-
pendingToolCalls:
|
|
12
|
+
pendingToolCalls: MinimalTrackedToolCall[];
|
|
13
13
|
embeddedShellFocused: boolean;
|
|
14
14
|
isInteractiveShellEnabled: boolean;
|
|
15
15
|
}
|
|
@@ -4,9 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useInactivityTimer } from './useInactivityTimer.js';
|
|
7
|
-
import { useTurnActivityMonitor } from './useTurnActivityMonitor.js';
|
|
7
|
+
import { useTurnActivityMonitor, } from './useTurnActivityMonitor.js';
|
|
8
8
|
import { SHELL_FOCUS_HINT_DELAY_MS, SHELL_ACTION_REQUIRED_TITLE_DELAY_MS, SHELL_SILENT_WORKING_TITLE_DELAY_MS, } from '../constants.js';
|
|
9
|
-
import {} from './useToolScheduler.js';
|
|
10
9
|
/**
|
|
11
10
|
* Consolidated hook to manage all shell-related inactivity states.
|
|
12
11
|
* Centralizes the timing heuristics and redirection suppression logic.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useShellInactivityStatus.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useShellInactivityStatus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"useShellInactivityStatus.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useShellInactivityStatus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACL,sBAAsB,GAEvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,yBAAyB,EACzB,oCAAoC,EACpC,mCAAmC,GACpC,MAAM,iBAAiB,CAAC;AAmBzB;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EACvC,WAAW,EACX,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,yBAAyB,GACE,EAAyB,EAAE;IACtD,MAAM,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GAAG,sBAAsB,CACxE,cAAc,EACd,WAAW,EACX,gBAAgB,CACjB,CAAC;IAEF,MAAM,eAAe,GACnB,CAAC,CAAC,WAAW,IAAI,CAAC,oBAAoB,IAAI,yBAAyB,CAAC;IAEtE,sGAAsG;IACtG,MAAM,iBAAiB,GAAG,cAAc,GAAG,kBAAkB,CAAC;IAE9D,4EAA4E;IAC5E,kFAAkF;IAClF,MAAM,mBAAmB,GAAG,kBAAkB,CAC5C,eAAe,IAAI,CAAC,mBAAmB,EACvC,cAAc,EACd,iBAAiB;QACf,CAAC,CAAC,yBAAyB;QAC3B,CAAC,CAAC,yBAAyB,GAAG,CAAC,CAClC,CAAC;IAEF,sEAAsE;IACtE,6DAA6D;IAC7D,2EAA2E;IAC3E,MAAM,6BAA6B,GAAG,kBAAkB,CACtD,eAAe,IAAI,CAAC,mBAAmB,IAAI,iBAAiB,EAC5D,cAAc,EACd,oCAAoC,CACrC,CAAC;IAEF,qEAAqE;IACrE,+EAA+E;IAC/E,oFAAoF;IACpF,MAAM,4BAA4B,GAAG,kBAAkB,CACrD,eAAe,IAAI,CAAC,mBAAmB,IAAI,CAAC,iBAAiB,CAAC,EAC9D,cAAc,EACd,mBAAmB;QACjB,CAAC,CAAC,mCAAmC;QACrC,CAAC,CAAC,oCAAoC,GAAG,CAAC,CAC7C,CAAC;IAEF,IAAI,gBAAgB,GAAqB,MAAM,CAAC;IAChD,IAAI,6BAA6B,EAAE,CAAC;QAClC,gBAAgB,GAAG,iBAAiB,CAAC;IACvC,CAAC;SAAM,IAAI,4BAA4B,EAAE,CAAC;QACxC,gBAAgB,GAAG,gBAAgB,CAAC;IACtC,CAAC;IAED,OAAO;QACL,mBAAmB;QACnB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { type Config, type ToolCallRequestInfo, type ToolCall, type CompletedToolCall, type EditorType, type SubagentActivityItem } from '@google/gemini-cli-core';
|
|
6
|
+
import { type Config, type ToolCallRequestInfo, type ToolCall, type CompletedToolCall, Scheduler, type EditorType, type SubagentActivityItem } from '@google/gemini-cli-core';
|
|
7
7
|
export type ScheduleFn = (request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => Promise<CompletedToolCall[]>;
|
|
8
8
|
export type MarkToolsAsSubmittedFn = (callIds: string[]) => void;
|
|
9
9
|
export type CancelAllFn = (signal: AbortSignal) => void;
|
|
@@ -42,5 +42,6 @@ export declare function useToolScheduler(onComplete: (tools: CompletedToolCall[]
|
|
|
42
42
|
MarkToolsAsSubmittedFn,
|
|
43
43
|
React.Dispatch<React.SetStateAction<TrackedToolCall[]>>,
|
|
44
44
|
CancelAllFn,
|
|
45
|
-
number
|
|
45
|
+
number,
|
|
46
|
+
Scheduler
|
|
46
47
|
];
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { MessageBusType, ROOT_SCHEDULER_ID, Scheduler, CoreToolCallStatus, } from '@google/gemini-cli-core';
|
|
6
|
+
import { MessageBusType, ROOT_SCHEDULER_ID, Scheduler, CoreToolCallStatus, AGENT_TOOL_NAME, } from '@google/gemini-cli-core';
|
|
7
7
|
import { useCallback, useState, useMemo, useEffect, useRef } from 'react';
|
|
8
8
|
/**
|
|
9
9
|
* Modern tool scheduler hook using the event-driven Core Scheduler.
|
|
@@ -127,7 +127,7 @@ export function useToolScheduler(onComplete, config, getPreferredEditor) {
|
|
|
127
127
|
const flattened = Object.values(toolCallsMap).flat();
|
|
128
128
|
return flattened.map((tc) => {
|
|
129
129
|
let subagentName = tc.request.name;
|
|
130
|
-
if (tc.request.name ===
|
|
130
|
+
if (tc.request.name === AGENT_TOOL_NAME) {
|
|
131
131
|
const argsObj = tc.request.args;
|
|
132
132
|
let parsedArgs = argsObj;
|
|
133
133
|
if (typeof argsObj === 'string') {
|
|
@@ -140,7 +140,7 @@ export function useToolScheduler(onComplete, config, getPreferredEditor) {
|
|
|
140
140
|
}
|
|
141
141
|
if (typeof parsedArgs === 'object' && parsedArgs !== null) {
|
|
142
142
|
for (const [key, value] of Object.entries(parsedArgs)) {
|
|
143
|
-
if (key === '
|
|
143
|
+
if (key === 'agent_name' && typeof value === 'string') {
|
|
144
144
|
subagentName = value;
|
|
145
145
|
break;
|
|
146
146
|
}
|
|
@@ -182,6 +182,7 @@ export function useToolScheduler(onComplete, config, getPreferredEditor) {
|
|
|
182
182
|
setToolCallsForDisplay,
|
|
183
183
|
cancelAll,
|
|
184
184
|
lastToolOutputTime,
|
|
185
|
+
scheduler,
|
|
185
186
|
];
|
|
186
187
|
}
|
|
187
188
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useToolScheduler.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,cAAc,EACd,iBAAiB,EACjB,SAAS,EAGT,kBAAkB,
|
|
1
|
+
{"version":3,"file":"useToolScheduler.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolScheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { StreamingState } from '../types.js';
|
|
7
|
-
import { type
|
|
7
|
+
import { type CoreToolCallStatus, type ToolCallRequestInfo } from '@google/gemini-cli-core';
|
|
8
|
+
export interface MinimalTrackedToolCall {
|
|
9
|
+
status: CoreToolCallStatus;
|
|
10
|
+
request: ToolCallRequestInfo;
|
|
11
|
+
}
|
|
8
12
|
export interface TurnActivityStatus {
|
|
9
13
|
operationStartTime: number;
|
|
10
14
|
isRedirectionActive: boolean;
|
|
@@ -13,4 +17,4 @@ export interface TurnActivityStatus {
|
|
|
13
17
|
* Monitors the activity of a Gemini turn to detect when a new operation starts
|
|
14
18
|
* and whether it involves shell redirections that should suppress inactivity prompts.
|
|
15
19
|
*/
|
|
16
|
-
export declare const useTurnActivityMonitor: (streamingState: StreamingState, activePtyId: number | string | null | undefined, pendingToolCalls?:
|
|
20
|
+
export declare const useTurnActivityMonitor: (streamingState: StreamingState, activePtyId: number | string | null | undefined, pendingToolCalls?: MinimalTrackedToolCall[]) => TurnActivityStatus;
|
|
@@ -5,8 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { useState, useEffect, useRef, useMemo } from 'react';
|
|
7
7
|
import { StreamingState } from '../types.js';
|
|
8
|
-
import { hasRedirection } from '@google/gemini-cli-core';
|
|
9
|
-
import {} from './useToolScheduler.js';
|
|
8
|
+
import { hasRedirection, } from '@google/gemini-cli-core';
|
|
10
9
|
/**
|
|
11
10
|
* Monitors the activity of a Gemini turn to detect when a new operation starts
|
|
12
11
|
* and whether it involves shell redirections that should suppress inactivity prompts.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTurnActivityMonitor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useTurnActivityMonitor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"useTurnActivityMonitor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useTurnActivityMonitor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,cAAc,GAGf,MAAM,yBAAyB,CAAC;AAYjC;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,cAA8B,EAC9B,WAA+C,EAC/C,mBAA6C,EAAE,EAC3B,EAAE;IACtB,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhE,8DAA8D;IAC9D,2EAA2E;IAC3E,kFAAkF;IAClF,MAAM,YAAY,GAAG,MAAM,CAAqC,SAAS,CAAC,CAAC;IAC3E,MAAM,qBAAqB,GAAG,MAAM,CAA6B,SAAS,CAAC,CAAC;IAE5E,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,cAAc,KAAK,cAAc,CAAC,UAAU,CAAC;QACrE,MAAM,aAAa,GACjB,qBAAqB,CAAC,OAAO,KAAK,cAAc,CAAC,UAAU,CAAC;QAC9D,MAAM,UAAU,GAAG,WAAW,KAAK,YAAY,CAAC,OAAO,CAAC;QAExD,IAAI,eAAe,IAAI,CAAC,CAAC,aAAa,IAAI,UAAU,CAAC,EAAE,CAAC;YACtD,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,CAAC,eAAe,IAAI,aAAa,EAAE,CAAC;YAC7C,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QAED,YAAY,CAAC,OAAO,GAAG,WAAW,CAAC;QACnC,qBAAqB,CAAC,OAAO,GAAG,cAAc,CAAC;IACjD,CAAC,EAAE,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;IAElC,yDAAyD;IACzD,sFAAsF;IACtF,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE;IACH,gDAAgD;IAChD,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QAC3B,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,mBAAmB;YAAE,OAAO,KAAK,CAAC;QAE1D,MAAM,OAAO,GACV,EAAE,CAAC,OAAO,CAAC,IAA6B,EAAE,OAAO,IAAI,EAAE,CAAC;QAC3D,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,EACJ,CAAC,gBAAgB,CAAC,CACnB,CAAC;IAEF,OAAO;QACL,kBAAkB;QAClB,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -351,7 +351,10 @@ export const defaultKeyBindingConfig = new Map([
|
|
|
351
351
|
new KeyBinding('ctrl+j'),
|
|
352
352
|
],
|
|
353
353
|
],
|
|
354
|
-
[
|
|
354
|
+
[
|
|
355
|
+
Command.OPEN_EXTERNAL_EDITOR,
|
|
356
|
+
[new KeyBinding('ctrl+g'), new KeyBinding('ctrl+shift+g')],
|
|
357
|
+
],
|
|
355
358
|
[Command.DEPRECATED_OPEN_EXTERNAL_EDITOR, [new KeyBinding('ctrl+x')]],
|
|
356
359
|
[
|
|
357
360
|
Command.PASTE_CLIPBOARD,
|
|
@@ -589,7 +592,7 @@ export const commandDescriptions = {
|
|
|
589
592
|
[Command.DEPRECATED_OPEN_EXTERNAL_EDITOR]: 'Deprecated command to open external editor.',
|
|
590
593
|
[Command.PASTE_CLIPBOARD]: 'Paste from the clipboard.',
|
|
591
594
|
// App Controls
|
|
592
|
-
[Command.SHOW_ERROR_DETAILS]: 'Toggle detailed error information.',
|
|
595
|
+
[Command.SHOW_ERROR_DETAILS]: 'Toggle the debug console for detailed error information.',
|
|
593
596
|
[Command.SHOW_FULL_TODOS]: 'Toggle the full TODO list.',
|
|
594
597
|
[Command.SHOW_IDE_CONTEXT_DETAIL]: 'Show IDE context details.',
|
|
595
598
|
[Command.TOGGLE_MARKDOWN]: 'Toggle Markdown rendering.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyBindings.js","sourceRoot":"","sources":["../../../../src/ui/key/keyBindings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"keyBindings.js","sourceRoot":"","sources":["../../../../src/ui/key/keyBindings.ts"],"names":[],"mappings":"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"}
|