@1mcp/agent 0.35.0-beta.3 → 0.35.0
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-AboutRuntimeWorkspace-DH2QC2nJ.js +1 -0
- package/build/admin/assets/admin-BackendLogsWorkspace-BKavXT9B.js +1 -0
- package/build/admin/assets/admin-InstructionTemplatesWorkspace-CvG4EPdZ.js +1 -0
- package/build/admin/assets/admin-OAuthServicesWorkspace-B8y2weAX.js +1 -0
- package/build/admin/assets/admin-PresetAuthoringWorkspace-BboJVBFl.js +1 -0
- package/build/admin/assets/admin-console-D6jyI73o.css +1 -0
- package/build/admin/assets/{admin-console-Bbil6BQU.css → admin-console-DmRyrCWD.css} +1 -1
- package/build/admin/assets/admin-console-HJH52xGP.js +3 -0
- package/build/admin/assets/admin-icons-CYGTDZA5.js +1 -0
- package/build/admin/assets/admin-mantine-xwbfu5Gd.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/sdkOAuthClientProvider.d.ts +4 -0
- package/build/auth/sdkOAuthClientProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthClientProvider.js +29 -0
- package/build/auth/sdkOAuthClientProvider.js.map +1 -1
- package/build/auth/sessionTypes.d.ts +2 -0
- package/build/auth/sessionTypes.d.ts.map +1 -1
- package/build/auth/sessionTypes.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 +4 -1
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/instructions/instructions.d.ts.map +1 -1
- package/build/commands/instructions/instructions.js +56 -1
- package/build/commands/instructions/instructions.js.map +1 -1
- package/build/commands/mcp/add.js +2 -2
- package/build/commands/mcp/add.js.map +1 -1
- package/build/commands/mcp/list.js +1 -1
- package/build/commands/mcp/list.js.map +1 -1
- package/build/commands/mcp/update.js +1 -1
- package/build/commands/mcp/update.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 +4 -1
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/serve/index.d.ts +10 -0
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +10 -0
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +3 -0
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +20 -0
- 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 +2 -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 +3 -0
- package/build/commands/shared/apiClient.d.ts.map +1 -1
- package/build/commands/shared/apiClient.js +6 -0
- package/build/commands/shared/apiClient.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +11 -0
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.js +64 -6
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
- package/build/commands/shared/inspectApiSchemas.d.ts +8 -8
- 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 +22 -22
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/commands/wait/wait.d.ts.map +1 -1
- package/build/commands/wait/wait.js +1 -0
- package/build/commands/wait/wait.js.map +1 -1
- package/build/config/configManager.d.ts +11 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +13 -0
- package/build/config/configManager.js.map +1 -1
- package/build/config/configuredServerTargets.d.ts +3 -0
- package/build/config/configuredServerTargets.d.ts.map +1 -0
- package/build/config/configuredServerTargets.js +8 -0
- package/build/config/configuredServerTargets.js.map +1 -0
- package/build/config/mcpConfigManager.d.ts +3 -0
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +15 -0
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/constants/api.d.ts +1 -0
- package/build/constants/api.d.ts.map +1 -1
- package/build/constants/api.js +1 -0
- package/build/constants/api.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js +33 -14
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +23 -1
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +81 -7
- 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 +287 -0
- package/build/core/capabilities/capabilityPagination.js.map +1 -0
- package/build/core/capabilities/capabilityVisibility.d.ts +2 -1
- package/build/core/capabilities/capabilityVisibility.d.ts.map +1 -1
- package/build/core/capabilities/capabilityVisibility.js +2 -1
- package/build/core/capabilities/capabilityVisibility.js.map +1 -1
- package/build/core/capabilities/configuredToolSnapshot.d.ts +12 -0
- package/build/core/capabilities/configuredToolSnapshot.d.ts.map +1 -0
- package/build/core/capabilities/configuredToolSnapshot.js +98 -0
- package/build/core/capabilities/configuredToolSnapshot.js.map +1 -0
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +8 -4
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +3 -3
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/client/clientManager.d.ts.map +1 -1
- package/build/core/client/clientManager.js +11 -6
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/client/postAuthOAuthRecovery.d.ts +6 -0
- package/build/core/client/postAuthOAuthRecovery.d.ts.map +1 -0
- package/build/core/client/postAuthOAuthRecovery.js +74 -0
- package/build/core/client/postAuthOAuthRecovery.js.map +1 -0
- package/build/core/configChangeHandler.d.ts +2 -0
- package/build/core/configChangeHandler.d.ts.map +1 -1
- package/build/core/configChangeHandler.js +38 -11
- package/build/core/configChangeHandler.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/effectiveServerInstructions.d.ts +17 -0
- package/build/core/instructions/effectiveServerInstructions.d.ts.map +1 -0
- package/build/core/instructions/effectiveServerInstructions.js +12 -0
- package/build/core/instructions/effectiveServerInstructions.js.map +1 -0
- package/build/core/instructions/instructionAggregator.d.ts +51 -2
- package/build/core/instructions/instructionAggregator.d.ts.map +1 -1
- package/build/core/instructions/instructionAggregator.js +191 -30
- package/build/core/instructions/instructionAggregator.js.map +1 -1
- package/build/core/instructions/instructionsDistribution.d.ts +53 -0
- package/build/core/instructions/instructionsDistribution.d.ts.map +1 -1
- package/build/core/instructions/instructionsDistribution.js +25 -0
- package/build/core/instructions/instructionsDistribution.js.map +1 -1
- package/build/core/instructions/templateTypes.d.ts +25 -3
- package/build/core/instructions/templateTypes.d.ts.map +1 -1
- package/build/core/instructions/templateTypes.js +45 -0
- package/build/core/instructions/templateTypes.js.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 +4 -0
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.js +24 -4
- 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 +79 -23
- package/build/core/protocol/toolRequestHandlers.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/clientInstancePool.js +2 -2
- package/build/core/server/clientInstancePool.js.map +1 -1
- package/build/core/server/connectionManager.d.ts.map +1 -1
- package/build/core/server/connectionManager.js +2 -0
- package/build/core/server/connectionManager.js.map +1 -1
- package/build/core/server/disabledTools.d.ts +2 -0
- package/build/core/server/disabledTools.d.ts.map +1 -1
- package/build/core/server/disabledTools.js +7 -4
- package/build/core/server/disabledTools.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/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +1 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/server/templateIdentity.d.ts +1 -0
- package/build/core/server/templateIdentity.d.ts.map +1 -1
- package/build/core/server/templateIdentity.js +11 -1
- package/build/core/server/templateIdentity.js.map +1 -1
- package/build/core/server/templateServerManager.d.ts +5 -1
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +27 -9
- package/build/core/server/templateServerManager.js.map +1 -1
- package/build/core/server/toolDescriptionOverrides.d.ts +9 -0
- package/build/core/server/toolDescriptionOverrides.d.ts.map +1 -0
- package/build/core/server/toolDescriptionOverrides.js +44 -0
- package/build/core/server/toolDescriptionOverrides.js.map +1 -0
- package/build/core/tools/handlers/serverManagementHandler.d.ts +15 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +2 -0
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/discovery.d.ts +2 -2
- package/build/core/tools/internal/schemas/index.d.ts +9 -9
- package/build/core/tools/internal/schemas/installation.d.ts +3 -3
- package/build/core/tools/internal/schemas/management.d.ts +4 -4
- 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 +43 -0
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +60 -1
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.d.ts +131 -4
- package/build/domains/admin/adminConfiguredServerService.d.ts.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.js +766 -39
- package/build/domains/admin/adminConfiguredServerService.js.map +1 -1
- package/build/domains/admin/adminDomain.d.ts +13 -0
- package/build/domains/admin/adminDomain.d.ts.map +1 -1
- package/build/domains/admin/adminDomain.js +16 -0
- package/build/domains/admin/adminDomain.js.map +1 -1
- package/build/domains/admin/adminInstructionPreviewRuntime.d.ts +7 -0
- package/build/domains/admin/adminInstructionPreviewRuntime.d.ts.map +1 -0
- package/build/domains/admin/adminInstructionPreviewRuntime.js +154 -0
- package/build/domains/admin/adminInstructionPreviewRuntime.js.map +1 -0
- package/build/domains/admin/adminInstructionTemplateService.d.ts +169 -0
- package/build/domains/admin/adminInstructionTemplateService.d.ts.map +1 -0
- package/build/domains/admin/adminInstructionTemplateService.js +181 -0
- package/build/domains/admin/adminInstructionTemplateService.js.map +1 -0
- package/build/domains/admin/configuredToolInventory.d.ts +46 -0
- package/build/domains/admin/configuredToolInventory.d.ts.map +1 -0
- package/build/domains/admin/configuredToolInventory.js +135 -0
- package/build/domains/admin/configuredToolInventory.js.map +1 -0
- package/build/domains/backend-logs/backendLogSource.d.ts.map +1 -1
- package/build/domains/backend-logs/backendLogSource.js.map +1 -1
- 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 +241 -13
- package/build/domains/config-change/configChange.js.map +1 -1
- package/build/domains/config-change/types.d.ts +34 -2
- 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/instruction-template/instructionTemplateManager.d.ts +58 -0
- package/build/domains/instruction-template/instructionTemplateManager.d.ts.map +1 -0
- package/build/domains/instruction-template/instructionTemplateManager.js +167 -0
- package/build/domains/instruction-template/instructionTemplateManager.js.map +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.js +6 -5
- package/build/domains/runtime-targets/runtimeIdentityVerification.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 +422 -23
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/apiRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/apiRoutes.js +2 -0
- package/build/transport/http/routes/apiRoutes.js.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.d.ts +2 -0
- package/build/transport/http/routes/inspectRequestContext.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.js +15 -6
- package/build/transport/http/routes/inspectRequestContext.js.map +1 -1
- package/build/transport/http/routes/inspectRoutes.d.ts +9 -0
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +15 -10
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/instructionsRoutes.d.ts +4 -0
- package/build/transport/http/routes/instructionsRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/instructionsRoutes.js +147 -0
- package/build/transport/http/routes/instructionsRoutes.js.map +1 -0
- 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 +5 -4
- 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 +17 -0
- 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/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/utils/validation/discoveredServer.d.ts +15 -0
- package/build/utils/validation/discoveredServer.d.ts.map +1 -0
- package/build/utils/validation/discoveredServer.js +2 -0
- package/build/utils/validation/discoveredServer.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts +4 -5
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +94 -25
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +2 -2
- package/build/admin/assets/admin-console-BOl7XR0p.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,
|
|
@@ -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;
|
|
@@ -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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"}
|
|
@@ -5,10 +5,10 @@ export declare const clientServerStatusSchema: z.ZodEnum<{
|
|
|
5
5
|
connected: "connected";
|
|
6
6
|
disconnected: "disconnected";
|
|
7
7
|
awaiting_oauth: "awaiting_oauth";
|
|
8
|
-
pending: "pending";
|
|
9
|
-
loading: "loading";
|
|
10
8
|
failed: "failed";
|
|
11
9
|
cancelled: "cancelled";
|
|
10
|
+
pending: "pending";
|
|
11
|
+
loading: "loading";
|
|
12
12
|
initializing: "initializing";
|
|
13
13
|
}>;
|
|
14
14
|
export declare const inspectServerSummarySchema: z.ZodObject<{
|
|
@@ -20,10 +20,10 @@ export declare const inspectServerSummarySchema: z.ZodObject<{
|
|
|
20
20
|
connected: "connected";
|
|
21
21
|
disconnected: "disconnected";
|
|
22
22
|
awaiting_oauth: "awaiting_oauth";
|
|
23
|
-
pending: "pending";
|
|
24
|
-
loading: "loading";
|
|
25
23
|
failed: "failed";
|
|
26
24
|
cancelled: "cancelled";
|
|
25
|
+
pending: "pending";
|
|
26
|
+
loading: "loading";
|
|
27
27
|
initializing: "initializing";
|
|
28
28
|
}>;
|
|
29
29
|
available: z.ZodBoolean;
|
|
@@ -40,10 +40,10 @@ export declare const inspectServersResultSchema: z.ZodObject<{
|
|
|
40
40
|
connected: "connected";
|
|
41
41
|
disconnected: "disconnected";
|
|
42
42
|
awaiting_oauth: "awaiting_oauth";
|
|
43
|
-
pending: "pending";
|
|
44
|
-
loading: "loading";
|
|
45
43
|
failed: "failed";
|
|
46
44
|
cancelled: "cancelled";
|
|
45
|
+
pending: "pending";
|
|
46
|
+
loading: "loading";
|
|
47
47
|
initializing: "initializing";
|
|
48
48
|
}>;
|
|
49
49
|
available: z.ZodBoolean;
|
|
@@ -59,10 +59,10 @@ export declare const inspectServerResultSchema: z.ZodObject<{
|
|
|
59
59
|
connected: "connected";
|
|
60
60
|
disconnected: "disconnected";
|
|
61
61
|
awaiting_oauth: "awaiting_oauth";
|
|
62
|
-
pending: "pending";
|
|
63
|
-
loading: "loading";
|
|
64
62
|
failed: "failed";
|
|
65
63
|
cancelled: "cancelled";
|
|
64
|
+
pending: "pending";
|
|
65
|
+
loading: "loading";
|
|
66
66
|
initializing: "initializing";
|
|
67
67
|
}>;
|
|
68
68
|
available: z.ZodBoolean;
|
|
@@ -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,CAyGxC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { buildServerUrl } from '../../commands/shared/serveClient.js';
|
|
2
2
|
import { normalizeTags, resolveProjectContext } from '../../config/projectConfigLoader.js';
|
|
3
|
+
import { getConfigDir } from '../../constants.js';
|
|
3
4
|
import { verifyRuntimeIdentityForTarget, } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
|
|
4
5
|
import { localRuntimeStatusCommand, RuntimeProbeError, runtimeTargetVerifyCommand, } from '../../domains/runtime-targets/runtimeProbe.js';
|
|
5
6
|
import { assertRuntimeTargetConfigDirAllowed, normalizeRuntimeTargetUrl, RuntimeTargetStore, RuntimeTargetStoreError, } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
@@ -94,9 +95,9 @@ export async function resolveServeTarget(options, ports = {}) {
|
|
|
94
95
|
};
|
|
95
96
|
}
|
|
96
97
|
const localDiscovery = await discoverServerWithPidFile(mergedOptions['config-dir'], mergedOptions.url);
|
|
97
|
-
const { url: discoveredUrl, pid: serverPid, source } = localDiscovery;
|
|
98
|
-
const validation = await validateServer1mcpUrl(discoveredUrl);
|
|
99
|
-
if (!validation.valid) {
|
|
98
|
+
const { url: discoveredUrl, pid: serverPid, source, validated, runtimeIdentity } = localDiscovery;
|
|
99
|
+
const validation = validated ? undefined : await validateServer1mcpUrl(discoveredUrl);
|
|
100
|
+
if (validation && !validation.valid) {
|
|
100
101
|
const isEphemeral = Boolean(mergedOptions.url);
|
|
101
102
|
throw new RuntimeProbeError(toRuntimeProbeFailure(validation, discoveredUrl), {
|
|
102
103
|
targetKind: isEphemeral ? 'ephemeral' : 'local',
|
|
@@ -109,23 +110,18 @@ export async function resolveServeTarget(options, ports = {}) {
|
|
|
109
110
|
: {}),
|
|
110
111
|
});
|
|
111
112
|
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
if (mergedOptions.context === 'local') {
|
|
125
|
-
throw error;
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
}
|
|
113
|
+
const isExplicitLocalContext = !mergedOptions.url && mergedOptions.context === 'local';
|
|
114
|
+
const candidateRuntimeIdentity = runtimeIdentity ?? validation?.identity;
|
|
115
|
+
const localRuntimeIdentity = isExplicitLocalContext && candidateRuntimeIdentity
|
|
116
|
+
? await (ports.verifyRuntimeIdentity ?? verifyRuntimeIdentityForTarget)({
|
|
117
|
+
target: {
|
|
118
|
+
name: 'local',
|
|
119
|
+
url: withoutMcpSuffix(discoveredUrl),
|
|
120
|
+
observedIdentity: undefined,
|
|
121
|
+
},
|
|
122
|
+
candidateIdentity: candidateRuntimeIdentity,
|
|
123
|
+
})
|
|
124
|
+
: undefined;
|
|
129
125
|
return {
|
|
130
126
|
cwd: resolvedProjectContext.cwd,
|
|
131
127
|
projectRoot: resolvedProjectContext.projectRoot,
|
|
@@ -137,13 +133,17 @@ export async function resolveServeTarget(options, ports = {}) {
|
|
|
137
133
|
serverPid,
|
|
138
134
|
source,
|
|
139
135
|
projectContextSource: resolvedProjectContext.source,
|
|
140
|
-
runtimeTargetContext:
|
|
136
|
+
runtimeTargetContext: isExplicitLocalContext
|
|
141
137
|
? {
|
|
142
138
|
name: 'local',
|
|
143
139
|
kind: 'local',
|
|
144
|
-
runtimeScopeId: localRuntimeIdentity
|
|
140
|
+
runtimeScopeId: localRuntimeIdentity?.identity.runtimeScopeId,
|
|
145
141
|
}
|
|
146
142
|
: undefined,
|
|
143
|
+
localRuntimeScope: {
|
|
144
|
+
storagePath: getConfigDir(mergedOptions['config-dir']),
|
|
145
|
+
runtimeScopeId: localRuntimeIdentity?.identity.runtimeScopeId,
|
|
146
|
+
},
|
|
147
147
|
runtimeIdentityWarnings: localRuntimeIdentity?.warnings,
|
|
148
148
|
};
|
|
149
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveTargetResolver.js","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAwB,MAAM,qCAAqC,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE1F,OAAO,EAGL,8BAA8B,GAC/B,MAAM,6DAA6D,CAAC;AACrE,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,mCAAmC,EACnC,yBAAyB,EAEzB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,oDAAoD,CAAC;AAE5D,OAAO,EACL,yBAAyB,EACzB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"serveTargetResolver.js","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/commands/wait/wait.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,8BAA8B,EAGpC,MAAM,iDAAiD,CAAC;AAEzD,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAElH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACnC;AAqBD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,IAAI,EAAE,MAAM;aAEZ,eAAe,EAAE,MAAM;aACvB,OAAO,CAAC,EAAE,OAAO;gBAHjB,IAAI,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACC,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,OAAO,YAAA;CAKpC;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5E;AAMD,wBAAsB,cAAc,CAClC,OAAO,EAAE,8BAA8B,CAAC,kBAAkB,CAAC,EAC3D,OAAO,EAAE,MAAM,GACd,OAAO,CACN;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GACxC;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CACvC,
|
|
1
|
+
{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/commands/wait/wait.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,8BAA8B,EAGpC,MAAM,iDAAiD,CAAC;AAEzD,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAElH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACnC;AAqBD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,IAAI,EAAE,MAAM;aAEZ,eAAe,EAAE,MAAM;aACvB,OAAO,CAAC,EAAE,OAAO;gBAHjB,IAAI,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACC,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,OAAO,YAAA;CAKpC;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5E;AAMD,wBAAsB,cAAc,CAClC,OAAO,EAAE,8BAA8B,CAAC,kBAAkB,CAAC,EAC3D,OAAO,EAAE,MAAM,GACd,OAAO,CACN;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GACxC;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CACvC,CA+CA;AAYD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAkB1G"}
|
|
@@ -83,6 +83,7 @@ export async function waitForServers(context, timeout) {
|
|
|
83
83
|
bearerToken: context.bearerToken,
|
|
84
84
|
sessionId: context.sessionId,
|
|
85
85
|
context: context.context,
|
|
86
|
+
contextProof: context.contextProof,
|
|
86
87
|
});
|
|
87
88
|
const startedAt = Date.now();
|
|
88
89
|
const deadline = startedAt + timeout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/wait/wait.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/wait/wait.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { ApplicationConfig, MCPServerParams } from '../core/types/transport.js';
|
|
2
|
+
import { ApplicationConfig, MCPServerConfiguration, MCPServerParams } from '../core/types/transport.js';
|
|
3
3
|
import type { ContextData } from '../types/context.js';
|
|
4
4
|
import { CONFIG_EVENTS, ConfigChange, ConfigChangeType } from './types.js';
|
|
5
5
|
export declare class ConfigManager extends EventEmitter {
|
|
@@ -64,6 +64,16 @@ export declare class ConfigManager extends EventEmitter {
|
|
|
64
64
|
* @returns Array of template processing error messages
|
|
65
65
|
*/
|
|
66
66
|
getTemplateProcessingErrors(): string[];
|
|
67
|
+
/** Return the unrendered instruction configuration used by both runtime surfaces. */
|
|
68
|
+
getRuntimeInstructionConfiguration(): {
|
|
69
|
+
instructionTemplates?: MCPServerConfiguration['instructionTemplates'];
|
|
70
|
+
publishedInstructionTemplates?: MCPServerConfiguration['publishedInstructionTemplates'];
|
|
71
|
+
activeInstructionTemplate?: string;
|
|
72
|
+
configuredTargets: {
|
|
73
|
+
mcpServers: MCPServerConfiguration['mcpServers'];
|
|
74
|
+
mcpTemplates: NonNullable<MCPServerConfiguration['mcpTemplates']>;
|
|
75
|
+
};
|
|
76
|
+
};
|
|
67
77
|
/**
|
|
68
78
|
* Check if there are any template processing errors
|
|
69
79
|
* @returns True if there are template processing errors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAKtC,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAKtC,OAAO,EACL,iBAAiB,EAEjB,sBAAsB,EACtB,eAAe,EAGhB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AASzD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3E,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAuC;IAC9D,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,cAAc,CAAuB;IAG7C,OAAO,CAAC,wBAAwB,CAAgB;IAChD,OAAO,CAAC,kBAAkB,CAAuC;IACjE,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,gBAAgB,CAAC,CAA6B;IACtD,OAAO,CAAC,8BAA8B,CAGS;IAE/C;;;OAGG;IACH,OAAO;WAUO,WAAW,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,aAAa;IAOjE,OAAO,CAAC,kBAAkB;IAQb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,OAAO,CAAC,UAAU;IAelB;;;;OAIG;IACU,uBAAuB,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;QACnE,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC/C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACjD,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;IAsGF;;;;OAIG;IACI,yBAAyB,IAAI;QAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC/C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACjD,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB;IA0DD,OAAO,CAAC,kCAAkC;IAU1C;;;;;;OAMG;YACW,gBAAgB;IAsC9B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAInB;;;OAGG;IACI,2BAA2B,IAAI,MAAM,EAAE;IAI9C,qFAAqF;IAC9E,kCAAkC,IAAI;QAC3C,oBAAoB,CAAC,EAAE,sBAAsB,CAAC,sBAAsB,CAAC,CAAC;QACtE,6BAA6B,CAAC,EAAE,sBAAsB,CAAC,+BAA+B,CAAC,CAAC;QACxF,yBAAyB,CAAC,EAAE,MAAM,CAAC;QACnC,iBAAiB,EAAE;YACjB,UAAU,EAAE,sBAAsB,CAAC,YAAY,CAAC,CAAC;YACjD,YAAY,EAAE,WAAW,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC,CAAC;SACnE,CAAC;KACH;IAaD;;;OAGG;IACI,2BAA2B,IAAI,OAAO;IAI7C;;OAEG;IACI,kBAAkB,IAAI,IAAI;IAMjC;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;OAGG;IACH,OAAO,CAAC,aAAa;IAKrB;;OAEG;IACI,eAAe,IAAI,OAAO;YAInB,kBAAkB;IAsCnB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAInC,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAIrD,gBAAgB,IAAI,MAAM,EAAE;IAI5B,YAAY,IAAI,iBAAiB;CAGzC;AAED,YAAY,EAAE,YAAY,EAAE,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAC;AAE3C,eAAe,aAAa,CAAC"}
|
|
@@ -284,6 +284,19 @@ export class ConfigManager extends EventEmitter {
|
|
|
284
284
|
getTemplateProcessingErrors() {
|
|
285
285
|
return [...this.templateProcessingErrors];
|
|
286
286
|
}
|
|
287
|
+
/** Return the unrendered instruction configuration used by both runtime surfaces. */
|
|
288
|
+
getRuntimeInstructionConfiguration() {
|
|
289
|
+
const config = mcpServerConfigSchema.parse(this.loadRawConfig());
|
|
290
|
+
return {
|
|
291
|
+
instructionTemplates: config.instructionTemplates,
|
|
292
|
+
publishedInstructionTemplates: config.publishedInstructionTemplates,
|
|
293
|
+
activeInstructionTemplate: config.activeInstructionTemplate,
|
|
294
|
+
configuredTargets: {
|
|
295
|
+
mcpServers: config.mcpServers,
|
|
296
|
+
mcpTemplates: config.mcpTemplates ?? {},
|
|
297
|
+
},
|
|
298
|
+
};
|
|
299
|
+
}
|
|
287
300
|
/**
|
|
288
301
|
* Check if there are any template processing errors
|
|
289
302
|
* @returns True if there are template processing errors
|