@1mcp/agent 0.30.3 → 0.31.0-beta2
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 +75 -2
- package/build/commands/auth/index.d.ts +3 -0
- package/build/commands/auth/index.d.ts.map +1 -0
- package/build/commands/auth/index.js +47 -0
- package/build/commands/auth/index.js.map +1 -0
- package/build/commands/auth/login.d.ts +7 -0
- package/build/commands/auth/login.d.ts.map +1 -0
- package/build/commands/auth/login.js +83 -0
- package/build/commands/auth/login.js.map +1 -0
- package/build/commands/auth/logout.d.ts +7 -0
- package/build/commands/auth/logout.d.ts.map +1 -0
- package/build/commands/auth/logout.js +46 -0
- package/build/commands/auth/logout.js.map +1 -0
- package/build/commands/auth/status.d.ts +6 -0
- package/build/commands/auth/status.d.ts.map +1 -0
- package/build/commands/auth/status.js +54 -0
- package/build/commands/auth/status.js.map +1 -0
- package/build/commands/cliSetup/cliSetup.d.ts +12 -0
- package/build/commands/cliSetup/cliSetup.d.ts.map +1 -0
- package/build/commands/cliSetup/cliSetup.js +49 -0
- package/build/commands/cliSetup/cliSetup.js.map +1 -0
- package/build/commands/cliSetup/index.d.ts +3 -0
- package/build/commands/cliSetup/index.d.ts.map +1 -0
- package/build/commands/cliSetup/index.js +52 -0
- package/build/commands/cliSetup/index.js.map +1 -0
- package/build/commands/cliSetup/setupFiles.d.ts +24 -0
- package/build/commands/cliSetup/setupFiles.d.ts.map +1 -0
- package/build/commands/cliSetup/setupFiles.js +233 -0
- package/build/commands/cliSetup/setupFiles.js.map +1 -0
- package/build/commands/inspect/index.d.ts +3 -0
- package/build/commands/inspect/index.d.ts.map +1 -0
- package/build/commands/inspect/index.js +60 -0
- package/build/commands/inspect/index.js.map +1 -0
- package/build/commands/inspect/inspect.d.ts +36 -0
- package/build/commands/inspect/inspect.d.ts.map +1 -0
- package/build/commands/inspect/inspect.js +274 -0
- package/build/commands/inspect/inspect.js.map +1 -0
- package/build/commands/inspect/inspectUtils.d.ts +76 -0
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -0
- package/build/commands/inspect/inspectUtils.js +303 -0
- package/build/commands/inspect/inspectUtils.js.map +1 -0
- package/build/commands/instructions/index.d.ts +3 -0
- package/build/commands/instructions/index.d.ts.map +1 -0
- package/build/commands/instructions/index.js +34 -0
- package/build/commands/instructions/index.js.map +1 -0
- package/build/commands/instructions/instructions.d.ts +10 -0
- package/build/commands/instructions/instructions.d.ts.map +1 -0
- package/build/commands/instructions/instructions.js +86 -0
- package/build/commands/instructions/instructions.js.map +1 -0
- package/build/commands/instructions/instructionsUtils.d.ts +24 -0
- package/build/commands/instructions/instructionsUtils.d.ts.map +1 -0
- package/build/commands/instructions/instructionsUtils.js +74 -0
- package/build/commands/instructions/instructionsUtils.js.map +1 -0
- package/build/commands/mcp/add.d.ts.map +1 -1
- package/build/commands/mcp/add.js +21 -2
- package/build/commands/mcp/add.js.map +1 -1
- package/build/commands/mcp/index.d.ts.map +1 -1
- package/build/commands/mcp/index.js +5 -4
- package/build/commands/mcp/index.js.map +1 -1
- package/build/commands/mcp/list.d.ts.map +1 -1
- package/build/commands/mcp/list.js +52 -8
- package/build/commands/mcp/list.js.map +1 -1
- package/build/commands/mcp/status.d.ts.map +1 -1
- package/build/commands/mcp/status.js +59 -26
- package/build/commands/mcp/status.js.map +1 -1
- package/build/commands/proxy/proxy.d.ts.map +1 -1
- package/build/commands/proxy/proxy.js +26 -30
- package/build/commands/proxy/proxy.js.map +1 -1
- package/build/commands/run/index.d.ts +3 -0
- package/build/commands/run/index.d.ts.map +1 -0
- package/build/commands/run/index.js +62 -0
- package/build/commands/run/index.js.map +1 -0
- package/build/commands/run/run.d.ts +35 -0
- package/build/commands/run/run.d.ts.map +1 -0
- package/build/commands/run/run.js +340 -0
- package/build/commands/run/run.js.map +1 -0
- package/build/commands/run/runUtils.d.ts +49 -0
- package/build/commands/run/runUtils.d.ts.map +1 -0
- package/build/commands/run/runUtils.js +195 -0
- package/build/commands/run/runUtils.js.map +1 -0
- package/build/commands/serve/index.d.ts +0 -22
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +0 -23
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +23 -23
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +67 -51
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/shared/apiClient.d.ts +27 -0
- package/build/commands/shared/apiClient.d.ts.map +1 -0
- package/build/commands/shared/apiClient.js +96 -0
- package/build/commands/shared/apiClient.js.map +1 -0
- package/build/commands/shared/authProfileStore.d.ts +16 -0
- package/build/commands/shared/authProfileStore.d.ts.map +1 -0
- package/build/commands/shared/authProfileStore.js +109 -0
- package/build/commands/shared/authProfileStore.js.map +1 -0
- package/build/commands/shared/baseConfigUtils.d.ts +15 -1
- package/build/commands/shared/baseConfigUtils.d.ts.map +1 -1
- package/build/commands/shared/baseConfigUtils.js +171 -40
- package/build/commands/shared/baseConfigUtils.js.map +1 -1
- package/build/commands/shared/cliContext.d.ts +13 -0
- package/build/commands/shared/cliContext.d.ts.map +1 -0
- package/build/commands/shared/cliContext.js +71 -0
- package/build/commands/shared/cliContext.js.map +1 -0
- package/build/commands/shared/commandRunner.d.ts +3 -0
- package/build/commands/shared/commandRunner.d.ts.map +1 -0
- package/build/commands/shared/commandRunner.js +13 -0
- package/build/commands/shared/commandRunner.js.map +1 -0
- package/build/commands/shared/serveClient.d.ts +68 -0
- package/build/commands/shared/serveClient.d.ts.map +1 -0
- package/build/commands/shared/serveClient.js +204 -0
- package/build/commands/shared/serveClient.js.map +1 -0
- package/build/commands/shared/serveTargetResolver.d.ts +21 -0
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -0
- package/build/commands/shared/serveTargetResolver.js +33 -0
- package/build/commands/shared/serveTargetResolver.js.map +1 -0
- package/build/config/configLoader.d.ts +28 -2
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +155 -28
- package/build/config/configLoader.js.map +1 -1
- package/build/config/configManager.d.ts +12 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +74 -6
- package/build/config/configManager.js.map +1 -1
- package/build/config/mcpConfigManager.d.ts +18 -5
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +51 -44
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/config/mcpConfigMerge.d.ts +15 -0
- package/build/config/mcpConfigMerge.d.ts.map +1 -0
- package/build/config/mcpConfigMerge.js +87 -0
- package/build/config/mcpConfigMerge.js.map +1 -0
- package/build/config/projectConfigLoader.d.ts +9 -0
- package/build/config/projectConfigLoader.d.ts.map +1 -1
- package/build/config/projectConfigLoader.js +72 -20
- package/build/config/projectConfigLoader.js.map +1 -1
- package/build/config/templateProcessor.d.ts.map +1 -1
- package/build/config/templateProcessor.js +2 -2
- package/build/config/templateProcessor.js.map +1 -1
- package/build/constants/api.d.ts +6 -0
- package/build/constants/api.d.ts.map +1 -1
- package/build/constants/api.js +7 -0
- package/build/constants/api.js.map +1 -1
- package/build/constants/mcp.d.ts +2 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +2 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/constants/paths.d.ts +5 -0
- package/build/constants/paths.d.ts.map +1 -1
- package/build/constants/paths.js +9 -1
- package/build/constants/paths.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +7 -2
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +12 -12
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +22 -21
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts +4 -0
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +18 -11
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/server/serverManager.d.ts +4 -0
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +6 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +7 -2
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +1 -0
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/discovery.d.ts +3 -3
- package/build/core/tools/internal/schemas/index.d.ts +4 -4
- package/build/core/tools/internal/schemas/management.d.ts +1 -1
- package/build/core/types/transport.d.ts +146 -0
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +75 -0
- package/build/core/types/transport.js.map +1 -1
- package/build/globalOptions.d.ts +6 -0
- package/build/globalOptions.d.ts.map +1 -1
- package/build/globalOptions.js +5 -0
- package/build/globalOptions.js.map +1 -1
- package/build/index.d.ts +2 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +24 -4
- package/build/index.js.map +1 -1
- package/build/transport/http/routes/apiRoutes.d.ts +10 -0
- package/build/transport/http/routes/apiRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/apiRoutes.js +18 -0
- package/build/transport/http/routes/apiRoutes.js.map +1 -0
- package/build/transport/http/routes/cliTokenRoute.d.ts +4 -0
- package/build/transport/http/routes/cliTokenRoute.d.ts.map +1 -0
- package/build/transport/http/routes/cliTokenRoute.js +35 -0
- package/build/transport/http/routes/cliTokenRoute.js.map +1 -0
- package/build/transport/http/routes/inspectHelpers.d.ts +68 -0
- package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -0
- package/build/transport/http/routes/inspectHelpers.js +141 -0
- package/build/transport/http/routes/inspectHelpers.js.map +1 -0
- package/build/transport/http/routes/inspectRoutes.d.ts +8 -0
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/inspectRoutes.js +348 -0
- package/build/transport/http/routes/inspectRoutes.js.map +1 -0
- package/build/transport/http/routes/toolRoutes.d.ts +5 -0
- package/build/transport/http/routes/toolRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/toolRoutes.js +204 -0
- package/build/transport/http/routes/toolRoutes.js.map +1 -0
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +16 -1
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/http/utils/contextExtractor.d.ts +5 -1
- package/build/transport/http/utils/contextExtractor.d.ts.map +1 -1
- package/build/transport/http/utils/contextExtractor.js +75 -12
- package/build/transport/http/utils/contextExtractor.js.map +1 -1
- package/build/transport/stdioProxyTransport.d.ts +2 -2
- package/build/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/transport/stdioProxyTransport.js +11 -75
- package/build/transport/stdioProxyTransport.js.map +1 -1
- package/build/types/context.d.ts +1 -0
- package/build/types/context.d.ts.map +1 -1
- package/build/types/context.js.map +1 -1
- package/build/utils/cli/normalizedArgv.d.ts +3 -0
- package/build/utils/cli/normalizedArgv.d.ts.map +1 -0
- package/build/utils/cli/normalizedArgv.js +9 -0
- package/build/utils/cli/normalizedArgv.js.map +1 -0
- package/build/utils/context/contextHash.d.ts +11 -0
- package/build/utils/context/contextHash.d.ts.map +1 -0
- package/build/utils/context/contextHash.js +37 -0
- package/build/utils/context/contextHash.js.map +1 -0
- package/build/utils/typeGuards.d.ts +2 -0
- package/build/utils/typeGuards.d.ts.map +1 -0
- package/build/utils/typeGuards.js +4 -0
- package/build/utils/typeGuards.js.map +1 -0
- package/build/utils/urlUtils.d.ts +2 -0
- package/build/utils/urlUtils.d.ts.map +1 -0
- package/build/utils/urlUtils.js +4 -0
- package/build/utils/urlUtils.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts +1 -0
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +10 -4
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +6 -4
|
@@ -59,6 +59,57 @@ export interface BaseTransportConfig {
|
|
|
59
59
|
readonly tags?: string[];
|
|
60
60
|
readonly oauth?: OAuthConfig;
|
|
61
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* Shareable transport settings that can be defined globally and inherited by servers
|
|
64
|
+
*/
|
|
65
|
+
export interface GlobalTransportConfig {
|
|
66
|
+
readonly env?: Record<string, string> | string[];
|
|
67
|
+
/** @deprecated Use connectionTimeout and requestTimeout instead */
|
|
68
|
+
readonly timeout?: number;
|
|
69
|
+
readonly connectionTimeout?: number;
|
|
70
|
+
readonly requestTimeout?: number;
|
|
71
|
+
readonly oauth?: OAuthConfig;
|
|
72
|
+
readonly headers?: Record<string, string>;
|
|
73
|
+
readonly inheritParentEnv?: boolean;
|
|
74
|
+
readonly envFilter?: string[];
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Application-level configuration that can be set in mcp.json under the "app" key.
|
|
78
|
+
* CLI args and ONE_MCP_* env vars always take precedence over these values.
|
|
79
|
+
*/
|
|
80
|
+
export interface ApplicationConfig {
|
|
81
|
+
readonly transport?: 'http' | 'sse' | 'stdio';
|
|
82
|
+
readonly port?: number;
|
|
83
|
+
readonly host?: string;
|
|
84
|
+
readonly logLevel?: 'debug' | 'info' | 'warn' | 'error';
|
|
85
|
+
readonly logFile?: string;
|
|
86
|
+
readonly auth?: {
|
|
87
|
+
readonly enabled?: boolean;
|
|
88
|
+
readonly sessionTtl?: number;
|
|
89
|
+
readonly rateLimitWindow?: number;
|
|
90
|
+
readonly rateLimitMax?: number;
|
|
91
|
+
readonly trustProxy?: string;
|
|
92
|
+
readonly enableScopeValidation?: boolean;
|
|
93
|
+
readonly enableEnhancedSecurity?: boolean;
|
|
94
|
+
};
|
|
95
|
+
readonly asyncLoading?: {
|
|
96
|
+
readonly enabled?: boolean;
|
|
97
|
+
readonly minServers?: number;
|
|
98
|
+
readonly timeout?: number;
|
|
99
|
+
readonly batchNotifications?: boolean;
|
|
100
|
+
readonly batchDelay?: number;
|
|
101
|
+
};
|
|
102
|
+
readonly lazyLoading?: {
|
|
103
|
+
readonly enabled?: boolean;
|
|
104
|
+
readonly mode?: 'full' | 'metatool' | 'hybrid';
|
|
105
|
+
readonly cacheMaxEntries?: number;
|
|
106
|
+
readonly inlineCatalog?: boolean;
|
|
107
|
+
};
|
|
108
|
+
readonly configReload?: {
|
|
109
|
+
readonly enabled?: boolean;
|
|
110
|
+
readonly debounce?: number;
|
|
111
|
+
};
|
|
112
|
+
}
|
|
62
113
|
/**
|
|
63
114
|
* Common configuration for HTTP-based transports (HTTP and SSE)
|
|
64
115
|
*/
|
|
@@ -91,6 +142,7 @@ export declare const oAuthConfigSchema: z.ZodObject<{
|
|
|
91
142
|
clientSecret: z.ZodOptional<z.ZodString>;
|
|
92
143
|
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
93
144
|
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
145
|
+
redirectUrl: z.ZodOptional<z.ZodString>;
|
|
94
146
|
}, z.core.$strip>;
|
|
95
147
|
/**
|
|
96
148
|
* Zod schema for template server configuration
|
|
@@ -125,6 +177,7 @@ export declare const transportConfigSchema: z.ZodObject<{
|
|
|
125
177
|
clientSecret: z.ZodOptional<z.ZodString>;
|
|
126
178
|
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
127
179
|
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
180
|
+
redirectUrl: z.ZodOptional<z.ZodString>;
|
|
128
181
|
}, z.core.$strip>>;
|
|
129
182
|
url: z.ZodOptional<z.ZodString>;
|
|
130
183
|
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -149,6 +202,79 @@ export declare const transportConfigSchema: z.ZodObject<{
|
|
|
149
202
|
}, z.core.$strip>>;
|
|
150
203
|
}, z.core.$strip>>;
|
|
151
204
|
}, z.core.$strip>;
|
|
205
|
+
/**
|
|
206
|
+
* Zod schema for application-level configuration
|
|
207
|
+
*/
|
|
208
|
+
export declare const applicationConfigSchema: z.ZodObject<{
|
|
209
|
+
transport: z.ZodOptional<z.ZodEnum<{
|
|
210
|
+
stdio: "stdio";
|
|
211
|
+
http: "http";
|
|
212
|
+
sse: "sse";
|
|
213
|
+
}>>;
|
|
214
|
+
port: z.ZodOptional<z.ZodNumber>;
|
|
215
|
+
host: z.ZodOptional<z.ZodString>;
|
|
216
|
+
logLevel: z.ZodOptional<z.ZodEnum<{
|
|
217
|
+
debug: "debug";
|
|
218
|
+
info: "info";
|
|
219
|
+
warn: "warn";
|
|
220
|
+
error: "error";
|
|
221
|
+
}>>;
|
|
222
|
+
logFile: z.ZodOptional<z.ZodString>;
|
|
223
|
+
auth: z.ZodOptional<z.ZodObject<{
|
|
224
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
225
|
+
sessionTtl: z.ZodOptional<z.ZodNumber>;
|
|
226
|
+
rateLimitWindow: z.ZodOptional<z.ZodNumber>;
|
|
227
|
+
rateLimitMax: z.ZodOptional<z.ZodNumber>;
|
|
228
|
+
trustProxy: z.ZodOptional<z.ZodString>;
|
|
229
|
+
enableScopeValidation: z.ZodOptional<z.ZodBoolean>;
|
|
230
|
+
enableEnhancedSecurity: z.ZodOptional<z.ZodBoolean>;
|
|
231
|
+
}, z.core.$strip>>;
|
|
232
|
+
asyncLoading: z.ZodOptional<z.ZodObject<{
|
|
233
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
234
|
+
minServers: z.ZodOptional<z.ZodNumber>;
|
|
235
|
+
timeout: z.ZodOptional<z.ZodNumber>;
|
|
236
|
+
batchNotifications: z.ZodOptional<z.ZodBoolean>;
|
|
237
|
+
batchDelay: z.ZodOptional<z.ZodNumber>;
|
|
238
|
+
}, z.core.$strip>>;
|
|
239
|
+
lazyLoading: z.ZodOptional<z.ZodObject<{
|
|
240
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
241
|
+
mode: z.ZodOptional<z.ZodEnum<{
|
|
242
|
+
full: "full";
|
|
243
|
+
metatool: "metatool";
|
|
244
|
+
hybrid: "hybrid";
|
|
245
|
+
}>>;
|
|
246
|
+
cacheMaxEntries: z.ZodOptional<z.ZodNumber>;
|
|
247
|
+
inlineCatalog: z.ZodOptional<z.ZodBoolean>;
|
|
248
|
+
}, z.core.$strip>>;
|
|
249
|
+
configReload: z.ZodOptional<z.ZodObject<{
|
|
250
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
251
|
+
debounce: z.ZodOptional<z.ZodNumber>;
|
|
252
|
+
}, z.core.$strip>>;
|
|
253
|
+
}, z.core.$strip>;
|
|
254
|
+
/**
|
|
255
|
+
* Keys allowed in the global MCP configuration section
|
|
256
|
+
*/
|
|
257
|
+
export declare const GLOBAL_TRANSPORT_CONFIG_KEYS: readonly ["env", "timeout", "connectionTimeout", "requestTimeout", "oauth", "headers", "inheritParentEnv", "envFilter"];
|
|
258
|
+
/**
|
|
259
|
+
* Zod schema for global MCP configuration
|
|
260
|
+
* Only includes shareable settings that can be inherited by servers.
|
|
261
|
+
*/
|
|
262
|
+
export declare const globalTransportConfigSchema: z.ZodObject<{
|
|
263
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
264
|
+
env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
|
|
265
|
+
inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
|
|
266
|
+
envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
267
|
+
timeout: z.ZodOptional<z.ZodNumber>;
|
|
268
|
+
connectionTimeout: z.ZodOptional<z.ZodNumber>;
|
|
269
|
+
requestTimeout: z.ZodOptional<z.ZodNumber>;
|
|
270
|
+
oauth: z.ZodOptional<z.ZodObject<{
|
|
271
|
+
clientId: z.ZodOptional<z.ZodString>;
|
|
272
|
+
clientSecret: z.ZodOptional<z.ZodString>;
|
|
273
|
+
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
274
|
+
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
275
|
+
redirectUrl: z.ZodOptional<z.ZodString>;
|
|
276
|
+
}, z.core.$strip>>;
|
|
277
|
+
}, z.core.$strip>;
|
|
152
278
|
/**
|
|
153
279
|
* Union type for all transport configurations
|
|
154
280
|
*/
|
|
@@ -194,6 +320,8 @@ export interface TemplateServerConfig {
|
|
|
194
320
|
export interface MCPServerConfiguration {
|
|
195
321
|
/** Version of the configuration format for migration purposes */
|
|
196
322
|
version?: string;
|
|
323
|
+
/** Shareable defaults inherited by all MCP servers (transport settings only) */
|
|
324
|
+
serverDefaults?: GlobalTransportConfig;
|
|
197
325
|
/** Static server configurations (no template processing) */
|
|
198
326
|
mcpServers: Record<string, MCPServerParams>;
|
|
199
327
|
/** Template-based server configurations (processed with context) */
|
|
@@ -217,6 +345,22 @@ export declare const templateSettingsSchema: z.ZodObject<{
|
|
|
217
345
|
*/
|
|
218
346
|
export declare const mcpServerConfigSchema: z.ZodObject<{
|
|
219
347
|
version: z.ZodOptional<z.ZodString>;
|
|
348
|
+
serverDefaults: z.ZodOptional<z.ZodObject<{
|
|
349
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
350
|
+
env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
|
|
351
|
+
inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
|
|
352
|
+
envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
353
|
+
timeout: z.ZodOptional<z.ZodNumber>;
|
|
354
|
+
connectionTimeout: z.ZodOptional<z.ZodNumber>;
|
|
355
|
+
requestTimeout: z.ZodOptional<z.ZodNumber>;
|
|
356
|
+
oauth: z.ZodOptional<z.ZodObject<{
|
|
357
|
+
clientId: z.ZodOptional<z.ZodString>;
|
|
358
|
+
clientSecret: z.ZodOptional<z.ZodString>;
|
|
359
|
+
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
360
|
+
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
361
|
+
redirectUrl: z.ZodOptional<z.ZodString>;
|
|
362
|
+
}, z.core.$strip>>;
|
|
363
|
+
}, z.core.$strip>>;
|
|
220
364
|
mcpServers: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
221
365
|
type: z.ZodOptional<z.ZodEnum<{
|
|
222
366
|
stdio: "stdio";
|
|
@@ -234,6 +378,7 @@ export declare const mcpServerConfigSchema: z.ZodObject<{
|
|
|
234
378
|
clientSecret: z.ZodOptional<z.ZodString>;
|
|
235
379
|
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
236
380
|
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
381
|
+
redirectUrl: z.ZodOptional<z.ZodString>;
|
|
237
382
|
}, z.core.$strip>>;
|
|
238
383
|
url: z.ZodOptional<z.ZodString>;
|
|
239
384
|
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -275,6 +420,7 @@ export declare const mcpServerConfigSchema: z.ZodObject<{
|
|
|
275
420
|
clientSecret: z.ZodOptional<z.ZodString>;
|
|
276
421
|
scopes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
277
422
|
autoRegister: z.ZodOptional<z.ZodBoolean>;
|
|
423
|
+
redirectUrl: z.ZodOptional<z.ZodString>;
|
|
278
424
|
}, z.core.$strip>>;
|
|
279
425
|
url: z.ZodOptional<z.ZodString>;
|
|
280
426
|
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/core/types/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE1E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,mEAAmE;IACnE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,6FAA6F;IAC7F,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACnE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC3C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IACjD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/core/types/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export const oAuthConfigSchema = z.object({
|
|
|
7
7
|
clientSecret: z.string().optional().describe('OAuth client secret for authentication'),
|
|
8
8
|
scopes: z.array(z.string()).optional().describe('OAuth scopes to request'),
|
|
9
9
|
autoRegister: z.boolean().optional().describe('Automatically register OAuth client if not already registered'),
|
|
10
|
+
redirectUrl: z.string().optional().describe('OAuth redirect URL used after auth'),
|
|
10
11
|
});
|
|
11
12
|
/**
|
|
12
13
|
* Zod schema for template server configuration
|
|
@@ -76,6 +77,77 @@ export const transportConfigSchema = z.object({
|
|
|
76
77
|
// Template configuration
|
|
77
78
|
template: templateServerConfigSchema.optional().describe('Template-based server instance management configuration'),
|
|
78
79
|
});
|
|
80
|
+
/**
|
|
81
|
+
* Zod schema for application-level configuration
|
|
82
|
+
*/
|
|
83
|
+
export const applicationConfigSchema = z.object({
|
|
84
|
+
transport: z.enum(['http', 'sse', 'stdio']).optional().describe('Transport type for the 1MCP server'),
|
|
85
|
+
port: z.number().int().min(1).max(65535).optional().describe('HTTP port to listen on'),
|
|
86
|
+
host: z.string().optional().describe('HTTP host to listen on'),
|
|
87
|
+
logLevel: z.enum(['debug', 'info', 'warn', 'error']).optional().describe('Log level'),
|
|
88
|
+
logFile: z.string().optional().describe('Path to log file'),
|
|
89
|
+
auth: z
|
|
90
|
+
.object({
|
|
91
|
+
enabled: z.boolean().optional().describe('Enable OAuth 2.1 authentication'),
|
|
92
|
+
sessionTtl: z.number().int().min(1).optional().describe('Session TTL in minutes'),
|
|
93
|
+
rateLimitWindow: z.number().int().min(1).optional().describe('Rate limit window in minutes'),
|
|
94
|
+
rateLimitMax: z.number().int().min(1).optional().describe('Maximum requests per rate limit window'),
|
|
95
|
+
trustProxy: z.string().optional().describe('Trust proxy configuration for Express.js'),
|
|
96
|
+
enableScopeValidation: z.boolean().optional().describe('Enable tag-based scope validation'),
|
|
97
|
+
enableEnhancedSecurity: z.boolean().optional().describe('Enable enhanced security middleware'),
|
|
98
|
+
})
|
|
99
|
+
.optional(),
|
|
100
|
+
asyncLoading: z
|
|
101
|
+
.object({
|
|
102
|
+
enabled: z.boolean().optional().describe('Enable asynchronous MCP server loading'),
|
|
103
|
+
minServers: z.number().int().min(0).optional().describe('Minimum servers to wait for before accepting requests'),
|
|
104
|
+
timeout: z.number().int().min(0).optional().describe('Initial load timeout in milliseconds'),
|
|
105
|
+
batchNotifications: z.boolean().optional().describe('Batch capability change notifications'),
|
|
106
|
+
batchDelay: z.number().int().min(0).optional().describe('Batch delay in milliseconds'),
|
|
107
|
+
})
|
|
108
|
+
.optional(),
|
|
109
|
+
lazyLoading: z
|
|
110
|
+
.object({
|
|
111
|
+
enabled: z.boolean().optional().describe('Enable lazy loading for tools'),
|
|
112
|
+
mode: z.enum(['full', 'metatool', 'hybrid']).optional().describe('Lazy loading mode'),
|
|
113
|
+
cacheMaxEntries: z.number().int().min(0).optional().describe('Maximum tool schemas to cache'),
|
|
114
|
+
inlineCatalog: z.boolean().optional().describe('Include full tool catalog in initialize template'),
|
|
115
|
+
})
|
|
116
|
+
.optional(),
|
|
117
|
+
configReload: z
|
|
118
|
+
.object({
|
|
119
|
+
enabled: z.boolean().optional().describe('Enable automatic configuration hot-reload'),
|
|
120
|
+
debounce: z.number().int().min(0).optional().describe('Debounce delay in milliseconds'),
|
|
121
|
+
})
|
|
122
|
+
.optional(),
|
|
123
|
+
});
|
|
124
|
+
/**
|
|
125
|
+
* Keys allowed in the global MCP configuration section
|
|
126
|
+
*/
|
|
127
|
+
export const GLOBAL_TRANSPORT_CONFIG_KEYS = [
|
|
128
|
+
'env',
|
|
129
|
+
'timeout',
|
|
130
|
+
'connectionTimeout',
|
|
131
|
+
'requestTimeout',
|
|
132
|
+
'oauth',
|
|
133
|
+
'headers',
|
|
134
|
+
'inheritParentEnv',
|
|
135
|
+
'envFilter',
|
|
136
|
+
];
|
|
137
|
+
/**
|
|
138
|
+
* Zod schema for global MCP configuration
|
|
139
|
+
* Only includes shareable settings that can be inherited by servers.
|
|
140
|
+
*/
|
|
141
|
+
export const globalTransportConfigSchema = transportConfigSchema.pick({
|
|
142
|
+
env: true,
|
|
143
|
+
timeout: true,
|
|
144
|
+
connectionTimeout: true,
|
|
145
|
+
requestTimeout: true,
|
|
146
|
+
oauth: true,
|
|
147
|
+
headers: true,
|
|
148
|
+
inheritParentEnv: true,
|
|
149
|
+
envFilter: true,
|
|
150
|
+
});
|
|
79
151
|
/**
|
|
80
152
|
* Zod schema for template settings
|
|
81
153
|
*/
|
|
@@ -92,6 +164,9 @@ export const templateSettingsSchema = z.object({
|
|
|
92
164
|
*/
|
|
93
165
|
export const mcpServerConfigSchema = z.object({
|
|
94
166
|
version: z.string().optional().describe('Version of the configuration format for migration purposes'),
|
|
167
|
+
serverDefaults: globalTransportConfigSchema
|
|
168
|
+
.optional()
|
|
169
|
+
.describe('Shareable defaults inherited by all MCP servers (transport settings only)'),
|
|
95
170
|
mcpServers: z
|
|
96
171
|
.record(z.string(), transportConfigSchema)
|
|
97
172
|
.describe('Static server configurations (no template processing)'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/core/types/transport.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/core/types/transport.ts"],"names":[],"mappings":"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"}
|
package/build/globalOptions.d.ts
CHANGED
|
@@ -22,6 +22,11 @@ export declare const globalOptions: {
|
|
|
22
22
|
readonly type: "string";
|
|
23
23
|
readonly default: undefined;
|
|
24
24
|
};
|
|
25
|
+
readonly 'cli-session-cache-path': {
|
|
26
|
+
readonly describe: "Path template for the run/inspect CLI session cache file, supports {pid} (env: ONE_MCP_CLI_SESSION_CACHE_PATH)";
|
|
27
|
+
readonly type: "string";
|
|
28
|
+
readonly default: undefined;
|
|
29
|
+
};
|
|
25
30
|
readonly 'log-level': {
|
|
26
31
|
readonly describe: "Set the log level (debug, info, warn, error) (env: ONE_MCP_LOG_LEVEL)";
|
|
27
32
|
readonly type: "string";
|
|
@@ -40,6 +45,7 @@ export declare const globalOptions: {
|
|
|
40
45
|
export interface GlobalOptions {
|
|
41
46
|
config?: string;
|
|
42
47
|
'config-dir'?: string;
|
|
48
|
+
'cli-session-cache-path'?: string;
|
|
43
49
|
'log-level'?: 'debug' | 'info' | 'warn' | 'error';
|
|
44
50
|
'log-file'?: string;
|
|
45
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalOptions.d.ts","sourceRoot":"","sources":["../src/globalOptions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"globalOptions.d.ts","sourceRoot":"","sources":["../src/globalOptions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BhB,CAAC;AAEX;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
package/build/globalOptions.js
CHANGED
|
@@ -22,6 +22,11 @@ export const globalOptions = {
|
|
|
22
22
|
type: 'string',
|
|
23
23
|
default: undefined,
|
|
24
24
|
},
|
|
25
|
+
'cli-session-cache-path': {
|
|
26
|
+
describe: 'Path template for the run/inspect CLI session cache file, supports {pid} (env: ONE_MCP_CLI_SESSION_CACHE_PATH)',
|
|
27
|
+
type: 'string',
|
|
28
|
+
default: undefined,
|
|
29
|
+
},
|
|
25
30
|
'log-level': {
|
|
26
31
|
describe: 'Set the log level (debug, info, warn, error) (env: ONE_MCP_LOG_LEVEL)',
|
|
27
32
|
type: 'string',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalOptions.js","sourceRoot":"","sources":["../src/globalOptions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,MAAM,EAAE;QACN,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,+CAA+C;QACzD,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;IACD,YAAY,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wDAAwD;QAClE,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,uEAAuE;QACjF,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU;QACpD,OAAO,EAAE,SAAS;KACnB;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,qEAAqE;QAC/E,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;CACO,CAAC"}
|
|
1
|
+
{"version":3,"file":"globalOptions.js","sourceRoot":"","sources":["../src/globalOptions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,MAAM,EAAE;QACN,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,+CAA+C;QACzD,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;IACD,YAAY,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wDAAwD;QAClE,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;IACD,wBAAwB,EAAE;QACxB,QAAQ,EACN,gHAAgH;QAClH,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,uEAAuE;QACjF,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU;QACpD,OAAO,EAAE,SAAS;KACnB;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,qEAAqE;QAC/E,IAAI,EAAE,QAAiB;QACvB,OAAO,EAAE,SAAS;KACnB;CACO,CAAC"}
|
package/build/index.d.ts
CHANGED
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAEpF,OAAO,gCAAgC,CAAC;AAgBxC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -2,18 +2,24 @@
|
|
|
2
2
|
import { MCP_SERVER_VERSION } from './constants.js';
|
|
3
3
|
import { globalOptions } from './globalOptions.js';
|
|
4
4
|
import logger from './logger/logger.js';
|
|
5
|
+
import { normalizeCliArgv, normalizedArgv } from './utils/cli/normalizedArgv.js';
|
|
5
6
|
import 'source-map-support/register.js';
|
|
6
7
|
import yargs from 'yargs';
|
|
7
|
-
import { hideBin } from 'yargs/helpers';
|
|
8
8
|
import { setupAppCommands } from './commands/app/index.js';
|
|
9
|
+
import { setupAuthCommands } from './commands/auth/index.js';
|
|
10
|
+
import { setupCliSetupCommand } from './commands/cliSetup/index.js';
|
|
11
|
+
import { setupInspectCommand } from './commands/inspect/index.js';
|
|
12
|
+
import { setupInstructionsCommand } from './commands/instructions/index.js';
|
|
9
13
|
import { setupMcpCommands } from './commands/mcp/index.js';
|
|
10
14
|
import { setupPresetCommands } from './commands/preset/index.js';
|
|
11
15
|
import { setupProxyCommand } from './commands/proxy/index.js';
|
|
12
16
|
import { setupRegistryCommands } from './commands/registry/index.js';
|
|
17
|
+
import { setupRunCommand } from './commands/run/index.js';
|
|
13
18
|
import { serverOptions, setupServeCommand } from './commands/serve/index.js';
|
|
14
19
|
import { configureGlobalLogger } from './logger/configureGlobalLogger.js';
|
|
20
|
+
export { normalizeCliArgv, normalizedArgv };
|
|
15
21
|
// Parse command line arguments and set up commands
|
|
16
|
-
let yargsInstance = yargs(
|
|
22
|
+
let yargsInstance = yargs(normalizedArgv);
|
|
17
23
|
// Set up base yargs with global options
|
|
18
24
|
yargsInstance = yargsInstance
|
|
19
25
|
.usage('Usage: $0 [command] [options]')
|
|
@@ -42,10 +48,15 @@ yargsInstance = yargsInstance
|
|
|
42
48
|
});
|
|
43
49
|
// Register command groups with global options
|
|
44
50
|
yargsInstance = setupAppCommands(yargsInstance);
|
|
51
|
+
yargsInstance = setupAuthCommands(yargsInstance);
|
|
52
|
+
yargsInstance = setupCliSetupCommand(yargsInstance);
|
|
53
|
+
yargsInstance = setupInstructionsCommand(yargsInstance);
|
|
45
54
|
yargsInstance = setupMcpCommands(yargsInstance);
|
|
46
55
|
yargsInstance = setupPresetCommands(yargsInstance);
|
|
47
56
|
yargsInstance = setupServeCommand(yargsInstance);
|
|
48
57
|
yargsInstance = setupProxyCommand(yargsInstance);
|
|
58
|
+
yargsInstance = setupInspectCommand(yargsInstance);
|
|
59
|
+
yargsInstance = setupRunCommand(yargsInstance);
|
|
49
60
|
yargsInstance = setupRegistryCommands(yargsInstance);
|
|
50
61
|
/**
|
|
51
62
|
* Check for conflicting global options (options specified both before and after the command)
|
|
@@ -56,7 +67,16 @@ function checkGlobalOptionConflicts(argv) {
|
|
|
56
67
|
.map((opt) => ('alias' in opt ? opt.alias : null))
|
|
57
68
|
.filter(Boolean);
|
|
58
69
|
const allGlobalOptions = [...globalOptionNames, ...globalOptionAliases];
|
|
59
|
-
const commandIndex = argv.findIndex((arg) => arg === 'app' ||
|
|
70
|
+
const commandIndex = argv.findIndex((arg) => arg === 'app' ||
|
|
71
|
+
arg === 'auth' ||
|
|
72
|
+
arg === 'cli-setup' ||
|
|
73
|
+
arg === 'instructions' ||
|
|
74
|
+
arg === 'mcp' ||
|
|
75
|
+
arg === 'preset' ||
|
|
76
|
+
arg === 'serve' ||
|
|
77
|
+
arg === 'proxy' ||
|
|
78
|
+
arg === 'inspect' ||
|
|
79
|
+
arg === 'run');
|
|
60
80
|
if (commandIndex === -1)
|
|
61
81
|
return;
|
|
62
82
|
const beforeCommandArgs = argv.slice(0, commandIndex);
|
|
@@ -94,7 +114,7 @@ function checkGlobalOptionConflicts(argv) {
|
|
|
94
114
|
*/
|
|
95
115
|
async function main() {
|
|
96
116
|
// Check for global option conflicts before parsing
|
|
97
|
-
checkGlobalOptionConflicts(
|
|
117
|
+
checkGlobalOptionConflicts(['node', 'cli', ...normalizedArgv]);
|
|
98
118
|
// Let yargs handle all command processing
|
|
99
119
|
await yargsInstance.parse();
|
|
100
120
|
}
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAiB,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,MAAM,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ServerManager } from '../../../core/server/serverManager.js';
|
|
2
|
+
import { RequestHandler, Router } from 'express';
|
|
3
|
+
export type { InspectServerPayload, InspectServersPayload, InspectToolPayload, ServerSummary, } from './inspectRoutes.js';
|
|
4
|
+
export { buildFilterConfig, createInspectHandler, createServersHandler, matchesFilterConfig, parseTarget, resolveConnectionByServerName, } from './inspectRoutes.js';
|
|
5
|
+
export { createToolInvocationsHandler, createToolsHandler } from './toolRoutes.js';
|
|
6
|
+
export { createCliTokenRoute } from './cliTokenRoute.js';
|
|
7
|
+
export type { SDKOAuthServerProvider } from '../../../auth/sdkOAuthServerProvider.js';
|
|
8
|
+
export declare function createApiRoutes(serverManager: ServerManager, scopeAuthMiddleware: RequestHandler): Router;
|
|
9
|
+
export default createApiRoutes;
|
|
10
|
+
//# sourceMappingURL=apiRoutes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apiRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/apiRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAMjD,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,aAAa,GACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,WAAW,EACX,6BAA6B,GAC9B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAIlF,wBAAgB,eAAe,CAAC,aAAa,EAAE,aAAa,EAAE,mBAAmB,EAAE,cAAc,GAAG,MAAM,CASzG;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import tagsExtractor from '../../../transport/http/middlewares/tagsExtractor.js';
|
|
2
|
+
import { Router } from 'express';
|
|
3
|
+
import { createInspectHandler, createServersHandler } from './inspectRoutes.js';
|
|
4
|
+
import { createToolInvocationsHandler, createToolsHandler } from './toolRoutes.js';
|
|
5
|
+
export { buildFilterConfig, createInspectHandler, createServersHandler, matchesFilterConfig, parseTarget, resolveConnectionByServerName, } from './inspectRoutes.js';
|
|
6
|
+
export { createToolInvocationsHandler, createToolsHandler } from './toolRoutes.js';
|
|
7
|
+
export { createCliTokenRoute } from './cliTokenRoute.js';
|
|
8
|
+
// ---- Route factory ----
|
|
9
|
+
export function createApiRoutes(serverManager, scopeAuthMiddleware) {
|
|
10
|
+
const router = Router();
|
|
11
|
+
router.get('/inspect', tagsExtractor, scopeAuthMiddleware, createInspectHandler(serverManager));
|
|
12
|
+
router.get('/servers', tagsExtractor, scopeAuthMiddleware, createServersHandler(serverManager));
|
|
13
|
+
router.get('/tools', tagsExtractor, scopeAuthMiddleware, createToolsHandler(serverManager));
|
|
14
|
+
router.post('/tool-invocations', tagsExtractor, scopeAuthMiddleware, createToolInvocationsHandler(serverManager));
|
|
15
|
+
return router;
|
|
16
|
+
}
|
|
17
|
+
export default createApiRoutes;
|
|
18
|
+
//# sourceMappingURL=apiRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apiRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/apiRoutes.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,kDAAkD,CAAC;AAE7E,OAAO,EAAkB,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AASnF,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,WAAW,EACX,6BAA6B,GAC9B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAGzD,0BAA0B;AAE1B,MAAM,UAAU,eAAe,CAAC,aAA4B,EAAE,mBAAmC;IAC/F,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC;IAChG,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC;IAChG,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC;IAC5F,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,aAAa,EAAE,mBAAmB,EAAE,4BAA4B,CAAC,aAAa,CAAC,CAAC,CAAC;IAElH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliTokenRoute.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/cliTokenRoute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAO7E,OAAO,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AAE5D,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,sBAAsB,GAAG,cAAc,CAmCzF"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { McpConfigManager } from '../../../config/mcpConfigManager.js';
|
|
3
|
+
import { AUTH_CONFIG } from '../../../constants.js';
|
|
4
|
+
import { AgentConfigManager } from '../../../core/server/agentConfig.js';
|
|
5
|
+
import logger from '../../../logger/logger.js';
|
|
6
|
+
import { tagsToScopes } from '../../../utils/validation/scopeValidation.js';
|
|
7
|
+
export function createCliTokenRoute(oauthProvider) {
|
|
8
|
+
return async (req, res) => {
|
|
9
|
+
// Must use socket address (not req.ip) to prevent X-Forwarded-For spoofing
|
|
10
|
+
const remoteAddr = req.socket.remoteAddress;
|
|
11
|
+
const isLocalhost = remoteAddr === '127.0.0.1' || remoteAddr === '::1' || remoteAddr === '::ffff:127.0.0.1';
|
|
12
|
+
if (!isLocalhost) {
|
|
13
|
+
res.status(403).json({ error: 'This endpoint is only available from localhost' });
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
const agentConfig = AgentConfigManager.getInstance();
|
|
17
|
+
if (!agentConfig.get('features').auth) {
|
|
18
|
+
res.json({ authRequired: false, message: 'Auth is disabled on this server' });
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const tokenId = randomUUID();
|
|
22
|
+
const accessToken = AUTH_CONFIG.SERVER.TOKEN.ID_PREFIX + tokenId;
|
|
23
|
+
const ttlMs = agentConfig.get('auth').oauthTokenTtlMs;
|
|
24
|
+
const mcpConfig = McpConfigManager.getInstance();
|
|
25
|
+
const allScopes = tagsToScopes(mcpConfig.getAvailableTags());
|
|
26
|
+
oauthProvider.oauthStorage.sessionRepository.createWithId(tokenId, 'cli', '', allScopes, ttlMs);
|
|
27
|
+
logger.info('CLI token generated for localhost', { tokenId: tokenId.substring(0, 8) + '...' });
|
|
28
|
+
res.json({
|
|
29
|
+
authRequired: true,
|
|
30
|
+
token: accessToken,
|
|
31
|
+
expiresIn: Math.floor(ttlMs / 1000),
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=cliTokenRoute.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliTokenRoute.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/cliTokenRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAIxE,MAAM,UAAU,mBAAmB,CAAC,aAAqC;IACvE,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;QAC1D,2EAA2E;QAC3E,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;QAC5C,MAAM,WAAW,GAAG,UAAU,KAAK,WAAW,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,kBAAkB,CAAC;QAE5G,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAC,CAAC;YAClF,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAErD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC,CAAC;YAC9E,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC;QACjE,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC;QAEtD,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAE7D,aAAa,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAEhG,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;QAE/F,GAAG,CAAC,IAAI,CAAC;YACP,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,WAAW;YAClB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;SACpC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|