@1mcp/agent 0.32.2 → 0.33.0-beta1
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/build/auth/oauthAuthorizationFlow.d.ts +145 -0
- package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -0
- package/build/auth/oauthAuthorizationFlow.js +257 -0
- package/build/auth/oauthAuthorizationFlow.js.map +1 -0
- package/build/auth/sdkOAuthServerProvider.d.ts +4 -0
- package/build/auth/sdkOAuthServerProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthServerProvider.js +4 -0
- package/build/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/auth/storage/fileStorageService.d.ts.map +1 -1
- package/build/auth/storage/fileStorageService.js +9 -5
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/commands/cliSetup/setupFiles.d.ts +2 -4
- package/build/commands/cliSetup/setupFiles.d.ts.map +1 -1
- package/build/commands/cliSetup/setupFiles.js +8 -46
- package/build/commands/cliSetup/setupFiles.js.map +1 -1
- package/build/commands/inspect/inspect.d.ts +3 -0
- package/build/commands/inspect/inspect.d.ts.map +1 -1
- package/build/commands/inspect/inspect.js +90 -83
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/instructions/instructions.d.ts.map +1 -1
- package/build/commands/instructions/instructions.js +11 -68
- package/build/commands/instructions/instructions.js.map +1 -1
- package/build/commands/mcp/install.d.ts.map +1 -1
- package/build/commands/mcp/install.js +62 -145
- package/build/commands/mcp/install.js.map +1 -1
- package/build/commands/mcp/installSource.d.ts +13 -0
- package/build/commands/mcp/installSource.d.ts.map +1 -0
- package/build/commands/mcp/installSource.js +69 -0
- package/build/commands/mcp/installSource.js.map +1 -0
- package/build/commands/mcp/uninstall.d.ts.map +1 -1
- package/build/commands/mcp/uninstall.js +20 -15
- package/build/commands/mcp/uninstall.js.map +1 -1
- package/build/commands/preset/edit.d.ts.map +1 -1
- package/build/commands/preset/edit.js +2 -0
- package/build/commands/preset/edit.js.map +1 -1
- package/build/commands/preset/interactive.d.ts.map +1 -1
- package/build/commands/preset/interactive.js +2 -0
- package/build/commands/preset/interactive.js.map +1 -1
- package/build/commands/preset/show.d.ts.map +1 -1
- package/build/commands/preset/show.js +2 -0
- package/build/commands/preset/show.js.map +1 -1
- package/build/commands/preset/test.d.ts.map +1 -1
- package/build/commands/preset/test.js +2 -0
- package/build/commands/preset/test.js.map +1 -1
- package/build/commands/proxy/proxy.d.ts.map +1 -1
- package/build/commands/proxy/proxy.js +11 -22
- package/build/commands/proxy/proxy.js.map +1 -1
- package/build/commands/registry/options.d.ts +14 -7
- package/build/commands/registry/options.d.ts.map +1 -1
- package/build/commands/registry/options.js +14 -7
- package/build/commands/registry/options.js.map +1 -1
- package/build/commands/run/run.d.ts +1 -0
- package/build/commands/run/run.d.ts.map +1 -1
- package/build/commands/run/run.js +124 -156
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/serve/index.d.ts +5 -0
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +6 -1
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +1 -0
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +5 -103
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/serve/serveOptions.d.ts +6 -0
- package/build/commands/serve/serveOptions.d.ts.map +1 -0
- package/build/commands/serve/serveOptions.js +90 -0
- package/build/commands/serve/serveOptions.js.map +1 -0
- package/build/commands/shared/baseConfigUtils.d.ts +1 -25
- package/build/commands/shared/baseConfigUtils.d.ts.map +1 -1
- package/build/commands/shared/baseConfigUtils.js +3 -193
- package/build/commands/shared/baseConfigUtils.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +131 -0
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -0
- package/build/commands/shared/clientSurfaceAttachment.js +205 -0
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -0
- package/build/commands/shared/configParsingUtils.d.ts +9 -0
- package/build/commands/shared/configParsingUtils.d.ts.map +1 -0
- package/build/commands/shared/configParsingUtils.js +179 -0
- package/build/commands/shared/configParsingUtils.js.map +1 -0
- package/build/commands/shared/serveClient.d.ts.map +1 -1
- package/build/commands/shared/serveClient.js +35 -12
- package/build/commands/shared/serveClient.js.map +1 -1
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
- package/build/commands/shared/serveTargetResolver.js +42 -3
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/config/configLoader.d.ts +0 -1
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +12 -7
- package/build/config/configLoader.js.map +1 -1
- package/build/config/envProcessor.d.ts +3 -8
- package/build/config/envProcessor.d.ts.map +1 -1
- package/build/config/envProcessor.js +17 -34
- package/build/config/envProcessor.js.map +1 -1
- package/build/config/mcpConfigMerge.d.ts.map +1 -1
- package/build/config/mcpConfigMerge.js +15 -8
- package/build/config/mcpConfigMerge.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.d.ts +2 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.js +3 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +88 -0
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -0
- package/build/core/capabilities/capabilityCatalog.js +235 -0
- package/build/core/capabilities/capabilityCatalog.js.map +1 -0
- package/build/core/capabilities/capabilityNotificationFacts.d.ts +9 -0
- package/build/core/capabilities/capabilityNotificationFacts.d.ts.map +1 -0
- package/build/core/capabilities/capabilityNotificationFacts.js +11 -0
- package/build/core/capabilities/capabilityNotificationFacts.js.map +1 -0
- package/build/core/capabilities/metaToolProvider.d.ts +2 -0
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +37 -77
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/toolRegistry.d.ts +2 -1
- package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
- package/build/core/capabilities/toolRegistry.js +2 -0
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/configChangeHandler.d.ts.map +1 -1
- package/build/core/configChangeHandler.js +33 -16
- package/build/core/configChangeHandler.js.map +1 -1
- package/build/core/filtering/filterSelection.d.ts +72 -0
- package/build/core/filtering/filterSelection.d.ts.map +1 -0
- package/build/core/filtering/filterSelection.js +262 -0
- package/build/core/filtering/filterSelection.js.map +1 -0
- package/build/core/instructions/instructionsDistribution.d.ts +52 -0
- package/build/core/instructions/instructionsDistribution.d.ts.map +1 -0
- package/build/core/instructions/instructionsDistribution.js +124 -0
- package/build/core/instructions/instructionsDistribution.js.map +1 -0
- package/build/core/protocol/notificationHandlers.js +2 -2
- package/build/core/protocol/notificationHandlers.js.map +1 -1
- package/build/core/protocol/promptRequestHandlers.d.ts +4 -0
- package/build/core/protocol/promptRequestHandlers.d.ts.map +1 -0
- package/build/core/protocol/promptRequestHandlers.js +64 -0
- package/build/core/protocol/promptRequestHandlers.js.map +1 -0
- package/build/core/protocol/requestHandlerUtils.d.ts +8 -0
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -0
- package/build/core/protocol/requestHandlerUtils.js +48 -0
- package/build/core/protocol/requestHandlerUtils.js.map +1 -0
- package/build/core/protocol/requestHandlers.d.ts +2 -0
- package/build/core/protocol/requestHandlers.d.ts.map +1 -1
- package/build/core/protocol/requestHandlers.js +7 -391
- package/build/core/protocol/requestHandlers.js.map +1 -1
- package/build/core/protocol/resourceRequestHandlers.d.ts +3 -0
- package/build/core/protocol/resourceRequestHandlers.d.ts.map +1 -0
- package/build/core/protocol/resourceRequestHandlers.js +76 -0
- package/build/core/protocol/resourceRequestHandlers.js.map +1 -0
- package/build/core/protocol/toolRequestHandlers.d.ts +4 -0
- package/build/core/protocol/toolRequestHandlers.d.ts.map +1 -0
- package/build/core/protocol/toolRequestHandlers.js +132 -0
- package/build/core/protocol/toolRequestHandlers.js.map +1 -0
- package/build/core/server/adapters/TemplateServerAdapter.d.ts +0 -5
- package/build/core/server/adapters/TemplateServerAdapter.d.ts.map +1 -1
- package/build/core/server/adapters/TemplateServerAdapter.js +7 -30
- package/build/core/server/adapters/TemplateServerAdapter.js.map +1 -1
- package/build/core/server/clientInstanceFactory.d.ts +13 -0
- package/build/core/server/clientInstanceFactory.d.ts.map +1 -0
- package/build/core/server/clientInstanceFactory.js +32 -0
- package/build/core/server/clientInstanceFactory.js.map +1 -0
- package/build/core/server/clientInstancePool.d.ts +8 -49
- package/build/core/server/clientInstancePool.d.ts.map +1 -1
- package/build/core/server/clientInstancePool.js +61 -72
- package/build/core/server/clientInstancePool.js.map +1 -1
- package/build/core/server/clientInstancePoolTypes.d.ts +52 -0
- package/build/core/server/clientInstancePoolTypes.d.ts.map +1 -0
- package/build/core/server/clientInstancePoolTypes.js +10 -0
- package/build/core/server/clientInstancePoolTypes.js.map +1 -0
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +34 -31
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/server/requestContextPreparation.d.ts +38 -0
- package/build/core/server/requestContextPreparation.d.ts.map +1 -0
- package/build/core/server/requestContextPreparation.js +49 -0
- package/build/core/server/requestContextPreparation.js.map +1 -0
- package/build/core/server/serverManager.js +1 -1
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/server/templateIdentity.d.ts +44 -0
- package/build/core/server/templateIdentity.d.ts.map +1 -0
- package/build/core/server/templateIdentity.js +95 -0
- package/build/core/server/templateIdentity.js.map +1 -0
- package/build/core/server/templateServerCleanup.d.ts +23 -0
- package/build/core/server/templateServerCleanup.d.ts.map +1 -0
- package/build/core/server/templateServerCleanup.js +155 -0
- package/build/core/server/templateServerCleanup.js.map +1 -0
- package/build/core/server/templateServerManager.d.ts +12 -3
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +82 -127
- package/build/core/server/templateServerManager.js.map +1 -1
- package/build/core/tools/internal/adapters/installation/types.d.ts +16 -11
- package/build/core/tools/internal/adapters/installation/types.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/installationAdapter.d.ts +3 -13
- package/build/core/tools/internal/adapters/installationAdapter.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/installationAdapter.js +85 -69
- package/build/core/tools/internal/adapters/installationAdapter.js.map +1 -1
- package/build/core/tools/internal/installationHandlers.d.ts.map +1 -1
- package/build/core/tools/internal/installationHandlers.js +10 -4
- package/build/core/tools/internal/installationHandlers.js.map +1 -1
- package/build/core/tools/internal/integration.domainMocks.testSetup.d.ts +2 -0
- package/build/core/tools/internal/integration.domainMocks.testSetup.d.ts.map +1 -0
- package/build/core/tools/internal/integration.domainMocks.testSetup.js +66 -0
- package/build/core/tools/internal/integration.domainMocks.testSetup.js.map +1 -0
- package/build/core/tools/internal/integration.testSetup.d.ts +2 -0
- package/build/core/tools/internal/integration.testSetup.d.ts.map +1 -0
- package/build/core/tools/internal/integration.testSetup.js +469 -0
- package/build/core/tools/internal/integration.testSetup.js.map +1 -0
- package/build/core/tools/internal/schemas/index.d.ts +6 -0
- package/build/core/tools/internal/schemas/index.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/installation.d.ts +6 -0
- package/build/core/tools/internal/schemas/installation.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/installation.js +13 -1
- package/build/core/tools/internal/schemas/installation.js.map +1 -1
- package/build/domains/config-change/backupRetention.d.ts +14 -0
- package/build/domains/config-change/backupRetention.d.ts.map +1 -0
- package/build/domains/config-change/backupRetention.js +36 -0
- package/build/domains/config-change/backupRetention.js.map +1 -0
- package/build/domains/config-change/configChange.d.ts +4 -0
- package/build/domains/config-change/configChange.d.ts.map +1 -0
- package/build/domains/config-change/configChange.js +346 -0
- package/build/domains/config-change/configChange.js.map +1 -0
- package/build/domains/config-change/configLock.d.ts +6 -0
- package/build/domains/config-change/configLock.d.ts.map +1 -0
- package/build/domains/config-change/configLock.js +62 -0
- package/build/domains/config-change/configLock.js.map +1 -0
- package/build/domains/config-change/types.d.ts +64 -0
- package/build/domains/config-change/types.d.ts.map +1 -0
- package/build/domains/config-change/types.js +2 -0
- package/build/domains/config-change/types.js.map +1 -0
- package/build/domains/installation/index.d.ts +4 -3
- package/build/domains/installation/index.d.ts.map +1 -1
- package/build/domains/installation/index.js +5 -3
- package/build/domains/installation/index.js.map +1 -1
- package/build/domains/installation/serverInstallationSourceResolution.d.ts +6 -0
- package/build/domains/installation/serverInstallationSourceResolution.d.ts.map +1 -0
- package/build/domains/installation/serverInstallationSourceResolution.js +210 -0
- package/build/domains/installation/serverInstallationSourceResolution.js.map +1 -0
- package/build/domains/installation/serverInstallationTypes.d.ts +105 -0
- package/build/domains/installation/serverInstallationTypes.d.ts.map +1 -0
- package/build/domains/installation/serverInstallationTypes.js +2 -0
- package/build/domains/installation/serverInstallationTypes.js.map +1 -0
- package/build/domains/installation/serverInstallationWorkflow.d.ts +4 -0
- package/build/domains/installation/serverInstallationWorkflow.d.ts.map +1 -0
- package/build/domains/installation/serverInstallationWorkflow.js +148 -0
- package/build/domains/installation/serverInstallationWorkflow.js.map +1 -0
- package/build/domains/preset/manager/presetManager.d.ts +0 -4
- package/build/domains/preset/manager/presetManager.d.ts.map +1 -1
- package/build/domains/preset/manager/presetManager.js +19 -153
- package/build/domains/preset/manager/presetManager.js.map +1 -1
- package/build/domains/preset/manager/presetManagerCleanup.d.ts +15 -0
- package/build/domains/preset/manager/presetManagerCleanup.d.ts.map +1 -0
- package/build/domains/preset/manager/presetManagerCleanup.js +34 -0
- package/build/domains/preset/manager/presetManagerCleanup.js.map +1 -0
- package/build/domains/preset/manager/presetStorage.d.ts +4 -0
- package/build/domains/preset/manager/presetStorage.d.ts.map +1 -0
- package/build/domains/preset/manager/presetStorage.js +27 -0
- package/build/domains/preset/manager/presetStorage.js.map +1 -0
- package/build/domains/preset/manager/presetTesting.d.ts +8 -0
- package/build/domains/preset/manager/presetTesting.d.ts.map +1 -0
- package/build/domains/preset/manager/presetTesting.js +38 -0
- package/build/domains/preset/manager/presetTesting.js.map +1 -0
- package/build/domains/preset/manager/presetValidation.d.ts +3 -0
- package/build/domains/preset/manager/presetValidation.d.ts.map +1 -0
- package/build/domains/preset/manager/presetValidation.js +41 -0
- package/build/domains/preset/manager/presetValidation.js.map +1 -0
- package/build/domains/registry/cacheManager.d.ts.map +1 -1
- package/build/domains/registry/cacheManager.js +1 -0
- package/build/domains/registry/cacheManager.js.map +1 -1
- package/build/domains/registry/mcpRegistryClient.d.ts.map +1 -1
- package/build/domains/registry/mcpRegistryClient.js +2 -1
- package/build/domains/registry/mcpRegistryClient.js.map +1 -1
- package/build/transport/http/middlewares/scopeAuthMiddleware.d.ts +3 -0
- package/build/transport/http/middlewares/scopeAuthMiddleware.d.ts.map +1 -1
- package/build/transport/http/middlewares/scopeAuthMiddleware.js +18 -28
- package/build/transport/http/middlewares/scopeAuthMiddleware.js.map +1 -1
- package/build/transport/http/middlewares/tagsExtractor.d.ts.map +1 -1
- package/build/transport/http/middlewares/tagsExtractor.js +46 -255
- package/build/transport/http/middlewares/tagsExtractor.js.map +1 -1
- package/build/transport/http/routes/cliTokenRoute.d.ts.map +1 -1
- package/build/transport/http/routes/cliTokenRoute.js +20 -14
- package/build/transport/http/routes/cliTokenRoute.js.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.d.ts +5 -0
- package/build/transport/http/routes/inspectRequestContext.d.ts.map +1 -0
- package/build/transport/http/routes/inspectRequestContext.js +59 -0
- package/build/transport/http/routes/inspectRequestContext.js.map +1 -0
- package/build/transport/http/routes/inspectRoutes.d.ts +3 -3
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +60 -83
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/oauthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/oauthRoutes.js +99 -223
- package/build/transport/http/routes/oauthRoutes.js.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.d.ts +2 -2
- package/build/transport/http/routes/streamableHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.js +39 -84
- package/build/transport/http/routes/streamableHttpRoutes.js.map +1 -1
- package/build/transport/http/routes/toolRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/toolRoutes.js +138 -39
- package/build/transport/http/routes/toolRoutes.js.map +1 -1
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +93 -0
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/http/streamableSessionLifecycle.d.ts +90 -0
- package/build/transport/http/streamableSessionLifecycle.d.ts.map +1 -0
- package/build/transport/http/streamableSessionLifecycle.js +348 -0
- package/build/transport/http/streamableSessionLifecycle.js.map +1 -0
- package/build/transport/http/utils/contextExtractor.d.ts +1 -1
- package/build/transport/http/utils/contextExtractor.d.ts.map +1 -1
- package/build/transport/http/utils/contextExtractor.js +1 -33
- package/build/transport/http/utils/contextExtractor.js.map +1 -1
- package/build/transport/stdioProxyTransport.d.ts +1 -0
- package/build/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/transport/stdioProxyTransport.js +3 -0
- package/build/transport/stdioProxyTransport.js.map +1 -1
- package/build/transport/transportFactory.d.ts +1 -2
- package/build/transport/transportFactory.d.ts.map +1 -1
- package/build/transport/transportFactory.js +54 -4
- package/build/transport/transportFactory.js.map +1 -1
- package/build/transport/transportFactory.testSetup.d.ts +2 -0
- package/build/transport/transportFactory.testSetup.d.ts.map +1 -0
- package/build/transport/transportFactory.testSetup.js +83 -0
- package/build/transport/transportFactory.testSetup.js.map +1 -0
- package/build/utils/context/sessionIdentity.d.ts +9 -0
- package/build/utils/context/sessionIdentity.d.ts.map +1 -0
- package/build/utils/context/sessionIdentity.js +39 -0
- package/build/utils/context/sessionIdentity.js.map +1 -0
- package/build/utils/ui/interactiveSelector.d.ts +0 -25
- package/build/utils/ui/interactiveSelector.d.ts.map +1 -1
- package/build/utils/ui/interactiveSelector.js +12 -329
- package/build/utils/ui/interactiveSelector.js.map +1 -1
- package/build/utils/ui/interactiveSelectorPrompts.d.ts +7 -0
- package/build/utils/ui/interactiveSelectorPrompts.d.ts.map +1 -0
- package/build/utils/ui/interactiveSelectorPrompts.js +60 -0
- package/build/utils/ui/interactiveSelectorPrompts.js.map +1 -0
- package/build/utils/ui/interactiveSelectorQuery.d.ts +5 -0
- package/build/utils/ui/interactiveSelectorQuery.d.ts.map +1 -0
- package/build/utils/ui/interactiveSelectorQuery.js +67 -0
- package/build/utils/ui/interactiveSelectorQuery.js.map +1 -0
- package/build/utils/ui/interactiveSelectorTagUi.d.ts +7 -0
- package/build/utils/ui/interactiveSelectorTagUi.d.ts.map +1 -0
- package/build/utils/ui/interactiveSelectorTagUi.js +129 -0
- package/build/utils/ui/interactiveSelectorTagUi.js.map +1 -0
- package/package.json +2 -2
- package/build/transport/http/utils/sessionService.d.ts +0 -106
- package/build/transport/http/utils/sessionService.d.ts.map +0 -1
- package/build/transport/http/utils/sessionService.js +0 -342
- package/build/transport/http/utils/sessionService.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configLoader.d.ts","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configLoader.d.ts","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,EAErB,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,mBAAmB;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,UAAU,uBAAuB;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAkED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAkB7E;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAK;gBAEb,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAOlE,OAAO,CAAC,kBAAkB;IAkBnB,iBAAiB,IAAI,MAAM;IAI3B,iBAAiB,IAAI,OAAO;IAuBnC,OAAO,CAAC,mBAAmB;IAmCpB,aAAa,IAAI,OAAO;IAIxB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,eAAe;IAQ1E,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,qBAAqB;IAQ5D,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,iBAAiB;IAQrD,aAAa,IAAI,iBAAiB;IAWlC,qBAAqB,IAAI,iBAAiB;IAK1C,gBAAgB,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,eAAe;IAiFpE,mCAAmC,IAAI,eAAe;IAItD,6BAA6B,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAIhE,kBAAkB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAUrG,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,EAAE;IAa5E,eAAe,IAAI,OAAO;CAIlC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
import { substituteEnvVarsInConfig } from '../config/envProcessor.js';
|
|
4
3
|
import { getUnknownGlobalConfigKeys, mergeGlobalAndServerConfig } from '../config/mcpConfigMerge.js';
|
|
5
4
|
import { DEFAULT_CONFIG, getGlobalConfigPath } from '../constants.js';
|
|
6
5
|
import { MCP_CONFIG_SCHEMA_URL } from '../constants/schema.js';
|
|
@@ -8,7 +7,16 @@ import { AgentConfigManager } from '../core/server/agentConfig.js';
|
|
|
8
7
|
import { applicationConfigSchema, globalTransportConfigSchema, transportConfigSchema, } from '../core/types/transport.js';
|
|
9
8
|
import logger, { debugIf } from '../logger/logger.js';
|
|
10
9
|
import { parse as parseToml } from 'smol-toml';
|
|
11
|
-
import { ZodError } from 'zod';
|
|
10
|
+
import { z, ZodError } from 'zod';
|
|
11
|
+
const ENV_PLACEHOLDER_PATTERN = /\$\{[^}]+\}|\$[A-Za-z_][A-Za-z0-9_]*/;
|
|
12
|
+
const serverConfigValidationSchema = transportConfigSchema.extend({
|
|
13
|
+
url: z
|
|
14
|
+
.string()
|
|
15
|
+
.refine((value) => ENV_PLACEHOLDER_PATTERN.test(value) || z.string().url().safeParse(value).success, {
|
|
16
|
+
message: 'Invalid url',
|
|
17
|
+
})
|
|
18
|
+
.optional(),
|
|
19
|
+
});
|
|
12
20
|
function formatZodIssues(error) {
|
|
13
21
|
return error.issues.map((issue) => `${issue.path.join('.')}: ${issue.message}`).join(', ');
|
|
14
22
|
}
|
|
@@ -156,7 +164,7 @@ export class ConfigLoader {
|
|
|
156
164
|
}
|
|
157
165
|
validateServerConfig(serverName, config) {
|
|
158
166
|
try {
|
|
159
|
-
return
|
|
167
|
+
return serverConfigValidationSchema.parse(config);
|
|
160
168
|
}
|
|
161
169
|
catch (error) {
|
|
162
170
|
throw new Error(getValidationErrorMessage(`Invalid configuration for server '${serverName}'`, error));
|
|
@@ -202,10 +210,7 @@ export class ConfigLoader {
|
|
|
202
210
|
logger.error(errorMsg);
|
|
203
211
|
throw new Error(errorMsg, { cause: error });
|
|
204
212
|
}
|
|
205
|
-
const
|
|
206
|
-
const features = agentConfig.get('features');
|
|
207
|
-
const substituteEnv = options?.substituteEnv ?? features.envSubstitution;
|
|
208
|
-
const processedConfig = substituteEnv ? substituteEnvVarsInConfig(rawResult.config) : rawResult.config;
|
|
213
|
+
const processedConfig = rawResult.config;
|
|
209
214
|
if (!processedConfig || typeof processedConfig !== 'object') {
|
|
210
215
|
const errorMsg = 'Invalid configuration format';
|
|
211
216
|
logger.error(errorMsg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configLoader.js","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"configLoader.js","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export interface EnvProcessingConfig {
|
|
|
5
5
|
readonly inheritParentEnv?: boolean;
|
|
6
6
|
readonly envFilter?: string[];
|
|
7
7
|
readonly env?: Record<string, string> | string[];
|
|
8
|
+
readonly substituteEnv?: boolean;
|
|
8
9
|
}
|
|
9
10
|
/**
|
|
10
11
|
* Generic configuration object type for environment variable substitution
|
|
@@ -32,16 +33,10 @@ export interface ProcessedEnvironment {
|
|
|
32
33
|
export declare function parseEnvArray(envArray: string[]): Record<string, string>;
|
|
33
34
|
/**
|
|
34
35
|
* Substitutes environment variables in configuration values
|
|
35
|
-
* @param configValue Configuration value that may contain ${VAR} patterns
|
|
36
|
+
* @param configValue Configuration value that may contain ${VAR} or $VAR patterns
|
|
36
37
|
* @returns Value with environment variables substituted
|
|
37
38
|
*/
|
|
38
|
-
export declare function substituteEnvVars(configValue: string): string;
|
|
39
|
-
/**
|
|
40
|
-
* Recursively substitutes environment variables in a configuration object
|
|
41
|
-
* @param config Configuration object
|
|
42
|
-
* @returns Configuration object with environment variables substituted
|
|
43
|
-
*/
|
|
44
|
-
export declare function substituteEnvVarsInConfig(config: unknown): unknown;
|
|
39
|
+
export declare function substituteEnvVars(configValue: string, env?: Record<string, string | undefined>): string;
|
|
45
40
|
/**
|
|
46
41
|
* Processes environment configuration for stdio transport
|
|
47
42
|
* @param config Environment processing configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envProcessor.d.ts","sourceRoot":"","sources":["../../src/config/envProcessor.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"envProcessor.d.ts","sourceRoot":"","sources":["../../src/config/envProcessor.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IACjD,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;QAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;QAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;KAC7B,CAAC;CACH;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqBxE;AAwGD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAcpH;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,GAAG,oBAAoB,CA6EpF"}
|
|
@@ -117,43 +117,21 @@ function getParentEnvironment() {
|
|
|
117
117
|
}
|
|
118
118
|
/**
|
|
119
119
|
* Substitutes environment variables in configuration values
|
|
120
|
-
* @param configValue Configuration value that may contain ${VAR} patterns
|
|
120
|
+
* @param configValue Configuration value that may contain ${VAR} or $VAR patterns
|
|
121
121
|
* @returns Value with environment variables substituted
|
|
122
122
|
*/
|
|
123
|
-
export function substituteEnvVars(configValue) {
|
|
124
|
-
return configValue.replace(/\$\{([^}]+)\}/g, (match,
|
|
125
|
-
const
|
|
126
|
-
const
|
|
123
|
+
export function substituteEnvVars(configValue, env = process.env) {
|
|
124
|
+
return configValue.replace(/\$\{([^}]+)\}|\$([A-Za-z_][A-Za-z0-9_]*)/g, (match, bracedEnvVar, shellEnvVar) => {
|
|
125
|
+
const envVar = bracedEnvVar ?? shellEnvVar;
|
|
126
|
+
const envVarName = envVar?.trim() ?? '';
|
|
127
|
+
const envValue = env[envVarName];
|
|
127
128
|
if (envValue === undefined) {
|
|
128
|
-
logger.warn(`Environment variable ${envVarName} not found, keeping placeholder
|
|
129
|
+
logger.warn(`Environment variable ${envVarName} not found, keeping placeholder unchanged`);
|
|
129
130
|
return match;
|
|
130
131
|
}
|
|
131
132
|
return envValue;
|
|
132
133
|
});
|
|
133
134
|
}
|
|
134
|
-
/**
|
|
135
|
-
* Recursively substitutes environment variables in a configuration object
|
|
136
|
-
* @param config Configuration object
|
|
137
|
-
* @returns Configuration object with environment variables substituted
|
|
138
|
-
*/
|
|
139
|
-
export function substituteEnvVarsInConfig(config) {
|
|
140
|
-
if (typeof config === 'string') {
|
|
141
|
-
return substituteEnvVars(config);
|
|
142
|
-
}
|
|
143
|
-
if (Array.isArray(config)) {
|
|
144
|
-
return config.map((item) => substituteEnvVarsInConfig(item));
|
|
145
|
-
}
|
|
146
|
-
if (config && typeof config === 'object') {
|
|
147
|
-
const result = {};
|
|
148
|
-
// Use Object.keys() for safer iteration and then access properties
|
|
149
|
-
for (const key of Object.keys(config)) {
|
|
150
|
-
const value = config[key];
|
|
151
|
-
result[key] = substituteEnvVarsInConfig(value);
|
|
152
|
-
}
|
|
153
|
-
return result;
|
|
154
|
-
}
|
|
155
|
-
return config;
|
|
156
|
-
}
|
|
157
135
|
/**
|
|
158
136
|
* Processes environment configuration for stdio transport
|
|
159
137
|
* @param config Environment processing configuration
|
|
@@ -195,11 +173,16 @@ export function processEnvironment(config) {
|
|
|
195
173
|
else {
|
|
196
174
|
customEnv = { ...config.env };
|
|
197
175
|
}
|
|
198
|
-
// Apply environment variable substitution to custom env
|
|
199
|
-
|
|
200
|
-
const
|
|
201
|
-
|
|
202
|
-
customEnv
|
|
176
|
+
// Apply environment variable substitution to custom env.
|
|
177
|
+
if (config.substituteEnv !== false) {
|
|
178
|
+
const substitutionEnv = config.envFilter && config.envFilter.length > 0
|
|
179
|
+
? { ...combinedEnv, ...customEnv }
|
|
180
|
+
: { ...process.env, ...combinedEnv, ...customEnv };
|
|
181
|
+
for (const key of Object.keys(customEnv)) {
|
|
182
|
+
const value = customEnv[key];
|
|
183
|
+
if (typeof value === 'string') {
|
|
184
|
+
customEnv[key] = substituteEnvVars(value, substitutionEnv);
|
|
185
|
+
}
|
|
203
186
|
}
|
|
204
187
|
}
|
|
205
188
|
customKeys = Object.keys(customEnv);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envProcessor.js","sourceRoot":"","sources":["../../src/config/envProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAElF,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"envProcessor.js","sourceRoot":"","sources":["../../src/config/envProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpConfigMerge.d.ts","sourceRoot":"","sources":["../../src/config/mcpConfigMerge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,qBAAqB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"mcpConfigMerge.d.ts","sourceRoot":"","sources":["../../src/config/mcpConfigMerge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,qBAAqB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AA+BpH;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,EAAE,CAMvE;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,qBAAqB,GAAG,SAAS,EAC/C,YAAY,EAAE,eAAe,GAC5B,eAAe,CAsDjB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,qBAAqB,GAAG,SAAS,EAC/C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAQjC"}
|
|
@@ -9,6 +9,18 @@ function isStringRecord(value) {
|
|
|
9
9
|
}
|
|
10
10
|
return Object.values(value).every((entry) => typeof entry === 'string');
|
|
11
11
|
}
|
|
12
|
+
function mergeEnvFilters(globalFilter, serverFilter) {
|
|
13
|
+
if (globalFilter === undefined) {
|
|
14
|
+
return serverFilter;
|
|
15
|
+
}
|
|
16
|
+
if (serverFilter === undefined) {
|
|
17
|
+
return globalFilter;
|
|
18
|
+
}
|
|
19
|
+
return Array.from(new Set([...globalFilter, ...serverFilter]));
|
|
20
|
+
}
|
|
21
|
+
function shouldApplyGlobalEnvFilter(serverConfig) {
|
|
22
|
+
return serverConfig.type === 'stdio' || (serverConfig.type === undefined && serverConfig.command !== undefined);
|
|
23
|
+
}
|
|
12
24
|
/**
|
|
13
25
|
* Return unknown keys defined under the raw global section.
|
|
14
26
|
*/
|
|
@@ -40,9 +52,9 @@ export function mergeGlobalAndServerConfig(globalConfig, serverConfig) {
|
|
|
40
52
|
if (merged.inheritParentEnv === undefined && globalConfig.inheritParentEnv !== undefined) {
|
|
41
53
|
merged.inheritParentEnv = globalConfig.inheritParentEnv;
|
|
42
54
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
55
|
+
merged.envFilter = shouldApplyGlobalEnvFilter(serverConfig)
|
|
56
|
+
? mergeEnvFilters(globalConfig.envFilter, serverConfig.envFilter)
|
|
57
|
+
: serverConfig.envFilter;
|
|
46
58
|
// Replace semantics
|
|
47
59
|
if (merged.oauth === undefined && globalConfig.oauth !== undefined) {
|
|
48
60
|
merged.oauth = globalConfig.oauth;
|
|
@@ -67,11 +79,6 @@ export function mergeGlobalAndServerConfig(globalConfig, serverConfig) {
|
|
|
67
79
|
serverConfig.inheritParentEnv === undefined) {
|
|
68
80
|
delete merged.inheritParentEnv;
|
|
69
81
|
}
|
|
70
|
-
if ((merged.type === 'http' || merged.type === 'sse' || merged.type === 'streamableHttp') &&
|
|
71
|
-
globalConfig.envFilter !== undefined &&
|
|
72
|
-
serverConfig.envFilter === undefined) {
|
|
73
|
-
delete merged.envFilter;
|
|
74
|
-
}
|
|
75
82
|
return merged;
|
|
76
83
|
}
|
|
77
84
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpConfigMerge.js","sourceRoot":"","sources":["../../src/config/mcpConfigMerge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAA0C,MAAM,8BAA8B,CAAC;AAEpH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAS,4BAA4B,CAAC,CAAC;AAErE,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;AAC1E,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,SAAkB;IAC3D,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,YAA+C,EAC/C,YAA6B;IAE7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,MAAM,GAAoB,EAAE,GAAG,YAAY,EAAE,CAAC;IAEpD,4BAA4B;IAC5B,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACxC,CAAC;IACD,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS,IAAI,YAAY,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC3F,MAAM,CAAC,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;IAC5D,CAAC;IACD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,YAAY,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACrF,MAAM,CAAC,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC;IACtD,CAAC;IACD,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS,IAAI,YAAY,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACzF,MAAM,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;IAC1D,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"mcpConfigMerge.js","sourceRoot":"","sources":["../../src/config/mcpConfigMerge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAA0C,MAAM,8BAA8B,CAAC;AAEpH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAS,4BAA4B,CAAC,CAAC;AAErE,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,eAAe,CAAC,YAAkC,EAAE,YAAkC;IAC7F,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,YAAY,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,0BAA0B,CAAC,YAA6B;IAC/D,OAAO,YAAY,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;AAClH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,SAAkB;IAC3D,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,YAA+C,EAC/C,YAA6B;IAE7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,MAAM,GAAoB,EAAE,GAAG,YAAY,EAAE,CAAC;IAEpD,4BAA4B;IAC5B,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACxC,CAAC;IACD,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS,IAAI,YAAY,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC3F,MAAM,CAAC,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;IAC5D,CAAC;IACD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,YAAY,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACrF,MAAM,CAAC,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC;IACtD,CAAC;IACD,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS,IAAI,YAAY,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACzF,MAAM,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;IAC1D,CAAC;IACD,MAAM,CAAC,SAAS,GAAG,0BAA0B,CAAC,YAAY,CAAC;QACzD,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC;QACjE,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC;IAE3B,oBAAoB;IACpB,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,YAAY,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACnE,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;IACpC,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACxC,CAAC;IAED,2DAA2D;IAC3D,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,YAAY,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAChC,CAAC;SAAM,IAAI,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1E,MAAM,CAAC,GAAG,GAAG,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACtD,CAAC;IAED,2DAA2D;IAC3D,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACxG,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,iEAAiE;IACjE,IACE,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB,CAAC;QACrF,YAAY,CAAC,gBAAgB,KAAK,SAAS;QAC3C,YAAY,CAAC,gBAAgB,KAAK,SAAS,EAC3C,CAAC;QACD,OAAO,MAAM,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,YAA+C,EAC/C,OAAwC;IAExC,MAAM,aAAa,GAAoC,EAAE,CAAC;IAE1D,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACjE,aAAa,CAAC,UAAU,CAAC,GAAG,0BAA0B,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
package/build/constants/mcp.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
|
6
6
|
export declare const APP_CONFIG_FILE = "config.toml";
|
|
7
7
|
export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
|
|
8
8
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
9
|
-
export declare const MCP_SERVER_VERSION = "0.
|
|
9
|
+
export declare const MCP_SERVER_VERSION = "0.33.0-beta1";
|
|
10
10
|
export declare const MCP_URI_SEPARATOR = "_1mcp_";
|
|
11
11
|
/**
|
|
12
12
|
* Default maximum number of MCP servers to load concurrently
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAG5F,eAAO,MAAM,eAAe,aAAa,CAAC;AAC1C,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAC7C,eAAO,MAAM,8BAA8B,6BAA6B,CAAC;AACzE,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAG5F,eAAO,MAAM,eAAe,aAAa,CAAC;AAC1C,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAC7C,eAAO,MAAM,8BAA8B,6BAA6B,CAAC;AACzE,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,kBAAkB,iBAAiB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C;;GAEG;AACH,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAE9C,eAAO,MAAM,uBAAuB,EAAE,kBAYrC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,kBAMrC,CAAC"}
|
package/build/constants/mcp.js
CHANGED
|
@@ -3,7 +3,7 @@ export const MCP_CONFIG_FILE = 'mcp.json';
|
|
|
3
3
|
export const APP_CONFIG_FILE = 'config.toml';
|
|
4
4
|
export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
|
|
5
5
|
export const MCP_SERVER_NAME = '1mcp';
|
|
6
|
-
export const MCP_SERVER_VERSION = '0.
|
|
6
|
+
export const MCP_SERVER_VERSION = '0.33.0-beta1';
|
|
7
7
|
export const MCP_URI_SEPARATOR = '_1mcp_';
|
|
8
8
|
/**
|
|
9
9
|
* Default maximum number of MCP servers to load concurrently
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAKA,gBAAgB;AAChB,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAC7C,MAAM,CAAC,MAAM,8BAA8B,GAAG,0BAA0B,CAAC;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/constants/mcp.ts"],"names":[],"mappings":"AAKA,gBAAgB;AAChB,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAC7C,MAAM,CAAC,MAAM,8BAA8B,GAAG,0BAA0B,CAAC;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAEjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAE9C,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,IAAI;KAClB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,IAAI;KAClB;IACD,OAAO,EAAE;QACP,WAAW,EAAE,IAAI;KAClB;IACD,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,KAAK,EAAE;QACL,WAAW,EAAE,KAAK;KACnB;IACD,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE,EAAE;CAChB,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { NotificationManager } from '../../core/notifications/notificationManage
|
|
|
4
4
|
import { ServerManager } from '../../core/server/serverManager.js';
|
|
5
5
|
import { InboundConnection, OutboundConnections } from '../../core/types/index.js';
|
|
6
6
|
import { CapabilityAggregator, CapabilityChanges } from './capabilityAggregator.js';
|
|
7
|
+
import type { CapabilityRefreshResult } from './capabilityCatalog.js';
|
|
7
8
|
/**
|
|
8
9
|
* Events emitted by AsyncLoadingOrchestrator
|
|
9
10
|
*/
|
|
@@ -79,7 +80,7 @@ export declare class AsyncLoadingOrchestrator extends EventEmitter {
|
|
|
79
80
|
/**
|
|
80
81
|
* Force refresh capabilities and send notifications if needed
|
|
81
82
|
*/
|
|
82
|
-
refreshCapabilities(): Promise<
|
|
83
|
+
refreshCapabilities(): Promise<CapabilityRefreshResult>;
|
|
83
84
|
/**
|
|
84
85
|
* Update configuration at runtime
|
|
85
86
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncLoadingOrchestrator.d.ts","sourceRoot":"","sources":["../../../src/core/capabilities/asyncLoadingOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"asyncLoadingOrchestrator.d.ts","sourceRoot":"","sources":["../../../src/core/capabilities/asyncLoadingOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGtE;;GAEG;AACH,MAAM,WAAW,8BAA8B;IAC7C,oBAAoB,EAAE,MAAM,IAAI,CAAC;IACjC,6BAA6B,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACxF,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CACjD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,cAAc,CAAoB;IAC1C,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,cAAc,CAAkB;gBAGtC,mBAAmB,EAAE,mBAAmB,EACxC,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,iBAAiB;IAanC;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxC;;OAEG;IACI,uBAAuB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAwB1E;;OAEG;IACH,OAAO,CAAC,eAAe;IAqBvB;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAoB/B;;OAEG;YACW,iBAAiB;IAsB/B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAiB/B;;OAEG;IACI,uBAAuB,IAAI,oBAAoB;IAItD;;OAEG;IACI,sBAAsB,IAAI,mBAAmB,GAAG,IAAI;IAI3D;;OAEG;IACI,OAAO,IAAI,OAAO;IAIzB;;OAEG;IACU,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAwBpE;;OAEG;IACI,YAAY,IAAI,IAAI;IAiB3B;;OAEG;IACI,gBAAgB,IAAI,MAAM;IAWjC;;OAEG;IACI,QAAQ,IAAI,IAAI;CA4BxB"}
|
|
@@ -190,7 +190,7 @@ export class AsyncLoadingOrchestrator extends EventEmitter {
|
|
|
190
190
|
async refreshCapabilities() {
|
|
191
191
|
if (!this.isInitialized || this.isShuttingDown) {
|
|
192
192
|
logger.warn('Cannot refresh capabilities - orchestrator not ready');
|
|
193
|
-
return;
|
|
193
|
+
return { changed: false, shouldNotifyListChanged: false };
|
|
194
194
|
}
|
|
195
195
|
try {
|
|
196
196
|
logger.info('Manually refreshing capabilities...');
|
|
@@ -202,10 +202,12 @@ export class AsyncLoadingOrchestrator extends EventEmitter {
|
|
|
202
202
|
else {
|
|
203
203
|
logger.info('Manual capability refresh completed - no changes detected');
|
|
204
204
|
}
|
|
205
|
+
return { changed: changes.hasChanges, shouldNotifyListChanged: changes.toolsChanged };
|
|
205
206
|
}
|
|
206
207
|
catch (error) {
|
|
207
208
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
208
209
|
logger.error(`Failed to refresh capabilities: ${errorMessage}`);
|
|
210
|
+
return { changed: false, shouldNotifyListChanged: false };
|
|
209
211
|
}
|
|
210
212
|
}
|
|
211
213
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncLoadingOrchestrator.js","sourceRoot":"","sources":["../../../src/core/capabilities/asyncLoadingOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,oBAAoB,EAAqB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"asyncLoadingOrchestrator.js","sourceRoot":"","sources":["../../../src/core/capabilities/asyncLoadingOrchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
import { type TemplateHashProvider } from '../../core/server/connectionResolver.js';
|
|
3
|
+
import type { MCPServerParams, OutboundConnections } from '../../core/types/index.js';
|
|
4
|
+
import { SchemaCache } from './schemaCache.js';
|
|
5
|
+
import type { ListToolsOptions, ListToolsResult as RegistryListToolsResult, ToolMetadata } from './toolRegistry.js';
|
|
6
|
+
import { ToolRegistry } from './toolRegistry.js';
|
|
7
|
+
export interface CapabilityAccessError {
|
|
8
|
+
type: 'validation' | 'not_found' | 'upstream' | 'internal';
|
|
9
|
+
message: string;
|
|
10
|
+
}
|
|
11
|
+
export type CapabilityRefreshIntent = 'never' | 'ifStale' | 'force';
|
|
12
|
+
export type CapabilityRefreshReason = 'list' | 'describe' | 'invoke';
|
|
13
|
+
export interface CapabilityRefreshFacts {
|
|
14
|
+
intent: CapabilityRefreshIntent;
|
|
15
|
+
refreshed: boolean;
|
|
16
|
+
changed: boolean;
|
|
17
|
+
shouldNotifyListChanged: boolean;
|
|
18
|
+
}
|
|
19
|
+
export interface CapabilityRefreshInput {
|
|
20
|
+
intent: Exclude<CapabilityRefreshIntent, 'never'>;
|
|
21
|
+
reason: CapabilityRefreshReason;
|
|
22
|
+
}
|
|
23
|
+
export interface CapabilityRefreshResult {
|
|
24
|
+
changed?: boolean;
|
|
25
|
+
shouldNotifyListChanged?: boolean;
|
|
26
|
+
}
|
|
27
|
+
export interface CapabilityCatalogQueryOptions {
|
|
28
|
+
refreshIntent?: CapabilityRefreshIntent;
|
|
29
|
+
}
|
|
30
|
+
export interface CapabilityRoute {
|
|
31
|
+
server: string;
|
|
32
|
+
toolName: string;
|
|
33
|
+
connectionKey: string;
|
|
34
|
+
}
|
|
35
|
+
export interface VisibleTool extends ToolMetadata {
|
|
36
|
+
}
|
|
37
|
+
export interface VisibleToolListResult extends RegistryListToolsResult {
|
|
38
|
+
tools: VisibleTool[];
|
|
39
|
+
servers: string[];
|
|
40
|
+
routes: CapabilityRoute[];
|
|
41
|
+
refresh: CapabilityRefreshFacts;
|
|
42
|
+
}
|
|
43
|
+
export interface CapabilityCatalogDependencies {
|
|
44
|
+
getToolRegistry: () => ToolRegistry;
|
|
45
|
+
schemaCache: SchemaCache;
|
|
46
|
+
outboundConnections: OutboundConnections;
|
|
47
|
+
getServerConfigs: () => Record<string, MCPServerParams>;
|
|
48
|
+
loadSchema?: (server: string, toolName: string) => Promise<Tool>;
|
|
49
|
+
refreshCapabilities?: (input: CapabilityRefreshInput) => Promise<CapabilityRefreshResult | void>;
|
|
50
|
+
defaultAllowedServers?: Set<string>;
|
|
51
|
+
templateHashProvider?: TemplateHashProvider;
|
|
52
|
+
}
|
|
53
|
+
export interface DescribeVisibleToolResult {
|
|
54
|
+
schema: Tool | Record<string, never>;
|
|
55
|
+
fromCache?: boolean;
|
|
56
|
+
route?: CapabilityRoute;
|
|
57
|
+
error?: CapabilityAccessError;
|
|
58
|
+
refresh: CapabilityRefreshFacts;
|
|
59
|
+
}
|
|
60
|
+
export interface InvokeVisibleToolResult {
|
|
61
|
+
result: unknown;
|
|
62
|
+
server: string;
|
|
63
|
+
tool: string;
|
|
64
|
+
route?: CapabilityRoute;
|
|
65
|
+
error?: CapabilityAccessError;
|
|
66
|
+
refresh: CapabilityRefreshFacts;
|
|
67
|
+
}
|
|
68
|
+
export declare class CapabilityCatalog {
|
|
69
|
+
private readonly deps;
|
|
70
|
+
private readonly connectionResolver;
|
|
71
|
+
constructor(deps: CapabilityCatalogDependencies);
|
|
72
|
+
listVisibleTools(options?: ListToolsOptions, sessionId?: string, allowedServers?: Set<string>, queryOptions?: CapabilityCatalogQueryOptions): Promise<VisibleToolListResult>;
|
|
73
|
+
describeVisibleTool(args: {
|
|
74
|
+
server?: string;
|
|
75
|
+
toolName?: string;
|
|
76
|
+
}, sessionId?: string, allowedServers?: Set<string>, queryOptions?: CapabilityCatalogQueryOptions): Promise<DescribeVisibleToolResult>;
|
|
77
|
+
invokeVisibleTool(args: {
|
|
78
|
+
server?: string;
|
|
79
|
+
toolName?: string;
|
|
80
|
+
args: unknown;
|
|
81
|
+
}, sessionId?: string, allowedServers?: Set<string>, queryOptions?: CapabilityCatalogQueryOptions): Promise<InvokeVisibleToolResult>;
|
|
82
|
+
private resolveRefreshFacts;
|
|
83
|
+
private visibleToolRegistry;
|
|
84
|
+
private resolveVisibleToolAccess;
|
|
85
|
+
private isServerVisible;
|
|
86
|
+
private resolveRoute;
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=capabilityCatalog.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capabilityCatalog.d.ts","sourceRoot":"","sources":["../../../src/core/capabilities/capabilityCatalog.ts"],"names":[],"mappings":"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"}
|