@1mcp/agent 0.39.2 → 0.39.3

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.
Files changed (32) hide show
  1. package/build/admin/assets/admin-OAuthServicesWorkspace-BN-YviL_.js +1 -0
  2. package/build/admin/assets/admin-console-Cg5G_AjF.js +3 -0
  3. package/build/admin/index.html +1 -1
  4. package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
  5. package/build/auth/oauthAuthorizationFlow.js +23 -2
  6. package/build/auth/oauthAuthorizationFlow.js.map +1 -1
  7. package/build/auth/oauthDiagnostics.d.ts +29 -0
  8. package/build/auth/oauthDiagnostics.d.ts.map +1 -0
  9. package/build/auth/oauthDiagnostics.js +44 -0
  10. package/build/auth/oauthDiagnostics.js.map +1 -0
  11. package/build/auth/oauthEndpointFetch.d.ts +2 -0
  12. package/build/auth/oauthEndpointFetch.d.ts.map +1 -1
  13. package/build/auth/oauthEndpointFetch.js +40 -2
  14. package/build/auth/oauthEndpointFetch.js.map +1 -1
  15. package/build/constants/mcp.d.ts +1 -1
  16. package/build/constants/mcp.js +1 -1
  17. package/build/core/server/runtimeLaunchIpc.d.ts +10 -10
  18. package/build/core/server/runtimeReplacementConfig.d.ts +10 -10
  19. package/build/core/types/transport.d.ts +20 -20
  20. package/build/domains/admin/adminOAuthService.d.ts.map +1 -1
  21. package/build/domains/admin/adminOAuthService.js +8 -6
  22. package/build/domains/admin/adminOAuthService.js.map +1 -1
  23. package/build/sdk/legacy/auth/sdkOAuthClientProvider.d.ts +2 -1
  24. package/build/sdk/legacy/auth/sdkOAuthClientProvider.d.ts.map +1 -1
  25. package/build/sdk/legacy/auth/sdkOAuthClientProvider.js +81 -18
  26. package/build/sdk/legacy/auth/sdkOAuthClientProvider.js.map +1 -1
  27. package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
  28. package/build/transport/http/routes/adminRoutes.js +10 -2
  29. package/build/transport/http/routes/adminRoutes.js.map +1 -1
  30. package/package.json +2 -2
  31. package/build/admin/assets/admin-OAuthServicesWorkspace-l3f4X7ks.js +0 -1
  32. package/build/admin/assets/admin-console-MrctqWR_.js +0 -3
