@adcp/sdk 14.2.0 → 14.4.0

package/dist/lib/auth/oauth/types.mjs

@@ -30,6 +30,7 @@ class OAuthTimeoutError extends OAuthError {
 }
 function toMCPTokens(tokens) {
   return {
+    ...tokens.issuer !== void 0 && tokens.issuer !== null && { issuer: tokens.issuer },
     access_token: tokens.access_token,
     refresh_token: tokens.refresh_token,
     token_type: tokens.token_type || "Bearer",
@@ -39,6 +40,7 @@ function toMCPTokens(tokens) {
 }
 function fromMCPTokens(tokens) {
   const result = {
+    ...tokens.issuer !== void 0 && tokens.issuer !== null && { issuer: tokens.issuer },
     access_token: tokens.access_token,
     token_type: tokens.token_type,
     scope: tokens.scope
@@ -54,6 +56,7 @@ function fromMCPTokens(tokens) {
 }
 function toMCPClientInfo(client) {
   return {
+    ...client.issuer !== void 0 && client.issuer !== null && { issuer: client.issuer },
     client_id: client.client_id,
     client_secret: client.client_secret,
     client_secret_expires_at: client.client_secret_expires_at
@@ -61,16 +64,50 @@ function toMCPClientInfo(client) {
 }
 function fromMCPClientInfo(info) {
   return {
+    ...info.issuer !== void 0 && info.issuer !== null && { issuer: info.issuer },
     client_id: info.client_id,
     client_secret: info.client_secret,
     client_secret_expires_at: info.client_secret_expires_at
   };
 }
+function isOAuthIssuer(value) {
+  if (typeof value !== "string" || value.length === 0) return false;
+  try {
+    const url = new URL(value);
+    return (url.protocol === "https:" || url.protocol === "http:") && !url.username && !url.password && !url.search && !url.hash;
+  } catch {
+    return false;
+  }
+}
+function assertOAuthCredentialIssuer(credential, expectedIssuer, requireIssuer = false) {
+  const issuer = credential.issuer;
+  if ((issuer === void 0 || issuer === null) && !requireIssuer) return;
+  if (!isOAuthIssuer(issuer)) {
+    throw new OAuthError(
+      "Saved OAuth credentials need a valid issuer. Clear them and sign in again, or set their issuer from trusted configuration.",
+      "oauth_issuer_required"
+    );
+  }
+  if (expectedIssuer !== void 0 && issuer !== expectedIssuer && !(issuer.endsWith("/") && issuer.slice(0, -1) === expectedIssuer) && !(expectedIssuer.endsWith("/") && expectedIssuer.slice(0, -1) === issuer)) {
+    throw new OAuthError("OAuth credentials belong to a different authorization server.", "oauth_issuer_mismatch");
+  }
+}
+function assertOAuthServerIssuer(metadata, authorizationServerUrl) {
+  const issuer = metadata?.issuer;
+  if (!isOAuthIssuer(issuer) || issuer !== authorizationServerUrl && !(authorizationServerUrl.endsWith("/") && issuer === authorizationServerUrl.slice(0, -1))) {
+    throw new OAuthError(
+      "Authorization-server metadata does not match the discovered issuer.",
+      "oauth_issuer_mismatch"
+    );
+  }
+}
 export {
   DEFAULT_CLIENT_METADATA,
   OAuthCancelledError,
   OAuthError,
   OAuthTimeoutError,
+  assertOAuthCredentialIssuer,
+  assertOAuthServerIssuer,
   fromMCPClientInfo,
   fromMCPTokens,
   toMCPClientInfo,

package/dist/lib/auth/oauth/web-flow.js

@@ -144,6 +144,7 @@ async function startWebOAuthFlow(opts) {
   if (!asMetadata) {
     throw new import_types.OAuthError(`No OAuth metadata at ${asUrl.toString()}`, "no_authorization_server_metadata", agent.id);
   }
+  (0, import_types.assertOAuthServerIssuer)(asMetadata, asUrl.toString());
   const resource = resourceOverride ? new URL(resourceOverride) : prm?.resource ? new URL(prm.resource) : (0, import_auth_utils.resourceUrlFromServerUrl)(new URL(agent.agent_uri));
   const baseClientMetadata = {
     ...import_types.DEFAULT_CLIENT_METADATA,
@@ -230,6 +231,12 @@ async function completeWebOAuthFlow(opts) {
   const asMetadata = await (0, import_auth.discoverAuthorizationServerMetadata)(flow.authorizationServerUrl, {
     fetchFn: guardedFetch
   });
+  (0, import_types.assertOAuthServerIssuer)(asMetadata, flow.authorizationServerUrl);
+  (0, import_types.assertOAuthCredentialIssuer)(
+    flow.clientInformation,
+    flow.authorizationServerUrl,
+    !!flow.clientInformation.client_secret
+  );
   let tokens;
   try {
     tokens = await (0, import_auth.exchangeAuthorization)(flow.authorizationServerUrl, {
@@ -241,6 +248,7 @@ async function completeWebOAuthFlow(opts) {
       resource: flow.resource ? new URL(flow.resource) : void 0,
       fetchFn: guardedFetch
     });
+    tokens = { ...tokens, issuer: flow.authorizationServerUrl };
   } catch (err) {
     throw wrapTokenExchangeError(err);
   }
@@ -410,6 +418,7 @@ function createSsrfSafeOAuthFetch(trustedFetchFn, allowHttp) {
 async function resolveClientInformation(args) {
   const { agent, agentStorage, asUrl, asMetadata, clientMetadata, fetchFn, allowConfidentialClient } = args;
   if (agent.oauth_client) {
+    (0, import_types.assertOAuthCredentialIssuer)(agent.oauth_client, asUrl.toString(), !!agent.oauth_client.client_secret);
     return (0, import_types.toMCPClientInfo)(agent.oauth_client);
   }
   if (!asMetadata.registration_endpoint) {
@@ -419,11 +428,12 @@ async function resolveClientInformation(args) {
       agent.id
     );
   }
-  const registered = await (0, import_auth.registerClient)(asUrl.toString(), {
+  const registration = await (0, import_auth.registerClient)(asUrl.toString(), {
     metadata: asMetadata,
     clientMetadata,
     fetchFn
   });
+  const registered = { ...registration, issuer: asUrl.toString() };
   if (registered.client_secret && !allowConfidentialClient) {
     throw new ConfidentialClientNotAllowedError(agent.id);
   }

package/dist/lib/auth/oauth/web-flow.mjs

@@ -7,7 +7,15 @@ import {
   startAuthorization
 } from "@modelcontextprotocol/sdk/client/auth.js";
 import { checkResourceAllowed, resourceUrlFromServerUrl } from "@modelcontextprotocol/sdk/shared/auth-utils.js";
-import { DEFAULT_CLIENT_METADATA, fromMCPClientInfo, fromMCPTokens, OAuthError, toMCPClientInfo } from "./types.mjs";
+import {
+  DEFAULT_CLIENT_METADATA,
+  fromMCPClientInfo,
+  fromMCPTokens,
+  OAuthError,
+  toMCPClientInfo,
+  assertOAuthCredentialIssuer,
+  assertOAuthServerIssuer
+} from "./types.mjs";
 import { validateOAuthResourceUrl } from "./resource-url.mjs";
 import { ssrfSafeFetch } from "../../net/ssrf-fetch.mjs";
 const DEFAULT_WEB_FLOW_TTL_MS = 10 * 60 * 1e3;
@@ -115,6 +123,7 @@ async function startWebOAuthFlow(opts) {
   if (!asMetadata) {
     throw new OAuthError(`No OAuth metadata at ${asUrl.toString()}`, "no_authorization_server_metadata", agent.id);
   }
+  assertOAuthServerIssuer(asMetadata, asUrl.toString());
   const resource = resourceOverride ? new URL(resourceOverride) : prm?.resource ? new URL(prm.resource) : resourceUrlFromServerUrl(new URL(agent.agent_uri));
   const baseClientMetadata = {
     ...DEFAULT_CLIENT_METADATA,
@@ -201,6 +210,12 @@ async function completeWebOAuthFlow(opts) {
   const asMetadata = await discoverAuthorizationServerMetadata(flow.authorizationServerUrl, {
     fetchFn: guardedFetch
   });
+  assertOAuthServerIssuer(asMetadata, flow.authorizationServerUrl);
+  assertOAuthCredentialIssuer(
+    flow.clientInformation,
+    flow.authorizationServerUrl,
+    !!flow.clientInformation.client_secret
+  );
   let tokens;
   try {
     tokens = await exchangeAuthorization(flow.authorizationServerUrl, {
@@ -212,6 +227,7 @@ async function completeWebOAuthFlow(opts) {
       resource: flow.resource ? new URL(flow.resource) : void 0,
       fetchFn: guardedFetch
     });
+    tokens = { ...tokens, issuer: flow.authorizationServerUrl };
   } catch (err) {
     throw wrapTokenExchangeError(err);
   }
@@ -381,6 +397,7 @@ function createSsrfSafeOAuthFetch(trustedFetchFn, allowHttp) {
 async function resolveClientInformation(args) {
   const { agent, agentStorage, asUrl, asMetadata, clientMetadata, fetchFn, allowConfidentialClient } = args;
   if (agent.oauth_client) {
+    assertOAuthCredentialIssuer(agent.oauth_client, asUrl.toString(), !!agent.oauth_client.client_secret);
     return toMCPClientInfo(agent.oauth_client);
   }
   if (!asMetadata.registration_endpoint) {
@@ -390,11 +407,12 @@ async function resolveClientInformation(args) {
       agent.id
     );
   }
-  const registered = await registerClient(asUrl.toString(), {
+  const registration = await registerClient(asUrl.toString(), {
     metadata: asMetadata,
     clientMetadata,
     fetchFn
   });
+  const registered = { ...registration, issuer: asUrl.toString() };
   if (registered.client_secret && !allowConfidentialClient) {
     throw new ConfidentialClientNotAllowedError(agent.id);
   }

package/dist/lib/protocols/mcp.js

@@ -34,6 +34,7 @@ var import_streamableHttp = require("@modelcontextprotocol/sdk/client/streamable
 var import_sse = require("@modelcontextprotocol/sdk/client/sse.js");
 var import_auth = require("@modelcontextprotocol/sdk/client/auth.js");
 var import_node_crypto = require("node:crypto");
+var import_MCPOAuthProvider = require('../auth/oauth/MCPOAuthProvider.js');
 var import_auth2 = require('../auth/index.js');
 var import_errors = require('../errors/index.js');
 var import_tracing = require('../observability/tracing.js');
@@ -713,6 +714,7 @@ async function connectMCP(options) {
     fetchFn,
     allowPrivateIp
   } = options;
+  if (authProvider) (0, import_MCPOAuthProvider.assertLegacyOAuthSdk)();
   const baseUrl = new URL(agentUrl);
   debugLogs.push({
     type: "info",

package/dist/lib/protocols/mcp.mjs

@@ -11,6 +11,7 @@ import {
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
 import { hkdfSync, randomBytes } from "node:crypto";
+import { assertLegacyOAuthSdk } from "../auth/oauth/MCPOAuthProvider.mjs";
 import { createMCPRequestHeaders } from "../auth/index.mjs";
 import { is401Error } from "../errors/index.mjs";
 import { withSpan, injectTraceHeaders } from "../observability/tracing.mjs";
@@ -700,6 +701,7 @@ async function connectMCP(options) {
     fetchFn,
     allowPrivateIp
   } = options;
+  if (authProvider) assertLegacyOAuthSdk();
   const baseUrl = new URL(agentUrl);
   debugLogs.push({
     type: "info",

package/dist/lib/reporting/inspection.d.mts

@@ -2,7 +2,7 @@ import { type CanonicalReferenceResolver } from '../canonical-references/index.m
 import { type SsrfFetchOptions } from '../net/ssrf-fetch.mjs';
 import type { ReportingControlTotal } from '../types/tools.generated.mjs';
 import type { ReportingInspectionContext, ReportingObservation } from './reconciliation.mjs';
-export type ReportingInspectionErrorCode = 'UNSUPPORTED_RESOURCE' | 'RESOURCE_READ_FAILED' | 'RESOURCE_NOT_READY' | 'RESOURCE_TOO_LARGE' | 'INSPECTION_TIMEOUT' | 'MANIFEST_DIGEST_MISMATCH' | 'MANIFEST_INVALID' | 'MANIFEST_INCOMPLETE' | 'MANIFEST_IDENTITY_MISMATCH' | 'MANIFEST_TOTAL_MISMATCH' | 'OBJECT_DUPLICATE' | 'OBJECT_SIZE_MISMATCH' | 'OBJECT_DIGEST_MISMATCH' | 'OBJECT_ROW_COUNT_MISMATCH' | 'FORMAT_UNSUPPORTED' | 'COMPRESSION_UNSUPPORTED' | 'ROW_SCHEMA_FETCH_FAILED' | 'ROW_SCHEMA_INVALID' | 'ROW_SCHEMA_VIOLATION' | 'REPORT_DEFINITION_FETCH_FAILED' | 'REPORT_DEFINITION_INVALID' | 'CANONICALIZATION_FETCH_FAILED' | 'CANONICALIZATION_INVALID' | 'ROW_COUNT_MISMATCH' | 'CONTROL_TOTAL_UNSUPPORTED' | 'CONTROL_TOTAL_MISMATCH' | 'CANONICAL_DIGEST_MISMATCH';
+export type ReportingInspectionErrorCode = 'CONSUMER_COMMIT_FAILED' | 'UNSUPPORTED_RESOURCE' | 'RESOURCE_READ_FAILED' | 'RESOURCE_NOT_READY' | 'RESOURCE_TOO_LARGE' | 'INSPECTION_TIMEOUT' | 'MANIFEST_DIGEST_MISMATCH' | 'MANIFEST_INVALID' | 'MANIFEST_INCOMPLETE' | 'MANIFEST_IDENTITY_MISMATCH' | 'MANIFEST_TOTAL_MISMATCH' | 'OBJECT_DUPLICATE' | 'OBJECT_SIZE_MISMATCH' | 'OBJECT_DIGEST_MISMATCH' | 'OBJECT_ROW_COUNT_MISMATCH' | 'FORMAT_UNSUPPORTED' | 'COMPRESSION_UNSUPPORTED' | 'ROW_SCHEMA_FETCH_FAILED' | 'ROW_SCHEMA_INVALID' | 'ROW_SCHEMA_VIOLATION' | 'REPORT_DEFINITION_FETCH_FAILED' | 'REPORT_DEFINITION_INVALID' | 'CANONICALIZATION_FETCH_FAILED' | 'CANONICALIZATION_INVALID' | 'ROW_COUNT_MISMATCH' | 'CONTROL_TOTAL_UNSUPPORTED' | 'CONTROL_TOTAL_MISMATCH' | 'CANONICAL_DIGEST_MISMATCH';
 export declare class ReportingInspectionError extends Error {
     readonly code: ReportingInspectionErrorCode;
     readonly retryable: boolean;
@@ -78,9 +78,9 @@ export interface ReportingManifestInspectorOptions<TCredential = unknown> {
     maxFiles?: number;
     maxRows?: number;
     maxRowBytes?: number;
-    /** Hard wall-clock budget for one inspection attempt, including custom adapters. */
+    /** Aggregate deadline for async work, checked cooperatively during synchronous work. Synchronous callbacks cannot be preempted. */
     maxInspectionMs?: number;
-    /** Maximum wall-clock time permitted for synchronous row-schema compilation. */
+    /** Reject synchronous schema compilation overruns after compilation returns. */
     maxSchemaCompileMs?: number;
 }
 /** Build the SDK-managed manifest/file inspector used by reconcileReporting. */

package/dist/lib/reporting/inspection.d.ts

@@ -2,7 +2,7 @@ import { type CanonicalReferenceResolver } from '../canonical-references';
 import { type SsrfFetchOptions } from '../net/ssrf-fetch';
 import type { ReportingControlTotal } from '../types/tools.generated';
 import type { ReportingInspectionContext, ReportingObservation } from './reconciliation';
-export type ReportingInspectionErrorCode = 'UNSUPPORTED_RESOURCE' | 'RESOURCE_READ_FAILED' | 'RESOURCE_NOT_READY' | 'RESOURCE_TOO_LARGE' | 'INSPECTION_TIMEOUT' | 'MANIFEST_DIGEST_MISMATCH' | 'MANIFEST_INVALID' | 'MANIFEST_INCOMPLETE' | 'MANIFEST_IDENTITY_MISMATCH' | 'MANIFEST_TOTAL_MISMATCH' | 'OBJECT_DUPLICATE' | 'OBJECT_SIZE_MISMATCH' | 'OBJECT_DIGEST_MISMATCH' | 'OBJECT_ROW_COUNT_MISMATCH' | 'FORMAT_UNSUPPORTED' | 'COMPRESSION_UNSUPPORTED' | 'ROW_SCHEMA_FETCH_FAILED' | 'ROW_SCHEMA_INVALID' | 'ROW_SCHEMA_VIOLATION' | 'REPORT_DEFINITION_FETCH_FAILED' | 'REPORT_DEFINITION_INVALID' | 'CANONICALIZATION_FETCH_FAILED' | 'CANONICALIZATION_INVALID' | 'ROW_COUNT_MISMATCH' | 'CONTROL_TOTAL_UNSUPPORTED' | 'CONTROL_TOTAL_MISMATCH' | 'CANONICAL_DIGEST_MISMATCH';
+export type ReportingInspectionErrorCode = 'CONSUMER_COMMIT_FAILED' | 'UNSUPPORTED_RESOURCE' | 'RESOURCE_READ_FAILED' | 'RESOURCE_NOT_READY' | 'RESOURCE_TOO_LARGE' | 'INSPECTION_TIMEOUT' | 'MANIFEST_DIGEST_MISMATCH' | 'MANIFEST_INVALID' | 'MANIFEST_INCOMPLETE' | 'MANIFEST_IDENTITY_MISMATCH' | 'MANIFEST_TOTAL_MISMATCH' | 'OBJECT_DUPLICATE' | 'OBJECT_SIZE_MISMATCH' | 'OBJECT_DIGEST_MISMATCH' | 'OBJECT_ROW_COUNT_MISMATCH' | 'FORMAT_UNSUPPORTED' | 'COMPRESSION_UNSUPPORTED' | 'ROW_SCHEMA_FETCH_FAILED' | 'ROW_SCHEMA_INVALID' | 'ROW_SCHEMA_VIOLATION' | 'REPORT_DEFINITION_FETCH_FAILED' | 'REPORT_DEFINITION_INVALID' | 'CANONICALIZATION_FETCH_FAILED' | 'CANONICALIZATION_INVALID' | 'ROW_COUNT_MISMATCH' | 'CONTROL_TOTAL_UNSUPPORTED' | 'CONTROL_TOTAL_MISMATCH' | 'CANONICAL_DIGEST_MISMATCH';
 export declare class ReportingInspectionError extends Error {
     readonly code: ReportingInspectionErrorCode;
     readonly retryable: boolean;
@@ -78,9 +78,9 @@ export interface ReportingManifestInspectorOptions<TCredential = unknown> {
     maxFiles?: number;
     maxRows?: number;
     maxRowBytes?: number;
-    /** Hard wall-clock budget for one inspection attempt, including custom adapters. */
+    /** Aggregate deadline for async work, checked cooperatively during synchronous work. Synchronous callbacks cannot be preempted. */
     maxInspectionMs?: number;
-    /** Maximum wall-clock time permitted for synchronous row-schema compilation. */
+    /** Reject synchronous schema compilation overruns after compilation returns. */
     maxSchemaCompileMs?: number;
 }
 /** Build the SDK-managed manifest/file inspector used by reconcileReporting. */