@1mcp/agent 0.39.0-beta.2 → 0.39.0-beta.4
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/admin/assets/{admin-OAuthServicesWorkspace-CKPMmDQI.js → admin-OAuthServicesWorkspace-CKR1HA-8.js} +1 -1
- package/build/admin/assets/{admin-console-CwgYre_s.js → admin-console-OfHKqRm-.js} +3 -3
- package/build/admin/index.html +1 -1
- package/build/application/services/healthService.js +3 -3
- package/build/application/services/healthService.js.map +1 -1
- package/build/application/services/tokenEstimationService.d.ts.map +1 -1
- package/build/application/services/tokenEstimationService.js +15 -13
- package/build/application/services/tokenEstimationService.js.map +1 -1
- package/build/auth/oauthAuthority.d.ts +149 -0
- package/build/auth/oauthAuthority.d.ts.map +1 -0
- package/build/auth/oauthAuthority.js +101 -0
- package/build/auth/oauthAuthority.js.map +1 -0
- package/build/auth/oauthAuthorizationFlow.d.ts +7 -1
- package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
- package/build/auth/oauthAuthorizationFlow.js +60 -74
- package/build/auth/oauthAuthorizationFlow.js.map +1 -1
- package/build/auth/oauthEndpointFetch.d.ts +20 -0
- package/build/auth/oauthEndpointFetch.d.ts.map +1 -0
- package/build/auth/oauthEndpointFetch.js +246 -0
- package/build/auth/oauthEndpointFetch.js.map +1 -0
- package/build/auth/sessionTypes.d.ts +1 -1
- package/build/auth/storage/authCodeRepository.js +2 -2
- package/build/auth/storage/authCodeRepository.js.map +1 -1
- package/build/auth/storage/authRequestRepository.js +2 -2
- package/build/auth/storage/authRequestRepository.js.map +1 -1
- package/build/auth/storage/clientDataRepository.js +2 -2
- package/build/auth/storage/clientDataRepository.js.map +1 -1
- package/build/auth/storage/clientSessionRepository.d.ts +19 -0
- package/build/auth/storage/clientSessionRepository.d.ts.map +1 -1
- package/build/auth/storage/clientSessionRepository.js +179 -1
- package/build/auth/storage/clientSessionRepository.js.map +1 -1
- package/build/auth/storage/fileStorageService.d.ts +9 -1
- package/build/auth/storage/fileStorageService.d.ts.map +1 -1
- package/build/auth/storage/fileStorageService.js +82 -51
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/auth/storage/inboundOAuthStorage.d.ts +14 -0
- package/build/auth/storage/inboundOAuthStorage.d.ts.map +1 -0
- package/build/auth/storage/inboundOAuthStorage.js +29 -0
- package/build/auth/storage/inboundOAuthStorage.js.map +1 -0
- package/build/auth/storage/nativeCredentialStore.d.ts +44 -0
- package/build/auth/storage/nativeCredentialStore.d.ts.map +1 -0
- package/build/auth/storage/nativeCredentialStore.js +177 -0
- package/build/auth/storage/nativeCredentialStore.js.map +1 -0
- package/build/auth/storage/oauthStorageService.d.ts +8 -1
- package/build/auth/storage/oauthStorageService.d.ts.map +1 -1
- package/build/auth/storage/oauthStorageService.js +69 -49
- package/build/auth/storage/oauthStorageService.js.map +1 -1
- package/build/auth/storage/protectedRecordStorage.d.ts +129 -0
- package/build/auth/storage/protectedRecordStorage.d.ts.map +1 -0
- package/build/auth/storage/protectedRecordStorage.js +1139 -0
- package/build/auth/storage/protectedRecordStorage.js.map +1 -0
- package/build/auth/storage/sessionRepository.d.ts.map +1 -1
- package/build/auth/storage/sessionRepository.js +13 -3
- package/build/auth/storage/sessionRepository.js.map +1 -1
- package/build/auth/storage/upstreamOAuthStorage.d.ts +15 -0
- package/build/auth/storage/upstreamOAuthStorage.d.ts.map +1 -0
- package/build/auth/storage/upstreamOAuthStorage.js +25 -0
- package/build/auth/storage/upstreamOAuthStorage.js.map +1 -0
- package/build/auth/storage/upstreamOAuthStoragePath.d.ts +3 -0
- package/build/auth/storage/upstreamOAuthStoragePath.d.ts.map +1 -0
- package/build/auth/storage/upstreamOAuthStoragePath.js +8 -0
- package/build/auth/storage/upstreamOAuthStoragePath.js.map +1 -0
- package/build/cli.d.ts +4 -0
- package/build/cli.d.ts.map +1 -0
- package/build/cli.js +133 -0
- package/build/cli.js.map +1 -0
- package/build/commands/auth/exportOAuthCredentials.d.ts +9 -0
- package/build/commands/auth/exportOAuthCredentials.d.ts.map +1 -0
- package/build/commands/auth/exportOAuthCredentials.js +71 -0
- package/build/commands/auth/exportOAuthCredentials.js.map +1 -0
- package/build/commands/auth/exportUpstreamCredentials.d.ts +5 -0
- package/build/commands/auth/exportUpstreamCredentials.d.ts.map +1 -0
- package/build/commands/auth/exportUpstreamCredentials.js +6 -0
- package/build/commands/auth/exportUpstreamCredentials.js.map +1 -0
- package/build/commands/auth/index.d.ts.map +1 -1
- package/build/commands/auth/index.js +23 -1
- package/build/commands/auth/index.js.map +1 -1
- package/build/commands/cliSetup/setupFiles.js +1 -1
- package/build/commands/cliSetup/setupFiles.js.map +1 -1
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -1
- package/build/commands/inspect/inspectUtils.js +2 -3
- package/build/commands/inspect/inspectUtils.js.map +1 -1
- package/build/commands/mcp/install.js +7 -7
- package/build/commands/mcp/install.js.map +1 -1
- package/build/commands/mcp/installSource.js +2 -2
- package/build/commands/mcp/installSource.js.map +1 -1
- package/build/commands/mcp/tokens.js +6 -6
- package/build/commands/mcp/tokens.js.map +1 -1
- package/build/commands/mcp/uninstall.js +4 -4
- package/build/commands/mcp/uninstall.js.map +1 -1
- package/build/commands/mcp/utils/installWizard.js +2 -2
- package/build/commands/mcp/utils/installWizard.js.map +1 -1
- package/build/commands/mcp/utils/mcpServerConfig.js +5 -5
- package/build/commands/mcp/utils/mcpServerConfig.js.map +1 -1
- package/build/commands/mcp/utils/serverUtils.js +4 -4
- package/build/commands/mcp/utils/serverUtils.js.map +1 -1
- package/build/commands/mcp/wizard/search.js +1 -1
- package/build/commands/mcp/wizard/search.js.map +1 -1
- package/build/commands/preset/create.js +1 -1
- package/build/commands/preset/create.js.map +1 -1
- package/build/commands/preset/delete.js +1 -1
- package/build/commands/preset/delete.js.map +1 -1
- package/build/commands/preset/edit.js +1 -1
- package/build/commands/preset/edit.js.map +1 -1
- package/build/commands/preset/interactive.js +1 -1
- package/build/commands/preset/interactive.js.map +1 -1
- package/build/commands/preset/list.js +1 -1
- package/build/commands/preset/list.js.map +1 -1
- package/build/commands/preset/show.js +1 -1
- package/build/commands/preset/show.js.map +1 -1
- package/build/commands/preset/test.js +1 -1
- package/build/commands/preset/test.js.map +1 -1
- package/build/commands/preset/url.js +1 -1
- package/build/commands/preset/url.js.map +1 -1
- package/build/commands/proxy/proxy.js +13 -13
- package/build/commands/proxy/proxy.js.map +1 -1
- package/build/commands/registry/search.js +2 -2
- package/build/commands/registry/search.js.map +1 -1
- package/build/commands/registry/show.d.ts.map +1 -1
- package/build/commands/registry/show.js +2 -2
- package/build/commands/registry/show.js.map +1 -1
- package/build/commands/registry/status.js +2 -2
- package/build/commands/registry/status.js.map +1 -1
- package/build/commands/registry/versions.js +2 -2
- package/build/commands/registry/versions.js.map +1 -1
- package/build/commands/run/run.js +3 -3
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/run/runUtils.js +2 -2
- package/build/commands/run/runUtils.js.map +1 -1
- package/build/commands/serve/cooperativeRuntime.d.ts.map +1 -1
- package/build/commands/serve/cooperativeRuntime.js +24 -20
- package/build/commands/serve/cooperativeRuntime.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 +5 -0
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +5 -5
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/serve/serveLifecycleError.d.ts +16 -0
- package/build/commands/serve/serveLifecycleError.d.ts.map +1 -0
- package/build/commands/serve/serveLifecycleError.js +31 -0
- package/build/commands/serve/serveLifecycleError.js.map +1 -0
- package/build/commands/serve/serveOptions.d.ts.map +1 -1
- package/build/commands/serve/serveOptions.js +14 -18
- package/build/commands/serve/serveOptions.js.map +1 -1
- package/build/commands/serve/serveStop.js +5 -5
- package/build/commands/serve/serveStop.js.map +1 -1
- package/build/commands/shared/authProfileStore.d.ts.map +1 -1
- package/build/commands/shared/authProfileStore.js +4 -2
- package/build/commands/shared/authProfileStore.js.map +1 -1
- package/build/commands/shared/baseConfigUtils.d.ts.map +1 -1
- package/build/commands/shared/baseConfigUtils.js +12 -12
- package/build/commands/shared/baseConfigUtils.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.js +4 -2
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
- package/build/commands/shared/configParsingUtils.js +1 -1
- package/build/commands/shared/configParsingUtils.js.map +1 -1
- package/build/commands/shared/connectionHelper.d.ts.map +1 -1
- package/build/commands/shared/connectionHelper.js +17 -18
- package/build/commands/shared/connectionHelper.js.map +1 -1
- package/build/commands/shared/inspectApiSchemas.d.ts +20 -20
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +38 -38
- package/build/config/configLoader.js.map +1 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +65 -26
- package/build/config/configManager.js.map +1 -1
- package/build/config/configWatcher.d.ts.map +1 -1
- package/build/config/configWatcher.js +15 -18
- package/build/config/configWatcher.js.map +1 -1
- package/build/config/envProcessor.d.ts.map +1 -1
- package/build/config/envProcessor.js +9 -9
- package/build/config/envProcessor.js.map +1 -1
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +24 -28
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/config/projectConfigLoader.d.ts.map +1 -1
- package/build/config/projectConfigLoader.js +14 -11
- package/build/config/projectConfigLoader.js.map +1 -1
- package/build/config/templateProcessor.d.ts.map +1 -1
- package/build/config/templateProcessor.js +5 -5
- package/build/config/templateProcessor.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.js +67 -38
- package/build/core/capabilities/asyncLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts +3 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js +9 -2
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +24 -1
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +412 -41
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityManager.js +8 -8
- package/build/core/capabilities/capabilityManager.js.map +1 -1
- package/build/core/capabilities/capabilityPagination.d.ts +34 -1
- package/build/core/capabilities/capabilityPagination.d.ts.map +1 -1
- package/build/core/capabilities/capabilityPagination.js +238 -31
- package/build/core/capabilities/capabilityPagination.js.map +1 -1
- package/build/core/capabilities/capabilityVisibility.d.ts +13 -1
- package/build/core/capabilities/capabilityVisibility.d.ts.map +1 -1
- package/build/core/capabilities/capabilityVisibility.js +24 -1
- package/build/core/capabilities/capabilityVisibility.js.map +1 -1
- package/build/core/capabilities/catalogGeneration.d.ts.map +1 -1
- package/build/core/capabilities/catalogGeneration.js +20 -1
- package/build/core/capabilities/catalogGeneration.js.map +1 -1
- package/build/core/capabilities/configuredToolSnapshot.d.ts +1 -0
- package/build/core/capabilities/configuredToolSnapshot.d.ts.map +1 -1
- package/build/core/capabilities/configuredToolSnapshot.js +30 -4
- package/build/core/capabilities/configuredToolSnapshot.js.map +1 -1
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts.map +1 -1
- package/build/core/capabilities/internalCapabilitiesProvider.js +6 -14
- package/build/core/capabilities/internalCapabilitiesProvider.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +2 -0
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +37 -31
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +3 -1
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +45 -13
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts +18 -3
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.js +181 -17
- package/build/core/capabilities/runtimeCapabilityCatalog.js.map +1 -1
- package/build/core/capabilities/schemaCache.d.ts.map +1 -1
- package/build/core/capabilities/schemaCache.js +53 -15
- package/build/core/capabilities/schemaCache.js.map +1 -1
- package/build/core/capabilities/schemas/metaToolSchemas.d.ts +4 -3
- package/build/core/capabilities/schemas/metaToolSchemas.d.ts.map +1 -1
- package/build/core/capabilities/schemas/metaToolSchemas.js +1 -0
- package/build/core/capabilities/schemas/metaToolSchemas.js.map +1 -1
- package/build/core/capabilities/toolRegistry.d.ts +7 -3
- package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
- package/build/core/capabilities/toolRegistry.js +34 -19
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/client/postAuthOAuthRecovery.d.ts.map +1 -1
- package/build/core/client/postAuthOAuthRecovery.js +5 -3
- package/build/core/client/postAuthOAuthRecovery.js.map +1 -1
- package/build/core/configChangeHandler.d.ts.map +1 -1
- package/build/core/configChangeHandler.js +44 -65
- package/build/core/configChangeHandler.js.map +1 -1
- package/build/core/context/globalContextManager.d.ts.map +1 -1
- package/build/core/context/globalContextManager.js +6 -6
- package/build/core/context/globalContextManager.js.map +1 -1
- package/build/core/filtering/clientFiltering.d.ts.map +1 -1
- package/build/core/filtering/clientFiltering.js +16 -67
- package/build/core/filtering/clientFiltering.js.map +1 -1
- package/build/core/filtering/clientTemplateTracker.d.ts.map +1 -1
- package/build/core/filtering/clientTemplateTracker.js +13 -41
- package/build/core/filtering/clientTemplateTracker.js.map +1 -1
- package/build/core/filtering/filterCache.d.ts.map +1 -1
- package/build/core/filtering/filterCache.js +13 -32
- package/build/core/filtering/filterCache.js.map +1 -1
- package/build/core/filtering/filteringService.d.ts.map +1 -1
- package/build/core/filtering/filteringService.js +22 -80
- package/build/core/filtering/filteringService.js.map +1 -1
- package/build/core/filtering/templateFilteringService.d.ts.map +1 -1
- package/build/core/filtering/templateFilteringService.js +25 -89
- package/build/core/filtering/templateFilteringService.js.map +1 -1
- package/build/core/filtering/templateIndex.d.ts.map +1 -1
- package/build/core/filtering/templateIndex.js +11 -23
- package/build/core/filtering/templateIndex.js.map +1 -1
- package/build/core/flags/flagManager.d.ts.map +1 -1
- package/build/core/flags/flagManager.js +2 -5
- package/build/core/flags/flagManager.js.map +1 -1
- package/build/core/instructions/instructionAggregator.d.ts.map +1 -1
- package/build/core/instructions/instructionAggregator.js +18 -36
- package/build/core/instructions/instructionAggregator.js.map +1 -1
- package/build/core/instructions/templateTypes.d.ts +1 -1
- package/build/core/instructions/templateTypes.d.ts.map +1 -1
- package/build/core/instructions/templateTypes.js +3 -3
- package/build/core/loading/loadingStateTracker.d.ts.map +1 -1
- package/build/core/loading/loadingStateTracker.js +17 -9
- package/build/core/loading/loadingStateTracker.js.map +1 -1
- package/build/core/loading/mcpLoadingManager.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.js +33 -30
- package/build/core/loading/mcpLoadingManager.js.map +1 -1
- package/build/core/loading/parallelExecutor.d.ts.map +1 -1
- package/build/core/loading/parallelExecutor.js +1 -4
- package/build/core/loading/parallelExecutor.js.map +1 -1
- package/build/core/notifications/notificationManager.js +11 -11
- package/build/core/notifications/notificationManager.js.map +1 -1
- package/build/core/protocol/requestHandlerUtils.d.ts +2 -2
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.js +7 -4
- package/build/core/protocol/requestHandlerUtils.js.map +1 -1
- package/build/core/server/adapters/TemplateServerAdapter.js +3 -3
- package/build/core/server/adapters/TemplateServerAdapter.js.map +1 -1
- package/build/core/server/agentConfig.d.ts +1 -0
- package/build/core/server/agentConfig.d.ts.map +1 -1
- package/build/core/server/agentConfig.js +1 -0
- package/build/core/server/agentConfig.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +7 -13
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/server/disabledTools.d.ts +1 -1
- package/build/core/server/disabledTools.d.ts.map +1 -1
- package/build/core/server/disabledTools.js +18 -25
- package/build/core/server/disabledTools.js.map +1 -1
- package/build/core/server/pidFileManager.js +6 -6
- package/build/core/server/pidFileManager.js.map +1 -1
- package/build/core/server/processIdentity.d.ts.map +1 -1
- package/build/core/server/processIdentity.js +67 -18
- package/build/core/server/processIdentity.js.map +1 -1
- package/build/core/server/runtimeLaunchIpc.d.ts +15 -2
- package/build/core/server/runtimeLaunchIpc.d.ts.map +1 -1
- package/build/core/server/runtimeLifecycle.js +2 -2
- package/build/core/server/runtimeLifecycle.js.map +1 -1
- package/build/core/server/runtimeReplacementConfig.d.ts +15 -2
- package/build/core/server/runtimeReplacementConfig.d.ts.map +1 -1
- package/build/core/server/runtimeScopeOwnership.js +1 -1
- package/build/core/server/runtimeScopeOwnership.js.map +1 -1
- package/build/core/server/templateConfigurationManager.js +16 -15
- package/build/core/server/templateConfigurationManager.js.map +1 -1
- package/build/core/server/toolDescriptionOverrides.d.ts +1 -0
- package/build/core/server/toolDescriptionOverrides.d.ts.map +1 -1
- package/build/core/server/toolDescriptionOverrides.js +30 -5
- package/build/core/server/toolDescriptionOverrides.js.map +1 -1
- package/build/core/tools/handlers/registryHandler.d.ts.map +1 -1
- package/build/core/tools/handlers/registryHandler.js +2 -6
- package/build/core/tools/handlers/registryHandler.js.map +1 -1
- package/build/core/tools/handlers/searchHandler.js +2 -2
- package/build/core/tools/handlers/searchHandler.js.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +21 -0
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.js +11 -20
- package/build/core/tools/handlers/serverManagementHandler.js.map +1 -1
- package/build/core/tools/handlers/showHandler.js +2 -2
- package/build/core/tools/handlers/showHandler.js.map +1 -1
- package/build/core/tools/handlers/versionsHandler.js +2 -2
- package/build/core/tools/handlers/versionsHandler.js.map +1 -1
- package/build/core/tools/internal/adapters/discoveryAdapter.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/discoveryAdapter.js +12 -29
- package/build/core/tools/internal/adapters/discoveryAdapter.js.map +1 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +3 -0
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/installation/directInstallation.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/installation/directInstallation.js +4 -6
- package/build/core/tools/internal/adapters/installation/directInstallation.js.map +1 -1
- package/build/core/tools/internal/adapters/installation/packageResolver.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/installation/packageResolver.js +8 -14
- package/build/core/tools/internal/adapters/installation/packageResolver.js.map +1 -1
- package/build/core/tools/internal/adapters/installationAdapter.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/installationAdapter.js +38 -35
- package/build/core/tools/internal/adapters/installationAdapter.js.map +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.js +22 -28
- package/build/core/tools/internal/adapters/management/managementAdapter.js.map +1 -1
- package/build/core/tools/internal/adapters/management/toolHandlers.js +10 -10
- package/build/core/tools/internal/adapters/management/toolHandlers.js.map +1 -1
- package/build/core/tools/internal/adapters/management/validation.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/management/validation.js +6 -3
- package/build/core/tools/internal/adapters/management/validation.js.map +1 -1
- package/build/core/tools/internal/discoveryHandlers.d.ts.map +1 -1
- package/build/core/tools/internal/discoveryHandlers.js +10 -25
- package/build/core/tools/internal/discoveryHandlers.js.map +1 -1
- package/build/core/tools/internal/index.js +3 -3
- package/build/core/tools/internal/index.js.map +1 -1
- package/build/core/tools/internal/installationHandlers.d.ts.map +1 -1
- package/build/core/tools/internal/installationHandlers.js +9 -27
- package/build/core/tools/internal/installationHandlers.js.map +1 -1
- package/build/core/tools/internal/managementHandlers.d.ts.map +1 -1
- package/build/core/tools/internal/managementHandlers.js +10 -25
- package/build/core/tools/internal/managementHandlers.js.map +1 -1
- package/build/core/tools/internal/schemas/discovery.d.ts +1 -1
- package/build/core/tools/internal/schemas/index.d.ts +7 -7
- package/build/core/tools/internal/schemas/installation.d.ts +1 -1
- package/build/core/tools/internal/schemas/management.d.ts +5 -5
- package/build/core/types/transport.d.ts +26 -3
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +12 -0
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/configuredToolInventory.d.ts.map +1 -1
- package/build/domains/admin/configuredToolInventory.js +47 -9
- package/build/domains/admin/configuredToolInventory.js.map +1 -1
- package/build/domains/admin/runtimeConfiguredToolInspectionService.d.ts.map +1 -1
- package/build/domains/admin/runtimeConfiguredToolInspectionService.js +13 -3
- package/build/domains/admin/runtimeConfiguredToolInspectionService.js.map +1 -1
- package/build/domains/admin/runtimeScopeAdminLock.js +2 -3
- package/build/domains/admin/runtimeScopeAdminLock.js.map +1 -1
- package/build/domains/backend-logs/backendLogBroker.d.ts +2 -0
- package/build/domains/backend-logs/backendLogBroker.d.ts.map +1 -1
- package/build/domains/backend-logs/backendLogBroker.js +7 -0
- package/build/domains/backend-logs/backendLogBroker.js.map +1 -1
- package/build/domains/backend-logs/backendLogProjection.d.ts.map +1 -1
- package/build/domains/backend-logs/backendLogProjection.js +2 -13
- package/build/domains/backend-logs/backendLogProjection.js.map +1 -1
- package/build/domains/config-change/configChange.js +3 -3
- package/build/domains/config-change/configChange.js.map +1 -1
- package/build/domains/preset/manager/presetManager.d.ts.map +1 -1
- package/build/domains/preset/manager/presetManager.js +29 -66
- package/build/domains/preset/manager/presetManager.js.map +1 -1
- package/build/domains/preset/manager/presetManagerCleanup.js +8 -8
- package/build/domains/preset/manager/presetManagerCleanup.js.map +1 -1
- package/build/domains/preset/manager/presetTesting.js +1 -7
- package/build/domains/preset/manager/presetTesting.js.map +1 -1
- package/build/domains/preset/services/presetNotificationService.d.ts.map +1 -1
- package/build/domains/preset/services/presetNotificationService.js +15 -32
- package/build/domains/preset/services/presetNotificationService.js.map +1 -1
- package/build/domains/registry/cacheManager.d.ts.map +1 -1
- package/build/domains/registry/cacheManager.js +5 -6
- package/build/domains/registry/cacheManager.js.map +1 -1
- package/build/domains/registry/mcpRegistryClient.js +11 -11
- package/build/domains/registry/mcpRegistryClient.js.map +1 -1
- package/build/domains/server-management/progressTrackingService.d.ts.map +1 -1
- package/build/domains/server-management/progressTrackingService.js +7 -10
- package/build/domains/server-management/progressTrackingService.js.map +1 -1
- package/build/domains/server-management/serverInstallationService.d.ts.map +1 -1
- package/build/domains/server-management/serverInstallationService.js +14 -12
- package/build/domains/server-management/serverInstallationService.js.map +1 -1
- package/build/gateway/adapters/legacy/legacyInboundEraAdapter.d.ts.map +1 -1
- package/build/gateway/adapters/legacy/legacyInboundEraAdapter.js +2 -1
- package/build/gateway/adapters/legacy/legacyInboundEraAdapter.js.map +1 -1
- package/build/gateway/adapters/legacy/legacyOutboundEraAdapter.d.ts +4 -1
- package/build/gateway/adapters/legacy/legacyOutboundEraAdapter.d.ts.map +1 -1
- package/build/gateway/adapters/legacy/legacyOutboundEraAdapter.js +4 -1
- package/build/gateway/adapters/legacy/legacyOutboundEraAdapter.js.map +1 -1
- package/build/gateway/adapters/modern/modernInboundEraAdapter.d.ts.map +1 -1
- package/build/gateway/adapters/modern/modernInboundEraAdapter.js +5 -4
- package/build/gateway/adapters/modern/modernInboundEraAdapter.js.map +1 -1
- package/build/gateway/adapters/modern/modernOutboundEraAdapter.d.ts.map +1 -1
- package/build/gateway/adapters/modern/modernOutboundEraAdapter.js +18 -5
- package/build/gateway/adapters/modern/modernOutboundEraAdapter.js.map +1 -1
- package/build/gateway/contracts/gatewayFailure.d.ts +39 -1
- package/build/gateway/contracts/gatewayFailure.d.ts.map +1 -1
- package/build/gateway/contracts/gatewayFailure.js +139 -0
- package/build/gateway/contracts/gatewayFailure.js.map +1 -1
- package/build/gateway/contracts/gatewayRequest.d.ts +6 -6
- package/build/gateway/contracts/immutableJson.d.ts +2 -1
- package/build/gateway/contracts/immutableJson.d.ts.map +1 -1
- package/build/gateway/contracts/immutableJson.js +2 -2
- package/build/gateway/contracts/immutableJson.js.map +1 -1
- package/build/gateway/core/gatewayDispatcher.js +1 -1
- package/build/gateway/core/gatewayDispatcher.js.map +1 -1
- package/build/gateway/interactions/interactionBroker.d.ts.map +1 -1
- package/build/gateway/interactions/interactionBroker.js +5 -3
- package/build/gateway/interactions/interactionBroker.js.map +1 -1
- package/build/gateway/interactions/nativeInputResponses.d.ts +16 -0
- package/build/gateway/interactions/nativeInputResponses.d.ts.map +1 -0
- package/build/gateway/interactions/nativeInputResponses.js +76 -0
- package/build/gateway/interactions/nativeInputResponses.js.map +1 -0
- package/build/gateway/interactions/validateInteractionResponse.d.ts.map +1 -1
- package/build/gateway/interactions/validateInteractionResponse.js +20 -1
- package/build/gateway/interactions/validateInteractionResponse.js.map +1 -1
- package/build/gateway/ports/outboundEraAdapter.d.ts +5 -0
- package/build/gateway/ports/outboundEraAdapter.d.ts.map +1 -1
- package/build/index.d.ts +1 -3
- package/build/index.d.ts.map +1 -1
- package/build/index.js +7 -131
- package/build/index.js.map +1 -1
- package/build/logger/backgroundSupervisorLogger.d.ts +4 -0
- package/build/logger/backgroundSupervisorLogger.d.ts.map +1 -0
- package/build/logger/backgroundSupervisorLogger.js +21 -0
- package/build/logger/backgroundSupervisorLogger.js.map +1 -0
- package/build/logger/diagnosticRedaction.d.ts +3 -0
- package/build/logger/diagnosticRedaction.d.ts.map +1 -0
- package/build/logger/diagnosticRedaction.js +12 -0
- package/build/logger/diagnosticRedaction.js.map +1 -0
- package/build/logger/httpDiagnostics.d.ts +25 -0
- package/build/logger/httpDiagnostics.d.ts.map +1 -0
- package/build/logger/httpDiagnostics.js +125 -0
- package/build/logger/httpDiagnostics.js.map +1 -0
- package/build/logger/localDiagnosticRecord.d.ts +11 -0
- package/build/logger/localDiagnosticRecord.d.ts.map +1 -0
- package/build/logger/localDiagnosticRecord.js +9 -0
- package/build/logger/localDiagnosticRecord.js.map +1 -0
- package/build/logger/localDiagnostics.d.ts +5 -0
- package/build/logger/localDiagnostics.d.ts.map +1 -0
- package/build/logger/localDiagnostics.js +116 -0
- package/build/logger/localDiagnostics.js.map +1 -0
- package/build/logger/logger.d.ts +39 -37
- package/build/logger/logger.d.ts.map +1 -1
- package/build/logger/logger.js +120 -154
- package/build/logger/logger.js.map +1 -1
- package/build/logger/secureLogger.d.ts +3 -9
- package/build/logger/secureLogger.d.ts.map +1 -1
- package/build/logger/secureLogger.js +4 -30
- package/build/logger/secureLogger.js.map +1 -1
- package/build/observability/events/normalize.d.ts +14 -0
- package/build/observability/events/normalize.d.ts.map +1 -0
- package/build/observability/events/normalize.js +39 -0
- package/build/observability/events/normalize.js.map +1 -0
- package/build/observability/events/registry.d.ts +5697 -0
- package/build/observability/events/registry.d.ts.map +1 -0
- package/build/observability/events/registry.js +5674 -0
- package/build/observability/events/registry.js.map +1 -0
- package/build/observability/privacy/fields.d.ts +25 -0
- package/build/observability/privacy/fields.d.ts.map +1 -0
- package/build/observability/privacy/fields.js +195 -0
- package/build/observability/privacy/fields.js.map +1 -0
- package/build/observability/tracing/bootstrap.d.ts +3 -0
- package/build/observability/tracing/bootstrap.d.ts.map +1 -0
- package/build/observability/tracing/bootstrap.js +6 -0
- package/build/observability/tracing/bootstrap.js.map +1 -0
- package/build/observability/tracing/context.d.ts +4 -0
- package/build/observability/tracing/context.d.ts.map +1 -0
- package/build/observability/tracing/context.js +3 -0
- package/build/observability/tracing/context.js.map +1 -0
- package/build/observability/tracing/otelAdapter.d.ts +17 -0
- package/build/observability/tracing/otelAdapter.d.ts.map +1 -0
- package/build/observability/tracing/otelAdapter.js +160 -0
- package/build/observability/tracing/otelAdapter.js.map +1 -0
- package/build/sdk/contracts/catalogCoverageInvalidation.d.ts +4 -0
- package/build/sdk/contracts/catalogCoverageInvalidation.d.ts.map +1 -0
- package/build/sdk/contracts/catalogCoverageInvalidation.js +13 -0
- package/build/sdk/contracts/catalogCoverageInvalidation.js.map +1 -0
- package/build/sdk/contracts/jsonValue.d.ts +30 -7
- package/build/sdk/contracts/jsonValue.d.ts.map +1 -1
- package/build/sdk/contracts/jsonValue.js +37 -9
- package/build/sdk/contracts/jsonValue.js.map +1 -1
- package/build/sdk/contracts/mcpParamHeaders.d.ts +17 -0
- package/build/sdk/contracts/mcpParamHeaders.d.ts.map +1 -0
- package/build/sdk/contracts/mcpParamHeaders.js +134 -0
- package/build/sdk/contracts/mcpParamHeaders.js.map +1 -0
- package/build/sdk/contracts/requestProgress.d.ts +29 -0
- package/build/sdk/contracts/requestProgress.d.ts.map +1 -0
- package/build/sdk/contracts/requestProgress.js +126 -0
- package/build/sdk/contracts/requestProgress.js.map +1 -0
- package/build/sdk/legacy/auth/sdkOAuthClientProvider.d.ts +77 -84
- package/build/sdk/legacy/auth/sdkOAuthClientProvider.d.ts.map +1 -1
- package/build/sdk/legacy/auth/sdkOAuthClientProvider.js +632 -209
- package/build/sdk/legacy/auth/sdkOAuthClientProvider.js.map +1 -1
- package/build/sdk/legacy/auth/sdkOAuthServerProvider.d.ts.map +1 -1
- package/build/sdk/legacy/auth/sdkOAuthServerProvider.js +42 -37
- package/build/sdk/legacy/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/sdk/legacy/client/runtime/clientManager.d.ts +5 -1
- package/build/sdk/legacy/client/runtime/clientManager.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/clientManager.js +247 -93
- package/build/sdk/legacy/client/runtime/clientManager.js.map +1 -1
- package/build/sdk/legacy/client/runtime/connectionHandler.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/connectionHandler.js +77 -15
- package/build/sdk/legacy/client/runtime/connectionHandler.js.map +1 -1
- package/build/sdk/legacy/client/runtime/legacyInteractionLease.d.ts +2 -1
- package/build/sdk/legacy/client/runtime/legacyInteractionLease.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/legacyInteractionLease.js +11 -2
- package/build/sdk/legacy/client/runtime/legacyInteractionLease.js.map +1 -1
- package/build/sdk/legacy/client/runtime/legacySdkClientAdapter.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/legacySdkClientAdapter.js +40 -12
- package/build/sdk/legacy/client/runtime/legacySdkClientAdapter.js.map +1 -1
- package/build/sdk/legacy/client/runtime/mcpParamHeaders.d.ts +2 -0
- package/build/sdk/legacy/client/runtime/mcpParamHeaders.d.ts.map +1 -0
- package/build/sdk/legacy/client/runtime/mcpParamHeaders.js +2 -0
- package/build/sdk/legacy/client/runtime/mcpParamHeaders.js.map +1 -0
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.d.ts +6 -0
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.js +119 -6
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.js.map +1 -1
- package/build/sdk/legacy/client/runtime/oauthFlowHandler.d.ts +1 -1
- package/build/sdk/legacy/client/runtime/oauthFlowHandler.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/oauthFlowHandler.js +73 -21
- package/build/sdk/legacy/client/runtime/oauthFlowHandler.js.map +1 -1
- package/build/sdk/legacy/client/runtime/serveClient.js +1 -1
- package/build/sdk/legacy/client/runtime/serveClient.js.map +1 -1
- package/build/sdk/legacy/commands/serve.d.ts +1 -0
- package/build/sdk/legacy/commands/serve.d.ts.map +1 -1
- package/build/sdk/legacy/commands/serve.js +99 -88
- package/build/sdk/legacy/commands/serve.js.map +1 -1
- package/build/sdk/legacy/server/protocol/notificationHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/notificationHandlers.js +9 -14
- package/build/sdk/legacy/server/protocol/notificationHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/privateInteractionConnection.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/privateInteractionConnection.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/privateInteractionConnection.js +31 -11
- package/build/sdk/legacy/server/protocol/privateInteractionConnection.js.map +1 -1
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.js +10 -5
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/requestHandlers.js +4 -4
- package/build/sdk/legacy/server/protocol/requestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/requestInteractionScope.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/requestInteractionScope.js +68 -12
- package/build/sdk/legacy/server/protocol/requestInteractionScope.js.map +1 -1
- package/build/sdk/legacy/server/protocol/requestProviderProgress.d.ts +8 -0
- package/build/sdk/legacy/server/protocol/requestProviderProgress.d.ts.map +1 -0
- package/build/sdk/legacy/server/protocol/requestProviderProgress.js +29 -0
- package/build/sdk/legacy/server/protocol/requestProviderProgress.js.map +1 -0
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js +23 -2
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/resourceSubscriptions.js +1 -1
- package/build/sdk/legacy/server/protocol/resourceSubscriptions.js.map +1 -1
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.js +157 -62
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/retained-sdk/LICENSE +21 -0
- package/build/sdk/legacy/server/retained-sdk/provenance.json +17 -0
- package/build/sdk/legacy/server/retained-sdk/streamableHttp.js +160 -0
- package/build/sdk/legacy/server/retained-sdk/webStandardStreamableHttp.js +950 -0
- package/build/sdk/legacy/server/runtime/clientInstancePool.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/clientInstancePool.js +45 -76
- package/build/sdk/legacy/server/runtime/clientInstancePool.js.map +1 -1
- package/build/sdk/legacy/server/runtime/connectionManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/connectionManager.js +25 -18
- package/build/sdk/legacy/server/runtime/connectionManager.js.map +1 -1
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.d.ts +2 -0
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.js +17 -1
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.js.map +1 -1
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.js +17 -32
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.js.map +1 -1
- package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.js +33 -42
- package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.js.map +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.js +26 -32
- package/build/sdk/legacy/server/runtime/serverManager.js.map +1 -1
- package/build/sdk/legacy/server/runtime/templateServerCleanup.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/templateServerCleanup.js +15 -43
- package/build/sdk/legacy/server/runtime/templateServerCleanup.js.map +1 -1
- package/build/sdk/legacy/server/runtime/templateServerManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/templateServerManager.js +37 -38
- package/build/sdk/legacy/server/runtime/templateServerManager.js.map +1 -1
- package/build/sdk/legacy/server/streamableHttp.js +1 -1
- package/build/sdk/legacy/shared/capabilityListCapture.d.ts +2 -2
- package/build/sdk/legacy/shared/capabilityListCapture.d.ts.map +1 -1
- package/build/sdk/legacy/shared/capabilityListCapture.js +3 -3
- package/build/sdk/legacy/shared/capabilityListCapture.js.map +1 -1
- package/build/sdk/legacy/shared/resourceTemplateRouting.d.ts.map +1 -1
- package/build/sdk/legacy/shared/resourceTemplateRouting.js +29 -11
- package/build/sdk/legacy/shared/resourceTemplateRouting.js.map +1 -1
- package/build/sdk/legacy/shared/schemaProjection.d.ts +3 -1
- package/build/sdk/legacy/shared/schemaProjection.d.ts.map +1 -1
- package/build/sdk/legacy/shared/schemaProjection.js +7 -2
- package/build/sdk/legacy/shared/schemaProjection.js.map +1 -1
- package/build/sdk/legacy/transport/http/loggingSseTransport.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/loggingSseTransport.js +2 -11
- package/build/sdk/legacy/transport/http/loggingSseTransport.js.map +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js +13 -2
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js.map +1 -1
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.d.ts +4 -0
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js +14 -2
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js.map +1 -1
- package/build/sdk/legacy/transport/http/routes/sseRoutes.js +5 -5
- package/build/sdk/legacy/transport/http/routes/sseRoutes.js.map +1 -1
- package/build/sdk/legacy/transport/http/server.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/server.js +20 -7
- package/build/sdk/legacy/transport/http/server.js.map +1 -1
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.js +28 -45
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.js.map +1 -1
- package/build/sdk/legacy/transport/restartableStdioTransport.d.ts.map +1 -1
- package/build/sdk/legacy/transport/restartableStdioTransport.js +8 -11
- package/build/sdk/legacy/transport/restartableStdioTransport.js.map +1 -1
- package/build/sdk/legacy/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/sdk/legacy/transport/stdioProxyTransport.js +28 -36
- package/build/sdk/legacy/transport/stdioProxyTransport.js.map +1 -1
- package/build/sdk/legacy/transport/transportFactory.d.ts +1 -1
- package/build/sdk/legacy/transport/transportFactory.d.ts.map +1 -1
- package/build/sdk/legacy/transport/transportFactory.js +53 -40
- package/build/sdk/legacy/transport/transportFactory.js.map +1 -1
- package/build/server.d.ts.map +1 -1
- package/build/server.js +19 -24
- package/build/server.js.map +1 -1
- package/build/transport/http/middlewares/errorHandler.js +1 -1
- package/build/transport/http/middlewares/errorHandler.js.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.d.ts +4 -14
- package/build/transport/http/middlewares/httpRequestLogger.d.ts.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.js +134 -40
- package/build/transport/http/middlewares/httpRequestLogger.js.map +1 -1
- package/build/transport/http/middlewares/mcpAvailabilityMiddleware.d.ts.map +1 -1
- package/build/transport/http/middlewares/mcpAvailabilityMiddleware.js +8 -20
- package/build/transport/http/middlewares/mcpAvailabilityMiddleware.js.map +1 -1
- package/build/transport/http/middlewares/securityMiddleware.d.ts.map +1 -1
- package/build/transport/http/middlewares/securityMiddleware.js +7 -38
- package/build/transport/http/middlewares/securityMiddleware.js.map +1 -1
- package/build/transport/http/middlewares/tagsExtractor.js +2 -2
- 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 +2 -1
- package/build/transport/http/routes/cliTokenRoute.js.map +1 -1
- package/build/transport/http/routes/healthRoutes.d.ts +11 -1
- package/build/transport/http/routes/healthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/healthRoutes.js +12 -8
- package/build/transport/http/routes/healthRoutes.js.map +1 -1
- package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -1
- package/build/transport/http/routes/inspectHelpers.js +4 -3
- package/build/transport/http/routes/inspectHelpers.js.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +3 -3
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/instructionsRoutes.js +1 -1
- package/build/transport/http/routes/instructionsRoutes.js.map +1 -1
- package/build/transport/http/routes/modernHttpRoutes.d.ts +4 -0
- package/build/transport/http/routes/modernHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/modernHttpRoutes.js +169 -24
- package/build/transport/http/routes/modernHttpRoutes.js.map +1 -1
- package/build/transport/http/routes/modernInteractionBinding.d.ts +2 -1
- package/build/transport/http/routes/modernInteractionBinding.d.ts.map +1 -1
- package/build/transport/http/routes/modernInteractionBinding.js +7 -4
- package/build/transport/http/routes/modernInteractionBinding.js.map +1 -1
- package/build/transport/http/routes/modernToolHeaderRegistry.d.ts +16 -0
- package/build/transport/http/routes/modernToolHeaderRegistry.d.ts.map +1 -0
- package/build/transport/http/routes/modernToolHeaderRegistry.js +161 -0
- package/build/transport/http/routes/modernToolHeaderRegistry.js.map +1 -0
- package/build/transport/http/routes/oauthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/oauthRoutes.js +12 -9
- package/build/transport/http/routes/oauthRoutes.js.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.js +11 -21
- 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 +25 -9
- package/build/transport/http/routes/toolRoutes.js.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.d.ts.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.js +21 -36
- package/build/transport/http/storage/streamableSessionRepository.js.map +1 -1
- package/build/transport/http/utils/contextExtractor.d.ts.map +1 -1
- package/build/transport/http/utils/contextExtractor.js +6 -6
- package/build/transport/http/utils/contextExtractor.js.map +1 -1
- package/build/transport/http/utils/httpErrorHandler.d.ts +1 -1
- package/build/transport/http/utils/httpErrorHandler.d.ts.map +1 -1
- package/build/transport/http/utils/httpErrorHandler.js +5 -19
- package/build/transport/http/utils/httpErrorHandler.js.map +1 -1
- package/build/transport/http/utils/templateContextAuthority.d.ts.map +1 -1
- package/build/transport/http/utils/templateContextAuthority.js +6 -21
- package/build/transport/http/utils/templateContextAuthority.js.map +1 -1
- package/build/transport/http/utils/unifiedLogger.d.ts +10 -50
- package/build/transport/http/utils/unifiedLogger.d.ts.map +1 -1
- package/build/transport/http/utils/unifiedLogger.js +9 -77
- package/build/transport/http/utils/unifiedLogger.js.map +1 -1
- package/build/transport/managedStdioStderr.d.ts.map +1 -1
- package/build/transport/managedStdioStderr.js +2 -6
- package/build/transport/managedStdioStderr.js.map +1 -1
- package/build/utils/core/errorHandling.js +1 -1
- package/build/utils/core/errorHandling.js.map +1 -1
- package/build/utils/core/operationExecution.js +2 -2
- package/build/utils/core/operationExecution.js.map +1 -1
- package/build/utils/core/parsing.d.ts +2 -0
- package/build/utils/core/parsing.d.ts.map +1 -1
- package/build/utils/core/parsing.js +19 -0
- package/build/utils/core/parsing.js.map +1 -1
- package/build/utils/core/resourceUris.d.ts +6 -0
- package/build/utils/core/resourceUris.d.ts.map +1 -0
- package/build/utils/core/resourceUris.js +104 -0
- package/build/utils/core/resourceUris.js.map +1 -0
- package/build/utils/core/toolNames.d.ts +8 -0
- package/build/utils/core/toolNames.d.ts.map +1 -0
- package/build/utils/core/toolNames.js +56 -0
- package/build/utils/core/toolNames.js.map +1 -0
- package/build/utils/filePermissions.d.ts.map +1 -1
- package/build/utils/filePermissions.js +6 -6
- package/build/utils/filePermissions.js.map +1 -1
- package/build/utils/ui/interactiveSelector.js +1 -1
- package/build/utils/ui/interactiveSelector.js.map +1 -1
- package/build/utils/ui/urlGenerator.d.ts.map +1 -1
- package/build/utils/ui/urlGenerator.js +6 -10
- package/build/utils/ui/urlGenerator.js.map +1 -1
- package/build/utils/validation/scopeValidation.d.ts.map +1 -1
- package/build/utils/validation/scopeValidation.js +4 -12
- package/build/utils/validation/scopeValidation.js.map +1 -1
- package/build/utils/validation/urlDetection.js +4 -4
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +70 -61
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { UriTemplate } from '@modelcontextprotocol/sdk/shared/uriTemplate.js';
|
|
2
|
+
import { ResourceRouteNotFoundError } from '../../../gateway/contracts/gatewayFailure.js';
|
|
3
|
+
import { isValidResourceUri } from '../../../utils/core/resourceUris.js';
|
|
2
4
|
/** Derive only the namespace owned by this exact catalog template, never by parsing a display name. */
|
|
3
5
|
function catalogPrefix(entry) {
|
|
4
6
|
const upstreamTemplate = entry.route.upstreamIdentity.trim();
|
|
@@ -7,9 +9,14 @@ function catalogPrefix(entry) {
|
|
|
7
9
|
: undefined;
|
|
8
10
|
}
|
|
9
11
|
export function resolveResourceRoute(snapshot, identity) {
|
|
12
|
+
if (!isValidResourceUri(identity))
|
|
13
|
+
throw new Error('Invalid resource URI');
|
|
10
14
|
const exact = snapshot.resolve('resources', identity);
|
|
11
|
-
if (exact?.connection)
|
|
15
|
+
if (exact?.connection) {
|
|
16
|
+
if (!isValidResourceUri(exact.entry.route.upstreamIdentity))
|
|
17
|
+
throw new Error('Invalid upstream resource URI');
|
|
12
18
|
return { entry: exact.entry, connection: exact.connection, upstreamIdentity: exact.entry.route.upstreamIdentity };
|
|
19
|
+
}
|
|
13
20
|
const matches = [];
|
|
14
21
|
for (const entry of snapshot.generation.entries) {
|
|
15
22
|
if (entry.route.kind !== 'resourceTemplates')
|
|
@@ -25,19 +32,27 @@ export function resolveResourceRoute(snapshot, identity) {
|
|
|
25
32
|
continue;
|
|
26
33
|
}
|
|
27
34
|
const prefix = catalogPrefix(entry);
|
|
28
|
-
if (matched
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
if (!matched || prefix === undefined || !identity.startsWith(prefix))
|
|
36
|
+
continue;
|
|
37
|
+
const upstreamIdentity = identity.slice(prefix.length);
|
|
38
|
+
if (!isValidResourceUri(upstreamIdentity))
|
|
39
|
+
continue;
|
|
40
|
+
matches.push({
|
|
41
|
+
entry,
|
|
42
|
+
connection,
|
|
43
|
+
// The full template selected the route; its owned namespace is removed without decoding URI bytes.
|
|
44
|
+
upstreamIdentity,
|
|
45
|
+
});
|
|
35
46
|
}
|
|
47
|
+
if (matches.length === 0)
|
|
48
|
+
throw new ResourceRouteNotFoundError(identity);
|
|
36
49
|
if (matches.length !== 1)
|
|
37
|
-
throw new Error(
|
|
50
|
+
throw new Error(`Ambiguous resource: ${identity}`);
|
|
38
51
|
return matches[0];
|
|
39
52
|
}
|
|
40
53
|
export function projectResourceUri(snapshot, connectionKey, upstreamIdentity) {
|
|
54
|
+
if (!isValidResourceUri(upstreamIdentity))
|
|
55
|
+
throw new Error('Invalid upstream resource URI');
|
|
41
56
|
const matches = [];
|
|
42
57
|
for (const entry of snapshot.generation.entries) {
|
|
43
58
|
if (entry.route.connectionKey !== connectionKey)
|
|
@@ -49,8 +64,11 @@ export function projectResourceUri(snapshot, connectionKey, upstreamIdentity) {
|
|
|
49
64
|
try {
|
|
50
65
|
if (new UriTemplate(entry.route.upstreamIdentity).match(upstreamIdentity)) {
|
|
51
66
|
const prefix = catalogPrefix(entry);
|
|
52
|
-
if (prefix !== undefined)
|
|
53
|
-
|
|
67
|
+
if (prefix !== undefined) {
|
|
68
|
+
const publicIdentity = `${prefix}${upstreamIdentity}`;
|
|
69
|
+
if (isValidResourceUri(publicIdentity))
|
|
70
|
+
matches.push(publicIdentity);
|
|
71
|
+
}
|
|
54
72
|
}
|
|
55
73
|
}
|
|
56
74
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceTemplateRouting.js","sourceRoot":"","sources":["../../../../src/sdk/legacy/shared/resourceTemplateRouting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"resourceTemplateRouting.js","sourceRoot":"","sources":["../../../../src/sdk/legacy/shared/resourceTemplateRouting.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { type JsonObject } from '../../contracts/index.js';
|
|
1
|
+
import { type JsonObject, type JsonValue } from '../../contracts/index.js';
|
|
2
2
|
import type { Server as LegacyServer } from '../server/index.js';
|
|
3
3
|
export declare function projectLegacyTools(result: JsonObject): JsonObject;
|
|
4
|
+
/** One tool as {@link projectLegacyTools} sends it. */
|
|
5
|
+
export declare function projectLegacyTool(tool: unknown): JsonValue;
|
|
4
6
|
export declare function projectLegacyToolResult(result: unknown, outputSchema?: Readonly<Record<string, unknown>>): JsonObject;
|
|
5
7
|
export declare function projectCanonicalToolResult(result: unknown, outputSchema?: Readonly<Record<string, unknown>>): JsonObject;
|
|
6
8
|
/** Only the trusted modern bridge may avoid v1's object-only result-shape wrapper.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaProjection.d.ts","sourceRoot":"","sources":["../../../../src/sdk/legacy/shared/schemaProjection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"schemaProjection.d.ts","sourceRoot":"","sources":["../../../../src/sdk/legacy/shared/schemaProjection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAA2C,MAAM,6BAA6B,CAAC;AACvH,OAAO,KAAK,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAc9E,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAEjE;AACD,uDAAuD;AACvD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,CAG1D;AACD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,UAAU,CAKrH;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,OAAO,EACf,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC/C,UAAU,CAOZ;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAEpG;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAS/D"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Server, specTypeSchemas } from '@modelcontextprotocol/server';
|
|
2
2
|
import { SchemaBoundaryError } from '../../../core/validation/schemaPolicy.js';
|
|
3
|
-
import { toJsonValue } from '../../contracts/index.js';
|
|
3
|
+
import { RESPONSE_JSON_VALUE_LIMITS, toJsonValue } from '../../contracts/index.js';
|
|
4
4
|
import { Protocol } from './protocol.js';
|
|
5
5
|
/** Pinned v2 codec owns reversible wrapping and reference rebasing. No copied codec algorithm. */
|
|
6
6
|
class LegacySchemaCodec extends Server {
|
|
@@ -8,7 +8,7 @@ class LegacySchemaCodec extends Server {
|
|
|
8
8
|
super({ name: '1mcp-schema-projection', version: '1' }, { capabilities: { tools: {} } });
|
|
9
9
|
}
|
|
10
10
|
projectTools(result) {
|
|
11
|
-
return toJsonValue(this._wireCodec().encodeResult('tools/list', result));
|
|
11
|
+
return toJsonValue(this._wireCodec().encodeResult('tools/list', result), RESPONSE_JSON_VALUE_LIMITS);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
// An unconnected v2 Server explicitly uses its legacy codec until negotiation.
|
|
@@ -16,6 +16,11 @@ const codec = new LegacySchemaCodec();
|
|
|
16
16
|
export function projectLegacyTools(result) {
|
|
17
17
|
return codec.projectTools(result);
|
|
18
18
|
}
|
|
19
|
+
/** One tool as {@link projectLegacyTools} sends it. */
|
|
20
|
+
export function projectLegacyTool(tool) {
|
|
21
|
+
const projected = codec.projectTools({ tools: [toJsonValue(tool, RESPONSE_JSON_VALUE_LIMITS)] });
|
|
22
|
+
return projected.tools[0];
|
|
23
|
+
}
|
|
19
24
|
export function projectLegacyToolResult(result, outputSchema) {
|
|
20
25
|
assertCanonicalToolResult(result);
|
|
21
26
|
return toJsonValue(codec.projectCallToolResult(result, outputSchema));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaProjection.js","sourceRoot":"","sources":["../../../../src/sdk/legacy/shared/schemaProjection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"schemaProjection.js","sourceRoot":"","sources":["../../../../src/sdk/legacy/shared/schemaProjection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAmC,0BAA0B,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEvH,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,kGAAkG;AAClG,MAAM,iBAAkB,SAAQ,MAAM;IACpC;QACE,KAAK,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3F,CAAC;IACD,YAAY,CAAC,MAAkB;QAC7B,OAAO,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,0BAA0B,CAAe,CAAC;IACrH,CAAC;CACF;AACD,+EAA+E;AAC/E,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAE,CAAC;AACtC,MAAM,UAAU,kBAAkB,CAAC,MAAkB;IACnD,OAAO,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AACD,uDAAuD;AACvD,MAAM,UAAU,iBAAiB,CAAC,IAAa;IAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAAC;IACjG,OAAQ,SAAS,CAAC,KAAqB,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AACD,MAAM,UAAU,uBAAuB,CAAC,MAAe,EAAE,YAAgD;IACvG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,WAAW,CAChB,KAAK,CAAC,qBAAqB,CAAC,MAAwD,EAAE,YAAY,CAAC,CACtF,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAAe,EACf,YAAgD;IAEhD,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAe,CAAC;IACpD,MAAM,SAAS,GAAG,uBAAuB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACnE,OAAO;QACL,GAAG,SAAS;QACZ,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,SAAS,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7G,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAoB;IAC/D,OAAO,QAAQ,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAsC,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAAe;IACvD,IACE,CAAC,MAAM;QACP,OAAO,MAAM,KAAK,QAAQ;QAC1B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACrB,CAAC,YAAY,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC;QAC5D,eAAe,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,SAAS;QAEhH,MAAM,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggingSseTransport.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/loggingSseTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D;;;;GAIG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;gBACnD,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc;IAIlC,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"loggingSseTransport.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/loggingSseTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D;;;;GAIG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;gBACnD,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc;IAIlC,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqB5D"}
|
|
@@ -17,17 +17,8 @@ export class LoggingSSEServerTransport extends SSEServerTransport {
|
|
|
17
17
|
const isErrorLoggingEnabled = agentConfig.isJsonRpcErrorLoggingEnabled();
|
|
18
18
|
if (isErrorLoggingEnabled) {
|
|
19
19
|
try {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const safeErrorData = rawErrorData === null || ['string', 'number', 'boolean'].includes(typeof rawErrorData)
|
|
23
|
-
? rawErrorData
|
|
24
|
-
: undefined;
|
|
25
|
-
logJsonRpc('warn', 'JSON-RPC error response', {
|
|
26
|
-
jsonrpcVersion: message.jsonrpc,
|
|
27
|
-
requestId: message.id,
|
|
28
|
-
errorCode: message.error.code,
|
|
29
|
-
errorMessage: message.error.message,
|
|
30
|
-
errorData: safeErrorData,
|
|
20
|
+
logJsonRpc('error', 'loggingSseTransport.json.rpc.error.response.6ba80f1a', {
|
|
21
|
+
requestId: typeof message.id === 'string' ? message.id : undefined,
|
|
31
22
|
sessionId: this.sessionId,
|
|
32
23
|
});
|
|
33
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggingSseTransport.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/loggingSseTransport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE;;;;GAIG;AACH,MAAM,OAAO,yBAA0B,SAAQ,kBAAkB;IAC/D,YAAY,QAAgB,EAAE,GAAmB;QAC/C,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,OAAuB;QACzC,gDAAgD;QAChD,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5D,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;YACrD,MAAM,qBAAqB,GAAG,WAAW,CAAC,4BAA4B,EAAE,CAAC;YAEzE,IAAI,qBAAqB,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,
|
|
1
|
+
{"version":3,"file":"loggingSseTransport.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/loggingSseTransport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE;;;;GAIG;AACH,MAAM,OAAO,yBAA0B,SAAQ,kBAAkB;IAC/D,YAAY,QAAgB,EAAE,GAAmB;QAC/C,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,OAAuB;QACzC,gDAAgD;QAChD,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5D,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;YACrD,MAAM,qBAAqB,GAAG,WAAW,CAAC,4BAA4B,EAAE,CAAC;YAEzE,IAAI,qBAAqB,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,UAAU,CAAC,OAAO,EAAE,sDAAsD,EAAE;wBAC1E,SAAS,EAAE,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;wBAClE,SAAS,EAAE,IAAI,CAAC,SAAS;qBAC1B,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,SAAS,EAAE,CAAC;oBACnB,qDAAqD;gBACvD,CAAC;YACH,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAuthMiddleware.d.ts","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAEL,+BAA+B,EAChC,MAAM,wDAAwD,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,WAAW,CAAC;SACpB;QAED,UAAU,QAAQ;YAChB,MAAM,EAAE,cAAc,CAAC;SACxB;KACF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC7D,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,sBAAsB;IACtB,aAAa,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC7D,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,6BAA6B;IAC7B,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAM3C,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,CAAC,EAAE,sBAAsB,UAK9D,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"scopeAuthMiddleware.d.ts","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAEL,+BAA+B,EAChC,MAAM,wDAAwD,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,WAAW,CAAC;SACpB;QAED,UAAU,QAAQ;YAChB,MAAM,EAAE,cAAc,CAAC;SACxB;KACF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC7D,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,sBAAsB;IACtB,aAAa,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC7D,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,6BAA6B;IAC7B,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAM3C,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,CAAC,EAAE,sBAAsB,UAK9D,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,CA+IlE;AA6CD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,EAAE,CAaxD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS,CAOzE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAW5F;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAO/D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAG/D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAoB/D;+BAxRiB,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI;AA2RnE,wBAA2C"}
|
|
@@ -42,10 +42,13 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
const provider = oauthProvider || new SDKOAuthServerProvider();
|
|
45
|
+
// Match the canonical resource advertised by mcpAuthRouter, never a request Host header.
|
|
46
|
+
const expectedResource = new URL(AgentConfigManager.getInstance().getUrl()).href;
|
|
47
|
+
const resourceMetadataUrl = `${AgentConfigManager.getInstance().getUrl()}/.well-known/oauth-protected-resource`;
|
|
45
48
|
// Create the SDK's bearer auth middleware
|
|
46
49
|
const bearerAuthMiddleware = requireBearerAuth({
|
|
47
50
|
verifier: provider,
|
|
48
|
-
resourceMetadataUrl
|
|
51
|
+
resourceMetadataUrl,
|
|
49
52
|
});
|
|
50
53
|
// Return a combined middleware that does both auth and scope validation
|
|
51
54
|
return async (req, res, next) => {
|
|
@@ -64,6 +67,12 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
64
67
|
if (!authInfo) {
|
|
65
68
|
throw new Error('Authentication succeeded but req.auth is undefined');
|
|
66
69
|
}
|
|
70
|
+
// The retained v1 middleware verifies the opaque token but has no audience option.
|
|
71
|
+
if (authInfo.resource?.href !== expectedResource) {
|
|
72
|
+
res.set('WWW-Authenticate', `Bearer error="invalid_token", resource_metadata="${resourceMetadataUrl}"`);
|
|
73
|
+
res.status(401).json({ error: 'invalid_token', error_description: 'Token was not issued for this resource' });
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
67
76
|
// Type-safe access to authInfo properties
|
|
68
77
|
const grantedScopes = authInfo.scopes ? [...authInfo.scopes] : [];
|
|
69
78
|
const grantedTags = scopesToTags(grantedScopes);
|
|
@@ -109,6 +118,8 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
109
118
|
const admittedExpires = authInfo.expiresAt;
|
|
110
119
|
const revalidate = async () => {
|
|
111
120
|
const current = await provider.verifyAccessToken(token);
|
|
121
|
+
if (current.resource?.href !== expectedResource)
|
|
122
|
+
return false;
|
|
112
123
|
// The native provider exposes the session repository's millisecond expiry.
|
|
113
124
|
return (typeof current.expiresAt === 'number' &&
|
|
114
125
|
Number.isFinite(current.expiresAt) &&
|
|
@@ -134,7 +145,7 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
134
145
|
next();
|
|
135
146
|
}
|
|
136
147
|
catch (error) {
|
|
137
|
-
logger.error('
|
|
148
|
+
logger.error('scopeAuthMiddleware.scope.auth.middleware.error.8db4aa86', { error: error });
|
|
138
149
|
res.status(500).json({
|
|
139
150
|
error: 'server_error',
|
|
140
151
|
error_description: 'Internal server error',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAuthMiddleware.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,GAChC,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAkDhH,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAE3C,SAAS,eAAe,CAAC,QAAgB,EAAE,MAAgB;IACzD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5G,CAAC;AAED,sGAAsG;AACtG,MAAM,UAAU,kBAAkB,CAAC,IAA0B;IAC3D,OAAO,+BAA+B,CAAC,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,yBAAyB,CAAC,aAAsC;IAC9E,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;IAEtD,oEAAoE;IACpE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,eAAe,EAAE,CAAC;QAClD,OAAO,CAAC,IAAa,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;YAChE,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;YACzD,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAED,sEAAsE;IACtE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;QACvC,OAAO,CAAC,IAAa,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;YAChE,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;YACzD,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,IAAI,IAAI,sBAAsB,EAAE,CAAC;IAE/D,
|
|
1
|
+
{"version":3,"file":"scopeAuthMiddleware.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { type CatalogCursorOwner } from '../../../../core/capabilities/capabilityCatalog.js';
|
|
2
|
+
import { type ResourceRouteOwner } from '../../../../core/capabilities/capabilityVisibility.js';
|
|
1
3
|
import type { ServerManager } from '../../../../core/server/serverManager.js';
|
|
2
4
|
import type { InboundConnectionConfig } from '../../../../core/types/index.js';
|
|
3
5
|
import { LegacyOutboundEraAdapter } from '../../../../gateway/adapters/legacy/legacyOutboundEraAdapter.js';
|
|
@@ -15,6 +17,8 @@ export interface ModernInboundLegacyBridge {
|
|
|
15
17
|
* aggregate legacy server. SDK-v1 objects stay inside the legacy island.
|
|
16
18
|
*/
|
|
17
19
|
export declare function createModernInboundLegacyBridge(serverManager: ServerManager, config: InboundConnectionConfig, options?: {
|
|
20
|
+
readonly resourceOwner?: ResourceRouteOwner;
|
|
21
|
+
readonly catalogCursorOwner?: CatalogCursorOwner;
|
|
18
22
|
readonly subscriptionSignal?: AbortSignal;
|
|
19
23
|
readonly subscriptionListKinds?: readonly ('tools' | 'resources' | 'prompts')[];
|
|
20
24
|
readonly subscriptionNotification?: (notification: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modernInboundLegacyBridge.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"modernInboundLegacyBridge.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAC9G,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGjH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0DAA0D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAqB1F,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;IAC5C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CACnD,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,EAC/B,OAAO,GAAE;IACP,QAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IAC5C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACjD,QAAQ,CAAC,kBAAkB,CAAC,EAAE,WAAW,CAAC;IAC1C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IAChF,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,YAAY,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IACjH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC;IAC3G,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACrF,GACL,OAAO,CAAC,yBAAyB,CAAC,CAkHpC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
|
|
3
|
+
import { bindCatalogCursorOwner } from '../../../../core/capabilities/capabilityCatalog.js';
|
|
4
|
+
import { bindResourceRouteOwner } from '../../../../core/capabilities/capabilityVisibility.js';
|
|
3
5
|
import { FilteringService } from '../../../../core/filtering/filteringService.js';
|
|
4
6
|
import { filterConnectionsForSession } from '../../../../core/protocol/requestHandlerUtils.js';
|
|
5
7
|
import { LegacyOutboundEraAdapter } from '../../../../gateway/adapters/legacy/legacyOutboundEraAdapter.js';
|
|
6
|
-
import { toJsonValue } from '../../../contracts/index.js';
|
|
8
|
+
import { RESPONSE_JSON_VALUE_LIMITS, toJsonValue } from '../../../contracts/index.js';
|
|
7
9
|
import { Client } from '../../client/index.js';
|
|
8
10
|
import { LegacySdkClientAdapter } from '../../client/runtime/legacySdkClientAdapter.js';
|
|
9
11
|
import { applyModernCatalogCoverage, ensureModernSubscriptionCoverage, } from '../../client/runtime/modernSubscriptions.js';
|
|
@@ -61,6 +63,15 @@ export async function createModernInboundLegacyBridge(serverManager, config, opt
|
|
|
61
63
|
try {
|
|
62
64
|
await Promise.all(connecting);
|
|
63
65
|
options.subscriptionSignal?.throwIfAborted();
|
|
66
|
+
if (options.resourceOwner || options.catalogCursorOwner) {
|
|
67
|
+
const context = serverManager.getServer(connectionId)?.context;
|
|
68
|
+
if (!context)
|
|
69
|
+
throw new Error('Private catalog context is unavailable');
|
|
70
|
+
if (options.resourceOwner)
|
|
71
|
+
bindResourceRouteOwner(context, options.resourceOwner);
|
|
72
|
+
if (options.catalogCursorOwner)
|
|
73
|
+
bindCatalogCursorOwner(context, options.catalogCursorOwner);
|
|
74
|
+
}
|
|
64
75
|
// This private inbound session owns the threshold; no shared upstream logging/setLevel is sent.
|
|
65
76
|
if (options.logLevel !== undefined)
|
|
66
77
|
await client.setLoggingLevel(options.logLevel);
|
|
@@ -98,7 +109,8 @@ export async function createModernInboundLegacyBridge(serverManager, config, opt
|
|
|
98
109
|
await client.subscribeResource({ uri }, { signal });
|
|
99
110
|
},
|
|
100
111
|
prepareSubscriptions: async () => ({ ...acceptedCatalogFilter }),
|
|
101
|
-
|
|
112
|
+
// Results come from this gateway's own handlers, so they are assembled responses.
|
|
113
|
+
outbound: new LegacyOutboundEraAdapter(legacy, { era: 'legacy', revision: LEGACY_REVISION }, { resultLimits: RESPONSE_JSON_VALUE_LIMITS }),
|
|
102
114
|
close: () => (closePromise ??= Promise.resolve()
|
|
103
115
|
.then(() => {
|
|
104
116
|
options.subscriptionSignal?.removeEventListener('abort', abortSubscription);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modernInboundLegacyBridge.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAGxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,0DAA0D,CAAC;AAGpG,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"modernInboundLegacyBridge.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/modernInboundLegacyBridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export function setupSseRoutes(router, serverManager, authMiddleware, availabili
|
|
|
35
35
|
const inboundConnection = serverManager.getServer(transport.sessionId);
|
|
36
36
|
if (inboundConnection) {
|
|
37
37
|
asyncOrchestrator.initializeNotifications(inboundConnection);
|
|
38
|
-
logger.debug(
|
|
38
|
+
logger.debug('sseRoutes.async.loading.notifications.initialized.for.sse.session.2bbc6561');
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
// Set up heartbeat to detect disconnected clients
|
|
@@ -46,7 +46,7 @@ export function setupSseRoutes(router, serverManager, authMiddleware, availabili
|
|
|
46
46
|
}
|
|
47
47
|
catch (_error) {
|
|
48
48
|
// If write fails, the connection is likely broken
|
|
49
|
-
logger.debug(
|
|
49
|
+
logger.debug('sseRoutes.sse.heartbeat.failed.for.session.closing.connection.e0165d88', { error: _error });
|
|
50
50
|
clearInterval(heartbeatInterval);
|
|
51
51
|
serverManager.disconnectTransport(transport.sessionId);
|
|
52
52
|
}
|
|
@@ -58,12 +58,12 @@ export function setupSseRoutes(router, serverManager, authMiddleware, availabili
|
|
|
58
58
|
};
|
|
59
59
|
transport.onerror = (error) => {
|
|
60
60
|
clearInterval(heartbeatInterval);
|
|
61
|
-
logger.error(
|
|
61
|
+
logger.error('sseRoutes.sse.transport.error.for.session.d3add0c1', { error: error });
|
|
62
62
|
serverManager.recordInboundConnectionError(transport.sessionId, error);
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
65
|
catch (error) {
|
|
66
|
-
logger.error('
|
|
66
|
+
logger.error('sseRoutes.sse.connection.error.b6fc4ad6', { error: error });
|
|
67
67
|
res.status(500).end();
|
|
68
68
|
}
|
|
69
69
|
});
|
|
@@ -92,7 +92,7 @@ export function setupSseRoutes(router, serverManager, authMiddleware, availabili
|
|
|
92
92
|
});
|
|
93
93
|
}
|
|
94
94
|
catch (error) {
|
|
95
|
-
logger.error('
|
|
95
|
+
logger.error('sseRoutes.message.handling.error.353d0f66', { error: error });
|
|
96
96
|
res.status(500).json({
|
|
97
97
|
error: {
|
|
98
98
|
code: ErrorCode.InternalError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sseRoutes.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGpE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,wDAAwD,CAAC;AAChE,OAAO,aAAa,MAAM,kDAAkD,CAAC;AAI7E,MAAM,UAAU,cAAc,CAC5B,MAAc,EACd,aAA4B,EAC5B,cAA8B,EAC9B,sBAAuC,EACvC,iBAA4C,EAC5C,cAAuB;IAEvB,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEpD,0CAA0C;IAC1C,IAAI,sBAAsB,EAAE,CAAC;QAC3B,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC7E,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,yBAAyB,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;YAExE,mEAAmE;YACnE,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YAEtC,iDAAiD;YACjD,MAAM,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE;gBACnE,IAAI;gBACJ,aAAa;gBACb,aAAa;gBACb,QAAQ;gBACR,UAAU;gBACV,gBAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM;gBACjD,cAAc;aACf,CAAC,CAAC;YAEH,wDAAwD;YACxD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,iBAAiB,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBACvE,IAAI,iBAAiB,EAAE,CAAC;oBACtB,iBAAiB,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;oBAC7D,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"sseRoutes.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAE9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAwNlE,wBAAgB,6BAA6B,CAAC,aAAa,EAAE,kBAAkB;uBAExD,MAAM,GAAG,SAAS;2BAKd,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,SAAS;EAYtE;AAED;;;;;;;;;;;;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;IAyBvB;;;;;;;;;OASG;IACH,OAAO,CAAC,WAAW;IAmNnB;;;;;;;;OAQG;IACI,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAS5C;;;;;;;;OAQG;IACI,QAAQ,IAAI,IAAI;IAOvB,OAAO,CAAC,gCAAgC;CAoBzC"}
|
|
@@ -2,6 +2,9 @@ import fs from 'fs';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { SDKOAuthServerProvider } from '../../../../auth/sdkOAuthServerProvider.js';
|
|
4
4
|
import { FileStorageService } from '../../../../auth/storage/fileStorageService.js';
|
|
5
|
+
import { getInboundOAuthStoreReadiness } from '../../../../auth/storage/inboundOAuthStorage.js';
|
|
6
|
+
import { getUpstreamOAuthStoreReadiness } from '../../../../auth/storage/upstreamOAuthStorage.js';
|
|
7
|
+
import { resolveUpstreamOAuthStorageBaseDir } from '../../../../auth/storage/upstreamOAuthStoragePath.js';
|
|
5
8
|
import { getAllServerTargets, resolveServerTarget } from '../../../../commands/shared/baseConfigUtils.js';
|
|
6
9
|
import ConfigContext from '../../../../config/configContext.js';
|
|
7
10
|
import ConfigManager from '../../../../config/configManager.js';
|
|
@@ -22,7 +25,7 @@ import logger from '../../../../logger/logger.js';
|
|
|
22
25
|
import { mcpAuthRouter } from '../../server/auth/router.js';
|
|
23
26
|
import { createModernInboundLegacyBridge } from './modernInboundLegacyBridge.js';
|
|
24
27
|
import errorHandler from '../../../../transport/http/middlewares/errorHandler.js';
|
|
25
|
-
import { httpRequestLogger } from '../../../../transport/http/middlewares/httpRequestLogger.js';
|
|
28
|
+
import { httpRequestBodyLogger, httpRequestLogger } from '../../../../transport/http/middlewares/httpRequestLogger.js';
|
|
26
29
|
import { createMcpAvailabilityMiddleware } from '../../../../transport/http/middlewares/mcpAvailabilityMiddleware.js';
|
|
27
30
|
import { createScopeAuthMiddleware } from '../../../../transport/http/middlewares/scopeAuthMiddleware.js';
|
|
28
31
|
import { setupSecurityMiddleware } from '../../../../transport/http/middlewares/securityMiddleware.js';
|
|
@@ -278,6 +281,7 @@ export class ExpressServer {
|
|
|
278
281
|
}));
|
|
279
282
|
this.app.use(bodyParser.json());
|
|
280
283
|
this.app.use(bodyParser.urlencoded({ extended: true }));
|
|
284
|
+
this.app.use(httpRequestBodyLogger);
|
|
281
285
|
// Add error handling middleware
|
|
282
286
|
this.app.use(errorHandler);
|
|
283
287
|
}
|
|
@@ -338,7 +342,17 @@ export class ExpressServer {
|
|
|
338
342
|
this.app.use('/oauth', createOAuthRoutes(this.oauthProvider, this.loadingManager, oauthFlow));
|
|
339
343
|
const getOAuthDashboard = createBackendOAuthDashboardProvider(this.oauthProvider, this.loadingManager, oauthFlow);
|
|
340
344
|
// Setup health check routes (no auth required for monitoring)
|
|
341
|
-
|
|
345
|
+
const credentialMode = this.configManager.get('auth').credentialStore ?? 'file';
|
|
346
|
+
const sessionStoragePath = this.configManager.get('auth').sessionStoragePath;
|
|
347
|
+
const runtimeScope = this.configManager.get('runtimeScopeStoragePath') ?? sessionStoragePath;
|
|
348
|
+
this.app.use('/health', createHealthRoutes(this.loadingManager, this.configManager.get('health')?.rateLimit, () => ({
|
|
349
|
+
inbound: getInboundOAuthStoreReadiness({ baseDir: sessionStoragePath, mode: credentialMode, runtimeScope }),
|
|
350
|
+
upstream: getUpstreamOAuthStoreReadiness({
|
|
351
|
+
baseDir: resolveUpstreamOAuthStorageBaseDir(sessionStoragePath),
|
|
352
|
+
mode: credentialMode,
|
|
353
|
+
runtimeScope,
|
|
354
|
+
}),
|
|
355
|
+
})));
|
|
342
356
|
const adminStorageDir = this.configManager.get('runtimeScopeStoragePath') ??
|
|
343
357
|
this.configManager.get('auth').sessionStoragePath ??
|
|
344
358
|
getGlobalConfigDir();
|
|
@@ -431,10 +445,10 @@ export class ExpressServer {
|
|
|
431
445
|
this.app.use(router);
|
|
432
446
|
// Log authentication status
|
|
433
447
|
if (this.configManager.get('features').auth) {
|
|
434
|
-
logger.info('
|
|
448
|
+
logger.info('server.authentication.enabled.oauth.2.1.endpoints.available.via.sdk.2d8726c6');
|
|
435
449
|
}
|
|
436
450
|
else {
|
|
437
|
-
logger.info('
|
|
451
|
+
logger.info('server.authentication.disabled.all.endpoints.accessible.without.auth.1dd4346d');
|
|
438
452
|
}
|
|
439
453
|
}
|
|
440
454
|
/**
|
|
@@ -449,9 +463,8 @@ export class ExpressServer {
|
|
|
449
463
|
start(onListening) {
|
|
450
464
|
const { port, host } = this.configManager.getConfig();
|
|
451
465
|
this.app.listen(port, host, () => {
|
|
452
|
-
|
|
453
|
-
logger.info(
|
|
454
|
-
logger.info(`📋 OAuth Management Dashboard: ${this.configManager.getUrl()}/oauth`);
|
|
466
|
+
logger.info('server.server.is.running.on.port.with.http.sse.and.streamable.http.transport.b730b0c1');
|
|
467
|
+
logger.info('server.oauth.management.dashboard.oauth.4eaf12e9');
|
|
455
468
|
onListening?.();
|
|
456
469
|
});
|
|
457
470
|
}
|