@@ -1 +1 @@
1
- {"version":3,"file":"oauthEndpointFetch.d.ts","sourceRoot":"","sources":["../../src/auth/oauthEndpointFetch.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAChD,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CA2B9D;AAaD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,MAAM,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,gBAAgB,CAAC,EAAE,MAAM,GACxB,GAAG,CAcL;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACrE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,SAAS,EAAE,CAAC,eAAe,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9C,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IAChF,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpG,GAAG,OAAO,KAAK,CA6Kf"}
1
+ {"version":3,"file":"oauthEndpointFetch.d.ts","sourceRoot":"","sources":["../../src/auth/oauthEndpointFetch.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAChD,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CA2B9D;AAaD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,MAAM,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,gBAAgB,CAAC,EAAE,MAAM,GACxB,GAAG,CAcL;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACrE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,SAAS,EAAE,CAAC,eAAe,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9C,YAAY,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IAChF,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpG,GAAG,OAAO,KAAK,CA4Mf"}
@@ -3,7 +3,10 @@ import http from 'node:http';
3
3
  import https from 'node:https';
4
4
  import { isIP } from 'node:net';
5
5
  import { Readable, Transform } from 'node:stream';
6
+ import { MCP_SERVER_VERSION } from '../constants.js';
7
+ import { writeLocalDiagnostic } from '../logger/localDiagnostics.js';
6
8
  import { oauthAuthorityError } from './oauthAuthority.js';
9
+ import { oauthDiagnosticMessage, readOAuthDiagnostic } from './oauthDiagnostics.js';
7
10
  export const OAUTH_RESPONSE_LIMIT = 1024 * 1024;
8
11
  export const OAUTH_FETCH_TIMEOUT_MS = 10_000;
9
12
  export class OAuthResourceRedirectError extends Error {
@@ -73,6 +76,19 @@ export function validateOAuthEndpoint(value, configuredResource, expectedOrigin,
73
76
  export function createOAuthEndpointFetch(options) {
74
77
  return async (input, init) => {
75
78
  let resourceRequest = false;
79
+ let reason = 'authority_mismatch';
80
+ let httpStatus;
81
+ const report = () => {
82
+ const message = oauthDiagnosticMessage(reason, httpStatus);
83
+ try {
84
+ options.onDiagnostic?.(resourceRequest, message);
85
+ writeLocalDiagnostic('warn', 'oauth.endpoint.failed', { ...readOAuthDiagnostic(message) });
86
+ }
87
+ catch {
88
+ // Diagnostic reporting must not change authorization outcomes.
89
+ }
90
+ return message;
91
+ };
76
92
  try {
77
93
  const request = input instanceof Request ? input : undefined;
78
94
  const target = new URL(request?.url ?? String(input));
@@ -95,6 +111,7 @@ export function createOAuthEndpointFetch(options) {
95
111
  : init;
96
112
  const safeInit = await options.beforeRequest(url, { ...inputInit, signal: isResource ? signal : boundedSignal });
97
113
  const hostname = url.hostname.replace(/^\[|\]$/g, '');
114
+ reason = 'network_failure';
98
115
  const addresses = isIP(hostname)
99
116
  ? [{ address: hostname, family: isIP(hostname) }]
100
117
  : await Promise.race([
@@ -102,6 +119,7 @@ export function createOAuthEndpointFetch(options) {
102
119
  new Promise((_resolve, reject) => boundedSignal.addEventListener('abort', () => reject(oauthAuthorityError()), { once: true })),
103
120
  ]);
104
121
  const localException = isResource || isConfiguredLocalOrigin(url, options.resource, options.issuer);
122
+ reason = 'authority_mismatch';
105
123
  if (!addresses.length || (!localException && addresses.some((item) => isPrivateOAuthAddress(item.address))))
106
124
  throw oauthAuthorityError();
107
125
  const resolved = addresses
@@ -112,9 +130,12 @@ export function createOAuthEndpointFetch(options) {
112
130
  if (boundedSignal.aborted)
113
131
  throw oauthAuthorityError();
114
132
  const headers = new Headers(safeInit.headers);
133
+ if (!headers.has('user-agent'))
134
+ headers.set('user-agent', `1mcp/${MCP_SERVER_VERSION}`);
115
135
  const body = safeInit.body;
116
136
  if (body !== undefined && body !== null && typeof body !== 'string' && !(body instanceof URLSearchParams))
117
137
  throw oauthAuthorityError();
138
+ reason = 'network_failure';
118
139
  const response = await new Promise((resolve, reject) => {
119
140
  const outgoing = (url.protocol === 'https:' ? https : http).request(url, {
120
141
  family: addresses[0].family,
@@ -135,6 +156,7 @@ export function createOAuthEndpointFetch(options) {
135
156
  });
136
157
  const status = response.statusCode ?? 500;
137
158
  if (status >= 300 && status < 400) {
159
+ reason = 'authority_mismatch';
138
160
  response.destroy();
139
161
  if (isResource)
140
162
  throw new OAuthResourceRedirectError();
@@ -204,10 +226,18 @@ export function createOAuthEndpointFetch(options) {
204
226
  }
205
227
  let text = Buffer.concat(chunks).toString('utf8');
206
228
  if (status >= 200 && status < 300 && (safeInit.method ?? 'GET') === 'GET') {
229
+ reason = 'invalid_metadata';
207
230
  const value = JSON.parse(text);
208
231
  if (!value || typeof value !== 'object' || Array.isArray(value))
209
232
  throw oauthAuthorityError();
210
- text = JSON.stringify(options.metadata(value, url, safeInit));
233
+ try {
234
+ text = JSON.stringify(options.metadata(value, url, safeInit));
235
+ }
236
+ catch (error) {
237
+ if (error instanceof Error && error.message === oauthAuthorityError().message)
238
+ reason = 'authority_mismatch';
239
+ throw error;
240
+ }
211
241
  }
212
242
  if (status >= 200 && status < 300 && (safeInit.method ?? 'GET') === 'POST') {
213
243
  const value = JSON.parse(text);
@@ -217,6 +247,12 @@ export function createOAuthEndpointFetch(options) {
217
247
  }
218
248
  // Provider error descriptions are untrusted and may echo secrets.
219
249
  if (status >= 400) {
250
+ if ((safeInit.method ?? 'GET') === 'GET') {
251
+ reason = 'metadata_http_error';
252
+ httpStatus = status;
253
+ report();
254
+ }
255
+ options.validateResponseStatus?.(status, safeInit);
220
256
  let code = 'server_error';
221
257
  try {
222
258
  const value = JSON.parse(text);
@@ -236,10 +272,12 @@ export function createOAuthEndpointFetch(options) {
236
272
  return new Response(status === 204 || status === 205 ? null : text, { status, headers: responseHeaders });
237
273
  }
238
274
  catch (error) {
275
+ const retained = error instanceof Error ? readOAuthDiagnostic(error.message) : undefined;
276
+ const message = retained ? oauthDiagnosticMessage(retained.reason, retained.httpStatus) : report();
239
277
  options.onFailure(resourceRequest);
240
278
  if (error instanceof OAuthResourceRedirectError)
241
279
  throw error;
242
- throw oauthAuthorityError();
280
+ throw new Error(message);
243
281
  }
244
282
  };
245
283
  }
@@ -1 +1 @@
1
- {"version":3,"file":"oauthEndpointFetch.js","sourceRoot":"","sources":["../../src/auth/oauthEndpointFetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauthEndpointFetch.js","sourceRoot":"","sources":["../../src/auth/oauthEndpointFetch.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
6
6
  export declare const APP_CONFIG_FILE = "config.toml";
7
7
  export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
8
8
  export declare const MCP_SERVER_NAME = "1mcp";
9
- export declare const MCP_SERVER_VERSION = "0.39.2";
9
+ export declare const MCP_SERVER_VERSION = "0.39.3";
10
10
  export declare const MCP_PROJECT_METADATA: {
11
11
  readonly repository: "https://github.com/1mcp-app/agent";
12
12
  readonly documentation: "https://docs.1mcp.app";
@@ -3,7 +3,7 @@ export const MCP_CONFIG_FILE = 'mcp.json';
3
3
  export const APP_CONFIG_FILE = 'config.toml';
4
4
  export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
5
5
  export const MCP_SERVER_NAME = '1mcp';
6
- export const MCP_SERVER_VERSION = '0.39.2';
6
+ export const MCP_SERVER_VERSION = '0.39.3';
7
7
  // Compiled with every artifact so Admin Console metadata does not depend on
8
8
  // package.json being adjacent to the runtime entrypoint.
9
9
  export const MCP_PROJECT_METADATA = {
@@ -12,16 +12,6 @@ export declare const launchBootstrapSchema: z.ZodObject<{
12
12
  mcpConfig: z.ZodObject<{
13
13
  version: z.ZodOptional<z.ZodString>;
14
14
  serverDefaults: z.ZodOptional<z.ZodObject<{
15
- headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
16
- timeout: z.ZodOptional<z.ZodNumber>;
17
- env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
18
- inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
19
- envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
20
- restartOnExit: z.ZodOptional<z.ZodBoolean>;
21
- maxRestarts: z.ZodOptional<z.ZodNumber>;
22
- restartDelay: z.ZodOptional<z.ZodNumber>;
23
- connectionTimeout: z.ZodOptional<z.ZodNumber>;
24
- requestTimeout: z.ZodOptional<z.ZodNumber>;
25
15
  oauth: z.ZodOptional<z.ZodObject<{
26
16
  issuer: z.ZodOptional<z.ZodURL>;
27
17
  clientMetadataUrl: z.ZodOptional<z.ZodURL>;
@@ -32,6 +22,16 @@ export declare const launchBootstrapSchema: z.ZodObject<{
32
22
  autoRegister: z.ZodOptional<z.ZodBoolean>;
33
23
  redirectUrl: z.ZodOptional<z.ZodString>;
34
24
  }, z.core.$strip>>;
25
+ headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
26
+ timeout: z.ZodOptional<z.ZodNumber>;
27
+ env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
28
+ inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
29
+ envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
30
+ restartOnExit: z.ZodOptional<z.ZodBoolean>;
31
+ maxRestarts: z.ZodOptional<z.ZodNumber>;
32
+ restartDelay: z.ZodOptional<z.ZodNumber>;
33
+ connectionTimeout: z.ZodOptional<z.ZodNumber>;
34
+ requestTimeout: z.ZodOptional<z.ZodNumber>;
35
35
  }, z.core.$strip>>;
36
36
  mcpServers: z.ZodRecord<z.ZodString, z.ZodObject<{
37
37
  type: z.ZodOptional<z.ZodEnum<{
@@ -14,16 +14,6 @@ export declare const runtimeReplacementSnapshotSchema: z.ZodObject<{
14
14
  mcpConfig: z.ZodObject<{
15
15
  version: z.ZodOptional<z.ZodString>;
16
16
  serverDefaults: z.ZodOptional<z.ZodObject<{
17
- headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
18
- timeout: z.ZodOptional<z.ZodNumber>;
19
- env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
20
- inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
21
- envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
22
- restartOnExit: z.ZodOptional<z.ZodBoolean>;
23
- maxRestarts: z.ZodOptional<z.ZodNumber>;
24
- restartDelay: z.ZodOptional<z.ZodNumber>;
25
- connectionTimeout: z.ZodOptional<z.ZodNumber>;
26
- requestTimeout: z.ZodOptional<z.ZodNumber>;
27
17
  oauth: z.ZodOptional<z.ZodObject<{
28
18
  issuer: z.ZodOptional<z.ZodURL>;
29
19
  clientMetadataUrl: z.ZodOptional<z.ZodURL>;
@@ -34,6 +24,16 @@ export declare const runtimeReplacementSnapshotSchema: z.ZodObject<{
34
24
  autoRegister: z.ZodOptional<z.ZodBoolean>;
35
25
  redirectUrl: z.ZodOptional<z.ZodString>;
36
26
  }, z.core.$strip>>;
27
+ headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
28
+ timeout: z.ZodOptional<z.ZodNumber>;
29
+ env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
30
+ inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
31
+ envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
32
+ restartOnExit: z.ZodOptional<z.ZodBoolean>;
33
+ maxRestarts: z.ZodOptional<z.ZodNumber>;
34
+ restartDelay: z.ZodOptional<z.ZodNumber>;
35
+ connectionTimeout: z.ZodOptional<z.ZodNumber>;
36
+ requestTimeout: z.ZodOptional<z.ZodNumber>;
37
37
  }, z.core.$strip>>;
38
38
  mcpServers: z.ZodRecord<z.ZodString, z.ZodObject<{
39
39
  type: z.ZodOptional<z.ZodEnum<{
@@ -415,16 +415,6 @@ export declare const GLOBAL_TRANSPORT_CONFIG_KEYS: readonly ["env", "timeout", "
415
415
  * Only includes shareable settings that can be inherited by servers.
416
416
  */
417
417
  export declare const globalTransportConfigSchema: z.ZodObject<{
418
- headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
419
- timeout: z.ZodOptional<z.ZodNumber>;
420
- env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
421
- inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
422
- envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
423
- restartOnExit: z.ZodOptional<z.ZodBoolean>;
424
- maxRestarts: z.ZodOptional<z.ZodNumber>;
425
- restartDelay: z.ZodOptional<z.ZodNumber>;
426
- connectionTimeout: z.ZodOptional<z.ZodNumber>;
427
- requestTimeout: z.ZodOptional<z.ZodNumber>;
428
418
  oauth: z.ZodOptional<z.ZodObject<{
429
419
  issuer: z.ZodOptional<z.ZodURL>;
430
420
  clientMetadataUrl: z.ZodOptional<z.ZodURL>;
@@ -435,6 +425,16 @@ export declare const globalTransportConfigSchema: z.ZodObject<{
435
425
  autoRegister: z.ZodOptional<z.ZodBoolean>;
436
426
  redirectUrl: z.ZodOptional<z.ZodString>;
437
427
  }, z.core.$strip>>;
428
+ headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
429
+ timeout: z.ZodOptional<z.ZodNumber>;
430
+ env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
431
+ inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
432
+ envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
433
+ restartOnExit: z.ZodOptional<z.ZodBoolean>;
434
+ maxRestarts: z.ZodOptional<z.ZodNumber>;
435
+ restartDelay: z.ZodOptional<z.ZodNumber>;
436
+ connectionTimeout: z.ZodOptional<z.ZodNumber>;
437
+ requestTimeout: z.ZodOptional<z.ZodNumber>;
438
438
  }, z.core.$strip>;
439
439
  /**
440
440
  * Union type for all transport configurations
@@ -521,16 +521,6 @@ export declare const instructionTemplateConfigSchema: z.ZodObject<{
521
521
  export declare const mcpServerConfigSchema: z.ZodObject<{
522
522
  version: z.ZodOptional<z.ZodString>;
523
523
  serverDefaults: z.ZodOptional<z.ZodObject<{
524
- headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
525
- timeout: z.ZodOptional<z.ZodNumber>;
526
- env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
527
- inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
528
- envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
529
- restartOnExit: z.ZodOptional<z.ZodBoolean>;
530
- maxRestarts: z.ZodOptional<z.ZodNumber>;
531
- restartDelay: z.ZodOptional<z.ZodNumber>;
532
- connectionTimeout: z.ZodOptional<z.ZodNumber>;
533
- requestTimeout: z.ZodOptional<z.ZodNumber>;
534
524
  oauth: z.ZodOptional<z.ZodObject<{
535
525
  issuer: z.ZodOptional<z.ZodURL>;
536
526
  clientMetadataUrl: z.ZodOptional<z.ZodURL>;
@@ -541,6 +531,16 @@ export declare const mcpServerConfigSchema: z.ZodObject<{
541
531
  autoRegister: z.ZodOptional<z.ZodBoolean>;
542
532
  redirectUrl: z.ZodOptional<z.ZodString>;
543
533
  }, z.core.$strip>>;
534
+ headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
535
+ timeout: z.ZodOptional<z.ZodNumber>;
536
+ env: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodArray<z.ZodString>]>>;
537
+ inheritParentEnv: z.ZodOptional<z.ZodBoolean>;
538
+ envFilter: z.ZodOptional<z.ZodArray<z.ZodString>>;
539
+ restartOnExit: z.ZodOptional<z.ZodBoolean>;
540
+ maxRestarts: z.ZodOptional<z.ZodNumber>;
541
+ restartDelay: z.ZodOptional<z.ZodNumber>;
542
+ connectionTimeout: z.ZodOptional<z.ZodNumber>;
543
+ requestTimeout: z.ZodOptional<z.ZodNumber>;
544
544
  }, z.core.$strip>>;
545
545
  mcpServers: z.ZodRecord<z.ZodString, z.ZodObject<{
546
546
  type: z.ZodOptional<z.ZodEnum<{
@@ -1 +1 @@
1
- {"version":3,"file":"adminOAuthService.d.ts","sourceRoot":"","sources":["../../../src/domains/admin/adminOAuthService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAElF,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAErH,UAAU,wBAAwB;IAChC,gBAAgB,EAAE,qBAAqB,CAAC;IACxC,SAAS,EAAE,sBAAsB,CAAC;CACnC;AAED,UAAU,wBAAwB;IAChC,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC3G,cAAc,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;CAC1G;AAED,qBAAa,iBAAkB,YAAW,oBAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,wBAAwB;IAExD,gBAAgB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;IAqC1G,cAAc,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;CAoC/G"}
1
+ {"version":3,"file":"adminOAuthService.d.ts","sourceRoot":"","sources":["../../../src/domains/admin/adminOAuthService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAGlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAErH,UAAU,wBAAwB;IAChC,gBAAgB,EAAE,qBAAqB,CAAC;IACxC,SAAS,EAAE,sBAAsB,CAAC;CACnC;AAED,UAAU,wBAAwB;IAChC,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC3G,cAAc,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;CAC1G;AAED,qBAAa,iBAAkB,YAAW,oBAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,wBAAwB;IAExD,gBAAgB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;IAuC1G,cAAc,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;CAuC/G"}
@@ -1,3 +1,4 @@
1
+ import { safeOAuthDiagnosticMessage } from '../../auth/oauthDiagnostics.js';
1
2
  export class AdminOAuthService {
2
3
  options;
3
4
  constructor(options) {
@@ -19,8 +20,8 @@ export class AdminOAuthService {
19
20
  ...(input.adminReturnOrigin ? { adminReturnOrigin: input.adminReturnOrigin } : {}),
20
21
  });
21
22
  }
22
- catch {
23
- throw new Error('backend_oauth_authorization_start_failed');
23
+ catch (error) {
24
+ throw new Error(safeOAuthDiagnosticMessage(error) ?? 'backend_oauth_authorization_start_failed');
24
25
  }
25
26
  if (result.status === 'service_not_found') {
26
27
  throw new Error('backend_oauth_service_not_found');
@@ -29,7 +30,7 @@ export class AdminOAuthService {
29
30
  throw new Error('backend_oauth_runtime_unavailable');
30
31
  }
31
32
  if (result.status !== 'redirect') {
32
- throw new Error('backend_oauth_authorization_start_failed');
33
+ throw new Error(safeOAuthDiagnosticMessage(result.errorDescription) ?? 'backend_oauth_authorization_start_failed');
33
34
  }
34
35
  return {
35
36
  serviceId: input.serviceId,
@@ -54,8 +55,8 @@ export class AdminOAuthService {
54
55
  ...(input.adminReturnOrigin ? { adminReturnOrigin: input.adminReturnOrigin } : {}),
55
56
  });
56
57
  }
57
- catch {
58
- throw new Error('backend_oauth_authorization_start_failed');
58
+ catch (error) {
59
+ throw new Error(safeOAuthDiagnosticMessage(error) ?? 'backend_oauth_authorization_start_failed');
59
60
  }
60
61
  if (result.status === 'service_not_found') {
61
62
  throw new Error('backend_oauth_service_not_found');
@@ -64,7 +65,8 @@ export class AdminOAuthService {
64
65
  throw new Error('backend_oauth_runtime_unavailable');
65
66
  }
66
67
  if (result.status !== 'restarted' || !result.redirectUrl) {
67
- throw new Error('backend_oauth_authorization_start_failed');
68
+ throw new Error(safeOAuthDiagnosticMessage('errorDescription' in result ? result.errorDescription : undefined) ??
69
+ 'backend_oauth_authorization_start_failed');
68
70
  }
69
71
  return {
70
72
  serviceId: input.serviceId,
@@ -1 +1 @@
1
- {"version":3,"file":"adminOAuthService.js","sourceRoot":"","sources":["../../../src/domains/admin/adminOAuthService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adminOAuthService.js","sourceRoot":"","sources":["../../../src/domains/admin/adminOAuthService.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { type OAuthAuthorityContext } from '../../../auth/oauthAuthority.js';
2
- import type { OAuthClientProvider, OAuthDiscoveryState } from '../client/auth.js';
2
+ import { type OAuthClientProvider, type OAuthDiscoveryState } from '../client/auth.js';
3
3
  import { type OAuthClientInformationFull, type OAuthClientMetadata, type OAuthTokens } from '../shared/auth.js';
4
4
  export interface OAuthClientConfig {
5
5
  clientId?: string;
@@ -72,6 +72,7 @@ export declare class SDKOAuthClientProvider implements OAuthClientProvider {
72
72
  private selectResourceURL;
73
73
  discoveryState(): OAuthDiscoveryState | undefined;
74
74
  saveDiscoveryState(state: OAuthDiscoveryState): Promise<void>;
75
+ private saveValidatedDiscoveryState;
75
76
  private current;
76
77
  private requireCurrent;
77
78
  private checkIssuer;
@@ -1 +1 @@
1
- {"version":3,"file":"sdkOAuthClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/sdk/legacy/auth/sdkOAuthClientProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdkOAuthClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/sdk/legacy/auth/sdkOAuthClientProvider.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,14 @@
1
1
  import { AsyncLocalStorage } from 'node:async_hooks';
2
2
  import { createHash, createHmac, randomBytes, randomUUID } from 'node:crypto';
3
3
  import { authoritySlot, matchesAuthorityContext, OAUTH_ATTEMPT_TTL_MS, oauthAuthorityError, OAuthAuthorizationDeniedError, oauthDigest, sameAuthority, } from '../../../auth/oauthAuthority.js';
4
+ import { oauthDiagnosticMessage, readOAuthDiagnostic } from '../../../auth/oauthDiagnostics.js';
4
5
  import { createOAuthEndpointFetch, validateOAuthEndpoint } from '../../../auth/oauthEndpointFetch.js';
5
6
  import { ClientSessionRepository } from '../../../auth/storage/clientSessionRepository.js';
6
7
  import { createUpstreamOAuthStorage } from '../../../auth/storage/upstreamOAuthStorage.js';
7
8
  import { AUTH_CONFIG } from '../../../constants.js';
8
9
  import { AgentConfigManager } from '../../../core/server/agentConfig.js';
9
- import { OAuthClientInformationFullSchema, OAuthTokensSchema, } from '../shared/auth.js';
10
+ import { buildDiscoveryUrls } from '../client/auth.js';
11
+ import { OAuthClientInformationFullSchema, OAuthMetadataSchema, OAuthProtectedResourceMetadataSchema, OAuthTokensSchema, OpenIdProviderDiscoveryMetadataSchema, } from '../shared/auth.js';
10
12
  /** Shared by the released modern and legacy SDK adapters. SDK cache objects are never authority. */
11
13
  export class SDKOAuthClientProvider {
12
14
  serverName;
@@ -89,6 +91,25 @@ export class SDKOAuthClientProvider {
89
91
  if (!resourceRequest && operation)
90
92
  operation.failed = true;
91
93
  },
94
+ onDiagnostic: (resourceRequest, message) => {
95
+ const operation = this.operations.getStore();
96
+ if (readOAuthDiagnostic(message)?.httpStatus === 404)
97
+ return;
98
+ if (!resourceRequest && operation)
99
+ operation.diagnostic ??= message;
100
+ },
101
+ validateResponseStatus: (status, init) => {
102
+ if (status < 500)
103
+ return;
104
+ // Modern discovery treats a gateway 502 as an optional endpoint miss.
105
+ if (status === 502 && !this.config.legacy)
106
+ return;
107
+ const ticket = this.tokenRequests.get(init);
108
+ if (ticket?.kind !== 'discovery' || !ticket.discoveryIssuer)
109
+ return;
110
+ // Terminal AS failures otherwise escape before the SDK saves discovery state.
111
+ throw new Error(oauthDiagnosticMessage('metadata_http_error', status));
112
+ },
92
113
  response: (value, _url, init) => {
93
114
  const ticket = this.tokenRequests.get(init);
94
115
  if (!ticket)
@@ -106,9 +127,11 @@ export class SDKOAuthClientProvider {
106
127
  }
107
128
  },
108
129
  metadata: (value, url, init) => {
109
- const validated = this.validateMetadata(value, url);
110
130
  const ticket = this.tokenRequests.get(init);
111
- if (typeof value.issuer === 'string' && ticket)
131
+ if (!ticket || ticket.kind !== 'discovery')
132
+ throw oauthAuthorityError();
133
+ const validated = this.validateMetadata(value, url, ticket.discoveryIssuer);
134
+ if (ticket.discoveryIssuer)
112
135
  this.recordResponse(this.responseMap('discovery'), this.discoveryKey(value), ticket);
113
136
  return validated;
114
137
  },
@@ -395,13 +418,29 @@ export class SDKOAuthClientProvider {
395
418
  if (!this.callbacks.getStore() || !current?.discovery)
396
419
  return undefined;
397
420
  try {
398
- return JSON.parse(current.discovery);
421
+ const state = JSON.parse(current.discovery);
422
+ this.operations.getStore().discoveryIssuer = state.authorizationServerUrl;
423
+ return state;
399
424
  }
400
425
  catch {
401
426
  throw oauthAuthorityError();
402
427
  }
403
428
  }
404
429
  async saveDiscoveryState(state) {
430
+ try {
431
+ await this.saveValidatedDiscoveryState(state);
432
+ const operation = this.operations.getStore();
433
+ if (operation)
434
+ operation.diagnostic = undefined;
435
+ }
436
+ catch (error) {
437
+ const diagnostic = this.operations.getStore()?.diagnostic;
438
+ if (diagnostic)
439
+ throw new Error(diagnostic);
440
+ throw error;
441
+ }
442
+ }
443
+ async saveValidatedDiscoveryState(state) {
405
444
  await this.migration;
406
445
  this.assertOperation();
407
446
  if (!this.context || !this.slot)
@@ -494,10 +533,13 @@ export class SDKOAuthClientProvider {
494
533
  if (this.config.scopes && scope?.split(' ').some((item) => !this.config.scopes.includes(item)))
495
534
  throw oauthAuthorityError();
496
535
  }
497
- validateMetadata(value, url) {
536
+ validateMetadata(value, url, discoveryIssuer) {
498
537
  if (!this.context)
499
538
  throw oauthAuthorityError();
500
- if (Array.isArray(value.authorization_servers)) {
539
+ if (!discoveryIssuer) {
540
+ OAuthProtectedResourceMetadataSchema.parse(value);
541
+ if (!Array.isArray(value.authorization_servers))
542
+ throw oauthAuthorityError();
501
543
  const issuers = value.authorization_servers;
502
544
  if (!issuers.length || issuers.length > 16 || issuers.some((issuer) => typeof issuer !== 'string'))
503
545
  throw oauthAuthorityError();
@@ -514,20 +556,36 @@ export class SDKOAuthClientProvider {
514
556
  if (typeof value.resource !== 'string')
515
557
  throw oauthAuthorityError();
516
558
  this.selectResourceURL(this.context.route.url, value.resource);
559
+ const operation = this.operations.getStore();
560
+ if (operation)
561
+ operation.discoveryIssuer = selected;
517
562
  return {
518
563
  ...value,
519
564
  authorization_servers: [selected],
520
565
  ...(this.config.scopes ? { scopes_supported: this.config.scopes } : {}),
521
566
  };
522
567
  }
523
- if (typeof value.issuer === 'string') {
524
- const issuer = validateOAuthEndpoint(value.issuer, this.context.route.url, undefined, this.config.issuer);
525
- if (issuer.origin !== url.origin || (this.config.issuer && value.issuer !== this.config.issuer))
568
+ const discoveryType = buildDiscoveryUrls(discoveryIssuer).find((candidate) => candidate.url.href === url.href)?.type;
569
+ if (discoveryType === 'oidc')
570
+ OpenIdProviderDiscoveryMetadataSchema.parse(value);
571
+ else
572
+ OAuthMetadataSchema.parse(value);
573
+ if (value.issuer !== discoveryIssuer)
574
+ throw oauthAuthorityError();
575
+ const issuer = validateOAuthEndpoint(discoveryIssuer, this.context.route.url, undefined, this.config.issuer);
576
+ if (issuer.origin !== url.origin || (this.config.issuer && discoveryIssuer !== this.config.issuer))
577
+ throw oauthAuthorityError();
578
+ for (const key of ['authorization_endpoint', 'token_endpoint']) {
579
+ if (typeof value[key] !== 'string')
526
580
  throw oauthAuthorityError();
527
- for (const key of ['authorization_endpoint', 'token_endpoint', 'registration_endpoint', 'jwks_uri']) {
528
- if (value[key] !== undefined)
529
- validateOAuthEndpoint(String(value[key]), this.context.route.url, undefined, this.config.issuer);
530
- }
581
+ validateOAuthEndpoint(value[key], this.context.route.url, undefined, this.config.issuer);
582
+ }
583
+ for (const key of ['registration_endpoint', 'jwks_uri']) {
584
+ if (value[key] === undefined)
585
+ continue;
586
+ if (typeof value[key] !== 'string')
587
+ throw oauthAuthorityError();
588
+ validateOAuthEndpoint(value[key], this.context.route.url, undefined, this.config.issuer);
531
589
  }
532
590
  return value;
533
591
  }
@@ -541,13 +599,17 @@ export class SDKOAuthClientProvider {
541
599
  if (isDiscovery) {
542
600
  this.assertOperation();
543
601
  const requestVersion = await this.reserveRequest();
544
- if (url.search)
545
- throw oauthAuthorityError();
602
+ const operation = this.operations.getStore();
603
+ const issuer = operation?.discoveryIssuer;
604
+ const discoveryIssuer = issuer && buildDiscoveryUrls(issuer).some((candidate) => candidate.url.href === url.href) ? issuer : undefined;
605
+ if (operation && !issuer)
606
+ operation.discoveryIssuer = new URL('/', resource).href;
546
607
  const request = { ...init, headers: { accept: 'application/json' }, redirect: 'error' };
547
608
  this.tokenRequests.set(request, {
548
609
  generation: this.claim,
549
610
  revision: this.record?.revision ?? 0,
550
611
  kind: 'discovery',
612
+ discoveryIssuer,
551
613
  requestVersion,
552
614
  });
553
615
  return request;
@@ -623,11 +685,12 @@ export class SDKOAuthClientProvider {
623
685
  const operation = this.operations.getStore();
624
686
  if (operation)
625
687
  operation.failed = true;
626
- throw oauthAuthorityError();
688
+ throw new Error(operation?.diagnostic ?? oauthAuthorityError().message);
627
689
  }
628
690
  assertOperation() {
629
- if (this.operations.getStore()?.failed)
630
- throw oauthAuthorityError();
691
+ const operation = this.operations.getStore();
692
+ if (operation?.failed)
693
+ throw new Error(operation.diagnostic ?? oauthAuthorityError().message);
631
694
  }
632
695
  async reserveRequest() {
633
696
  const requestVersion = await this.sessionRepository.reserveRequest(this.slot, this.claim);