@1mcp/agent 0.38.0 → 0.38.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/admin/assets/{admin-OAuthServicesWorkspace-CzXIIHM0.js → admin-OAuthServicesWorkspace-C3DNmymC.js} +1 -1
- package/build/admin/assets/{admin-console-Mv3xmdoU.js → admin-console-BmdH0cQS.js} +3 -3
- package/build/admin/index.html +1 -1
- package/build/auth/oauthAuthorizationFlow.d.ts +4 -0
- package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
- package/build/auth/oauthAuthorizationFlow.js +61 -4
- package/build/auth/oauthAuthorizationFlow.js.map +1 -1
- package/build/auth/storage/authCodeRepository.d.ts +1 -1
- package/build/auth/storage/authRequestRepository.d.ts +1 -1
- package/build/auth/storage/clientSessionRepository.d.ts +1 -1
- package/build/auth/storage/fileStorageService.d.ts +1 -1
- package/build/auth/storage/refreshTokenFamilyRepository.d.ts +1 -1
- package/build/auth/storage/refreshTokenFamilyRepository.js +1 -1
- package/build/auth/storage/sessionRepository.d.ts +1 -1
- package/build/auth/storage/sessionRepository.js +1 -1
- package/build/commands/admin/admin.d.ts +2 -2
- package/build/commands/admin/admin.js +3 -3
- package/build/commands/admin/index.js +1 -1
- package/build/commands/app/consolidate.js +1 -1
- package/build/commands/auth/index.js +1 -1
- package/build/commands/auth/login.js +1 -1
- package/build/commands/auth/runtimeTargetContext.js +1 -1
- package/build/commands/auth/status.js +1 -1
- package/build/commands/inspect/index.js +1 -1
- package/build/commands/inspect/inspect.d.ts +2 -2
- package/build/commands/inspect/inspect.d.ts.map +1 -1
- package/build/commands/inspect/inspect.js +37 -7
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/inspect/inspectUtils.d.ts +1 -1
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -1
- package/build/commands/inspect/inspectUtils.js +12 -3
- package/build/commands/inspect/inspectUtils.js.map +1 -1
- package/build/commands/instructions/index.js +1 -1
- package/build/commands/instructions/instructions.js +4 -4
- package/build/commands/mcp/enable.d.ts +1 -1
- package/build/commands/mcp/enable.js +2 -2
- package/build/commands/mcp/restart.d.ts +1 -1
- package/build/commands/mcp/restart.js +2 -2
- package/build/commands/mcp/status.d.ts +1 -1
- package/build/commands/mcp/status.js +2 -2
- package/build/commands/mcp/tokens.js +1 -1
- package/build/commands/mcp/tools.d.ts +1 -1
- package/build/commands/mcp/tools.js +1 -1
- package/build/commands/mcp/utils/mcpServerConfig.d.ts +1 -1
- package/build/commands/mcp/utils/mcpServerConfig.js +2 -2
- package/build/commands/preset/edit.js +1 -1
- package/build/commands/preset/interactive.js +1 -1
- package/build/commands/preset/show.js +1 -1
- package/build/commands/preset/test.js +1 -1
- package/build/commands/proxy/proxy.js +1 -1
- package/build/commands/run/index.js +1 -1
- package/build/commands/run/run.d.ts +3 -3
- package/build/commands/run/run.d.ts.map +1 -1
- package/build/commands/run/run.js +14 -8
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/run/upstreamEofGuidance.d.ts +3 -0
- package/build/commands/run/upstreamEofGuidance.d.ts.map +1 -0
- package/build/commands/run/upstreamEofGuidance.js +19 -0
- package/build/commands/run/upstreamEofGuidance.js.map +1 -0
- package/build/commands/serve/serveBackground.d.ts +3 -0
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +19 -5
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/serve/serveStatus.d.ts +2 -1
- package/build/commands/serve/serveStatus.d.ts.map +1 -1
- package/build/commands/serve/serveStatus.js +30 -12
- package/build/commands/serve/serveStatus.js.map +1 -1
- package/build/commands/serve/serveStop.d.ts +2 -1
- package/build/commands/serve/serveStop.d.ts.map +1 -1
- package/build/commands/serve/serveStop.js +113 -20
- package/build/commands/serve/serveStop.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +3 -3
- package/build/commands/shared/clientSurfaceAttachment.js +4 -4
- package/build/commands/shared/inspectApiSchemas.d.ts +13 -0
- package/build/commands/shared/inspectApiSchemas.d.ts.map +1 -1
- package/build/commands/shared/inspectApiSchemas.js +18 -0
- package/build/commands/shared/inspectApiSchemas.js.map +1 -1
- package/build/commands/shared/serveTargetResolver.d.ts +1 -1
- package/build/commands/shared/serveTargetResolver.js +1 -1
- package/build/commands/target/index.js +1 -1
- package/build/commands/wait/index.js +1 -1
- package/build/commands/wait/wait.d.ts +2 -2
- package/build/commands/wait/wait.js +4 -4
- package/build/config/configLoader.js +1 -1
- package/build/config/configManager.js +3 -3
- package/build/config/configuredServerTargets.js +1 -1
- package/build/config/mcpConfigManager.js +3 -3
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/constants.d.ts +1 -1
- package/build/constants.js +1 -1
- package/build/core/capabilities/asyncLoadingOrchestrator.d.ts +4 -4
- package/build/core/capabilities/asyncLoadingOrchestrator.js +3 -3
- package/build/core/capabilities/capabilityAggregator.d.ts +1 -1
- package/build/core/capabilities/capabilityAggregator.js +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +2 -2
- package/build/core/capabilities/capabilityCatalog.js +5 -5
- package/build/core/capabilities/capabilityManager.d.ts +1 -1
- package/build/core/capabilities/capabilityManager.js +2 -2
- package/build/core/capabilities/capabilityPagination.d.ts +1 -1
- package/build/core/capabilities/configuredToolSnapshot.d.ts +1 -1
- package/build/core/capabilities/configuredToolSnapshot.js +1 -1
- package/build/core/capabilities/inspectPagination.d.ts +16 -0
- package/build/core/capabilities/inspectPagination.d.ts.map +1 -0
- package/build/core/capabilities/inspectPagination.js +41 -0
- package/build/core/capabilities/inspectPagination.js.map +1 -0
- package/build/core/capabilities/internal/discoveryTools.js +1 -1
- package/build/core/capabilities/internal/installationTools.js +1 -1
- package/build/core/capabilities/internal/managementTools.js +1 -1
- package/build/core/capabilities/internalCapabilitiesProvider.d.ts +2 -2
- package/build/core/capabilities/internalCapabilitiesProvider.js +8 -8
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +3 -3
- package/build/core/capabilities/lazyLoadingOrchestrator.js +3 -3
- package/build/core/capabilities/metaToolProvider.d.ts +2 -2
- package/build/core/capabilities/runtimeCapabilityCatalog.d.ts +1 -1
- package/build/core/capabilities/runtimeCapabilityCatalog.js +4 -4
- package/build/core/capabilities/toolRegistry.d.ts +1 -1
- package/build/core/client/postAuthOAuthRecovery.d.ts +1 -1
- package/build/core/client/postAuthOAuthRecovery.js +3 -3
- package/build/core/client/renderableOutboundConnection.d.ts +2 -2
- package/build/core/configChangeHandler.js +6 -6
- package/build/core/filtering/clientFiltering.d.ts +1 -1
- package/build/core/filtering/filterCache.d.ts +1 -1
- package/build/core/filtering/filterSelection.d.ts +1 -1
- package/build/core/filtering/filteringService.d.ts +1 -1
- package/build/core/filtering/filteringService.js +1 -1
- package/build/core/filtering/templateFilteringService.d.ts +2 -2
- package/build/core/filtering/templateIndex.d.ts +1 -1
- package/build/core/flags/flagManager.js +1 -1
- package/build/core/instructions/effectiveServerInstructions.d.ts +1 -1
- package/build/core/instructions/instructionAggregator.d.ts +3 -3
- package/build/core/instructions/instructionAggregator.js +1 -1
- package/build/core/loading/loadingStateTracker.d.ts.map +1 -1
- package/build/core/loading/loadingStateTracker.js +5 -1
- package/build/core/loading/loadingStateTracker.js.map +1 -1
- package/build/core/loading/mcpLoadingManager.d.ts +2 -2
- package/build/core/notifications/notificationManager.d.ts +2 -2
- package/build/core/notifications/notificationManager.js +2 -2
- package/build/core/protocol/requestHandlerUtils.d.ts +4 -4
- package/build/core/protocol/requestHandlerUtils.js +9 -9
- package/build/core/server/adapters/ExternalServerAdapter.d.ts +2 -2
- package/build/core/server/adapters/ServerRegistry.d.ts +3 -3
- package/build/core/server/adapters/TemplateServerAdapter.d.ts +3 -3
- package/build/core/server/adapters/types.d.ts +3 -3
- package/build/core/server/adapters/types.js +1 -1
- package/build/core/server/agentConfig.d.ts +3 -3
- package/build/core/server/agentConfig.js +2 -2
- package/build/core/server/backendStdioSupervisor.d.ts.map +1 -1
- package/build/core/server/backendStdioSupervisor.js +8 -5
- package/build/core/server/backendStdioSupervisor.js.map +1 -1
- package/build/core/server/backgroundLaunchConfig.d.ts +1 -1
- package/build/core/server/backgroundLaunchConfig.js +1 -1
- package/build/core/server/backgroundRuntimeSupervisor.d.ts +2 -2
- package/build/core/server/backgroundRuntimeSupervisor.d.ts.map +1 -1
- package/build/core/server/backgroundRuntimeSupervisor.js +12 -4
- package/build/core/server/backgroundRuntimeSupervisor.js.map +1 -1
- package/build/core/server/backgroundRuntimeSupervisorState.d.ts +3 -0
- package/build/core/server/backgroundRuntimeSupervisorState.d.ts.map +1 -1
- package/build/core/server/backgroundRuntimeSupervisorState.js +3 -0
- package/build/core/server/backgroundRuntimeSupervisorState.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts +1 -1
- package/build/core/server/disabledTools.d.ts +1 -1
- package/build/core/server/pidFileManager.d.ts +6 -2
- package/build/core/server/pidFileManager.d.ts.map +1 -1
- package/build/core/server/pidFileManager.js +13 -4
- package/build/core/server/pidFileManager.js.map +1 -1
- package/build/core/server/processIdentity.d.ts +27 -0
- package/build/core/server/processIdentity.d.ts.map +1 -0
- package/build/core/server/processIdentity.js +101 -0
- package/build/core/server/processIdentity.js.map +1 -0
- package/build/core/server/runtimeFileLock.d.ts +6 -0
- package/build/core/server/runtimeFileLock.d.ts.map +1 -0
- package/build/core/server/runtimeFileLock.js +34 -0
- package/build/core/server/runtimeFileLock.js.map +1 -0
- package/build/core/server/runtimeLifecycle.d.ts +5 -5
- package/build/core/server/runtimeLifecycle.d.ts.map +1 -1
- package/build/core/server/runtimeLifecycle.js +16 -3
- package/build/core/server/runtimeLifecycle.js.map +1 -1
- package/build/core/server/runtimeScopeOwnership.d.ts +3 -0
- package/build/core/server/runtimeScopeOwnership.d.ts.map +1 -1
- package/build/core/server/runtimeScopeOwnership.js +95 -28
- package/build/core/server/runtimeScopeOwnership.js.map +1 -1
- package/build/core/server/templateConfigurationManager.d.ts +1 -1
- package/build/core/server/toolDescriptionOverrides.d.ts +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +4 -4
- package/build/core/tools/handlers/serverManagementHandler.js +3 -3
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.js +2 -2
- package/build/core/tools/internal/adapters/management/toolHandlers.js +1 -1
- package/build/core/tools/internal/adapters/management/types.d.ts +1 -1
- package/build/core/tools/internal/adapters/management/validation.d.ts +1 -1
- package/build/core/tools/internal/adapters/validation/configValidation.d.ts +1 -1
- package/build/core/tools/internal/discoveryHandlers.js +1 -1
- package/build/core/tools/internal/installationHandlers.js +2 -2
- package/build/core/tools/internal/managementHandlers.js +2 -2
- package/build/core/types/server.d.ts +2 -2
- package/build/domains/admin/adminConfiguredServerService.d.ts +1 -1
- package/build/domains/admin/adminConfiguredServerService.js +2 -2
- package/build/domains/admin/adminDomain.d.ts +2 -2
- package/build/domains/admin/adminDomain.js +1 -1
- package/build/domains/admin/adminInstructionPreviewRuntime.d.ts +1 -1
- package/build/domains/admin/adminInstructionPreviewRuntime.js +1 -1
- package/build/domains/admin/adminInstructionTemplateService.d.ts +3 -3
- package/build/domains/admin/adminOAuthService.d.ts +1 -0
- package/build/domains/admin/adminOAuthService.d.ts.map +1 -1
- package/build/domains/admin/adminOAuthService.js +8 -2
- package/build/domains/admin/adminOAuthService.js.map +1 -1
- package/build/domains/admin/adminPresetService.d.ts +2 -2
- package/build/domains/admin/adminPresetService.js +2 -2
- package/build/domains/admin/configuredToolInventory.js +1 -1
- package/build/domains/admin/runtimeConfiguredToolInspectionService.js +1 -1
- package/build/domains/discovery/appDiscovery.js +2 -2
- package/build/domains/installation/metadata/defaultsProvider.d.ts +1 -1
- package/build/domains/installation/metadata/metadataExtractor.d.ts +1 -1
- package/build/domains/installation/serverInstallationSourceResolution.d.ts +1 -1
- package/build/domains/installation/serverInstallationTypes.d.ts +2 -2
- package/build/domains/installation/serverInstallationWorkflow.js +2 -2
- package/build/domains/instruction-template/instructionTemplateManager.d.ts +1 -1
- package/build/domains/instruction-template/instructionTemplateManager.js +1 -1
- package/build/domains/preset/manager/presetManager.d.ts +1 -1
- package/build/domains/preset/manager/presetManager.js +3 -3
- package/build/domains/preset/manager/presetManagerCleanup.d.ts +2 -2
- package/build/domains/preset/manager/presetStorage.d.ts +1 -1
- package/build/domains/preset/manager/presetTesting.d.ts +1 -1
- package/build/domains/preset/manager/presetTesting.js +2 -2
- package/build/domains/preset/manager/presetValidation.d.ts +1 -1
- package/build/domains/preset/manager/presetValidation.js +1 -1
- package/build/domains/preset/parsers/tagQueryEvaluator.d.ts +1 -1
- package/build/domains/preset/parsers/tagQueryParser.d.ts +1 -1
- package/build/domains/registry/formatters/commonFormatters.d.ts +1 -1
- package/build/domains/registry/formatters/serverDetailFormatter.d.ts +1 -1
- package/build/domains/registry/formatters/serverDetailFormatter.js +1 -1
- package/build/domains/registry/formatters/versionsFormatter.d.ts +1 -1
- package/build/domains/registry/searchFiltering.d.ts +1 -1
- package/build/domains/registry/searchFiltering.js +1 -1
- package/build/domains/server-management/types.d.ts +1 -1
- package/build/logger/configureGlobalLogger.js +1 -1
- package/build/sdk/legacy/auth/sdkOAuthClientProvider.d.ts +2 -2
- package/build/sdk/legacy/auth/sdkOAuthServerProvider.d.ts +4 -4
- package/build/sdk/legacy/auth/sdkOAuthServerProvider.js +1 -1
- package/build/sdk/legacy/client/runtime/clientManager.d.ts +1 -1
- package/build/sdk/legacy/client/runtime/legacyGatewayClientAdapter.d.ts +2 -2
- package/build/sdk/legacy/client/runtime/legacyGatewayClientAdapter.js +1 -1
- package/build/sdk/legacy/client/runtime/legacyOutboundConnection.js +1 -1
- package/build/sdk/legacy/client/runtime/legacySdkClientAdapter.d.ts +2 -2
- package/build/sdk/legacy/client/runtime/legacySdkClientAdapter.js +4 -4
- package/build/sdk/legacy/client/runtime/legacyTransport.d.ts +1 -1
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.d.ts +1 -1
- package/build/sdk/legacy/client/runtime/modernSdkClientAdapter.js +2 -2
- package/build/sdk/legacy/client/runtime/outboundRequestParams.d.ts +1 -1
- package/build/sdk/legacy/client/runtime/serveClient.d.ts +2 -2
- package/build/sdk/legacy/client/runtime/serveClient.d.ts.map +1 -1
- package/build/sdk/legacy/client/runtime/serveClient.js +4 -4
- package/build/sdk/legacy/client/runtime/serveClient.js.map +1 -1
- package/build/sdk/legacy/commands/serve.js +1 -1
- package/build/sdk/legacy/server/protocol/notificationHandlers.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/notificationHandlers.js +5 -5
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/promptRequestHandlers.js +3 -3
- package/build/sdk/legacy/server/protocol/requestHandlers.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/requestHandlers.js +3 -3
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js +4 -4
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.d.ts +1 -1
- package/build/sdk/legacy/server/protocol/toolRequestHandlers.js +3 -3
- package/build/sdk/legacy/server/runtime/clientInstancePoolTypes.d.ts +2 -2
- package/build/sdk/legacy/server/runtime/connectionManager.d.ts +1 -1
- package/build/sdk/legacy/server/runtime/connectionManager.js +2 -2
- package/build/sdk/legacy/server/runtime/legacyInboundConnection.d.ts +2 -2
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.d.ts +3 -3
- package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.js +2 -2
- package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.d.ts +1 -1
- package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.d.ts +2 -2
- package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.js +1 -1
- package/build/sdk/legacy/server/runtime/requestContextPreparation.d.ts +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.d.ts +1 -1
- package/build/sdk/legacy/server/runtime/serverManager.js +1 -1
- package/build/sdk/legacy/server/runtime/templateServerCleanup.d.ts +1 -1
- package/build/sdk/legacy/server/runtime/templateServerManager.d.ts +1 -1
- package/build/sdk/legacy/server/runtime/templateServerManager.js +1 -1
- package/build/sdk/legacy/shared/capabilityListCapture.d.ts +1 -1
- package/build/sdk/legacy/shared/capabilityListCapture.js +1 -1
- package/build/sdk/legacy/transport/http/loggingSseTransport.d.ts +2 -2
- package/build/sdk/legacy/transport/http/loggingSseTransport.js +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js +1 -1
- package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js +2 -2
- package/build/sdk/legacy/transport/http/restorableStreamableTransport.d.ts +1 -1
- package/build/sdk/legacy/transport/http/restorableStreamableTransport.js +1 -1
- package/build/sdk/legacy/transport/http/routes/sseRoutes.js +2 -2
- package/build/sdk/legacy/transport/http/server.js +2 -2
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.d.ts +1 -1
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.js +1 -1
- package/build/sdk/legacy/transport/restartableStdioTransport.d.ts +3 -3
- package/build/sdk/legacy/transport/restartableStdioTransport.js +1 -1
- package/build/sdk/legacy/transport/stdioProxyTransport.js +2 -2
- package/build/sdk/legacy/transport/transportFactory.js +3 -3
- package/build/sdk/legacy/validation/CustomJsonSchemaValidator.d.ts +1 -1
- package/build/transport/http/middlewares/httpRequestLogger.js +1 -1
- package/build/transport/http/middlewares/tagsExtractor.js +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +3 -1
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/adminRoutes.js +36 -1
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/apiRoutes.js +1 -1
- package/build/transport/http/routes/inspectHelpers.js +1 -1
- package/build/transport/http/routes/inspectRequestContext.js +2 -2
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +57 -59
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/modernHttpRoutes.js +1 -1
- package/build/transport/http/routes/oauthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/oauthRoutes.js +20 -4
- package/build/transport/http/routes/oauthRoutes.js.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.d.ts +2 -2
- package/build/transport/http/routes/streamableHttpRoutes.js +7 -7
- package/build/transport/http/routes/toolRoutes.js +1 -1
- package/build/transport/http/storage/streamableSessionRepository.js +1 -1
- package/build/transport/http/utils/templateContextAuthority.js +1 -1
- package/build/utils/validation/urlDetection.js +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { AgentConfigManager } from '
|
|
2
|
+
import { AgentConfigManager } from '../server/agentConfig.js';
|
|
3
3
|
import { debugIf } from '../../logger/logger.js';
|
|
4
4
|
/**
|
|
5
5
|
* Tool mapping for internal MCP tools
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import type { MCPServerParams } from '../types/transport.js';
|
|
2
2
|
import type { ConfiguredServerTargetSource } from '../../domains/config-change/types.js';
|
|
3
3
|
export interface ConfiguredServerInstructionTarget {
|
|
4
4
|
source: ConfiguredServerTargetSource;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { LazyLoadingOrchestrator } from '
|
|
3
|
-
import { InboundConnectionConfig, OutboundConnections } from '
|
|
4
|
-
import type { InstructionTemplateConfig } from '
|
|
2
|
+
import { LazyLoadingOrchestrator } from '../capabilities/lazyLoadingOrchestrator.js';
|
|
3
|
+
import { InboundConnectionConfig, OutboundConnections } from '../types/index.js';
|
|
4
|
+
import type { InstructionTemplateConfig } from '../types/transport.js';
|
|
5
5
|
import { type ConfiguredServerInstructionTarget, type ConfiguredServerInstructionTargets } from './effectiveServerInstructions.js';
|
|
6
6
|
export type InstructionSurface = 'initialization' | 'cli';
|
|
7
7
|
export interface RuntimeInstructionConfiguration {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { FilteringService } from '
|
|
2
|
+
import { FilteringService } from '../filtering/filteringService.js';
|
|
3
3
|
import logger, { debugIf } from '../../logger/logger.js';
|
|
4
4
|
import Handlebars from 'handlebars';
|
|
5
5
|
import { hasConfiguredInstructionOverride, resolveEffectiveServerInstructions, } from './effectiveServerInstructions.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadingStateTracker.d.ts","sourceRoot":"","sources":["../../../src/core/loading/loadingStateTracker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"loadingStateTracker.d.ts","sourceRoot":"","sources":["../../../src/core/loading/loadingStateTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,11 +99,15 @@ export class LoadingStateTracker extends EventEmitter {
|
|
|
99
99
|
return;
|
|
100
100
|
}
|
|
101
101
|
const now = new Date();
|
|
102
|
-
|
|
102
|
+
let info = {
|
|
103
103
|
...existing,
|
|
104
104
|
state,
|
|
105
105
|
...updates,
|
|
106
106
|
};
|
|
107
|
+
if (state === LoadingState.Ready) {
|
|
108
|
+
const { error: _error, authorizationUrl: _authorizationUrl, oauthStartTime: _oauthStartTime, ...readyInfo } = info;
|
|
109
|
+
info = readyInfo;
|
|
110
|
+
}
|
|
107
111
|
// Handle state-specific updates
|
|
108
112
|
switch (state) {
|
|
109
113
|
case LoadingState.Loading:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadingStateTracker.js","sourceRoot":"","sources":["../../../src/core/loading/loadingStateTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAN,IAAY,YAaX;AAbD,WAAY,YAAY;IACtB,wCAAwC;IACxC,mCAAmB,CAAA;IACnB,uCAAuC;IACvC,mCAAmB,CAAA;IACnB,oDAAoD;IACpD,+BAAe,CAAA;IACf,kCAAkC;IAClC,iCAAiB,CAAA;IACjB,0CAA0C;IAC1C,gDAAgC,CAAA;IAChC,0CAA0C;IAC1C,uCAAuB,CAAA;AACzB,CAAC,EAbW,YAAY,KAAZ,YAAY,QAavB;AAuCD;;GAEG;AACH,MAAM,CAAN,IAAkB,iBAOjB;AAPD,WAAkB,iBAAiB;IACjC,gEAA2C,CAAA;IAC3C,yDAAoC,CAAA;IACpC,yDAAoC,CAAA;IACpC,iDAA4B,CAAA;IAC5B,mDAA8B,CAAA;IAC9B,qDAAgC,CAAA;AAClC,CAAC,EAPiB,iBAAiB,KAAjB,iBAAiB,QAOlC;AAWD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,mBAAoB,SAAQ,YAAY;IAC3C,OAAO,GAAmC,IAAI,GAAG,EAAE,CAAC;IACpD,eAAe,GAAS,IAAI,IAAI,EAAE,CAAC;IACnC,cAAc,GAAY,KAAK,CAAC;IAExC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,yCAAyC;IACrE,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,WAAqB;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC;QAElC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE;gBACrB,IAAI;gBACJ,KAAK,EAAE,YAAY,CAAC,OAAO;gBAC3B,UAAU,EAAE,CAAC;aACd,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,gCAAgC,WAAW,CAAC,MAAM,UAAU,CAAC,CAAC;QAC1E,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACI,cAAc,CAAC,IAAY;QAChC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO;QACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE;YACrB,IAAI;YACJ,KAAK,EAAE,YAAY,CAAC,OAAO;YAC3B,UAAU,EAAE,CAAC;SACd,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,0CAA0C,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACI,iBAAiB,CACtB,IAAY,EACZ,KAAmB,EACnB,UAA0G,EAAE;QAE5G,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,CAAC,uCAAuC,IAAI,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,
|
|
1
|
+
{"version":3,"file":"loadingStateTracker.js","sourceRoot":"","sources":["../../../src/core/loading/loadingStateTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { ClientManager } from '
|
|
3
|
-
import { MCPServerParams, OutboundConnections } from '
|
|
2
|
+
import { ClientManager } from '../client/clientManager.js';
|
|
3
|
+
import { MCPServerParams, OutboundConnections } from '../types/index.js';
|
|
4
4
|
import { createTransports } from '../../transport/transportFactory.js';
|
|
5
5
|
import { type BackendLoadingPolicy } from './backendLoadingPolicy.js';
|
|
6
6
|
import { LoadingStateTracker, LoadingSummary } from './loadingStateTracker.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { CapabilityChanges } from '
|
|
3
|
-
import { InboundConnection, InboundConnectionError } from '
|
|
2
|
+
import { CapabilityChanges } from '../capabilities/capabilityAggregator.js';
|
|
3
|
+
import { InboundConnection, InboundConnectionError } from '../types/index.js';
|
|
4
4
|
/**
|
|
5
5
|
* Configuration for notification batching and behavior
|
|
6
6
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { AgentConfigManager } from '
|
|
3
|
-
import { ServerStatus } from '
|
|
2
|
+
import { AgentConfigManager } from '../server/agentConfig.js';
|
|
3
|
+
import { ServerStatus } from '../types/index.js';
|
|
4
4
|
import logger, { debugIf } from '../../logger/logger.js';
|
|
5
5
|
/**
|
|
6
6
|
* Default notification configuration
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { CapabilityCatalog } from '
|
|
2
|
-
import { type CapabilityVisibility } from '
|
|
3
|
-
import { InboundConnection, OutboundConnection, OutboundConnections } from '
|
|
4
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import { CapabilityCatalog } from '../capabilities/capabilityCatalog.js';
|
|
2
|
+
import { type CapabilityVisibility } from '../capabilities/capabilityVisibility.js';
|
|
3
|
+
import { InboundConnection, OutboundConnection, OutboundConnections } from '../types/index.js';
|
|
4
|
+
import type { MCPServerParams } from '../types/transport.js';
|
|
5
5
|
export declare function getRequestSession(inboundConn: InboundConnection): string | undefined;
|
|
6
6
|
export declare function createCapabilityCatalogFromConnections(connections: OutboundConnections, getServerConfigs?: () => Record<string, MCPServerParams>): Promise<CapabilityCatalog>;
|
|
7
7
|
/** Create the runtime Capability Catalog used by protocol capability walks. */
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { getConfiguredServerTargets } from '../../config/configuredServerTargets.js';
|
|
2
|
-
import { CapabilityCatalog } from '
|
|
3
|
-
import { createCapabilityVisibility } from '
|
|
4
|
-
import { acquireRuntimeCapabilityCatalog } from '
|
|
5
|
-
import { SchemaCache } from '
|
|
6
|
-
import { ToolRegistry } from '
|
|
7
|
-
import { byCapabilities } from '
|
|
8
|
-
import { FilteringService } from '
|
|
9
|
-
import { createConnectionResolver } from '
|
|
10
|
-
import { ServerManager } from '
|
|
2
|
+
import { CapabilityCatalog } from '../capabilities/capabilityCatalog.js';
|
|
3
|
+
import { createCapabilityVisibility } from '../capabilities/capabilityVisibility.js';
|
|
4
|
+
import { acquireRuntimeCapabilityCatalog } from '../capabilities/runtimeCapabilityCatalog.js';
|
|
5
|
+
import { SchemaCache } from '../capabilities/schemaCache.js';
|
|
6
|
+
import { ToolRegistry } from '../capabilities/toolRegistry.js';
|
|
7
|
+
import { byCapabilities } from '../filtering/clientFiltering.js';
|
|
8
|
+
import { FilteringService } from '../filtering/filteringService.js';
|
|
9
|
+
import { createConnectionResolver } from '../server/connectionResolver.js';
|
|
10
|
+
import { ServerManager } from '../server/serverManager.js';
|
|
11
11
|
export function getRequestSession(inboundConn) {
|
|
12
12
|
return inboundConn.context?.sessionId;
|
|
13
13
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { OutboundConnection, OutboundConnections } from '
|
|
2
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import type { OutboundConnection, OutboundConnections } from '../../types/client.js';
|
|
2
|
+
import type { MCPServerParams } from '../../types/index.js';
|
|
3
3
|
import { ServerAdapter, ServerContext, ServerStatus, ServerType } from './types.js';
|
|
4
4
|
/**
|
|
5
5
|
* ExternalServerAdapter handles external MCP servers with static connections.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { TemplateServerManager } from '
|
|
2
|
-
import type { OutboundConnection, OutboundConnections } from '
|
|
3
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import type { TemplateServerManager } from '../templateServerManager.js';
|
|
2
|
+
import type { OutboundConnection, OutboundConnections } from '../../types/client.js';
|
|
3
|
+
import type { MCPServerParams } from '../../types/index.js';
|
|
4
4
|
import { ServerAdapter, ServerContext, ServerType } from './types.js';
|
|
5
5
|
/**
|
|
6
6
|
* ServerRegistry manages server adapters and provides unified access to all server types.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { TemplateServerManager } from '
|
|
2
|
-
import type { OutboundConnection, OutboundConnections } from '
|
|
3
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import type { TemplateServerManager } from '../templateServerManager.js';
|
|
2
|
+
import type { OutboundConnection, OutboundConnections } from '../../types/client.js';
|
|
3
|
+
import type { MCPServerParams } from '../../types/index.js';
|
|
4
4
|
import { ServerAdapter, ServerContext, ServerStatus, ServerType } from './types.js';
|
|
5
5
|
/**
|
|
6
6
|
* TemplateServerAdapter handles template-based MCP servers with dynamic connections.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { OutboundConnection } from '
|
|
2
|
-
import { ClientStatus } from '
|
|
3
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import type { OutboundConnection } from '../../types/client.js';
|
|
2
|
+
import { ClientStatus } from '../../types/client.js';
|
|
3
|
+
import type { MCPServerParams } from '../../types/index.js';
|
|
4
4
|
/**
|
|
5
5
|
* Server types supported by 1MCP
|
|
6
6
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { TemplateContextTrustMode } from '
|
|
2
|
-
import { type BackendLoadingPolicy } from '
|
|
3
|
-
import { type TemplateInstancePoolPolicy } from '
|
|
1
|
+
import type { TemplateContextTrustMode } from '../context/templateContextTrust.js';
|
|
2
|
+
import { type BackendLoadingPolicy } from '../loading/backendLoadingPolicy.js';
|
|
3
|
+
import { type TemplateInstancePoolPolicy } from './clientInstancePoolTypes.js';
|
|
4
4
|
/**
|
|
5
5
|
* Configuration interface for agent-specific settings.
|
|
6
6
|
*
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AUTH_CONFIG, HOST, PORT, RATE_LIMIT_CONFIG, STREAMABLE_HTTP_ENDPOINT } from '../../constants.js';
|
|
2
|
-
import { DEFAULT_BACKEND_LOADING_POLICY } from '
|
|
3
|
-
import { DEFAULT_TEMPLATE_INSTANCE_POOL_POLICY, } from '
|
|
2
|
+
import { DEFAULT_BACKEND_LOADING_POLICY } from '../loading/backendLoadingPolicy.js';
|
|
3
|
+
import { DEFAULT_TEMPLATE_INSTANCE_POOL_POLICY, } from './clientInstancePoolTypes.js';
|
|
4
4
|
/**
|
|
5
5
|
* Deep merge utility for nested objects
|
|
6
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backendStdioSupervisor.d.ts","sourceRoot":"","sources":["../../../src/core/server/backendStdioSupervisor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"backendStdioSupervisor.d.ts","sourceRoot":"","sources":["../../../src/core/server/backendStdioSupervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,11 +130,9 @@ export class BackendStdioSupervisor {
|
|
|
130
130
|
await result.dispose?.();
|
|
131
131
|
return;
|
|
132
132
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
return;
|
|
137
|
-
}
|
|
133
|
+
// Set state to 'connected' BEFORE activate(): when activate() rewrites the
|
|
134
|
+
// supervisor snapshot, a still-'restarting' state would cause
|
|
135
|
+
// applyBackendSupervisionState() to clear capabilities/instructions (#547)
|
|
138
136
|
this.recoveryController = null;
|
|
139
137
|
this.state = 'connected';
|
|
140
138
|
this.currentPid = result.pid ?? null;
|
|
@@ -142,6 +140,11 @@ export class BackendStdioSupervisor {
|
|
|
142
140
|
if (manual) {
|
|
143
141
|
this.attempt = 0;
|
|
144
142
|
}
|
|
143
|
+
result.activate?.();
|
|
144
|
+
if (this.isRecoveryStale(generation, controller)) {
|
|
145
|
+
await result.dispose?.();
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
145
148
|
this.publish();
|
|
146
149
|
this.scheduleStableReset(generation);
|
|
147
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backendStdioSupervisor.js","sourceRoot":"","sources":["../../../src/core/server/backendStdioSupervisor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"backendStdioSupervisor.js","sourceRoot":"","sources":["../../../src/core/server/backendStdioSupervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
import { applicationConfigSchema } from '
|
|
3
|
+
import { applicationConfigSchema } from '../types/transport.js';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
export const BACKGROUND_LAUNCH_CONFIG_FILE = 'background-launch.json';
|
|
6
6
|
const backgroundLaunchConfigSchema = z.object({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type SpawnOptions } from 'child_process';
|
|
2
|
-
import { type BackgroundRuntimeExit, type BackgroundRuntimeSignal, type BackgroundSupervisorState } from '
|
|
3
|
-
export * from '
|
|
2
|
+
import { type BackgroundRuntimeExit, type BackgroundRuntimeSignal, type BackgroundSupervisorState } from './backgroundRuntimeSupervisorState.js';
|
|
3
|
+
export * from './backgroundRuntimeSupervisorState.js';
|
|
4
4
|
export declare const BACKGROUND_RESTART_DELAYS_MS: readonly [1000, 2000, 4000, 8000, 16000];
|
|
5
5
|
export declare const BACKGROUND_STABLE_RESET_MS: number;
|
|
6
6
|
export interface SupervisedRuntimeWorker {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backgroundRuntimeSupervisor.d.ts","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAE/B,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"backgroundRuntimeSupervisor.d.ts","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAE/B,MAAM,sDAAsD,CAAC;AAI9D,cAAc,sDAAsD,CAAC;AAErE,eAAO,MAAM,4BAA4B,0CAAgD,CAAC;AAC1F,eAAO,MAAM,0BAA0B,QAAiB,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAClE,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,uBAAuB,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IACnH,IAAI,CAAC,MAAM,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC;CACjD;AAED,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EACD,iBAAiB,GACjB,eAAe,GACf,qBAAqB,GACrB,cAAc,GACd,mBAAmB,GACnB,uBAAuB,GACvB,mBAAmB,GACnB,iBAAiB,GACjB,qBAAqB,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,qBAAqB,CAAC;CAC9B;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,4EAA4E;IAC5E,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gCAAgC;IAC/C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,KAAK,uBAAuB,CAAC;IAC3G,YAAY,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,IAAI,CAAC;IACxD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,IAAI,CAAC;IACzD,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,wBAAwB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACnC;AAmED;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,2BAA2B,EACpC,YAAY,EAAE,gCAAgC,GAC7C,OAAO,CAAC,IAAI,CAAC,CAgNf"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { spawn } from 'child_process';
|
|
2
|
-
import { writeBackgroundSupervisorState, } from '
|
|
3
|
-
|
|
2
|
+
import { writeBackgroundSupervisorState, } from './backgroundRuntimeSupervisorState.js';
|
|
3
|
+
import { readProcessIdentity } from './processIdentity.js';
|
|
4
|
+
export * from './backgroundRuntimeSupervisorState.js';
|
|
4
5
|
export const BACKGROUND_RESTART_DELAYS_MS = [1_000, 2_000, 4_000, 8_000, 16_000];
|
|
5
6
|
export const BACKGROUND_STABLE_RESET_MS = 5 * 60 * 1_000;
|
|
6
7
|
function defaultWaitForStop() {
|
|
@@ -72,6 +73,7 @@ export async function runBackgroundRuntimeSupervisor(options, dependencies) {
|
|
|
72
73
|
version: 1,
|
|
73
74
|
status: 'starting',
|
|
74
75
|
supervisorPid,
|
|
76
|
+
supervisorIdentity: readProcessIdentity(supervisorPid),
|
|
75
77
|
runtimePid: null,
|
|
76
78
|
restartAttempt: 0,
|
|
77
79
|
lastExit: null,
|
|
@@ -105,7 +107,13 @@ export async function runBackgroundRuntimeSupervisor(options, dependencies) {
|
|
|
105
107
|
}
|
|
106
108
|
});
|
|
107
109
|
const runtimePid = worker.pid;
|
|
108
|
-
persist({
|
|
110
|
+
persist({
|
|
111
|
+
status: 'starting',
|
|
112
|
+
runtimePid,
|
|
113
|
+
runtimeIdentity: readProcessIdentity(runtimePid),
|
|
114
|
+
nextRetryAt: null,
|
|
115
|
+
readyAt: null,
|
|
116
|
+
});
|
|
109
117
|
record({ event: 'runtime-spawned', runtimePid, restartAttempt: state.restartAttempt });
|
|
110
118
|
const stopWorker = async () => {
|
|
111
119
|
persist({ status: 'stopping', nextRetryAt: null });
|
|
@@ -208,7 +216,7 @@ export async function runBackgroundRuntimeSupervisor(options, dependencies) {
|
|
|
208
216
|
throw new Error('Background Runtime Supervisor lost the worker exit outcome');
|
|
209
217
|
}
|
|
210
218
|
const exit = exitOutcome.exit;
|
|
211
|
-
persist({ runtimePid: null, lastExit: exit, nextRetryAt: null, readyAt: null });
|
|
219
|
+
persist({ runtimePid: null, runtimeIdentity: undefined, lastExit: exit, nextRetryAt: null, readyAt: null });
|
|
212
220
|
record({ event: 'runtime-exit', runtimePid, restartAttempt: state.restartAttempt, exit });
|
|
213
221
|
if (state.restartAttempt >= BACKGROUND_RESTART_DELAYS_MS.length) {
|
|
214
222
|
persist({ status: 'crash-loop', runtimePid: null, nextRetryAt: null });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backgroundRuntimeSupervisor.js","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"backgroundRuntimeSupervisor.js","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ProcessIdentity } from './processIdentity.js';
|
|
1
2
|
export declare const BACKGROUND_SUPERVISOR_STATE_FILE = "background-runtime.json";
|
|
2
3
|
export declare const BACKGROUND_MAX_RESTART_ATTEMPTS = 5;
|
|
3
4
|
export type BackgroundSupervisorStatus = 'starting' | 'running' | 'restarting' | 'crash-loop' | 'stopping';
|
|
@@ -12,6 +13,8 @@ export interface BackgroundSupervisorState {
|
|
|
12
13
|
version: 1;
|
|
13
14
|
status: BackgroundSupervisorStatus;
|
|
14
15
|
supervisorPid: number;
|
|
16
|
+
supervisorIdentity?: ProcessIdentity;
|
|
17
|
+
runtimeIdentity?: ProcessIdentity;
|
|
15
18
|
runtimePid: number | null;
|
|
16
19
|
restartAttempt: number;
|
|
17
20
|
lastExit: BackgroundRuntimeExit | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backgroundRuntimeSupervisorState.d.ts","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisorState.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gCAAgC,4BAA4B,CAAC;AAC1E,eAAO,MAAM,+BAA+B,IAAI,CAAC;AAEjD,MAAM,MAAM,0BAA0B,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAC3G,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,0BAA0B,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"backgroundRuntimeSupervisorState.d.ts","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisorState.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,sBAAsB,CAAC;AAEnF,eAAO,MAAM,gCAAgC,4BAA4B,CAAC;AAC1E,eAAO,MAAM,+BAA+B,IAAI,CAAC;AAEjD,MAAM,MAAM,0BAA0B,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAC3G,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,0BAA0B,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAuBD,qBAAa,kCAAmC,SAAQ,KAAK;aAEzC,aAAa,EAAE,MAAM;gBAArB,aAAa,EAAE,MAAM,EACrC,KAAK,EAAE,OAAO;CAQjB;AAED,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI,CAiBjG;AAED,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,yBAAyB,GAAG,IAAI,CAOxG;AAED,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAiBlG"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { z } from 'zod';
|
|
4
|
+
import { processIdentitySchema } from './processIdentity.js';
|
|
4
5
|
export const BACKGROUND_SUPERVISOR_STATE_FILE = 'background-runtime.json';
|
|
5
6
|
export const BACKGROUND_MAX_RESTART_ATTEMPTS = 5;
|
|
6
7
|
const stateSchema = z.object({
|
|
7
8
|
version: z.literal(1),
|
|
8
9
|
status: z.enum(['starting', 'running', 'restarting', 'crash-loop', 'stopping']),
|
|
9
10
|
supervisorPid: z.number().int().positive(),
|
|
11
|
+
supervisorIdentity: processIdentitySchema.optional(),
|
|
12
|
+
runtimeIdentity: processIdentitySchema.optional(),
|
|
10
13
|
runtimePid: z.number().int().positive().nullable(),
|
|
11
14
|
restartAttempt: z.number().int().min(0).max(BACKGROUND_MAX_RESTART_ATTEMPTS),
|
|
12
15
|
lastExit: z
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backgroundRuntimeSupervisorState.js","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisorState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,gCAAgC,GAAG,yBAAyB,CAAC;AAC1E,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"backgroundRuntimeSupervisorState.js","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisorState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { OutboundConnection, OutboundConnections } from '
|
|
1
|
+
import type { OutboundConnection, OutboundConnections } from '../types/client.js';
|
|
2
2
|
/**
|
|
3
3
|
* Interface for accessing template server hash mappings.
|
|
4
4
|
* This abstracts away the dependency on TemplateServerManager.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { MCPServerParams } from '
|
|
1
|
+
import type { MCPServerParams } from '../types/index.js';
|
|
2
2
|
import type { Tool } from '../../sdk/contracts/index.js';
|
|
3
3
|
export declare function getLogicalToolName(logicalServerName: string, toolName: string): string;
|
|
4
4
|
export declare function getDisabledToolMessage(logicalServerName: string, toolName: string): string;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { type ProcessIdentity } from './processIdentity.js';
|
|
1
2
|
/**
|
|
2
3
|
* Server information stored in PID file
|
|
3
4
|
*/
|
|
4
5
|
export interface ServerPidInfo {
|
|
5
6
|
pid: number;
|
|
7
|
+
processIdentity?: ProcessIdentity;
|
|
6
8
|
url: string;
|
|
7
9
|
port: number;
|
|
8
10
|
host: string;
|
|
@@ -58,7 +60,9 @@ export declare function readPidFile(configDir: string): ServerPidInfo | null;
|
|
|
58
60
|
*/
|
|
59
61
|
export declare function cleanupPidFile(configDir: string): boolean;
|
|
60
62
|
/**
|
|
61
|
-
* Delete the PID file only if it still
|
|
63
|
+
* Delete the PID file only if it still matches the expected PID or full record.
|
|
64
|
+
* Lifecycle callers pass the full record to also match birth evidence and startup time.
|
|
65
|
+
* Guards against a
|
|
62
66
|
* time-of-check/time-of-use race: between reading a stale/dead PID and deleting
|
|
63
67
|
* the file, a new runtime may have written a fresh PID file in the same scope.
|
|
64
68
|
* Deleting unconditionally would strand that live runtime (undiscoverable to
|
|
@@ -67,7 +71,7 @@ export declare function cleanupPidFile(configDir: string): boolean;
|
|
|
67
71
|
* @returns true if the file was removed or is already gone/replaced; false if a
|
|
68
72
|
* matching file existed but could not be deleted.
|
|
69
73
|
*/
|
|
70
|
-
export declare function cleanupPidFileIfMatches(configDir: string,
|
|
74
|
+
export declare function cleanupPidFileIfMatches(configDir: string, expected: number | ServerPidInfo): boolean;
|
|
71
75
|
/**
|
|
72
76
|
* Cleanup function to remove PID file
|
|
73
77
|
* @param configDir Configuration directory
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pidFileManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/pidFileManager.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"pidFileManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/pidFileManager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,eAAe,EAA8C,MAAM,sBAAsB,CAAC;AAExG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAuBD,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,WAAW,EAAE,MAAM;gBAAnB,WAAW,EAAE,MAAM,EACnC,KAAK,EAAE,OAAO;CAOjB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CA0B/E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CA4BnE;AAWD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAczD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAsBpG;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE5D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAQ9D;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAmBrE"}
|