@1mcp/agent 0.34.4 → 0.35.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/build/admin/assets/admin-console-C5_zD_qW.css +1 -0
- package/build/admin/assets/admin-console-CbHHoqLr.js +61 -0
- package/build/admin/index.html +13 -0
- package/build/application/services/healthService.d.ts +32 -0
- package/build/application/services/healthService.d.ts.map +1 -1
- package/build/application/services/healthService.js +49 -0
- package/build/application/services/healthService.js.map +1 -1
- package/build/commands/admin/admin.d.ts +90 -0
- package/build/commands/admin/admin.d.ts.map +1 -0
- package/build/commands/admin/admin.js +545 -0
- package/build/commands/admin/admin.js.map +1 -0
- package/build/commands/admin/index.d.ts +3 -0
- package/build/commands/admin/index.d.ts.map +1 -0
- package/build/commands/admin/index.js +99 -0
- package/build/commands/admin/index.js.map +1 -0
- package/build/commands/auth/index.d.ts.map +1 -1
- package/build/commands/auth/index.js +24 -5
- package/build/commands/auth/index.js.map +1 -1
- package/build/commands/auth/login.d.ts +1 -0
- package/build/commands/auth/login.d.ts.map +1 -1
- package/build/commands/auth/login.js +6 -10
- package/build/commands/auth/login.js.map +1 -1
- package/build/commands/auth/logout.d.ts +3 -0
- package/build/commands/auth/logout.d.ts.map +1 -1
- package/build/commands/auth/logout.js +19 -32
- package/build/commands/auth/logout.js.map +1 -1
- package/build/commands/auth/runtimeTargetContext.d.ts +25 -0
- package/build/commands/auth/runtimeTargetContext.d.ts.map +1 -0
- package/build/commands/auth/runtimeTargetContext.js +69 -0
- package/build/commands/auth/runtimeTargetContext.js.map +1 -0
- package/build/commands/auth/status.d.ts +1 -0
- package/build/commands/auth/status.d.ts.map +1 -1
- package/build/commands/auth/status.js +10 -33
- package/build/commands/auth/status.js.map +1 -1
- package/build/commands/inspect/index.d.ts.map +1 -1
- package/build/commands/inspect/index.js +4 -0
- package/build/commands/inspect/index.js.map +1 -1
- package/build/commands/inspect/inspect.d.ts +1 -0
- package/build/commands/inspect/inspect.d.ts.map +1 -1
- package/build/commands/inspect/inspect.js +2 -2
- package/build/commands/inspect/inspect.js.map +1 -1
- package/build/commands/instructions/index.d.ts.map +1 -1
- package/build/commands/instructions/index.js +4 -0
- package/build/commands/instructions/index.js.map +1 -1
- package/build/commands/instructions/instructions.d.ts +1 -0
- package/build/commands/instructions/instructions.d.ts.map +1 -1
- package/build/commands/instructions/instructions.js.map +1 -1
- package/build/commands/instructions/instructionsUtils.js +1 -1
- package/build/commands/instructions/instructionsUtils.js.map +1 -1
- package/build/commands/mcp/enable.d.ts +89 -2
- package/build/commands/mcp/enable.d.ts.map +1 -1
- package/build/commands/mcp/enable.js +555 -35
- package/build/commands/mcp/enable.js.map +1 -1
- package/build/commands/mcp/index.d.ts.map +1 -1
- package/build/commands/mcp/index.js +10 -0
- package/build/commands/mcp/index.js.map +1 -1
- package/build/commands/mcp/restart.d.ts +69 -0
- package/build/commands/mcp/restart.d.ts.map +1 -0
- package/build/commands/mcp/restart.js +259 -0
- package/build/commands/mcp/restart.js.map +1 -0
- package/build/commands/mcp/status.d.ts +24 -1
- package/build/commands/mcp/status.d.ts.map +1 -1
- package/build/commands/mcp/status.js +158 -14
- package/build/commands/mcp/status.js.map +1 -1
- package/build/commands/proxy/index.d.ts +1 -0
- package/build/commands/proxy/index.d.ts.map +1 -1
- package/build/commands/proxy/index.js +4 -0
- package/build/commands/proxy/index.js.map +1 -1
- package/build/commands/run/index.d.ts.map +1 -1
- package/build/commands/run/index.js +4 -0
- package/build/commands/run/index.js.map +1 -1
- package/build/commands/run/run.d.ts +1 -0
- package/build/commands/run/run.d.ts.map +1 -1
- package/build/commands/run/run.js +2 -2
- package/build/commands/run/run.js.map +1 -1
- package/build/commands/serve/index.d.ts +8 -0
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +12 -0
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +13 -0
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +115 -57
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/serve/serveBackground.d.ts +48 -26
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +230 -61
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/serve/serveRestart.d.ts +1 -1
- package/build/commands/serve/serveRestart.js +1 -1
- package/build/commands/serve/serveStatus.d.ts +20 -10
- package/build/commands/serve/serveStatus.d.ts.map +1 -1
- package/build/commands/serve/serveStatus.js +174 -13
- package/build/commands/serve/serveStatus.js.map +1 -1
- package/build/commands/serve/serveStop.d.ts +13 -4
- package/build/commands/serve/serveStop.d.ts.map +1 -1
- package/build/commands/serve/serveStop.js +212 -23
- package/build/commands/serve/serveStop.js.map +1 -1
- package/build/commands/shared/apiClient.d.ts +5 -1
- package/build/commands/shared/apiClient.d.ts.map +1 -1
- package/build/commands/shared/apiClient.js +17 -9
- package/build/commands/shared/apiClient.js.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.d.ts +14 -0
- package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
- package/build/commands/shared/clientSurfaceAttachment.js +51 -9
- package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
- package/build/commands/shared/commandRunner.d.ts +3 -1
- package/build/commands/shared/commandRunner.d.ts.map +1 -1
- package/build/commands/shared/commandRunner.js +59 -2
- package/build/commands/shared/commandRunner.js.map +1 -1
- package/build/commands/shared/serveTargetResolver.d.ts +14 -1
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
- package/build/commands/shared/serveTargetResolver.js +145 -3
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/commands/target/index.d.ts +3 -0
- package/build/commands/target/index.d.ts.map +1 -0
- package/build/commands/target/index.js +171 -0
- package/build/commands/target/index.js.map +1 -0
- package/build/commands/target/target.d.ts +78 -0
- package/build/commands/target/target.d.ts.map +1 -0
- package/build/commands/target/target.js +471 -0
- package/build/commands/target/target.js.map +1 -0
- package/build/config/configManager.d.ts +2 -0
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +19 -8
- package/build/config/configManager.js.map +1 -1
- package/build/config/mcpConfigMerge.d.ts.map +1 -1
- package/build/config/mcpConfigMerge.js +13 -2
- package/build/config/mcpConfigMerge.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/client/clientManager.d.ts +24 -1
- package/build/core/client/clientManager.d.ts.map +1 -1
- package/build/core/client/clientManager.js +268 -2
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/client/connectionHandler.d.ts.map +1 -1
- package/build/core/client/connectionHandler.js +18 -1
- package/build/core/client/connectionHandler.js.map +1 -1
- package/build/core/configChangeHandler.d.ts +1 -0
- package/build/core/configChangeHandler.d.ts.map +1 -1
- package/build/core/configChangeHandler.js +14 -0
- package/build/core/configChangeHandler.js.map +1 -1
- package/build/core/loading/mcpLoadingManager.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.js +16 -4
- package/build/core/loading/mcpLoadingManager.js.map +1 -1
- package/build/core/runtime/runtimeIdentityService.d.ts +30 -0
- package/build/core/runtime/runtimeIdentityService.d.ts.map +1 -0
- package/build/core/runtime/runtimeIdentityService.js +63 -0
- package/build/core/runtime/runtimeIdentityService.js.map +1 -0
- package/build/core/server/agentConfig.d.ts +4 -0
- package/build/core/server/agentConfig.d.ts.map +1 -1
- package/build/core/server/agentConfig.js +3 -0
- package/build/core/server/agentConfig.js.map +1 -1
- package/build/core/server/backendStdioSupervisor.d.ts +73 -0
- package/build/core/server/backendStdioSupervisor.d.ts.map +1 -0
- package/build/core/server/backendStdioSupervisor.js +191 -0
- package/build/core/server/backendStdioSupervisor.js.map +1 -0
- package/build/core/server/backgroundLaunchConfig.d.ts +15 -0
- package/build/core/server/backgroundLaunchConfig.d.ts.map +1 -0
- package/build/core/server/backgroundLaunchConfig.js +46 -0
- package/build/core/server/backgroundLaunchConfig.js.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisor.d.ts +44 -0
- package/build/core/server/backgroundRuntimeSupervisor.d.ts.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisor.js +252 -0
- package/build/core/server/backgroundRuntimeSupervisor.js.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisorState.d.ts +30 -0
- package/build/core/server/backgroundRuntimeSupervisorState.d.ts.map +1 -0
- package/build/core/server/backgroundRuntimeSupervisorState.js +81 -0
- package/build/core/server/backgroundRuntimeSupervisorState.js.map +1 -0
- package/build/core/server/clientInstanceFactory.d.ts.map +1 -1
- package/build/core/server/clientInstanceFactory.js +1 -0
- package/build/core/server/clientInstanceFactory.js.map +1 -1
- package/build/core/server/clientInstancePool.d.ts +17 -5
- package/build/core/server/clientInstancePool.d.ts.map +1 -1
- package/build/core/server/clientInstancePool.js +198 -33
- package/build/core/server/clientInstancePool.js.map +1 -1
- package/build/core/server/clientInstancePoolTypes.d.ts +7 -1
- package/build/core/server/clientInstancePoolTypes.d.ts.map +1 -1
- package/build/core/server/clientInstancePoolTypes.js.map +1 -1
- package/build/core/server/runtimeScopeOwnership.d.ts +61 -0
- package/build/core/server/runtimeScopeOwnership.d.ts.map +1 -0
- package/build/core/server/runtimeScopeOwnership.js +544 -0
- package/build/core/server/runtimeScopeOwnership.js.map +1 -0
- package/build/core/server/serverManager.d.ts +2 -0
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +30 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/server/templateIdentity.d.ts +10 -0
- package/build/core/server/templateIdentity.d.ts.map +1 -1
- package/build/core/server/templateIdentity.js +33 -0
- package/build/core/server/templateIdentity.js.map +1 -1
- package/build/core/server/templateServerCleanup.d.ts.map +1 -1
- package/build/core/server/templateServerCleanup.js +7 -1
- package/build/core/server/templateServerCleanup.js.map +1 -1
- package/build/core/server/templateServerManager.d.ts +13 -0
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +129 -4
- package/build/core/server/templateServerManager.js.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +117 -11
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.js +103 -45
- package/build/core/tools/handlers/serverManagementHandler.js.map +1 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +2 -2
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts +2 -2
- package/build/core/tools/internal/adapters/management/managementAdapter.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/management/managementAdapter.js +45 -26
- package/build/core/tools/internal/adapters/management/managementAdapter.js.map +1 -1
- package/build/core/tools/internal/adapters/management/types.d.ts +21 -2
- package/build/core/tools/internal/adapters/management/types.d.ts.map +1 -1
- package/build/core/tools/internal/managementHandlers.d.ts.map +1 -1
- package/build/core/tools/internal/managementHandlers.js +73 -22
- package/build/core/tools/internal/managementHandlers.js.map +1 -1
- package/build/core/tools/internal/schemas/discovery.d.ts +3 -3
- package/build/core/tools/internal/schemas/edit.js +1 -1
- package/build/core/tools/internal/schemas/edit.js.map +1 -1
- package/build/core/tools/internal/schemas/index.d.ts +90 -19
- package/build/core/tools/internal/schemas/index.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/installation.d.ts +7 -7
- package/build/core/tools/internal/schemas/management.d.ts +80 -9
- package/build/core/tools/internal/schemas/management.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/management.js +69 -2
- package/build/core/tools/internal/schemas/management.js.map +1 -1
- package/build/core/types/client.d.ts +9 -2
- package/build/core/types/client.d.ts.map +1 -1
- package/build/core/types/client.js +4 -0
- package/build/core/types/client.js.map +1 -1
- package/build/core/types/transport.d.ts +34 -4
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +26 -3
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/adminBackendRestartService.d.ts +41 -0
- package/build/domains/admin/adminBackendRestartService.d.ts.map +1 -0
- package/build/domains/admin/adminBackendRestartService.js +22 -0
- package/build/domains/admin/adminBackendRestartService.js.map +1 -0
- package/build/domains/admin/adminConfiguredServerService.d.ts +275 -0
- package/build/domains/admin/adminConfiguredServerService.d.ts.map +1 -0
- package/build/domains/admin/adminConfiguredServerService.js +1926 -0
- package/build/domains/admin/adminConfiguredServerService.js.map +1 -0
- package/build/domains/admin/adminConnectivityChecker.d.ts +7 -0
- package/build/domains/admin/adminConnectivityChecker.d.ts.map +1 -0
- package/build/domains/admin/adminConnectivityChecker.js +42 -0
- package/build/domains/admin/adminConnectivityChecker.js.map +1 -0
- package/build/domains/admin/adminDomain.d.ts +36 -0
- package/build/domains/admin/adminDomain.d.ts.map +1 -0
- package/build/domains/admin/adminDomain.js +52 -0
- package/build/domains/admin/adminDomain.js.map +1 -0
- package/build/domains/admin/adminIdentityService.d.ts +75 -0
- package/build/domains/admin/adminIdentityService.d.ts.map +1 -0
- package/build/domains/admin/adminIdentityService.js +321 -0
- package/build/domains/admin/adminIdentityService.js.map +1 -0
- package/build/domains/admin/adminOAuthService.d.ts +26 -0
- package/build/domains/admin/adminOAuthService.d.ts.map +1 -0
- package/build/domains/admin/adminOAuthService.js +71 -0
- package/build/domains/admin/adminOAuthService.js.map +1 -0
- package/build/domains/admin/adminOperationService.d.ts +203 -0
- package/build/domains/admin/adminOperationService.d.ts.map +1 -0
- package/build/domains/admin/adminOperationService.js +749 -0
- package/build/domains/admin/adminOperationService.js.map +1 -0
- package/build/domains/admin/adminPresetService.d.ts +140 -0
- package/build/domains/admin/adminPresetService.d.ts.map +1 -0
- package/build/domains/admin/adminPresetService.js +248 -0
- package/build/domains/admin/adminPresetService.js.map +1 -0
- package/build/domains/admin/runtimeScopeAdminLock.d.ts +22 -0
- package/build/domains/admin/runtimeScopeAdminLock.d.ts.map +1 -0
- package/build/domains/admin/runtimeScopeAdminLock.js +121 -0
- package/build/domains/admin/runtimeScopeAdminLock.js.map +1 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.d.ts +20 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.d.ts.map +1 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.js +78 -0
- package/build/domains/admin/runtimeServerManagerBackendRestartService.js.map +1 -0
- package/build/domains/config-change/configChange.d.ts +6 -1
- package/build/domains/config-change/configChange.d.ts.map +1 -1
- package/build/domains/config-change/configChange.js +344 -0
- package/build/domains/config-change/configChange.js.map +1 -1
- package/build/domains/config-change/types.d.ts +18 -3
- package/build/domains/config-change/types.d.ts.map +1 -1
- package/build/domains/preset/manager/presetManager.d.ts +1 -0
- package/build/domains/preset/manager/presetManager.d.ts.map +1 -1
- package/build/domains/preset/manager/presetManager.js +3 -0
- package/build/domains/preset/manager/presetManager.js.map +1 -1
- package/build/domains/preset/tagAuthoring.d.ts +10 -0
- package/build/domains/preset/tagAuthoring.d.ts.map +1 -0
- package/build/domains/preset/tagAuthoring.js +94 -0
- package/build/domains/preset/tagAuthoring.js.map +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +51 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.js +258 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.js.map +1 -0
- package/build/domains/runtime-targets/runtimeTargetStore.d.ts +222 -0
- package/build/domains/runtime-targets/runtimeTargetStore.d.ts.map +1 -0
- package/build/domains/runtime-targets/runtimeTargetStore.js +1456 -0
- package/build/domains/runtime-targets/runtimeTargetStore.js.map +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +7 -1
- package/build/index.js.map +1 -1
- package/build/server.d.ts.map +1 -1
- package/build/server.js +18 -2
- package/build/server.js.map +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +38 -0
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/adminRoutes.js +1475 -0
- package/build/transport/http/routes/adminRoutes.js.map +1 -0
- package/build/transport/http/routes/healthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/healthRoutes.js +70 -2
- package/build/transport/http/routes/healthRoutes.js.map +1 -1
- package/build/transport/http/routes/oauthRoutes.d.ts +4 -1
- package/build/transport/http/routes/oauthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/oauthRoutes.js +12 -190
- package/build/transport/http/routes/oauthRoutes.js.map +1 -1
- package/build/transport/http/routes/runtimeIdentityRoutes.d.ts +7 -0
- package/build/transport/http/routes/runtimeIdentityRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/runtimeIdentityRoutes.js +9 -0
- package/build/transport/http/routes/runtimeIdentityRoutes.js.map +1 -0
- package/build/transport/http/server.d.ts +3 -0
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +102 -4
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/transportFactory.d.ts.map +1 -1
- package/build/transport/transportFactory.js +27 -15
- package/build/transport/transportFactory.js.map +1 -1
- package/build/transport/transportFactory.testSetup.js +2 -0
- package/build/transport/transportFactory.testSetup.js.map +1 -1
- package/build/utils/core/errorTypes.d.ts +3 -0
- package/build/utils/core/errorTypes.d.ts.map +1 -1
- package/build/utils/core/errorTypes.js +7 -0
- package/build/utils/core/errorTypes.js.map +1 -1
- package/build/utils/validation/urlDetection.d.ts +13 -2
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +37 -6
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +22 -9
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { runCliCommand } from '../../commands/shared/commandRunner.js';
|
|
2
|
+
import { globalOptions } from '../../globalOptions.js';
|
|
3
|
+
export function setupAdminCommands(yargs) {
|
|
4
|
+
return yargs.command('admin <subcommand>', 'Manage CLI Admin sessions for Runtime Target Contexts', (commandYargs) => {
|
|
5
|
+
commandYargs
|
|
6
|
+
.command('bootstrap', 'Create the first Admin Account for the selected local Runtime Scope', (sub) => sub
|
|
7
|
+
.options(globalOptions || {})
|
|
8
|
+
.option('username', {
|
|
9
|
+
describe: 'Admin username',
|
|
10
|
+
type: 'string',
|
|
11
|
+
})
|
|
12
|
+
.option('password', {
|
|
13
|
+
describe: 'Admin password',
|
|
14
|
+
type: 'string',
|
|
15
|
+
})
|
|
16
|
+
.option('json', {
|
|
17
|
+
describe: 'Write machine-readable JSON output',
|
|
18
|
+
type: 'boolean',
|
|
19
|
+
default: false,
|
|
20
|
+
}), async (argv) => {
|
|
21
|
+
const { adminBootstrapCommand } = await import('./admin.js');
|
|
22
|
+
await runCliCommand(argv, adminBootstrapCommand);
|
|
23
|
+
})
|
|
24
|
+
.command('login', 'Create a CLI Admin session for a Runtime Target Context', (sub) => sub
|
|
25
|
+
.options(globalOptions || {})
|
|
26
|
+
.option('context', {
|
|
27
|
+
describe: 'Runtime Target Context name',
|
|
28
|
+
type: 'string',
|
|
29
|
+
})
|
|
30
|
+
.option('url', {
|
|
31
|
+
describe: 'Unsupported for admin credential commands; use --context',
|
|
32
|
+
type: 'string',
|
|
33
|
+
})
|
|
34
|
+
.option('username', {
|
|
35
|
+
describe: 'Admin username',
|
|
36
|
+
type: 'string',
|
|
37
|
+
})
|
|
38
|
+
.option('password', {
|
|
39
|
+
describe: 'Admin password',
|
|
40
|
+
type: 'string',
|
|
41
|
+
})
|
|
42
|
+
.option('json', {
|
|
43
|
+
describe: 'Write machine-readable JSON output',
|
|
44
|
+
type: 'boolean',
|
|
45
|
+
default: false,
|
|
46
|
+
}), async (argv) => {
|
|
47
|
+
const { adminLoginCommand } = await import('./admin.js');
|
|
48
|
+
await runCliCommand(argv, adminLoginCommand);
|
|
49
|
+
})
|
|
50
|
+
.command('status', 'Show CLI Admin session status for a Runtime Target Context', (sub) => sub
|
|
51
|
+
.options(globalOptions || {})
|
|
52
|
+
.option('context', {
|
|
53
|
+
describe: 'Runtime Target Context name',
|
|
54
|
+
type: 'string',
|
|
55
|
+
})
|
|
56
|
+
.option('url', {
|
|
57
|
+
describe: 'Unsupported for admin credential commands; use --context',
|
|
58
|
+
type: 'string',
|
|
59
|
+
})
|
|
60
|
+
.option('json', {
|
|
61
|
+
describe: 'Write machine-readable JSON output',
|
|
62
|
+
type: 'boolean',
|
|
63
|
+
default: false,
|
|
64
|
+
}), async (argv) => {
|
|
65
|
+
const { adminStatusCommand } = await import('./admin.js');
|
|
66
|
+
await runCliCommand(argv, adminStatusCommand);
|
|
67
|
+
})
|
|
68
|
+
.command('logout', 'Revoke a CLI Admin session for a Runtime Target Context', (sub) => sub
|
|
69
|
+
.options(globalOptions || {})
|
|
70
|
+
.option('context', {
|
|
71
|
+
describe: 'Runtime Target Context name',
|
|
72
|
+
type: 'string',
|
|
73
|
+
})
|
|
74
|
+
.option('url', {
|
|
75
|
+
describe: 'Unsupported for admin credential commands; use --context',
|
|
76
|
+
type: 'string',
|
|
77
|
+
})
|
|
78
|
+
.option('forget', {
|
|
79
|
+
describe: 'Clear only the local Admin Session reference without confirming runtime revocation',
|
|
80
|
+
type: 'boolean',
|
|
81
|
+
default: false,
|
|
82
|
+
})
|
|
83
|
+
.option('all-local', {
|
|
84
|
+
describe: 'Clear every local Admin Session reference without confirming runtime revocation',
|
|
85
|
+
type: 'boolean',
|
|
86
|
+
default: false,
|
|
87
|
+
})
|
|
88
|
+
.option('json', {
|
|
89
|
+
describe: 'Write machine-readable JSON output',
|
|
90
|
+
type: 'boolean',
|
|
91
|
+
default: false,
|
|
92
|
+
}), async (argv) => {
|
|
93
|
+
const { adminLogoutCommand } = await import('./admin.js');
|
|
94
|
+
await runCliCommand(argv, adminLogoutCommand);
|
|
95
|
+
})
|
|
96
|
+
.demandCommand(1, 'Specify a subcommand: bootstrap, login, status, or logout');
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/admin/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,CAoFnD"}
|
|
@@ -5,9 +5,13 @@ export function setupAuthCommands(yargs) {
|
|
|
5
5
|
commandYargs
|
|
6
6
|
.command('login', 'Save a bearer token for a 1MCP server URL', (sub) => sub
|
|
7
7
|
.options(globalOptions || {})
|
|
8
|
+
.option('context', {
|
|
9
|
+
describe: 'Runtime Target Context name',
|
|
10
|
+
type: 'string',
|
|
11
|
+
})
|
|
8
12
|
.option('url', {
|
|
9
13
|
alias: 'u',
|
|
10
|
-
describe: '
|
|
14
|
+
describe: 'Unsupported for auth credential commands; use --context',
|
|
11
15
|
type: 'string',
|
|
12
16
|
})
|
|
13
17
|
.option('token', {
|
|
@@ -18,9 +22,15 @@ export function setupAuthCommands(yargs) {
|
|
|
18
22
|
const { authLoginCommand } = await import('./login.js');
|
|
19
23
|
await runCliCommand(argv, authLoginCommand);
|
|
20
24
|
})
|
|
21
|
-
.command('status', 'Show saved authentication profiles', (sub) => sub
|
|
25
|
+
.command('status', 'Show saved authentication profiles', (sub) => sub
|
|
26
|
+
.options(globalOptions || {})
|
|
27
|
+
.option('context', {
|
|
28
|
+
describe: 'Runtime Target Context name',
|
|
29
|
+
type: 'string',
|
|
30
|
+
})
|
|
31
|
+
.option('url', {
|
|
22
32
|
alias: 'u',
|
|
23
|
-
describe: '
|
|
33
|
+
describe: 'Unsupported for auth credential commands; use --context',
|
|
24
34
|
type: 'string',
|
|
25
35
|
}), async (argv) => {
|
|
26
36
|
const { authStatusCommand } = await import('./status.js');
|
|
@@ -28,13 +38,22 @@ export function setupAuthCommands(yargs) {
|
|
|
28
38
|
})
|
|
29
39
|
.command('logout', 'Remove a saved authentication profile', (sub) => sub
|
|
30
40
|
.options(globalOptions || {})
|
|
41
|
+
.option('context', {
|
|
42
|
+
describe: 'Runtime Target Context name',
|
|
43
|
+
type: 'string',
|
|
44
|
+
})
|
|
31
45
|
.option('url', {
|
|
32
46
|
alias: 'u',
|
|
33
|
-
describe: '
|
|
47
|
+
describe: 'Unsupported for auth credential commands; use --context',
|
|
34
48
|
type: 'string',
|
|
35
49
|
})
|
|
36
50
|
.option('all', {
|
|
37
|
-
describe: '
|
|
51
|
+
describe: 'Unsupported for Runtime Target Context credentials',
|
|
52
|
+
type: 'boolean',
|
|
53
|
+
default: false,
|
|
54
|
+
})
|
|
55
|
+
.option('all-local', {
|
|
56
|
+
describe: 'Clear every local OAuth token reference without contacting a runtime',
|
|
38
57
|
type: 'boolean',
|
|
39
58
|
default: false,
|
|
40
59
|
}), async (argv) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,UAAU,iBAAiB,CAAC,KAAW;IAC3C,OAAO,KAAK,CAAC,OAAO,CAClB,mBAAmB,EACnB,iEAAiE,EACjE,CAAC,YAAY,EAAE,EAAE;QACf,YAAY;aACT,OAAO,CACN,OAAO,EACP,2CAA2C,EAC3C,CAAC,GAAG,EAAE,EAAE,CACN,GAAG;aACA,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,KAAK,EAAE;YACb,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,UAAU,iBAAiB,CAAC,KAAW;IAC3C,OAAO,KAAK,CAAC,OAAO,CAClB,mBAAmB,EACnB,iEAAiE,EACjE,CAAC,YAAY,EAAE,EAAE;QACf,YAAY;aACT,OAAO,CACN,OAAO,EACP,2CAA2C,EAC3C,CAAC,GAAG,EAAE,EAAE,CACN,GAAG;aACA,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,SAAS,EAAE;YACjB,QAAQ,EAAE,6BAA6B;YACvC,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yDAAyD;YACnE,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACf,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,4CAA4C;YACtD,IAAI,EAAE,QAAQ;SACf,CAAC,EACN,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;YACxD,MAAM,aAAa,CAAC,IAA8C,EAAE,gBAAgB,CAAC,CAAC;QACxF,CAAC,CACF;aACA,OAAO,CACN,QAAQ,EACR,oCAAoC,EACpC,CAAC,GAAG,EAAE,EAAE,CACN,GAAG;aACA,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,SAAS,EAAE;YACjB,QAAQ,EAAE,6BAA6B;YACvC,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yDAAyD;YACnE,IAAI,EAAE,QAAQ;SACf,CAAC,EACN,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC1D,MAAM,aAAa,CAAC,IAA+C,EAAE,iBAAiB,CAAC,CAAC;QAC1F,CAAC,CACF;aACA,OAAO,CACN,QAAQ,EACR,uCAAuC,EACvC,CAAC,GAAG,EAAE,EAAE,CACN,GAAG;aACA,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,SAAS,EAAE;YACjB,QAAQ,EAAE,6BAA6B;YACvC,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yDAAyD;YACnE,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,QAAQ,EAAE,oDAAoD;YAC9D,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,WAAW,EAAE;YACnB,QAAQ,EAAE,sEAAsE;YAChF,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC,EACN,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC1D,MAAM,aAAa,CAAC,IAA+C,EAAE,iBAAiB,CAAC,CAAC;QAC1F,CAAC,CACF;aACA,aAAa,CAAC,CAAC,EAAE,gDAAgD,CAAC,CAAC;IACxE,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACrD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6C/E"}
|
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
import { ApiClient } from '../../commands/shared/apiClient.js';
|
|
2
|
-
import { normalizeServerUrl, saveAuthProfile } from '../../commands/shared/authProfileStore.js';
|
|
3
2
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
3
|
+
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
4
|
+
import { resolveAuthRuntimeTarget } from './runtimeTargetContext.js';
|
|
6
5
|
export async function authLoginCommand(options) {
|
|
7
|
-
const {
|
|
8
|
-
const baseUrl = normalizeServerUrl(stripMcpSuffix(discoveredUrl));
|
|
9
|
-
if (source !== 'user') {
|
|
10
|
-
process.stderr.write(`Auto-detected server at ${baseUrl} (via ${source})\n`);
|
|
11
|
-
}
|
|
6
|
+
const { context, baseUrl, runtimeScopeId } = await resolveAuthRuntimeTarget(options, 'login');
|
|
12
7
|
// Probe without auth — if it succeeds, auth is disabled
|
|
13
8
|
const probeClient = new ApiClient({ baseUrl });
|
|
14
9
|
const probeResponse = await probeClient.get(API_INSPECT_ENDPOINT);
|
|
@@ -34,12 +29,13 @@ export async function authLoginCommand(options) {
|
|
|
34
29
|
if (!response.ok && response.status !== 0) {
|
|
35
30
|
process.stderr.write(`Warning: server returned HTTP ${response.status}, saving token anyway.\n`);
|
|
36
31
|
}
|
|
37
|
-
|
|
32
|
+
new RuntimeTargetStore().setOAuthTokenReference(context, runtimeScopeId, {
|
|
38
33
|
serverUrl: baseUrl,
|
|
39
34
|
token,
|
|
40
35
|
savedAt: Date.now(),
|
|
36
|
+
label: context,
|
|
41
37
|
});
|
|
42
|
-
process.stdout.write(`Saved authentication profile for ${baseUrl}\n`);
|
|
38
|
+
process.stdout.write(`Saved authentication profile for ${context} (${baseUrl})\n`);
|
|
43
39
|
}
|
|
44
40
|
function isLocalhostUrl(url) {
|
|
45
41
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import type { GlobalOptions } from '../../globalOptions.js';
|
|
2
2
|
export interface AuthLogoutOptions extends GlobalOptions {
|
|
3
|
+
context?: string;
|
|
3
4
|
url?: string;
|
|
4
5
|
all?: boolean;
|
|
6
|
+
allLocal?: boolean;
|
|
7
|
+
'all-local'?: boolean;
|
|
5
8
|
}
|
|
6
9
|
export declare function authLogoutCommand(options: AuthLogoutOptions): Promise<void>;
|
|
7
10
|
//# sourceMappingURL=logout.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAS3D,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCjF"}
|
|
@@ -1,46 +1,33 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { discoverServerWithPidFile } from '../../utils/validation/urlDetection.js';
|
|
1
|
+
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
2
|
+
import { AuthCommandError, requireAuthContext, resolveAuthRuntimeTarget, toAuthOAuthTokenReference, } from './runtimeTargetContext.js';
|
|
4
3
|
export async function authLogoutCommand(options) {
|
|
4
|
+
const context = requireAuthContext(options, 'logout');
|
|
5
5
|
if (options.all) {
|
|
6
|
-
|
|
7
|
-
if (profiles.length === 0) {
|
|
8
|
-
process.stdout.write('No saved profiles to remove.\n');
|
|
9
|
-
return;
|
|
10
|
-
}
|
|
11
|
-
for (const profile of profiles) {
|
|
12
|
-
await deleteAuthProfile(options['config-dir'], profile.serverUrl);
|
|
13
|
-
}
|
|
14
|
-
process.stdout.write(`Removed ${profiles.length} profile${profiles.length !== 1 ? 's' : ''}.\n`);
|
|
15
|
-
return;
|
|
6
|
+
throw new AuthCommandError('credential_all_unsupported', 'auth logout --all is not supported for Runtime Target Context credentials', `1mcp auth logout --context ${options.context}`);
|
|
16
7
|
}
|
|
17
|
-
if (
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
try {
|
|
21
|
-
({ url: discoveredUrl, source } = await discoverServerWithPidFile(options['config-dir']));
|
|
22
|
-
}
|
|
23
|
-
catch {
|
|
24
|
-
throw new Error('Specify --url <server-url> or --all. No running server detected for auto-discovery.');
|
|
8
|
+
if (options.allLocal || options['all-local']) {
|
|
9
|
+
if (context !== 'local') {
|
|
10
|
+
throw new AuthCommandError('credential_all_local_context_required', 'auth logout --all-local can only be used with --context local', '1mcp auth logout --context local --all-local');
|
|
25
11
|
}
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
if (removed) {
|
|
30
|
-
process.stdout.write(`Removed profile for ${baseUrl}\n`);
|
|
12
|
+
const cleared = new RuntimeTargetStore().clearLocalOAuthTokenReferences();
|
|
13
|
+
if (cleared === 0) {
|
|
14
|
+
process.stdout.write('No saved local authentication profiles.\n');
|
|
31
15
|
}
|
|
32
16
|
else {
|
|
33
|
-
process.stdout.write(`
|
|
17
|
+
process.stdout.write(`Removed ${cleared} local authentication profile${cleared !== 1 ? 's' : ''}.\n`);
|
|
34
18
|
}
|
|
35
19
|
return;
|
|
36
20
|
}
|
|
37
|
-
const baseUrl =
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
21
|
+
const { baseUrl, runtimeScopeId } = await resolveAuthRuntimeTarget(options, 'logout');
|
|
22
|
+
const store = new RuntimeTargetStore();
|
|
23
|
+
const rawReference = store.getOAuthTokenReference(context, runtimeScopeId);
|
|
24
|
+
const profile = toAuthOAuthTokenReference(rawReference);
|
|
25
|
+
if (profile) {
|
|
26
|
+
store.clearOAuthTokenReference(context, runtimeScopeId);
|
|
27
|
+
process.stdout.write(`Removed profile for ${context} (${baseUrl})\n`);
|
|
41
28
|
}
|
|
42
29
|
else {
|
|
43
|
-
process.stdout.write(`No saved profile for ${baseUrl}\n`);
|
|
30
|
+
process.stdout.write(`No saved profile for ${context} (${baseUrl})\n`);
|
|
44
31
|
}
|
|
45
32
|
}
|
|
46
33
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAGxF,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AAUnC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAA0B;IAChE,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEtD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,gBAAgB,CACxB,4BAA4B,EAC5B,2EAA2E,EAC3E,8BAA8B,OAAO,CAAC,OAAO,EAAE,CAChD,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,gBAAgB,CACxB,uCAAuC,EACvC,+DAA+D,EAC/D,8CAA8C,CAC/C,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC,8BAA8B,EAAE,CAAC;QAC1E,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,OAAO,gCAAgC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACxG,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtF,MAAM,KAAK,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACvC,MAAM,YAAY,GAAG,KAAK,CAAC,sBAAsB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,yBAAyB,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,CAAC,wBAAwB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACxD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,OAAO,KAAK,OAAO,KAAK,CAAC,CAAC;IACxE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,KAAK,OAAO,KAAK,CAAC,CAAC;IACzE,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { GlobalOptions } from '../../globalOptions.js';
|
|
2
|
+
export interface AuthRuntimeTargetOptions extends GlobalOptions {
|
|
3
|
+
context?: string;
|
|
4
|
+
url?: string;
|
|
5
|
+
}
|
|
6
|
+
export interface AuthRuntimeTarget {
|
|
7
|
+
context: string;
|
|
8
|
+
baseUrl: string;
|
|
9
|
+
runtimeScopeId: string;
|
|
10
|
+
}
|
|
11
|
+
export interface AuthOAuthTokenReference {
|
|
12
|
+
token: string;
|
|
13
|
+
serverUrl?: string;
|
|
14
|
+
savedAt?: number;
|
|
15
|
+
label?: string;
|
|
16
|
+
}
|
|
17
|
+
export declare class AuthCommandError extends Error {
|
|
18
|
+
readonly code: string;
|
|
19
|
+
readonly recoveryCommand?: string | undefined;
|
|
20
|
+
constructor(code: string, message: string, recoveryCommand?: string | undefined);
|
|
21
|
+
}
|
|
22
|
+
export declare function resolveAuthRuntimeTarget(options: AuthRuntimeTargetOptions, command: 'login' | 'logout' | 'status'): Promise<AuthRuntimeTarget>;
|
|
23
|
+
export declare function requireAuthContext(options: AuthRuntimeTargetOptions, command: 'login' | 'logout' | 'status'): string;
|
|
24
|
+
export declare function toAuthOAuthTokenReference(value: unknown): AuthOAuthTokenReference | undefined;
|
|
25
|
+
//# sourceMappingURL=runtimeTargetContext.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtimeTargetContext.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/runtimeTargetContext.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAK3D,MAAM,WAAW,wBAAyB,SAAQ,aAAa;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,IAAI,EAAE,MAAM;aAEZ,eAAe,CAAC,EAAE,MAAM;gBAFxB,IAAI,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACC,eAAe,CAAC,EAAE,MAAM,YAAA;CAK3C;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GACrC,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,wBAAwB,EAAE,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAkBpH;AAUD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,uBAAuB,GAAG,SAAS,CAc7F"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { resolveServeTarget, } from '../../commands/shared/serveTargetResolver.js';
|
|
2
|
+
import { fetchRuntimeIdentity } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
|
|
3
|
+
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
4
|
+
import { stripMcpSuffix } from '../../utils/urlUtils.js';
|
|
5
|
+
import { normalizeServerUrl } from '../shared/authProfileStore.js';
|
|
6
|
+
export class AuthCommandError extends Error {
|
|
7
|
+
code;
|
|
8
|
+
recoveryCommand;
|
|
9
|
+
constructor(code, message, recoveryCommand) {
|
|
10
|
+
super(message);
|
|
11
|
+
this.code = code;
|
|
12
|
+
this.recoveryCommand = recoveryCommand;
|
|
13
|
+
this.name = 'AuthCommandError';
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export async function resolveAuthRuntimeTarget(options, command) {
|
|
17
|
+
const context = requireAuthContext(options, command);
|
|
18
|
+
const target = await resolveServeTarget({
|
|
19
|
+
context,
|
|
20
|
+
'config-dir': options['config-dir'],
|
|
21
|
+
});
|
|
22
|
+
const baseUrl = normalizeServerUrl(stripMcpSuffix(target.discoveredUrl));
|
|
23
|
+
return {
|
|
24
|
+
context,
|
|
25
|
+
baseUrl,
|
|
26
|
+
runtimeScopeId: await resolveRuntimeScopeId(target, baseUrl),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export function requireAuthContext(options, command) {
|
|
30
|
+
if (options.url) {
|
|
31
|
+
throw new AuthCommandError('credential_url_unsupported', 'Auth credential commands require a named Runtime Target Context and do not accept --url');
|
|
32
|
+
}
|
|
33
|
+
if (options.context) {
|
|
34
|
+
return options.context;
|
|
35
|
+
}
|
|
36
|
+
const currentName = safeCurrentName();
|
|
37
|
+
throw new AuthCommandError('credential_context_required', 'Auth credential commands require --context <name>', currentName ? `1mcp auth ${command} --context ${currentName}` : `1mcp auth ${command} --context <name>`);
|
|
38
|
+
}
|
|
39
|
+
function safeCurrentName() {
|
|
40
|
+
try {
|
|
41
|
+
return new RuntimeTargetStore().current().name;
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
export function toAuthOAuthTokenReference(value) {
|
|
48
|
+
if (typeof value !== 'object' || value === null) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
const candidate = value;
|
|
52
|
+
if (typeof candidate.token !== 'string' || candidate.token.length === 0) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
return {
|
|
56
|
+
token: candidate.token,
|
|
57
|
+
...(typeof candidate.serverUrl === 'string' ? { serverUrl: candidate.serverUrl } : {}),
|
|
58
|
+
...(typeof candidate.savedAt === 'number' ? { savedAt: candidate.savedAt } : {}),
|
|
59
|
+
...(typeof candidate.label === 'string' ? { label: candidate.label } : {}),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
async function resolveRuntimeScopeId(target, baseUrl) {
|
|
63
|
+
if (target.runtimeTargetContext?.runtimeScopeId) {
|
|
64
|
+
return target.runtimeTargetContext.runtimeScopeId;
|
|
65
|
+
}
|
|
66
|
+
const identity = await fetchRuntimeIdentity(baseUrl);
|
|
67
|
+
return identity.runtimeScopeId;
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=runtimeTargetContext.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtimeTargetContext.js","sourceRoot":"","sources":["../../../src/commands/auth/runtimeTargetContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjF"}
|
|
@@ -1,43 +1,20 @@
|
|
|
1
1
|
import { ApiClient } from '../../commands/shared/apiClient.js';
|
|
2
|
-
import { listAuthProfiles, loadAuthProfile, normalizeServerUrl } from '../../commands/shared/authProfileStore.js';
|
|
3
2
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
3
|
+
import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';
|
|
4
|
+
import { resolveAuthRuntimeTarget, toAuthOAuthTokenReference } from './runtimeTargetContext.js';
|
|
6
5
|
export async function authStatusCommand(options) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
return;
|
|
10
|
-
}
|
|
11
|
-
// Try auto-discovery first
|
|
12
|
-
try {
|
|
13
|
-
const { url: discoveredUrl, source } = await discoverServerWithPidFile(options['config-dir']);
|
|
14
|
-
const baseUrl = normalizeServerUrl(stripMcpSuffix(discoveredUrl));
|
|
15
|
-
process.stderr.write(`Auto-detected server at ${baseUrl} (via ${source})\n`);
|
|
16
|
-
await showProfileStatus(options['config-dir'], baseUrl);
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
catch {
|
|
20
|
-
// No server found, fall through to list all profiles
|
|
21
|
-
}
|
|
22
|
-
const profiles = await listAuthProfiles(options['config-dir']);
|
|
23
|
-
if (profiles.length === 0) {
|
|
24
|
-
process.stdout.write('No saved authentication profiles.\n');
|
|
25
|
-
return;
|
|
26
|
-
}
|
|
27
|
-
process.stdout.write(`Saved profiles (${profiles.length}):\n`);
|
|
28
|
-
for (const profile of profiles) {
|
|
29
|
-
const savedAt = new Date(profile.savedAt).toLocaleString();
|
|
30
|
-
process.stdout.write(` - ${profile.serverUrl} (saved ${savedAt})\n`);
|
|
31
|
-
}
|
|
6
|
+
const { context, baseUrl, runtimeScopeId } = await resolveAuthRuntimeTarget(options, 'status');
|
|
7
|
+
await showProfileStatus(context, runtimeScopeId, baseUrl);
|
|
32
8
|
}
|
|
33
|
-
async function showProfileStatus(
|
|
34
|
-
const profile =
|
|
9
|
+
async function showProfileStatus(context, runtimeScopeId, baseUrl) {
|
|
10
|
+
const profile = toAuthOAuthTokenReference(new RuntimeTargetStore().getOAuthTokenReference(context, runtimeScopeId));
|
|
35
11
|
if (!profile) {
|
|
36
|
-
process.stdout.write(`No saved profile for ${baseUrl}\n`);
|
|
12
|
+
process.stdout.write(`No saved profile for ${context} (${baseUrl})\n`);
|
|
37
13
|
return;
|
|
38
14
|
}
|
|
39
|
-
const
|
|
40
|
-
|
|
15
|
+
const profileUrl = profile.serverUrl ?? baseUrl;
|
|
16
|
+
const savedAt = profile.savedAt === undefined ? 'unknown' : new Date(profile.savedAt).toLocaleString();
|
|
17
|
+
process.stdout.write(`Profile: ${context} (${profileUrl})\n`);
|
|
41
18
|
process.stdout.write(` Saved: ${savedAt}\n`);
|
|
42
19
|
const client = new ApiClient({ baseUrl, bearerToken: profile.token });
|
|
43
20
|
const response = await client.get(API_INSPECT_ENDPOINT);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAGxF,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAOhG,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAA0B;IAChE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/F,MAAM,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAAe,EAAE,cAAsB,EAAE,OAAe;IACvF,MAAM,OAAO,GAAG,yBAAyB,CAAC,IAAI,kBAAkB,EAAE,CAAC,sBAAsB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;IACpH,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,KAAK,OAAO,KAAK,CAAC,CAAC;QACvE,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC;IACvG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,OAAO,KAAK,UAAU,KAAK,CAAC,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,OAAO,IAAI,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACxD,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/E,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,QAAQ,CAAC,KAAK,IAAI,QAAQ,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnG,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,CAkErD"}
|
|
@@ -11,6 +11,10 @@ export function setupInspectCommand(yargs) {
|
|
|
11
11
|
alias: 'u',
|
|
12
12
|
describe: 'Override auto-detected 1MCP server URL',
|
|
13
13
|
type: 'string',
|
|
14
|
+
})
|
|
15
|
+
.option('context', {
|
|
16
|
+
describe: 'Use a named Runtime Target Context',
|
|
17
|
+
type: 'string',
|
|
14
18
|
})
|
|
15
19
|
.option('preset', {
|
|
16
20
|
alias: 'p',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/inspect/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,UAAU,mBAAmB,CAAC,KAAW;IAC7C,OAAO,KAAK,CAAC,OAAO,CAClB,kBAAkB,EAClB,6DAA6D,EAC7D,CAAC,YAAY,EAAE,EAAE,CACf,YAAY;SACT,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;SAC5B,UAAU,CAAC,QAAQ,EAAE;QACpB,QAAQ,EAAE,wEAAwE;QAClF,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,oDAAoD;QAC9D,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QACpB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,mCAAmC;QAC7C,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,QAAQ,EAAE,yDAAyD;QACnE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,iDAAiD;QAC3D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;KACZ,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EAAE,4CAA4C;QACtD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,OAAO,CAAC,YAAY,EAAE,uDAAuD,CAAC;SAC9E,OAAO,CAAC,uBAAuB,EAAE,qCAAqC,CAAC;SACvE,OAAO,CAAC,iCAAiC,EAAE,0CAA0C,CAAC;SACtF,OAAO,CAAC,qCAAqC,EAAE,uDAAuD,CAAC;SACvG,OAAO,CAAC,qCAAqC,EAAE,6BAA6B,CAAC;SAC7E,OAAO,CAAC,6BAA6B,EAAE,mCAAmC,CAAC;SAC3E,QAAQ,CAAC,2FAA2F,CAAC,EAC1G,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,aAAa,CAAC,IAA4C,EAAE,cAAc,CAAC,CAAC;IACpF,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/inspect/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,UAAU,mBAAmB,CAAC,KAAW;IAC7C,OAAO,KAAK,CAAC,OAAO,CAClB,kBAAkB,EAClB,6DAA6D,EAC7D,CAAC,YAAY,EAAE,EAAE,CACf,YAAY;SACT,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;SAC5B,UAAU,CAAC,QAAQ,EAAE;QACpB,QAAQ,EAAE,wEAAwE;QAClF,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,oCAAoC;QAC9C,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,oDAAoD;QAC9D,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QACpB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,mCAAmC;QAC7C,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,QAAQ,EAAE,yDAAyD;QACnE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,iDAAiD;QAC3D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;KACZ,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EAAE,4CAA4C;QACtD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,OAAO,CAAC,YAAY,EAAE,uDAAuD,CAAC;SAC9E,OAAO,CAAC,uBAAuB,EAAE,qCAAqC,CAAC;SACvE,OAAO,CAAC,iCAAiC,EAAE,0CAA0C,CAAC;SACtF,OAAO,CAAC,qCAAqC,EAAE,uDAAuD,CAAC;SACvG,OAAO,CAAC,qCAAqC,EAAE,6BAA6B,CAAC;SAC7E,OAAO,CAAC,6BAA6B,EAAE,mCAAmC,CAAC;SAC3E,QAAQ,CAAC,2FAA2F,CAAC,EAC1G,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,aAAa,CAAC,IAA4C,EAAE,cAAc,CAAC,CAAC;IACpF,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -6,6 +6,7 @@ import type { ContextData } from '../../types/context.js';
|
|
|
6
6
|
import { type InspectOutputFormat, type InspectResult } from './inspectUtils.js';
|
|
7
7
|
export interface InspectCommandOptions extends GlobalOptions {
|
|
8
8
|
url?: string;
|
|
9
|
+
context?: string;
|
|
9
10
|
preset?: string;
|
|
10
11
|
filter?: string;
|
|
11
12
|
tags?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/inspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAI/D,OAAO,
|
|
1
|
+
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/commands/inspect/inspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAI/D,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,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;AAuGD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,qBAAqB,EAC9B,aAAa,GAAE,uBAA4B,GAC1C,OAAO,CAAC,aAAa,CAAC,CA4FxB;AAgED,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,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,7 +1,7 @@
|
|
|
1
1
|
import { StreamableHTTPError } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
2
2
|
import { findToolByQualifiedName } from '../../commands/run/runUtils.js';
|
|
3
3
|
import { ApiClient } from '../../commands/shared/apiClient.js';
|
|
4
|
-
import { attachReusableClientSurface, } from '../../commands/shared/clientSurfaceAttachment.js';
|
|
4
|
+
import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, } from '../../commands/shared/clientSurfaceAttachment.js';
|
|
5
5
|
import { StreamableServeClient, } from '../../commands/shared/serveClient.js';
|
|
6
6
|
import { MCP_URI_SEPARATOR } from '../../constants.js';
|
|
7
7
|
import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
|
|
@@ -163,7 +163,7 @@ async function tryInspectRest(context, includeServerInstructions) {
|
|
|
163
163
|
if (apiResponse.status === 401 || apiResponse.status === 403) {
|
|
164
164
|
return {
|
|
165
165
|
status: 'auth_required',
|
|
166
|
-
message:
|
|
166
|
+
message: formatClientSurfaceAuthRequiredMessage(context),
|
|
167
167
|
};
|
|
168
168
|
}
|
|
169
169
|
const isMissingInspectEndpoint = apiResponse.status === 404 && (!apiResponse.error || apiResponse.error === 'HTTP 404');
|