@machina.ai/cell-cli-core 1.6.1-rc2 → 1.10.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 +4 -3
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/src/agents/codebase-investigator.d.ts +46 -0
- package/dist/src/agents/codebase-investigator.js +135 -0
- package/dist/src/agents/codebase-investigator.js.map +1 -0
- package/dist/src/agents/executor.d.ts +92 -0
- package/dist/src/agents/executor.js +579 -0
- package/dist/src/agents/executor.js.map +1 -0
- package/dist/src/agents/executor.test.d.ts +6 -0
- package/dist/src/agents/executor.test.js +680 -0
- package/dist/src/agents/executor.test.js.map +1 -0
- package/dist/src/agents/invocation.d.ts +46 -0
- package/dist/src/agents/invocation.js +102 -0
- package/dist/src/agents/invocation.js.map +1 -0
- package/dist/src/agents/invocation.test.d.ts +6 -0
- package/dist/src/agents/invocation.test.js +215 -0
- package/dist/src/agents/invocation.test.js.map +1 -0
- package/dist/src/agents/registry.d.ts +36 -0
- package/dist/src/agents/registry.js +81 -0
- package/dist/src/agents/registry.js.map +1 -0
- package/dist/src/agents/registry.test.d.ts +6 -0
- package/dist/src/agents/registry.test.js +146 -0
- package/dist/src/agents/registry.test.js.map +1 -0
- package/dist/src/agents/schema-utils.d.ts +39 -0
- package/dist/src/agents/schema-utils.js +57 -0
- package/dist/src/agents/schema-utils.js.map +1 -0
- package/dist/src/agents/schema-utils.test.d.ts +6 -0
- package/dist/src/agents/schema-utils.test.js +144 -0
- package/dist/src/agents/schema-utils.test.js.map +1 -0
- package/dist/src/agents/subagent-tool-wrapper.d.ts +38 -0
- package/dist/src/agents/subagent-tool-wrapper.js +48 -0
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -0
- package/dist/src/agents/subagent-tool-wrapper.test.d.ts +6 -0
- package/dist/src/agents/subagent-tool-wrapper.test.js +112 -0
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -0
- package/dist/src/agents/types.d.ts +145 -0
- package/dist/src/agents/types.js +18 -0
- package/dist/src/agents/types.js.map +1 -0
- package/dist/src/agents/utils.d.ts +15 -0
- package/dist/src/agents/utils.js +29 -0
- package/dist/src/agents/utils.js.map +1 -0
- package/dist/src/agents/utils.test.d.ts +6 -0
- package/dist/src/agents/utils.test.js +87 -0
- package/dist/src/agents/utils.test.js.map +1 -0
- 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.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 +61 -15
- package/dist/src/config/config.js +132 -28
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +67 -3
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/constants.d.ts +11 -0
- package/dist/src/config/constants.js +16 -0
- package/dist/src/config/constants.js.map +1 -0
- 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/core/baseLlmClient.d.ts +4 -0
- package/dist/src/core/baseLlmClient.js +24 -23
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +76 -13
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.d.ts +6 -3
- package/dist/src/core/client.js +103 -64
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +470 -118
- 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.js +12 -12
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +260 -23
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +11 -14
- package/dist/src/core/geminiChat.js +80 -124
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +316 -239
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.test.js +16 -16
- 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 +19 -19
- 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 +53 -111
- 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/subagent.js +1 -1
- package/dist/src/core/subagent.js.map +1 -1
- package/dist/src/core/subagent.test.js +38 -12
- package/dist/src/core/subagent.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +15 -6
- package/dist/src/core/turn.js +14 -13
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +14 -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.d.ts +45 -14
- package/dist/src/ide/detect-ide.js +32 -69
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +40 -46
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +4 -4
- package/dist/src/ide/ide-client.js +33 -32
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.js +12 -25
- package/dist/src/ide/ide-client.test.js.map +1 -1
- package/dist/src/ide/ide-installer.d.ts +2 -2
- package/dist/src/ide/ide-installer.js +8 -10
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +33 -14
- 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 +7 -2
- package/dist/src/index.js +7 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +4 -1
- package/dist/src/mcp/oauth-provider.js +31 -25
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/sa-impersonation-provider.d.ts +33 -0
- package/dist/src/mcp/sa-impersonation-provider.js +130 -0
- package/dist/src/mcp/sa-impersonation-provider.js.map +1 -0
- package/dist/src/mcp/sa-impersonation-provider.test.d.ts +6 -0
- package/dist/src/mcp/sa-impersonation-provider.test.js +117 -0
- package/dist/src/mcp/sa-impersonation-provider.test.js.map +1 -0
- 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/policy/policy-engine.js +11 -2
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +45 -0
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/routing/strategies/compositeStrategy.js +4 -3
- package/dist/src/routing/strategies/compositeStrategy.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +3 -2
- package/dist/src/services/chatRecordingService.js +3 -2
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/fileSystemService.d.ts +9 -0
- package/dist/src/services/fileSystemService.js +11 -0
- package/dist/src/services/fileSystemService.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +3 -0
- package/dist/src/services/shellExecutionService.js +165 -49
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +74 -5
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/activity-detector.d.ts +41 -0
- package/dist/src/telemetry/activity-detector.js +61 -0
- package/dist/src/telemetry/activity-detector.js.map +1 -0
- package/dist/src/telemetry/activity-detector.test.d.ts +6 -0
- package/dist/src/telemetry/activity-detector.test.js +136 -0
- package/dist/src/telemetry/activity-detector.test.js.map +1 -0
- package/dist/src/telemetry/activity-types.d.ts +19 -0
- package/dist/src/telemetry/activity-types.js +21 -0
- package/dist/src/telemetry/activity-types.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +18 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +257 -108
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.d.ts +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +258 -33
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +118 -100
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +146 -103
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/config.d.ts +31 -0
- package/dist/src/telemetry/config.js +74 -0
- package/dist/src/telemetry/config.js.map +1 -0
- package/dist/src/telemetry/config.test.d.ts +6 -0
- package/dist/src/telemetry/config.test.js +124 -0
- package/dist/src/telemetry/config.test.js.map +1 -0
- package/dist/src/telemetry/constants.d.ts +0 -34
- package/dist/src/telemetry/constants.js +0 -34
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +9 -3
- package/dist/src/telemetry/index.js +19 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +10 -2
- package/dist/src/telemetry/loggers.js +206 -273
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.js +3 -3
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +316 -13
- 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 +436 -11
- package/dist/src/telemetry/metrics.js +600 -110
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +898 -16
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/sdk.js +1 -1
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/sdk.test.js +13 -0
- package/dist/src/telemetry/sdk.test.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 +168 -5
- package/dist/src/telemetry/types.js +696 -34
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +2 -2
- package/dist/src/telemetry/uiTelemetry.js +3 -4
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +14 -14
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/mock-tool.d.ts +28 -3
- package/dist/src/test-utils/mock-tool.js +71 -1
- package/dist/src/test-utils/mock-tool.js.map +1 -1
- package/dist/src/tools/glob.js +4 -2
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/ls.js +1 -1
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +5 -14
- package/dist/src/tools/mcp-client.js +51 -98
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +175 -157
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +1 -1
- package/dist/src/tools/memoryTool.js +1 -2
- 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.d.ts +6 -0
- package/dist/src/tools/message-bus-integration.test.js +183 -0
- package/dist/src/tools/message-bus-integration.test.js.map +1 -0
- package/dist/src/tools/shell.js +60 -4
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +2 -1
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.d.ts +1 -1
- package/dist/src/tools/smart-edit.js +116 -12
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js +91 -29
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +22 -0
- package/dist/src/tools/tool-error.js +28 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +9 -0
- package/dist/src/tools/tool-names.js +18 -0
- package/dist/src/tools/tool-names.js.map +1 -0
- package/dist/src/tools/tool-registry.test.js +10 -10
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +11 -3
- package/dist/src/tools/tools.js +94 -3
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +7 -0
- package/dist/src/tools/web-fetch.js +42 -10
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +127 -8
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.js +2 -1
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.js +2 -1
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +25 -0
- package/dist/src/tools/write-todos.js +151 -0
- package/dist/src/tools/write-todos.js.map +1 -0
- package/dist/src/tools/write-todos.test.d.ts +6 -0
- package/dist/src/tools/write-todos.test.js +89 -0
- package/dist/src/tools/write-todos.test.js.map +1 -0
- package/dist/src/utils/bfsFileSearch.d.ts +1 -1
- package/dist/src/utils/editCorrector.js +2 -2
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editor.js +1 -0
- 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/flashFallback.test.js +2 -2
- package/dist/src/utils/flashFallback.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.d.ts +1 -1
- package/dist/src/utils/getFolderStructure.js +1 -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/installationManager.test.js +2 -1
- package/dist/src/utils/installationManager.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +14 -4
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +81 -0
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.d.ts +2 -1
- package/dist/src/utils/memoryDiscovery.js +3 -2
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +99 -21
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +13 -20
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.test.js +14 -0
- package/dist/src/utils/memoryImportProcessor.test.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 +4 -1
- package/dist/src/utils/retry.js +40 -17
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +104 -31
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/schemaValidator.js +11 -1
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/src/utils/schemaValidator.test.d.ts +6 -0
- package/dist/src/utils/schemaValidator.test.js +113 -0
- package/dist/src/utils/schemaValidator.test.js.map +1 -0
- package/dist/src/utils/shell-utils.d.ts +1 -0
- package/dist/src/utils/shell-utils.js +6 -2
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +5 -0
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/terminalSerializer.d.ts +1 -4
- package/dist/src/utils/terminalSerializer.js +3 -3
- package/dist/src/utils/terminalSerializer.js.map +1 -1
- package/dist/src/utils/thoughtUtils.d.ts +21 -0
- package/dist/src/utils/thoughtUtils.js +39 -0
- package/dist/src/utils/thoughtUtils.js.map +1 -0
- package/dist/src/utils/thoughtUtils.test.d.ts +6 -0
- package/dist/src/utils/thoughtUtils.test.js +78 -0
- package/dist/src/utils/thoughtUtils.test.js.map +1 -0
- package/dist/src/utils/tool-utils.js +2 -2
- 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.test.js +2 -1
- package/dist/src/utils/userAccountManager.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/dist/src/test-utils/tools.d.ts +0 -45
- package/dist/src/test-utils/tools.js +0 -105
- package/dist/src/test-utils/tools.js.map +0 -1
|
@@ -3,21 +3,37 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import
|
|
7
|
-
import
|
|
8
|
-
import { populateMcpServerCommand, createTransport, isEnabled, hasValidTypes, McpClient, hasNetworkTransport, } from './mcp-client.js';
|
|
6
|
+
import * as GenAiLib from '@google/genai';
|
|
7
|
+
import * as ClientLib from '@modelcontextprotocol/sdk/client/index.js';
|
|
9
8
|
import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
|
|
10
9
|
import * as SdkClientStdioLib from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
11
|
-
import
|
|
12
|
-
import
|
|
13
|
-
import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
|
|
10
|
+
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
11
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
14
12
|
import { AuthProviderType } from '../config/config.js';
|
|
13
|
+
import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
|
|
14
|
+
import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
|
|
15
|
+
import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
|
|
16
|
+
import { OAuthUtils } from '../mcp/oauth-utils.js';
|
|
17
|
+
import { WorkspaceContext } from '../utils/workspaceContext.js';
|
|
18
|
+
import { connectToMcpServer, createTransport, hasNetworkTransport, isEnabled, McpClient, populateMcpServerCommand, } from './mcp-client.js';
|
|
19
|
+
import * as fs from 'node:fs';
|
|
20
|
+
import * as os from 'node:os';
|
|
21
|
+
import * as path from 'node:path';
|
|
15
22
|
vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
|
|
16
23
|
vi.mock('@modelcontextprotocol/sdk/client/index.js');
|
|
17
24
|
vi.mock('@google/genai');
|
|
18
25
|
vi.mock('../mcp/oauth-provider.js');
|
|
19
26
|
vi.mock('../mcp/oauth-token-storage.js');
|
|
27
|
+
vi.mock('../mcp/oauth-utils.js');
|
|
20
28
|
describe('mcp-client', () => {
|
|
29
|
+
let workspaceContext;
|
|
30
|
+
let testWorkspace;
|
|
31
|
+
beforeEach(() => {
|
|
32
|
+
// create a tmp dir for this test
|
|
33
|
+
// Create a unique temporary directory for the workspace to avoid conflicts
|
|
34
|
+
testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-agent-test-'));
|
|
35
|
+
workspaceContext = new WorkspaceContext(testWorkspace);
|
|
36
|
+
});
|
|
21
37
|
afterEach(() => {
|
|
22
38
|
vi.restoreAllMocks();
|
|
23
39
|
});
|
|
@@ -30,6 +46,7 @@ describe('mcp-client', () => {
|
|
|
30
46
|
getStatus: vi.fn(),
|
|
31
47
|
registerCapabilities: vi.fn(),
|
|
32
48
|
setRequestHandler: vi.fn(),
|
|
49
|
+
getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
|
|
33
50
|
};
|
|
34
51
|
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
35
52
|
vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue({});
|
|
@@ -47,12 +64,12 @@ describe('mcp-client', () => {
|
|
|
47
64
|
};
|
|
48
65
|
const client = new McpClient('test-server', {
|
|
49
66
|
command: 'test-command',
|
|
50
|
-
}, mockedToolRegistry, {},
|
|
67
|
+
}, mockedToolRegistry, {}, workspaceContext, false);
|
|
51
68
|
await client.connect();
|
|
52
69
|
await client.discover({});
|
|
53
70
|
expect(mockedMcpToTool).toHaveBeenCalledOnce();
|
|
54
71
|
});
|
|
55
|
-
it('should skip tools if a parameter is missing a type', async () => {
|
|
72
|
+
it('should not skip tools even if a parameter is missing a type', async () => {
|
|
56
73
|
const consoleWarnSpy = vi
|
|
57
74
|
.spyOn(console, 'warn')
|
|
58
75
|
.mockImplementation(() => { });
|
|
@@ -63,6 +80,7 @@ describe('mcp-client', () => {
|
|
|
63
80
|
getStatus: vi.fn(),
|
|
64
81
|
registerCapabilities: vi.fn(),
|
|
65
82
|
setRequestHandler: vi.fn(),
|
|
83
|
+
getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
|
|
66
84
|
tool: vi.fn(),
|
|
67
85
|
};
|
|
68
86
|
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
@@ -96,13 +114,11 @@ describe('mcp-client', () => {
|
|
|
96
114
|
};
|
|
97
115
|
const client = new McpClient('test-server', {
|
|
98
116
|
command: 'test-command',
|
|
99
|
-
}, mockedToolRegistry, {},
|
|
117
|
+
}, mockedToolRegistry, {}, workspaceContext, false);
|
|
100
118
|
await client.connect();
|
|
101
119
|
await client.discover({});
|
|
102
|
-
expect(mockedToolRegistry.registerTool).
|
|
103
|
-
expect(consoleWarnSpy).
|
|
104
|
-
expect(consoleWarnSpy).toHaveBeenCalledWith(`Skipping tool 'invalidTool' from MCP server 'test-server' because it has ` +
|
|
105
|
-
`missing types in its parameter schema. Please file an issue with the owner of the MCP server.`);
|
|
120
|
+
expect(mockedToolRegistry.registerTool).toHaveBeenCalledTimes(2);
|
|
121
|
+
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
106
122
|
consoleWarnSpy.mockRestore();
|
|
107
123
|
});
|
|
108
124
|
it('should handle errors when discovering prompts', async () => {
|
|
@@ -126,12 +142,70 @@ describe('mcp-client', () => {
|
|
|
126
142
|
});
|
|
127
143
|
const client = new McpClient('test-server', {
|
|
128
144
|
command: 'test-command',
|
|
129
|
-
}, {}, {},
|
|
145
|
+
}, {}, {}, workspaceContext, false);
|
|
130
146
|
await client.connect();
|
|
131
147
|
await expect(client.discover({})).rejects.toThrow('No prompts or tools found on the server.');
|
|
132
148
|
expect(consoleErrorSpy).toHaveBeenCalledWith(`Error discovering prompts from test-server: Test error`);
|
|
133
149
|
consoleErrorSpy.mockRestore();
|
|
134
150
|
});
|
|
151
|
+
it('should not discover tools if server does not support them', async () => {
|
|
152
|
+
const mockedClient = {
|
|
153
|
+
connect: vi.fn(),
|
|
154
|
+
discover: vi.fn(),
|
|
155
|
+
disconnect: vi.fn(),
|
|
156
|
+
getStatus: vi.fn(),
|
|
157
|
+
registerCapabilities: vi.fn(),
|
|
158
|
+
setRequestHandler: vi.fn(),
|
|
159
|
+
getServerCapabilities: vi.fn().mockReturnValue({ prompts: {} }),
|
|
160
|
+
request: vi.fn().mockResolvedValue({ prompts: [] }),
|
|
161
|
+
};
|
|
162
|
+
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
163
|
+
vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue({});
|
|
164
|
+
const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool);
|
|
165
|
+
const mockedToolRegistry = {
|
|
166
|
+
registerTool: vi.fn(),
|
|
167
|
+
};
|
|
168
|
+
const client = new McpClient('test-server', {
|
|
169
|
+
command: 'test-command',
|
|
170
|
+
}, mockedToolRegistry, {}, workspaceContext, false);
|
|
171
|
+
await client.connect();
|
|
172
|
+
await expect(client.discover({})).rejects.toThrow('No prompts or tools found on the server.');
|
|
173
|
+
expect(mockedMcpToTool).not.toHaveBeenCalled();
|
|
174
|
+
});
|
|
175
|
+
it('should discover tools if server supports them', async () => {
|
|
176
|
+
const mockedClient = {
|
|
177
|
+
connect: vi.fn(),
|
|
178
|
+
discover: vi.fn(),
|
|
179
|
+
disconnect: vi.fn(),
|
|
180
|
+
getStatus: vi.fn(),
|
|
181
|
+
registerCapabilities: vi.fn(),
|
|
182
|
+
setRequestHandler: vi.fn(),
|
|
183
|
+
getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
|
|
184
|
+
request: vi.fn().mockResolvedValue({ prompts: [] }),
|
|
185
|
+
};
|
|
186
|
+
vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
|
|
187
|
+
vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue({});
|
|
188
|
+
const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
|
|
189
|
+
tool: () => Promise.resolve({
|
|
190
|
+
functionDeclarations: [
|
|
191
|
+
{
|
|
192
|
+
name: 'testTool',
|
|
193
|
+
description: 'A test tool',
|
|
194
|
+
},
|
|
195
|
+
],
|
|
196
|
+
}),
|
|
197
|
+
});
|
|
198
|
+
const mockedToolRegistry = {
|
|
199
|
+
registerTool: vi.fn(),
|
|
200
|
+
};
|
|
201
|
+
const client = new McpClient('test-server', {
|
|
202
|
+
command: 'test-command',
|
|
203
|
+
}, mockedToolRegistry, {}, workspaceContext, false);
|
|
204
|
+
await client.connect();
|
|
205
|
+
await client.discover({});
|
|
206
|
+
expect(mockedMcpToTool).toHaveBeenCalledOnce();
|
|
207
|
+
expect(mockedToolRegistry.registerTool).toHaveBeenCalledOnce();
|
|
208
|
+
});
|
|
135
209
|
});
|
|
136
210
|
describe('appendMcpServerCommand', () => {
|
|
137
211
|
it('should do nothing if no MCP servers or command are configured', () => {
|
|
@@ -282,149 +356,6 @@ describe('mcp-client', () => {
|
|
|
282
356
|
expect(isEnabled(namelessFuncDecl, serverName, mcpServerConfig)).toBe(false);
|
|
283
357
|
});
|
|
284
358
|
});
|
|
285
|
-
describe('hasValidTypes', () => {
|
|
286
|
-
it('should return true for a valid schema with anyOf', () => {
|
|
287
|
-
const schema = {
|
|
288
|
-
anyOf: [{ type: 'string' }, { type: 'number' }],
|
|
289
|
-
};
|
|
290
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
291
|
-
});
|
|
292
|
-
it('should return false for an invalid schema with anyOf', () => {
|
|
293
|
-
const schema = {
|
|
294
|
-
anyOf: [{ type: 'string' }, { description: 'no type' }],
|
|
295
|
-
};
|
|
296
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
297
|
-
});
|
|
298
|
-
it('should return true for a valid schema with allOf', () => {
|
|
299
|
-
const schema = {
|
|
300
|
-
allOf: [
|
|
301
|
-
{ type: 'string' },
|
|
302
|
-
{ type: 'object', properties: { foo: { type: 'string' } } },
|
|
303
|
-
],
|
|
304
|
-
};
|
|
305
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
306
|
-
});
|
|
307
|
-
it('should return false for an invalid schema with allOf', () => {
|
|
308
|
-
const schema = {
|
|
309
|
-
allOf: [{ type: 'string' }, { description: 'no type' }],
|
|
310
|
-
};
|
|
311
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
312
|
-
});
|
|
313
|
-
it('should return true for a valid schema with oneOf', () => {
|
|
314
|
-
const schema = {
|
|
315
|
-
oneOf: [{ type: 'string' }, { type: 'number' }],
|
|
316
|
-
};
|
|
317
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
318
|
-
});
|
|
319
|
-
it('should return false for an invalid schema with oneOf', () => {
|
|
320
|
-
const schema = {
|
|
321
|
-
oneOf: [{ type: 'string' }, { description: 'no type' }],
|
|
322
|
-
};
|
|
323
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
324
|
-
});
|
|
325
|
-
it('should return true for a valid schema with nested subschemas', () => {
|
|
326
|
-
const schema = {
|
|
327
|
-
anyOf: [
|
|
328
|
-
{ type: 'string' },
|
|
329
|
-
{
|
|
330
|
-
allOf: [
|
|
331
|
-
{ type: 'object', properties: { a: { type: 'string' } } },
|
|
332
|
-
{ type: 'object', properties: { b: { type: 'number' } } },
|
|
333
|
-
],
|
|
334
|
-
},
|
|
335
|
-
],
|
|
336
|
-
};
|
|
337
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
338
|
-
});
|
|
339
|
-
it('should return false for an invalid schema with nested subschemas', () => {
|
|
340
|
-
const schema = {
|
|
341
|
-
anyOf: [
|
|
342
|
-
{ type: 'string' },
|
|
343
|
-
{
|
|
344
|
-
allOf: [
|
|
345
|
-
{ type: 'object', properties: { a: { type: 'string' } } },
|
|
346
|
-
{ description: 'no type' },
|
|
347
|
-
],
|
|
348
|
-
},
|
|
349
|
-
],
|
|
350
|
-
};
|
|
351
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
352
|
-
});
|
|
353
|
-
it('should return true for a schema with a type and subschemas', () => {
|
|
354
|
-
const schema = {
|
|
355
|
-
type: 'string',
|
|
356
|
-
anyOf: [{ minLength: 1 }, { maxLength: 5 }],
|
|
357
|
-
};
|
|
358
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
359
|
-
});
|
|
360
|
-
it('should return false for a schema with no type and no subschemas', () => {
|
|
361
|
-
const schema = {
|
|
362
|
-
description: 'a schema with no type',
|
|
363
|
-
};
|
|
364
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
365
|
-
});
|
|
366
|
-
it('should return true for a valid schema', () => {
|
|
367
|
-
const schema = {
|
|
368
|
-
type: 'object',
|
|
369
|
-
properties: {
|
|
370
|
-
param1: { type: 'string' },
|
|
371
|
-
},
|
|
372
|
-
};
|
|
373
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
374
|
-
});
|
|
375
|
-
it('should return false if a parameter is missing a type', () => {
|
|
376
|
-
const schema = {
|
|
377
|
-
type: 'object',
|
|
378
|
-
properties: {
|
|
379
|
-
param1: { description: 'a param with no type' },
|
|
380
|
-
},
|
|
381
|
-
};
|
|
382
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
383
|
-
});
|
|
384
|
-
it('should return false if a nested parameter is missing a type', () => {
|
|
385
|
-
const schema = {
|
|
386
|
-
type: 'object',
|
|
387
|
-
properties: {
|
|
388
|
-
param1: {
|
|
389
|
-
type: 'object',
|
|
390
|
-
properties: {
|
|
391
|
-
nestedParam: {
|
|
392
|
-
description: 'a nested param with no type',
|
|
393
|
-
},
|
|
394
|
-
},
|
|
395
|
-
},
|
|
396
|
-
},
|
|
397
|
-
};
|
|
398
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
399
|
-
});
|
|
400
|
-
it('should return false if an array item is missing a type', () => {
|
|
401
|
-
const schema = {
|
|
402
|
-
type: 'object',
|
|
403
|
-
properties: {
|
|
404
|
-
param1: {
|
|
405
|
-
type: 'array',
|
|
406
|
-
items: {
|
|
407
|
-
description: 'an array item with no type',
|
|
408
|
-
},
|
|
409
|
-
},
|
|
410
|
-
},
|
|
411
|
-
};
|
|
412
|
-
expect(hasValidTypes(schema)).toBe(false);
|
|
413
|
-
});
|
|
414
|
-
it('should return true for a schema with no properties', () => {
|
|
415
|
-
const schema = {
|
|
416
|
-
type: 'object',
|
|
417
|
-
};
|
|
418
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
419
|
-
});
|
|
420
|
-
it('should return true for a schema with an empty properties object', () => {
|
|
421
|
-
const schema = {
|
|
422
|
-
type: 'object',
|
|
423
|
-
properties: {},
|
|
424
|
-
};
|
|
425
|
-
expect(hasValidTypes(schema)).toBe(true);
|
|
426
|
-
});
|
|
427
|
-
});
|
|
428
359
|
describe('hasNetworkTransport', () => {
|
|
429
360
|
it('should return true if only url is provided', () => {
|
|
430
361
|
const config = { url: 'http://example.com' };
|
|
@@ -451,4 +382,91 @@ describe('mcp-client', () => {
|
|
|
451
382
|
});
|
|
452
383
|
});
|
|
453
384
|
});
|
|
385
|
+
describe('connectToMcpServer with OAuth', () => {
|
|
386
|
+
let mockedClient;
|
|
387
|
+
let workspaceContext;
|
|
388
|
+
let testWorkspace;
|
|
389
|
+
let mockAuthProvider;
|
|
390
|
+
let mockTokenStorage;
|
|
391
|
+
beforeEach(() => {
|
|
392
|
+
mockedClient = {
|
|
393
|
+
connect: vi.fn(),
|
|
394
|
+
close: vi.fn(),
|
|
395
|
+
registerCapabilities: vi.fn(),
|
|
396
|
+
setRequestHandler: vi.fn(),
|
|
397
|
+
onclose: vi.fn(),
|
|
398
|
+
notification: vi.fn(),
|
|
399
|
+
};
|
|
400
|
+
vi.mocked(ClientLib.Client).mockImplementation(() => mockedClient);
|
|
401
|
+
testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-agent-test-'));
|
|
402
|
+
workspaceContext = new WorkspaceContext(testWorkspace);
|
|
403
|
+
vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
404
|
+
vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
405
|
+
vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
406
|
+
mockTokenStorage = {
|
|
407
|
+
getCredentials: vi.fn().mockResolvedValue({ clientId: 'test-client' }),
|
|
408
|
+
};
|
|
409
|
+
vi.mocked(MCPOAuthTokenStorage).mockReturnValue(mockTokenStorage);
|
|
410
|
+
mockAuthProvider = {
|
|
411
|
+
authenticate: vi.fn().mockResolvedValue(undefined),
|
|
412
|
+
getValidToken: vi.fn().mockResolvedValue('test-access-token'),
|
|
413
|
+
tokenStorage: mockTokenStorage,
|
|
414
|
+
};
|
|
415
|
+
vi.mocked(MCPOAuthProvider).mockReturnValue(mockAuthProvider);
|
|
416
|
+
});
|
|
417
|
+
afterEach(() => {
|
|
418
|
+
vi.clearAllMocks();
|
|
419
|
+
});
|
|
420
|
+
it('should handle automatic OAuth flow on 401 with www-authenticate header', async () => {
|
|
421
|
+
const serverUrl = 'http://test-server.com/';
|
|
422
|
+
const authUrl = 'http://auth.example.com/auth';
|
|
423
|
+
const tokenUrl = 'http://auth.example.com/token';
|
|
424
|
+
const wwwAuthHeader = `Bearer realm="test", resource_metadata="http://test-server.com/.well-known/oauth-protected-resource"`;
|
|
425
|
+
vi.mocked(mockedClient.connect).mockRejectedValueOnce(new Error(`401 Unauthorized\nwww-authenticate: ${wwwAuthHeader}`));
|
|
426
|
+
vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
|
|
427
|
+
authorizationUrl: authUrl,
|
|
428
|
+
tokenUrl,
|
|
429
|
+
scopes: ['test-scope'],
|
|
430
|
+
});
|
|
431
|
+
// We need this to be an any type because we dig into its private state.
|
|
432
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
433
|
+
let capturedTransport;
|
|
434
|
+
vi.mocked(mockedClient.connect).mockImplementationOnce(async (transport) => {
|
|
435
|
+
capturedTransport = transport;
|
|
436
|
+
return Promise.resolve();
|
|
437
|
+
});
|
|
438
|
+
const client = await connectToMcpServer('test-server', { httpUrl: serverUrl }, false, workspaceContext);
|
|
439
|
+
expect(client).toBe(mockedClient);
|
|
440
|
+
expect(mockedClient.connect).toHaveBeenCalledTimes(2);
|
|
441
|
+
expect(mockAuthProvider.authenticate).toHaveBeenCalledOnce();
|
|
442
|
+
const authHeader = capturedTransport._requestInit?.headers?.['Authorization'];
|
|
443
|
+
expect(authHeader).toBe('Bearer test-access-token');
|
|
444
|
+
});
|
|
445
|
+
it('should discover oauth config if not in www-authenticate header', async () => {
|
|
446
|
+
const serverUrl = 'http://test-server.com';
|
|
447
|
+
const authUrl = 'http://auth.example.com/auth';
|
|
448
|
+
const tokenUrl = 'http://auth.example.com/token';
|
|
449
|
+
vi.mocked(mockedClient.connect).mockRejectedValueOnce(new Error('401 Unauthorized'));
|
|
450
|
+
vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
|
|
451
|
+
authorizationUrl: authUrl,
|
|
452
|
+
tokenUrl,
|
|
453
|
+
scopes: ['test-scope'],
|
|
454
|
+
});
|
|
455
|
+
vi.mocked(mockAuthProvider.getValidToken).mockResolvedValue('test-access-token-from-discovery');
|
|
456
|
+
// We need this to be an any type because we dig into its private state.
|
|
457
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
458
|
+
let capturedTransport;
|
|
459
|
+
vi.mocked(mockedClient.connect).mockImplementationOnce(async (transport) => {
|
|
460
|
+
capturedTransport = transport;
|
|
461
|
+
return Promise.resolve();
|
|
462
|
+
});
|
|
463
|
+
const client = await connectToMcpServer('test-server', { httpUrl: serverUrl }, false, workspaceContext);
|
|
464
|
+
expect(client).toBe(mockedClient);
|
|
465
|
+
expect(mockedClient.connect).toHaveBeenCalledTimes(2);
|
|
466
|
+
expect(mockAuthProvider.authenticate).toHaveBeenCalledOnce();
|
|
467
|
+
expect(OAuthUtils.discoverOAuthConfig).toHaveBeenCalledWith(serverUrl);
|
|
468
|
+
const authHeader = capturedTransport._requestInit?.headers?.['Authorization'];
|
|
469
|
+
expect(authHeader).toBe('Bearer test-access-token-from-discovery');
|
|
470
|
+
});
|
|
471
|
+
});
|
|
454
472
|
//# sourceMappingURL=mcp-client.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-client.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-client.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcp-client.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
import type { ToolEditConfirmationDetails, ToolResult } from './tools.js';
|
|
7
7
|
import { BaseDeclarativeTool, BaseToolInvocation } from './tools.js';
|
|
8
8
|
import type { ModifiableDeclarativeTool, ModifyContext } from './modifiable-tool.js';
|
|
9
|
-
export declare const CELL_CONFIG_DIR = ".cell-cli";
|
|
10
9
|
export declare const DEFAULT_CONTEXT_FILENAME = "GEMINI.md";
|
|
11
10
|
export declare const MEMORY_SECTION_HEADER = "## Gemini Added Memories";
|
|
12
11
|
export declare function setGeminiMdFilename(newFilename: string | string[]): void;
|
|
@@ -17,6 +16,7 @@ interface SaveMemoryParams {
|
|
|
17
16
|
modified_by_user?: boolean;
|
|
18
17
|
modified_content?: string;
|
|
19
18
|
}
|
|
19
|
+
export declare function getGlobalMemoryFilePath(): string;
|
|
20
20
|
declare class MemoryToolInvocation extends BaseToolInvocation<SaveMemoryParams, ToolResult> {
|
|
21
21
|
private static readonly allowlist;
|
|
22
22
|
getDescription(): string;
|
|
@@ -43,7 +43,6 @@ Do NOT use this tool:
|
|
|
43
43
|
|
|
44
44
|
- \`fact\` (string, required): The specific fact or piece of information to remember. This should be a clear, self-contained statement. For example, if the user says "My favorite color is blue", the fact would be "My favorite color is blue".
|
|
45
45
|
`;
|
|
46
|
-
export const CELL_CONFIG_DIR = '.cell-cli';
|
|
47
46
|
export const DEFAULT_CONTEXT_FILENAME = 'GEMINI.md';
|
|
48
47
|
export const MEMORY_SECTION_HEADER = '## Gemini Added Memories';
|
|
49
48
|
// This variable will hold the currently configured filename for GEMINI.md context files.
|
|
@@ -71,7 +70,7 @@ export function getAllGeminiMdFilenames() {
|
|
|
71
70
|
}
|
|
72
71
|
return [currentGeminiMdFilename];
|
|
73
72
|
}
|
|
74
|
-
function getGlobalMemoryFilePath() {
|
|
73
|
+
export function getGlobalMemoryFilePath() {
|
|
75
74
|
return path.join(Storage.getGlobalGeminiDir(), getCurrentGeminiMdFilename());
|
|
76
75
|
}
|
|
77
76
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryTool.js","sourceRoot":"","sources":["../../../src/tools/memoryTool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,IAAI,EACJ,uBAAuB,GACxB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,oBAAoB,GAAwB;IAChD,IAAI,EAAE,aAAa;IACnB,WAAW,EACT,4OAA4O;IAC9O,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EACT,qGAAqG;aACxG;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;CAiB7B,CAAC;AAEF,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"memoryTool.js","sourceRoot":"","sources":["../../../src/tools/memoryTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import * as path from 'node:path';
|
|
|
10
10
|
import * as os from 'node:os';
|
|
11
11
|
import { ToolConfirmationOutcome } from './tools.js';
|
|
12
12
|
import { ToolErrorType } from './tool-error.js';
|
|
13
|
+
import { CELL_DIR } from '../utils/paths.js';
|
|
13
14
|
// Mock dependencies
|
|
14
15
|
vi.mock(import('node:fs/promises'), async (importOriginal) => {
|
|
15
16
|
const actual = await importOriginal();
|
|
@@ -67,7 +68,7 @@ describe('MemoryTool', () => {
|
|
|
67
68
|
describe('performAddMemoryEntry (static method)', () => {
|
|
68
69
|
let testFilePath;
|
|
69
70
|
beforeEach(() => {
|
|
70
|
-
testFilePath = path.join(os.homedir(),
|
|
71
|
+
testFilePath = path.join(os.homedir(), CELL_DIR, DEFAULT_CONTEXT_FILENAME);
|
|
71
72
|
});
|
|
72
73
|
it('should create section and save a fact if file does not exist', async () => {
|
|
73
74
|
mockFsAdapter.readFile.mockRejectedValue({ code: 'ENOENT' }); // Simulate file not found
|
|
@@ -170,7 +171,7 @@ describe('MemoryTool', () => {
|
|
|
170
171
|
const invocation = memoryTool.build(params);
|
|
171
172
|
const result = await invocation.execute(mockAbortSignal);
|
|
172
173
|
// Use getCurrentGeminiMdFilename for the default expectation before any setGeminiMdFilename calls in a test
|
|
173
|
-
const expectedFilePath = path.join(os.homedir(),
|
|
174
|
+
const expectedFilePath = path.join(os.homedir(), CELL_DIR, getCurrentGeminiMdFilename());
|
|
174
175
|
// For this test, we expect the actual fs methods to be passed
|
|
175
176
|
const expectedFsArgument = {
|
|
176
177
|
readFile: fs.readFile,
|
|
@@ -219,9 +220,9 @@ describe('MemoryTool', () => {
|
|
|
219
220
|
expect(result).toBeDefined();
|
|
220
221
|
expect(result).not.toBe(false);
|
|
221
222
|
if (result && result.type === 'edit') {
|
|
222
|
-
const expectedPath = path.join('~',
|
|
223
|
+
const expectedPath = path.join('~', CELL_DIR, 'GEMINI.md');
|
|
223
224
|
expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
|
|
224
|
-
expect(result.fileName).toContain(path.join('mock', 'home',
|
|
225
|
+
expect(result.fileName).toContain(path.join('mock', 'home', CELL_DIR));
|
|
225
226
|
expect(result.fileName).toContain('GEMINI.md');
|
|
226
227
|
expect(result.fileDiff).toContain('Index: GEMINI.md');
|
|
227
228
|
expect(result.fileDiff).toContain('+## Gemini Added Memories');
|
|
@@ -233,7 +234,7 @@ describe('MemoryTool', () => {
|
|
|
233
234
|
});
|
|
234
235
|
it('should return false when memory file is already allowlisted', async () => {
|
|
235
236
|
const params = { fact: 'Test fact' };
|
|
236
|
-
const memoryFilePath = path.join(os.homedir(),
|
|
237
|
+
const memoryFilePath = path.join(os.homedir(), CELL_DIR, getCurrentGeminiMdFilename());
|
|
237
238
|
const invocation = memoryTool.build(params);
|
|
238
239
|
// Add the memory file to the allowlist
|
|
239
240
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -243,7 +244,7 @@ describe('MemoryTool', () => {
|
|
|
243
244
|
});
|
|
244
245
|
it('should add memory file to allowlist when ProceedAlways is confirmed', async () => {
|
|
245
246
|
const params = { fact: 'Test fact' };
|
|
246
|
-
const memoryFilePath = path.join(os.homedir(),
|
|
247
|
+
const memoryFilePath = path.join(os.homedir(), CELL_DIR, getCurrentGeminiMdFilename());
|
|
247
248
|
const invocation = memoryTool.build(params);
|
|
248
249
|
const result = await invocation.shouldConfirmExecute(mockAbortSignal);
|
|
249
250
|
expect(result).toBeDefined();
|
|
@@ -259,7 +260,7 @@ describe('MemoryTool', () => {
|
|
|
259
260
|
});
|
|
260
261
|
it('should not add memory file to allowlist when other outcomes are confirmed', async () => {
|
|
261
262
|
const params = { fact: 'Test fact' };
|
|
262
|
-
const memoryFilePath = path.join(os.homedir(),
|
|
263
|
+
const memoryFilePath = path.join(os.homedir(), CELL_DIR, getCurrentGeminiMdFilename());
|
|
263
264
|
const invocation = memoryTool.build(params);
|
|
264
265
|
const result = await invocation.shouldConfirmExecute(mockAbortSignal);
|
|
265
266
|
expect(result).toBeDefined();
|
|
@@ -284,7 +285,7 @@ describe('MemoryTool', () => {
|
|
|
284
285
|
expect(result).toBeDefined();
|
|
285
286
|
expect(result).not.toBe(false);
|
|
286
287
|
if (result && result.type === 'edit') {
|
|
287
|
-
const expectedPath = path.join('~',
|
|
288
|
+
const expectedPath = path.join('~', CELL_DIR, 'GEMINI.md');
|
|
288
289
|
expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
|
|
289
290
|
expect(result.fileDiff).toContain('Index: GEMINI.md');
|
|
290
291
|
expect(result.fileDiff).toContain('+- New fact');
|