@machina.ai/cell-cli 1.36.0-rc1 → 1.38.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.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/package.json +4 -4
- package/dist/src/acp/acpClient.js +297 -32
- package/dist/src/acp/acpClient.js.map +1 -1
- package/dist/src/acp/acpClient.test.js +419 -19
- package/dist/src/acp/acpClient.test.js.map +1 -1
- package/dist/src/acp/acpResume.test.js +8 -0
- package/dist/src/acp/acpResume.test.js.map +1 -1
- package/dist/src/acp/commandHandler.js +4 -0
- package/dist/src/acp/commandHandler.js.map +1 -1
- package/dist/src/acp/commandHandler.test.js +4 -0
- package/dist/src/acp/commandHandler.test.js.map +1 -1
- package/dist/src/acp/commands/about.d.ts +11 -0
- package/dist/src/acp/commands/about.js +53 -0
- package/dist/src/acp/commands/about.js.map +1 -0
- package/dist/src/acp/commands/extensions.js +1 -1
- package/dist/src/acp/commands/extensions.js.map +1 -1
- package/dist/src/acp/commands/help.d.ts +14 -0
- package/dist/src/acp/commands/help.js +35 -0
- package/dist/src/acp/commands/help.js.map +1 -0
- package/dist/src/acp/commands/help.test.d.ts +6 -0
- package/dist/src/acp/commands/help.test.js +40 -0
- package/dist/src/acp/commands/help.test.js.map +1 -0
- package/dist/src/acp/commands/restore.js +2 -2
- package/dist/src/acp/commands/restore.js.map +1 -1
- package/dist/src/commands/extensions/new.js +1 -1
- package/dist/src/commands/extensions/new.js.map +1 -1
- package/dist/src/commands/mcp/list.js +2 -2
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp.test.js +1 -1
- package/dist/src/commands/mcp.test.js.map +1 -1
- package/dist/src/commands/skills/list.js +5 -8
- package/dist/src/commands/skills/list.js.map +1 -1
- package/dist/src/commands/skills/list.test.js +17 -13
- package/dist/src/commands/skills/list.test.js.map +1 -1
- package/dist/src/config/config.js +22 -9
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +121 -36
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager-permissions.test.js +1 -1
- package/dist/src/config/extension-manager-permissions.test.js.map +1 -1
- package/dist/src/config/extension-manager-themes.spec.js +1 -0
- package/dist/src/config/extension-manager-themes.spec.js.map +1 -1
- package/dist/src/config/extension-manager.test.js +1 -1
- package/dist/src/config/extension-manager.test.js.map +1 -1
- package/dist/src/config/extension.js +1 -1
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/extensions/github.js +1 -1
- package/dist/src/config/extensions/github.js.map +1 -1
- package/dist/src/config/footerItems.d.ts +4 -0
- package/dist/src/config/footerItems.js +12 -2
- package/dist/src/config/footerItems.js.map +1 -1
- package/dist/src/config/footerItems.test.js +129 -72
- package/dist/src/config/footerItems.test.js.map +1 -1
- package/dist/src/config/policy-engine.integration.test.js +1 -3
- package/dist/src/config/policy-engine.integration.test.js.map +1 -1
- package/dist/src/config/policy.d.ts +1 -1
- package/dist/src/config/policy.js +2 -2
- package/dist/src/config/policy.js.map +1 -1
- package/dist/src/config/settings.js +19 -3
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +272 -53
- package/dist/src/config/settingsSchema.js +262 -48
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +22 -4
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/workspace-policy-cli.test.js +7 -7
- package/dist/src/config/workspace-policy-cli.test.js.map +1 -1
- package/dist/src/gemini.js +24 -7
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +74 -4
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +69 -4
- 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/integration-tests/modelSteering.test.js +1 -1
- package/dist/src/integration-tests/modelSteering.test.js.map +1 -1
- package/dist/src/interactiveCli.js +4 -2
- package/dist/src/interactiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.d.ts +1 -1
- package/dist/src/nonInteractiveCli.js +11 -2
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +4 -2
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/nonInteractiveCliAgentSession.d.ts +16 -0
- package/dist/src/nonInteractiveCliAgentSession.js +484 -0
- package/dist/src/nonInteractiveCliAgentSession.js.map +1 -0
- package/dist/src/nonInteractiveCliAgentSession.test.js +1837 -0
- package/dist/src/nonInteractiveCliAgentSession.test.js.map +1 -0
- package/dist/src/services/BuiltinCommandLoader.js +4 -2
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/test-utils/mockCommandContext.js +1 -0
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/test-utils/mockConfig.js +16 -0
- package/dist/src/test-utils/mockConfig.js.map +1 -1
- package/dist/src/test-utils/mockSpinner.d.ts +6 -0
- package/dist/src/test-utils/mockSpinner.js +21 -0
- package/dist/src/test-utils/mockSpinner.js.map +1 -0
- package/dist/src/test-utils/render.d.ts +8 -1
- package/dist/src/test-utils/render.js +37 -11
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/App.test.js +1 -1
- package/dist/src/ui/App.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +225 -99
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +50 -38
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.js +15 -5
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +3 -1
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +1 -1
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +22 -11
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/marketplaceCommand.d.ts +7 -0
- package/dist/src/ui/commands/marketplaceCommand.js +135 -0
- package/dist/src/ui/commands/marketplaceCommand.js.map +1 -0
- package/dist/src/ui/commands/mcpCommand.js +26 -7
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js +26 -0
- package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/planCommand.js +9 -0
- package/dist/src/ui/commands/planCommand.js.map +1 -1
- package/dist/src/ui/commands/planCommand.test.js +29 -0
- package/dist/src/ui/commands/planCommand.test.js.map +1 -1
- package/dist/src/ui/commands/restoreCommand.js +1 -1
- package/dist/src/ui/commands/restoreCommand.js.map +1 -1
- package/dist/src/ui/commands/rewindCommand.js +3 -1
- package/dist/src/ui/commands/rewindCommand.js.map +1 -1
- package/dist/src/ui/commands/rewindCommand.test.js +1 -1
- package/dist/src/ui/commands/rewindCommand.test.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.js +5 -5
- package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.js +11 -1
- package/dist/src/ui/commands/skillsCommand.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.test.js +1 -0
- package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/{shellsCommand.d.ts → tasksCommand.d.ts} +1 -1
- package/dist/src/ui/commands/{shellsCommand.js → tasksCommand.js} +6 -6
- package/dist/src/ui/commands/tasksCommand.js.map +1 -0
- package/dist/src/ui/commands/tasksCommand.test.js +30 -0
- package/dist/src/ui/commands/tasksCommand.test.js.map +1 -0
- package/dist/src/ui/commands/types.d.ts +9 -1
- package/dist/src/ui/components/AnsiOutput.js +7 -5
- package/dist/src/ui/components/AnsiOutput.js.map +1 -1
- package/dist/src/ui/components/AnsiOutput.test.js +13 -0
- package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
- package/dist/src/ui/components/AppHeader.js +11 -11
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/AppHeader.test.js +6 -2
- 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 +13 -13
- package/dist/src/ui/components/AskUserDialog.js.map +1 -1
- package/dist/src/ui/components/AskUserDialog.test.js +31 -0
- package/dist/src/ui/components/AskUserDialog.test.js.map +1 -1
- package/dist/src/ui/components/BackgroundTaskDisplay.d.ts +16 -0
- package/dist/src/ui/components/{BackgroundShellDisplay.js → BackgroundTaskDisplay.js} +12 -12
- package/dist/src/ui/components/BackgroundTaskDisplay.js.map +1 -0
- package/dist/src/ui/components/{BackgroundShellDisplay.test.js → BackgroundTaskDisplay.test.js} +26 -26
- package/dist/src/ui/components/BackgroundTaskDisplay.test.js.map +1 -0
- package/dist/src/ui/components/Composer.js +20 -208
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +22 -17
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ContextSummaryDisplay.js +3 -1
- package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/CopyModeWarning.js +3 -6
- package/dist/src/ui/components/CopyModeWarning.js.map +1 -1
- package/dist/src/ui/components/CopyModeWarning.test.js +7 -8
- package/dist/src/ui/components/CopyModeWarning.test.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.js +9 -0
- package/dist/src/ui/components/ExitPlanModeDialog.js.map +1 -1
- package/dist/src/ui/components/ExitPlanModeDialog.test.js +15 -3
- package/dist/src/ui/components/ExitPlanModeDialog.test.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +7 -8
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +36 -9
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Footer.test.js +85 -6
- package/dist/src/ui/components/Footer.test.js.map +1 -1
- package/dist/src/ui/components/FooterConfigDialog.js +1 -0
- 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/Help.test.js +1 -1
- package/dist/src/ui/components/Help.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.d.ts +2 -0
- package/dist/src/ui/components/HistoryItemDisplay.js +14 -12
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.d.ts +10 -5
- package/dist/src/ui/components/InputPrompt.js +195 -90
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.d.ts +12 -1
- package/dist/src/ui/components/InputPrompt.test.js +370 -160
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.js +1 -2
- package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.test.js +7 -0
- package/dist/src/ui/components/LoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/components/MainContent.d.ts +1 -1
- package/dist/src/ui/components/MainContent.js +105 -34
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/MainContent.test.js +12 -9
- package/dist/src/ui/components/MainContent.test.js.map +1 -1
- package/dist/src/ui/components/MemoryUsageDisplay.d.ts +1 -0
- package/dist/src/ui/components/MemoryUsageDisplay.js +5 -2
- package/dist/src/ui/components/MemoryUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +50 -72
- package/dist/src/ui/components/ModelDialog.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/ModelQuotaDisplay.d.ts +18 -0
- package/dist/src/ui/components/ModelQuotaDisplay.js +104 -0
- package/dist/src/ui/components/ModelQuotaDisplay.js.map +1 -0
- package/dist/src/ui/components/ModelQuotaDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/ModelQuotaDisplay.test.js +62 -0
- package/dist/src/ui/components/ModelQuotaDisplay.test.js.map +1 -0
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/ProgressBar.d.ts +13 -0
- package/dist/src/ui/components/ProgressBar.js +17 -0
- package/dist/src/ui/components/ProgressBar.js.map +1 -0
- package/dist/src/ui/components/ProgressBar.test.d.ts +6 -0
- package/dist/src/ui/components/ProgressBar.test.js +28 -0
- package/dist/src/ui/components/ProgressBar.test.js.map +1 -0
- package/dist/src/ui/components/StatsDisplay.d.ts +2 -2
- package/dist/src/ui/components/StatsDisplay.js +47 -128
- package/dist/src/ui/components/StatsDisplay.js.map +1 -1
- package/dist/src/ui/components/StatsDisplay.test.js +65 -136
- package/dist/src/ui/components/StatsDisplay.test.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.js +1 -1
- package/dist/src/ui/components/StatusDisplay.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.test.js +3 -3
- package/dist/src/ui/components/StatusDisplay.test.js.map +1 -1
- package/dist/src/ui/components/StatusRow.d.ts +32 -0
- package/dist/src/ui/components/StatusRow.js +180 -0
- package/dist/src/ui/components/StatusRow.js.map +1 -0
- package/dist/src/ui/components/StatusRow.test.d.ts +6 -0
- package/dist/src/ui/components/StatusRow.test.js +99 -0
- package/dist/src/ui/components/StatusRow.test.js.map +1 -0
- package/dist/src/ui/components/ToastDisplay.d.ts +2 -1
- package/dist/src/ui/components/ToastDisplay.js +7 -5
- package/dist/src/ui/components/ToastDisplay.js.map +1 -1
- package/dist/src/ui/components/ToastDisplay.test.js +34 -20
- package/dist/src/ui/components/ToastDisplay.test.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.js +24 -9
- package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.test.js +4 -6
- package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
- package/dist/src/ui/components/UserIdentity.js +8 -5
- package/dist/src/ui/components/UserIdentity.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.d.ts +13 -0
- package/dist/src/ui/components/messages/DenseToolMessage.js +270 -0
- package/dist/src/ui/components/messages/DenseToolMessage.js.map +1 -0
- package/dist/src/ui/components/messages/DenseToolMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/DenseToolMessage.test.js +383 -0
- package/dist/src/ui/components/messages/DenseToolMessage.test.js.map +1 -0
- package/dist/src/ui/components/messages/DiffRenderer.d.ts +18 -0
- package/dist/src/ui/components/messages/DiffRenderer.js +54 -34
- package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.js +12 -6
- package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -1
- package/dist/src/ui/components/messages/InfoMessage.d.ts +1 -0
- package/dist/src/ui/components/messages/InfoMessage.js +2 -2
- package/dist/src/ui/components/messages/InfoMessage.js.map +1 -1
- package/dist/src/ui/components/messages/RedirectionConfirmation.test.js +1 -1
- package/dist/src/ui/components/messages/RedirectionConfirmation.test.js.map +1 -1
- package/dist/src/ui/components/messages/ShellToolMessage.test.js +44 -33
- package/dist/src/ui/components/messages/ShellToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/SubagentGroupDisplay.js +3 -2
- package/dist/src/ui/components/messages/SubagentGroupDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/SubagentGroupDisplay.test.js +1 -1
- package/dist/src/ui/components/messages/SubagentGroupDisplay.test.js.map +1 -1
- package/dist/src/ui/components/messages/SubagentHistoryMessage.d.ts +13 -0
- package/dist/src/ui/components/messages/SubagentHistoryMessage.js +4 -0
- package/dist/src/ui/components/messages/SubagentHistoryMessage.js.map +1 -0
- package/dist/src/ui/components/messages/SubagentHistoryMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/SubagentHistoryMessage.test.js +68 -0
- package/dist/src/ui/components/messages/SubagentHistoryMessage.test.js.map +1 -0
- package/dist/src/ui/components/messages/SubagentProgressDisplay.d.ts +2 -1
- package/dist/src/ui/components/messages/SubagentProgressDisplay.js +2 -2
- package/dist/src/ui/components/messages/SubagentProgressDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js +0 -4
- package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.d.ts +1 -0
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +108 -70
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +40 -25
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.compact.test.d.ts +6 -0
- package/dist/src/ui/components/messages/ToolGroupMessage.compact.test.js +147 -0
- package/dist/src/ui/components/messages/ToolGroupMessage.compact.test.js.map +1 -0
- package/dist/src/ui/components/messages/ToolGroupMessage.d.ts +3 -0
- package/dist/src/ui/components/messages/ToolGroupMessage.js +219 -52
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +55 -3
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js +8 -7
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolOverflowConsistencyChecks.test.js +1 -1
- package/dist/src/ui/components/messages/ToolOverflowConsistencyChecks.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.js +57 -15
- package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js +66 -3
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplayOverflow.test.js +5 -4
- package/dist/src/ui/components/messages/ToolResultDisplayOverflow.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolStickyHeaderRegression.test.js +3 -3
- package/dist/src/ui/components/messages/ToolStickyHeaderRegression.test.js.map +1 -1
- package/dist/src/ui/components/messages/TopicMessage.d.ts +15 -0
- package/dist/src/ui/components/messages/TopicMessage.js +56 -0
- package/dist/src/ui/components/messages/TopicMessage.js.map +1 -0
- package/dist/src/ui/components/messages/TopicMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/TopicMessage.test.js +77 -0
- package/dist/src/ui/components/messages/TopicMessage.test.js.map +1 -0
- package/dist/src/ui/components/shared/MaxSizedBox.d.ts +1 -0
- package/dist/src/ui/components/shared/MaxSizedBox.js +10 -7
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/Scrollable.d.ts +3 -0
- package/dist/src/ui/components/shared/Scrollable.js +6 -2
- package/dist/src/ui/components/shared/Scrollable.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.d.ts +9 -12
- package/dist/src/ui/components/shared/ScrollableList.js +2 -2
- package/dist/src/ui/components/shared/ScrollableList.js.map +1 -1
- package/dist/src/ui/components/shared/VirtualizedList.d.ts +13 -1
- package/dist/src/ui/components/shared/VirtualizedList.js +148 -37
- package/dist/src/ui/components/shared/VirtualizedList.js.map +1 -1
- package/dist/src/ui/components/shared/VirtualizedList.test.js +1 -10
- package/dist/src/ui/components/shared/VirtualizedList.test.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.d.ts +1 -0
- package/dist/src/ui/components/shared/text-buffer.js +19 -21
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionDetails.d.ts +4 -1
- package/dist/src/ui/components/views/ExtensionDetails.js +14 -4
- package/dist/src/ui/components/views/ExtensionDetails.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionDetails.test.js +25 -1
- package/dist/src/ui/components/views/ExtensionDetails.test.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionRegistryView.js +19 -5
- package/dist/src/ui/components/views/ExtensionRegistryView.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionRegistryView.test.js +38 -0
- package/dist/src/ui/components/views/ExtensionRegistryView.test.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.js +2 -1
- package/dist/src/ui/components/views/SkillsList.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.test.js +3 -1
- package/dist/src/ui/components/views/SkillsList.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 +6 -0
- package/dist/src/ui/constants.js +15 -0
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/InputContext.d.ts +17 -0
- package/dist/src/ui/contexts/InputContext.js +15 -0
- package/dist/src/ui/contexts/InputContext.js.map +1 -0
- package/dist/src/ui/contexts/KeypressContext.js +1 -1
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +25 -1
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/ScrollProvider.js +25 -3
- package/dist/src/ui/contexts/ScrollProvider.js.map +1 -1
- package/dist/src/ui/contexts/ScrollProvider.test.js +100 -0
- package/dist/src/ui/contexts/ScrollProvider.test.js.map +1 -1
- package/dist/src/ui/contexts/SessionContext.d.ts +2 -2
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.d.ts +6 -0
- package/dist/src/ui/contexts/ToolActionsContext.js +19 -11
- package/dist/src/ui/contexts/ToolActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.test.js +90 -7
- package/dist/src/ui/contexts/ToolActionsContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +4 -3
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +10 -16
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js +2 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.js +2 -1
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.js.map +1 -1
- package/dist/src/ui/hooks/shellReducer.d.ts +12 -10
- package/dist/src/ui/hooks/shellReducer.js +67 -37
- package/dist/src/ui/hooks/shellReducer.js.map +1 -1
- package/dist/src/ui/hooks/shellReducer.test.js +207 -36
- package/dist/src/ui/hooks/shellReducer.test.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +1 -1
- package/dist/src/ui/hooks/toolMapping.js +7 -0
- package/dist/src/ui/hooks/toolMapping.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.js +6 -1
- package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.test.js +5 -0
- package/dist/src/ui/hooks/useAlternateBuffer.test.js.map +1 -1
- package/dist/src/ui/hooks/useAnimatedScrollbar.js +2 -2
- package/dist/src/ui/hooks/useAnimatedScrollbar.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.js +1 -1
- package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useBackgroundTaskManager.d.ts +22 -0
- package/dist/src/ui/hooks/useBackgroundTaskManager.js +58 -0
- package/dist/src/ui/hooks/useBackgroundTaskManager.js.map +1 -0
- package/dist/src/ui/hooks/{useBackgroundShellManager.test.js → useBackgroundTaskManager.test.js} +50 -50
- package/dist/src/ui/hooks/useBackgroundTaskManager.test.js.map +1 -0
- package/dist/src/ui/hooks/useBanner.d.ts +1 -0
- package/dist/src/ui/hooks/useBanner.js +16 -9
- package/dist/src/ui/hooks/useBanner.js.map +1 -1
- package/dist/src/ui/hooks/useBanner.test.js +7 -4
- package/dist/src/ui/hooks/useBanner.test.js.map +1 -1
- package/dist/src/ui/hooks/useBatchedScroll.js +2 -2
- package/dist/src/ui/hooks/useBatchedScroll.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.d.ts +2 -1
- package/dist/src/ui/hooks/useCommandCompletion.js +13 -3
- package/dist/src/ui/hooks/useCommandCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.d.ts +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js +82 -6
- package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useComposerStatus.d.ts +21 -0
- package/dist/src/ui/hooks/useComposerStatus.js +78 -0
- package/dist/src/ui/hooks/useComposerStatus.js.map +1 -0
- package/dist/src/ui/hooks/useConsoleMessages.test.js +2 -2
- package/dist/src/ui/hooks/useConsoleMessages.test.js.map +1 -1
- package/dist/src/ui/hooks/useExecutionLifecycle.d.ts +28 -0
- package/dist/src/ui/hooks/{shellCommandProcessor.js → useExecutionLifecycle.js} +140 -58
- package/dist/src/ui/hooks/useExecutionLifecycle.js.map +1 -0
- package/dist/src/ui/hooks/useExecutionLifecycle.test.d.ts +6 -0
- package/dist/src/ui/hooks/{shellCommandProcessor.test.js → useExecutionLifecycle.test.js} +123 -81
- package/dist/src/ui/hooks/useExecutionLifecycle.test.js.map +1 -0
- package/dist/src/ui/hooks/useFolderTrust.js +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +6 -6
- package/dist/src/ui/hooks/useGeminiStream.js +140 -38
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +176 -22
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.js +2 -2
- package/dist/src/ui/hooks/useGitBranchName.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +10 -0
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/usePermissionsModifyTrust.js +2 -2
- package/dist/src/ui/hooks/usePermissionsModifyTrust.js.map +1 -1
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +1 -1
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js +4 -2
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.d.ts +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.js +2 -2
- package/dist/src/ui/hooks/useSessionBrowser.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.d.ts +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.js +37 -63
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.d.ts +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +57 -47
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.d.ts +2 -1
- package/dist/src/ui/hooks/useToolScheduler.js +55 -1
- package/dist/src/ui/hooks/useToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +107 -9
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/key/keyBindings.d.ts +9 -1
- package/dist/src/ui/key/keyBindings.js +40 -3
- package/dist/src/ui/key/keyBindings.js.map +1 -1
- package/dist/src/ui/key/keyMatchers.test.js +12 -2
- package/dist/src/ui/key/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/layouts/DefaultAppLayout.js +8 -6
- package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -1
- package/dist/src/ui/layouts/DefaultAppLayout.test.js +27 -22
- package/dist/src/ui/layouts/DefaultAppLayout.test.js.map +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +1 -1
- package/dist/src/ui/themes/builtin/dark/tokyonight-dark.d.ts +7 -0
- package/dist/src/ui/themes/builtin/dark/tokyonight-dark.js +147 -0
- package/dist/src/ui/themes/builtin/dark/tokyonight-dark.js.map +1 -0
- package/dist/src/ui/themes/theme-manager.js +2 -0
- package/dist/src/ui/themes/theme-manager.js.map +1 -1
- package/dist/src/ui/themes/theme.js +1 -1
- package/dist/src/ui/themes/theme.js.map +1 -1
- package/dist/src/ui/types.d.ts +10 -2
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.d.ts +1 -0
- package/dist/src/ui/utils/CodeColorizer.js +17 -18
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/ConsolePatcher.d.ts +1 -0
- package/dist/src/ui/utils/ConsolePatcher.js +12 -5
- package/dist/src/ui/utils/ConsolePatcher.js.map +1 -1
- package/dist/src/ui/utils/ConsolePatcher.test.d.ts +6 -0
- package/dist/src/ui/utils/ConsolePatcher.test.js +199 -0
- package/dist/src/ui/utils/ConsolePatcher.test.js.map +1 -0
- package/dist/src/ui/utils/TableRenderer.js +3 -3
- package/dist/src/ui/utils/TableRenderer.js.map +1 -1
- package/dist/src/ui/utils/borderStyles.d.ts +2 -2
- package/dist/src/ui/utils/borderStyles.js +2 -2
- package/dist/src/ui/utils/borderStyles.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.js +1 -1
- package/dist/src/ui/utils/directoryUtils.js.map +1 -1
- package/dist/src/ui/utils/fileUtils.d.ts +10 -0
- package/dist/src/ui/utils/fileUtils.js +17 -0
- package/dist/src/ui/utils/fileUtils.js.map +1 -0
- package/dist/src/ui/utils/terminalCapabilityManager.d.ts +1 -0
- package/dist/src/ui/utils/terminalCapabilityManager.js +8 -0
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.test.js +38 -0
- package/dist/src/ui/utils/terminalCapabilityManager.test.js.map +1 -1
- package/dist/src/ui/utils/toolLayoutUtils.d.ts +1 -1
- package/dist/src/ui/utils/toolLayoutUtils.js +1 -1
- package/dist/src/ui/utils/ui-sizing.test.js +1 -0
- package/dist/src/ui/utils/ui-sizing.test.js.map +1 -1
- package/dist/src/ui/utils/updateCheck.d.ts +1 -0
- package/dist/src/ui/utils/updateCheck.js.map +1 -1
- package/dist/src/utils/activityLogger.js +16 -0
- package/dist/src/utils/activityLogger.js.map +1 -1
- package/dist/src/utils/cleanup.js +12 -5
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/commands.js +15 -0
- package/dist/src/utils/commands.js.map +1 -1
- package/dist/src/utils/commands.test.js +79 -0
- package/dist/src/utils/commands.test.js.map +1 -1
- package/dist/src/utils/envVarResolver.d.ts +5 -2
- package/dist/src/utils/envVarResolver.js +15 -6
- package/dist/src/utils/envVarResolver.js.map +1 -1
- package/dist/src/utils/envVarResolver.test.js +41 -24
- package/dist/src/utils/envVarResolver.test.js.map +1 -1
- package/dist/src/utils/errors.js +4 -4
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/events.d.ts +3 -1
- package/dist/src/utils/events.js +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/gitUtils.js +4 -4
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.js +10 -3
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +8 -2
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/installationInfo.js +1 -1
- package/dist/src/utils/installationInfo.js.map +1 -1
- package/dist/src/utils/jsonoutput.js +1 -1
- package/dist/src/utils/jsonoutput.js.map +1 -1
- package/dist/src/utils/sandboxUtils.js +1 -1
- package/dist/src/utils/sandboxUtils.js.map +1 -1
- package/dist/src/utils/sessionCleanup.js +7 -30
- package/dist/src/utils/sessionCleanup.js.map +1 -1
- package/dist/src/utils/sessionCleanup.test.js +3 -0
- package/dist/src/utils/sessionCleanup.test.js.map +1 -1
- package/dist/src/utils/sessionUtils.js +1 -0
- package/dist/src/utils/sessionUtils.js.map +1 -1
- package/dist/src/utils/sessionUtils.test.js +179 -3
- package/dist/src/utils/sessionUtils.test.js.map +1 -1
- package/dist/src/utils/sessions.js +1 -1
- package/dist/src/utils/sessions.js.map +1 -1
- package/dist/src/utils/skillUtils.js +3 -1
- package/dist/src/utils/skillUtils.js.map +1 -1
- package/dist/src/utils/skillUtils.test.js +4 -6
- package/dist/src/utils/skillUtils.test.js.map +1 -1
- package/dist/src/utils/terminalNotifications.js +2 -4
- package/dist/src/utils/terminalNotifications.js.map +1 -1
- package/dist/src/utils/terminalNotifications.test.js +5 -3
- package/dist/src/utils/terminalNotifications.test.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.js +2 -2
- package/dist/src/utils/userStartupWarnings.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/src/ui/commands/shellsCommand.js.map +0 -1
- package/dist/src/ui/commands/shellsCommand.test.js +0 -29
- package/dist/src/ui/commands/shellsCommand.test.js.map +0 -1
- package/dist/src/ui/components/BackgroundShellDisplay.d.ts +0 -16
- package/dist/src/ui/components/BackgroundShellDisplay.js.map +0 -1
- package/dist/src/ui/components/BackgroundShellDisplay.test.js.map +0 -1
- package/dist/src/ui/hooks/shellCommandProcessor.d.ts +0 -28
- package/dist/src/ui/hooks/shellCommandProcessor.js.map +0 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +0 -1
- package/dist/src/ui/hooks/useBackgroundShellManager.d.ts +0 -22
- package/dist/src/ui/hooks/useBackgroundShellManager.js +0 -58
- package/dist/src/ui/hooks/useBackgroundShellManager.js.map +0 -1
- package/dist/src/ui/hooks/useBackgroundShellManager.test.js.map +0 -1
- /package/dist/src/{ui/commands/shellsCommand.test.d.ts → nonInteractiveCliAgentSession.test.d.ts} +0 -0
- /package/dist/src/ui/{components/BackgroundShellDisplay.test.d.ts → commands/tasksCommand.test.d.ts} +0 -0
- /package/dist/src/ui/{hooks/shellCommandProcessor.test.d.ts → components/BackgroundTaskDisplay.test.d.ts} +0 -0
- /package/dist/src/ui/hooks/{useBackgroundShellManager.test.d.ts → useBackgroundTaskManager.test.d.ts} +0 -0
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { HistoryItemWithoutId } from '../types.js';
|
|
7
|
+
import type { AnsiOutput, Config, GeminiClient, CompletionBehavior } from '@google/gemini-cli-core';
|
|
8
|
+
import { type PartListUnion } from '@google/genai';
|
|
9
|
+
import type { UseHistoryManagerReturn } from './useHistoryManager.js';
|
|
10
|
+
import { type BackgroundTask } from './shellReducer.js';
|
|
11
|
+
export { type BackgroundTask };
|
|
12
|
+
export declare const OUTPUT_UPDATE_INTERVAL_MS = 1000;
|
|
13
|
+
/**
|
|
14
|
+
* Hook to process shell commands.
|
|
15
|
+
* Orchestrates command execution and updates history and agent context.
|
|
16
|
+
*/
|
|
17
|
+
export declare const useExecutionLifecycle: (addItemToHistory: UseHistoryManagerReturn["addItem"], setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>, onExec: (command: Promise<void>) => void, onDebugMessage: (message: string) => void, config: Config, geminiClient: GeminiClient, setShellInputFocused: (value: boolean) => void, terminalWidth?: number, terminalHeight?: number, activeBackgroundExecutionId?: number, isWaitingForConfirmation?: boolean) => {
|
|
18
|
+
handleShellCommand: (rawQuery: PartListUnion, abortSignal: AbortSignal) => boolean;
|
|
19
|
+
activeShellPtyId: number | null;
|
|
20
|
+
lastShellOutputTime: number;
|
|
21
|
+
backgroundTaskCount: number;
|
|
22
|
+
isBackgroundTaskVisible: boolean;
|
|
23
|
+
toggleBackgroundTasks: () => void;
|
|
24
|
+
backgroundCurrentExecution: () => void;
|
|
25
|
+
registerBackgroundTask: (pid: number, command: string, initialOutput: string | AnsiOutput, completionBehavior?: CompletionBehavior) => void;
|
|
26
|
+
dismissBackgroundTask: (pid: number) => Promise<void>;
|
|
27
|
+
backgroundTasks: Map<number, BackgroundTask>;
|
|
28
|
+
};
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useCallback, useReducer, useRef, useEffect } from 'react';
|
|
7
|
-
import { isBinary, ShellExecutionService, CoreToolCallStatus, } from '@google/gemini-cli-core';
|
|
7
|
+
import { isBinary, ShellExecutionService, ExecutionLifecycleService, CoreToolCallStatus, } from '@google/gemini-cli-core';
|
|
8
8
|
import {} from '@google/genai';
|
|
9
9
|
import { SHELL_COMMAND_NAME } from '../constants.js';
|
|
10
10
|
import { formatBytes } from '../utils/formatters.js';
|
|
@@ -22,20 +22,17 @@ function addShellCommandToGeminiHistory(geminiClient, rawQuery, resultText) {
|
|
|
22
22
|
const modelContent = resultText.length > MAX_OUTPUT_LENGTH
|
|
23
23
|
? resultText.substring(0, MAX_OUTPUT_LENGTH) + '\n... (truncated)'
|
|
24
24
|
: resultText;
|
|
25
|
+
// Escape backticks to prevent prompt injection breakouts
|
|
26
|
+
const safeQuery = rawQuery.replace(/\\/g, '\\\\').replace(/\x60/g, '\\\x60');
|
|
27
|
+
const safeModelContent = modelContent
|
|
28
|
+
.replace(/\\/g, '\\\\')
|
|
29
|
+
.replace(/\x60/g, '\\\x60');
|
|
25
30
|
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
26
31
|
geminiClient.addHistory({
|
|
27
32
|
role: 'user',
|
|
28
33
|
parts: [
|
|
29
34
|
{
|
|
30
|
-
text: `I ran the following shell command
|
|
31
|
-
\`\`\`sh
|
|
32
|
-
${rawQuery}
|
|
33
|
-
\`\`\`
|
|
34
|
-
|
|
35
|
-
This produced the following result:
|
|
36
|
-
\`\`\`
|
|
37
|
-
${modelContent}
|
|
38
|
-
\`\`\``,
|
|
35
|
+
text: `I ran the following shell command:\n\`\`\`sh\n${safeQuery}\n\`\`\`\n\nThis produced the following result:\n\`\`\`\n${safeModelContent}\n\`\`\``,
|
|
39
36
|
},
|
|
40
37
|
],
|
|
41
38
|
});
|
|
@@ -44,7 +41,7 @@ ${modelContent}
|
|
|
44
41
|
* Hook to process shell commands.
|
|
45
42
|
* Orchestrates command execution and updates history and agent context.
|
|
46
43
|
*/
|
|
47
|
-
export const
|
|
44
|
+
export const useExecutionLifecycle = (addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight, activeBackgroundExecutionId, isWaitingForConfirmation) => {
|
|
48
45
|
const [state, dispatch] = useReducer(shellReducer, initialState);
|
|
49
46
|
// Consolidate stable tracking into a single manager object
|
|
50
47
|
const manager = useRef(null);
|
|
@@ -65,7 +62,7 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
65
62
|
clearTimeout(m.restoreTimeout);
|
|
66
63
|
m.restoreTimeout = null;
|
|
67
64
|
}
|
|
68
|
-
if (state.
|
|
65
|
+
if (state.isBackgroundTaskVisible && !m.wasVisibleBeforeForeground) {
|
|
69
66
|
m.wasVisibleBeforeForeground = true;
|
|
70
67
|
dispatch({ type: 'SET_VISIBILITY', visible: false });
|
|
71
68
|
}
|
|
@@ -87,20 +84,20 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
87
84
|
}, [
|
|
88
85
|
activePtyId,
|
|
89
86
|
isWaitingForConfirmation,
|
|
90
|
-
state.
|
|
87
|
+
state.isBackgroundTaskVisible,
|
|
91
88
|
m,
|
|
92
89
|
dispatch,
|
|
93
90
|
]);
|
|
94
91
|
useEffect(() => () => {
|
|
95
|
-
// Unsubscribe from all background
|
|
92
|
+
// Unsubscribe from all background task events on unmount
|
|
96
93
|
for (const unsubscribe of m.subscriptions.values()) {
|
|
97
94
|
unsubscribe();
|
|
98
95
|
}
|
|
99
96
|
m.subscriptions.clear();
|
|
100
97
|
}, [m]);
|
|
101
|
-
const
|
|
102
|
-
if (state.
|
|
103
|
-
const willBeVisible = !state.
|
|
98
|
+
const toggleBackgroundTasks = useCallback(() => {
|
|
99
|
+
if (state.backgroundTasks.size > 0) {
|
|
100
|
+
const willBeVisible = !state.isBackgroundTaskVisible;
|
|
104
101
|
dispatch({ type: 'TOGGLE_VISIBILITY' });
|
|
105
102
|
const isForegroundActive = !!activePtyId || !!isWaitingForConfirmation;
|
|
106
103
|
// If we are manually showing it during foreground, we set the restore flag
|
|
@@ -113,30 +110,40 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
113
110
|
m.wasVisibleBeforeForeground = false;
|
|
114
111
|
}
|
|
115
112
|
if (willBeVisible) {
|
|
116
|
-
dispatch({ type: '
|
|
113
|
+
dispatch({ type: 'SYNC_BACKGROUND_TASKS' });
|
|
117
114
|
}
|
|
118
115
|
}
|
|
119
116
|
else {
|
|
120
117
|
dispatch({ type: 'SET_VISIBILITY', visible: false });
|
|
121
118
|
addItemToHistory({
|
|
122
119
|
type: 'info',
|
|
123
|
-
text: 'No background
|
|
120
|
+
text: 'No background tasks are currently active.',
|
|
124
121
|
}, Date.now());
|
|
125
122
|
}
|
|
126
123
|
}, [
|
|
127
124
|
addItemToHistory,
|
|
128
|
-
state.
|
|
129
|
-
state.
|
|
125
|
+
state.backgroundTasks.size,
|
|
126
|
+
state.isBackgroundTaskVisible,
|
|
130
127
|
activePtyId,
|
|
131
128
|
isWaitingForConfirmation,
|
|
132
129
|
m,
|
|
133
130
|
dispatch,
|
|
134
131
|
]);
|
|
135
|
-
const
|
|
132
|
+
const backgroundCurrentExecution = useCallback(() => {
|
|
136
133
|
const pidToBackground = state.activeShellPtyId ?? activeBackgroundExecutionId;
|
|
137
134
|
if (pidToBackground) {
|
|
138
|
-
|
|
135
|
+
// TRACK THE PID BEFORE TRIGGERING THE BACKGROUND ACTION
|
|
136
|
+
// This prevents the onBackground listener from double-registering.
|
|
139
137
|
m.backgroundedPids.add(pidToBackground);
|
|
138
|
+
// Use ShellExecutionService for shell PTYs (handles log files, etc.),
|
|
139
|
+
// fall back to ExecutionLifecycleService for non-shell executions
|
|
140
|
+
// (e.g. remote agents, MCP tools, local agents).
|
|
141
|
+
if (state.activeShellPtyId) {
|
|
142
|
+
ShellExecutionService.background(pidToBackground);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
ExecutionLifecycleService.background(pidToBackground);
|
|
146
|
+
}
|
|
140
147
|
// Ensure backgrounding is silent and doesn't trigger restoration
|
|
141
148
|
m.wasVisibleBeforeForeground = false;
|
|
142
149
|
if (m.restoreTimeout) {
|
|
@@ -145,13 +152,15 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
145
152
|
}
|
|
146
153
|
}
|
|
147
154
|
}, [state.activeShellPtyId, activeBackgroundExecutionId, m]);
|
|
148
|
-
const
|
|
149
|
-
const shell = state.
|
|
155
|
+
const dismissBackgroundTask = useCallback(async (pid) => {
|
|
156
|
+
const shell = state.backgroundTasks.get(pid);
|
|
150
157
|
if (shell) {
|
|
151
158
|
if (shell.status === 'running') {
|
|
152
|
-
|
|
159
|
+
// ExecutionLifecycleService.kill handles both shell and non-shell
|
|
160
|
+
// executions. For shells, ShellExecutionService.kill delegates to it.
|
|
161
|
+
ExecutionLifecycleService.kill(pid);
|
|
153
162
|
}
|
|
154
|
-
dispatch({ type: '
|
|
163
|
+
dispatch({ type: 'DISMISS_TASK', pid });
|
|
155
164
|
m.backgroundedPids.delete(pid);
|
|
156
165
|
// Unsubscribe from updates
|
|
157
166
|
const unsubscribe = m.subscriptions.get(pid);
|
|
@@ -160,29 +169,54 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
160
169
|
m.subscriptions.delete(pid);
|
|
161
170
|
}
|
|
162
171
|
}
|
|
163
|
-
}, [state.
|
|
164
|
-
const
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
172
|
+
}, [state.backgroundTasks, dispatch, m]);
|
|
173
|
+
const registerBackgroundTask = useCallback((pid, command, initialOutput, completionBehavior) => {
|
|
174
|
+
m.backgroundedPids.add(pid);
|
|
175
|
+
dispatch({
|
|
176
|
+
type: 'REGISTER_TASK',
|
|
177
|
+
pid,
|
|
178
|
+
command,
|
|
179
|
+
initialOutput,
|
|
180
|
+
completionBehavior,
|
|
181
|
+
});
|
|
182
|
+
// Subscribe to exit via ExecutionLifecycleService (works for all execution types)
|
|
183
|
+
const exitUnsubscribe = ExecutionLifecycleService.onExit(pid, (code) => {
|
|
168
184
|
dispatch({
|
|
169
|
-
type: '
|
|
185
|
+
type: 'UPDATE_TASK',
|
|
170
186
|
pid,
|
|
171
187
|
update: { status: 'exited', exitCode: code },
|
|
172
188
|
});
|
|
189
|
+
// Auto-dismiss for inject/notify (output was delivered to conversation).
|
|
190
|
+
// Silent tasks stay in the UI until manually dismissed.
|
|
191
|
+
if (completionBehavior !== 'silent') {
|
|
192
|
+
dispatch({ type: 'DISMISS_TASK', pid });
|
|
193
|
+
}
|
|
194
|
+
const unsub = m.subscriptions.get(pid);
|
|
195
|
+
if (unsub) {
|
|
196
|
+
unsub();
|
|
197
|
+
m.subscriptions.delete(pid);
|
|
198
|
+
}
|
|
173
199
|
m.backgroundedPids.delete(pid);
|
|
174
200
|
});
|
|
175
|
-
// Subscribe to
|
|
176
|
-
const dataUnsubscribe =
|
|
201
|
+
// Subscribe to output via ExecutionLifecycleService (works for all execution types)
|
|
202
|
+
const dataUnsubscribe = ExecutionLifecycleService.subscribe(pid, (event) => {
|
|
177
203
|
if (event.type === 'data') {
|
|
178
|
-
dispatch({
|
|
204
|
+
dispatch({
|
|
205
|
+
type: 'APPEND_TASK_OUTPUT',
|
|
206
|
+
pid,
|
|
207
|
+
chunk: event.chunk,
|
|
208
|
+
});
|
|
179
209
|
}
|
|
180
210
|
else if (event.type === 'binary_detected') {
|
|
181
|
-
dispatch({
|
|
211
|
+
dispatch({
|
|
212
|
+
type: 'UPDATE_TASK',
|
|
213
|
+
pid,
|
|
214
|
+
update: { isBinary: true },
|
|
215
|
+
});
|
|
182
216
|
}
|
|
183
217
|
else if (event.type === 'binary_progress') {
|
|
184
218
|
dispatch({
|
|
185
|
-
type: '
|
|
219
|
+
type: 'UPDATE_TASK',
|
|
186
220
|
pid,
|
|
187
221
|
update: {
|
|
188
222
|
isBinary: true,
|
|
@@ -196,6 +230,23 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
196
230
|
dataUnsubscribe();
|
|
197
231
|
});
|
|
198
232
|
}, [dispatch, m]);
|
|
233
|
+
// Auto-register any execution that gets backgrounded, regardless of type.
|
|
234
|
+
// This is the agnostic hook: any tool that calls
|
|
235
|
+
// ExecutionLifecycleService.createExecution() or attachExecution()
|
|
236
|
+
// automatically gets Ctrl+B support — no UI changes needed per tool.
|
|
237
|
+
useEffect(() => {
|
|
238
|
+
const listener = (info) => {
|
|
239
|
+
// Skip if already registered (e.g. shells register via their own flow)
|
|
240
|
+
if (m.backgroundedPids.has(info.executionId)) {
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
registerBackgroundTask(info.executionId, info.label, info.output, info.completionBehavior);
|
|
244
|
+
};
|
|
245
|
+
ExecutionLifecycleService.onBackground(listener);
|
|
246
|
+
return () => {
|
|
247
|
+
ExecutionLifecycleService.offBackground(listener);
|
|
248
|
+
};
|
|
249
|
+
}, [registerBackgroundTask, m]);
|
|
199
250
|
const handleShellCommand = useCallback((rawQuery, abortSignal) => {
|
|
200
251
|
if (typeof rawQuery !== 'string' || rawQuery.trim() === '') {
|
|
201
252
|
return false;
|
|
@@ -288,7 +339,7 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
288
339
|
if (executionPid && m.backgroundedPids.has(executionPid)) {
|
|
289
340
|
// If already backgrounded, let the background shell subscription handle it.
|
|
290
341
|
dispatch({
|
|
291
|
-
type: '
|
|
342
|
+
type: 'APPEND_TASK_OUTPUT',
|
|
292
343
|
pid: executionPid,
|
|
293
344
|
chunk: event.type === 'data' ? event.chunk : cumulativeStdout,
|
|
294
345
|
});
|
|
@@ -335,11 +386,11 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
335
386
|
const result = await resultPromise;
|
|
336
387
|
setPendingHistoryItem(null);
|
|
337
388
|
if (result.backgrounded && result.pid) {
|
|
338
|
-
|
|
389
|
+
registerBackgroundTask(result.pid, rawQuery, cumulativeStdout, 'notify');
|
|
339
390
|
dispatch({ type: 'SET_ACTIVE_PTY', pid: null });
|
|
340
391
|
}
|
|
341
392
|
let mainContent;
|
|
342
|
-
if (isBinary(result.rawOutput)) {
|
|
393
|
+
if (isBinaryStream || isBinary(result.rawOutput)) {
|
|
343
394
|
mainContent =
|
|
344
395
|
'[Command produced binary output, which is not shown.]';
|
|
345
396
|
}
|
|
@@ -347,33 +398,64 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
347
398
|
mainContent =
|
|
348
399
|
result.output.trim() || '(Command produced no output)';
|
|
349
400
|
}
|
|
350
|
-
let finalOutput =
|
|
401
|
+
let finalOutput = result.ansiOutput && result.ansiOutput.length > 0
|
|
402
|
+
? result.ansiOutput
|
|
403
|
+
: mainContent;
|
|
351
404
|
let finalStatus = CoreToolCallStatus.Success;
|
|
405
|
+
const prependToAnsiOutput = (output, text) => {
|
|
406
|
+
const newLines = text.split('\n').map((line) => [
|
|
407
|
+
{
|
|
408
|
+
text: line,
|
|
409
|
+
fg: '',
|
|
410
|
+
bg: '',
|
|
411
|
+
dim: false,
|
|
412
|
+
bold: false,
|
|
413
|
+
italic: false,
|
|
414
|
+
underline: false,
|
|
415
|
+
inverse: false,
|
|
416
|
+
isUninitialized: false,
|
|
417
|
+
},
|
|
418
|
+
]);
|
|
419
|
+
return [...newLines, [], ...output];
|
|
420
|
+
};
|
|
421
|
+
let prefix = '';
|
|
352
422
|
if (result.error) {
|
|
353
423
|
finalStatus = CoreToolCallStatus.Error;
|
|
354
|
-
|
|
424
|
+
prefix = result.error.message;
|
|
355
425
|
}
|
|
356
426
|
else if (result.aborted) {
|
|
357
427
|
finalStatus = CoreToolCallStatus.Cancelled;
|
|
358
|
-
|
|
428
|
+
prefix = 'Command was cancelled.';
|
|
359
429
|
}
|
|
360
430
|
else if (result.backgrounded) {
|
|
361
431
|
finalStatus = CoreToolCallStatus.Success;
|
|
362
432
|
finalOutput = `Command moved to background (PID: ${result.pid}). Output hidden. Press Ctrl+B to view.`;
|
|
433
|
+
mainContent = finalOutput;
|
|
363
434
|
}
|
|
364
435
|
else if (result.signal) {
|
|
365
436
|
finalStatus = CoreToolCallStatus.Error;
|
|
366
|
-
|
|
437
|
+
prefix = `Command terminated by signal: ${result.signal}.`;
|
|
367
438
|
}
|
|
368
439
|
else if (result.exitCode !== 0) {
|
|
369
440
|
finalStatus = CoreToolCallStatus.Error;
|
|
370
|
-
|
|
441
|
+
prefix = `Command exited with code ${result.exitCode}.`;
|
|
442
|
+
}
|
|
443
|
+
if (prefix) {
|
|
444
|
+
finalOutput =
|
|
445
|
+
typeof finalOutput === 'string'
|
|
446
|
+
? `${prefix}\n${finalOutput}`
|
|
447
|
+
: prependToAnsiOutput(finalOutput, prefix);
|
|
448
|
+
mainContent = `${prefix}\n${mainContent}`;
|
|
371
449
|
}
|
|
372
450
|
if (pwdFilePath && fs.existsSync(pwdFilePath)) {
|
|
373
451
|
const finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
|
|
374
452
|
if (finalPwd && finalPwd !== targetDir) {
|
|
375
453
|
const warning = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.`;
|
|
376
|
-
finalOutput =
|
|
454
|
+
finalOutput =
|
|
455
|
+
typeof finalOutput === 'string'
|
|
456
|
+
? `${warning}\n\n${finalOutput}`
|
|
457
|
+
: prependToAnsiOutput(finalOutput, warning);
|
|
458
|
+
mainContent = `${warning}\n\n${mainContent}`;
|
|
377
459
|
}
|
|
378
460
|
}
|
|
379
461
|
const finalToolDisplay = {
|
|
@@ -387,7 +469,7 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
387
469
|
tools: [finalToolDisplay],
|
|
388
470
|
}, userMessageTimestamp);
|
|
389
471
|
}
|
|
390
|
-
addShellCommandToGeminiHistory(geminiClient, rawQuery,
|
|
472
|
+
addShellCommandToGeminiHistory(geminiClient, rawQuery, mainContent);
|
|
391
473
|
}
|
|
392
474
|
catch (err) {
|
|
393
475
|
setPendingHistoryItem(null);
|
|
@@ -418,22 +500,22 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
418
500
|
setShellInputFocused,
|
|
419
501
|
terminalHeight,
|
|
420
502
|
terminalWidth,
|
|
421
|
-
|
|
503
|
+
registerBackgroundTask,
|
|
422
504
|
m,
|
|
423
505
|
dispatch,
|
|
424
506
|
]);
|
|
425
|
-
const
|
|
507
|
+
const backgroundTaskCount = Array.from(state.backgroundTasks.values()).filter((s) => s.status === 'running').length;
|
|
426
508
|
return {
|
|
427
509
|
handleShellCommand,
|
|
428
510
|
activeShellPtyId: state.activeShellPtyId,
|
|
429
511
|
lastShellOutputTime: state.lastShellOutputTime,
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
512
|
+
backgroundTaskCount,
|
|
513
|
+
isBackgroundTaskVisible: state.isBackgroundTaskVisible,
|
|
514
|
+
toggleBackgroundTasks,
|
|
515
|
+
backgroundCurrentExecution,
|
|
516
|
+
registerBackgroundTask,
|
|
517
|
+
dismissBackgroundTask,
|
|
518
|
+
backgroundTasks: state.backgroundTasks,
|
|
437
519
|
};
|
|
438
520
|
};
|
|
439
|
-
//# sourceMappingURL=
|
|
521
|
+
//# sourceMappingURL=useExecutionLifecycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useExecutionLifecycle.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExecutionLifecycle.ts"],"names":[],"mappings":"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"}
|