@machina.ai/cell-cli-core 1.8.2-rc1 → 1.11.0-rc1
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/index.js.map +1 -1
- package/dist/package.json +5 -3
- package/dist/src/agents/codebase-investigator.d.ts +36 -1
- package/dist/src/agents/codebase-investigator.js +93 -34
- package/dist/src/agents/codebase-investigator.js.map +1 -1
- package/dist/src/agents/executor.d.ts +15 -11
- package/dist/src/agents/executor.js +271 -115
- package/dist/src/agents/executor.js.map +1 -1
- package/dist/src/agents/executor.test.js +508 -242
- package/dist/src/agents/executor.test.js.map +1 -1
- package/dist/src/agents/invocation.d.ts +5 -2
- package/dist/src/agents/invocation.js +4 -2
- package/dist/src/agents/invocation.js.map +1 -1
- package/dist/src/agents/invocation.test.js +9 -0
- package/dist/src/agents/invocation.test.js.map +1 -1
- package/dist/src/agents/registry.d.ts +2 -1
- package/dist/src/agents/registry.js +28 -4
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.d.ts +3 -1
- package/dist/src/agents/subagent-tool-wrapper.js +4 -3
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js +8 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -1
- package/dist/src/agents/types.d.ts +35 -6
- package/dist/src/agents/types.js +1 -0
- package/dist/src/agents/types.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +1 -0
- package/dist/src/code_assist/converter.js +1 -0
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +19 -0
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth-credential-storage.js +1 -1
- package/dist/src/code_assist/oauth-credential-storage.js.map +1 -1
- package/dist/src/code_assist/oauth-credential-storage.test.js +1 -1
- package/dist/src/code_assist/oauth-credential-storage.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +13 -12
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +14 -13
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +4 -2
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/config/config.d.ts +58 -18
- package/dist/src/config/config.js +125 -36
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +125 -18
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/storage.d.ts +0 -1
- package/dist/src/config/storage.js +2 -2
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/config/storage.test.js +7 -6
- package/dist/src/config/storage.test.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.d.ts +2 -1
- package/dist/src/confirmation-bus/message-bus.js +7 -1
- package/dist/src/confirmation-bus/message-bus.js.map +1 -1
- package/dist/src/confirmation-bus/types.d.ts +12 -2
- package/dist/src/confirmation-bus/types.js +1 -0
- package/dist/src/confirmation-bus/types.js.map +1 -1
- package/dist/src/core/client.d.ts +3 -1
- package/dist/src/core/client.js +70 -19
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +199 -25
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +3 -1
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +7 -0
- package/dist/src/core/coreToolScheduler.js +58 -22
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +351 -3
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +7 -11
- package/dist/src/core/geminiChat.js +33 -70
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +93 -228
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.js +11 -10
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +2 -2
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.d.ts +3 -2
- package/dist/src/core/nonInteractiveToolExecutor.js +2 -2
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +11 -8
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.d.ts +2 -1
- package/dist/src/core/prompts.js +58 -123
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +83 -29
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +16 -2
- package/dist/src/core/turn.js +15 -2
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +62 -2
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +11 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-client.js +5 -4
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.js +4 -4
- package/dist/src/ide/ide-installer.js +1 -1
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +13 -1
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/ide/process-utils.js +85 -75
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +83 -90
- package/dist/src/ide/process-utils.test.js.map +1 -1
- package/dist/src/index.d.ts +6 -0
- package/dist/src/index.js +6 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js +21 -20
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-utils.js +9 -8
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/mcp/oauth-utils.test.js +13 -2
- package/dist/src/mcp/oauth-utils.test.js.map +1 -1
- package/dist/src/mcp/token-storage/file-token-storage.js +2 -1
- package/dist/src/mcp/token-storage/file-token-storage.js.map +1 -1
- package/dist/src/mcp/token-storage/file-token-storage.test.js +4 -3
- package/dist/src/mcp/token-storage/file-token-storage.test.js.map +1 -1
- package/dist/src/output/stream-json-formatter.d.ts +32 -0
- package/dist/src/output/stream-json-formatter.js +52 -0
- package/dist/src/output/stream-json-formatter.js.map +1 -0
- package/dist/src/output/stream-json-formatter.test.js +479 -0
- package/dist/src/output/stream-json-formatter.test.js.map +1 -0
- package/dist/src/output/types.d.ts +63 -1
- package/dist/src/output/types.js +11 -0
- package/dist/src/output/types.js.map +1 -1
- package/dist/src/prompts/prompt-registry.js +2 -1
- package/dist/src/prompts/prompt-registry.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js +3 -2
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +2 -1
- package/dist/src/services/chatRecordingService.js +2 -1
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/loopDetectionService.js +3 -2
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +1 -0
- package/dist/src/services/shellExecutionService.js +177 -91
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +113 -12
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/activity-monitor.d.ts +116 -0
- package/dist/src/telemetry/activity-monitor.js +209 -0
- package/dist/src/telemetry/activity-monitor.js.map +1 -0
- package/dist/src/telemetry/activity-monitor.test.d.ts +6 -0
- package/dist/src/telemetry/activity-monitor.test.js +248 -0
- package/dist/src/telemetry/activity-monitor.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +15 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +154 -31
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +84 -15
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +16 -3
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +38 -5
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +0 -28
- package/dist/src/telemetry/constants.js +0 -29
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +6 -3
- package/dist/src/telemetry/index.js +12 -4
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +8 -2
- package/dist/src/telemetry/loggers.js +165 -299
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +213 -21
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/memory-monitor.d.ts +149 -0
- package/dist/src/telemetry/memory-monitor.js +335 -0
- package/dist/src/telemetry/memory-monitor.js.map +1 -0
- package/dist/src/telemetry/memory-monitor.test.d.ts +6 -0
- package/dist/src/telemetry/memory-monitor.test.js +472 -0
- package/dist/src/telemetry/memory-monitor.test.js.map +1 -0
- package/dist/src/telemetry/metrics.d.ts +131 -4
- package/dist/src/telemetry/metrics.js +182 -6
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +360 -1
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/sdk.js +3 -2
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/telemetryAttributes.d.ts +8 -0
- package/dist/src/telemetry/telemetryAttributes.js +18 -0
- package/dist/src/telemetry/telemetryAttributes.js.map +1 -0
- package/dist/src/telemetry/types.d.ts +163 -7
- package/dist/src/telemetry/types.js +691 -38
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +1 -1
- package/dist/src/telemetry/uiTelemetry.js +1 -1
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/tools/edit.js +8 -7
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +0 -1
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +3 -2
- package/dist/src/tools/glob.js +8 -7
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/grep.d.ts +3 -2
- package/dist/src/tools/grep.js +20 -14
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.d.ts +3 -2
- package/dist/src/tools/ls.js +8 -7
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +2 -9
- package/dist/src/tools/mcp-client-manager.js +6 -14
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +16 -6
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +3 -2
- package/dist/src/tools/mcp-client.js +49 -52
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +168 -5
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +2 -1
- package/dist/src/tools/mcp-tool.js +7 -3
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +2 -2
- package/dist/src/tools/memoryTool.js +4 -4
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +9 -8
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/message-bus-integration.test.js +14 -1
- package/dist/src/tools/message-bus-integration.test.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +4 -3
- package/dist/src/tools/read-file.js +9 -8
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +4 -3
- package/dist/src/tools/read-many-files.js +11 -8
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +0 -1
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/ripGrep.d.ts +3 -2
- package/dist/src/tools/ripGrep.js +47 -17
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +106 -60
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -1
- package/dist/src/tools/shell.js +31 -14
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +63 -9
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.d.ts +1 -20
- package/dist/src/tools/smart-edit.js +64 -61
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js +70 -87
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +21 -0
- package/dist/src/tools/tool-error.js +27 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +17 -0
- package/dist/src/tools/tool-names.js +21 -0
- package/dist/src/tools/tool-names.js.map +1 -0
- package/dist/src/tools/tool-registry.js +4 -3
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tools.d.ts +17 -10
- package/dist/src/tools/tools.js +54 -39
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +11 -3
- package/dist/src/tools/web-fetch.js +90 -32
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +388 -8
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +4 -3
- package/dist/src/tools/web-search.js +10 -7
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +1 -1
- package/dist/src/tools/write-file.js +3 -2
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +0 -1
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +3 -8
- package/dist/src/tools/write-todos.js +14 -7
- package/dist/src/tools/write-todos.js.map +1 -1
- package/dist/src/tools/write-todos.test.js +2 -2
- package/dist/src/tools/write-todos.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.js +3 -2
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/debugLogger.d.ts +25 -0
- package/dist/src/utils/debugLogger.js +33 -0
- package/dist/src/utils/debugLogger.js.map +1 -0
- package/dist/src/utils/debugLogger.test.d.ts +6 -0
- package/dist/src/utils/debugLogger.test.js +67 -0
- package/dist/src/utils/debugLogger.test.js.map +1 -0
- package/dist/src/utils/delay.d.ts +16 -0
- package/dist/src/utils/delay.js +43 -0
- package/dist/src/utils/delay.js.map +1 -0
- package/dist/src/utils/delay.test.d.ts +6 -0
- package/dist/src/utils/delay.test.js +88 -0
- package/dist/src/utils/delay.test.js.map +1 -0
- package/dist/src/utils/editCorrector.js +6 -10
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +3 -5
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.js +33 -37
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +1 -0
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/environmentContext.js +0 -33
- package/dist/src/utils/environmentContext.js.map +1 -1
- package/dist/src/utils/environmentContext.test.js +0 -34
- package/dist/src/utils/environmentContext.test.js.map +1 -1
- package/dist/src/utils/fetch.d.ts +1 -0
- package/dist/src/utils/fetch.js +9 -0
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +4 -0
- package/dist/src/utils/fileUtils.js +34 -2
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +12 -1
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/formatters.d.ts +1 -0
- package/dist/src/utils/formatters.js +2 -1
- package/dist/src/utils/formatters.js.map +1 -1
- package/dist/src/utils/formatters.test.d.ts +6 -0
- package/dist/src/utils/formatters.test.js +26 -0
- package/dist/src/utils/formatters.test.js.map +1 -0
- package/dist/src/utils/getFolderStructure.js +2 -1
- package/dist/src/utils/getFolderStructure.js.map +1 -1
- package/dist/src/utils/getFolderStructure.test.js +7 -6
- package/dist/src/utils/getFolderStructure.test.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.js +7 -6
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.test.js +30 -0
- package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
- package/dist/src/utils/installationManager.test.js +2 -1
- package/dist/src/utils/installationManager.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +5 -4
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.d.ts +3 -1
- package/dist/src/utils/memoryDiscovery.js +14 -12
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +136 -36
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +3 -2
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +2 -1
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/pathCorrector.d.ts +25 -0
- package/dist/src/utils/pathCorrector.js +33 -0
- package/dist/src/utils/pathCorrector.js.map +1 -0
- package/dist/src/utils/pathCorrector.test.d.ts +6 -0
- package/dist/src/utils/pathCorrector.test.js +83 -0
- package/dist/src/utils/pathCorrector.test.js.map +1 -0
- package/dist/src/utils/retry.d.ts +3 -1
- package/dist/src/utils/retry.js +44 -33
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +102 -40
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/safeJsonStringify.d.ts +4 -4
- package/dist/src/utils/safeJsonStringify.js +31 -7
- package/dist/src/utils/safeJsonStringify.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +15 -2
- package/dist/src/utils/shell-utils.js +354 -137
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +154 -60
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/systemEncoding.js +5 -4
- package/dist/src/utils/systemEncoding.js.map +1 -1
- package/dist/src/utils/tool-utils.d.ts +2 -2
- package/dist/src/utils/tool-utils.js +15 -6
- package/dist/src/utils/tool-utils.js.map +1 -1
- package/dist/src/utils/tool-utils.test.js +8 -0
- package/dist/src/utils/tool-utils.test.js.map +1 -1
- package/dist/src/utils/userAccountManager.js +5 -4
- package/dist/src/utils/userAccountManager.js.map +1 -1
- package/dist/src/utils/userAccountManager.test.js +2 -1
- package/dist/src/utils/userAccountManager.test.js.map +1 -1
- package/dist/src/utils/workspaceContext.js +2 -1
- package/dist/src/utils/workspaceContext.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -3
- package/dist/src/core/subagent.d.ts +0 -236
- package/dist/src/core/subagent.js +0 -482
- package/dist/src/core/subagent.js.map +0 -1
- package/dist/src/core/subagent.test.js +0 -530
- package/dist/src/core/subagent.test.js.map +0 -1
- /package/dist/src/{core/subagent.test.d.ts → output/stream-json-formatter.test.d.ts} +0 -0
|
@@ -4,15 +4,28 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
|
-
import { WebFetchTool } from './web-fetch.js';
|
|
7
|
+
import { WebFetchTool, parsePrompt } from './web-fetch.js';
|
|
8
8
|
import { ApprovalMode } from '../config/config.js';
|
|
9
9
|
import { ToolConfirmationOutcome } from './tools.js';
|
|
10
10
|
import { ToolErrorType } from './tool-error.js';
|
|
11
11
|
import * as fetchUtils from '../utils/fetch.js';
|
|
12
|
+
import { MessageBus } from '../confirmation-bus/message-bus.js';
|
|
13
|
+
import { PolicyEngine } from '../policy/policy-engine.js';
|
|
14
|
+
import { MessageBusType, } from '../confirmation-bus/types.js';
|
|
15
|
+
import { randomUUID } from 'node:crypto';
|
|
16
|
+
import { logWebFetchFallbackAttempt, WebFetchFallbackAttemptEvent, } from '../telemetry/index.js';
|
|
17
|
+
import { convert } from 'html-to-text';
|
|
12
18
|
const mockGenerateContent = vi.fn();
|
|
13
19
|
const mockGetGeminiClient = vi.fn(() => ({
|
|
14
20
|
generateContent: mockGenerateContent,
|
|
15
21
|
}));
|
|
22
|
+
vi.mock('html-to-text', () => ({
|
|
23
|
+
convert: vi.fn((text) => `Converted: ${text}`),
|
|
24
|
+
}));
|
|
25
|
+
vi.mock('../telemetry/index.js', () => ({
|
|
26
|
+
logWebFetchFallbackAttempt: vi.fn(),
|
|
27
|
+
WebFetchFallbackAttemptEvent: vi.fn(),
|
|
28
|
+
}));
|
|
16
29
|
vi.mock('../utils/fetch.js', async (importOriginal) => {
|
|
17
30
|
const actual = await importOriginal();
|
|
18
31
|
return {
|
|
@@ -21,6 +34,71 @@ vi.mock('../utils/fetch.js', async (importOriginal) => {
|
|
|
21
34
|
isPrivateIp: vi.fn(),
|
|
22
35
|
};
|
|
23
36
|
});
|
|
37
|
+
vi.mock('node:crypto', () => ({
|
|
38
|
+
randomUUID: vi.fn(),
|
|
39
|
+
}));
|
|
40
|
+
describe('parsePrompt', () => {
|
|
41
|
+
it('should extract valid URLs separated by whitespace', () => {
|
|
42
|
+
const prompt = 'Go to https://example.com and http://google.com';
|
|
43
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
44
|
+
expect(errors).toHaveLength(0);
|
|
45
|
+
expect(validUrls).toHaveLength(2);
|
|
46
|
+
expect(validUrls[0]).toBe('https://example.com/');
|
|
47
|
+
expect(validUrls[1]).toBe('http://google.com/');
|
|
48
|
+
});
|
|
49
|
+
it('should accept URLs with trailing punctuation', () => {
|
|
50
|
+
const prompt = 'Check https://example.com.';
|
|
51
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
52
|
+
expect(errors).toHaveLength(0);
|
|
53
|
+
expect(validUrls).toHaveLength(1);
|
|
54
|
+
expect(validUrls[0]).toBe('https://example.com./');
|
|
55
|
+
});
|
|
56
|
+
it('should detect URLs wrapped in punctuation as malformed', () => {
|
|
57
|
+
const prompt = 'Read (https://example.com)';
|
|
58
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
59
|
+
expect(validUrls).toHaveLength(0);
|
|
60
|
+
expect(errors).toHaveLength(1);
|
|
61
|
+
expect(errors[0]).toContain('Malformed URL detected');
|
|
62
|
+
expect(errors[0]).toContain('(https://example.com)');
|
|
63
|
+
});
|
|
64
|
+
it('should detect unsupported protocols (httpshttps://)', () => {
|
|
65
|
+
const prompt = 'Summarize httpshttps://github.com/JuliaLang/julia/issues/58346';
|
|
66
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
67
|
+
expect(validUrls).toHaveLength(0);
|
|
68
|
+
expect(errors).toHaveLength(1);
|
|
69
|
+
expect(errors[0]).toContain('Unsupported protocol');
|
|
70
|
+
expect(errors[0]).toContain('httpshttps://github.com/JuliaLang/julia/issues/58346');
|
|
71
|
+
});
|
|
72
|
+
it('should detect unsupported protocols (ftp://)', () => {
|
|
73
|
+
const prompt = 'ftp://example.com/file.txt';
|
|
74
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
75
|
+
expect(validUrls).toHaveLength(0);
|
|
76
|
+
expect(errors).toHaveLength(1);
|
|
77
|
+
expect(errors[0]).toContain('Unsupported protocol');
|
|
78
|
+
});
|
|
79
|
+
it('should detect malformed URLs', () => {
|
|
80
|
+
// http:// is not a valid URL in Node's new URL()
|
|
81
|
+
const prompt = 'http://';
|
|
82
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
83
|
+
expect(validUrls).toHaveLength(0);
|
|
84
|
+
expect(errors).toHaveLength(1);
|
|
85
|
+
expect(errors[0]).toContain('Malformed URL detected');
|
|
86
|
+
});
|
|
87
|
+
it('should handle prompts with no URLs', () => {
|
|
88
|
+
const prompt = 'hello world';
|
|
89
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
90
|
+
expect(validUrls).toHaveLength(0);
|
|
91
|
+
expect(errors).toHaveLength(0);
|
|
92
|
+
});
|
|
93
|
+
it('should handle mixed valid and invalid URLs', () => {
|
|
94
|
+
const prompt = 'Valid: https://google.com, Invalid: ftp://bad.com';
|
|
95
|
+
const { validUrls, errors } = parsePrompt(prompt);
|
|
96
|
+
expect(validUrls).toHaveLength(1);
|
|
97
|
+
expect(validUrls[0]).toBe('https://google.com,/');
|
|
98
|
+
expect(errors).toHaveLength(1);
|
|
99
|
+
expect(errors[0]).toContain('ftp://bad.com');
|
|
100
|
+
});
|
|
101
|
+
});
|
|
24
102
|
describe('WebFetchTool', () => {
|
|
25
103
|
let mockConfig;
|
|
26
104
|
beforeEach(() => {
|
|
@@ -32,13 +110,26 @@ describe('WebFetchTool', () => {
|
|
|
32
110
|
getGeminiClient: mockGetGeminiClient,
|
|
33
111
|
};
|
|
34
112
|
});
|
|
35
|
-
describe('
|
|
36
|
-
it('should
|
|
37
|
-
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
|
|
113
|
+
describe('validateToolParamValues', () => {
|
|
114
|
+
it('should throw if prompt is empty', () => {
|
|
38
115
|
const tool = new WebFetchTool(mockConfig);
|
|
39
|
-
|
|
40
|
-
expect(() => tool.build(params)).toThrow("The 'prompt' must contain at least one valid URL (starting with http:// or https://).");
|
|
116
|
+
expect(() => tool.build({ prompt: '' })).toThrow("The 'prompt' parameter cannot be empty");
|
|
41
117
|
});
|
|
118
|
+
it('should throw if prompt contains no URLs', () => {
|
|
119
|
+
const tool = new WebFetchTool(mockConfig);
|
|
120
|
+
expect(() => tool.build({ prompt: 'hello world' })).toThrow("The 'prompt' must contain at least one valid URL");
|
|
121
|
+
});
|
|
122
|
+
it('should throw if prompt contains malformed URLs (httpshttps://)', () => {
|
|
123
|
+
const tool = new WebFetchTool(mockConfig);
|
|
124
|
+
const prompt = 'fetch httpshttps://example.com';
|
|
125
|
+
expect(() => tool.build({ prompt })).toThrow('Error(s) in prompt URLs:');
|
|
126
|
+
});
|
|
127
|
+
it('should pass if prompt contains at least one valid URL', () => {
|
|
128
|
+
const tool = new WebFetchTool(mockConfig);
|
|
129
|
+
expect(() => tool.build({ prompt: 'fetch https://example.com' })).not.toThrow();
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
describe('execute', () => {
|
|
42
133
|
it('should return WEB_FETCH_FALLBACK_FAILED on fallback fetch failure', async () => {
|
|
43
134
|
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
|
|
44
135
|
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockRejectedValue(new Error('fetch failed'));
|
|
@@ -57,9 +148,141 @@ describe('WebFetchTool', () => {
|
|
|
57
148
|
const result = await invocation.execute(new AbortController().signal);
|
|
58
149
|
expect(result.error?.type).toBe(ToolErrorType.WEB_FETCH_PROCESSING_ERROR);
|
|
59
150
|
});
|
|
151
|
+
it('should log telemetry when falling back due to private IP', async () => {
|
|
152
|
+
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
|
|
153
|
+
// Mock fetchWithTimeout to succeed so fallback proceeds
|
|
154
|
+
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
|
|
155
|
+
ok: true,
|
|
156
|
+
text: () => Promise.resolve('some content'),
|
|
157
|
+
});
|
|
158
|
+
mockGenerateContent.mockResolvedValue({
|
|
159
|
+
candidates: [{ content: { parts: [{ text: 'fallback response' }] } }],
|
|
160
|
+
});
|
|
161
|
+
const tool = new WebFetchTool(mockConfig);
|
|
162
|
+
const params = { prompt: 'fetch https://private.ip' };
|
|
163
|
+
const invocation = tool.build(params);
|
|
164
|
+
await invocation.execute(new AbortController().signal);
|
|
165
|
+
expect(logWebFetchFallbackAttempt).toHaveBeenCalledWith(mockConfig, expect.any(WebFetchFallbackAttemptEvent));
|
|
166
|
+
expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith('private_ip');
|
|
167
|
+
});
|
|
168
|
+
it('should log telemetry when falling back due to primary fetch failure', async () => {
|
|
169
|
+
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
|
|
170
|
+
// Mock primary fetch to return empty response, triggering fallback
|
|
171
|
+
mockGenerateContent.mockResolvedValueOnce({
|
|
172
|
+
candidates: [],
|
|
173
|
+
});
|
|
174
|
+
// Mock fetchWithTimeout to succeed so fallback proceeds
|
|
175
|
+
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
|
|
176
|
+
ok: true,
|
|
177
|
+
text: () => Promise.resolve('some content'),
|
|
178
|
+
});
|
|
179
|
+
// Mock fallback LLM call
|
|
180
|
+
mockGenerateContent.mockResolvedValueOnce({
|
|
181
|
+
candidates: [{ content: { parts: [{ text: 'fallback response' }] } }],
|
|
182
|
+
});
|
|
183
|
+
const tool = new WebFetchTool(mockConfig);
|
|
184
|
+
const params = { prompt: 'fetch https://public.ip' };
|
|
185
|
+
const invocation = tool.build(params);
|
|
186
|
+
await invocation.execute(new AbortController().signal);
|
|
187
|
+
expect(logWebFetchFallbackAttempt).toHaveBeenCalledWith(mockConfig, expect.any(WebFetchFallbackAttemptEvent));
|
|
188
|
+
expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith('primary_failed');
|
|
189
|
+
});
|
|
190
|
+
});
|
|
191
|
+
describe('execute (fallback)', () => {
|
|
192
|
+
beforeEach(() => {
|
|
193
|
+
// Force fallback by mocking primary fetch to fail
|
|
194
|
+
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
|
|
195
|
+
mockGenerateContent.mockResolvedValueOnce({
|
|
196
|
+
candidates: [],
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
it('should convert HTML content using html-to-text', async () => {
|
|
200
|
+
const htmlContent = '<html><body><h1>Hello</h1></body></html>';
|
|
201
|
+
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
|
|
202
|
+
ok: true,
|
|
203
|
+
headers: new Headers({ 'content-type': 'text/html; charset=utf-8' }),
|
|
204
|
+
text: () => Promise.resolve(htmlContent),
|
|
205
|
+
});
|
|
206
|
+
// Mock fallback LLM call to return the content passed to it
|
|
207
|
+
mockGenerateContent.mockImplementationOnce(async (req) => ({
|
|
208
|
+
candidates: [{ content: { parts: [{ text: req[0].parts[0].text }] } }],
|
|
209
|
+
}));
|
|
210
|
+
const tool = new WebFetchTool(mockConfig);
|
|
211
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
212
|
+
const invocation = tool.build(params);
|
|
213
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
214
|
+
expect(convert).toHaveBeenCalledWith(htmlContent, {
|
|
215
|
+
wordwrap: false,
|
|
216
|
+
selectors: [
|
|
217
|
+
{ selector: 'a', options: { ignoreHref: true } },
|
|
218
|
+
{ selector: 'img', format: 'skip' },
|
|
219
|
+
],
|
|
220
|
+
});
|
|
221
|
+
expect(result.llmContent).toContain(`Converted: ${htmlContent}`);
|
|
222
|
+
});
|
|
223
|
+
it('should return raw text for JSON content', async () => {
|
|
224
|
+
const jsonContent = '{"key": "value"}';
|
|
225
|
+
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
|
|
226
|
+
ok: true,
|
|
227
|
+
headers: new Headers({ 'content-type': 'application/json' }),
|
|
228
|
+
text: () => Promise.resolve(jsonContent),
|
|
229
|
+
});
|
|
230
|
+
// Mock fallback LLM call to return the content passed to it
|
|
231
|
+
mockGenerateContent.mockImplementationOnce(async (req) => ({
|
|
232
|
+
candidates: [{ content: { parts: [{ text: req[0].parts[0].text }] } }],
|
|
233
|
+
}));
|
|
234
|
+
const tool = new WebFetchTool(mockConfig);
|
|
235
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
236
|
+
const invocation = tool.build(params);
|
|
237
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
238
|
+
expect(convert).not.toHaveBeenCalled();
|
|
239
|
+
expect(result.llmContent).toContain(jsonContent);
|
|
240
|
+
});
|
|
241
|
+
it('should return raw text for plain text content', async () => {
|
|
242
|
+
const textContent = 'Just some text.';
|
|
243
|
+
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
|
|
244
|
+
ok: true,
|
|
245
|
+
headers: new Headers({ 'content-type': 'text/plain' }),
|
|
246
|
+
text: () => Promise.resolve(textContent),
|
|
247
|
+
});
|
|
248
|
+
// Mock fallback LLM call to return the content passed to it
|
|
249
|
+
mockGenerateContent.mockImplementationOnce(async (req) => ({
|
|
250
|
+
candidates: [{ content: { parts: [{ text: req[0].parts[0].text }] } }],
|
|
251
|
+
}));
|
|
252
|
+
const tool = new WebFetchTool(mockConfig);
|
|
253
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
254
|
+
const invocation = tool.build(params);
|
|
255
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
256
|
+
expect(convert).not.toHaveBeenCalled();
|
|
257
|
+
expect(result.llmContent).toContain(textContent);
|
|
258
|
+
});
|
|
259
|
+
it('should treat content with no Content-Type header as HTML', async () => {
|
|
260
|
+
const content = '<p>No header</p>';
|
|
261
|
+
vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
|
|
262
|
+
ok: true,
|
|
263
|
+
headers: new Headers(),
|
|
264
|
+
text: () => Promise.resolve(content),
|
|
265
|
+
});
|
|
266
|
+
// Mock fallback LLM call to return the content passed to it
|
|
267
|
+
mockGenerateContent.mockImplementationOnce(async (req) => ({
|
|
268
|
+
candidates: [{ content: { parts: [{ text: req[0].parts[0].text }] } }],
|
|
269
|
+
}));
|
|
270
|
+
const tool = new WebFetchTool(mockConfig);
|
|
271
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
272
|
+
const invocation = tool.build(params);
|
|
273
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
274
|
+
expect(convert).toHaveBeenCalledWith(content, {
|
|
275
|
+
wordwrap: false,
|
|
276
|
+
selectors: [
|
|
277
|
+
{ selector: 'a', options: { ignoreHref: true } },
|
|
278
|
+
{ selector: 'img', format: 'skip' },
|
|
279
|
+
],
|
|
280
|
+
});
|
|
281
|
+
expect(result.llmContent).toContain(`Converted: ${content}`);
|
|
282
|
+
});
|
|
60
283
|
});
|
|
61
284
|
describe('shouldConfirmExecute', () => {
|
|
62
|
-
it('should return confirmation details with the correct prompt and urls', async () => {
|
|
285
|
+
it('should return confirmation details with the correct prompt and parsed urls', async () => {
|
|
63
286
|
const tool = new WebFetchTool(mockConfig);
|
|
64
287
|
const params = { prompt: 'fetch https://example.com' };
|
|
65
288
|
const invocation = tool.build(params);
|
|
@@ -68,7 +291,7 @@ describe('WebFetchTool', () => {
|
|
|
68
291
|
type: 'info',
|
|
69
292
|
title: 'Confirm Web Fetch',
|
|
70
293
|
prompt: 'fetch https://example.com',
|
|
71
|
-
urls: ['https://example.com'],
|
|
294
|
+
urls: ['https://example.com/'],
|
|
72
295
|
onConfirm: expect.any(Function),
|
|
73
296
|
});
|
|
74
297
|
});
|
|
@@ -110,5 +333,162 @@ describe('WebFetchTool', () => {
|
|
|
110
333
|
expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
|
|
111
334
|
});
|
|
112
335
|
});
|
|
336
|
+
describe('Message Bus Integration', () => {
|
|
337
|
+
let policyEngine;
|
|
338
|
+
let messageBus;
|
|
339
|
+
let mockUUID;
|
|
340
|
+
beforeEach(() => {
|
|
341
|
+
policyEngine = new PolicyEngine();
|
|
342
|
+
messageBus = new MessageBus(policyEngine);
|
|
343
|
+
mockUUID = vi.mocked(randomUUID);
|
|
344
|
+
mockUUID.mockReturnValue('test-correlation-id');
|
|
345
|
+
});
|
|
346
|
+
it('should use message bus for confirmation when available', async () => {
|
|
347
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
348
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
349
|
+
const invocation = tool.build(params);
|
|
350
|
+
// Mock message bus publish and subscribe
|
|
351
|
+
const publishSpy = vi.spyOn(messageBus, 'publish');
|
|
352
|
+
const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
|
|
353
|
+
const unsubscribeSpy = vi.spyOn(messageBus, 'unsubscribe');
|
|
354
|
+
// Start confirmation process
|
|
355
|
+
const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
|
|
356
|
+
// Verify confirmation request was published
|
|
357
|
+
expect(publishSpy).toHaveBeenCalledWith({
|
|
358
|
+
type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
|
|
359
|
+
toolCall: {
|
|
360
|
+
name: 'web_fetch',
|
|
361
|
+
args: { prompt: 'fetch https://example.com' },
|
|
362
|
+
},
|
|
363
|
+
correlationId: 'test-correlation-id',
|
|
364
|
+
});
|
|
365
|
+
// Verify subscription to response
|
|
366
|
+
expect(subscribeSpy).toHaveBeenCalledWith(MessageBusType.TOOL_CONFIRMATION_RESPONSE, expect.any(Function));
|
|
367
|
+
// Simulate confirmation response
|
|
368
|
+
const responseHandler = subscribeSpy.mock.calls[0][1];
|
|
369
|
+
const response = {
|
|
370
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
371
|
+
correlationId: 'test-correlation-id',
|
|
372
|
+
confirmed: true,
|
|
373
|
+
};
|
|
374
|
+
responseHandler(response);
|
|
375
|
+
const result = await confirmationPromise;
|
|
376
|
+
expect(result).toBe(false); // No further confirmation needed
|
|
377
|
+
expect(unsubscribeSpy).toHaveBeenCalled();
|
|
378
|
+
});
|
|
379
|
+
it('should reject promise when confirmation is denied via message bus', async () => {
|
|
380
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
381
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
382
|
+
const invocation = tool.build(params);
|
|
383
|
+
const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
|
|
384
|
+
const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
|
|
385
|
+
// Simulate denial response
|
|
386
|
+
const responseHandler = subscribeSpy.mock.calls[0][1];
|
|
387
|
+
const response = {
|
|
388
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
389
|
+
correlationId: 'test-correlation-id',
|
|
390
|
+
confirmed: false,
|
|
391
|
+
};
|
|
392
|
+
responseHandler(response);
|
|
393
|
+
// Should reject with error when denied
|
|
394
|
+
await expect(confirmationPromise).rejects.toThrow('Tool execution denied by policy');
|
|
395
|
+
});
|
|
396
|
+
it('should handle timeout gracefully', async () => {
|
|
397
|
+
vi.useFakeTimers();
|
|
398
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
399
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
400
|
+
const invocation = tool.build(params);
|
|
401
|
+
const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
|
|
402
|
+
// Fast-forward past timeout
|
|
403
|
+
await vi.advanceTimersByTimeAsync(30000);
|
|
404
|
+
const result = await confirmationPromise;
|
|
405
|
+
expect(result).not.toBe(false);
|
|
406
|
+
expect(result).toHaveProperty('type', 'info');
|
|
407
|
+
vi.useRealTimers();
|
|
408
|
+
});
|
|
409
|
+
it('should handle abort signal during confirmation', async () => {
|
|
410
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
411
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
412
|
+
const invocation = tool.build(params);
|
|
413
|
+
const abortController = new AbortController();
|
|
414
|
+
const confirmationPromise = invocation.shouldConfirmExecute(abortController.signal);
|
|
415
|
+
// Abort the operation
|
|
416
|
+
abortController.abort();
|
|
417
|
+
await expect(confirmationPromise).rejects.toThrow('Tool execution denied by policy.');
|
|
418
|
+
});
|
|
419
|
+
it('should fall back to legacy confirmation when no message bus', async () => {
|
|
420
|
+
const tool = new WebFetchTool(mockConfig); // No message bus
|
|
421
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
422
|
+
const invocation = tool.build(params);
|
|
423
|
+
const result = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
424
|
+
// Should use legacy confirmation flow (returns confirmation details, not false)
|
|
425
|
+
expect(result).not.toBe(false);
|
|
426
|
+
expect(result).toHaveProperty('type', 'info');
|
|
427
|
+
});
|
|
428
|
+
it('should ignore responses with wrong correlation ID', async () => {
|
|
429
|
+
vi.useFakeTimers();
|
|
430
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
431
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
432
|
+
const invocation = tool.build(params);
|
|
433
|
+
const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
|
|
434
|
+
const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
|
|
435
|
+
// Send response with wrong correlation ID
|
|
436
|
+
const responseHandler = subscribeSpy.mock.calls[0][1];
|
|
437
|
+
const wrongResponse = {
|
|
438
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
439
|
+
correlationId: 'wrong-id',
|
|
440
|
+
confirmed: true,
|
|
441
|
+
};
|
|
442
|
+
responseHandler(wrongResponse);
|
|
443
|
+
// Should timeout since correct response wasn't received
|
|
444
|
+
await vi.advanceTimersByTimeAsync(30000);
|
|
445
|
+
const result = await confirmationPromise;
|
|
446
|
+
expect(result).not.toBe(false);
|
|
447
|
+
expect(result).toHaveProperty('type', 'info');
|
|
448
|
+
vi.useRealTimers();
|
|
449
|
+
});
|
|
450
|
+
it('should handle message bus publish errors gracefully', async () => {
|
|
451
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
452
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
453
|
+
const invocation = tool.build(params);
|
|
454
|
+
// Mock publish to throw error
|
|
455
|
+
vi.spyOn(messageBus, 'publish').mockImplementation(() => {
|
|
456
|
+
throw new Error('Message bus error');
|
|
457
|
+
});
|
|
458
|
+
const result = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
459
|
+
expect(result).toBe(false); // Should gracefully fall back
|
|
460
|
+
});
|
|
461
|
+
it('should execute normally after confirmation approval', async () => {
|
|
462
|
+
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
|
|
463
|
+
mockGenerateContent.mockResolvedValue({
|
|
464
|
+
candidates: [
|
|
465
|
+
{
|
|
466
|
+
content: {
|
|
467
|
+
parts: [{ text: 'Fetched content from https://example.com' }],
|
|
468
|
+
role: 'model',
|
|
469
|
+
},
|
|
470
|
+
},
|
|
471
|
+
],
|
|
472
|
+
});
|
|
473
|
+
const tool = new WebFetchTool(mockConfig, messageBus);
|
|
474
|
+
const params = { prompt: 'fetch https://example.com' };
|
|
475
|
+
const invocation = tool.build(params);
|
|
476
|
+
const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
|
|
477
|
+
// Start confirmation
|
|
478
|
+
const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
|
|
479
|
+
// Approve via message bus
|
|
480
|
+
const responseHandler = subscribeSpy.mock.calls[0][1];
|
|
481
|
+
responseHandler({
|
|
482
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
483
|
+
correlationId: 'test-correlation-id',
|
|
484
|
+
confirmed: true,
|
|
485
|
+
});
|
|
486
|
+
await confirmationPromise;
|
|
487
|
+
// Execute the tool
|
|
488
|
+
const result = await invocation.execute(new AbortController().signal);
|
|
489
|
+
expect(result.error).toBeUndefined();
|
|
490
|
+
expect(result.llmContent).toContain('Fetched content');
|
|
491
|
+
});
|
|
492
|
+
});
|
|
113
493
|
});
|
|
114
494
|
//# sourceMappingURL=web-fetch.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch.test.js","sourceRoot":"","sources":["../../../src/tools/web-fetch.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web-fetch.test.js","sourceRoot":"","sources":["../../../src/tools/web-fetch.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import type { MessageBus } from '../confirmation-bus/message-bus.js';
|
|
6
7
|
import type { GroundingMetadata } from '@google/genai';
|
|
7
8
|
import type { ToolInvocation, ToolResult } from './tools.js';
|
|
8
9
|
import { BaseDeclarativeTool } from './tools.js';
|
|
@@ -36,14 +37,14 @@ export interface WebSearchToolResult extends ToolResult {
|
|
|
36
37
|
*/
|
|
37
38
|
export declare class WebSearchTool extends BaseDeclarativeTool<WebSearchToolParams, WebSearchToolResult> {
|
|
38
39
|
private readonly config;
|
|
39
|
-
static readonly Name
|
|
40
|
-
constructor(config: Config);
|
|
40
|
+
static readonly Name = "google_web_search";
|
|
41
|
+
constructor(config: Config, messageBus?: MessageBus);
|
|
41
42
|
/**
|
|
42
43
|
* Validates the parameters for the WebSearchTool.
|
|
43
44
|
* @param params The parameters to validate
|
|
44
45
|
* @returns An error message string if validation fails, null if valid
|
|
45
46
|
*/
|
|
46
47
|
protected validateToolParamValues(params: WebSearchToolParams): string | null;
|
|
47
|
-
protected createInvocation(params: WebSearchToolParams): ToolInvocation<WebSearchToolParams, WebSearchToolResult>;
|
|
48
|
+
protected createInvocation(params: WebSearchToolParams, messageBus?: MessageBus, _toolName?: string, _toolDisplayName?: string): ToolInvocation<WebSearchToolParams, WebSearchToolResult>;
|
|
48
49
|
}
|
|
49
50
|
export {};
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { WEB_SEARCH_TOOL_NAME } from './tool-names.js';
|
|
6
7
|
import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
|
|
7
8
|
import { ToolErrorType } from './tool-error.js';
|
|
8
9
|
import { getErrorMessage } from '../utils/errors.js';
|
|
@@ -11,8 +12,8 @@ import { getResponseText } from '../utils/partUtils.js';
|
|
|
11
12
|
import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
|
|
12
13
|
class WebSearchToolInvocation extends BaseToolInvocation {
|
|
13
14
|
config;
|
|
14
|
-
constructor(config, params) {
|
|
15
|
-
super(params);
|
|
15
|
+
constructor(config, params, messageBus, _toolName, _toolDisplayName) {
|
|
16
|
+
super(params, messageBus, _toolName, _toolDisplayName);
|
|
16
17
|
this.config = config;
|
|
17
18
|
}
|
|
18
19
|
getDescription() {
|
|
@@ -107,8 +108,8 @@ class WebSearchToolInvocation extends BaseToolInvocation {
|
|
|
107
108
|
*/
|
|
108
109
|
export class WebSearchTool extends BaseDeclarativeTool {
|
|
109
110
|
config;
|
|
110
|
-
static Name =
|
|
111
|
-
constructor(config) {
|
|
111
|
+
static Name = WEB_SEARCH_TOOL_NAME;
|
|
112
|
+
constructor(config, messageBus) {
|
|
112
113
|
super(WebSearchTool.Name, 'GoogleSearch', 'Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.', Kind.Search, {
|
|
113
114
|
type: 'object',
|
|
114
115
|
properties: {
|
|
@@ -118,7 +119,9 @@ export class WebSearchTool extends BaseDeclarativeTool {
|
|
|
118
119
|
},
|
|
119
120
|
},
|
|
120
121
|
required: ['query'],
|
|
121
|
-
}
|
|
122
|
+
}, true, // isOutputMarkdown
|
|
123
|
+
false, // canUpdateOutput
|
|
124
|
+
messageBus);
|
|
122
125
|
this.config = config;
|
|
123
126
|
}
|
|
124
127
|
/**
|
|
@@ -132,8 +135,8 @@ export class WebSearchTool extends BaseDeclarativeTool {
|
|
|
132
135
|
}
|
|
133
136
|
return null;
|
|
134
137
|
}
|
|
135
|
-
createInvocation(params) {
|
|
136
|
-
return new WebSearchToolInvocation(this.config, params);
|
|
138
|
+
createInvocation(params, messageBus, _toolName, _toolDisplayName) {
|
|
139
|
+
return new WebSearchToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
|
|
137
140
|
}
|
|
138
141
|
}
|
|
139
142
|
//# sourceMappingURL=web-search.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../../src/tools/web-search.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../../src/tools/web-search.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ export declare function getCorrectedFileContent(config: Config, filePath: string
|
|
|
43
43
|
*/
|
|
44
44
|
export declare class WriteFileTool extends BaseDeclarativeTool<WriteFileToolParams, ToolResult> implements ModifiableDeclarativeTool<WriteFileToolParams> {
|
|
45
45
|
private readonly config;
|
|
46
|
-
static readonly Name
|
|
46
|
+
static readonly Name = "write_file";
|
|
47
47
|
constructor(config: Config);
|
|
48
48
|
protected validateToolParamValues(params: WriteFileToolParams): string | null;
|
|
49
49
|
protected createInvocation(params: WriteFileToolParams): ToolInvocation<WriteFileToolParams, ToolResult>;
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import fs from 'node:fs';
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import * as Diff from 'diff';
|
|
9
|
+
import { WRITE_FILE_TOOL_NAME } from './tool-names.js';
|
|
9
10
|
import { ApprovalMode } from '../config/config.js';
|
|
10
11
|
import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome, } from './tools.js';
|
|
11
12
|
import { ToolErrorType } from './tool-error.js';
|
|
@@ -174,7 +175,7 @@ class WriteFileToolInvocation extends BaseToolInvocation {
|
|
|
174
175
|
const programmingLanguage = getLanguageFromFilePath(file_path);
|
|
175
176
|
const extension = path.extname(file_path);
|
|
176
177
|
const operation = isNewFile ? FileOperation.CREATE : FileOperation.UPDATE;
|
|
177
|
-
logFileOperation(this.config, new FileOperationEvent(
|
|
178
|
+
logFileOperation(this.config, new FileOperationEvent(WRITE_FILE_TOOL_NAME, operation, fileContent.split('\n').length, mimetype, extension, programmingLanguage));
|
|
178
179
|
const displayResult = {
|
|
179
180
|
fileDiff,
|
|
180
181
|
fileName,
|
|
@@ -234,7 +235,7 @@ class WriteFileToolInvocation extends BaseToolInvocation {
|
|
|
234
235
|
*/
|
|
235
236
|
export class WriteFileTool extends BaseDeclarativeTool {
|
|
236
237
|
config;
|
|
237
|
-
static Name =
|
|
238
|
+
static Name = WRITE_FILE_TOOL_NAME;
|
|
238
239
|
constructor(config) {
|
|
239
240
|
super(WriteFileTool.Name, 'WriteFile', `Writes content to a specified file in the local filesystem.
|
|
240
241
|
|