@1mcp/agent 0.31.0-beta1 → 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/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/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/baseConfigUtils.d.ts +15 -1
- package/build/commands/shared/baseConfigUtils.d.ts.map +1 -1
- package/build/commands/shared/baseConfigUtils.js +146 -41
- package/build/commands/shared/baseConfigUtils.js.map +1 -1
- 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 +2 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +20 -4
- 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/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/tools/handlers/serverManagementHandler.d.ts +5 -0
- 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/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/index.d.ts +2 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +4 -3
- package/build/index.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/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +2 -1
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +4 -3
|
@@ -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/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,9 +2,9 @@
|
|
|
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
9
|
import { setupAuthCommands } from './commands/auth/index.js';
|
|
10
10
|
import { setupCliSetupCommand } from './commands/cliSetup/index.js';
|
|
@@ -17,8 +17,9 @@ import { setupRegistryCommands } from './commands/registry/index.js';
|
|
|
17
17
|
import { setupRunCommand } from './commands/run/index.js';
|
|
18
18
|
import { serverOptions, setupServeCommand } from './commands/serve/index.js';
|
|
19
19
|
import { configureGlobalLogger } from './logger/configureGlobalLogger.js';
|
|
20
|
+
export { normalizeCliArgv, normalizedArgv };
|
|
20
21
|
// Parse command line arguments and set up commands
|
|
21
|
-
let yargsInstance = yargs(
|
|
22
|
+
let yargsInstance = yargs(normalizedArgv);
|
|
22
23
|
// Set up base yargs with global options
|
|
23
24
|
yargsInstance = yargsInstance
|
|
24
25
|
.usage('Usage: $0 [command] [options]')
|
|
@@ -113,7 +114,7 @@ function checkGlobalOptionConflicts(argv) {
|
|
|
113
114
|
*/
|
|
114
115
|
async function main() {
|
|
115
116
|
// Check for global option conflicts before parsing
|
|
116
|
-
checkGlobalOptionConflicts(
|
|
117
|
+
checkGlobalOptionConflicts(['node', 'cli', ...normalizedArgv]);
|
|
117
118
|
// Let yargs handle all command processing
|
|
118
119
|
await yargsInstance.parse();
|
|
119
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 @@
|
|
|
1
|
+
{"version":3,"file":"normalizedArgv.d.ts","sourceRoot":"","sources":["../../../src/utils/cli/normalizedArgv.ts"],"names":[],"mappings":"AAEA,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAMzD;AAED,eAAO,MAAM,cAAc,UAA0C,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { hideBin } from 'yargs/helpers';
|
|
2
|
+
export function normalizeCliArgv(argv) {
|
|
3
|
+
if (argv[0] === '--') {
|
|
4
|
+
return argv.slice(1);
|
|
5
|
+
}
|
|
6
|
+
return argv;
|
|
7
|
+
}
|
|
8
|
+
export const normalizedArgv = normalizeCliArgv(hideBin(process.argv));
|
|
9
|
+
//# sourceMappingURL=normalizedArgv.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizedArgv.js","sourceRoot":"","sources":["../../../src/utils/cli/normalizedArgv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC7C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlDetection.d.ts","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"urlDetection.d.ts","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AAEH;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAiB7C;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiBrE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAShD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAerF;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAe3D;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiCjF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOhF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA6BD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getConfigDir } from '../../constants.js';
|
|
2
2
|
import { cleanupPidFile, readPidFile } from '../../core/server/pidFileManager.js';
|
|
3
3
|
import { createSafeErrorMessage } from '../../logger/secureLogger.js';
|
|
4
|
+
import { normalizedArgv } from '../../utils/cli/normalizedArgv.js';
|
|
4
5
|
/**
|
|
5
6
|
* Multi-method URL detection system for app commands.
|
|
6
7
|
*
|
|
@@ -12,7 +13,7 @@ import { createSafeErrorMessage } from '../../logger/secureLogger.js';
|
|
|
12
13
|
* Method 1: Detect URL from CLI arguments (highest priority)
|
|
13
14
|
*/
|
|
14
15
|
export function detectUrlFromCliArgs() {
|
|
15
|
-
const args =
|
|
16
|
+
const args = normalizedArgv;
|
|
16
17
|
// Parse external-url flag
|
|
17
18
|
const externalUrlIndex = args.findIndex((arg) => arg === '--external-url' || arg === '-u');
|
|
18
19
|
if (externalUrlIndex !== -1 && args[externalUrlIndex + 1]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlDetection.js","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"urlDetection.js","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@1mcp/agent",
|
|
3
|
-
"version": "0.31.0-
|
|
3
|
+
"version": "0.31.0-beta2",
|
|
4
4
|
"description": "One MCP server to aggregate them all - A unified Model Context Protocol server implementation",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mcp",
|
|
@@ -71,6 +71,7 @@
|
|
|
71
71
|
"ora": "^9.0.0",
|
|
72
72
|
"prompts": "^2.4.2",
|
|
73
73
|
"semver": "^7.7.3",
|
|
74
|
+
"smol-toml": "^1.6.0",
|
|
74
75
|
"source-map-support": "^0.5.21",
|
|
75
76
|
"tiktoken": "^1.0.22",
|
|
76
77
|
"uuid": "^13.0.0",
|
|
@@ -92,7 +93,7 @@
|
|
|
92
93
|
"@types/node": "^25.5.0",
|
|
93
94
|
"@types/prompts": "^2.4.9",
|
|
94
95
|
"@types/semver": "^7.7.1",
|
|
95
|
-
"@types/supertest": "^
|
|
96
|
+
"@types/supertest": "^7.2.0",
|
|
96
97
|
"@types/yargs": "^17.0.33",
|
|
97
98
|
"@typescript-eslint/eslint-plugin": "^8.27.0",
|
|
98
99
|
"@typescript-eslint/parser": "^8.27.0",
|
|
@@ -103,7 +104,7 @@
|
|
|
103
104
|
"cytoscape-cose-bilkent": "^4.1.0",
|
|
104
105
|
"dayjs": "^1.11.13",
|
|
105
106
|
"debug": "^4.4.1",
|
|
106
|
-
"esbuild": "^0.
|
|
107
|
+
"esbuild": "^0.28.0",
|
|
107
108
|
"eslint": "^9.22.0",
|
|
108
109
|
"eslint-config-prettier": "^10.1.1",
|
|
109
110
|
"eslint-plugin-prettier": "^5.2.3",
|