@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
package/build/admin/index.html
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
6
6
|
<link rel="icon" href="/admin/favicon.svg" type="image/svg+xml" />
|
|
7
7
|
<title>1MCP Admin Console</title>
|
|
8
|
-
<script type="module" crossorigin src="/admin/assets/admin-console-
|
|
8
|
+
<script type="module" crossorigin src="/admin/assets/admin-console-BmdH0cQS.js"></script>
|
|
9
9
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-rolldown-runtime-Bh1tDfsg.js">
|
|
10
10
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-react-BSaWeqgv.js">
|
|
11
11
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-mantine-xwbfu5Gd.js">
|
|
@@ -86,9 +86,11 @@ export type LocalhostCliTokenResult = {
|
|
|
86
86
|
};
|
|
87
87
|
export interface BackendOAuthInput {
|
|
88
88
|
serverName: string;
|
|
89
|
+
adminReturnOrigin?: string;
|
|
89
90
|
}
|
|
90
91
|
export interface BackendOAuthCallbackInput {
|
|
91
92
|
serverName: string;
|
|
93
|
+
state?: string;
|
|
92
94
|
code?: string;
|
|
93
95
|
error?: string;
|
|
94
96
|
iss?: string;
|
|
@@ -109,8 +111,10 @@ export type RestartBackendOAuthResult = {
|
|
|
109
111
|
};
|
|
110
112
|
export type CompleteBackendOAuthCallbackResult = {
|
|
111
113
|
status: 'completed';
|
|
114
|
+
adminReturnOrigin?: string;
|
|
112
115
|
} | {
|
|
113
116
|
status: 'provider_error' | 'missing_code' | 'callback_failed' | 'runtime_unavailable';
|
|
117
|
+
adminReturnOrigin?: string;
|
|
114
118
|
errorDescription: string;
|
|
115
119
|
};
|
|
116
120
|
export interface BackendOAuthDashboardService {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthAuthorizationFlow.d.ts","sourceRoot":"","sources":["../../src/auth/oauthAuthorizationFlow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauthAuthorizationFlow.d.ts","sourceRoot":"","sources":["../../src/auth/oauthAuthorizationFlow.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,MAAM,CAAC;AAEpD,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,6BAA6B;IAC5C,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,gCAAgC,GAAG,IAAI,GAAG,SAAS,CAAC;IACpG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IACvG,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1D,mBAAmB,CACjB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC;CACX;AAED,MAAM,WAAW,oCAAoC;IACnD,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,gCAAgC,GAAG,IAAI,GAAG,SAAS,CAAC;IACpG,oBAAoB,EAAE;QACpB,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;KACpD,CAAC;IACF,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IACvG,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1D,iBAAiB,EAAE;QACjB,YAAY,CACV,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC;KACX,CAAC;CACH;AAED,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,gBAAgB,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,6BAA6B,GAAG,SAAS,CAAC;IACzE,UAAU,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3G;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,kCAAkC;IACjD,OAAO,EAAE,6BAA6B,CAAC;IACvC,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,aAAa,EAAE,MAAM,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,gBAAgB,EAAE,MAAM,MAAM,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAAC;IACrC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,mBAAmB,GAC3B;IACE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,MAAM,EAAE,iBAAiB,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,MAAM,EAAE,iBAAiB,GAAG,gBAAgB,GAAG,eAAe,CAAC;IAC/D,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,uBAAuB,GAC/B;IACE,YAAY,EAAE,KAAK,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,YAAY,EAAE,IAAI,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,uBAAuB,GAC/B;IACE,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,MAAM,EAAE,mBAAmB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC;IAC9E,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,yBAAyB,GACjC;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,mBAAmB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC;IAC9E,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,kCAAkC,GAC1C;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,GACD;IACE,MAAM,EAAE,gBAAgB,GAAG,cAAc,GAAG,iBAAiB,GAAG,qBAAqB,CAAC;IACtF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,2BAA2B,GACnC;IACE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,4BAA4B,EAAE,CAAC;CAC1C,GACD;IACE,MAAM,EAAE,qBAAqB,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,uBAAuB,IAAI,uBAAuB,CAAC;IACnD,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC9E,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAClF,4BAA4B,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAC;IAC5G,wBAAwB,IAAI,2BAA2B,CAAC;CACzD;AAED,MAAM,WAAW,8BAA8B;IAC7C,YAAY,EAAE,oCAAoC,CAAC;IACnD,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,kCAAkC,GAAG,sBAAsB,CA0PrH;AAED,wBAAgB,uCAAuC,CACrD,OAAO,EAAE,oCAAoC,EAC7C,YAAY,EAAE,IAAI,CAAC,kCAAkC,EAAE,SAAS,CAAC,GAChE,sBAAsB,CAaxB;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,8BAA8B,EAC7C,YAAY,EAAE,IAAI,CAAC,kCAAkC,EAAE,SAAS,CAAC,GAChE,sBAAsB,CAExB"}
|
|
@@ -1,7 +1,30 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
1
2
|
import { AUTH_CONFIG } from '../constants.js';
|
|
2
3
|
import logger from '../logger/logger.js';
|
|
3
4
|
import { tagsToScopes, validateScopes } from '../utils/validation/scopeValidation.js';
|
|
4
5
|
export function createOAuthAuthorizationFlow(dependencies) {
|
|
6
|
+
// Return context is short-lived, single-use and independent of Admin credentials.
|
|
7
|
+
const returns = new Map();
|
|
8
|
+
function bindReturn(authorizationUrl, input) {
|
|
9
|
+
if (!input.adminReturnOrigin)
|
|
10
|
+
return authorizationUrl;
|
|
11
|
+
for (const [key, value] of returns) {
|
|
12
|
+
if (value.expiresAt <= Date.now())
|
|
13
|
+
returns.delete(key);
|
|
14
|
+
}
|
|
15
|
+
if (returns.size >= 1000)
|
|
16
|
+
return undefined;
|
|
17
|
+
const url = new URL(authorizationUrl);
|
|
18
|
+
const state = `admin_return_${randomUUID()}`;
|
|
19
|
+
returns.set(state, {
|
|
20
|
+
serverName: input.serverName,
|
|
21
|
+
origin: input.adminReturnOrigin,
|
|
22
|
+
providerState: url.searchParams.get('state') ?? undefined,
|
|
23
|
+
expiresAt: Date.now() + 600_000,
|
|
24
|
+
});
|
|
25
|
+
url.searchParams.set('state', state);
|
|
26
|
+
return url.toString();
|
|
27
|
+
}
|
|
5
28
|
return {
|
|
6
29
|
createLocalhostCliToken() {
|
|
7
30
|
const authConfig = dependencies.getAuthConfig();
|
|
@@ -83,9 +106,16 @@ export function createOAuthAuthorizationFlow(dependencies) {
|
|
|
83
106
|
if (started.status !== 'started') {
|
|
84
107
|
return started;
|
|
85
108
|
}
|
|
109
|
+
const redirectUrl = bindReturn(started.authorizationUrl, input);
|
|
110
|
+
if (!redirectUrl) {
|
|
111
|
+
return {
|
|
112
|
+
status: 'oauth_url_unavailable',
|
|
113
|
+
errorDescription: 'Too many pending Admin OAuth return transactions',
|
|
114
|
+
};
|
|
115
|
+
}
|
|
86
116
|
return {
|
|
87
117
|
status: 'redirect',
|
|
88
|
-
redirectUrl
|
|
118
|
+
redirectUrl,
|
|
89
119
|
};
|
|
90
120
|
},
|
|
91
121
|
async restartBackendOAuth(input) {
|
|
@@ -109,39 +139,66 @@ export function createOAuthAuthorizationFlow(dependencies) {
|
|
|
109
139
|
if (started.status !== 'started') {
|
|
110
140
|
return started;
|
|
111
141
|
}
|
|
142
|
+
const redirectUrl = bindReturn(started.authorizationUrl, input);
|
|
143
|
+
if (!redirectUrl) {
|
|
144
|
+
return {
|
|
145
|
+
status: 'oauth_url_unavailable',
|
|
146
|
+
errorDescription: 'Too many pending Admin OAuth return transactions',
|
|
147
|
+
};
|
|
148
|
+
}
|
|
112
149
|
return {
|
|
113
150
|
status: 'restarted',
|
|
114
|
-
redirectUrl
|
|
151
|
+
redirectUrl,
|
|
115
152
|
};
|
|
116
153
|
},
|
|
117
154
|
async completeBackendOAuthCallback(input) {
|
|
155
|
+
const context = input.state ? returns.get(input.state) : undefined;
|
|
156
|
+
if (input.state)
|
|
157
|
+
returns.delete(input.state);
|
|
158
|
+
const adminReturnOrigin = context && context.serverName === input.serverName && context.expiresAt > Date.now()
|
|
159
|
+
? context.origin
|
|
160
|
+
: undefined;
|
|
161
|
+
const returnContext = adminReturnOrigin ? { adminReturnOrigin } : {};
|
|
162
|
+
if (input.state?.startsWith('admin_return_') && !adminReturnOrigin) {
|
|
163
|
+
return { status: 'callback_failed', errorDescription: 'Invalid or expired OAuth return transaction' };
|
|
164
|
+
}
|
|
118
165
|
if (input.error) {
|
|
119
166
|
return {
|
|
167
|
+
...returnContext,
|
|
120
168
|
status: 'provider_error',
|
|
121
169
|
errorDescription: input.error,
|
|
122
170
|
};
|
|
123
171
|
}
|
|
124
172
|
if (!input.code) {
|
|
125
173
|
return {
|
|
174
|
+
...returnContext,
|
|
126
175
|
status: 'missing_code',
|
|
127
176
|
errorDescription: 'Missing authorization code',
|
|
128
177
|
};
|
|
129
178
|
}
|
|
130
179
|
if (!dependencies.clientRuntime) {
|
|
131
180
|
return {
|
|
181
|
+
...returnContext,
|
|
132
182
|
status: 'runtime_unavailable',
|
|
133
183
|
errorDescription: 'Backend OAuth runtime is unavailable',
|
|
134
184
|
};
|
|
135
185
|
}
|
|
136
186
|
try {
|
|
137
|
-
const authorizationResponse = input.iss === undefined
|
|
187
|
+
const authorizationResponse = input.iss === undefined && !context?.providerState
|
|
188
|
+
? input.code
|
|
189
|
+
: new URLSearchParams({
|
|
190
|
+
code: input.code,
|
|
191
|
+
...(input.iss ? { iss: input.iss } : {}),
|
|
192
|
+
...(context?.providerState ? { state: context.providerState } : {}),
|
|
193
|
+
});
|
|
138
194
|
await dependencies.clientRuntime.completeOAuthAndReconnect(input.serverName, authorizationResponse);
|
|
139
195
|
dependencies.loadingRuntime?.markReady(input.serverName);
|
|
140
|
-
return { status: 'completed' };
|
|
196
|
+
return { status: 'completed', ...returnContext };
|
|
141
197
|
}
|
|
142
198
|
catch (error) {
|
|
143
199
|
logger.error(`OAuth callback completion failed for ${input.serverName}`, { error });
|
|
144
200
|
return {
|
|
201
|
+
...returnContext,
|
|
145
202
|
status: 'callback_failed',
|
|
146
203
|
errorDescription: 'Failed to complete OAuth callback',
|
|
147
204
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthAuthorizationFlow.js","sourceRoot":"","sources":["../../src/auth/oauthAuthorizationFlow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"oauthAuthorizationFlow.js","sourceRoot":"","sources":["../../src/auth/oauthAuthorizationFlow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ClientSessionData } from '
|
|
1
|
+
import { ClientSessionData } from '../sessionTypes.js';
|
|
2
2
|
import { FileStorageService } from './fileStorageService.js';
|
|
3
3
|
/**
|
|
4
4
|
* ClientSessionRepository handles OAuth 2.1 client session storage using the layered storage architecture.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExpirableData } from '
|
|
1
|
+
import { ExpirableData } from '../sessionTypes.js';
|
|
2
2
|
import { InsecureFilePermissionsError } from '../../utils/filePermissions.js';
|
|
3
3
|
import { type ZodType } from 'zod';
|
|
4
4
|
export { InsecureFilePermissionsError };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createHash, randomBytes, randomUUID, timingSafeEqual } from 'node:crypto';
|
|
2
|
-
import { RefreshTokenFamilyDataSchema, RefreshTokenLookupDataSchema, SessionDataSchema, } from '
|
|
2
|
+
import { RefreshTokenFamilyDataSchema, RefreshTokenLookupDataSchema, SessionDataSchema, } from '../sessionTypes.js';
|
|
3
3
|
import { AUTH_CONFIG } from '../../constants.js';
|
|
4
4
|
const REFRESH_FAMILY_LOCK = 'refresh-token-families';
|
|
5
5
|
export class RefreshTokenFamilyRepository {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import { SessionDataSchema } from '
|
|
2
|
+
import { SessionDataSchema } from '../sessionTypes.js';
|
|
3
3
|
import { AUTH_CONFIG } from '../../constants.js';
|
|
4
4
|
import logger from '../../logger/logger.js';
|
|
5
5
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ServeConfigPaths } from '
|
|
2
|
-
import { type ResolvableServeTargetOptions, type ResolvedServeTarget } from '
|
|
1
|
+
import { type ServeConfigPaths } from '../serve/runtimeScope.js';
|
|
2
|
+
import { type ResolvableServeTargetOptions, type ResolvedServeTarget } from '../shared/serveTargetResolver.js';
|
|
3
3
|
import { RuntimeIdentityService } from '../../core/runtime/runtimeIdentityService.js';
|
|
4
4
|
import { AdminIdentityService } from '../../domains/admin/adminIdentityService.js';
|
|
5
5
|
import { type RuntimeTargetListEntry } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { resolveServeConfigPaths } from '
|
|
2
|
-
import { ApiClient } from '
|
|
3
|
-
import { resolveServeTarget, } from '
|
|
1
|
+
import { resolveServeConfigPaths } from '../serve/runtimeScope.js';
|
|
2
|
+
import { ApiClient } from '../shared/apiClient.js';
|
|
3
|
+
import { resolveServeTarget, } from '../shared/serveTargetResolver.js';
|
|
4
4
|
import { MCP_SERVER_VERSION } from '../../constants.js';
|
|
5
5
|
import { RuntimeIdentityService } from '../../core/runtime/runtimeIdentityService.js';
|
|
6
6
|
import { AdminIdentityService } from '../../domains/admin/adminIdentityService.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 setupAdminCommands(yargs) {
|
|
4
4
|
return yargs.command('admin <subcommand>', 'Manage CLI Admin sessions for Runtime Target Contexts', (commandYargs) => {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import readline from 'readline';
|
|
4
|
-
import { initializeConfigContext, setServer } from '
|
|
4
|
+
import { initializeConfigContext, setServer } from '../shared/baseConfigUtils.js';
|
|
5
5
|
import ConfigContext from '../../config/configContext.js';
|
|
6
6
|
import { McpConfigManager } from '../../config/mcpConfigManager.js';
|
|
7
7
|
import { getAppBackupDir } from '../../constants.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 setupAuthCommands(yargs) {
|
|
4
4
|
return yargs.command('auth <subcommand>', 'Manage authentication profiles for secured 1MCP serve instances', (commandYargs) => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiClient } from '
|
|
1
|
+
import { ApiClient } from '../shared/apiClient.js';
|
|
2
2
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
3
3
|
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
4
4
|
import { resolveAuthRuntimeTarget } from './runtimeTargetContext.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolveServeTarget, } from '
|
|
1
|
+
import { resolveServeTarget, } from '../shared/serveTargetResolver.js';
|
|
2
2
|
import { fetchRuntimeIdentity } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
|
|
3
3
|
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
4
4
|
import { stripMcpSuffix } from '../../utils/urlUtils.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiClient } from '
|
|
1
|
+
import { ApiClient } from '../shared/apiClient.js';
|
|
2
2
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
3
3
|
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
4
4
|
import { resolveAuthRuntimeTarget, toAuthOAuthTokenReference } from './runtimeTargetContext.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 setupInspectCommand(yargs) {
|
|
4
4
|
return yargs.command('inspect [target]', 'Inspect servers or tools from a running 1MCP serve instance', (commandYargs) => commandYargs
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ReusableClientSurface } from '
|
|
2
|
-
import { type JsonRpcResponse } from '
|
|
1
|
+
import { type ReusableClientSurface } from '../shared/clientSurfaceAttachment.js';
|
|
2
|
+
import { type JsonRpcResponse } from '../shared/serveClient.js';
|
|
3
3
|
import type { GlobalOptions } from '../../globalOptions.js';
|
|
4
4
|
import { type Tool } from '../../sdk/contracts/index.js';
|
|
5
5
|
import type { ContextData } from '../../types/context.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/inspect.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/inspect.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,qCAAqC,CAAC;AAK7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAoB,KAAK,IAAI,EAAmB,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAKL,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAGnB,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,uBAAuB;IAC/B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,aAAa,CAAC,EAAE,qBAAqB,CAAC;CACvC;AAgGD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,qBAAqB,EAC9B,aAAa,GAAE,uBAA4B,GAC1C,OAAO,CAAC,aAAa,CAAC,CA0GxB;AAiED,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlF;AAeD,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,2CAA2C,EAAE,oBAAoB,CAAC;IACxF,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC;IACV,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IACtC,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC,CAiFD"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import { findToolByQualifiedName } from '
|
|
2
|
-
import { ApiClient } from '
|
|
3
|
-
import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, } from '
|
|
4
|
-
import { buildFilterSelectionQuery } from '
|
|
5
|
-
import {
|
|
1
|
+
import { findToolByQualifiedName } from '../run/runUtils.js';
|
|
2
|
+
import { ApiClient } from '../shared/apiClient.js';
|
|
3
|
+
import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, } from '../shared/clientSurfaceAttachment.js';
|
|
4
|
+
import { buildFilterSelectionQuery } from '../shared/filterSelectionQuery.js';
|
|
5
|
+
import { inspectToolsPageSchema } from '../shared/inspectApiSchemas.js';
|
|
6
|
+
import { StreamableServeClient, } from '../shared/serveClient.js';
|
|
6
7
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
7
8
|
import { readPublicCapabilityRoute } from '../../core/capabilities/catalogGeneration.js';
|
|
9
|
+
import { collectConfiguredToolPages } from '../../core/capabilities/configuredToolSnapshot.js';
|
|
10
|
+
import { paginateInspectTools } from '../../core/capabilities/inspectPagination.js';
|
|
8
11
|
import { hasHttpErrorCode, toProtocolTools } from '../../sdk/contracts/index.js';
|
|
9
12
|
import { extractInspectServerInfo, extractInspectToolInfo, formatInspectOutput, InspectCommandError, parseInspectTarget, } from './inspectUtils.js';
|
|
10
13
|
function buildInspectQuery(options, target) {
|
|
@@ -128,6 +131,18 @@ export async function getInspectResult(options, resultOptions = {}) {
|
|
|
128
131
|
}
|
|
129
132
|
else {
|
|
130
133
|
result = extractInspectServerInfo(target.serverName, response.tools, Boolean(attachment.cachedSession?.sessionId), extractServerInstructionsFromAggregatedInstructions(response.instructions, target.serverName));
|
|
134
|
+
result = {
|
|
135
|
+
...result,
|
|
136
|
+
...paginateInspectTools(result.tools, {
|
|
137
|
+
limit: attachment.target.mergedOptions.limit ?? 20,
|
|
138
|
+
all: attachment.target.mergedOptions.all,
|
|
139
|
+
cursor: attachment.target.mergedOptions.cursor,
|
|
140
|
+
scope: {
|
|
141
|
+
server: target.serverName,
|
|
142
|
+
filters: buildInspectQuery({ ...attachment.target.mergedOptions, cursor: undefined, all: false, limit: 20 }),
|
|
143
|
+
},
|
|
144
|
+
}),
|
|
145
|
+
};
|
|
131
146
|
if (!includeServerInstructions) {
|
|
132
147
|
result = stripServerInstructions(result);
|
|
133
148
|
}
|
|
@@ -186,6 +201,21 @@ export async function inspectCommand(options) {
|
|
|
186
201
|
process.stdout.write(`${output}\n`);
|
|
187
202
|
}
|
|
188
203
|
}
|
|
204
|
+
async function listAllInspectTools(client) {
|
|
205
|
+
const first = await client.listTools();
|
|
206
|
+
if ('error' in first)
|
|
207
|
+
return first;
|
|
208
|
+
const result = await collectConfiguredToolPages(async (cursor) => {
|
|
209
|
+
const response = cursor === undefined ? first : await client.listTools(cursor);
|
|
210
|
+
if ('error' in response)
|
|
211
|
+
throw new InspectCommandError(response.error.message);
|
|
212
|
+
const page = inspectToolsPageSchema.safeParse(response.result);
|
|
213
|
+
if (!page.success)
|
|
214
|
+
throw new InspectCommandError('Invalid tools/list response from server.');
|
|
215
|
+
return { ...page.data, tools: toProtocolTools(page.data.tools) };
|
|
216
|
+
});
|
|
217
|
+
return { ...first, result };
|
|
218
|
+
}
|
|
189
219
|
export async function inspectTools(options) {
|
|
190
220
|
const client = new StreamableServeClient(options.serverUrl, options.sessionId, options.bearerToken);
|
|
191
221
|
await client.start();
|
|
@@ -202,7 +232,7 @@ export async function inspectTools(options) {
|
|
|
202
232
|
retryWithFreshSession: false,
|
|
203
233
|
};
|
|
204
234
|
}
|
|
205
|
-
const response = await client
|
|
235
|
+
const response = await listAllInspectTools(client);
|
|
206
236
|
if ('error' in response) {
|
|
207
237
|
return {
|
|
208
238
|
rawResponse: response,
|
|
@@ -220,7 +250,7 @@ export async function inspectTools(options) {
|
|
|
220
250
|
retryWithFreshSession: false,
|
|
221
251
|
};
|
|
222
252
|
}
|
|
223
|
-
const response = await client
|
|
253
|
+
const response = await listAllInspectTools(client);
|
|
224
254
|
if ('error' in response) {
|
|
225
255
|
return {
|
|
226
256
|
rawResponse: response,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/commands/inspect/inspect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/commands/inspect/inspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ParsedToolReference } from '
|
|
1
|
+
import type { ParsedToolReference } from '../run/runUtils.js';
|
|
2
2
|
import type { Tool } from '../../sdk/contracts/index.js';
|
|
3
3
|
export type InspectOutputFormat = 'text' | 'json' | 'toon';
|
|
4
4
|
export interface InspectArgumentInfo {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectUtils.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/inspectUtils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inspectUtils.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/inspectUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,11 +77,16 @@ export function extractInspectServerInfo(serverName, tools, fromCache, instructi
|
|
|
77
77
|
};
|
|
78
78
|
}
|
|
79
79
|
export function formatInspectOutput(result, format) {
|
|
80
|
+
const displayed = result.kind === 'tool'
|
|
81
|
+
? omitQualifiedName(result)
|
|
82
|
+
: result.kind === 'server'
|
|
83
|
+
? { ...result, tools: result.tools.map(omitQualifiedName) }
|
|
84
|
+
: result;
|
|
80
85
|
if (format === 'json') {
|
|
81
|
-
return JSON.stringify(
|
|
86
|
+
return JSON.stringify(displayed, null, 2);
|
|
82
87
|
}
|
|
83
88
|
if (format === 'toon') {
|
|
84
|
-
return encode(
|
|
89
|
+
return encode(displayed);
|
|
85
90
|
}
|
|
86
91
|
if (result.kind === 'servers')
|
|
87
92
|
return formatServersOutput(result);
|
|
@@ -89,6 +94,10 @@ export function formatInspectOutput(result, format) {
|
|
|
89
94
|
return formatServerOutput(result);
|
|
90
95
|
return formatToolOutput(result);
|
|
91
96
|
}
|
|
97
|
+
function omitQualifiedName(value) {
|
|
98
|
+
const { qualifiedName: _qualifiedName, ...displayed } = value;
|
|
99
|
+
return displayed;
|
|
100
|
+
}
|
|
92
101
|
function formatServersOutput(info) {
|
|
93
102
|
if (info.servers.length === 0) {
|
|
94
103
|
return 'No servers available.';
|
|
@@ -129,7 +138,7 @@ function formatServersOutput(info) {
|
|
|
129
138
|
function formatToolOutput(toolInfo) {
|
|
130
139
|
const sections = [
|
|
131
140
|
chalk.bold.cyan('Inspect: Tool'),
|
|
132
|
-
[`server: ${toolInfo.server}`, `tool: ${toolInfo.tool}
|
|
141
|
+
[`server: ${toolInfo.server}`, `tool: ${toolInfo.tool}`].join('\n'),
|
|
133
142
|
];
|
|
134
143
|
if (toolInfo.description) {
|
|
135
144
|
sections.push(`${chalk.bold('description:')}\n${indentBlock(toolInfo.description, 2)}`);
|