@1mcp/agent 0.38.0 → 0.38.2
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-BnEBXa_2.js} +1 -1
- package/build/admin/assets/{admin-console-Mv3xmdoU.js → admin-console-5rVJC_G2.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/legacyRuntimeStop.d.ts +16 -0
- package/build/commands/serve/legacyRuntimeStop.d.ts.map +1 -0
- package/build/commands/serve/legacyRuntimeStop.js +143 -0
- package/build/commands/serve/legacyRuntimeStop.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 +36 -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 +137 -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/legacyRuntimeRecovery.d.ts +14 -0
- package/build/core/server/legacyRuntimeRecovery.d.ts.map +1 -0
- package/build/core/server/legacyRuntimeRecovery.js +209 -0
- package/build/core/server/legacyRuntimeRecovery.js.map +1 -0
- 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/processEvidence.d.ts +23 -0
- package/build/core/server/processEvidence.d.ts.map +1 -0
- package/build/core/server/processEvidence.js +114 -0
- package/build/core/server/processEvidence.js.map +1 -0
- 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 +19 -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,9 +1,12 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
1
2
|
import { getConfigDir } from '../../constants.js';
|
|
2
3
|
import { backgroundLaunchConfigExists, cleanupBackgroundLaunchConfig, } from '../../core/server/backgroundLaunchConfig.js';
|
|
3
4
|
import { cleanupBackgroundSupervisorState, readBackgroundSupervisorState, } from '../../core/server/backgroundRuntimeSupervisor.js';
|
|
4
|
-
import { cleanupPidFileIfMatches, isProcessAlive, PidFileReadError, readPidFile, } from '../../core/server/pidFileManager.js';
|
|
5
|
+
import { cleanupPidFileIfMatches, getPidFilePath, isProcessAlive, PidFileReadError, readPidFile, } from '../../core/server/pidFileManager.js';
|
|
6
|
+
import { inspectProcessIdentity } from '../../core/server/processIdentity.js';
|
|
5
7
|
import { acquireRuntimeScopeStopLock, readRuntimeScopeOwnership, releaseRuntimeScopeOwnership, } from '../../core/server/runtimeScopeOwnership.js';
|
|
6
8
|
import logger from '../../logger/logger.js';
|
|
9
|
+
import { stopLegacyRuntime } from './legacyRuntimeStop.js';
|
|
7
10
|
/** Poll until the process is gone or the timeout elapses. Returns true if it exited. */
|
|
8
11
|
export async function waitForProcessExit(pid, options = {}) {
|
|
9
12
|
const timeoutMs = options.timeoutMs ?? 10000;
|
|
@@ -50,6 +53,9 @@ function cleanupSupervisorLaunchConfig(configDir, expectedSupervisorPid) {
|
|
|
50
53
|
}
|
|
51
54
|
return cleanupBackgroundLaunchConfig(configDir, owner.claimId, { removeStaleGeneration: true });
|
|
52
55
|
}
|
|
56
|
+
function runtimeMetadataMatches(info, pid, identity) {
|
|
57
|
+
return !info || (info.pid === pid && JSON.stringify(info.processIdentity) === JSON.stringify(identity));
|
|
58
|
+
}
|
|
53
59
|
function bootstrapSupervisorState(supervisorPid) {
|
|
54
60
|
const now = new Date().toISOString();
|
|
55
61
|
return {
|
|
@@ -75,10 +81,34 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
75
81
|
const cleanupSupervisorState = deps.cleanupSupervisorState ?? cleanupBackgroundSupervisorState;
|
|
76
82
|
const cleanupLaunchConfig = deps.cleanupLaunchConfig ?? cleanupSupervisorLaunchConfig;
|
|
77
83
|
const cleanupOwnership = deps.cleanupOwnership ?? cleanupSupervisorOwnership;
|
|
78
|
-
const
|
|
79
|
-
const
|
|
84
|
+
const observedPidRecords = new Map();
|
|
85
|
+
const expectedWorkerIdentities = new Map();
|
|
86
|
+
const readInfo = (scope) => {
|
|
87
|
+
const info = (deps.readInfo ?? readPidFile)(scope);
|
|
88
|
+
if (!info && fs.existsSync(getPidFilePath(scope))) {
|
|
89
|
+
throw new PidFileReadError(getPidFilePath(scope), new Error('runtime PID metadata is malformed'));
|
|
90
|
+
}
|
|
91
|
+
if (info)
|
|
92
|
+
observedPidRecords.set(info.pid, info);
|
|
93
|
+
return info;
|
|
94
|
+
};
|
|
80
95
|
const kill = deps.kill ?? defaultKill;
|
|
81
|
-
const
|
|
96
|
+
const inspectIdentity = deps.inspectIdentity ?? inspectProcessIdentity;
|
|
97
|
+
const cleanup = deps.cleanup ??
|
|
98
|
+
((scope, pid) => {
|
|
99
|
+
const observed = observedPidRecords.get(pid);
|
|
100
|
+
if (observed)
|
|
101
|
+
return cleanupPidFileIfMatches(scope, observed);
|
|
102
|
+
const current = readPidFile(scope);
|
|
103
|
+
if (!current)
|
|
104
|
+
return !fs.existsSync(getPidFilePath(scope));
|
|
105
|
+
const expectedIdentity = expectedWorkerIdentities.get(pid);
|
|
106
|
+
if (current.pid !== pid ||
|
|
107
|
+
!expectedIdentity ||
|
|
108
|
+
JSON.stringify(current.processIdentity) !== JSON.stringify(expectedIdentity))
|
|
109
|
+
return false;
|
|
110
|
+
return cleanupPidFileIfMatches(scope, current);
|
|
111
|
+
});
|
|
82
112
|
const waitForExit = deps.waitForExit ?? waitForProcessExit;
|
|
83
113
|
const gracefulTimeoutMs = deps.gracefulTimeoutMs ?? 10000;
|
|
84
114
|
let supervisorState;
|
|
@@ -103,8 +133,9 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
103
133
|
if (supervisorState) {
|
|
104
134
|
const stateMatchesOwner = owner?.kind === 'background-supervisor' && owner.pid === supervisorState.supervisorPid;
|
|
105
135
|
if (!stateMatchesOwner) {
|
|
106
|
-
const staleProcessStillAlive =
|
|
107
|
-
(supervisorState.runtimePid !== null &&
|
|
136
|
+
const staleProcessStillAlive = inspectIdentity(supervisorState.supervisorPid, supervisorState.supervisorIdentity) !== 'dead' ||
|
|
137
|
+
(supervisorState.runtimePid !== null &&
|
|
138
|
+
inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity) !== 'dead');
|
|
108
139
|
if (staleProcessStillAlive) {
|
|
109
140
|
failStop(`supervisor state does not match Runtime Scope ownership in ${configDir}; refusing ambiguous stop.`);
|
|
110
141
|
return;
|
|
@@ -136,20 +167,72 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
136
167
|
return;
|
|
137
168
|
}
|
|
138
169
|
try {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
170
|
+
let initialInfo;
|
|
171
|
+
try {
|
|
172
|
+
initialInfo = readInfo(configDir);
|
|
173
|
+
if (supervisorState.runtimePid !== null &&
|
|
174
|
+
!runtimeMetadataMatches(initialInfo, supervisorState.runtimePid, supervisorState.runtimeIdentity)) {
|
|
175
|
+
throw new Error('runtime PID metadata conflicts with supervisor state');
|
|
176
|
+
}
|
|
177
|
+
if (owner.processIdentity &&
|
|
178
|
+
supervisorState.supervisorIdentity &&
|
|
179
|
+
JSON.stringify(owner.processIdentity) !== JSON.stringify(supervisorState.supervisorIdentity)) {
|
|
180
|
+
throw new Error('supervisor identity conflicts with Runtime Scope ownership');
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
catch (error) {
|
|
184
|
+
failStop(`cannot inspect runtime PID metadata in Runtime Scope ${configDir}: ${errorMessage(error)}`);
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
const supervisorIdentity = owner.processIdentity ?? supervisorState.supervisorIdentity;
|
|
188
|
+
const supervisorStatus = inspectIdentity(supervisorState.supervisorPid, supervisorIdentity);
|
|
189
|
+
const workerStatus = supervisorState.runtimePid === null
|
|
190
|
+
? 'dead'
|
|
191
|
+
: inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity);
|
|
192
|
+
if (supervisorStatus === 'unknown' || workerStatus === 'unknown') {
|
|
193
|
+
if (!owner.processIdentity &&
|
|
194
|
+
!supervisorState.supervisorIdentity &&
|
|
195
|
+
!supervisorState.runtimeIdentity &&
|
|
196
|
+
!initialInfo?.processIdentity) {
|
|
197
|
+
try {
|
|
198
|
+
if (await stopLegacyRuntime(configDir, owner, supervisorState, initialInfo)) {
|
|
199
|
+
process.stdout.write(`Stopped verified legacy background runtime in Runtime Scope ${configDir}.\n`);
|
|
200
|
+
process.exitCode = 0;
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
catch (error) {
|
|
205
|
+
failStop(`legacy runtime recovery aborted: ${errorMessage(error)}`);
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
failStop(`cannot verify process identity in Runtime Scope ${configDir}; refusing ambiguous stop. ` +
|
|
210
|
+
(!owner.processIdentity
|
|
211
|
+
? 'Legacy metadata has no process identity; automatic recovery requires a verified live pair on Linux. Stop the old runtime using its original CLI or service manager; verify all scope participants have stopped before manual metadata recovery.'
|
|
212
|
+
: ''));
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
const supervisorWasAlive = supervisorStatus === 'alive';
|
|
216
|
+
const runtimeWasAlive = workerStatus === 'alive';
|
|
217
|
+
const terminateOptions = { kill, waitForExit, gracefulTimeoutMs, inspectIdentity };
|
|
142
218
|
if (supervisorWasAlive &&
|
|
143
|
-
!(await terminateProcess(supervisorState.supervisorPid, 'supervisor',
|
|
219
|
+
!(await terminateProcess(supervisorState.supervisorPid, 'supervisor', {
|
|
220
|
+
...terminateOptions,
|
|
221
|
+
identity: supervisorIdentity,
|
|
222
|
+
}))) {
|
|
144
223
|
failStop(`failed to stop Background Runtime Supervisor (PID ${supervisorState.supervisorPid}) in Runtime Scope ${configDir}.`);
|
|
145
224
|
return;
|
|
146
225
|
}
|
|
147
226
|
let runtimePid = supervisorState.runtimePid;
|
|
227
|
+
let runtimeIdentity = supervisorState.runtimeIdentity;
|
|
148
228
|
if (supervisorWasAlive) {
|
|
149
229
|
try {
|
|
150
230
|
const finalState = readSupervisorState(configDir);
|
|
151
231
|
if (finalState?.supervisorPid === supervisorState.supervisorPid) {
|
|
152
|
-
|
|
232
|
+
if (finalState.runtimePid !== null) {
|
|
233
|
+
runtimePid = finalState.runtimePid;
|
|
234
|
+
runtimeIdentity = finalState.runtimeIdentity;
|
|
235
|
+
}
|
|
153
236
|
}
|
|
154
237
|
}
|
|
155
238
|
catch (error) {
|
|
@@ -161,7 +244,9 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
161
244
|
// final state has already disappeared, the PID file is the recovery source.
|
|
162
245
|
if (runtimePid === null) {
|
|
163
246
|
try {
|
|
164
|
-
|
|
247
|
+
const recoveredInfo = readInfo(configDir);
|
|
248
|
+
runtimePid = recoveredInfo?.pid ?? null;
|
|
249
|
+
runtimeIdentity = recoveredInfo?.processIdentity;
|
|
165
250
|
}
|
|
166
251
|
catch (error) {
|
|
167
252
|
failStop(`supervisor stopped, but its runtime PID could not be recovered in Runtime Scope ${configDir}: ${errorMessage(error)}`);
|
|
@@ -172,13 +257,25 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
172
257
|
// what prevents an in-flight retry policy from replacing a deliberately
|
|
173
258
|
// stopped worker.
|
|
174
259
|
if (runtimePid !== null &&
|
|
175
|
-
|
|
176
|
-
!(await terminateProcess(runtimePid, 'runtime', terminateOptions))) {
|
|
260
|
+
!(await terminateProcess(runtimePid, 'runtime', { ...terminateOptions, identity: runtimeIdentity }))) {
|
|
177
261
|
failStop(`failed to stop supervised runtime (PID ${runtimePid}) in Runtime Scope ${configDir}.`);
|
|
178
262
|
return;
|
|
179
263
|
}
|
|
180
|
-
|
|
181
|
-
|
|
264
|
+
try {
|
|
265
|
+
const finalInfo = readInfo(configDir);
|
|
266
|
+
if (!runtimeMetadataMatches(finalInfo, runtimePid, runtimeIdentity)) {
|
|
267
|
+
throw new Error('runtime PID metadata changed to a different process incarnation');
|
|
268
|
+
}
|
|
269
|
+
if (runtimePid !== null) {
|
|
270
|
+
if (runtimeIdentity)
|
|
271
|
+
expectedWorkerIdentities.set(runtimePid, runtimeIdentity);
|
|
272
|
+
if (!cleanup(configDir, runtimePid))
|
|
273
|
+
throw new Error('runtime PID metadata could not be safely removed');
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
catch (error) {
|
|
277
|
+
failStop(`runtime stopped, but PID metadata must be retained in Runtime Scope ${configDir}: ${errorMessage(error)}`);
|
|
278
|
+
return;
|
|
182
279
|
}
|
|
183
280
|
try {
|
|
184
281
|
if (!cleanupLaunchConfig(configDir, supervisorState.supervisorPid)) {
|
|
@@ -223,12 +320,24 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
223
320
|
throw error;
|
|
224
321
|
}
|
|
225
322
|
if (!info) {
|
|
323
|
+
if (fs.existsSync(getPidFilePath(configDir))) {
|
|
324
|
+
failStop(`runtime PID metadata is malformed in Runtime Scope ${configDir}; refusing ambiguous stop.`);
|
|
325
|
+
return;
|
|
326
|
+
}
|
|
226
327
|
process.stdout.write(`No runtime is running in this Runtime Scope: ${configDir}\n`);
|
|
227
328
|
process.exitCode = 0;
|
|
228
329
|
return;
|
|
229
330
|
}
|
|
230
331
|
// Stale dead-process PID file: clean it up and report cleanly.
|
|
231
|
-
|
|
332
|
+
const identityStatus = inspectIdentity(info.pid, info.processIdentity);
|
|
333
|
+
if (identityStatus === 'unknown') {
|
|
334
|
+
failStop(`cannot verify process identity for Runtime Scope PID ${info.pid}; refusing ambiguous stop.` +
|
|
335
|
+
(!info.processIdentity
|
|
336
|
+
? ' Legacy foreground or unverifiable runtimes require stopping through the original CLI or service manager. Verify all scope participants have stopped before manual metadata cleanup.'
|
|
337
|
+
: ''));
|
|
338
|
+
return;
|
|
339
|
+
}
|
|
340
|
+
if (identityStatus === 'dead') {
|
|
232
341
|
if (cleanup(configDir, info.pid)) {
|
|
233
342
|
process.stdout.write(`No running runtime in this Runtime Scope; removed a stale PID file (was PID ${info.pid}).\n`);
|
|
234
343
|
}
|
|
@@ -240,9 +349,10 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
240
349
|
return;
|
|
241
350
|
}
|
|
242
351
|
const exited = await terminateProcess(info.pid, 'Runtime', {
|
|
352
|
+
identity: info.processIdentity,
|
|
353
|
+
inspectIdentity,
|
|
243
354
|
kill,
|
|
244
355
|
waitForExit,
|
|
245
|
-
isAlive,
|
|
246
356
|
gracefulTimeoutMs,
|
|
247
357
|
});
|
|
248
358
|
if (exited) {
|
|
@@ -257,6 +367,10 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
257
367
|
failStop(`failed to stop runtime (PID ${info.pid}) in Runtime Scope ${configDir}.`);
|
|
258
368
|
}
|
|
259
369
|
async function terminateProcess(pid, label, options) {
|
|
370
|
+
const beforeTerm = options.inspectIdentity(pid, options.identity);
|
|
371
|
+
if (beforeTerm !== 'alive')
|
|
372
|
+
return beforeTerm === 'dead';
|
|
373
|
+
const sameProcessAlive = () => options.inspectIdentity(pid, options.identity) !== 'dead';
|
|
260
374
|
try {
|
|
261
375
|
options.kill(pid, 'SIGTERM');
|
|
262
376
|
}
|
|
@@ -265,11 +379,14 @@ async function terminateProcess(pid, label, options) {
|
|
|
265
379
|
}
|
|
266
380
|
let exited = await options.waitForExit(pid, {
|
|
267
381
|
timeoutMs: options.gracefulTimeoutMs,
|
|
268
|
-
isAlive:
|
|
382
|
+
isAlive: sameProcessAlive,
|
|
269
383
|
});
|
|
270
384
|
if (exited) {
|
|
271
385
|
return true;
|
|
272
386
|
}
|
|
387
|
+
const beforeKill = options.inspectIdentity(pid, options.identity);
|
|
388
|
+
if (beforeKill !== 'alive')
|
|
389
|
+
return beforeKill === 'dead';
|
|
273
390
|
logger.warn(`${label} (PID ${pid}) did not exit after SIGTERM; escalating to SIGKILL`);
|
|
274
391
|
try {
|
|
275
392
|
options.kill(pid, 'SIGKILL');
|
|
@@ -277,6 +394,6 @@ async function terminateProcess(pid, label, options) {
|
|
|
277
394
|
catch (error) {
|
|
278
395
|
logger.warn(`Failed to send SIGKILL to ${label} PID ${pid}: ${error}`);
|
|
279
396
|
}
|
|
280
|
-
return options.waitForExit(pid, { timeoutMs: 2000, isAlive:
|
|
397
|
+
return options.waitForExit(pid, { timeoutMs: 2000, isAlive: sameProcessAlive });
|
|
281
398
|
}
|
|
282
399
|
//# sourceMappingURL=serveStop.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStop.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"serveStop.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type AuthProfile } from '
|
|
2
|
-
import { type CliSessionCache } from '
|
|
3
|
-
import { type ResolvableServeTargetOptions } from '
|
|
1
|
+
import { type AuthProfile } from './authProfileStore.js';
|
|
2
|
+
import { type CliSessionCache } from './serveClient.js';
|
|
3
|
+
import { type ResolvableServeTargetOptions } from './serveTargetResolver.js';
|
|
4
4
|
import type { ProjectConfig } from '../../config/projectConfigTypes.js';
|
|
5
5
|
import { type TemplateContextProof } from '../../core/context/templateContextTrust.js';
|
|
6
6
|
import type { RuntimeIdentityWarning } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
import { loadAuthProfile, normalizeServerUrl } from '
|
|
3
|
-
import { buildCliContext, generateStreamableSessionId } from '
|
|
4
|
-
import { deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, writeCliSessionCache, } from '
|
|
5
|
-
import { resolveServeTarget, } from '
|
|
2
|
+
import { loadAuthProfile, normalizeServerUrl } from './authProfileStore.js';
|
|
3
|
+
import { buildCliContext, generateStreamableSessionId } from './cliContext.js';
|
|
4
|
+
import { deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, writeCliSessionCache, } from './serveClient.js';
|
|
5
|
+
import { resolveServeTarget, } from './serveTargetResolver.js';
|
|
6
6
|
import { createTemplateContextProof, TemplateContextCapabilityStore, } from '../../core/context/templateContextTrust.js';
|
|
7
7
|
import { isProcessAlive, readPidFile } from '../../core/server/pidFileManager.js';
|
|
8
8
|
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
@@ -80,4 +80,17 @@ export declare const inspectToolResultSchema: z.ZodObject<{
|
|
|
80
80
|
}, z.core.$loose>;
|
|
81
81
|
export type InspectServerSummary = z.infer<typeof inspectServerSummarySchema>;
|
|
82
82
|
export type ApiInspectServerResult = z.infer<typeof inspectServerResultSchema>;
|
|
83
|
+
export declare const inspectToolsPageSchema: z.ZodObject<{
|
|
84
|
+
tools: z.ZodArray<z.ZodObject<{
|
|
85
|
+
name: z.ZodString;
|
|
86
|
+
description: z.ZodOptional<z.ZodString>;
|
|
87
|
+
inputSchema: z.ZodObject<{
|
|
88
|
+
type: z.ZodLiteral<"object">;
|
|
89
|
+
}, z.core.$loose>;
|
|
90
|
+
outputSchema: z.ZodOptional<z.ZodObject<{
|
|
91
|
+
type: z.ZodLiteral<"object">;
|
|
92
|
+
}, z.core.$loose>>;
|
|
93
|
+
}, z.core.$loose>>;
|
|
94
|
+
nextCursor: z.ZodOptional<z.ZodString>;
|
|
95
|
+
}, z.core.$loose>;
|
|
83
96
|
//# sourceMappingURL=inspectApiSchemas.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectApiSchemas.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;;;;;EAAiC,CAAC;AAEvE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;iBAQvB,CAAC;AAEjB,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;iBAKvB,CAAC;AAEjB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;iBAStB,CAAC;AAEjB,eAAO,MAAM,uBAAuB;;;;;;;;iBAUpB,CAAC;AAEjB,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"inspectApiSchemas.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;;;;;EAAiC,CAAC;AAEvE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;iBAQvB,CAAC;AAEjB,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;iBAKvB,CAAC;AAEjB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;iBAStB,CAAC;AAEjB,eAAO,MAAM,uBAAuB;;;;;;;;iBAUpB,CAAC;AAEjB,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAe/E,eAAO,MAAM,sBAAsB;;;;;;;;;;;;iBAKnB,CAAC"}
|
|
@@ -37,4 +37,22 @@ export const inspectToolResultSchema = z
|
|
|
37
37
|
outputSchema: z.record(z.string(), z.unknown()).optional(),
|
|
38
38
|
})
|
|
39
39
|
.passthrough();
|
|
40
|
+
// Validate each upstream page before using its tool objects or continuation cursor.
|
|
41
|
+
const inspectToolSchema = z
|
|
42
|
+
.object({
|
|
43
|
+
name: z.string(),
|
|
44
|
+
description: z.string().optional(),
|
|
45
|
+
inputSchema: z.object({ type: z.literal('object') }).passthrough(),
|
|
46
|
+
outputSchema: z
|
|
47
|
+
.object({ type: z.literal('object') })
|
|
48
|
+
.passthrough()
|
|
49
|
+
.optional(),
|
|
50
|
+
})
|
|
51
|
+
.passthrough();
|
|
52
|
+
export const inspectToolsPageSchema = z
|
|
53
|
+
.object({
|
|
54
|
+
tools: z.array(inspectToolSchema),
|
|
55
|
+
nextCursor: z.string().optional(),
|
|
56
|
+
})
|
|
57
|
+
.passthrough();
|
|
40
58
|
//# sourceMappingURL=inspectApiSchemas.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectApiSchemas.js","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC;CAC7C,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC;KACvC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC;KACrC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;KACD,WAAW,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"inspectApiSchemas.js","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC;CAC7C,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC;KACvC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC;KACrC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;KACD,WAAW,EAAE,CAAC;AAKjB,oFAAoF;AACpF,MAAM,iBAAiB,GAAG,CAAC;KACxB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;IAClE,YAAY,EAAE,CAAC;SACZ,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;SACrC,WAAW,EAAE;SACb,QAAQ,EAAE;CACd,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC;KACpC,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;IACjC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC;KACD,WAAW,EAAE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type ServeUrlOptions } from '
|
|
1
|
+
import { type ServeUrlOptions } from './serveClient.js';
|
|
2
2
|
import type { ProjectConfig } from '../../config/projectConfigTypes.js';
|
|
3
3
|
import { type RuntimeIdentityWarning, verifyRuntimeIdentityForTarget } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
|
|
4
4
|
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { buildServerUrl } from '
|
|
1
|
+
import { buildServerUrl } from './serveClient.js';
|
|
2
2
|
import { normalizeTags, resolveProjectContext } from '../../config/projectConfigLoader.js';
|
|
3
3
|
import { getConfigDir } from '../../constants.js';
|
|
4
4
|
import { verifyRuntimeIdentityForTarget, } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { runCliCommand } from '
|
|
1
|
+
import { runCliCommand } from '../shared/commandRunner.js';
|
|
2
2
|
import { globalOptions } from '../../globalOptions.js';
|
|
3
3
|
export function setupTargetCommands(yargs) {
|
|
4
4
|
return yargs.command('target <subcommand>', 'Manage Runtime Target Contexts', (commandYargs) => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { runCliCommand } from '
|
|
1
|
+
import { runCliCommand } from '../shared/commandRunner.js';
|
|
2
2
|
import { globalOptions } from '../../globalOptions.js';
|
|
3
3
|
export function setupWaitCommand(yargs) {
|
|
4
4
|
return yargs.command('wait [server]', 'Wait for configured static MCP servers to become connected and available', (commandYargs) => commandYargs
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ClientSurfaceAttachmentContext } from '
|
|
2
|
-
import { type InspectServerSummary } from '
|
|
1
|
+
import { type ClientSurfaceAttachmentContext } from '../shared/clientSurfaceAttachment.js';
|
|
2
|
+
import { type InspectServerSummary } from '../shared/inspectApiSchemas.js';
|
|
3
3
|
import type { GlobalOptions } from '../../globalOptions.js';
|
|
4
4
|
export interface WaitCommandOptions extends GlobalOptions {
|
|
5
5
|
server?: string;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { encode } from '@toon-format/toon';
|
|
2
|
-
import { ApiClient } from '
|
|
3
|
-
import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, getClientSurfaceAuthRecoveryCommand, } from '
|
|
4
|
-
import { buildFilterSelectionQuery } from '
|
|
5
|
-
import { inspectServersResultSchema } from '
|
|
2
|
+
import { ApiClient } from '../shared/apiClient.js';
|
|
3
|
+
import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, getClientSurfaceAuthRecoveryCommand, } from '../shared/clientSurfaceAttachment.js';
|
|
4
|
+
import { buildFilterSelectionQuery } from '../shared/filterSelectionQuery.js';
|
|
5
|
+
import { inspectServersResultSchema } from '../shared/inspectApiSchemas.js';
|
|
6
6
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
7
7
|
import { z } from 'zod';
|
|
8
8
|
const waitCommandOptionsSchema = z
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
import { getUnknownGlobalConfigKeys, mergeGlobalAndServerConfig } from '
|
|
3
|
+
import { getUnknownGlobalConfigKeys, mergeGlobalAndServerConfig } from './mcpConfigMerge.js';
|
|
4
4
|
import { DEFAULT_CONFIG, getGlobalConfigPath } from '../constants.js';
|
|
5
5
|
import { MCP_CONFIG_SCHEMA_URL } from '../constants/schema.js';
|
|
6
6
|
import { AgentConfigManager } from '../core/server/agentConfig.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { isOperatorDisabledTemplateDefinition } from '
|
|
3
|
-
import { McpConfigManager } from '
|
|
4
|
-
import { mergeGlobalAndServerConfig } from '
|
|
2
|
+
import { isOperatorDisabledTemplateDefinition } from './configuredServerTargets.js';
|
|
3
|
+
import { McpConfigManager } from './mcpConfigManager.js';
|
|
4
|
+
import { mergeGlobalAndServerConfig } from './mcpConfigMerge.js';
|
|
5
5
|
import { AgentConfigManager } from '../core/server/agentConfig.js';
|
|
6
6
|
import { mcpServerConfigSchema, transportConfigSchema, } from '../core/types/transport.js';
|
|
7
7
|
import logger, { debugIf } from '../logger/logger.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { McpConfigManager } from '
|
|
1
|
+
import { McpConfigManager } from './mcpConfigManager.js';
|
|
2
2
|
export function getConfiguredServerTargets() {
|
|
3
3
|
const manager = McpConfigManager.getInstance();
|
|
4
4
|
return typeof manager.getConfiguredServerTargets === 'function'
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
2
|
import fs from 'fs';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import ConfigContext from '
|
|
5
|
-
import { ConfigLoader } from '
|
|
6
|
-
import { mergeGlobalAndServerConfig } from '
|
|
4
|
+
import ConfigContext from './configContext.js';
|
|
5
|
+
import { ConfigLoader } from './configLoader.js';
|
|
6
|
+
import { mergeGlobalAndServerConfig } from './mcpConfigMerge.js';
|
|
7
7
|
import { AgentConfigManager } from '../core/server/agentConfig.js';
|
|
8
8
|
import { mcpServerConfigSchema, } from '../core/types/index.js';
|
|
9
9
|
import logger, { debugIf } from '../logger/logger.js';
|
package/build/constants/mcp.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
|
6
6
|
export declare const APP_CONFIG_FILE = "config.toml";
|
|
7
7
|
export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
|
|
8
8
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
9
|
-
export declare const MCP_SERVER_VERSION = "0.38.
|
|
9
|
+
export declare const MCP_SERVER_VERSION = "0.38.2";
|
|
10
10
|
export declare const MCP_PROJECT_METADATA: {
|
|
11
11
|
readonly repository: "https://github.com/1mcp-app/agent";
|
|
12
12
|
readonly documentation: "https://docs.1mcp.app";
|
package/build/constants/mcp.js
CHANGED
|
@@ -3,7 +3,7 @@ export const MCP_CONFIG_FILE = 'mcp.json';
|
|
|
3
3
|
export const APP_CONFIG_FILE = 'config.toml';
|
|
4
4
|
export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
|
|
5
5
|
export const MCP_SERVER_NAME = '1mcp';
|
|
6
|
-
export const MCP_SERVER_VERSION = '0.38.
|
|
6
|
+
export const MCP_SERVER_VERSION = '0.38.2';
|
|
7
7
|
// Compiled with every artifact so Admin Console metadata does not depend on
|
|
8
8
|
// package.json being adjacent to the runtime entrypoint.
|
|
9
9
|
export const MCP_PROJECT_METADATA = {
|
package/build/constants.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @deprecated This file is deprecated. Import from './constants' directory instead.
|
|
2
|
+
* @deprecated This file is deprecated. Import from './constants.js' directory instead.
|
|
3
3
|
* This barrel export maintains backward compatibility.
|
|
4
4
|
*/
|
|
5
5
|
export * from './constants/index.js';
|
package/build/constants.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @deprecated This file is deprecated. Import from './constants' directory instead.
|
|
2
|
+
* @deprecated This file is deprecated. Import from './constants.js' directory instead.
|
|
3
3
|
* This barrel export maintains backward compatibility.
|
|
4
4
|
*/
|
|
5
5
|
// Re-export all constants from new domain-specific organization
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { McpLoadingManager } from '
|
|
3
|
-
import { NotificationManager } from '
|
|
4
|
-
import { ServerManager } from '
|
|
5
|
-
import { InboundConnection, OutboundConnections } from '
|
|
2
|
+
import { McpLoadingManager } from '../loading/mcpLoadingManager.js';
|
|
3
|
+
import { NotificationManager } from '../notifications/notificationManager.js';
|
|
4
|
+
import { ServerManager } from '../server/serverManager.js';
|
|
5
|
+
import { InboundConnection, OutboundConnections } from '../types/index.js';
|
|
6
6
|
import { CapabilityAggregator } from './capabilityAggregator.js';
|
|
7
7
|
import type { CapabilityRefreshResult } from './capabilityCatalog.js';
|
|
8
8
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import { McpLoadingEvent } from '
|
|
3
|
-
import { NotificationManager } from '
|
|
4
|
-
import { AgentConfigManager } from '
|
|
2
|
+
import { McpLoadingEvent } from '../loading/mcpLoadingManager.js';
|
|
3
|
+
import { NotificationManager } from '../notifications/notificationManager.js';
|
|
4
|
+
import { AgentConfigManager } from '../server/agentConfig.js';
|
|
5
5
|
import logger, { debugIf } from '../../logger/logger.js';
|
|
6
6
|
import { AsyncLoadingOrchestratorEvent } from './asyncLoadingOrchestratorEvent.js';
|
|
7
7
|
import { CapabilityAggregator } from './capabilityAggregator.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
|
-
import type { OutboundConnections } from '
|
|
2
|
+
import type { OutboundConnections } from '../types/index.js';
|
|
3
3
|
import type { Prompt, Resource, ResourceTemplate, Tool } from '../../sdk/contracts/index.js';
|
|
4
4
|
import { type CatalogGeneration } from './catalogGeneration.js';
|
|
5
5
|
import { type RuntimeCapabilitySnapshot } from './runtimeCapabilityCatalog.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
2
|
import { getConfiguredServerTargets } from '../../config/configuredServerTargets.js';
|
|
3
|
-
import { InternalCapabilitiesProvider } from '
|
|
3
|
+
import { InternalCapabilitiesProvider } from './internalCapabilitiesProvider.js';
|
|
4
4
|
import { buildCatalogGeneration } from './catalogGeneration.js';
|
|
5
5
|
import { acquireRuntimeCapabilityCatalog, RuntimeCatalogBackendChangedError, } from './runtimeCapabilityCatalog.js';
|
|
6
6
|
/** Publishes the runtime catalog as one aggregate snapshot for discovery and notifications. */
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type TemplateHashProvider } from '
|
|
2
|
-
import { type MCPServerParams, type OutboundConnection, type OutboundConnections } from '
|
|
1
|
+
import { type TemplateHashProvider } from '../server/connectionResolver.js';
|
|
2
|
+
import { type MCPServerParams, type OutboundConnection, type OutboundConnections } from '../types/index.js';
|
|
3
3
|
import type { Tool } from '../../sdk/contracts/index.js';
|
|
4
4
|
import { type CapabilityKind, type CapabilityPage, type CapabilityPaginationResult } from './capabilityPagination.js';
|
|
5
5
|
import { type CapabilityVisibility } from './capabilityVisibility.js';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { requestLegacyAdapter } from '
|
|
2
|
-
import { ConnectionResolver } from '
|
|
3
|
-
import { getDisabledSourceToolError, isSourceToolDisabled } from '
|
|
4
|
-
import { applySourceToolDescription } from '
|
|
5
|
-
import { ClientStatus, } from '
|
|
1
|
+
import { requestLegacyAdapter } from '../client/legacyAdapterRequest.js';
|
|
2
|
+
import { ConnectionResolver } from '../server/connectionResolver.js';
|
|
3
|
+
import { getDisabledSourceToolError, isSourceToolDisabled } from '../server/disabledTools.js';
|
|
4
|
+
import { applySourceToolDescription } from '../server/toolDescriptionOverrides.js';
|
|
5
|
+
import { ClientStatus, } from '../types/index.js';
|
|
6
6
|
import logger from '../../logger/logger.js';
|
|
7
7
|
import { walkCapabilityPages, } from './capabilityPagination.js';
|
|
8
8
|
import { getCapabilityVisibleServerNames } from './capabilityVisibility.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { InboundConnection, OutboundConnections } from '
|
|
1
|
+
import { InboundConnection, OutboundConnections } from '../types/index.js';
|
|
2
2
|
import { LazyLoadingOrchestrator } from './lazyLoadingOrchestrator.js';
|
|
3
3
|
interface ServerCapabilitiesSnapshot {
|
|
4
4
|
resources?: Record<string, unknown>;
|