@1mcp/agent 0.35.0-beta.2 → 0.35.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/README.md +5 -2
- package/build/admin/assets/admin-AboutRuntimeWorkspace-CM2ZafTJ.js +1 -0
- package/build/admin/assets/admin-BackendLogsWorkspace-CvJs1npx.js +1 -0
- package/build/admin/assets/admin-OAuthServicesWorkspace-BswG57Gm.js +1 -0
- package/build/admin/assets/admin-PresetAuthoringWorkspace-BIIRs_EN.js +1 -0
- package/build/admin/assets/admin-console-Brz9bnhv.css +1 -0
- package/build/admin/assets/{admin-console-C5_zD_qW.css → admin-console-DmRyrCWD.css} +1 -1
- package/build/admin/assets/admin-console-MT8QZmIC.js +3 -0
- package/build/admin/assets/admin-icons-D-JtMXSq.js +1 -0
- package/build/admin/assets/admin-mantine-DSFdoMaN.js +53 -0
- package/build/admin/assets/admin-react-BSaWeqgv.js +8 -0
- package/build/admin/assets/admin-rolldown-runtime-Bh1tDfsg.js +1 -0
- package/build/admin/favicon.svg +4 -0
- package/build/admin/index.html +8 -2
- package/build/auth/oauthAuthorizationFlow.d.ts +2 -2
- package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
- package/build/auth/oauthAuthorizationFlow.js +1 -1
- package/build/auth/oauthAuthorizationFlow.js.map +1 -1
- package/build/auth/sdkOAuthServerProvider.d.ts +4 -3
- package/build/auth/sdkOAuthServerProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthServerProvider.js +132 -17
- package/build/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/auth/sessionTypes.d.ts +42 -5
- package/build/auth/sessionTypes.d.ts.map +1 -1
- package/build/auth/sessionTypes.js +33 -1
- package/build/auth/sessionTypes.js.map +1 -1
- package/build/auth/storage/fileStorageService.d.ts +18 -1
- package/build/auth/storage/fileStorageService.d.ts.map +1 -1
- package/build/auth/storage/fileStorageService.js +253 -3
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/auth/storage/oauthStorageService.d.ts +4 -1
- package/build/auth/storage/oauthStorageService.d.ts.map +1 -1
- package/build/auth/storage/oauthStorageService.js +8 -1
- package/build/auth/storage/oauthStorageService.js.map +1 -1
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts +36 -0
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts.map +1 -0
- package/build/auth/storage/refreshTokenFamilyRepository.js +167 -0
- package/build/auth/storage/refreshTokenFamilyRepository.js.map +1 -0
- package/build/auth/storage/sessionRepository.d.ts +14 -1
- package/build/auth/storage/sessionRepository.d.ts.map +1 -1
- package/build/auth/storage/sessionRepository.js +32 -9
- package/build/auth/storage/sessionRepository.js.map +1 -1
- package/build/commands/inspect/inspect.d.ts +1 -0
- package/build/commands/inspect/inspect.d.ts.map +1 -1
- package/build/commands/inspect/inspect.js +6 -10
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/inspect/inspectUtils.d.ts +4 -0
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -1
- package/build/commands/inspect/inspectUtils.js +12 -0
- package/build/commands/inspect/inspectUtils.js.map +1 -1
- package/build/commands/instructions/instructionsUtils.d.ts +2 -0
- package/build/commands/instructions/instructionsUtils.d.ts.map +1 -1
- package/build/commands/instructions/instructionsUtils.js +7 -3
- package/build/commands/instructions/instructionsUtils.js.map +1 -1
- package/build/commands/proxy/proxy.d.ts.map +1 -1
- package/build/commands/proxy/proxy.js +2 -0
- package/build/commands/proxy/proxy.js.map +1 -1
- package/build/commands/run/run.d.ts +1 -0
- package/build/commands/run/run.d.ts.map +1 -1
- package/build/commands/run/run.js +90 -8
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/serve/asyncLoadingOptions.d.ts +30 -0
- package/build/commands/serve/asyncLoadingOptions.d.ts.map +1 -0
- package/build/commands/serve/asyncLoadingOptions.js +34 -0
- package/build/commands/serve/asyncLoadingOptions.js.map +1 -0
- package/build/commands/serve/index.d.ts +14 -1
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +24 -15
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +5 -1
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +37 -8
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +3 -0
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/serve/templateContextTrust.d.ts +12 -0
- package/build/commands/serve/templateContextTrust.d.ts.map +1 -0
- package/build/commands/serve/templateContextTrust.js +23 -0
- package/build/commands/serve/templateContextTrust.js.map +1 -0
- package/build/commands/shared/apiClient.d.ts +4 -1
- package/build/commands/shared/apiClient.d.ts.map +1 -1
- package/build/commands/shared/apiClient.js +8 -2
- package/build/commands/shared/apiClient.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +14 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.js +78 -10
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
- package/build/commands/shared/commandRunner.d.ts +1 -0
- package/build/commands/shared/commandRunner.d.ts.map +1 -1
- package/build/commands/shared/commandRunner.js +10 -2
- package/build/commands/shared/commandRunner.js.map +1 -1
- package/build/commands/shared/filterSelectionQuery.d.ts +8 -0
- package/build/commands/shared/filterSelectionQuery.d.ts.map +1 -0
- package/build/commands/shared/filterSelectionQuery.js +12 -0
- package/build/commands/shared/filterSelectionQuery.js.map +1 -0
- package/build/commands/shared/inspectApiSchemas.d.ts +83 -0
- package/build/commands/shared/inspectApiSchemas.d.ts.map +1 -0
- package/build/commands/shared/inspectApiSchemas.js +40 -0
- package/build/commands/shared/inspectApiSchemas.js.map +1 -0
- package/build/commands/shared/serveClient.d.ts +2 -1
- package/build/commands/shared/serveClient.d.ts.map +1 -1
- package/build/commands/shared/serveClient.js +3 -1
- package/build/commands/shared/serveClient.js.map +1 -1
- package/build/commands/shared/serveTargetResolver.d.ts +4 -0
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
- package/build/commands/shared/serveTargetResolver.js +25 -9
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/commands/wait/index.d.ts +3 -0
- package/build/commands/wait/index.d.ts.map +1 -0
- package/build/commands/wait/index.js +20 -0
- package/build/commands/wait/index.js.map +1 -0
- package/build/commands/wait/wait.d.ts +39 -0
- package/build/commands/wait/wait.d.ts.map +1 -0
- package/build/commands/wait/wait.js +162 -0
- package/build/commands/wait/wait.js.map +1 -0
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +12 -0
- package/build/config/configLoader.js.map +1 -1
- package/build/constants/auth.d.ts +10 -1
- package/build/constants/auth.d.ts.map +1 -1
- package/build/constants/auth.js +11 -1
- package/build/constants/auth.js.map +1 -1
- package/build/constants/mcp.d.ts +7 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +9 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js +10 -9
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +28 -5
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +98 -23
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityPagination.d.ts +40 -0
- package/build/core/capabilities/capabilityPagination.d.ts.map +1 -0
- package/build/core/capabilities/capabilityPagination.js +285 -0
- package/build/core/capabilities/capabilityPagination.js.map +1 -0
- package/build/core/capabilities/capabilityVisibility.d.ts +13 -0
- package/build/core/capabilities/capabilityVisibility.d.ts.map +1 -0
- package/build/core/capabilities/capabilityVisibility.js +14 -0
- package/build/core/capabilities/capabilityVisibility.js.map +1 -0
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts +2 -1
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts.map +1 -1
- package/build/core/capabilities/internalCapabilitiesProvider.js +2 -2
- package/build/core/capabilities/internalCapabilitiesProvider.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +5 -23
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +25 -44
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +6 -21
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +18 -70
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/capabilities/toolRegistry.d.ts +5 -1
- package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
- package/build/core/capabilities/toolRegistry.js +11 -3
- package/build/core/capabilities/toolRegistry.js.map +1 -1
- package/build/core/client/clientManager.d.ts +9 -0
- package/build/core/client/clientManager.d.ts.map +1 -1
- package/build/core/client/clientManager.js +87 -0
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/client/recreateHttpTransportOptions.d.ts +14 -0
- package/build/core/client/recreateHttpTransportOptions.d.ts.map +1 -0
- package/build/core/client/recreateHttpTransportOptions.js +2 -0
- package/build/core/client/recreateHttpTransportOptions.js.map +1 -0
- package/build/core/client/transportRecreator.d.ts +8 -1
- package/build/core/client/transportRecreator.d.ts.map +1 -1
- package/build/core/client/transportRecreator.js +11 -2
- package/build/core/client/transportRecreator.js.map +1 -1
- package/build/core/context/templateContextTrust.d.ts +66 -0
- package/build/core/context/templateContextTrust.d.ts.map +1 -0
- package/build/core/context/templateContextTrust.js +184 -0
- package/build/core/context/templateContextTrust.js.map +1 -0
- package/build/core/instructions/templateTypes.d.ts +2 -2
- package/build/core/instructions/templateTypes.d.ts.map +1 -1
- package/build/core/protocol/notificationHandlers.d.ts.map +1 -1
- package/build/core/protocol/notificationHandlers.js +26 -4
- package/build/core/protocol/notificationHandlers.js.map +1 -1
- package/build/core/protocol/promptRequestHandlers.d.ts.map +1 -1
- package/build/core/protocol/promptRequestHandlers.js +20 -11
- package/build/core/protocol/promptRequestHandlers.js.map +1 -1
- package/build/core/protocol/requestHandlerUtils.d.ts +7 -0
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.js +43 -7
- package/build/core/protocol/requestHandlerUtils.js.map +1 -1
- package/build/core/protocol/resourceRequestHandlers.d.ts.map +1 -1
- package/build/core/protocol/resourceRequestHandlers.js +38 -18
- package/build/core/protocol/resourceRequestHandlers.js.map +1 -1
- package/build/core/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/core/protocol/toolRequestHandlers.js +73 -30
- package/build/core/protocol/toolRequestHandlers.js.map +1 -1
- package/build/core/runtime/runtimeIdentityService.d.ts +1 -0
- package/build/core/runtime/runtimeIdentityService.d.ts.map +1 -1
- package/build/core/runtime/runtimeIdentityService.js +4 -1
- package/build/core/runtime/runtimeIdentityService.js.map +1 -1
- package/build/core/server/agentConfig.d.ts +4 -0
- package/build/core/server/agentConfig.d.ts.map +1 -1
- package/build/core/server/agentConfig.js +3 -0
- package/build/core/server/agentConfig.js.map +1 -1
- package/build/core/server/clientInstanceFactory.d.ts.map +1 -1
- package/build/core/server/clientInstanceFactory.js +12 -3
- package/build/core/server/clientInstanceFactory.js.map +1 -1
- package/build/core/server/connectionManager.d.ts +0 -6
- package/build/core/server/connectionManager.d.ts.map +1 -1
- package/build/core/server/connectionManager.js +2 -39
- package/build/core/server/connectionManager.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +35 -1
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/server/requestContextPreparation.d.ts +2 -1
- package/build/core/server/requestContextPreparation.d.ts.map +1 -1
- package/build/core/server/requestContextPreparation.js.map +1 -1
- package/build/core/server/runtimeScopeOwnership.js +1 -1
- package/build/core/server/runtimeScopeOwnership.js.map +1 -1
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +2 -0
- package/build/core/server/templateServerManager.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 +3 -3
- package/build/core/tools/internal/schemas/management.d.ts +3 -3
- package/build/core/types/server.d.ts +2 -0
- package/build/core/types/server.d.ts.map +1 -1
- package/build/core/types/server.js.map +1 -1
- package/build/core/types/transport.d.ts +12 -0
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +23 -5
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.d.ts +80 -0
- package/build/domains/admin/adminConfiguredServerService.d.ts.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.js +507 -1
- package/build/domains/admin/adminConfiguredServerService.js.map +1 -1
- package/build/domains/backend-logs/backendLogBroker.d.ts +47 -0
- package/build/domains/backend-logs/backendLogBroker.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogBroker.js +249 -0
- package/build/domains/backend-logs/backendLogBroker.js.map +1 -0
- package/build/domains/backend-logs/backendLogProjection.d.ts +9 -0
- package/build/domains/backend-logs/backendLogProjection.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogProjection.js +40 -0
- package/build/domains/backend-logs/backendLogProjection.js.map +1 -0
- package/build/domains/backend-logs/backendLogRuntime.d.ts +4 -0
- package/build/domains/backend-logs/backendLogRuntime.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogRuntime.js +11 -0
- package/build/domains/backend-logs/backendLogRuntime.js.map +1 -0
- package/build/domains/backend-logs/backendLogSanitizer.d.ts +2 -0
- package/build/domains/backend-logs/backendLogSanitizer.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogSanitizer.js +30 -0
- package/build/domains/backend-logs/backendLogSanitizer.js.map +1 -0
- package/build/domains/backend-logs/backendLogSource.d.ts +8 -0
- package/build/domains/backend-logs/backendLogSource.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogSource.js +22 -0
- package/build/domains/backend-logs/backendLogSource.js.map +1 -0
- package/build/domains/backend-logs/backendLogTypes.d.ts +49 -0
- package/build/domains/backend-logs/backendLogTypes.d.ts.map +1 -0
- package/build/domains/backend-logs/backendLogTypes.js +2 -0
- package/build/domains/backend-logs/backendLogTypes.js.map +1 -0
- package/build/domains/config-change/configChange.d.ts +2 -1
- package/build/domains/config-change/configChange.d.ts.map +1 -1
- package/build/domains/config-change/configChange.js +88 -0
- package/build/domains/config-change/configChange.js.map +1 -1
- package/build/domains/config-change/types.d.ts +5 -1
- package/build/domains/config-change/types.d.ts.map +1 -1
- package/build/domains/installation/serverInstallationSourceResolution.js +2 -0
- package/build/domains/installation/serverInstallationSourceResolution.js.map +1 -1
- package/build/domains/installation/serverInstallationTypes.d.ts +8 -0
- package/build/domains/installation/serverInstallationTypes.d.ts.map +1 -1
- package/build/domains/installation/serverInstallationWorkflow.js +16 -3
- package/build/domains/installation/serverInstallationWorkflow.js.map +1 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +8 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.js +62 -3
- package/build/domains/runtime-targets/runtimeIdentityVerification.js.map +1 -1
- package/build/domains/runtime-targets/runtimeProbe.d.ts +34 -0
- package/build/domains/runtime-targets/runtimeProbe.d.ts.map +1 -0
- package/build/domains/runtime-targets/runtimeProbe.js +71 -0
- package/build/domains/runtime-targets/runtimeProbe.js.map +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -0
- package/build/index.js.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.d.ts.map +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.js +3 -2
- package/build/transport/http/middlewares/httpRequestLogger.js.map +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +2 -0
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/adminRoutes.js +288 -31
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/inspectHelpers.d.ts +11 -4
- package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -1
- package/build/transport/http/routes/inspectHelpers.js +21 -2
- package/build/transport/http/routes/inspectHelpers.js.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.js +13 -4
- package/build/transport/http/routes/inspectRequestContext.js.map +1 -1
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +55 -4
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.js +13 -4
- 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 +37 -29
- package/build/transport/http/routes/toolRoutes.js.map +1 -1
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +3 -1
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.d.ts.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.js +2 -0
- package/build/transport/http/storage/streamableSessionRepository.js.map +1 -1
- package/build/transport/http/streamableSessionLifecycle.d.ts +3 -1
- package/build/transport/http/streamableSessionLifecycle.d.ts.map +1 -1
- package/build/transport/http/streamableSessionLifecycle.js +23 -6
- package/build/transport/http/streamableSessionLifecycle.js.map +1 -1
- package/build/transport/http/utils/contextExtractor.d.ts +14 -16
- package/build/transport/http/utils/contextExtractor.d.ts.map +1 -1
- package/build/transport/http/utils/contextExtractor.js +124 -33
- package/build/transport/http/utils/contextExtractor.js.map +1 -1
- package/build/transport/http/utils/templateContextAuthority.d.ts +13 -0
- package/build/transport/http/utils/templateContextAuthority.d.ts.map +1 -0
- package/build/transport/http/utils/templateContextAuthority.js +121 -0
- package/build/transport/http/utils/templateContextAuthority.js.map +1 -0
- package/build/transport/managedStdioStderr.d.ts +17 -1
- package/build/transport/managedStdioStderr.d.ts.map +1 -1
- package/build/transport/managedStdioStderr.js +129 -5
- package/build/transport/managedStdioStderr.js.map +1 -1
- package/build/transport/managedStdioStderrOptions.d.ts +2 -0
- package/build/transport/managedStdioStderrOptions.d.ts.map +1 -1
- package/build/transport/restartableStdioTransport.js +1 -1
- package/build/transport/restartableStdioTransport.js.map +1 -1
- package/build/transport/stdioProxyTransport.d.ts +3 -0
- package/build/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/transport/stdioProxyTransport.js +7 -2
- package/build/transport/stdioProxyTransport.js.map +1 -1
- package/build/transport/transportFactory.d.ts +6 -2
- package/build/transport/transportFactory.d.ts.map +1 -1
- package/build/transport/transportFactory.js +43 -15
- package/build/transport/transportFactory.js.map +1 -1
- package/build/types/serverStatus.d.ts +3 -0
- package/build/types/serverStatus.d.ts.map +1 -0
- package/build/types/serverStatus.js +13 -0
- package/build/types/serverStatus.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts +12 -9
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +233 -31
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +4 -3
- package/build/admin/assets/admin-console-CbHHoqLr.js +0 -61
- package/build/utils/ui/pagination.d.ts +0 -35
- package/build/utils/ui/pagination.d.ts.map +0 -1
- package/build/utils/ui/pagination.js +0 -166
- package/build/utils/ui/pagination.js.map +0 -1
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
1
2
|
import { loadAuthProfile, normalizeServerUrl } from '../../commands/shared/authProfileStore.js';
|
|
2
3
|
import { buildCliContext, generateStreamableSessionId } from '../../commands/shared/cliContext.js';
|
|
3
4
|
import { deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, writeCliSessionCache, } from '../../commands/shared/serveClient.js';
|
|
4
5
|
import { resolveServeTarget, } from '../../commands/shared/serveTargetResolver.js';
|
|
6
|
+
import { createTemplateContextProof, TemplateContextCapabilityStore, } from '../../core/context/templateContextTrust.js';
|
|
7
|
+
import { isProcessAlive, readPidFile } from '../../core/server/pidFileManager.js';
|
|
5
8
|
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
6
9
|
import { resolveCanonicalSessionId, withCanonicalSessionId } from '../../utils/context/sessionIdentity.js';
|
|
7
10
|
import { stripMcpSuffix } from '../../utils/urlUtils.js';
|
|
@@ -24,6 +27,7 @@ export async function attachFreshClientSurface(input) {
|
|
|
24
27
|
const bearerToken = await loadBearerToken(ports, target, options, baseUrl);
|
|
25
28
|
const requestSessionId = resolveCanonicalSessionId({ context: baseContext, transportSessionId: freshSessionId });
|
|
26
29
|
const context = withCanonicalSessionId(baseContext, requestSessionId);
|
|
30
|
+
const contextProof = await ports.createContextProof(target, context);
|
|
27
31
|
return {
|
|
28
32
|
target,
|
|
29
33
|
options,
|
|
@@ -31,6 +35,8 @@ export async function attachFreshClientSurface(input) {
|
|
|
31
35
|
serverUrl: target.serverUrl,
|
|
32
36
|
bearerToken,
|
|
33
37
|
context,
|
|
38
|
+
contextProof,
|
|
39
|
+
createContextProof: (updatedContext) => ports.createContextProof(target, updatedContext),
|
|
34
40
|
contextHash,
|
|
35
41
|
requestSessionId,
|
|
36
42
|
sessionId: requestSessionId,
|
|
@@ -57,23 +63,26 @@ export async function attachReusableClientSurface(input) {
|
|
|
57
63
|
});
|
|
58
64
|
const baseUrl = stripMcpSuffix(target.discoveredUrl);
|
|
59
65
|
const bearerTokenPromise = loadBearerToken(ports, target, options, baseUrl);
|
|
60
|
-
const [bearerToken,
|
|
66
|
+
const [bearerToken, loadedCachedSession] = await Promise.all([
|
|
61
67
|
bearerTokenPromise,
|
|
62
68
|
ports.readSessionCache(cachePath, target.serverUrl.toString(), contextHash),
|
|
63
69
|
]);
|
|
64
|
-
|
|
70
|
+
let cachedSession = loadedCachedSession;
|
|
71
|
+
let requestSessionId = resolveCanonicalSessionId({
|
|
65
72
|
context: baseContext,
|
|
66
73
|
transportSessionId: cachedSession?.sessionId,
|
|
67
74
|
});
|
|
68
|
-
|
|
75
|
+
let context = withCanonicalSessionId(baseContext, requestSessionId);
|
|
76
|
+
let contextProof = await ports.createContextProof(target, context);
|
|
69
77
|
let restSupport = cachedSession?.hasRestEndpoint;
|
|
70
|
-
|
|
78
|
+
let attachmentContext = {
|
|
71
79
|
target,
|
|
72
80
|
options,
|
|
73
81
|
baseUrl,
|
|
74
82
|
serverUrl: target.serverUrl,
|
|
75
83
|
bearerToken,
|
|
76
84
|
context,
|
|
85
|
+
contextProof,
|
|
77
86
|
contextHash,
|
|
78
87
|
cachePath,
|
|
79
88
|
cachedSession,
|
|
@@ -81,7 +90,7 @@ export async function attachReusableClientSurface(input) {
|
|
|
81
90
|
sessionId: requestSessionId,
|
|
82
91
|
restSupport,
|
|
83
92
|
};
|
|
84
|
-
if (cachedSession?.hasRestEndpoint !== false) {
|
|
93
|
+
if (input.alwaysTryRest || cachedSession?.hasRestEndpoint !== false) {
|
|
85
94
|
const restResponse = await input.rest(attachmentContext);
|
|
86
95
|
if (restResponse.status === 'success') {
|
|
87
96
|
restSupport = restResponse.restSupport ?? true;
|
|
@@ -99,6 +108,7 @@ export async function attachReusableClientSurface(input) {
|
|
|
99
108
|
sessionId,
|
|
100
109
|
requestSessionId,
|
|
101
110
|
context,
|
|
111
|
+
contextProof,
|
|
102
112
|
contextHash,
|
|
103
113
|
cachePath,
|
|
104
114
|
target,
|
|
@@ -115,6 +125,7 @@ export async function attachReusableClientSurface(input) {
|
|
|
115
125
|
message: restResponse.message,
|
|
116
126
|
requestSessionId,
|
|
117
127
|
context,
|
|
128
|
+
contextProof,
|
|
118
129
|
contextHash,
|
|
119
130
|
cachePath,
|
|
120
131
|
target,
|
|
@@ -131,15 +142,27 @@ export async function attachReusableClientSurface(input) {
|
|
|
131
142
|
}
|
|
132
143
|
let mcpResponse = await input.mcp({
|
|
133
144
|
...attachmentContext,
|
|
134
|
-
sessionId: cachedSession?.sessionId,
|
|
145
|
+
sessionId: cachedSession?.sessionId ?? requestSessionId,
|
|
135
146
|
restSupport,
|
|
136
147
|
sendInitialize: !cachedSession?.sessionId,
|
|
137
148
|
});
|
|
138
149
|
if (mcpResponse.status === 'stale_session') {
|
|
139
150
|
await ports.deleteSessionCache(cachePath);
|
|
151
|
+
cachedSession = null;
|
|
152
|
+
requestSessionId = generateStreamableSessionId();
|
|
153
|
+
context = withCanonicalSessionId(baseContext, requestSessionId);
|
|
154
|
+
contextProof = await ports.createContextProof(target, context);
|
|
155
|
+
attachmentContext = {
|
|
156
|
+
...attachmentContext,
|
|
157
|
+
context,
|
|
158
|
+
contextProof,
|
|
159
|
+
cachedSession,
|
|
160
|
+
requestSessionId,
|
|
161
|
+
sessionId: requestSessionId,
|
|
162
|
+
};
|
|
140
163
|
mcpResponse = await input.mcp({
|
|
141
164
|
...attachmentContext,
|
|
142
|
-
sessionId:
|
|
165
|
+
sessionId: requestSessionId,
|
|
143
166
|
restSupport,
|
|
144
167
|
sendInitialize: true,
|
|
145
168
|
});
|
|
@@ -159,6 +182,7 @@ export async function attachReusableClientSurface(input) {
|
|
|
159
182
|
sessionId,
|
|
160
183
|
requestSessionId,
|
|
161
184
|
context,
|
|
185
|
+
contextProof,
|
|
162
186
|
contextHash,
|
|
163
187
|
cachePath,
|
|
164
188
|
target,
|
|
@@ -174,6 +198,7 @@ export async function attachReusableClientSurface(input) {
|
|
|
174
198
|
message: mcpResponse.status === 'error' ? mcpResponse.message : 'Cached session expired.',
|
|
175
199
|
requestSessionId,
|
|
176
200
|
context,
|
|
201
|
+
contextProof,
|
|
177
202
|
contextHash,
|
|
178
203
|
cachePath,
|
|
179
204
|
target,
|
|
@@ -193,9 +218,42 @@ function withDefaultPorts(ports) {
|
|
|
193
218
|
readSessionCache: ports?.readSessionCache ?? readCliSessionCache,
|
|
194
219
|
writeSessionCache: ports?.writeSessionCache ?? writeCliSessionCache,
|
|
195
220
|
deleteSessionCache: ports?.deleteSessionCache ?? deleteCliSessionCache,
|
|
221
|
+
createContextProof: ports?.createContextProof ?? createLocalTemplateContextProof,
|
|
196
222
|
now: ports?.now ?? Date.now,
|
|
197
223
|
};
|
|
198
224
|
}
|
|
225
|
+
async function createLocalTemplateContextProof(target, context) {
|
|
226
|
+
const localScope = target.localRuntimeScope;
|
|
227
|
+
if (!localScope) {
|
|
228
|
+
return undefined;
|
|
229
|
+
}
|
|
230
|
+
if (!isProtectedTemplateContextProofTransport(target.serverUrl)) {
|
|
231
|
+
return undefined;
|
|
232
|
+
}
|
|
233
|
+
const runtimeInfo = readPidFile(localScope.storagePath);
|
|
234
|
+
if (!runtimeInfo ||
|
|
235
|
+
!isProcessAlive(runtimeInfo.pid) ||
|
|
236
|
+
path.resolve(runtimeInfo.configDir) !== path.resolve(localScope.storagePath) ||
|
|
237
|
+
(target.serverPid !== undefined && runtimeInfo.pid !== target.serverPid) ||
|
|
238
|
+
normalizeServerUrl(runtimeInfo.url) !== normalizeServerUrl(target.discoveredUrl)) {
|
|
239
|
+
return undefined;
|
|
240
|
+
}
|
|
241
|
+
const capability = new TemplateContextCapabilityStore({
|
|
242
|
+
storageDir: localScope.storagePath,
|
|
243
|
+
runtimeScopeId: localScope.runtimeScopeId,
|
|
244
|
+
}).read();
|
|
245
|
+
return capability ? createTemplateContextProof(context, capability) : undefined;
|
|
246
|
+
}
|
|
247
|
+
function isProtectedTemplateContextProofTransport(url) {
|
|
248
|
+
if (url.protocol === 'https:') {
|
|
249
|
+
return true;
|
|
250
|
+
}
|
|
251
|
+
if (url.protocol !== 'http:') {
|
|
252
|
+
return false;
|
|
253
|
+
}
|
|
254
|
+
const hostname = url.hostname.replace(/^\[|\]$/g, '').toLowerCase();
|
|
255
|
+
return hostname === 'localhost' || hostname === '::1' || /^127(?:\.\d{1,3}){3}$/.test(hostname);
|
|
256
|
+
}
|
|
199
257
|
async function loadBearerToken(ports, target, options, baseUrl) {
|
|
200
258
|
if (options.url) {
|
|
201
259
|
return undefined;
|
|
@@ -212,13 +270,23 @@ async function loadBearerToken(ports, target, options, baseUrl) {
|
|
|
212
270
|
return authProfile?.token;
|
|
213
271
|
}
|
|
214
272
|
export function formatClientSurfaceAuthRequiredMessage(context) {
|
|
273
|
+
const recoveryCommand = getClientSurfaceAuthRecoveryCommand(context);
|
|
274
|
+
if (context.target.runtimeTargetContext) {
|
|
275
|
+
return `Authentication required for target context "${context.target.runtimeTargetContext.name}". Run: ${recoveryCommand}`;
|
|
276
|
+
}
|
|
277
|
+
if (context.options.url) {
|
|
278
|
+
return `Authentication required for ephemeral URL target. Ephemeral URLs are credentialless; run: ${recoveryCommand} and retry with --context <name> after context-scoped credentials are available.`;
|
|
279
|
+
}
|
|
280
|
+
return `Authentication required. Run: ${recoveryCommand}`;
|
|
281
|
+
}
|
|
282
|
+
export function getClientSurfaceAuthRecoveryCommand(context) {
|
|
215
283
|
if (context.target.runtimeTargetContext) {
|
|
216
|
-
return `
|
|
284
|
+
return `1mcp auth login --context ${context.target.runtimeTargetContext.name} --token <your-token>`;
|
|
217
285
|
}
|
|
218
286
|
if (context.options.url) {
|
|
219
|
-
return `
|
|
287
|
+
return `1mcp target add <name> ${context.baseUrl}`;
|
|
220
288
|
}
|
|
221
|
-
return '
|
|
289
|
+
return '1mcp auth login --context local --token <your-token>';
|
|
222
290
|
}
|
|
223
291
|
function toOAuthTokenReference(value) {
|
|
224
292
|
if (typeof value !== 'object' || value === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientSurfaceAttachment.js","sourceRoot":"","sources":["../../../src/commands/shared/clientSurfaceAttachment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,eAAe,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AACjH,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,EAEL,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAGL,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"clientSurfaceAttachment.js","sourceRoot":"","sources":["../../../src/commands/shared/clientSurfaceAttachment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { GlobalOptions } from '../../globalOptions.js';
|
|
2
2
|
export declare function runCliCommand<T extends GlobalOptions & {
|
|
3
3
|
json?: boolean;
|
|
4
|
+
format?: string;
|
|
4
5
|
}>(argv: T, fn: (argv: T) => Promise<void>): Promise<void>;
|
|
5
6
|
//# sourceMappingURL=commandRunner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRunner.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,aAAa,CAAC,CAAC,SAAS,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"commandRunner.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,aAAa,CAAC,CAAC,SAAS,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/F,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgBf"}
|
|
@@ -17,7 +17,7 @@ export async function runCliCommand(argv, fn) {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
function hasJsonOutput(argv) {
|
|
20
|
-
return argv.json === true;
|
|
20
|
+
return argv.json === true || argv.format === 'json';
|
|
21
21
|
}
|
|
22
22
|
function jsonFailureEnvelope(error, message) {
|
|
23
23
|
const coded = isCodedError(error) ? error : undefined;
|
|
@@ -28,6 +28,7 @@ function jsonFailureEnvelope(error, message) {
|
|
|
28
28
|
error: {
|
|
29
29
|
code: coded?.code ?? 'command_failed',
|
|
30
30
|
message,
|
|
31
|
+
...(coded && typeof coded.retryable === 'boolean' ? { retryable: coded.retryable } : {}),
|
|
31
32
|
...(coded?.recoveryCommand ? { recoveryCommand: coded.recoveryCommand } : {}),
|
|
32
33
|
...(coded && 'details' in coded && coded.details !== undefined ? { details: coded.details } : {}),
|
|
33
34
|
},
|
|
@@ -40,7 +41,14 @@ function formatErrorForHuman(error, message) {
|
|
|
40
41
|
if (!isCodedError(error)) {
|
|
41
42
|
return message;
|
|
42
43
|
}
|
|
43
|
-
const
|
|
44
|
+
const humanDetails = Array.isArray(error.humanDetails) && error.humanDetails.every((line) => typeof line === 'string')
|
|
45
|
+
? error.humanDetails
|
|
46
|
+
: [];
|
|
47
|
+
const detailsMessage = humanDetails.length
|
|
48
|
+
? `\n${humanDetails.join('\n')}`
|
|
49
|
+
: 'details' in error && error.details !== undefined
|
|
50
|
+
? `\nDetails: ${JSON.stringify(error.details)}`
|
|
51
|
+
: '';
|
|
44
52
|
return `${error.code}: ${message}${detailsMessage}${error.recoveryCommand ? `\nRecovery: ${error.recoveryCommand}` : ''}`;
|
|
45
53
|
}
|
|
46
54
|
function exitCodeForError(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAO,EACP,EAA8B;IAE9B,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;IACvF,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;YACjF,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../src/commands/shared/commandRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export interface FilterSelectionOptions {
|
|
2
|
+
preset?: string;
|
|
3
|
+
filter?: string;
|
|
4
|
+
tags?: string[];
|
|
5
|
+
'tag-filter'?: string;
|
|
6
|
+
}
|
|
7
|
+
export declare function buildFilterSelectionQuery(options: FilterSelectionOptions): Record<string, string>;
|
|
8
|
+
//# sourceMappingURL=filterSelectionQuery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterSelectionQuery.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/filterSelectionQuery.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMjG"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export function buildFilterSelectionQuery(options) {
|
|
2
|
+
if (options.preset)
|
|
3
|
+
return { preset: options.preset };
|
|
4
|
+
if (options['tag-filter'])
|
|
5
|
+
return { 'tag-filter': options['tag-filter'] };
|
|
6
|
+
if (options.filter)
|
|
7
|
+
return { filter: options.filter };
|
|
8
|
+
if (options.tags?.length)
|
|
9
|
+
return { tags: options.tags.join(',') };
|
|
10
|
+
return {};
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=filterSelectionQuery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterSelectionQuery.js","sourceRoot":"","sources":["../../../src/commands/shared/filterSelectionQuery.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,yBAAyB,CAAC,OAA+B;IACvE,IAAI,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IACtD,IAAI,OAAO,CAAC,YAAY,CAAC;QAAE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;IAC1E,IAAI,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IACtD,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAClE,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const clientServerStatusSchema: z.ZodEnum<{
|
|
3
|
+
error: "error";
|
|
4
|
+
unknown: "unknown";
|
|
5
|
+
connected: "connected";
|
|
6
|
+
disconnected: "disconnected";
|
|
7
|
+
awaiting_oauth: "awaiting_oauth";
|
|
8
|
+
failed: "failed";
|
|
9
|
+
cancelled: "cancelled";
|
|
10
|
+
pending: "pending";
|
|
11
|
+
loading: "loading";
|
|
12
|
+
initializing: "initializing";
|
|
13
|
+
}>;
|
|
14
|
+
export declare const inspectServerSummarySchema: z.ZodObject<{
|
|
15
|
+
server: z.ZodString;
|
|
16
|
+
type: z.ZodString;
|
|
17
|
+
status: z.ZodEnum<{
|
|
18
|
+
error: "error";
|
|
19
|
+
unknown: "unknown";
|
|
20
|
+
connected: "connected";
|
|
21
|
+
disconnected: "disconnected";
|
|
22
|
+
awaiting_oauth: "awaiting_oauth";
|
|
23
|
+
failed: "failed";
|
|
24
|
+
cancelled: "cancelled";
|
|
25
|
+
pending: "pending";
|
|
26
|
+
loading: "loading";
|
|
27
|
+
initializing: "initializing";
|
|
28
|
+
}>;
|
|
29
|
+
available: z.ZodBoolean;
|
|
30
|
+
loadTracked: z.ZodBoolean;
|
|
31
|
+
}, z.core.$loose>;
|
|
32
|
+
export declare const inspectServersResultSchema: z.ZodObject<{
|
|
33
|
+
kind: z.ZodLiteral<"servers">;
|
|
34
|
+
servers: z.ZodArray<z.ZodObject<{
|
|
35
|
+
server: z.ZodString;
|
|
36
|
+
type: z.ZodString;
|
|
37
|
+
status: z.ZodEnum<{
|
|
38
|
+
error: "error";
|
|
39
|
+
unknown: "unknown";
|
|
40
|
+
connected: "connected";
|
|
41
|
+
disconnected: "disconnected";
|
|
42
|
+
awaiting_oauth: "awaiting_oauth";
|
|
43
|
+
failed: "failed";
|
|
44
|
+
cancelled: "cancelled";
|
|
45
|
+
pending: "pending";
|
|
46
|
+
loading: "loading";
|
|
47
|
+
initializing: "initializing";
|
|
48
|
+
}>;
|
|
49
|
+
available: z.ZodBoolean;
|
|
50
|
+
loadTracked: z.ZodBoolean;
|
|
51
|
+
}, z.core.$loose>>;
|
|
52
|
+
}, z.core.$loose>;
|
|
53
|
+
export declare const inspectServerResultSchema: z.ZodObject<{
|
|
54
|
+
kind: z.ZodLiteral<"server">;
|
|
55
|
+
server: z.ZodString;
|
|
56
|
+
status: z.ZodEnum<{
|
|
57
|
+
error: "error";
|
|
58
|
+
unknown: "unknown";
|
|
59
|
+
connected: "connected";
|
|
60
|
+
disconnected: "disconnected";
|
|
61
|
+
awaiting_oauth: "awaiting_oauth";
|
|
62
|
+
failed: "failed";
|
|
63
|
+
cancelled: "cancelled";
|
|
64
|
+
pending: "pending";
|
|
65
|
+
loading: "loading";
|
|
66
|
+
initializing: "initializing";
|
|
67
|
+
}>;
|
|
68
|
+
available: z.ZodBoolean;
|
|
69
|
+
authorizationUrl: z.ZodOptional<z.ZodString>;
|
|
70
|
+
error: z.ZodOptional<z.ZodString>;
|
|
71
|
+
}, z.core.$loose>;
|
|
72
|
+
export declare const inspectToolResultSchema: z.ZodObject<{
|
|
73
|
+
kind: z.ZodLiteral<"tool">;
|
|
74
|
+
server: z.ZodString;
|
|
75
|
+
tool: z.ZodString;
|
|
76
|
+
qualifiedName: z.ZodString;
|
|
77
|
+
description: z.ZodOptional<z.ZodString>;
|
|
78
|
+
inputSchema: z.ZodRecord<z.ZodString, z.ZodUnknown>;
|
|
79
|
+
outputSchema: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
80
|
+
}, z.core.$loose>;
|
|
81
|
+
export type InspectServerSummary = z.infer<typeof inspectServerSummarySchema>;
|
|
82
|
+
export type ApiInspectServerResult = z.infer<typeof inspectServerResultSchema>;
|
|
83
|
+
//# sourceMappingURL=inspectApiSchemas.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inspectApiSchemas.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;;;;;EAAiC,CAAC;AAEvE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;iBAQvB,CAAC;AAEjB,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;iBAKvB,CAAC;AAEjB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;iBAStB,CAAC;AAEjB,eAAO,MAAM,uBAAuB;;;;;;;;iBAUpB,CAAC;AAEjB,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { CLIENT_SERVER_STATUSES } from '../../types/serverStatus.js';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
export const clientServerStatusSchema = z.enum(CLIENT_SERVER_STATUSES);
|
|
4
|
+
export const inspectServerSummarySchema = z
|
|
5
|
+
.object({
|
|
6
|
+
server: z.string(),
|
|
7
|
+
type: z.string(),
|
|
8
|
+
status: clientServerStatusSchema,
|
|
9
|
+
available: z.boolean(),
|
|
10
|
+
loadTracked: z.boolean(),
|
|
11
|
+
})
|
|
12
|
+
.passthrough();
|
|
13
|
+
export const inspectServersResultSchema = z
|
|
14
|
+
.object({
|
|
15
|
+
kind: z.literal('servers'),
|
|
16
|
+
servers: z.array(inspectServerSummarySchema),
|
|
17
|
+
})
|
|
18
|
+
.passthrough();
|
|
19
|
+
export const inspectServerResultSchema = z
|
|
20
|
+
.object({
|
|
21
|
+
kind: z.literal('server'),
|
|
22
|
+
server: z.string(),
|
|
23
|
+
status: clientServerStatusSchema,
|
|
24
|
+
available: z.boolean(),
|
|
25
|
+
authorizationUrl: z.string().optional(),
|
|
26
|
+
error: z.string().optional(),
|
|
27
|
+
})
|
|
28
|
+
.passthrough();
|
|
29
|
+
export const inspectToolResultSchema = z
|
|
30
|
+
.object({
|
|
31
|
+
kind: z.literal('tool'),
|
|
32
|
+
server: z.string(),
|
|
33
|
+
tool: z.string(),
|
|
34
|
+
qualifiedName: z.string(),
|
|
35
|
+
description: z.string().optional(),
|
|
36
|
+
inputSchema: z.record(z.string(), z.unknown()),
|
|
37
|
+
outputSchema: z.record(z.string(), z.unknown()).optional(),
|
|
38
|
+
})
|
|
39
|
+
.passthrough();
|
|
40
|
+
//# sourceMappingURL=inspectApiSchemas.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inspectApiSchemas.js","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC;CAC7C,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC;KACvC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC;KACrC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;KACD,WAAW,EAAE,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type CallToolResult, type Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
import type { TemplateContextProof } from '../../core/context/templateContextTrust.js';
|
|
2
3
|
import type { ContextData } from '../../types/context.js';
|
|
3
4
|
export interface JsonRpcSuccessEnvelope<Result> {
|
|
4
5
|
jsonrpc: '2.0';
|
|
@@ -49,7 +50,7 @@ export declare class StreamableServeClient {
|
|
|
49
50
|
private nextId;
|
|
50
51
|
constructor(serverUrl: URL, sessionId?: string, bearerToken?: string);
|
|
51
52
|
start(): Promise<void>;
|
|
52
|
-
initialize(context?: ContextData): Promise<JsonRpcResponse<InitializeResult>>;
|
|
53
|
+
initialize(context?: ContextData, contextProof?: TemplateContextProof): Promise<JsonRpcResponse<InitializeResult>>;
|
|
53
54
|
listTools(): Promise<JsonRpcResponse<ListToolsResult>>;
|
|
54
55
|
callTool(name: string, args: Record<string, unknown>): Promise<JsonRpcResponse<CallToolResult>>;
|
|
55
56
|
get sessionId(): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveClient.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,cAAc,EAGnB,KAAK,IAAI,EACV,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"serveClient.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ export class StreamableServeClient {
|
|
|
24
24
|
sessionId,
|
|
25
25
|
requestInit: {
|
|
26
26
|
headers,
|
|
27
|
+
redirect: 'error',
|
|
27
28
|
},
|
|
28
29
|
});
|
|
29
30
|
this.transport.onmessage = (message) => {
|
|
@@ -39,7 +40,7 @@ export class StreamableServeClient {
|
|
|
39
40
|
async start() {
|
|
40
41
|
await this.transport.start();
|
|
41
42
|
}
|
|
42
|
-
async initialize(context) {
|
|
43
|
+
async initialize(context, contextProof) {
|
|
43
44
|
const response = await this.sendRequest('initialize', {
|
|
44
45
|
protocolVersion: LATEST_PROTOCOL_VERSION,
|
|
45
46
|
capabilities: {},
|
|
@@ -51,6 +52,7 @@ export class StreamableServeClient {
|
|
|
51
52
|
? {
|
|
52
53
|
_meta: {
|
|
53
54
|
context,
|
|
55
|
+
...(contextProof ? { contextProof } : {}),
|
|
54
56
|
},
|
|
55
57
|
}
|
|
56
58
|
: {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveClient.js","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAGL,uBAAuB,GAExB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"serveClient.js","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,10 @@ export interface ResolvedServeTarget<TOptions extends ResolvableServeTargetOptio
|
|
|
23
23
|
kind: 'local' | 'remote';
|
|
24
24
|
runtimeScopeId?: string;
|
|
25
25
|
};
|
|
26
|
+
localRuntimeScope?: {
|
|
27
|
+
storagePath: string;
|
|
28
|
+
runtimeScopeId?: string;
|
|
29
|
+
};
|
|
26
30
|
runtimeIdentityWarnings?: RuntimeIdentityWarning[];
|
|
27
31
|
}
|
|
28
32
|
export interface ServeTargetResolverPorts {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveTargetResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"serveTargetResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAEvE,OAAO,EACL,KAAK,sBAAsB,EAE3B,8BAA8B,EAC/B,MAAM,6DAA6D,CAAC;AAMrE,OAAO,EAIL,kBAAkB,EAEnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAO3D,MAAM,WAAW,4BAA6B,SAAQ,aAAa,EAAE,eAAe;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,4BAA4B;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACxC,oBAAoB,EAAE,gBAAgB,GAAG,WAAW,GAAG,KAAK,CAAC;IAC7D,oBAAoB,CAAC,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE,IAAI,CACvB,kBAAkB,EAClB,SAAS,GAAG,SAAS,GAAG,gCAAgC,GAAG,gCAAgC,CAC5F,GACC,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAC5D,qBAAqB,CAAC,EAAE,OAAO,8BAA8B,CAAC;CAC/D;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,4BAA4B,EACnF,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,QAAQ,CAgBV;AAsCD,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,4BAA4B,EACpF,OAAO,EAAE,QAAQ,EACjB,KAAK,GAAE,wBAA6B,GACnC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CA6GxC"}
|