@google/gemini-cli 0.1.21 → 0.2.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +26 -28
- package/dist/package.json +2 -2
- package/dist/src/commands/mcp/add.js +21 -10
- package/dist/src/commands/mcp/add.js.map +1 -1
- package/dist/src/commands/mcp/remove.js +2 -2
- package/dist/src/commands/mcp/remove.js.map +1 -1
- package/dist/src/config/auth.js +4 -3
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/auth.test.d.ts +6 -0
- package/dist/src/config/auth.test.js +57 -0
- package/dist/src/config/auth.test.js.map +1 -0
- package/dist/src/config/config.d.ts +1 -0
- package/dist/src/config/config.js +20 -11
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/keyBindings.js +3 -2
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/keyBindings.test.d.ts +6 -0
- package/dist/src/config/keyBindings.test.js +51 -0
- package/dist/src/config/keyBindings.test.js.map +1 -0
- package/dist/src/config/sandboxConfig.js +3 -3
- package/dist/src/config/sandboxConfig.js.map +1 -1
- package/dist/src/config/settings.js +50 -46
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +33 -6
- package/dist/src/config/settingsSchema.js +33 -6
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.d.ts +6 -0
- package/dist/src/config/settingsSchema.test.js +195 -0
- package/dist/src/config/settingsSchema.test.js.map +1 -0
- package/dist/src/config/trustedFolders.d.ts +2 -1
- package/dist/src/config/trustedFolders.js +7 -1
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.d.ts +6 -0
- package/dist/src/config/trustedFolders.test.js +160 -0
- package/dist/src/config/trustedFolders.test.js.map +1 -0
- package/dist/src/gemini.js +17 -7
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.d.ts +6 -0
- package/dist/src/gemini.test.js +193 -0
- package/dist/src/gemini.test.js.map +1 -0
- package/dist/src/generated/git-commit.d.ts +2 -1
- package/dist/src/generated/git-commit.js +2 -1
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/nonInteractiveCli.js +2 -5
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.d.ts +6 -0
- package/dist/src/services/BuiltinCommandLoader.test.js +108 -0
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -0
- package/dist/src/services/CommandService.test.d.ts +6 -0
- package/dist/src/services/CommandService.test.js +232 -0
- package/dist/src/services/CommandService.test.js.map +1 -0
- package/dist/src/services/FileCommandLoader.js +10 -8
- package/dist/src/services/FileCommandLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.js +3 -3
- package/dist/src/services/McpPromptLoader.js.map +1 -1
- package/dist/src/services/prompt-processors/argumentProcessor.d.ts +2 -7
- package/dist/src/services/prompt-processors/argumentProcessor.js +2 -10
- package/dist/src/services/prompt-processors/argumentProcessor.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.d.ts +16 -13
- package/dist/src/services/prompt-processors/shellProcessor.js +125 -40
- package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
- package/dist/src/services/prompt-processors/types.d.ts +2 -0
- package/dist/src/services/prompt-processors/types.js +2 -0
- package/dist/src/services/prompt-processors/types.js.map +1 -1
- package/dist/src/test-utils/customMatchers.d.ts +14 -0
- package/dist/src/test-utils/customMatchers.js +46 -0
- package/dist/src/test-utils/customMatchers.js.map +1 -0
- package/dist/src/test-utils/mockCommandContext.d.ts +18 -0
- package/dist/src/test-utils/mockCommandContext.js +86 -0
- package/dist/src/test-utils/mockCommandContext.js.map +1 -0
- package/dist/src/test-utils/mockCommandContext.test.d.ts +6 -0
- package/dist/src/test-utils/mockCommandContext.test.js +51 -0
- package/dist/src/test-utils/mockCommandContext.test.js.map +1 -0
- package/dist/src/test-utils/render.d.ts +8 -0
- package/dist/src/test-utils/render.js +10 -0
- package/dist/src/test-utils/render.js.map +1 -0
- package/dist/src/ui/App.js +52 -20
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.js +3 -3
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.js +9 -5
- package/dist/src/ui/commands/aboutCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.js +13 -5
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.js +8 -6
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/docsCommand.js +1 -1
- package/dist/src/ui/commands/docsCommand.js.map +1 -1
- package/dist/src/ui/commands/ideCommand.js +6 -9
- package/dist/src/ui/commands/ideCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +6 -6
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/setupGithubCommand.test.js +74 -0
- package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -0
- package/dist/src/ui/commands/toolsCommand.js +1 -1
- package/dist/src/ui/commands/toolsCommand.js.map +1 -1
- package/dist/src/ui/components/AboutBox.d.ts +1 -0
- package/dist/src/ui/components/AboutBox.js +1 -1
- package/dist/src/ui/components/AboutBox.js.map +1 -1
- package/dist/src/ui/components/AuthDialog.js +8 -8
- package/dist/src/ui/components/AuthDialog.js.map +1 -1
- package/dist/src/ui/components/AuthDialog.test.d.ts +6 -0
- package/dist/src/ui/components/AuthDialog.test.js +242 -0
- package/dist/src/ui/components/AuthDialog.test.js.map +1 -0
- package/dist/src/ui/components/ContextSummaryDisplay.js +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.d.ts +6 -0
- package/dist/src/ui/components/FolderTrustDialog.test.js +26 -0
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -0
- package/dist/src/ui/components/Footer.d.ts +1 -0
- package/dist/src/ui/components/Footer.js +3 -2
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Header.test.d.ts +6 -0
- package/dist/src/ui/components/Header.test.js +37 -0
- package/dist/src/ui/components/Header.test.js.map +1 -0
- package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js +91 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -0
- package/dist/src/ui/components/InputPrompt.js +5 -4
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.test.d.ts +6 -0
- package/dist/src/ui/components/LoadingIndicator.test.js +190 -0
- package/dist/src/ui/components/LoadingIndicator.test.js.map +1 -0
- package/dist/src/ui/components/SettingsDialog.js +332 -62
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.d.ts +6 -0
- package/dist/src/ui/components/SettingsDialog.test.js +568 -0
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -0
- package/dist/src/ui/components/ShellConfirmationDialog.js +2 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.test.d.ts +6 -0
- package/dist/src/ui/components/ShellConfirmationDialog.test.js +40 -0
- package/dist/src/ui/components/ShellConfirmationDialog.test.js.map +1 -0
- package/dist/src/ui/components/StatsDisplay.js +8 -7
- package/dist/src/ui/components/StatsDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.js +10 -1
- package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.d.ts +6 -0
- package/dist/src/ui/components/messages/DiffRenderer.test.js +239 -0
- package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -0
- package/dist/src/ui/components/messages/InfoMessage.js +2 -1
- package/dist/src/ui/components/messages/InfoMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +2 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +37 -0
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -0
- package/dist/src/ui/components/messages/ToolMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/ToolMessage.test.js +118 -0
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -0
- package/dist/src/ui/components/shared/MaxSizedBox.js +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.d.ts +6 -0
- package/dist/src/ui/components/shared/MaxSizedBox.test.js +154 -0
- package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -0
- package/dist/src/ui/components/shared/RadioButtonSelect.js +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.test.d.ts +6 -0
- package/dist/src/ui/components/shared/RadioButtonSelect.test.js +111 -0
- package/dist/src/ui/components/shared/RadioButtonSelect.test.js.map +1 -0
- package/dist/src/ui/components/shared/text-buffer.js +6 -0
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.d.ts +30 -0
- package/dist/src/ui/contexts/KeypressContext.js +309 -0
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -0
- package/dist/src/ui/contexts/KeypressContext.test.d.ts +6 -0
- package/dist/src/ui/contexts/KeypressContext.test.js +219 -0
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -0
- package/dist/src/ui/contexts/SessionContext.d.ts +3 -0
- package/dist/src/ui/contexts/SessionContext.js +2 -1
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +10 -10
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.d.ts +6 -0
- package/dist/src/ui/hooks/atCommandProcessor.test.js +809 -0
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -0
- package/dist/src/ui/hooks/shellCommandProcessor.js +8 -13
- package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.d.ts +6 -0
- package/dist/src/ui/hooks/shellCommandProcessor.test.js +328 -0
- package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js +21 -9
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.js +3 -5
- package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.d.ts +6 -0
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js +191 -0
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js.map +1 -0
- package/dist/src/ui/hooks/useEditorSettings.test.d.ts +6 -0
- package/dist/src/ui/hooks/useEditorSettings.test.js +164 -0
- package/dist/src/ui/hooks/useEditorSettings.test.js.map +1 -0
- package/dist/src/ui/hooks/useFolderTrust.d.ts +2 -2
- package/dist/src/ui/hooks/useFolderTrust.js +23 -5
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.test.d.ts +6 -0
- package/dist/src/ui/hooks/useGitBranchName.test.js +175 -0
- package/dist/src/ui/hooks/useGitBranchName.test.js.map +1 -0
- package/dist/src/ui/hooks/useHistoryManager.test.d.ts +6 -0
- package/dist/src/ui/hooks/useHistoryManager.test.js +171 -0
- package/dist/src/ui/hooks/useHistoryManager.test.js.map +1 -0
- package/dist/src/ui/hooks/useInputHistory.test.d.ts +6 -0
- package/dist/src/ui/hooks/useInputHistory.test.js +207 -0
- package/dist/src/ui/hooks/useInputHistory.test.js.map +1 -0
- package/dist/src/ui/hooks/useKeypress.d.ts +4 -24
- package/dist/src/ui/hooks/useKeypress.js +9 -330
- package/dist/src/ui/hooks/useKeypress.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.d.ts +6 -0
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +91 -0
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -0
- package/dist/src/ui/hooks/useMessageQueue.d.ts +22 -0
- package/dist/src/ui/hooks/useMessageQueue.js +49 -0
- package/dist/src/ui/hooks/useMessageQueue.js.map +1 -0
- package/dist/src/ui/hooks/useMessageQueue.test.d.ts +6 -0
- package/dist/src/ui/hooks/useMessageQueue.test.js +158 -0
- package/dist/src/ui/hooks/useMessageQueue.test.js.map +1 -0
- package/dist/src/ui/hooks/usePrivacySettings.js +6 -2
- package/dist/src/ui/hooks/usePrivacySettings.js.map +1 -1
- package/dist/src/ui/hooks/usePrivacySettings.test.d.ts +6 -0
- package/dist/src/ui/hooks/usePrivacySettings.test.js +154 -0
- package/dist/src/ui/hooks/usePrivacySettings.test.js.map +1 -0
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.d.ts +6 -0
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js +163 -0
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js.map +1 -0
- package/dist/src/ui/hooks/useShellHistory.test.d.ts +6 -0
- package/dist/src/ui/hooks/useShellHistory.test.js +162 -0
- package/dist/src/ui/hooks/useShellHistory.test.js.map +1 -0
- package/dist/src/ui/hooks/useSlashCompletion.test.d.ts +6 -0
- package/dist/src/ui/hooks/useSlashCompletion.test.js +272 -0
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -0
- package/dist/src/ui/hooks/useThemeCommand.js +1 -1
- package/dist/src/ui/hooks/useThemeCommand.js.map +1 -1
- package/dist/src/ui/hooks/useTimer.test.d.ts +6 -0
- package/dist/src/ui/hooks/useTimer.test.js +90 -0
- package/dist/src/ui/hooks/useTimer.test.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.d.ts +6 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js +846 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -0
- package/dist/src/ui/keyMatchers.test.d.ts +6 -0
- package/dist/src/ui/keyMatchers.test.js +276 -0
- package/dist/src/ui/keyMatchers.test.js.map +1 -0
- package/dist/src/ui/themes/color-utils.test.d.ts +6 -0
- package/dist/src/ui/themes/color-utils.test.js +197 -0
- package/dist/src/ui/themes/color-utils.test.js.map +1 -0
- package/dist/src/ui/themes/theme-manager.js +1 -1
- package/dist/src/ui/themes/theme-manager.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.test.d.ts +6 -0
- package/dist/src/ui/themes/theme-manager.test.js +83 -0
- package/dist/src/ui/themes/theme-manager.test.js.map +1 -0
- package/dist/src/ui/types.d.ts +2 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +1 -1
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.js +8 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.test.d.ts +6 -0
- package/dist/src/ui/utils/MarkdownDisplay.test.js +151 -0
- package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -0
- package/dist/src/ui/utils/clipboardUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/clipboardUtils.test.js +65 -0
- package/dist/src/ui/utils/clipboardUtils.test.js.map +1 -0
- package/dist/src/ui/utils/commandUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/commandUtils.test.js +294 -0
- package/dist/src/ui/utils/commandUtils.test.js.map +1 -0
- package/dist/src/ui/utils/computeStats.js +3 -1
- package/dist/src/ui/utils/computeStats.js.map +1 -1
- package/dist/src/ui/utils/displayUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/displayUtils.test.js +42 -0
- package/dist/src/ui/utils/displayUtils.test.js.map +1 -0
- package/dist/src/ui/utils/formatters.test.d.ts +6 -0
- package/dist/src/ui/utils/formatters.test.js +56 -0
- package/dist/src/ui/utils/formatters.test.js.map +1 -0
- package/dist/src/ui/utils/markdownUtilities.test.d.ts +6 -0
- package/dist/src/ui/utils/markdownUtilities.test.js +42 -0
- package/dist/src/ui/utils/markdownUtilities.test.js.map +1 -0
- package/dist/src/ui/utils/platformConstants.d.ts +5 -0
- package/dist/src/ui/utils/platformConstants.js +5 -0
- package/dist/src/ui/utils/platformConstants.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.js +7 -7
- package/dist/src/ui/utils/terminalSetup.js.map +1 -1
- package/dist/src/ui/utils/updateCheck.js +1 -1
- package/dist/src/ui/utils/updateCheck.js.map +1 -1
- package/dist/src/ui/utils/updateCheck.test.d.ts +6 -0
- package/dist/src/ui/utils/updateCheck.test.js +145 -0
- package/dist/src/ui/utils/updateCheck.test.js.map +1 -0
- package/dist/src/utils/gitUtils.test.d.ts +6 -0
- package/dist/src/utils/gitUtils.test.js +113 -0
- package/dist/src/utils/gitUtils.test.js.map +1 -0
- package/dist/src/utils/installationInfo.test.d.ts +6 -0
- package/dist/src/utils/installationInfo.test.js +242 -0
- package/dist/src/utils/installationInfo.test.js.map +1 -0
- package/dist/src/utils/readStdin.js +10 -0
- package/dist/src/utils/readStdin.js.map +1 -1
- package/dist/src/utils/sandbox.js +62 -60
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/settingsUtils.d.ts +8 -0
- package/dist/src/utils/settingsUtils.js +16 -7
- package/dist/src/utils/settingsUtils.js.map +1 -1
- package/dist/src/utils/settingsUtils.test.d.ts +6 -0
- package/dist/src/utils/settingsUtils.test.js +514 -0
- package/dist/src/utils/settingsUtils.test.js.map +1 -0
- package/dist/src/utils/userStartupWarnings.test.d.ts +6 -0
- package/dist/src/utils/userStartupWarnings.test.js +67 -0
- package/dist/src/utils/userStartupWarnings.test.js.map +1 -0
- package/dist/src/utils/version.js +1 -1
- package/dist/src/utils/version.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +3 -3
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/zed-integration/fileSystemService.d.ts +19 -0
- package/dist/src/zed-integration/fileSystemService.js +43 -0
- package/dist/src/zed-integration/fileSystemService.js.map +1 -0
- package/dist/src/zed-integration/schema.d.ts +322 -322
- package/dist/src/zed-integration/zedIntegration.js +17 -4
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"atCommandProcessor.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/atCommandProcessor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,10 +62,9 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
62
62
|
}
|
|
63
63
|
commandToExecute = `{ ${command} }; __code=$?; pwd > "${pwdFilePath}"; exit $__code`;
|
|
64
64
|
}
|
|
65
|
-
const
|
|
65
|
+
const executeCommand = async (resolve) => {
|
|
66
66
|
let lastUpdateTime = Date.now();
|
|
67
67
|
let cumulativeStdout = '';
|
|
68
|
-
let cumulativeStderr = '';
|
|
69
68
|
let isBinaryStream = false;
|
|
70
69
|
let binaryBytesReceived = 0;
|
|
71
70
|
const initialToolDisplay = {
|
|
@@ -87,18 +86,13 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
87
86
|
abortSignal.addEventListener('abort', abortHandler, { once: true });
|
|
88
87
|
onDebugMessage(`Executing in ${targetDir}: ${commandToExecute}`);
|
|
89
88
|
try {
|
|
90
|
-
const { pid, result } = ShellExecutionService.execute(commandToExecute, targetDir, (event) => {
|
|
89
|
+
const { pid, result } = await ShellExecutionService.execute(commandToExecute, targetDir, (event) => {
|
|
91
90
|
switch (event.type) {
|
|
92
91
|
case 'data':
|
|
93
92
|
// Do not process text data if we've already switched to binary mode.
|
|
94
93
|
if (isBinaryStream)
|
|
95
94
|
break;
|
|
96
|
-
|
|
97
|
-
cumulativeStdout += event.chunk;
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
cumulativeStderr += event.chunk;
|
|
101
|
-
}
|
|
95
|
+
cumulativeStdout += event.chunk;
|
|
102
96
|
break;
|
|
103
97
|
case 'binary_detected':
|
|
104
98
|
isBinaryStream = true;
|
|
@@ -123,9 +117,7 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
123
117
|
}
|
|
124
118
|
}
|
|
125
119
|
else {
|
|
126
|
-
currentDisplayOutput =
|
|
127
|
-
cumulativeStdout +
|
|
128
|
-
(cumulativeStderr ? `\n${cumulativeStderr}` : '');
|
|
120
|
+
currentDisplayOutput = cumulativeStdout;
|
|
129
121
|
}
|
|
130
122
|
// Throttle pending UI updates to avoid excessive re-renders.
|
|
131
123
|
if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
|
|
@@ -140,7 +132,7 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
140
132
|
});
|
|
141
133
|
lastUpdateTime = Date.now();
|
|
142
134
|
}
|
|
143
|
-
}, abortSignal);
|
|
135
|
+
}, abortSignal, config.getShouldUseNodePtyShell());
|
|
144
136
|
executionPid = pid;
|
|
145
137
|
result
|
|
146
138
|
.then((result) => {
|
|
@@ -222,6 +214,9 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
|
|
|
222
214
|
}
|
|
223
215
|
resolve(); // Resolve the promise to unblock `onExec`
|
|
224
216
|
}
|
|
217
|
+
};
|
|
218
|
+
const execPromise = new Promise((resolve) => {
|
|
219
|
+
executeCommand(resolve);
|
|
225
220
|
});
|
|
226
221
|
onExec(execPromise);
|
|
227
222
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shellCommandProcessor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/shellCommandProcessor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAGL,cAAc,GACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAGL,QAAQ,EAER,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC;AAC9C,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEhC,SAAS,8BAA8B,CACrC,YAA0B,EAC1B,QAAgB,EAChB,UAAkB;IAElB,MAAM,YAAY,GAChB,UAAU,CAAC,MAAM,GAAG,iBAAiB;QACnC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,mBAAmB;QAClE,CAAC,CAAC,UAAU,CAAC;IAEjB,YAAY,CAAC,UAAU,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE;YACL;gBACE,IAAI,EAAE;;EAEZ,QAAQ;;;;;EAKR,YAAY;OACP;aACA;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,gBAAoD,EACpD,qBAEC,EACD,MAAwC,EACxC,cAAyC,EACzC,MAAc,EACd,YAA0B,EAC1B,EAAE;IACF,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,QAAuB,EAAE,WAAwB,EAAW,EAAE;QAC7D,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,SAAS,oBAAoB,EAAE,CAAC;QAC/C,gBAAgB,CACd,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,EACtC,oBAAoB,CACrB,CAAC;QAEF,MAAM,SAAS,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QACxC,IAAI,gBAAgB,GAAG,QAAQ,CAAC;QAChC,IAAI,WAA+B,CAAC;QAEpC,2EAA2E;QAC3E,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,aAAa,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;YAC7E,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;YAClD,8DAA8D;YAC9D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrD,OAAO,IAAI,GAAG,CAAC;YACjB,CAAC;YACD,gBAAgB,GAAG,KAAK,OAAO,yBAAyB,WAAW,iBAAiB,CAAC;QACvF,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"shellCommandProcessor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/shellCommandProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,328 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { act, renderHook } from '@testing-library/react';
|
|
7
|
+
import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
|
|
8
|
+
const mockIsBinary = vi.hoisted(() => vi.fn());
|
|
9
|
+
const mockShellExecutionService = vi.hoisted(() => vi.fn());
|
|
10
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
11
|
+
const original = await importOriginal();
|
|
12
|
+
return {
|
|
13
|
+
...original,
|
|
14
|
+
ShellExecutionService: { execute: mockShellExecutionService },
|
|
15
|
+
isBinary: mockIsBinary,
|
|
16
|
+
};
|
|
17
|
+
});
|
|
18
|
+
vi.mock('fs');
|
|
19
|
+
vi.mock('os');
|
|
20
|
+
vi.mock('crypto');
|
|
21
|
+
vi.mock('../utils/textUtils.js');
|
|
22
|
+
import { useShellCommandProcessor, OUTPUT_UPDATE_INTERVAL_MS, } from './shellCommandProcessor.js';
|
|
23
|
+
import * as fs from 'fs';
|
|
24
|
+
import * as os from 'os';
|
|
25
|
+
import * as path from 'path';
|
|
26
|
+
import * as crypto from 'crypto';
|
|
27
|
+
import { ToolCallStatus } from '../types.js';
|
|
28
|
+
describe('useShellCommandProcessor', () => {
|
|
29
|
+
let addItemToHistoryMock;
|
|
30
|
+
let setPendingHistoryItemMock;
|
|
31
|
+
let onExecMock;
|
|
32
|
+
let onDebugMessageMock;
|
|
33
|
+
let mockConfig;
|
|
34
|
+
let mockGeminiClient;
|
|
35
|
+
let mockShellOutputCallback;
|
|
36
|
+
let resolveExecutionPromise;
|
|
37
|
+
beforeEach(() => {
|
|
38
|
+
vi.clearAllMocks();
|
|
39
|
+
addItemToHistoryMock = vi.fn();
|
|
40
|
+
setPendingHistoryItemMock = vi.fn();
|
|
41
|
+
onExecMock = vi.fn();
|
|
42
|
+
onDebugMessageMock = vi.fn();
|
|
43
|
+
mockConfig = {
|
|
44
|
+
getTargetDir: () => '/test/dir',
|
|
45
|
+
getShouldUseNodePtyShell: () => false,
|
|
46
|
+
};
|
|
47
|
+
mockGeminiClient = { addHistory: vi.fn() };
|
|
48
|
+
vi.mocked(os.platform).mockReturnValue('linux');
|
|
49
|
+
vi.mocked(os.tmpdir).mockReturnValue('/tmp');
|
|
50
|
+
vi.mocked(crypto.randomBytes).mockReturnValue(Buffer.from('abcdef', 'hex'));
|
|
51
|
+
mockIsBinary.mockReturnValue(false);
|
|
52
|
+
vi.mocked(fs.existsSync).mockReturnValue(false);
|
|
53
|
+
mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
|
|
54
|
+
mockShellOutputCallback = callback;
|
|
55
|
+
return {
|
|
56
|
+
pid: 12345,
|
|
57
|
+
result: new Promise((resolve) => {
|
|
58
|
+
resolveExecutionPromise = resolve;
|
|
59
|
+
}),
|
|
60
|
+
};
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
const renderProcessorHook = () => renderHook(() => useShellCommandProcessor(addItemToHistoryMock, setPendingHistoryItemMock, onExecMock, onDebugMessageMock, mockConfig, mockGeminiClient));
|
|
64
|
+
const createMockServiceResult = (overrides = {}) => ({
|
|
65
|
+
rawOutput: Buffer.from(overrides.output || ''),
|
|
66
|
+
output: 'Success',
|
|
67
|
+
exitCode: 0,
|
|
68
|
+
signal: null,
|
|
69
|
+
error: null,
|
|
70
|
+
aborted: false,
|
|
71
|
+
pid: 12345,
|
|
72
|
+
executionMethod: 'child_process',
|
|
73
|
+
...overrides,
|
|
74
|
+
});
|
|
75
|
+
it('should initiate command execution and set pending state', async () => {
|
|
76
|
+
const { result } = renderProcessorHook();
|
|
77
|
+
act(() => {
|
|
78
|
+
result.current.handleShellCommand('ls -l', new AbortController().signal);
|
|
79
|
+
});
|
|
80
|
+
expect(addItemToHistoryMock).toHaveBeenCalledWith({ type: 'user_shell', text: 'ls -l' }, expect.any(Number));
|
|
81
|
+
expect(setPendingHistoryItemMock).toHaveBeenCalledWith({
|
|
82
|
+
type: 'tool_group',
|
|
83
|
+
tools: [
|
|
84
|
+
expect.objectContaining({
|
|
85
|
+
name: 'Shell Command',
|
|
86
|
+
status: ToolCallStatus.Executing,
|
|
87
|
+
}),
|
|
88
|
+
],
|
|
89
|
+
});
|
|
90
|
+
const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
|
|
91
|
+
const wrappedCommand = `{ ls -l; }; __code=$?; pwd > "${tmpFile}"; exit $__code`;
|
|
92
|
+
expect(mockShellExecutionService).toHaveBeenCalledWith(wrappedCommand, '/test/dir', expect.any(Function), expect.any(Object), false);
|
|
93
|
+
expect(onExecMock).toHaveBeenCalledWith(expect.any(Promise));
|
|
94
|
+
});
|
|
95
|
+
it('should handle successful execution and update history correctly', async () => {
|
|
96
|
+
const { result } = renderProcessorHook();
|
|
97
|
+
act(() => {
|
|
98
|
+
result.current.handleShellCommand('echo "ok"', new AbortController().signal);
|
|
99
|
+
});
|
|
100
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
101
|
+
act(() => {
|
|
102
|
+
resolveExecutionPromise(createMockServiceResult({ output: 'ok' }));
|
|
103
|
+
});
|
|
104
|
+
await act(async () => await execPromise);
|
|
105
|
+
expect(setPendingHistoryItemMock).toHaveBeenCalledWith(null);
|
|
106
|
+
expect(addItemToHistoryMock).toHaveBeenCalledTimes(2); // Initial + final
|
|
107
|
+
expect(addItemToHistoryMock.mock.calls[1][0]).toEqual(expect.objectContaining({
|
|
108
|
+
tools: [
|
|
109
|
+
expect.objectContaining({
|
|
110
|
+
status: ToolCallStatus.Success,
|
|
111
|
+
resultDisplay: 'ok',
|
|
112
|
+
}),
|
|
113
|
+
],
|
|
114
|
+
}));
|
|
115
|
+
expect(mockGeminiClient.addHistory).toHaveBeenCalled();
|
|
116
|
+
});
|
|
117
|
+
it('should handle command failure and display error status', async () => {
|
|
118
|
+
const { result } = renderProcessorHook();
|
|
119
|
+
act(() => {
|
|
120
|
+
result.current.handleShellCommand('bad-cmd', new AbortController().signal);
|
|
121
|
+
});
|
|
122
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
123
|
+
act(() => {
|
|
124
|
+
resolveExecutionPromise(createMockServiceResult({ exitCode: 127, output: 'not found' }));
|
|
125
|
+
});
|
|
126
|
+
await act(async () => await execPromise);
|
|
127
|
+
const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
|
|
128
|
+
expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Error);
|
|
129
|
+
expect(finalHistoryItem.tools[0].resultDisplay).toContain('Command exited with code 127');
|
|
130
|
+
expect(finalHistoryItem.tools[0].resultDisplay).toContain('not found');
|
|
131
|
+
});
|
|
132
|
+
describe('UI Streaming and Throttling', () => {
|
|
133
|
+
beforeEach(() => {
|
|
134
|
+
vi.useFakeTimers({ toFake: ['Date'] });
|
|
135
|
+
});
|
|
136
|
+
afterEach(() => {
|
|
137
|
+
vi.useRealTimers();
|
|
138
|
+
});
|
|
139
|
+
it('should throttle pending UI updates for text streams', async () => {
|
|
140
|
+
const { result } = renderProcessorHook();
|
|
141
|
+
act(() => {
|
|
142
|
+
result.current.handleShellCommand('stream', new AbortController().signal);
|
|
143
|
+
});
|
|
144
|
+
// Simulate rapid output
|
|
145
|
+
act(() => {
|
|
146
|
+
mockShellOutputCallback({
|
|
147
|
+
type: 'data',
|
|
148
|
+
chunk: 'hello',
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
// Should not have updated the UI yet
|
|
152
|
+
expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(1); // Only the initial call
|
|
153
|
+
// Advance time and send another event to trigger the throttled update
|
|
154
|
+
await act(async () => {
|
|
155
|
+
await vi.advanceTimersByTimeAsync(OUTPUT_UPDATE_INTERVAL_MS + 1);
|
|
156
|
+
});
|
|
157
|
+
act(() => {
|
|
158
|
+
mockShellOutputCallback({
|
|
159
|
+
type: 'data',
|
|
160
|
+
chunk: ' world',
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
// Should now have been called with the cumulative output
|
|
164
|
+
expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(2);
|
|
165
|
+
expect(setPendingHistoryItemMock).toHaveBeenLastCalledWith(expect.objectContaining({
|
|
166
|
+
tools: [expect.objectContaining({ resultDisplay: 'hello world' })],
|
|
167
|
+
}));
|
|
168
|
+
});
|
|
169
|
+
it('should show binary progress messages correctly', async () => {
|
|
170
|
+
const { result } = renderProcessorHook();
|
|
171
|
+
act(() => {
|
|
172
|
+
result.current.handleShellCommand('cat img', new AbortController().signal);
|
|
173
|
+
});
|
|
174
|
+
// Should immediately show the detection message
|
|
175
|
+
act(() => {
|
|
176
|
+
mockShellOutputCallback({ type: 'binary_detected' });
|
|
177
|
+
});
|
|
178
|
+
await act(async () => {
|
|
179
|
+
await vi.advanceTimersByTimeAsync(OUTPUT_UPDATE_INTERVAL_MS + 1);
|
|
180
|
+
});
|
|
181
|
+
// Send another event to trigger the update
|
|
182
|
+
act(() => {
|
|
183
|
+
mockShellOutputCallback({ type: 'binary_progress', bytesReceived: 0 });
|
|
184
|
+
});
|
|
185
|
+
expect(setPendingHistoryItemMock).toHaveBeenLastCalledWith(expect.objectContaining({
|
|
186
|
+
tools: [
|
|
187
|
+
expect.objectContaining({
|
|
188
|
+
resultDisplay: '[Binary output detected. Halting stream...]',
|
|
189
|
+
}),
|
|
190
|
+
],
|
|
191
|
+
}));
|
|
192
|
+
// Now test progress updates
|
|
193
|
+
await act(async () => {
|
|
194
|
+
await vi.advanceTimersByTimeAsync(OUTPUT_UPDATE_INTERVAL_MS + 1);
|
|
195
|
+
});
|
|
196
|
+
act(() => {
|
|
197
|
+
mockShellOutputCallback({
|
|
198
|
+
type: 'binary_progress',
|
|
199
|
+
bytesReceived: 2048,
|
|
200
|
+
});
|
|
201
|
+
});
|
|
202
|
+
expect(setPendingHistoryItemMock).toHaveBeenLastCalledWith(expect.objectContaining({
|
|
203
|
+
tools: [
|
|
204
|
+
expect.objectContaining({
|
|
205
|
+
resultDisplay: '[Receiving binary output... 2.0 KB received]',
|
|
206
|
+
}),
|
|
207
|
+
],
|
|
208
|
+
}));
|
|
209
|
+
});
|
|
210
|
+
});
|
|
211
|
+
it('should not wrap the command on Windows', async () => {
|
|
212
|
+
vi.mocked(os.platform).mockReturnValue('win32');
|
|
213
|
+
const { result } = renderProcessorHook();
|
|
214
|
+
act(() => {
|
|
215
|
+
result.current.handleShellCommand('dir', new AbortController().signal);
|
|
216
|
+
});
|
|
217
|
+
expect(mockShellExecutionService).toHaveBeenCalledWith('dir', '/test/dir', expect.any(Function), expect.any(Object), false);
|
|
218
|
+
});
|
|
219
|
+
it('should handle command abort and display cancelled status', async () => {
|
|
220
|
+
const { result } = renderProcessorHook();
|
|
221
|
+
const abortController = new AbortController();
|
|
222
|
+
act(() => {
|
|
223
|
+
result.current.handleShellCommand('sleep 5', abortController.signal);
|
|
224
|
+
});
|
|
225
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
226
|
+
act(() => {
|
|
227
|
+
abortController.abort();
|
|
228
|
+
resolveExecutionPromise(createMockServiceResult({ aborted: true, output: 'Canceled' }));
|
|
229
|
+
});
|
|
230
|
+
await act(async () => await execPromise);
|
|
231
|
+
const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
|
|
232
|
+
expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Canceled);
|
|
233
|
+
expect(finalHistoryItem.tools[0].resultDisplay).toContain('Command was cancelled.');
|
|
234
|
+
});
|
|
235
|
+
it('should handle binary output result correctly', async () => {
|
|
236
|
+
const { result } = renderProcessorHook();
|
|
237
|
+
const binaryBuffer = Buffer.from([0x89, 0x50, 0x4e, 0x47]);
|
|
238
|
+
mockIsBinary.mockReturnValue(true);
|
|
239
|
+
act(() => {
|
|
240
|
+
result.current.handleShellCommand('cat image.png', new AbortController().signal);
|
|
241
|
+
});
|
|
242
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
243
|
+
act(() => {
|
|
244
|
+
resolveExecutionPromise(createMockServiceResult({ rawOutput: binaryBuffer }));
|
|
245
|
+
});
|
|
246
|
+
await act(async () => await execPromise);
|
|
247
|
+
const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
|
|
248
|
+
expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Success);
|
|
249
|
+
expect(finalHistoryItem.tools[0].resultDisplay).toBe('[Command produced binary output, which is not shown.]');
|
|
250
|
+
});
|
|
251
|
+
it('should handle promise rejection and show an error', async () => {
|
|
252
|
+
const { result } = renderProcessorHook();
|
|
253
|
+
const testError = new Error('Unexpected failure');
|
|
254
|
+
mockShellExecutionService.mockImplementation(() => ({
|
|
255
|
+
pid: 12345,
|
|
256
|
+
result: Promise.reject(testError),
|
|
257
|
+
}));
|
|
258
|
+
act(() => {
|
|
259
|
+
result.current.handleShellCommand('a-command', new AbortController().signal);
|
|
260
|
+
});
|
|
261
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
262
|
+
await act(async () => await execPromise);
|
|
263
|
+
expect(setPendingHistoryItemMock).toHaveBeenCalledWith(null);
|
|
264
|
+
expect(addItemToHistoryMock).toHaveBeenCalledTimes(2);
|
|
265
|
+
expect(addItemToHistoryMock.mock.calls[1][0]).toEqual({
|
|
266
|
+
type: 'error',
|
|
267
|
+
text: 'An unexpected error occurred: Unexpected failure',
|
|
268
|
+
});
|
|
269
|
+
});
|
|
270
|
+
it('should handle synchronous errors during execution and clean up resources', async () => {
|
|
271
|
+
const testError = new Error('Synchronous spawn error');
|
|
272
|
+
mockShellExecutionService.mockImplementation(() => {
|
|
273
|
+
throw testError;
|
|
274
|
+
});
|
|
275
|
+
// Mock that the temp file was created before the error was thrown
|
|
276
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
277
|
+
const { result } = renderProcessorHook();
|
|
278
|
+
act(() => {
|
|
279
|
+
result.current.handleShellCommand('a-command', new AbortController().signal);
|
|
280
|
+
});
|
|
281
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
282
|
+
await act(async () => await execPromise);
|
|
283
|
+
expect(setPendingHistoryItemMock).toHaveBeenCalledWith(null);
|
|
284
|
+
expect(addItemToHistoryMock).toHaveBeenCalledTimes(2);
|
|
285
|
+
expect(addItemToHistoryMock.mock.calls[1][0]).toEqual({
|
|
286
|
+
type: 'error',
|
|
287
|
+
text: 'An unexpected error occurred: Synchronous spawn error',
|
|
288
|
+
});
|
|
289
|
+
const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
|
|
290
|
+
// Verify that the temporary file was cleaned up
|
|
291
|
+
expect(vi.mocked(fs.unlinkSync)).toHaveBeenCalledWith(tmpFile);
|
|
292
|
+
});
|
|
293
|
+
describe('Directory Change Warning', () => {
|
|
294
|
+
it('should show a warning if the working directory changes', async () => {
|
|
295
|
+
const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
|
|
296
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
297
|
+
vi.mocked(fs.readFileSync).mockReturnValue('/test/dir/new'); // A different directory
|
|
298
|
+
const { result } = renderProcessorHook();
|
|
299
|
+
act(() => {
|
|
300
|
+
result.current.handleShellCommand('cd new', new AbortController().signal);
|
|
301
|
+
});
|
|
302
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
303
|
+
act(() => {
|
|
304
|
+
resolveExecutionPromise(createMockServiceResult());
|
|
305
|
+
});
|
|
306
|
+
await act(async () => await execPromise);
|
|
307
|
+
const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
|
|
308
|
+
expect(finalHistoryItem.tools[0].resultDisplay).toContain("WARNING: shell mode is stateless; the directory change to '/test/dir/new' will not persist.");
|
|
309
|
+
expect(vi.mocked(fs.unlinkSync)).toHaveBeenCalledWith(tmpFile);
|
|
310
|
+
});
|
|
311
|
+
it('should NOT show a warning if the directory does not change', async () => {
|
|
312
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
313
|
+
vi.mocked(fs.readFileSync).mockReturnValue('/test/dir'); // The same directory
|
|
314
|
+
const { result } = renderProcessorHook();
|
|
315
|
+
act(() => {
|
|
316
|
+
result.current.handleShellCommand('ls', new AbortController().signal);
|
|
317
|
+
});
|
|
318
|
+
const execPromise = onExecMock.mock.calls[0][0];
|
|
319
|
+
act(() => {
|
|
320
|
+
resolveExecutionPromise(createMockServiceResult());
|
|
321
|
+
});
|
|
322
|
+
await act(async () => await execPromise);
|
|
323
|
+
const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
|
|
324
|
+
expect(finalHistoryItem.tools[0].resultDisplay).not.toContain('WARNING');
|
|
325
|
+
});
|
|
326
|
+
});
|
|
327
|
+
});
|
|
328
|
+
//# sourceMappingURL=shellCommandProcessor.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shellCommandProcessor.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/shellCommandProcessor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { useCallback, useMemo, useEffect, useState } from 'react';
|
|
7
7
|
import process from 'node:process';
|
|
8
|
-
import { useStateAndRef } from './useStateAndRef.js';
|
|
9
8
|
import { GitService, Logger, logSlashCommand, makeSlashCommandEvent, SlashCommandStatus, ToolConfirmationOutcome, } from '@google/gemini-cli-core';
|
|
10
9
|
import { useSessionStats } from '../contexts/SessionContext.js';
|
|
11
10
|
import { runExitCleanup } from '../../utils/cleanup.js';
|
|
@@ -39,14 +38,14 @@ export const useSlashCommandProcessor = (config, settings, addItem, clearItems,
|
|
|
39
38
|
// synchronously. Commands that use it will await its initialization.
|
|
40
39
|
return l;
|
|
41
40
|
}, [config]);
|
|
42
|
-
const [
|
|
41
|
+
const [pendingCompressionItem, setPendingCompressionItem] = useState(null);
|
|
43
42
|
const pendingHistoryItems = useMemo(() => {
|
|
44
43
|
const items = [];
|
|
45
|
-
if (
|
|
46
|
-
items.push(
|
|
44
|
+
if (pendingCompressionItem != null) {
|
|
45
|
+
items.push(pendingCompressionItem);
|
|
47
46
|
}
|
|
48
47
|
return items;
|
|
49
|
-
}, [
|
|
48
|
+
}, [pendingCompressionItem]);
|
|
50
49
|
const addMessage = useCallback((message) => {
|
|
51
50
|
// Convert Message to HistoryItemWithoutId
|
|
52
51
|
let historyItemContent;
|
|
@@ -59,6 +58,7 @@ export const useSlashCommandProcessor = (config, settings, addItem, clearItems,
|
|
|
59
58
|
modelVersion: message.modelVersion,
|
|
60
59
|
selectedAuthType: message.selectedAuthType,
|
|
61
60
|
gcpProject: message.gcpProject,
|
|
61
|
+
ideClient: message.ideClient,
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
else if (message.type === MessageType.HELP) {
|
|
@@ -119,7 +119,7 @@ export const useSlashCommandProcessor = (config, settings, addItem, clearItems,
|
|
|
119
119
|
},
|
|
120
120
|
loadHistory,
|
|
121
121
|
setDebugMessage: onDebugMessage,
|
|
122
|
-
pendingItem:
|
|
122
|
+
pendingItem: pendingCompressionItem,
|
|
123
123
|
setPendingItem: setPendingCompressionItem,
|
|
124
124
|
toggleCorgiMode,
|
|
125
125
|
toggleVimEnabled,
|
|
@@ -141,7 +141,7 @@ export const useSlashCommandProcessor = (config, settings, addItem, clearItems,
|
|
|
141
141
|
refreshStatic,
|
|
142
142
|
session.stats,
|
|
143
143
|
onDebugMessage,
|
|
144
|
-
|
|
144
|
+
pendingCompressionItem,
|
|
145
145
|
setPendingCompressionItem,
|
|
146
146
|
toggleCorgiMode,
|
|
147
147
|
toggleVimEnabled,
|
|
@@ -149,7 +149,19 @@ export const useSlashCommandProcessor = (config, settings, addItem, clearItems,
|
|
|
149
149
|
setGeminiMdFileCount,
|
|
150
150
|
reloadCommands,
|
|
151
151
|
]);
|
|
152
|
-
|
|
152
|
+
useEffect(() => {
|
|
153
|
+
if (!config) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
const ideClient = config.getIdeClient();
|
|
157
|
+
const listener = () => {
|
|
158
|
+
reloadCommands();
|
|
159
|
+
};
|
|
160
|
+
ideClient.addStatusChangeListener(listener);
|
|
161
|
+
return () => {
|
|
162
|
+
ideClient.removeStatusChangeListener(listener);
|
|
163
|
+
};
|
|
164
|
+
}, [config, reloadCommands]);
|
|
153
165
|
useEffect(() => {
|
|
154
166
|
const controller = new AbortController();
|
|
155
167
|
const load = async () => {
|
|
@@ -165,7 +177,7 @@ export const useSlashCommandProcessor = (config, settings, addItem, clearItems,
|
|
|
165
177
|
return () => {
|
|
166
178
|
controller.abort();
|
|
167
179
|
};
|
|
168
|
-
}, [config,
|
|
180
|
+
}, [config, reloadTrigger]);
|
|
169
181
|
const handleSlashCommand = useCallback(async (rawQuery, oneTimeShellAllowlist, overwriteConfirmed) => {
|
|
170
182
|
if (typeof rawQuery !== 'string') {
|
|
171
183
|
return false;
|