@1mcp/agent 0.35.0-beta.1 → 0.35.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -2
- package/build/admin/assets/{admin-console-CkZ5lBKg.js → admin-console-BOl7XR0p.js} +6 -6
- package/build/admin/assets/{admin-console-CX5GzncA.css → admin-console-Bbil6BQU.css} +1 -1
- package/build/admin/index.html +2 -2
- package/build/application/services/healthService.d.ts +32 -0
- package/build/application/services/healthService.d.ts.map +1 -1
- package/build/application/services/healthService.js +49 -0
- package/build/application/services/healthService.js.map +1 -1
- package/build/auth/oauthAuthorizationFlow.d.ts +2 -2
- package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
- package/build/auth/oauthAuthorizationFlow.js +1 -1
- package/build/auth/oauthAuthorizationFlow.js.map +1 -1
- package/build/auth/sdkOAuthServerProvider.d.ts +4 -3
- package/build/auth/sdkOAuthServerProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthServerProvider.js +132 -17
- package/build/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/auth/sessionTypes.d.ts +40 -5
- package/build/auth/sessionTypes.d.ts.map +1 -1
- package/build/auth/sessionTypes.js +33 -1
- package/build/auth/sessionTypes.js.map +1 -1
- package/build/auth/storage/fileStorageService.d.ts +18 -1
- package/build/auth/storage/fileStorageService.d.ts.map +1 -1
- package/build/auth/storage/fileStorageService.js +253 -3
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/auth/storage/oauthStorageService.d.ts +4 -1
- package/build/auth/storage/oauthStorageService.d.ts.map +1 -1
- package/build/auth/storage/oauthStorageService.js +8 -1
- package/build/auth/storage/oauthStorageService.js.map +1 -1
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts +36 -0
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts.map +1 -0
- package/build/auth/storage/refreshTokenFamilyRepository.js +167 -0
- package/build/auth/storage/refreshTokenFamilyRepository.js.map +1 -0
- package/build/auth/storage/sessionRepository.d.ts +14 -1
- package/build/auth/storage/sessionRepository.d.ts.map +1 -1
- package/build/auth/storage/sessionRepository.js +32 -9
- package/build/auth/storage/sessionRepository.js.map +1 -1
- package/build/commands/inspect/inspect.d.ts.map +1 -1
- package/build/commands/inspect/inspect.js +2 -9
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/inspect/inspectUtils.d.ts +4 -0
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -1
- package/build/commands/inspect/inspectUtils.js +12 -0
- package/build/commands/inspect/inspectUtils.js.map +1 -1
- package/build/commands/instructions/instructionsUtils.d.ts +2 -0
- package/build/commands/instructions/instructionsUtils.d.ts.map +1 -1
- package/build/commands/instructions/instructionsUtils.js +7 -3
- package/build/commands/instructions/instructionsUtils.js.map +1 -1
- package/build/commands/mcp/index.d.ts.map +1 -1
- package/build/commands/mcp/index.js +10 -0
- package/build/commands/mcp/index.js.map +1 -1
- package/build/commands/mcp/restart.d.ts +69 -0
- package/build/commands/mcp/restart.d.ts.map +1 -0
- package/build/commands/mcp/restart.js +259 -0
- package/build/commands/mcp/restart.js.map +1 -0
- package/build/commands/mcp/status.d.ts +24 -1
- package/build/commands/mcp/status.d.ts.map +1 -1
- package/build/commands/mcp/status.js +158 -14
- package/build/commands/mcp/status.js.map +1 -1
- package/build/commands/run/run.d.ts.map +1 -1
- package/build/commands/run/run.js +86 -7
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/serve/asyncLoadingOptions.d.ts +30 -0
- package/build/commands/serve/asyncLoadingOptions.d.ts.map +1 -0
- package/build/commands/serve/asyncLoadingOptions.js +34 -0
- package/build/commands/serve/asyncLoadingOptions.js.map +1 -0
- package/build/commands/serve/index.d.ts +12 -1
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +26 -15
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +15 -1
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +128 -65
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/serve/serveBackground.d.ts +48 -26
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +231 -61
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/serve/serveRestart.d.ts +1 -1
- package/build/commands/serve/serveRestart.js +1 -1
- package/build/commands/serve/serveStatus.d.ts +20 -10
- package/build/commands/serve/serveStatus.d.ts.map +1 -1
- package/build/commands/serve/serveStatus.js +174 -13
- package/build/commands/serve/serveStatus.js.map +1 -1
- package/build/commands/serve/serveStop.d.ts +13 -4
- package/build/commands/serve/serveStop.d.ts.map +1 -1
- package/build/commands/serve/serveStop.js +212 -23
- package/build/commands/serve/serveStop.js.map +1 -1
- package/build/commands/shared/apiClient.d.ts +1 -1
- package/build/commands/shared/apiClient.d.ts.map +1 -1
- package/build/commands/shared/apiClient.js +2 -2
- package/build/commands/shared/apiClient.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +3 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.js +14 -4
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
- package/build/commands/shared/commandRunner.d.ts +1 -0
- package/build/commands/shared/commandRunner.d.ts.map +1 -1
- package/build/commands/shared/commandRunner.js +10 -2
- package/build/commands/shared/commandRunner.js.map +1 -1
- package/build/commands/shared/filterSelectionQuery.d.ts +8 -0
- package/build/commands/shared/filterSelectionQuery.d.ts.map +1 -0
- package/build/commands/shared/filterSelectionQuery.js +12 -0
- package/build/commands/shared/filterSelectionQuery.js.map +1 -0
- package/build/commands/shared/inspectApiSchemas.d.ts +83 -0
- package/build/commands/shared/inspectApiSchemas.d.ts.map +1 -0
- package/build/commands/shared/inspectApiSchemas.js +40 -0
- package/build/commands/shared/inspectApiSchemas.js.map +1 -0
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
- package/build/commands/shared/serveTargetResolver.js +19 -8
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/commands/wait/index.d.ts +3 -0
- package/build/commands/wait/index.d.ts.map +1 -0
- package/build/commands/wait/index.js +20 -0
- package/build/commands/wait/index.js.map +1 -0
- package/build/commands/wait/wait.d.ts +39 -0
- package/build/commands/wait/wait.d.ts.map +1 -0
- package/build/commands/wait/wait.js +161 -0
- package/build/commands/wait/wait.js.map +1 -0
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +12 -0
- package/build/config/configLoader.js.map +1 -1
- package/build/config/configManager.d.ts +2 -0
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +19 -8
- package/build/config/configManager.js.map +1 -1
- package/build/config/mcpConfigMerge.d.ts.map +1 -1
- package/build/config/mcpConfigMerge.js +13 -2
- package/build/config/mcpConfigMerge.js.map +1 -1
- package/build/constants/auth.d.ts +10 -1
- package/build/constants/auth.d.ts.map +1 -1
- package/build/constants/auth.js +11 -1
- package/build/constants/auth.js.map +1 -1
- package/build/constants/mcp.d.ts +7 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +9 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js +10 -9
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +6 -5
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +36 -23
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityVisibility.d.ts +12 -0
- package/build/core/capabilities/capabilityVisibility.d.ts.map +1 -0
- package/build/core/capabilities/capabilityVisibility.js +13 -0
- package/build/core/capabilities/capabilityVisibility.js.map +1 -0
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts +2 -1
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts.map +1 -1
- package/build/core/capabilities/internalCapabilitiesProvider.js +2 -2
- package/build/core/capabilities/internalCapabilitiesProvider.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +5 -23
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +25 -44
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +6 -21
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +18 -70
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/toolRegistry.d.ts +5 -1
- package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
- package/build/core/capabilities/toolRegistry.js +11 -3
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/client/clientManager.d.ts +33 -1
- package/build/core/client/clientManager.d.ts.map +1 -1
- package/build/core/client/clientManager.js +350 -2
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/client/connectionHandler.d.ts.map +1 -1
- package/build/core/client/connectionHandler.js +18 -1
- package/build/core/client/connectionHandler.js.map +1 -1
- package/build/core/client/recreateHttpTransportOptions.d.ts +14 -0
- package/build/core/client/recreateHttpTransportOptions.d.ts.map +1 -0
- package/build/core/client/recreateHttpTransportOptions.js +2 -0
- package/build/core/client/recreateHttpTransportOptions.js.map +1 -0
- package/build/core/client/transportRecreator.d.ts +8 -1
- package/build/core/client/transportRecreator.d.ts.map +1 -1
- package/build/core/client/transportRecreator.js +11 -2
- package/build/core/client/transportRecreator.js.map +1 -1
- package/build/core/configChangeHandler.d.ts +1 -0
- package/build/core/configChangeHandler.d.ts.map +1 -1
- package/build/core/configChangeHandler.js +14 -0
- package/build/core/configChangeHandler.js.map +1 -1
- package/build/core/instructions/templateTypes.d.ts +2 -2
- package/build/core/instructions/templateTypes.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.js +16 -4
- package/build/core/loading/mcpLoadingManager.js.map +1 -1
- package/build/core/protocol/requestHandlerUtils.d.ts +3 -0
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.js +23 -7
- package/build/core/protocol/requestHandlerUtils.js.map +1 -1
- package/build/core/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/core/protocol/toolRequestHandlers.js +13 -13
- package/build/core/protocol/toolRequestHandlers.js.map +1 -1
- package/build/core/runtime/runtimeIdentityService.d.ts +1 -0
- package/build/core/runtime/runtimeIdentityService.d.ts.map +1 -1
- package/build/core/runtime/runtimeIdentityService.js +4 -1
- package/build/core/runtime/runtimeIdentityService.js.map +1 -1
- package/build/core/server/backendStdioSupervisor.d.ts +73 -0
- package/build/core/server/backendStdioSupervisor.d.ts.map +1 -0
- package/build/core/server/backendStdioSupervisor.js +191 -0
- package/build/core/server/backendStdioSupervisor.js.map +1 -0
- package/build/core/server/backgroundLaunchConfig.d.ts +15 -0
- package/build/core/server/backgroundLaunchConfig.d.ts.map +1 -0
- package/build/core/server/backgroundLaunchConfig.js +46 -0
- package/build/core/server/backgroundLaunchConfig.js.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisor.d.ts +44 -0
- package/build/core/server/backgroundRuntimeSupervisor.d.ts.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisor.js +252 -0
- package/build/core/server/backgroundRuntimeSupervisor.js.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisorState.d.ts +30 -0
- package/build/core/server/backgroundRuntimeSupervisorState.d.ts.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisorState.js +81 -0
- package/build/core/server/backgroundRuntimeSupervisorState.js.map +1 -0
- package/build/core/server/clientInstanceFactory.d.ts.map +1 -1
- package/build/core/server/clientInstanceFactory.js +13 -3
- package/build/core/server/clientInstanceFactory.js.map +1 -1
- package/build/core/server/clientInstancePool.d.ts +17 -5
- package/build/core/server/clientInstancePool.d.ts.map +1 -1
- package/build/core/server/clientInstancePool.js +198 -33
- package/build/core/server/clientInstancePool.js.map +1 -1
- package/build/core/server/clientInstancePoolTypes.d.ts +7 -1
- package/build/core/server/clientInstancePoolTypes.d.ts.map +1 -1
- package/build/core/server/clientInstancePoolTypes.js.map +1 -1
- package/build/core/server/connectionManager.d.ts +0 -6
- package/build/core/server/connectionManager.d.ts.map +1 -1
- package/build/core/server/connectionManager.js +0 -39
- package/build/core/server/connectionManager.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +35 -1
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/server/runtimeScopeOwnership.d.ts +61 -0
- package/build/core/server/runtimeScopeOwnership.d.ts.map +1 -0
- package/build/core/server/runtimeScopeOwnership.js +544 -0
- package/build/core/server/runtimeScopeOwnership.js.map +1 -0
- package/build/core/server/serverManager.d.ts +2 -0
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +30 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/server/templateIdentity.d.ts +10 -0
- package/build/core/server/templateIdentity.d.ts.map +1 -1
- package/build/core/server/templateIdentity.js +33 -0
- package/build/core/server/templateIdentity.js.map +1 -1
- package/build/core/server/templateServerCleanup.d.ts.map +1 -1
- package/build/core/server/templateServerCleanup.js +7 -1
- package/build/core/server/templateServerCleanup.js.map +1 -1
- package/build/core/server/templateServerManager.d.ts +13 -0
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +129 -4
- package/build/core/server/templateServerManager.js.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +111 -5
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.js +103 -45
- package/build/core/tools/handlers/serverManagementHandler.js.map +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts +2 -2
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.js +45 -26
- package/build/core/tools/internal/adapters/management/managementAdapter.js.map +1 -1
- package/build/core/tools/internal/adapters/management/types.d.ts +21 -2
- package/build/core/tools/internal/adapters/management/types.d.ts.map +1 -1
- package/build/core/tools/internal/managementHandlers.d.ts.map +1 -1
- package/build/core/tools/internal/managementHandlers.js +73 -22
- package/build/core/tools/internal/managementHandlers.js.map +1 -1
- package/build/core/tools/internal/schemas/discovery.d.ts +2 -2
- package/build/core/tools/internal/schemas/edit.js +1 -1
- package/build/core/tools/internal/schemas/edit.js.map +1 -1
- package/build/core/tools/internal/schemas/index.d.ts +77 -6
- package/build/core/tools/internal/schemas/index.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/management.d.ts +75 -4
- package/build/core/tools/internal/schemas/management.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/management.js +69 -2
- package/build/core/tools/internal/schemas/management.js.map +1 -1
- package/build/core/types/client.d.ts +9 -2
- package/build/core/types/client.d.ts.map +1 -1
- package/build/core/types/client.js +4 -0
- package/build/core/types/client.js.map +1 -1
- package/build/core/types/transport.d.ts +27 -1
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +39 -8
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/adminBackendRestartService.d.ts +41 -0
- package/build/domains/admin/adminBackendRestartService.d.ts.map +1 -0
- package/build/domains/admin/adminBackendRestartService.js +22 -0
- package/build/domains/admin/adminBackendRestartService.js.map +1 -0
- package/build/domains/admin/adminDomain.d.ts +7 -0
- package/build/domains/admin/adminDomain.d.ts.map +1 -1
- package/build/domains/admin/adminDomain.js +13 -0
- package/build/domains/admin/adminDomain.js.map +1 -1
- package/build/domains/admin/adminOAuthService.d.ts +26 -0
- package/build/domains/admin/adminOAuthService.d.ts.map +1 -0
- package/build/domains/admin/adminOAuthService.js +71 -0
- package/build/domains/admin/adminOAuthService.js.map +1 -0
- package/build/domains/admin/adminOperationService.d.ts +1 -0
- package/build/domains/admin/adminOperationService.d.ts.map +1 -1
- package/build/domains/admin/adminOperationService.js +39 -14
- package/build/domains/admin/adminOperationService.js.map +1 -1
- package/build/domains/admin/runtimeServerManagerBackendRestartService.d.ts +20 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.d.ts.map +1 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.js +78 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.js.map +1 -0
- package/build/domains/backend-logs/backendLogBroker.d.ts +47 -0
- package/build/domains/backend-logs/backendLogBroker.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogBroker.js +249 -0
- package/build/domains/backend-logs/backendLogBroker.js.map +1 -0
- package/build/domains/backend-logs/backendLogProjection.d.ts +9 -0
- package/build/domains/backend-logs/backendLogProjection.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogProjection.js +40 -0
- package/build/domains/backend-logs/backendLogProjection.js.map +1 -0
- package/build/domains/backend-logs/backendLogRuntime.d.ts +4 -0
- package/build/domains/backend-logs/backendLogRuntime.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogRuntime.js +11 -0
- package/build/domains/backend-logs/backendLogRuntime.js.map +1 -0
- package/build/domains/backend-logs/backendLogSanitizer.d.ts +2 -0
- package/build/domains/backend-logs/backendLogSanitizer.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogSanitizer.js +30 -0
- package/build/domains/backend-logs/backendLogSanitizer.js.map +1 -0
- package/build/domains/backend-logs/backendLogSource.d.ts +8 -0
- package/build/domains/backend-logs/backendLogSource.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogSource.js +22 -0
- package/build/domains/backend-logs/backendLogSource.js.map +1 -0
- package/build/domains/backend-logs/backendLogTypes.d.ts +49 -0
- package/build/domains/backend-logs/backendLogTypes.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogTypes.js +2 -0
- package/build/domains/backend-logs/backendLogTypes.js.map +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +8 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.js +62 -3
- package/build/domains/runtime-targets/runtimeIdentityVerification.js.map +1 -1
- package/build/domains/runtime-targets/runtimeProbe.d.ts +34 -0
- package/build/domains/runtime-targets/runtimeProbe.d.ts.map +1 -0
- package/build/domains/runtime-targets/runtimeProbe.js +71 -0
- package/build/domains/runtime-targets/runtimeProbe.js.map +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -0
- package/build/index.js.map +1 -1
- package/build/server.d.ts.map +1 -1
- package/build/server.js +18 -2
- package/build/server.js.map +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +6 -0
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/adminRoutes.js +438 -38
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/healthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/healthRoutes.js +70 -2
- package/build/transport/http/routes/healthRoutes.js.map +1 -1
- package/build/transport/http/routes/inspectHelpers.d.ts +11 -4
- package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -1
- package/build/transport/http/routes/inspectHelpers.js +21 -2
- package/build/transport/http/routes/inspectHelpers.js.map +1 -1
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +55 -4
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/oauthRoutes.d.ts +3 -2
- package/build/transport/http/routes/oauthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/oauthRoutes.js +10 -8
- package/build/transport/http/routes/oauthRoutes.js.map +1 -1
- package/build/transport/http/routes/toolRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/toolRoutes.js +37 -29
- 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 +16 -5
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/managedStdioStderr.d.ts +17 -1
- package/build/transport/managedStdioStderr.d.ts.map +1 -1
- package/build/transport/managedStdioStderr.js +129 -5
- package/build/transport/managedStdioStderr.js.map +1 -1
- package/build/transport/managedStdioStderrOptions.d.ts +2 -0
- package/build/transport/managedStdioStderrOptions.d.ts.map +1 -1
- package/build/transport/restartableStdioTransport.js +1 -1
- package/build/transport/restartableStdioTransport.js.map +1 -1
- package/build/transport/transportFactory.d.ts +6 -2
- package/build/transport/transportFactory.d.ts.map +1 -1
- package/build/transport/transportFactory.js +69 -29
- package/build/transport/transportFactory.js.map +1 -1
- package/build/transport/transportFactory.testSetup.js +2 -0
- package/build/transport/transportFactory.testSetup.js.map +1 -1
- package/build/types/serverStatus.d.ts +3 -0
- package/build/types/serverStatus.d.ts.map +1 -0
- package/build/types/serverStatus.js +13 -0
- package/build/types/serverStatus.js.map +1 -0
- package/build/utils/core/errorTypes.d.ts +3 -0
- package/build/utils/core/errorTypes.d.ts.map +1 -1
- package/build/utils/core/errorTypes.js +7 -0
- package/build/utils/core/errorTypes.js.map +1 -1
- package/build/utils/validation/urlDetection.d.ts +12 -9
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +233 -31
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +4 -3
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { ConfigManager } from '../../../config/configManager.js';
|
|
2
2
|
import { McpConfigManager } from '../../../config/mcpConfigManager.js';
|
|
3
3
|
import { FilteringService } from '../../../core/filtering/filteringService.js';
|
|
4
|
+
import { LoadingState } from '../../../core/loading/loadingStateTracker.js';
|
|
5
|
+
import { McpLoadingManager } from '../../../core/loading/mcpLoadingManager.js';
|
|
4
6
|
import { filterDisabledTools, getDisabledToolError, getDisabledToolsForServer, } from '../../../core/server/disabledTools.js';
|
|
5
7
|
import logger from '../../../logger/logger.js';
|
|
6
8
|
import { buildFilterConfig, deriveServerState, getServerName, getToolName, matchesFilterConfig, parseTarget, qualifyToolName, resolveConnectionByServerName, summarizeDirectServerTool, summarizeToolSchema, } from './inspectHelpers.js';
|
|
@@ -23,6 +25,19 @@ function getServerTargetConfigs(declaredServers) {
|
|
|
23
25
|
...declaredServers.templateServers,
|
|
24
26
|
};
|
|
25
27
|
}
|
|
28
|
+
function getLoadingInfo(serverName) {
|
|
29
|
+
try {
|
|
30
|
+
return McpLoadingManager.current.getStateTracker().getServerState(serverName);
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
// Inspect is also used by lightweight unit and compatibility runtimes that
|
|
34
|
+
// have no loading manager. Their connection/adapter state remains valid.
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
function isLoadTrackedStaticServer(declaredServers, serverName) {
|
|
39
|
+
return Boolean(declaredServers.staticServers[serverName] && !declaredServers.staticServers[serverName].disabled);
|
|
40
|
+
}
|
|
26
41
|
function hasDisabledTools(serverConfigs, serverName) {
|
|
27
42
|
return getDisabledToolsForServer(serverConfigs, serverName).length > 0;
|
|
28
43
|
}
|
|
@@ -130,13 +145,15 @@ async function buildServerSummaries(filteredConnections, toolRegistry, capabilit
|
|
|
130
145
|
for (const [cleanName, info] of serverMap) {
|
|
131
146
|
const adapter = serverRegistry.get(cleanName);
|
|
132
147
|
const connection = resolveConnectionByServerName(summaryConnections, cleanName);
|
|
133
|
-
const
|
|
148
|
+
const loadingInfo = getLoadingInfo(cleanName);
|
|
149
|
+
const state = deriveServerState(adapter?.getStatus(), adapter?.isAvailable(), connection, loadingInfo);
|
|
134
150
|
const type = adapter?.type ?? (declaredServers.templateServers[cleanName] ? 'template' : 'external');
|
|
135
151
|
servers.push({
|
|
136
152
|
server: cleanName,
|
|
137
153
|
type: String(type),
|
|
138
154
|
status: state.status,
|
|
139
155
|
available: state.available,
|
|
156
|
+
loadTracked: isLoadTrackedStaticServer(declaredServers, cleanName),
|
|
140
157
|
toolCount: info.toolCount,
|
|
141
158
|
hasInstructions: info.hasInstructions,
|
|
142
159
|
});
|
|
@@ -271,13 +288,44 @@ export function createInspectHandler(serverManager) {
|
|
|
271
288
|
res.status(404).json({ error: `Server not found: ${serverName}` });
|
|
272
289
|
return;
|
|
273
290
|
}
|
|
274
|
-
|
|
275
|
-
|
|
291
|
+
const declaredConfig = declaredTemplateConfig ?? declaredStaticConfig;
|
|
292
|
+
const targetAllowed = !!connection ||
|
|
293
|
+
matchesFilterConfig(adapter?.config.tags, filterConfig) ||
|
|
294
|
+
matchesFilterConfig(declaredConfig?.tags, filterConfig);
|
|
295
|
+
if (!targetAllowed) {
|
|
296
|
+
res.status(404).json({ error: `Server not found: ${serverName}` });
|
|
276
297
|
return;
|
|
277
298
|
}
|
|
278
|
-
const
|
|
299
|
+
const loadingInfo = getLoadingInfo(serverName);
|
|
300
|
+
const state = deriveServerState(adapter?.getStatus(requestSessionId ? { sessionId: requestSessionId } : undefined), adapter?.isAvailable(requestSessionId ? { sessionId: requestSessionId } : undefined), connection, loadingInfo);
|
|
279
301
|
const type = adapter?.type ?? (declaredTemplateConfig ? 'template' : 'external');
|
|
280
302
|
const instructions = instructionAggregator?.getServerInstructions(serverName) ?? null;
|
|
303
|
+
const loadTracked = isLoadTrackedStaticServer(declaredServers, serverName);
|
|
304
|
+
// Static startup targets remain inspectable before the first atomic
|
|
305
|
+
// capability snapshot. Do not force a direct tools/list call while the
|
|
306
|
+
// loading tracker says the backend is not ready.
|
|
307
|
+
if (declaredStaticConfig && (!connection || (loadingInfo && loadingInfo.state !== LoadingState.Ready))) {
|
|
308
|
+
const payload = {
|
|
309
|
+
kind: 'server',
|
|
310
|
+
server: serverName,
|
|
311
|
+
type: String(type),
|
|
312
|
+
status: state.status,
|
|
313
|
+
available: state.available,
|
|
314
|
+
loadTracked,
|
|
315
|
+
instructions,
|
|
316
|
+
...(loadingInfo?.authorizationUrl ? { authorizationUrl: loadingInfo.authorizationUrl } : {}),
|
|
317
|
+
...(loadingInfo?.error ? { error: loadingInfo.error.message } : {}),
|
|
318
|
+
tools: [],
|
|
319
|
+
totalTools: 0,
|
|
320
|
+
hasMore: false,
|
|
321
|
+
};
|
|
322
|
+
res.json(payload);
|
|
323
|
+
return;
|
|
324
|
+
}
|
|
325
|
+
if (!connection) {
|
|
326
|
+
res.status(503).json({ error: `Server '${serverName}' is not currently connected` });
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
281
329
|
let toolsResult;
|
|
282
330
|
if (toolRegistry) {
|
|
283
331
|
if (connection?.client) {
|
|
@@ -319,7 +367,10 @@ export function createInspectHandler(serverManager) {
|
|
|
319
367
|
type: String(type),
|
|
320
368
|
status: state.status,
|
|
321
369
|
available: state.available,
|
|
370
|
+
loadTracked,
|
|
322
371
|
instructions,
|
|
372
|
+
...(loadingInfo?.authorizationUrl ? { authorizationUrl: loadingInfo.authorizationUrl } : {}),
|
|
373
|
+
...(loadingInfo?.error ? { error: loadingInfo.error.message } : {}),
|
|
323
374
|
tools: toolsResult.tools,
|
|
324
375
|
totalTools: toolsResult.totalTools,
|
|
325
376
|
hasMore: toolsResult.hasMore,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/inspectRoutes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"inspectRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/inspectRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,8 @@ import { Router } from 'express';
|
|
|
5
5
|
/**
|
|
6
6
|
* Creates OAuth routes with the provided OAuth provider
|
|
7
7
|
*/
|
|
8
|
-
export declare function createOAuthRoutes(oauthProvider: SDKOAuthServerProvider, loadingManager?: McpLoadingManager): Router;
|
|
9
|
-
export declare function createBackendOAuthDashboardProvider(oauthProvider: SDKOAuthServerProvider & OAuthAuthorizationFlowProvider, loadingManager?: McpLoadingManager): () => ReturnType<OAuthAuthorizationFlow['getBackendOAuthDashboard']>;
|
|
8
|
+
export declare function createOAuthRoutes(oauthProvider: SDKOAuthServerProvider, loadingManager?: McpLoadingManager, oauthFlow?: OAuthAuthorizationFlow): Router;
|
|
9
|
+
export declare function createBackendOAuthDashboardProvider(oauthProvider: SDKOAuthServerProvider & OAuthAuthorizationFlowProvider, loadingManager?: McpLoadingManager, oauthFlow?: OAuthAuthorizationFlow): () => ReturnType<OAuthAuthorizationFlow['getBackendOAuthDashboard']>;
|
|
10
|
+
export declare function createBackendOAuthAuthorizationFlow(oauthProvider: SDKOAuthServerProvider & OAuthAuthorizationFlowProvider, loadingManager?: McpLoadingManager): OAuthAuthorizationFlow;
|
|
10
11
|
export default createOAuthRoutes;
|
|
11
12
|
//# sourceMappingURL=oauthRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAM3E,OAAO,EAAqC,MAAM,EAAE,MAAM,SAAS,CAAC;AAUpE;;GAEG;AACH,wBAAgB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"oauthRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAM3E,OAAO,EAAqC,MAAM,EAAE,MAAM,SAAS,CAAC;AAUpE;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,sBAAsB,EACrC,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,CAsJR;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,sBAAsB,GAAG,8BAA8B,EACtE,cAAc,CAAC,EAAE,iBAAiB,EAClC,SAAS,GAAE,sBAA2F,GACrG,MAAM,UAAU,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,CAAC,CAEtE;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,sBAAsB,GAAG,8BAA8B,EACtE,cAAc,CAAC,EAAE,iBAAiB,GACjC,sBAAsB,CAExB;AAuCD,eAAe,iBAAiB,CAAC"}
|
|
@@ -17,9 +17,8 @@ const consentBodySchema = z.object({
|
|
|
17
17
|
/**
|
|
18
18
|
* Creates OAuth routes with the provided OAuth provider
|
|
19
19
|
*/
|
|
20
|
-
export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
20
|
+
export function createOAuthRoutes(oauthProvider, loadingManager, oauthFlow = createBackendOAuthAuthorizationFlow(oauthProvider, loadingManager)) {
|
|
21
21
|
const router = Router();
|
|
22
|
-
const oauthFlow = getOAuthFlow(oauthProvider, loadingManager);
|
|
23
22
|
// Rate limiter for OAuth endpoints
|
|
24
23
|
const createOAuthLimiter = () => {
|
|
25
24
|
const serverConfig = AgentConfigManager.getInstance();
|
|
@@ -36,7 +35,7 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
36
35
|
* OAuth Dashboard - Shows all services and their OAuth status
|
|
37
36
|
*/
|
|
38
37
|
router.get('/', (_req, res) => {
|
|
39
|
-
res.redirect('/admin');
|
|
38
|
+
res.redirect('/admin/oauth');
|
|
40
39
|
});
|
|
41
40
|
/**
|
|
42
41
|
* Start OAuth authorization for a specific service
|
|
@@ -78,14 +77,14 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
78
77
|
if (result.status !== 'completed') {
|
|
79
78
|
logger.error(`OAuth callback failed for ${serverName}:`, result.errorDescription);
|
|
80
79
|
const errorCode = result.status === 'provider_error' ? result.errorDescription : result.status;
|
|
81
|
-
return res.redirect(`/oauth?error=${encodeURIComponent(errorCode)}`);
|
|
80
|
+
return res.redirect(`/admin/oauth?error=${encodeURIComponent(errorCode)}`);
|
|
82
81
|
}
|
|
83
82
|
// Redirect back to dashboard with success
|
|
84
|
-
res.redirect('/oauth?success=1');
|
|
83
|
+
res.redirect('/admin/oauth?success=1');
|
|
85
84
|
}
|
|
86
85
|
catch (error) {
|
|
87
86
|
logger.error(`Error handling OAuth callback for ${serverName}:`, error);
|
|
88
|
-
res.redirect(
|
|
87
|
+
res.redirect('/admin/oauth?error=callback_failed');
|
|
89
88
|
}
|
|
90
89
|
});
|
|
91
90
|
/**
|
|
@@ -153,8 +152,11 @@ export function createOAuthRoutes(oauthProvider, loadingManager) {
|
|
|
153
152
|
router.post('/consent', sensitiveOperationLimiter, consentHandler);
|
|
154
153
|
return router;
|
|
155
154
|
}
|
|
156
|
-
export function createBackendOAuthDashboardProvider(oauthProvider, loadingManager) {
|
|
157
|
-
return () =>
|
|
155
|
+
export function createBackendOAuthDashboardProvider(oauthProvider, loadingManager, oauthFlow = createBackendOAuthAuthorizationFlow(oauthProvider, loadingManager)) {
|
|
156
|
+
return () => oauthFlow.getBackendOAuthDashboard();
|
|
157
|
+
}
|
|
158
|
+
export function createBackendOAuthAuthorizationFlow(oauthProvider, loadingManager) {
|
|
159
|
+
return getOAuthFlow(oauthProvider, loadingManager);
|
|
158
160
|
}
|
|
159
161
|
function getOAuthFlow(oauthProvider, loadingManager) {
|
|
160
162
|
const agentConfig = AgentConfigManager.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,GAG1B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAElG,OAAO,EAAqC,MAAM,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACpC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC9D,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,UAAU,iBAAiB,
|
|
1
|
+
{"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toolRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AAyH5D,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CAyF/E;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,cAAc,CAyIzF"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { McpConfigManager } from '../../../config/mcpConfigManager.js';
|
|
2
2
|
import { CapabilityCatalog } from '../../../core/capabilities/capabilityCatalog.js';
|
|
3
|
+
import { createCapabilityVisibility, getCapabilityVisibleServerNames, } from '../../../core/capabilities/capabilityVisibility.js';
|
|
3
4
|
import { ToolRegistry } from '../../../core/capabilities/toolRegistry.js';
|
|
4
5
|
import { FilteringService } from '../../../core/filtering/filteringService.js';
|
|
5
6
|
import { ServerType } from '../../../core/server/adapters/types.js';
|
|
7
|
+
import { createConnectionResolver } from '../../../core/server/connectionResolver.js';
|
|
6
8
|
import { getDisabledToolError } from '../../../core/server/disabledTools.js';
|
|
7
9
|
import { ClientStatus } from '../../../core/types/client.js';
|
|
8
10
|
import logger from '../../../logger/logger.js';
|
|
@@ -11,19 +13,25 @@ import { buildFilterConfig, ensureRequestContextInitialized, parseTarget, resolv
|
|
|
11
13
|
function getServerConfigs() {
|
|
12
14
|
return McpConfigManager.getInstance().getTransportConfig();
|
|
13
15
|
}
|
|
14
|
-
function
|
|
16
|
+
function getCapabilityVisibilityFromRequest(serverManager, res, sessionId) {
|
|
15
17
|
const filterConfig = buildFilterConfig(res);
|
|
16
|
-
|
|
18
|
+
const hasFilterSelection = filterConfig.tagFilterMode !== 'none' || (filterConfig.tags !== undefined && filterConfig.tags.length > 0);
|
|
19
|
+
if (!hasFilterSelection && !sessionId) {
|
|
17
20
|
return undefined;
|
|
18
21
|
}
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
const getClients = serverManager.getClients;
|
|
23
|
+
if (typeof getClients !== 'function') {
|
|
24
|
+
return sessionId ? createCapabilityVisibility([], sessionId) : undefined;
|
|
25
|
+
}
|
|
26
|
+
const allConnections = getClients.call(serverManager);
|
|
27
|
+
const sessionScoped = createConnectionResolver(allConnections, getTemplateHashProvider(serverManager)).filterForSession(sessionId);
|
|
28
|
+
const filteredConnections = hasFilterSelection
|
|
29
|
+
? FilteringService.getFilteredConnections(sessionScoped, filterConfig)
|
|
30
|
+
: sessionScoped;
|
|
31
|
+
return createCapabilityVisibility(Array.from(filteredConnections.entries(), ([connectionKey, connection]) => {
|
|
32
|
+
const publicServerName = connection.name || connectionKey.split(':')[0];
|
|
33
|
+
return [connectionKey, publicServerName];
|
|
34
|
+
}), sessionId);
|
|
27
35
|
}
|
|
28
36
|
function getTemplateHashProvider(serverManager) {
|
|
29
37
|
return serverManager.getTemplateServerManager?.();
|
|
@@ -39,8 +47,7 @@ function getDisabledToolInvocationError(serverName, toolName) {
|
|
|
39
47
|
}
|
|
40
48
|
async function createFallbackCapabilityCatalog(serverManager) {
|
|
41
49
|
const clients = serverManager.getClients();
|
|
42
|
-
const
|
|
43
|
-
const serverTags = new Map();
|
|
50
|
+
const registryTools = [];
|
|
44
51
|
const degradedServers = [];
|
|
45
52
|
for (const [connectionKey, conn] of clients) {
|
|
46
53
|
if (conn.status !== ClientStatus.Connected)
|
|
@@ -48,11 +55,11 @@ async function createFallbackCapabilityCatalog(serverManager) {
|
|
|
48
55
|
try {
|
|
49
56
|
const logicalServerName = conn.name || (connectionKey.includes(':') ? connectionKey.split(':')[0] : connectionKey);
|
|
50
57
|
const result = await conn.client.listTools();
|
|
51
|
-
|
|
52
|
-
const tags = Array.isArray(
|
|
53
|
-
?
|
|
58
|
+
const transportTags = conn.transport?.tags;
|
|
59
|
+
const tags = Array.isArray(transportTags)
|
|
60
|
+
? transportTags.filter((tag) => typeof tag === 'string')
|
|
54
61
|
: [];
|
|
55
|
-
|
|
62
|
+
registryTools.push(...(result.tools ?? []).map((tool) => ({ tool, server: logicalServerName, connectionKey, tags })));
|
|
56
63
|
}
|
|
57
64
|
catch (err) {
|
|
58
65
|
logger.error(`Failed to list tools for ${connectionKey}:`, err);
|
|
@@ -60,7 +67,7 @@ async function createFallbackCapabilityCatalog(serverManager) {
|
|
|
60
67
|
}
|
|
61
68
|
}
|
|
62
69
|
const catalog = new CapabilityCatalog({
|
|
63
|
-
getToolRegistry: () => ToolRegistry.
|
|
70
|
+
getToolRegistry: () => ToolRegistry.fromToolsWithServer(registryTools),
|
|
64
71
|
schemaCache: {
|
|
65
72
|
getIfCached: () => null,
|
|
66
73
|
getOrLoad: async (_server, _toolName) => {
|
|
@@ -86,7 +93,7 @@ export function createToolsHandler(serverManager) {
|
|
|
86
93
|
const limitParam = typeof req.query.limit === 'string' ? parseInt(req.query.limit, 10) : undefined;
|
|
87
94
|
const limit = limitParam !== undefined && Number.isFinite(limitParam) && limitParam > 0 ? limitParam : undefined;
|
|
88
95
|
const requestSessionId = await initializeRequestContextForApi(serverManager, req, res);
|
|
89
|
-
const
|
|
96
|
+
const visibility = getCapabilityVisibilityFromRequest(serverManager, res, requestSessionId);
|
|
90
97
|
const lazyOrchestrator = serverManager.getLazyLoadingOrchestrator();
|
|
91
98
|
if (!lazyOrchestrator) {
|
|
92
99
|
const cursor = typeof req.query.cursor === 'string' ? req.query.cursor : undefined;
|
|
@@ -96,7 +103,7 @@ export function createToolsHandler(serverManager) {
|
|
|
96
103
|
pattern,
|
|
97
104
|
limit,
|
|
98
105
|
cursor,
|
|
99
|
-
},
|
|
106
|
+
}, visibility);
|
|
100
107
|
res.json({
|
|
101
108
|
tools: result.tools,
|
|
102
109
|
totalCount: result.totalCount,
|
|
@@ -121,7 +128,7 @@ export function createToolsHandler(serverManager) {
|
|
|
121
128
|
pattern,
|
|
122
129
|
limit,
|
|
123
130
|
cursor,
|
|
124
|
-
},
|
|
131
|
+
}, visibility);
|
|
125
132
|
if (catalogResult.tools.length > 0 || catalogResult.totalCount > 0) {
|
|
126
133
|
res.json({
|
|
127
134
|
tools: catalogResult.tools,
|
|
@@ -138,7 +145,7 @@ export function createToolsHandler(serverManager) {
|
|
|
138
145
|
pattern,
|
|
139
146
|
limit,
|
|
140
147
|
cursor,
|
|
141
|
-
},
|
|
148
|
+
}, visibility));
|
|
142
149
|
if (result.error) {
|
|
143
150
|
const status = result.error.type === 'validation' ? 400 : result.error.type === 'not_found' ? 404 : 500;
|
|
144
151
|
res.status(status).json({ error: result.error.message });
|
|
@@ -172,10 +179,13 @@ export function createToolInvocationsHandler(serverManager) {
|
|
|
172
179
|
res.status(400).json({ error: 'Invalid tool reference. Use "server/tool" format.' });
|
|
173
180
|
return;
|
|
174
181
|
}
|
|
175
|
-
const
|
|
182
|
+
const visibility = getCapabilityVisibilityFromRequest(serverManager, res, requestSessionId);
|
|
183
|
+
const visibleServerNames = visibility ? getCapabilityVisibleServerNames(visibility) : undefined;
|
|
184
|
+
const filterConfig = buildFilterConfig(res);
|
|
185
|
+
const hasFilterSelection = filterConfig.tagFilterMode !== 'none' || (filterConfig.tags !== undefined && filterConfig.tags.length > 0);
|
|
176
186
|
const lazyOrchestrator = serverManager.getLazyLoadingOrchestrator();
|
|
177
187
|
if (!lazyOrchestrator) {
|
|
178
|
-
if (
|
|
188
|
+
if (hasFilterSelection && visibleServerNames && !visibleServerNames.has(target.serverName)) {
|
|
179
189
|
res.status(404).json({ error: `Server not found: ${target.serverName}` });
|
|
180
190
|
return;
|
|
181
191
|
}
|
|
@@ -185,9 +195,7 @@ export function createToolInvocationsHandler(serverManager) {
|
|
|
185
195
|
return;
|
|
186
196
|
}
|
|
187
197
|
const allConnections = serverManager.getClients();
|
|
188
|
-
const filteredConnections =
|
|
189
|
-
? allConnections
|
|
190
|
-
: FilteringService.getFilteredConnections(allConnections, buildFilterConfig(res));
|
|
198
|
+
const filteredConnections = FilteringService.getFilteredConnections(allConnections, buildFilterConfig(res));
|
|
191
199
|
const serverRegistry = getServerRegistry(serverManager);
|
|
192
200
|
const sessionConnection = requestSessionId
|
|
193
201
|
? serverRegistry?.resolveConnection?.(target.serverName, { sessionId: requestSessionId })
|
|
@@ -214,7 +222,7 @@ export function createToolInvocationsHandler(serverManager) {
|
|
|
214
222
|
}
|
|
215
223
|
return;
|
|
216
224
|
}
|
|
217
|
-
if (!
|
|
225
|
+
if (!hasFilterSelection || !visibleServerNames || visibleServerNames.has(target.serverName)) {
|
|
218
226
|
const disabledToolError = getDisabledToolInvocationError(target.serverName, target.toolName);
|
|
219
227
|
if (disabledToolError) {
|
|
220
228
|
res.status(404).json({ error: disabledToolError });
|
|
@@ -229,7 +237,7 @@ export function createToolInvocationsHandler(serverManager) {
|
|
|
229
237
|
getServerConfigs,
|
|
230
238
|
templateHashProvider: getTemplateHashProvider(serverManager),
|
|
231
239
|
});
|
|
232
|
-
const catalogResult = await catalog.invokeVisibleTool({ server: target.serverName, toolName: target.toolName, args: toolArgs },
|
|
240
|
+
const catalogResult = await catalog.invokeVisibleTool({ server: target.serverName, toolName: target.toolName, args: toolArgs }, visibility);
|
|
233
241
|
if (!catalogResult.error) {
|
|
234
242
|
res.json({ result: catalogResult.result, server: catalogResult.server, tool: catalogResult.tool });
|
|
235
243
|
return;
|
|
@@ -243,7 +251,7 @@ export function createToolInvocationsHandler(serverManager) {
|
|
|
243
251
|
server: target.serverName,
|
|
244
252
|
toolName: target.toolName,
|
|
245
253
|
args: toolArgs,
|
|
246
|
-
},
|
|
254
|
+
}, visibility));
|
|
247
255
|
if (result.error) {
|
|
248
256
|
let status;
|
|
249
257
|
if (result.error.type === 'validation') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toolRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/toolRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/transport/http/server.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/transport/http/server.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAsMlE;;;;;;;;;;;;GAYG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,cAAc,CAAC,CAAoB;IAC3C,OAAO,CAAC,iBAAiB,CAAC,CAA2B;IACrD,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,2BAA2B,CAA8B;IACjE,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,SAAS,CAAC,CAA8B;IAEhD;;;;;;;;;;OAUG;gBAED,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,iBAAiB,EAClC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM;IAsCzB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,eAAe;IAwBvB;;;;;;;;;OASG;IACH,OAAO,CAAC,WAAW;IAyJnB;;;;;;;;OAQG;IACI,KAAK,IAAI,IAAI;IASpB;;;;;;;;OAQG;IACI,QAAQ,IAAI,IAAI;IAOvB,OAAO,CAAC,gCAAgC;CAoBzC"}
|
|
@@ -3,7 +3,7 @@ import path from 'path';
|
|
|
3
3
|
import { mcpAuthRouter } from '@modelcontextprotocol/sdk/server/auth/router.js';
|
|
4
4
|
import { SDKOAuthServerProvider } from '../../auth/sdkOAuthServerProvider.js';
|
|
5
5
|
import { FileStorageService } from '../../auth/storage/fileStorageService.js';
|
|
6
|
-
import { getAllServerTargets } from '../../commands/shared/baseConfigUtils.js';
|
|
6
|
+
import { getAllServerTargets, resolveServerTarget } from '../../commands/shared/baseConfigUtils.js';
|
|
7
7
|
import ConfigContext from '../../config/configContext.js';
|
|
8
8
|
import { McpConfigManager } from '../../config/mcpConfigManager.js';
|
|
9
9
|
import { getGlobalConfigDir, MCP_SERVER_VERSION, RATE_LIMIT_CONFIG, STORAGE_SUBDIRS } from '../../constants.js';
|
|
@@ -12,6 +12,8 @@ import { AgentConfigManager } from '../../core/server/agentConfig.js';
|
|
|
12
12
|
import { createAdminConnectivityChecker } from '../../domains/admin/adminConnectivityChecker.js';
|
|
13
13
|
import { createAdminDomain } from '../../domains/admin/adminDomain.js';
|
|
14
14
|
import { tryAcquireRuntimeScopeAdminLock, } from '../../domains/admin/runtimeScopeAdminLock.js';
|
|
15
|
+
import { RuntimeServerManagerBackendRestartService } from '../../domains/admin/runtimeServerManagerBackendRestartService.js';
|
|
16
|
+
import { getBackendLogBroker } from '../../domains/backend-logs/backendLogRuntime.js';
|
|
15
17
|
import { createConfigChangeService } from '../../domains/config-change/configChange.js';
|
|
16
18
|
import { PresetManager } from '../../domains/preset/manager/presetManager.js';
|
|
17
19
|
import logger from '../../logger/logger.js';
|
|
@@ -27,7 +29,7 @@ import { setupSecurityMiddleware } from './middlewares/securityMiddleware.js';
|
|
|
27
29
|
import { createAdminRoutes } from './routes/adminRoutes.js';
|
|
28
30
|
import { createApiRoutes, createCliTokenRoute, rejectBrowserOriginRequests } from './routes/apiRoutes.js';
|
|
29
31
|
import createHealthRoutes from './routes/healthRoutes.js';
|
|
30
|
-
import createOAuthRoutes, { createBackendOAuthDashboardProvider } from './routes/oauthRoutes.js';
|
|
32
|
+
import createOAuthRoutes, { createBackendOAuthAuthorizationFlow, createBackendOAuthDashboardProvider, } from './routes/oauthRoutes.js';
|
|
31
33
|
import { createRuntimeIdentityRoutes } from './routes/runtimeIdentityRoutes.js';
|
|
32
34
|
import { setupSseRoutes } from './routes/sseRoutes.js';
|
|
33
35
|
import { setupStreamableHttpRoutes } from './routes/streamableHttpRoutes.js';
|
|
@@ -197,7 +199,7 @@ export class ExpressServer {
|
|
|
197
199
|
this.app.set('trust proxy', this.configManager.get('trustProxy'));
|
|
198
200
|
// Initialize OAuth provider with custom session storage path if configured
|
|
199
201
|
const sessionStoragePath = this.configManager.get('auth').sessionStoragePath;
|
|
200
|
-
this.oauthProvider = new SDKOAuthServerProvider(sessionStoragePath);
|
|
202
|
+
this.oauthProvider = new SDKOAuthServerProvider(sessionStoragePath, this.runtimeIdentityService.getRuntimeScopeId());
|
|
201
203
|
// Initialize streamable session repository with 'transport' subdirectory
|
|
202
204
|
const fileStorageService = new FileStorageService(sessionStoragePath, STORAGE_SUBDIRS.TRANSPORT);
|
|
203
205
|
this.streamableSessionRepository = new StreamableSessionRepository(fileStorageService);
|
|
@@ -293,8 +295,9 @@ export class ExpressServer {
|
|
|
293
295
|
});
|
|
294
296
|
this.app.use(authRouter);
|
|
295
297
|
// Setup OAuth management routes (no auth required)
|
|
296
|
-
|
|
297
|
-
|
|
298
|
+
const oauthFlow = createBackendOAuthAuthorizationFlow(this.oauthProvider, this.loadingManager);
|
|
299
|
+
this.app.use('/oauth', createOAuthRoutes(this.oauthProvider, this.loadingManager, oauthFlow));
|
|
300
|
+
const getOAuthDashboard = createBackendOAuthDashboardProvider(this.oauthProvider, this.loadingManager, oauthFlow);
|
|
298
301
|
// Setup health check routes (no auth required for monitoring)
|
|
299
302
|
this.app.use('/health', createHealthRoutes(this.loadingManager));
|
|
300
303
|
const adminStorageDir = this.configManager.get('runtimeScopeStoragePath') ??
|
|
@@ -315,15 +318,23 @@ export class ExpressServer {
|
|
|
315
318
|
checkConnectivity: createAdminConnectivityChecker(),
|
|
316
319
|
presetManager: PresetManager.getInstance(path.dirname(adminConfigPath)),
|
|
317
320
|
readServerTargets: getAllServerTargets,
|
|
321
|
+
runtimeBackendRestartService: new RuntimeServerManagerBackendRestartService({
|
|
322
|
+
serverManager: this.serverManager,
|
|
323
|
+
resolveTarget: resolveServerTarget,
|
|
324
|
+
}),
|
|
325
|
+
oauthFlow,
|
|
318
326
|
});
|
|
319
327
|
const adminRoutes = createAdminRoutes({
|
|
320
328
|
adminEnabled,
|
|
321
329
|
adminService: adminDomain.adminService,
|
|
322
330
|
configuredServerService: adminDomain.configuredServerService,
|
|
323
331
|
presetService: adminDomain.presetService,
|
|
332
|
+
backendRestartService: adminDomain.backendRestartService,
|
|
333
|
+
oauthService: adminDomain.oauthService,
|
|
324
334
|
adminMutationAvailability,
|
|
325
335
|
getRuntimeIdentity,
|
|
326
336
|
getOAuthDashboard,
|
|
337
|
+
getBackendLogBroker,
|
|
327
338
|
});
|
|
328
339
|
if (adminRoutes) {
|
|
329
340
|
this.app.use('/admin', adminRoutes);
|