@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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveBackground.js","sourceRoot":"","sources":["../../../src/commands/serve/serveBackground.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"serveBackground.js","sourceRoot":"","sources":["../../../src/commands/serve/serveBackground.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type BackgroundSupervisorState, cleanupBackgroundSupervisorState, readBackgroundSupervisorState } from '../../core/server/backgroundRuntimeSupervisor.js';
|
|
2
2
|
import { ServerPidInfo } from '../../core/server/pidFileManager.js';
|
|
3
|
+
import { inspectProcessIdentity } from '../../core/server/processIdentity.js';
|
|
3
4
|
import { discoverScopedRuntime, RuntimeStatus } from '../../core/server/runtimeLifecycle.js';
|
|
4
5
|
import { readRuntimeScopeOwnership, reclaimStaleRuntimeScopeOwnership, type RuntimeScopeOwnershipRecord } from '../../core/server/runtimeScopeOwnership.js';
|
|
5
6
|
/**
|
|
@@ -27,7 +28,7 @@ export declare const STATUS_EXIT_CODES: Record<ServeRuntimeStatus, number>;
|
|
|
27
28
|
export interface RuntimeStatusDeps {
|
|
28
29
|
readSupervisorState?: typeof readBackgroundSupervisorState;
|
|
29
30
|
cleanupSupervisorState?: typeof cleanupBackgroundSupervisorState;
|
|
30
|
-
|
|
31
|
+
inspectIdentity?: typeof inspectProcessIdentity;
|
|
31
32
|
discoverRuntime?: typeof discoverScopedRuntime;
|
|
32
33
|
readOwnership?: typeof readRuntimeScopeOwnership;
|
|
33
34
|
reclaimOwnership?: typeof reclaimStaleRuntimeScopeOwnership;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStatus.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"serveStatus.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC5F,OAAO,EACL,yBAAyB,EACzB,iCAAiC,EAEjC,KAAK,2BAA2B,EACjC,MAAM,2CAA2C,CAAC;AAEnD;;;;;GAKG;AAEH,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAE1F,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,oEAAoE;IACpE,SAAS,CAAC,EAAE,2BAA2B,CAAC;IACxC,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAQhE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,CAAC,EAAE,OAAO,6BAA6B,CAAC;IAC3D,sBAAsB,CAAC,EAAE,OAAO,gCAAgC,CAAC;IACjE,eAAe,CAAC,EAAE,OAAO,sBAAsB,CAAC;IAChD,eAAe,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACjD,gBAAgB,CAAC,EAAE,OAAO,iCAAiC,CAAC;CAC7D;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,eAAe,CAAC,EAAE,MAAM,EACxB,IAAI,GAAE,iBAAsB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CA2F9B;AAuED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CA+C7E;AA8BD;;GAEG;AACH,wBAAsB,cAAc,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5E"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { getConfigDir } from '../../constants.js';
|
|
2
2
|
import { cleanupBackgroundSupervisorState, readBackgroundSupervisorState, } from '../../core/server/backgroundRuntimeSupervisor.js';
|
|
3
|
-
import {
|
|
3
|
+
import { inspectProcessIdentity } from '../../core/server/processIdentity.js';
|
|
4
4
|
import { discoverScopedRuntime } from '../../core/server/runtimeLifecycle.js';
|
|
5
|
-
import { readRuntimeScopeOwnership, reclaimStaleRuntimeScopeOwnership, } from '../../core/server/runtimeScopeOwnership.js';
|
|
5
|
+
import { readRuntimeScopeOwnership, reclaimStaleRuntimeScopeOwnership, RuntimeScopeOwnedError, } from '../../core/server/runtimeScopeOwnership.js';
|
|
6
6
|
/** Process exit codes per runtime state, allowing scripts to branch on status. */
|
|
7
7
|
export const STATUS_EXIT_CODES = {
|
|
8
8
|
running: 0,
|
|
@@ -22,7 +22,7 @@ export async function getRuntimeStatusReport(configDirOption, deps = {}) {
|
|
|
22
22
|
const configDir = getConfigDir(configDirOption);
|
|
23
23
|
const readSupervisorState = deps.readSupervisorState ?? readBackgroundSupervisorState;
|
|
24
24
|
const cleanupSupervisorState = deps.cleanupSupervisorState ?? cleanupBackgroundSupervisorState;
|
|
25
|
-
const
|
|
25
|
+
const inspectIdentity = deps.inspectIdentity ?? inspectProcessIdentity;
|
|
26
26
|
const discoverRuntime = deps.discoverRuntime ?? discoverScopedRuntime;
|
|
27
27
|
const readOwnership = deps.readOwnership ?? readRuntimeScopeOwnership;
|
|
28
28
|
const reclaimOwnership = deps.reclaimOwnership ?? reclaimStaleRuntimeScopeOwnership;
|
|
@@ -34,8 +34,15 @@ export async function getRuntimeStatusReport(configDirOption, deps = {}) {
|
|
|
34
34
|
return statusError(configDir, error);
|
|
35
35
|
}
|
|
36
36
|
if (supervisorState) {
|
|
37
|
-
const
|
|
38
|
-
const
|
|
37
|
+
const supervisorStatus = inspectIdentity(supervisorState.supervisorPid, supervisorState.supervisorIdentity);
|
|
38
|
+
const runtimeStatus = supervisorState.runtimePid === null
|
|
39
|
+
? 'dead'
|
|
40
|
+
: inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity);
|
|
41
|
+
if (supervisorStatus === 'unknown' || runtimeStatus === 'unknown') {
|
|
42
|
+
return statusError(configDir, new Error('Cannot verify supervisor or worker process identity; lifecycle metadata was retained'));
|
|
43
|
+
}
|
|
44
|
+
const supervisorAlive = supervisorStatus === 'alive';
|
|
45
|
+
const runtimeAlive = runtimeStatus === 'alive';
|
|
39
46
|
if (!supervisorAlive && runtimeAlive) {
|
|
40
47
|
return { status: 'orphaned', configDir, info: null, supervisorState };
|
|
41
48
|
}
|
|
@@ -50,7 +57,7 @@ export async function getRuntimeStatusReport(configDirOption, deps = {}) {
|
|
|
50
57
|
discoverRuntime,
|
|
51
58
|
readOwnership,
|
|
52
59
|
reclaimOwnership,
|
|
53
|
-
|
|
60
|
+
inspectIdentity,
|
|
54
61
|
});
|
|
55
62
|
if ((discovered.status === 'running' || discovered.status === 'unreachable') && discovered.info) {
|
|
56
63
|
let owner;
|
|
@@ -92,7 +99,7 @@ export async function getRuntimeStatusReport(configDirOption, deps = {}) {
|
|
|
92
99
|
}
|
|
93
100
|
return { ...discovered, configDir, supervisorState };
|
|
94
101
|
}
|
|
95
|
-
return discoverRuntimeWithOwnership(configDir, { discoverRuntime, readOwnership, reclaimOwnership,
|
|
102
|
+
return discoverRuntimeWithOwnership(configDir, { discoverRuntime, readOwnership, reclaimOwnership, inspectIdentity });
|
|
96
103
|
}
|
|
97
104
|
async function discoverRuntimeWithOwnership(configDir, deps) {
|
|
98
105
|
const discovered = await deps.discoverRuntime(configDir);
|
|
@@ -109,21 +116,32 @@ async function discoverRuntimeWithOwnership(configDir, deps) {
|
|
|
109
116
|
if (!ownership) {
|
|
110
117
|
return { ...discovered, configDir };
|
|
111
118
|
}
|
|
112
|
-
|
|
119
|
+
const ownerStatus = deps.inspectIdentity(ownership.pid, ownership.processIdentity);
|
|
120
|
+
if (ownerStatus === 'unknown')
|
|
121
|
+
return statusError(configDir, new Error('Cannot verify Runtime Scope owner identity; lifecycle metadata was retained'));
|
|
122
|
+
if (ownerStatus === 'alive') {
|
|
113
123
|
return { status: 'unreachable', configDir, info: null, ownership };
|
|
114
124
|
}
|
|
125
|
+
let reclaimError;
|
|
115
126
|
try {
|
|
116
|
-
if (deps.reclaimOwnership(configDir, ownership
|
|
127
|
+
if (deps.reclaimOwnership(configDir, ownership)) {
|
|
117
128
|
return { ...discovered, configDir };
|
|
118
129
|
}
|
|
130
|
+
}
|
|
131
|
+
catch (error) {
|
|
132
|
+
if (!(error instanceof RuntimeScopeOwnedError))
|
|
133
|
+
return statusError(configDir, error);
|
|
134
|
+
reclaimError = error;
|
|
135
|
+
}
|
|
136
|
+
try {
|
|
119
137
|
const replacement = deps.readOwnership(configDir);
|
|
120
138
|
if (!replacement) {
|
|
121
|
-
return { ...discovered, configDir };
|
|
139
|
+
return reclaimError ? statusError(configDir, reclaimError) : { ...discovered, configDir };
|
|
122
140
|
}
|
|
123
|
-
if (deps.
|
|
141
|
+
if (deps.inspectIdentity(replacement.pid, replacement.processIdentity) === 'alive') {
|
|
124
142
|
return { status: 'unreachable', configDir, info: null, ownership: replacement };
|
|
125
143
|
}
|
|
126
|
-
return statusError(configDir, new Error('Runtime Scope ownership changed while removing stale metadata'));
|
|
144
|
+
return statusError(configDir, reclaimError ?? new Error('Runtime Scope ownership changed while removing stale metadata'));
|
|
127
145
|
}
|
|
128
146
|
catch (error) {
|
|
129
147
|
return statusError(configDir, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStatus.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAEL,gCAAgC,EAChC,6BAA6B,GAC9B,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"serveStatus.js","sourceRoot":"","sources":["../../../src/commands/serve/serveStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { cleanupBackgroundSupervisorState, readBackgroundSupervisorState } from '../../core/server/backgroundRuntimeSupervisor.js';
|
|
2
2
|
import { readPidFile } from '../../core/server/pidFileManager.js';
|
|
3
|
+
import { inspectProcessIdentity } from '../../core/server/processIdentity.js';
|
|
3
4
|
import { acquireRuntimeScopeStopLock, readRuntimeScopeOwnership } from '../../core/server/runtimeScopeOwnership.js';
|
|
4
5
|
/**
|
|
5
6
|
* `serve --stop`: stop only the runtime in the selected Runtime Scope.
|
|
@@ -20,6 +21,7 @@ export declare function waitForProcessExit(pid: number, options?: WaitForExitOpt
|
|
|
20
21
|
/** Signals this command sends to a runtime process. */
|
|
21
22
|
type StopSignal = 'SIGTERM' | 'SIGKILL';
|
|
22
23
|
export interface RunStopDeps {
|
|
24
|
+
inspectIdentity?: typeof inspectProcessIdentity;
|
|
23
25
|
readSupervisorState?: typeof readBackgroundSupervisorState;
|
|
24
26
|
readOwnership?: typeof readRuntimeScopeOwnership;
|
|
25
27
|
acquireStopLock?: typeof acquireRuntimeScopeStopLock;
|
|
@@ -29,7 +31,6 @@ export interface RunStopDeps {
|
|
|
29
31
|
/** Guarded release of the matching background-supervisor ownership record. */
|
|
30
32
|
cleanupOwnership?: (configDir: string, expectedSupervisorPid: number) => boolean;
|
|
31
33
|
readInfo?: typeof readPidFile;
|
|
32
|
-
isAlive?: (pid: number) => boolean;
|
|
33
34
|
kill?: (pid: number, signal: StopSignal) => void;
|
|
34
35
|
/** Delete the PID file only if it still records the stopped PID. */
|
|
35
36
|
cleanup?: (configDir: string, expectedPid: number) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serveStop.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serveStop.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serveStop.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAKL,WAAW,EAEZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAwB,MAAM,qCAAqC,CAAC;AACnG,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EAI1B,MAAM,2CAA2C,CAAC;AAGnD;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wFAAwF;AACxF,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,CAexG;AAED,uDAAuD;AACvD,KAAK,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAExC,MAAM,WAAW,WAAW;IAC1B,eAAe,CAAC,EAAE,OAAO,sBAAsB,CAAC;IAChD,mBAAmB,CAAC,EAAE,OAAO,6BAA6B,CAAC;IAC3D,aAAa,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACjD,eAAe,CAAC,EAAE,OAAO,2BAA2B,CAAC;IACrD,sBAAsB,CAAC,EAAE,OAAO,gCAAgC,CAAC;IACjE,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,KAAK,OAAO,CAAC;IACpF,8EAA8E;IAC9E,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,KAAK,OAAO,CAAC;IACjF,QAAQ,CAAC,EAAE,OAAO,WAAW,CAAC;IAC9B,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,oEAAoE;IACpE,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9D,WAAW,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACxC,kDAAkD;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAwDD;;GAEG;AACH,wBAAsB,YAAY,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+SlG"}
|
|
@@ -1,7 +1,9 @@
|
|
|
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';
|
|
7
9
|
/** Poll until the process is gone or the timeout elapses. Returns true if it exited. */
|
|
@@ -50,6 +52,9 @@ function cleanupSupervisorLaunchConfig(configDir, expectedSupervisorPid) {
|
|
|
50
52
|
}
|
|
51
53
|
return cleanupBackgroundLaunchConfig(configDir, owner.claimId, { removeStaleGeneration: true });
|
|
52
54
|
}
|
|
55
|
+
function runtimeMetadataMatches(info, pid, identity) {
|
|
56
|
+
return !info || (info.pid === pid && JSON.stringify(info.processIdentity) === JSON.stringify(identity));
|
|
57
|
+
}
|
|
53
58
|
function bootstrapSupervisorState(supervisorPid) {
|
|
54
59
|
const now = new Date().toISOString();
|
|
55
60
|
return {
|
|
@@ -75,10 +80,34 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
75
80
|
const cleanupSupervisorState = deps.cleanupSupervisorState ?? cleanupBackgroundSupervisorState;
|
|
76
81
|
const cleanupLaunchConfig = deps.cleanupLaunchConfig ?? cleanupSupervisorLaunchConfig;
|
|
77
82
|
const cleanupOwnership = deps.cleanupOwnership ?? cleanupSupervisorOwnership;
|
|
78
|
-
const
|
|
79
|
-
const
|
|
83
|
+
const observedPidRecords = new Map();
|
|
84
|
+
const expectedWorkerIdentities = new Map();
|
|
85
|
+
const readInfo = (scope) => {
|
|
86
|
+
const info = (deps.readInfo ?? readPidFile)(scope);
|
|
87
|
+
if (!info && fs.existsSync(getPidFilePath(scope))) {
|
|
88
|
+
throw new PidFileReadError(getPidFilePath(scope), new Error('runtime PID metadata is malformed'));
|
|
89
|
+
}
|
|
90
|
+
if (info)
|
|
91
|
+
observedPidRecords.set(info.pid, info);
|
|
92
|
+
return info;
|
|
93
|
+
};
|
|
80
94
|
const kill = deps.kill ?? defaultKill;
|
|
81
|
-
const
|
|
95
|
+
const inspectIdentity = deps.inspectIdentity ?? inspectProcessIdentity;
|
|
96
|
+
const cleanup = deps.cleanup ??
|
|
97
|
+
((scope, pid) => {
|
|
98
|
+
const observed = observedPidRecords.get(pid);
|
|
99
|
+
if (observed)
|
|
100
|
+
return cleanupPidFileIfMatches(scope, observed);
|
|
101
|
+
const current = readPidFile(scope);
|
|
102
|
+
if (!current)
|
|
103
|
+
return !fs.existsSync(getPidFilePath(scope));
|
|
104
|
+
const expectedIdentity = expectedWorkerIdentities.get(pid);
|
|
105
|
+
if (current.pid !== pid ||
|
|
106
|
+
!expectedIdentity ||
|
|
107
|
+
JSON.stringify(current.processIdentity) !== JSON.stringify(expectedIdentity))
|
|
108
|
+
return false;
|
|
109
|
+
return cleanupPidFileIfMatches(scope, current);
|
|
110
|
+
});
|
|
82
111
|
const waitForExit = deps.waitForExit ?? waitForProcessExit;
|
|
83
112
|
const gracefulTimeoutMs = deps.gracefulTimeoutMs ?? 10000;
|
|
84
113
|
let supervisorState;
|
|
@@ -103,8 +132,9 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
103
132
|
if (supervisorState) {
|
|
104
133
|
const stateMatchesOwner = owner?.kind === 'background-supervisor' && owner.pid === supervisorState.supervisorPid;
|
|
105
134
|
if (!stateMatchesOwner) {
|
|
106
|
-
const staleProcessStillAlive =
|
|
107
|
-
(supervisorState.runtimePid !== null &&
|
|
135
|
+
const staleProcessStillAlive = inspectIdentity(supervisorState.supervisorPid, supervisorState.supervisorIdentity) !== 'dead' ||
|
|
136
|
+
(supervisorState.runtimePid !== null &&
|
|
137
|
+
inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity) !== 'dead');
|
|
108
138
|
if (staleProcessStillAlive) {
|
|
109
139
|
failStop(`supervisor state does not match Runtime Scope ownership in ${configDir}; refusing ambiguous stop.`);
|
|
110
140
|
return;
|
|
@@ -136,20 +166,52 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
136
166
|
return;
|
|
137
167
|
}
|
|
138
168
|
try {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
169
|
+
try {
|
|
170
|
+
const initialInfo = readInfo(configDir);
|
|
171
|
+
if (supervisorState.runtimePid !== null &&
|
|
172
|
+
!runtimeMetadataMatches(initialInfo, supervisorState.runtimePid, supervisorState.runtimeIdentity)) {
|
|
173
|
+
throw new Error('runtime PID metadata conflicts with supervisor state');
|
|
174
|
+
}
|
|
175
|
+
if (owner.processIdentity &&
|
|
176
|
+
supervisorState.supervisorIdentity &&
|
|
177
|
+
JSON.stringify(owner.processIdentity) !== JSON.stringify(supervisorState.supervisorIdentity)) {
|
|
178
|
+
throw new Error('supervisor identity conflicts with Runtime Scope ownership');
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
failStop(`cannot inspect runtime PID metadata in Runtime Scope ${configDir}: ${errorMessage(error)}`);
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
const supervisorIdentity = owner.processIdentity ?? supervisorState.supervisorIdentity;
|
|
186
|
+
const supervisorStatus = inspectIdentity(supervisorState.supervisorPid, supervisorIdentity);
|
|
187
|
+
const workerStatus = supervisorState.runtimePid === null
|
|
188
|
+
? 'dead'
|
|
189
|
+
: inspectIdentity(supervisorState.runtimePid, supervisorState.runtimeIdentity);
|
|
190
|
+
if (supervisorStatus === 'unknown' || workerStatus === 'unknown') {
|
|
191
|
+
failStop(`cannot verify process identity in Runtime Scope ${configDir}; refusing ambiguous stop.`);
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
const supervisorWasAlive = supervisorStatus === 'alive';
|
|
195
|
+
const runtimeWasAlive = workerStatus === 'alive';
|
|
196
|
+
const terminateOptions = { kill, waitForExit, gracefulTimeoutMs, inspectIdentity };
|
|
142
197
|
if (supervisorWasAlive &&
|
|
143
|
-
!(await terminateProcess(supervisorState.supervisorPid, 'supervisor',
|
|
198
|
+
!(await terminateProcess(supervisorState.supervisorPid, 'supervisor', {
|
|
199
|
+
...terminateOptions,
|
|
200
|
+
identity: supervisorIdentity,
|
|
201
|
+
}))) {
|
|
144
202
|
failStop(`failed to stop Background Runtime Supervisor (PID ${supervisorState.supervisorPid}) in Runtime Scope ${configDir}.`);
|
|
145
203
|
return;
|
|
146
204
|
}
|
|
147
205
|
let runtimePid = supervisorState.runtimePid;
|
|
206
|
+
let runtimeIdentity = supervisorState.runtimeIdentity;
|
|
148
207
|
if (supervisorWasAlive) {
|
|
149
208
|
try {
|
|
150
209
|
const finalState = readSupervisorState(configDir);
|
|
151
210
|
if (finalState?.supervisorPid === supervisorState.supervisorPid) {
|
|
152
|
-
|
|
211
|
+
if (finalState.runtimePid !== null) {
|
|
212
|
+
runtimePid = finalState.runtimePid;
|
|
213
|
+
runtimeIdentity = finalState.runtimeIdentity;
|
|
214
|
+
}
|
|
153
215
|
}
|
|
154
216
|
}
|
|
155
217
|
catch (error) {
|
|
@@ -161,7 +223,9 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
161
223
|
// final state has already disappeared, the PID file is the recovery source.
|
|
162
224
|
if (runtimePid === null) {
|
|
163
225
|
try {
|
|
164
|
-
|
|
226
|
+
const recoveredInfo = readInfo(configDir);
|
|
227
|
+
runtimePid = recoveredInfo?.pid ?? null;
|
|
228
|
+
runtimeIdentity = recoveredInfo?.processIdentity;
|
|
165
229
|
}
|
|
166
230
|
catch (error) {
|
|
167
231
|
failStop(`supervisor stopped, but its runtime PID could not be recovered in Runtime Scope ${configDir}: ${errorMessage(error)}`);
|
|
@@ -172,13 +236,25 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
172
236
|
// what prevents an in-flight retry policy from replacing a deliberately
|
|
173
237
|
// stopped worker.
|
|
174
238
|
if (runtimePid !== null &&
|
|
175
|
-
|
|
176
|
-
!(await terminateProcess(runtimePid, 'runtime', terminateOptions))) {
|
|
239
|
+
!(await terminateProcess(runtimePid, 'runtime', { ...terminateOptions, identity: runtimeIdentity }))) {
|
|
177
240
|
failStop(`failed to stop supervised runtime (PID ${runtimePid}) in Runtime Scope ${configDir}.`);
|
|
178
241
|
return;
|
|
179
242
|
}
|
|
180
|
-
|
|
181
|
-
|
|
243
|
+
try {
|
|
244
|
+
const finalInfo = readInfo(configDir);
|
|
245
|
+
if (!runtimeMetadataMatches(finalInfo, runtimePid, runtimeIdentity)) {
|
|
246
|
+
throw new Error('runtime PID metadata changed to a different process incarnation');
|
|
247
|
+
}
|
|
248
|
+
if (runtimePid !== null) {
|
|
249
|
+
if (runtimeIdentity)
|
|
250
|
+
expectedWorkerIdentities.set(runtimePid, runtimeIdentity);
|
|
251
|
+
if (!cleanup(configDir, runtimePid))
|
|
252
|
+
throw new Error('runtime PID metadata could not be safely removed');
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
catch (error) {
|
|
256
|
+
failStop(`runtime stopped, but PID metadata must be retained in Runtime Scope ${configDir}: ${errorMessage(error)}`);
|
|
257
|
+
return;
|
|
182
258
|
}
|
|
183
259
|
try {
|
|
184
260
|
if (!cleanupLaunchConfig(configDir, supervisorState.supervisorPid)) {
|
|
@@ -223,12 +299,21 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
223
299
|
throw error;
|
|
224
300
|
}
|
|
225
301
|
if (!info) {
|
|
302
|
+
if (fs.existsSync(getPidFilePath(configDir))) {
|
|
303
|
+
failStop(`runtime PID metadata is malformed in Runtime Scope ${configDir}; refusing ambiguous stop.`);
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
226
306
|
process.stdout.write(`No runtime is running in this Runtime Scope: ${configDir}\n`);
|
|
227
307
|
process.exitCode = 0;
|
|
228
308
|
return;
|
|
229
309
|
}
|
|
230
310
|
// Stale dead-process PID file: clean it up and report cleanly.
|
|
231
|
-
|
|
311
|
+
const identityStatus = inspectIdentity(info.pid, info.processIdentity);
|
|
312
|
+
if (identityStatus === 'unknown') {
|
|
313
|
+
failStop(`cannot verify process identity for Runtime Scope PID ${info.pid}; refusing ambiguous stop.`);
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
if (identityStatus === 'dead') {
|
|
232
317
|
if (cleanup(configDir, info.pid)) {
|
|
233
318
|
process.stdout.write(`No running runtime in this Runtime Scope; removed a stale PID file (was PID ${info.pid}).\n`);
|
|
234
319
|
}
|
|
@@ -240,9 +325,10 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
240
325
|
return;
|
|
241
326
|
}
|
|
242
327
|
const exited = await terminateProcess(info.pid, 'Runtime', {
|
|
328
|
+
identity: info.processIdentity,
|
|
329
|
+
inspectIdentity,
|
|
243
330
|
kill,
|
|
244
331
|
waitForExit,
|
|
245
|
-
isAlive,
|
|
246
332
|
gracefulTimeoutMs,
|
|
247
333
|
});
|
|
248
334
|
if (exited) {
|
|
@@ -257,6 +343,10 @@ export async function runServeStop(configDirOption, deps = {}) {
|
|
|
257
343
|
failStop(`failed to stop runtime (PID ${info.pid}) in Runtime Scope ${configDir}.`);
|
|
258
344
|
}
|
|
259
345
|
async function terminateProcess(pid, label, options) {
|
|
346
|
+
const beforeTerm = options.inspectIdentity(pid, options.identity);
|
|
347
|
+
if (beforeTerm !== 'alive')
|
|
348
|
+
return beforeTerm === 'dead';
|
|
349
|
+
const sameProcessAlive = () => options.inspectIdentity(pid, options.identity) !== 'dead';
|
|
260
350
|
try {
|
|
261
351
|
options.kill(pid, 'SIGTERM');
|
|
262
352
|
}
|
|
@@ -265,11 +355,14 @@ async function terminateProcess(pid, label, options) {
|
|
|
265
355
|
}
|
|
266
356
|
let exited = await options.waitForExit(pid, {
|
|
267
357
|
timeoutMs: options.gracefulTimeoutMs,
|
|
268
|
-
isAlive:
|
|
358
|
+
isAlive: sameProcessAlive,
|
|
269
359
|
});
|
|
270
360
|
if (exited) {
|
|
271
361
|
return true;
|
|
272
362
|
}
|
|
363
|
+
const beforeKill = options.inspectIdentity(pid, options.identity);
|
|
364
|
+
if (beforeKill !== 'alive')
|
|
365
|
+
return beforeKill === 'dead';
|
|
273
366
|
logger.warn(`${label} (PID ${pid}) did not exit after SIGTERM; escalating to SIGKILL`);
|
|
274
367
|
try {
|
|
275
368
|
options.kill(pid, 'SIGKILL');
|
|
@@ -277,6 +370,6 @@ async function terminateProcess(pid, label, options) {
|
|
|
277
370
|
catch (error) {
|
|
278
371
|
logger.warn(`Failed to send SIGKILL to ${label} PID ${pid}: ${error}`);
|
|
279
372
|
}
|
|
280
|
-
return options.waitForExit(pid, { timeoutMs: 2000, isAlive:
|
|
373
|
+
return options.waitForExit(pid, { timeoutMs: 2000, isAlive: sameProcessAlive });
|
|
281
374
|
}
|
|
282
375
|
//# 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
|