@1mcp/agent 0.39.0-beta.3 → 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-D_GlqLxL.js → admin-OAuthServicesWorkspace-CKR1HA-8.js} +1 -1
- package/build/admin/assets/{admin-console-CMRxMjQo.js → admin-console-OfHKqRm-.js} +3 -3
- package/build/admin/index.html +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/clientSessionRepository.d.ts +19 -0
- package/build/auth/storage/clientSessionRepository.d.ts.map +1 -1
- package/build/auth/storage/clientSessionRepository.js +178 -0
- 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 +32 -5
- 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 -47
- 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 +10 -0
- 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/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/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/run/runUtils.js +2 -2
- package/build/commands/run/runUtils.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 +1 -0
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +13 -0
- package/build/config/configLoader.js.map +1 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +44 -2
- package/build/config/configManager.js.map +1 -1
- package/build/config/configWatcher.d.ts.map +1 -1
- package/build/config/configWatcher.js +3 -1
- package/build/config/configWatcher.js.map +1 -1
- package/build/config/envProcessor.d.ts.map +1 -1
- package/build/config/envProcessor.js +3 -1
- package/build/config/envProcessor.js.map +1 -1
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +4 -1
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/config/projectConfigLoader.d.ts.map +1 -1
- package/build/config/projectConfigLoader.js +7 -0
- package/build/config/projectConfigLoader.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 +31 -2
- 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 +410 -39
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityPagination.d.ts +18 -1
- package/build/core/capabilities/capabilityPagination.d.ts.map +1 -1
- package/build/core/capabilities/capabilityPagination.js +101 -15
- 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/lazyLoadingOrchestrator.d.ts +2 -0
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +20 -4
- 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 +42 -4
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts +15 -2
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.js +153 -16
- 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 +41 -0
- package/build/core/capabilities/schemaCache.js.map +1 -1
- package/build/core/capabilities/schemas/metaToolSchemas.d.ts +1 -0
- 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 +28 -9
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/instructions/instructionAggregator.d.ts.map +1 -1
- package/build/core/instructions/instructionAggregator.js +3 -1
- 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 +11 -2
- 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 +6 -2
- package/build/core/loading/mcpLoadingManager.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/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/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/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 +14 -1
- package/build/core/server/runtimeLaunchIpc.d.ts.map +1 -1
- package/build/core/server/runtimeReplacementConfig.d.ts +14 -1
- package/build/core/server/runtimeReplacementConfig.d.ts.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/serverManagementHandler.d.ts +21 -0
- package/build/core/tools/handlers/serverManagementHandler.d.ts.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/schemas/discovery.d.ts +1 -1
- package/build/core/tools/internal/schemas/index.d.ts +1 -1
- package/build/core/types/transport.d.ts +25 -2
- 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/gateway/adapters/modern/modernInboundEraAdapter.d.ts.map +1 -1
- package/build/gateway/adapters/modern/modernInboundEraAdapter.js +3 -3
- 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 +4 -0
- 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/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 +2 -0
- package/build/gateway/ports/outboundEraAdapter.d.ts.map +1 -1
- 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 +7 -0
- package/build/logger/logger.d.ts.map +1 -1
- package/build/logger/logger.js +14 -0
- package/build/logger/logger.js.map +1 -1
- package/build/observability/events/registry.d.ts +163 -49
- package/build/observability/events/registry.d.ts.map +1 -1
- package/build/observability/events/registry.js +136 -49
- package/build/observability/events/registry.js.map +1 -1
- package/build/observability/privacy/fields.d.ts +3 -1
- package/build/observability/privacy/fields.d.ts.map +1 -1
- package/build/observability/privacy/fields.js +23 -0
- package/build/observability/privacy/fields.js.map +1 -1
- 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/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 +25 -7
- 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 +213 -6
- 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 +70 -4
- 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 +28 -2
- 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 +117 -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 +68 -16
- package/build/sdk/legacy/client/runtime/oauthFlowHandler.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 +28 -2
- 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 +2 -6
- 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 +4 -4
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/requestInteractionScope.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/requestInteractionScope.js +62 -10
- 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 +20 -2
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js.map +1 -1
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.js +151 -60
- 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 +34 -6
- package/build/sdk/legacy/server/runtime/clientInstancePool.js.map +1 -1
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.js +4 -2
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.js.map +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.js +3 -1
- package/build/sdk/legacy/server/runtime/serverManager.js.map +1 -1
- package/build/sdk/legacy/server/runtime/templateServerManager.d.ts.map +1 -1
- package/build/sdk/legacy/server/runtime/templateServerManager.js +32 -7
- 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/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/transport/http/middlewares/scopeAuthMiddleware.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js +12 -1
- 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 +11 -0
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js.map +1 -1
- package/build/sdk/legacy/transport/http/server.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/server.js +16 -2
- package/build/sdk/legacy/transport/http/server.js.map +1 -1
- package/build/sdk/legacy/transport/transportFactory.d.ts.map +1 -1
- package/build/sdk/legacy/transport/transportFactory.js +34 -12
- package/build/sdk/legacy/transport/transportFactory.js.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.d.ts +4 -2
- package/build/transport/http/middlewares/httpRequestLogger.d.ts.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.js +135 -16
- package/build/transport/http/middlewares/httpRequestLogger.js.map +1 -1
- package/build/transport/http/routes/cliTokenRoute.d.ts.map +1 -1
- package/build/transport/http/routes/cliTokenRoute.js +1 -0
- 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 +6 -2
- 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/modernHttpRoutes.d.ts +4 -0
- package/build/transport/http/routes/modernHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/modernHttpRoutes.js +168 -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 +6 -3
- 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 +18 -2
- package/build/transport/http/routes/toolRoutes.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/package.json +68 -64
|
@@ -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":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAK9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAQrE,uGAAuG;AACvG,SAAS,aAAa,CAAC,KAAmB;IACxC,MAAM,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IAC7D,OAAO,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC1D,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;QAC/D,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAmC,EAAE,QAAgB;IACxF,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACtD,IAAI,KAAK,EAAE,UAAU,EAAE,CAAC;QACtB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC9G,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,gBAAgB,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;IACpH,CAAC;IACD,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAAE,SAAS;QACvD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACvE,IAAI,CAAC,UAAU;YAAE,SAAS;QAC1B,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;QACjF,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,SAAS;QAC/E,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YAAE,SAAS;QACpD,OAAO,CAAC,IAAI,CAAC;YACX,KAAK;YACL,UAAU;YACV,mGAAmG;YACnG,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACzE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,EAAE,CAAC,CAAC;IAC7E,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,QAAmC,EACnC,aAAqB,EACrB,gBAAwB;IAExB,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC5F,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,KAAK,aAAa;YAAE,SAAS;QAC1D,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,gBAAgB,KAAK,gBAAgB;YACvF,OAAO,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC;QACpC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAAE,SAAS;QACvD,IAAI,CAAC;YACH,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC1E,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;gBACpC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzB,MAAM,cAAc,GAAG,GAAG,MAAM,GAAG,gBAAgB,EAAE,CAAC;oBACtD,IAAI,kBAAkB,CAAC,cAAc,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC,uBAAuB,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC9F,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,gBAAgB,EAAE,CAAC,CAAC;IACrG,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}
|
|
@@ -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) &&
|
|
@@ -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,5 +1,7 @@
|
|
|
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';
|
|
@@ -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);
|
|
@@ -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,0BAA0B,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,GACjC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EACnB,sBAAsB,EACtB,mCAAmC,EACnC,qCAAqC,EACrC,iCAAiC,EACjC,iCAAiC,GAClC,MAAM,0BAA0B,CAAC;AAElC,MAAM,eAAe,GAAG,YAAY,CAAC;AAUrC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,aAA4B,EAC5B,MAA+B,EAC/B,
|
|
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,sBAAsB,EAA2B,MAAM,6CAA6C,CAAC;AAC9G,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gDAAgD,CAAC;AACjH,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,0BAA0B,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,GACjC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EACnB,sBAAsB,EACtB,mCAAmC,EACnC,qCAAqC,EACrC,iCAAiC,EACjC,iCAAiC,GAClC,MAAM,0BAA0B,CAAC;AAElC,MAAM,eAAe,GAAG,YAAY,CAAC;AAUrC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,aAA4B,EAC5B,MAA+B,EAC/B,UAUI,EAAE;IAEN,MAAM,qBAAqB,GAAG,OAAO,CAAC,wBAAwB;QAC5D,CAAC,CAAC,MAAM,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,qBAAqB,IAAI,EAAE,EAAE,OAAO,CAAC,kBAAkB,CAAC;QACpH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAAG,UAAU,UAAU,EAAE,EAAE,CAAC;IAC9C,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,GAAG,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;IAChF,MAAM,YAAY,GAAG,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAChF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IACnG,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;QACrC,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI;YACjC,CAAC,0BAA0B,EAAE,UAAU,CAAC;YACxC,CAAC,mBAAmB,EAAE,aAAa,CAAC;YACpC,CAAC,sBAAsB,EAAE,OAAO,CAAC;SACzB,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;gBAAE,SAAS;YACxC,MAAM,CAAC,iBAAiB,CACtB,MAAM,EACN,KAAK,EAAE,OAAO,EAAE,EAAE,CAChB,WAAW,CACT,MAAM,QAAQ,CAAC;gBACb,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAA4B,EAAE,CAAC;aAC1F,CAAC,CACM,CACb,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,KAAK,OAAO,CAAC,UAAU,CAAC;YACtB,eAAe,CAAC,KAAK,EAAE;YACvB,eAAe,CAAC,KAAK,EAAE;YACvB,aAAa,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC;SACtD,CAAC,CAAC;IACL,CAAC,CAAC;IACF,OAAO,CAAC,kBAAkB,EAAE,cAAc,EAAE,CAAC;IAC7C,OAAO,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACzF,MAAM,UAAU,GAAG;QACjB,aAAa,CAAC,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE;YAC5D,GAAG,MAAM;YACT,WAAW,EAAE,CAAC,OAAO,CAAC,wBAAwB;YAC9C,GAAG,CAAC,OAAO,CAAC,wBAAwB;gBAClC,CAAC,CAAC;oBACE,qBAAqB,EAAG,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAW,CAAC,MAAM,CACxE,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,IAAI,aAAa,CAAC,KAAK,IAAI,CAC/D;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;YACP,yBAAyB,EAAE,IAAI;SAChC,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC;KAChC,CAAC;IACF,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9B,OAAO,CAAC,kBAAkB,EAAE,cAAc,EAAE,CAAC;QAC7C,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;YACxD,MAAM,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;YAC/D,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxE,IAAI,OAAO,CAAC,aAAa;gBAAE,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAClF,IAAI,OAAO,CAAC,kBAAkB;gBAAE,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAC9F,CAAC;QACD,gGAAgG;QAChG,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;YAAE,MAAM,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACrC,MAAM,aAAa,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACnF,OAAO,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAC5E,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAChG,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAClG,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,OAAO,CAAC,wBAAwB,EAAE,CAAC;QACrC,KAAK,MAAM,MAAM,IAAI;YACnB,iCAAiC;YACjC,qCAAqC;YACrC,iCAAiC;YACjC,mCAAmC;SACpC,EAAE,CAAC;YACF,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5G,CAAC;QACD,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;IACxD,CAAC;IACD,IAAI,YAAuC,CAAC;IAC5C,OAAO;QACL,kBAAkB,EAAE,YAAY;QAChC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;YAC/B,MAAM,MAAM,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,oBAAoB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,qBAAqB,EAAE,CAAC;QAChE,kFAAkF;QAClF,QAAQ,EAAE,IAAI,wBAAwB,CACpC,MAAM,EACN,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,EAC5C,EAAE,YAAY,EAAE,0BAA0B,EAAE,CAC7C;QACD,KAAK,EAAE,GAAG,EAAE,CACV,CAAC,YAAY,KAAK,OAAO,CAAC,OAAO,EAAE;aAChC,IAAI,CAAC,GAAG,EAAE;YACT,OAAO,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAC9E,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;aACvG,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;YACvG,IAAI,MAAM;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAC;QAClC,CAAC,CAAC,CAAC;KACR,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,aAA4B,EAC5B,MAA+B,EAC/B,KAAqD,EACrD,MAAoB;IAEpB,MAAM,OAAO,GAAG,gBAAgB,CAAC,sBAAsB,CACrD,2BAA2B,CAAC,aAAa,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,EAClE,MAAM,CACP,CAAC;IACF,MAAM,QAAQ,GAA4B,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI;QAC1B,CAAC,kBAAkB,EAAE,OAAO,CAAC;QAC7B,CAAC,oBAAoB,EAAE,SAAS,CAAC;QACjC,CAAC,sBAAsB,EAAE,WAAW,CAAC;KAC7B,EAAE,CAAC;QACX,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,SAAS;QACpC,MAAM,SAAS,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,SAAS;QAChC,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,KAAK,MAAM,UAAU,IAAI,SAAS,EAAE,CAAC;YACnC,MAAM,EAAE,cAAc,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;YACnD,IACE,CAAC,UAAU;gBACX,OAAO,UAAU,KAAK,QAAQ;gBAC9B,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;gBACzB,UAAU,CAAC,WAAW,KAAK,IAAI,EAC/B,CAAC;gBACD,SAAS,GAAG,KAAK,CAAC;gBAClB,MAAM;YACR,CAAC;YACD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;YACnC,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,MAAM,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAC3E,0BAA0B,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACpE,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC5B,SAAS,GAAG,KAAK,CAAC;gBAClB,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,SAAS;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IACxC,CAAC;IACD,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -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();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transportFactory.d.ts","sourceRoot":"","sources":["../../../../src/sdk/legacy/transport/transportFactory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transportFactory.d.ts","sourceRoot":"","sources":["../../../../src/sdk/legacy/transport/transportFactory.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,eAAe,EAAyB,MAAM,0BAA0B,CAAC;AAIlF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAUrF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAQlF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;CACzE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAuB1F;AA4UD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACvC,OAAO,GAAE,wBAA6B,GACrC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CA4BvC;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACvC,OAAO,CAAC,EAAE,WAAW,EACrB,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CA+ChD"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { SSEClientTransport as ModernSSEClientTransport, StreamableHTTPClientTransport as ModernStreamableHTTPClientTransport, } from '@modelcontextprotocol/client';
|
|
2
2
|
import { StdioClientTransport as ModernStdioClientTransport } from '@modelcontextprotocol/client/stdio';
|
|
3
|
-
import
|
|
3
|
+
import { oauthConfigurationFingerprint } from '../../../auth/oauthAuthority.js';
|
|
4
4
|
import { SDKOAuthClientProvider } from '../../../auth/sdkOAuthClientProvider.js';
|
|
5
|
+
import { resolveUpstreamOAuthStorageBaseDir } from '../../../auth/storage/upstreamOAuthStoragePath.js';
|
|
5
6
|
import { processEnvironment, substituteEnvVars } from '../../../config/envProcessor.js';
|
|
6
7
|
import { getRuntimeParentEnvironment } from '../../../config/runtimeBootstrap.js';
|
|
7
8
|
import { getRuntimeScopeEnvironment, sanitizeRuntimeScopeError } from '../../../config/runtimeScopeEnv.js';
|
|
8
9
|
import { AUTH_CONFIG, MCP_SERVER_VERSION } from '../../../constants.js';
|
|
10
|
+
import { RuntimeIdentityService } from '../../../core/runtime/runtimeIdentityService.js';
|
|
9
11
|
import { AgentConfigManager } from '../../../core/server/agentConfig.js';
|
|
10
12
|
import { transportConfigSchema } from '../../../core/types/index.js';
|
|
11
13
|
import { createBackendLogProjection } from '../../../domains/backend-logs/backendLogProjection.js';
|
|
@@ -53,19 +55,37 @@ function createOAuthProvider(name, validatedTransport) {
|
|
|
53
55
|
const configManager = AgentConfigManager.getInstance();
|
|
54
56
|
const oauthConfig = {
|
|
55
57
|
autoRegister: true,
|
|
56
|
-
redirectUrl: `${configManager.getUrl()}${AUTH_CONFIG.CLIENT.OAUTH.DEFAULT_CALLBACK_PATH}/${name}`,
|
|
58
|
+
redirectUrl: `${configManager.getUrl()}${AUTH_CONFIG.CLIENT.OAUTH.DEFAULT_CALLBACK_PATH}/${encodeURIComponent(name)}`,
|
|
57
59
|
...validatedTransport.oauth,
|
|
58
60
|
};
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
61
|
+
const clientSessionPath = resolveUpstreamOAuthStorageBaseDir(configManager.get('auth').sessionStoragePath);
|
|
62
|
+
const configuredAuthority = validatedTransport.oauth?.credentialAuthority;
|
|
63
|
+
const source = configuredAuthority ?? name;
|
|
64
|
+
const owner = new RuntimeIdentityService({
|
|
65
|
+
storageDir: configManager.get('runtimeScopeStoragePath'),
|
|
66
|
+
}).getRuntimeScopeId();
|
|
67
|
+
oauthConfig.legacy = !usesModernClient(validatedTransport);
|
|
68
|
+
oauthConfig.authority = {
|
|
69
|
+
owner,
|
|
70
|
+
source,
|
|
71
|
+
route: {
|
|
72
|
+
kind: validatedTransport.type === 'sse' ? 'sse' : 'http',
|
|
73
|
+
connectionKey: source,
|
|
74
|
+
url: validatedTransport.url,
|
|
75
|
+
},
|
|
76
|
+
configuration: oauthConfigurationFingerprint({
|
|
77
|
+
url: validatedTransport.url,
|
|
78
|
+
headers: validatedTransport.headers,
|
|
79
|
+
issuer: oauthConfig.issuer,
|
|
80
|
+
clientId: oauthConfig.clientId,
|
|
81
|
+
clientSecret: oauthConfig.clientSecret,
|
|
82
|
+
scopes: oauthConfig.scopes,
|
|
83
|
+
redirect: oauthConfig.redirectUrl,
|
|
84
|
+
clientMetadataUrl: oauthConfig.clientMetadataUrl,
|
|
85
|
+
autoRegister: oauthConfig.autoRegister,
|
|
86
|
+
legacy: oauthConfig.legacy,
|
|
87
|
+
}, [owner, source, validatedTransport.type, validatedTransport.url]),
|
|
88
|
+
};
|
|
69
89
|
logger.info('transportFactory.creating.oauth.client.provider.for.transport.8f8cab56');
|
|
70
90
|
return new SDKOAuthClientProvider(name, oauthConfig, clientSessionPath);
|
|
71
91
|
}
|
|
@@ -124,6 +144,7 @@ function createSSETransport(name, validatedTransport) {
|
|
|
124
144
|
};
|
|
125
145
|
const oauthProvider = createOAuthProvider(name, validatedTransport);
|
|
126
146
|
sseOptions.authProvider = oauthProvider;
|
|
147
|
+
sseOptions.fetch = oauthProvider.fetch;
|
|
127
148
|
const Transport = usesModernClient(validatedTransport) ? ModernSSEClientTransport : SSEClientTransport;
|
|
128
149
|
const transport = new Transport(new URL(validatedTransport.url), sseOptions);
|
|
129
150
|
transport.oauthProvider = oauthProvider;
|
|
@@ -148,6 +169,7 @@ function createHTTPTransport(name, validatedTransport, sessionId) {
|
|
|
148
169
|
};
|
|
149
170
|
const oauthProvider = createOAuthProvider(name, validatedTransport);
|
|
150
171
|
httpOptions.authProvider = oauthProvider;
|
|
172
|
+
httpOptions.fetch = oauthProvider.fetch;
|
|
151
173
|
const Transport = usesModernClient(validatedTransport)
|
|
152
174
|
? ModernStreamableHTTPClientTransport
|
|
153
175
|
: StreamableHTTPClientTransport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transportFactory.js","sourceRoot":"","sources":["../../../../src/sdk/legacy/transport/transportFactory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transportFactory.js","sourceRoot":"","sources":["../../../../src/sdk/legacy/transport/transportFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from 'express';
|
|
2
|
-
/**
|
|
1
|
+
import type { NextFunction, Request, Response } from 'express';
|
|
2
|
+
/** Run immediately after body parsers, before authentication or backend dispatch. */
|
|
3
|
+
export declare function httpRequestBodyLogger(_req: Request, res: Response, next: NextFunction): void;
|
|
4
|
+
/** Sanitized local request/response diagnostics; bodies are captured only at debug level. */
|
|
3
5
|
export declare function httpRequestLogger(req: Request, res: Response, next: NextFunction): void;
|
|
4
6
|
//# sourceMappingURL=httpRequestLogger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpRequestLogger.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/httpRequestLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"httpRequestLogger.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/httpRequestLogger.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI/D,qFAAqF;AACrF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAG5F;AAED,6FAA6F;AAC7F,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CA4HvF"}
|