@mastra/mcp 1.18.1-alpha.2 → 2.0.0-alpha.4

package/dist/client/configuration.d.ts

@@ -2,7 +2,7 @@ import type { Stream } from 'node:stream';
 import { MastraBase } from '@mastra/core/base';
 import type { MCPServerBase } from '@mastra/core/mcp';
 import type { Tool } from '@mastra/core/tools';
-import type { ElicitRequest, ElicitResult, ProgressNotification, Prompt, Resource, ResourceTemplateType } from '@modelcontextprotocol/client';
+import type { ProgressNotification, Prompt, Resource, ResourceTemplateType } from '@modelcontextprotocol/client';
 import type { MastraMCPServerDefinition, MCPServerAuthState } from './client.js';
 import type { MCPDiscoveryErrorDetails } from './error-utils.js';
 import type { SerializableMCPToolCatalog, SerializableMCPToolDefinition } from './types.js';
@@ -81,7 +81,7 @@ export declare class MCPClient extends MastraBase {
      * const mcp = new MCPClient({
      *   servers: {
      *     weatherServer: {
-     *       url: new URL('http://localhost:8080/sse'),
+     *       url: new URL('http://localhost:8080/mcp'),
      *       requestInit: {
      *         headers: { Authorization: 'Bearer token' }
      *       }
@@ -114,48 +114,6 @@ export declare class MCPClient extends MastraBase {
     get progress(): {
         onUpdate: (serverName: string, handler: (params: ProgressNotification['params']) => void) => Promise<void>;
     };
-    /**
-     * Provides access to elicitation-related operations for interactive user input collection.
-     *
-     * Elicitation allows MCP servers to request structured information from users during tool execution.
-     *
-     * @example
-     * ```typescript
-     * // Set up handler for elicitation requests from a server
-     * await mcp.elicitation.onRequest('serverName', async (request) => {
-     *   console.log(`Server requests: ${request.message}`);
-     *   console.log('Schema:', request.requestedSchema);
-     *
-     *   // Collect user input and return response
-     *   return {
-     *     action: 'accept',
-     *     content: { name: 'John Doe', email: 'john@example.com' }
-     *   };
-     * });
-     * ```
-     */
-    get elicitation(): {
-        /**
-         * Sets up a handler function for elicitation requests from a specific server.
-         *
-         * The handler receives requests for user input and must return a response with
-         * action ('accept', 'decline', or 'cancel') and optional content.
-         *
-         * @param serverName - Name of the server to handle elicitation requests for
-         * @param handler - Function to handle elicitation requests
-         * @throws {MastraError} If setting up the handler fails
-         *
-         * @example
-         * ```typescript
-         * await mcp.elicitation.onRequest('weatherServer', async (request) => {
-         *   // Prompt user for input
-         *   const userInput = await promptUser(request.requestedSchema);
-         *   return { action: 'accept', content: userInput };
-         * });
-         * ```
-         */
-        onRequest: (serverName: string, handler: (request: ElicitRequest['params']) => Promise<ElicitResult>) => Promise<void>;
-    };
     /**
      * Provides access to resource-related operations across all configured servers.
      *
@@ -172,11 +130,11 @@ export declare class MCPClient extends MastraBase {
      * // Read a specific resource
      * const content = await mcp.resources.read('weatherServer', 'file://data.json');
      *
-     * // Subscribe to resource updates
-     * await mcp.resources.subscribe('weatherServer', 'file://data.json');
+     * // Receive resource updates
      * await mcp.resources.onUpdated('weatherServer', async (params) => {
      *   console.log(`Resource updated: ${params.uri}`);
      * });
+     * await mcp.resources.subscribe('weatherServer', 'file://data.json');
      * ```
      */
     get resources(): {
@@ -279,69 +237,31 @@ export declare class MCPClient extends MastraBase {
             })[];
         }>;
         /**
-         * Subscribes to updates for a specific resource on a server.
+         * Subscribes to update notifications for a resource on a server. Subscriptions ride
+         * the client's single `subscriptions/listen` stream and are restored after reconnects.
          *
          * @param serverName - Name of the server
-         * @param uri - URI of the resource to subscribe to
-         * @returns Promise resolving when subscription is established
-         * @throws {MastraError} If subscription fails
+         * @param uri - URI of the resource to watch
+         * @throws {MastraError} If the server declines the subscription
          *
          * @example
          * ```typescript
-         * await mcp.resources.subscribe('weatherServer', 'file://config.json');
+         * await mcp.resources.onUpdated('weatherServer', ({ uri }) => console.log(`updated ${uri}`));
+         * await mcp.resources.subscribe('weatherServer', 'file://data.json');
          * ```
          */
-        subscribe: (serverName: string, uri: string) => Promise<{
-            _meta?: {
-                [x: string]: unknown;
-                "io.modelcontextprotocol/serverInfo"?: {
-                    version: string;
-                    websiteUrl?: string | undefined;
-                    description?: string | undefined;
-                    icons?: {
-                        src: string;
-                        mimeType?: string | undefined;
-                        sizes?: string[] | undefined;
-                        theme?: "dark" | "light" | undefined;
-                    }[] | undefined;
-                    name: string;
-                    title?: string | undefined;
-                } | undefined;
-            } | undefined;
-        }>;
+        subscribe: (serverName: string, uri: string) => Promise<void>;
         /**
-         * Unsubscribes from updates for a specific resource on a server.
+         * Stops update notifications for a resource previously passed to `subscribe`.
          *
          * @param serverName - Name of the server
-         * @param uri - URI of the resource to unsubscribe from
-         * @returns Promise resolving when unsubscription is complete
-         * @throws {MastraError} If unsubscription fails
-         *
-         * @example
-         * ```typescript
-         * await mcp.resources.unsubscribe('weatherServer', 'file://config.json');
-         * ```
+         * @param uri - URI of the resource
+         * @throws {MastraError} If the stream cannot be updated
          */
-        unsubscribe: (serverName: string, uri: string) => Promise<{
-            _meta?: {
-                [x: string]: unknown;
-                "io.modelcontextprotocol/serverInfo"?: {
-                    version: string;
-                    websiteUrl?: string | undefined;
-                    description?: string | undefined;
-                    icons?: {
-                        src: string;
-                        mimeType?: string | undefined;
-                        sizes?: string[] | undefined;
-                        theme?: "dark" | "light" | undefined;
-                    }[] | undefined;
-                    name: string;
-                    title?: string | undefined;
-                } | undefined;
-            } | undefined;
-        }>;
+        unsubscribe: (serverName: string, uri: string) => Promise<void>;
         /**
          * Sets a notification handler for when subscribed resources are updated on a server.
+         * Updates arrive for resources passed to `subscribe`.
          *
          * @param serverName - Name of the server to monitor
          * @param handler - Callback function receiving the updated resource URI
@@ -647,8 +567,9 @@ export declare class MCPClient extends MastraBase {
      *
      * 1. Starts a loopback callback server on the redirect URL's port (falling
      *    back to the next sequential ports when it is in use)
-     * 2. Attempts a connection so the SDK runs discovery and dynamic client
-     *    registration, delivering the authorization URL through the provider's
+     * 2. Attempts a connection so the SDK runs authorization server discovery
+     *    (identifying the client by its pre-registered id or its client metadata
+     *    URL) and delivers the authorization URL through the provider's
      *    `onRedirectToAuthorization` callback — the host directs the user there
      * 3. Waits for the browser to deliver the authorization code, validates the
      *    OAuth state, exchanges the code for tokens, and reconnects
@@ -701,12 +622,17 @@ export declare class MCPClient extends MastraBase {
      */
     cancelAuthentication(serverName: string): Promise<boolean>;
     /**
-     * Returns instructions advertised by connected MCP servers during initialize.
+     * Returns instructions advertised by connected MCP servers during discovery.
      *
      * Servers that have not connected yet, or did not advertise instructions,
      * return `undefined`.
      */
     getServerInstructions(): Record<string, string | undefined>;
+    /**
+     * The protocol revision negotiated with each configured server, keyed by
+     * server name. Servers that have not connected yet return `undefined`.
+     */
+    getServerProtocolVersions(): Record<string, string | undefined>;
     /**
      * Retrieves all tools from all configured servers with namespaced names.
      *
@@ -894,12 +820,12 @@ export declare class MCPClient extends MastraBase {
      */
     private discoverAcrossServers;
     /**
-     * Creates MCPServerBase-compatible proxy objects for each server connection
-     * in this MCPClient.  The returned record can be spread directly into
-     * Mastra's `mcpServers` config so that external (non-Mastra) servers
-     * appear in Studio alongside native MCPServer instances.
+     * Creates `MCPServerBase` proxy objects for each server connection in this
+     * MCPClient. The returned record can be spread directly into Mastra's
+     * `mcpServers` config so that external (non-Mastra) servers appear in Studio
+     * alongside local MCPServer instances.
      *
-     * @returns Record mapping server names to MCPServerBase proxy instances
+     * @returns Record mapping server names to proxy instances
      *
      * @example
      * ```typescript
@@ -917,22 +843,6 @@ export declare class MCPClient extends MastraBase {
      * ```
      */
     toMCPServerProxies(): Record<string, MCPServerBase>;
-    /**
-     * Gets current session IDs for all connected MCP clients using Streamable HTTP transport.
-     *
-     * Returns an object mapping server names to their session IDs. Only includes servers
-     * that are currently connected via Streamable HTTP transport.
-     *
-     * @returns Object mapping server names to session IDs
-     *
-     * @example
-     * ```typescript
-     * const sessions = mcp.sessionIds;
-     * console.log(sessions);
-     * // { weatherServer: 'abc-123', stockServer: 'def-456' }
-     * ```
-     */
-    get sessionIds(): Record<string, string>;
     /**
      * Gets the stderr stream of a connected stdio server.
      *

package/dist/client/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/client/configuration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/client/configuration.ts"],"names":[],"mappings":"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"}

package/dist/client/error-utils.d.ts

@@ -1,3 +1,12 @@
+/**
+ * Whether a failed MCP call is worth one transport reconnect and retry.
+ *
+ * Qualifying failures are a detached SDK client, an HTTP 400/401/403/404 from
+ * the endpoint (a gateway or auth layer answering while the backend behind it
+ * is unhealthy or the credentials went stale), or a dropped/refused connection.
+ * The caller reconnects and retries once. Tool execution errors and JSON-RPC
+ * protocol errors are never reconnectable.
+ */
 export declare function isReconnectableMCPError(error: unknown): boolean;
 /** Structured transport metadata for a failed aggregate MCP discovery. */
 export interface MCPDiscoveryErrorDetails {

package/dist/client/error-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-utils.d.ts","sourceRoot":"","sources":["../../src/client/error-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAuB/D;AAED,0EAA0E;AAC1E,MAAM,WAAW,wBAAwB;IACvC,8FAA8F;IAC9F,OAAO,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAoCD;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAmDpF"}
+{"version":3,"file":"error-utils.d.ts","sourceRoot":"","sources":["../../src/client/error-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAmB/D;AAED,0EAA0E;AAC1E,MAAM,WAAW,wBAAwB;IACvC,8FAA8F;IAC9F,OAAO,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAoCD;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAmDpF"}

package/dist/client/index.d.ts

@@ -1,4 +1,5 @@
-export type { LoggingLevel, LogMessage, LogHandler, MastraMCPServerDefinition, ElicitationHandler, ProgressHandler, InternalMastraMCPClientOptions, RequireToolApproval, RequireToolApprovalFn, RequireToolApprovalContext, ToolAnnotations, SerializableMCPToolDefinition, SerializableMCPToolCatalog, } from './types.js';
+export type { LoggingLevel, LogMessage, LogHandler, MastraMCPServerDefinition, MCPClientCapabilities, MCPClientProtocolVersion, MCPInputRequest, MCPInputRequestHandler, ProgressHandler, InternalMastraMCPClientOptions, RequireToolApproval, RequireToolApprovalFn, RequireToolApprovalContext, ToolAnnotations, SerializableMCPToolDefinition, SerializableMCPToolCatalog, } from './types.js';
+export { MCP_CLIENT_PROTOCOL_VERSION } from './types.js';
 export * from './client.js';
 export * from './configuration.js';
 export type { MCPDiscoveryErrorDetails } from './error-utils.js';

package/dist/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,UAAU,EACV,UAAU,EACV,yBAAyB,EACzB,kBAAkB,EAClB,eAAe,EACf,8BAA8B,EAC9B,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,SAAS,CAAC;AACjB,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,YAAY,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,UAAU,EACV,UAAU,EACV,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,8BAA8B,EAC9B,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AACtD,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,YAAY,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/client/oauth-callback-server.d.ts

@@ -6,7 +6,7 @@
  * with MCPOAuthClientProvider to complete the authorization-code flow for
  * OAuth-protected MCP servers.
  *
- * @see https://modelcontextprotocol.io/specification/2025-06-18/basic/authorization
+ * @see https://modelcontextprotocol.io/specification/2026-07-28/basic/authorization
  */
 /**
  * Options for creating an OAuth callback server.
@@ -44,6 +44,10 @@ export interface OAuthCallbackResult {
      * The state parameter echoed back by the authorization server.
      */
     state: string;
+    /**
+     * RFC 9207 authorization-server issuer returned with the callback, when present.
+     */
+    iss?: string;
 }
 /**
  * A running loopback OAuth callback server.
@@ -81,9 +85,9 @@ export interface OAuthCallbackServer {
  * its preferred port, followed by the sequential fallback-port variants that
  * createOAuthCallbackServer will try when the preferred port is in use.
  *
- * This is the single source of the candidate list: register all of these as
- * redirect_uris during dynamic client registration so a fallback-bound
- * callback URL always matches a registered URI.
+ * This is the single source of the candidate list: include all of these as
+ * redirect_uris in the pre-registered client or the hosted Client ID Metadata
+ * Document so a fallback-bound callback URL always matches a listed URI.
  */
 export declare function getCallbackUrlCandidates(redirectUrl: string | URL): URL[];
 /**

package/dist/client/oauth-callback-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-callback-server.d.ts","sourceRoot":"","sources":["../../src/client/oauth-callback-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAkCH;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;;;;;OASG;IACH,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;IAE1B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAE5E;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,EAAE,CAezE;AAmCD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA8IjH"}
+{"version":3,"file":"oauth-callback-server.d.ts","sourceRoot":"","sources":["../../src/client/oauth-callback-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAkCH;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;;;;;OASG;IACH,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;IAE1B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAE5E;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,EAAE,CAezE;AAmCD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA8IjH"}

package/dist/client/oauth-provider.d.ts

@@ -4,13 +4,15 @@
  * Provides a ready-to-use OAuthClientProvider implementation that can be used
  * with Mastra's MCPClient for connecting to OAuth-protected MCP servers.
  *
- * @see https://modelcontextprotocol.io/specification/2025-06-18/basic/authorization
+ * Client identity is configured, never registered at runtime: the provider is
+ * given either pre-registered client information or a Client ID Metadata
+ * Document URL (SEP-991), and it never performs dynamic client registration.
  */
-import type { OAuthClientProvider, OAuthClientMetadata, OAuthClientInformation, OAuthClientInformationFull, OAuthTokens } from '../shared/oauth-types.js';
+import type { OAuthClientProvider, OAuthClientMetadata, OAuthClientInformation, OAuthClientInformationContext, OAuthDiscoveryState, StoredOAuthTokens } from '../shared/oauth-types.js';
 /**
  * Storage interface for persisting OAuth data.
  *
- * Implement this interface to persist OAuth data across sessions.
+ * Implement this interface to persist OAuth data across processes.
  * For simple in-memory usage, use InMemoryOAuthStorage.
  */
 export interface OAuthStorage {
@@ -42,7 +44,19 @@ export declare class InMemoryOAuthStorage implements OAuthStorage {
 }
 /**
  * Options for creating a MCPOAuthClientProvider.
+ *
+ * Exactly one client identity source is required: `clientInformation` for a
+ * client pre-registered with the authorization server, or `clientMetadataUrl`
+ * for a Client ID Metadata Document the authorization server fetches.
  */
+export interface MCPClientMetadata extends OAuthClientMetadata {
+    /**
+     * The `client_id` published in a Client ID Metadata Document. When present it
+     * must equal `clientMetadataUrl`; the provider never sends it to the
+     * authorization server itself.
+     */
+    client_id?: string;
+}
 export interface MCPOAuthClientProviderOptions {
     /**
      * The redirect URL for the OAuth callback.
@@ -53,19 +67,32 @@ export interface MCPOAuthClientProviderOptions {
      */
     redirectUrl: string | URL;
     /**
-     * OAuth client metadata for registration.
-     * If the client is not pre-registered with the authorization server,
-     * this metadata will be used for dynamic client registration.
+     * OAuth client metadata (name, redirect URIs, grant types, scope).
+     *
+     * Used for scope selection and as the description of this client; it is
+     * never posted to a registration endpoint. With `clientMetadataUrl` it must
+     * mirror the hosted document: `client_name` and at least one redirect URI.
      */
-    clientMetadata: OAuthClientMetadata;
+    clientMetadata: MCPClientMetadata;
     /**
-     * Pre-registered client information.
-     * If provided, skips dynamic client registration.
+     * Client information for a client pre-registered with the authorization server.
      */
     clientInformation?: OAuthClientInformation;
     /**
-     * Storage for persisting OAuth data (tokens, client info, etc.).
-     * Defaults to InMemoryOAuthStorage if not provided.
+     * HTTPS URL of this client's Client ID Metadata Document (SEP-991).
+     *
+     * The URL is used as the `client_id`; the authorization server fetches the
+     * document to learn the client's metadata. Must be an HTTPS URL with a
+     * non-root pathname.
+     */
+    clientMetadataUrl?: string;
+    /**
+     * Storage for persisting OAuth data (tokens, discovery state and the PKCE
+     * verifier). Defaults to InMemoryOAuthStorage if not provided.
+     *
+     * Tokens are keyed by the authorization server's validated `issuer`, and
+     * mutation ordering is coordinated only within one provider instance, so
+     * give each provider its own storage namespace.
      */
     storage?: OAuthStorage;
     /**
@@ -86,19 +113,19 @@ export interface MCPOAuthClientProviderOptions {
 /**
  * Mastra's OAuth Client Provider implementation.
  *
- * This provider handles the OAuth 2.1 flow for connecting to OAuth-protected
- * MCP servers, including:
- * - Dynamic client registration (RFC 7591)
+ * This provider handles the OAuth 2.1 authorization-code flow for connecting to
+ * OAuth-protected MCP servers, including:
+ * - Pre-registered or URL-based (Client ID Metadata Document) client identity
  * - PKCE (Proof Key for Code Exchange)
  * - Token storage and refresh
  *
  * @example
  * ```typescript
- * import { MCPClient, MCPOAuthClientProvider, InMemoryOAuthStorage } from '@mastra/mcp';
+ * import { MCPClient, MCPOAuthClientProvider } from '@mastra/mcp';
  *
- * // Create the OAuth provider
  * const oauthProvider = new MCPOAuthClientProvider({
  *   redirectUrl: 'http://localhost:3000/oauth/callback',
+ *   clientMetadataUrl: 'https://my-app.example.com/oauth/client-metadata.json',
  *   clientMetadata: {
  *     redirect_uris: ['http://localhost:3000/oauth/callback'],
  *     client_name: 'My MCP Client',
@@ -106,33 +133,31 @@ export interface MCPOAuthClientProviderOptions {
  *     response_types: ['code'],
  *   },
  *   onRedirectToAuthorization: (url) => {
- *     // Open URL in browser for CLI, or redirect response for web
  *     console.log(`Please visit: ${url}`);
  *   },
  * });
  *
- * // Create the MCP client with OAuth
  * const client = new MCPClient({
  *   servers: {
  *     'protected-server': {
- *       url: 'https://mcp.example.com/mcp',
+ *       url: new URL('https://mcp.example.com/mcp'),
  *       authProvider: oauthProvider,
  *     },
  *   },
  * });
- *
- * await client.connect();
  * ```
  */
 export declare class MCPOAuthClientProvider implements OAuthClientProvider {
     private _redirectUrl;
-    private _clientMetadata;
+    private readonly _clientMetadata;
+    private readonly _clientMetadataUrl?;
+    private readonly _clientInfo?;
     private readonly storage;
     private readonly onRedirect?;
     private readonly generateState;
-    private _clientInfo?;
     private _sessionState?;
     private _sessionRedirectUrl?;
+    private credentialMutation;
     constructor(options: MCPOAuthClientProviderOptions);
     /**
      * The URL to redirect the user agent to after authorization.
@@ -142,6 +167,10 @@ export declare class MCPOAuthClientProvider implements OAuthClientProvider {
      * Metadata about this OAuth client.
      */
     get clientMetadata(): OAuthClientMetadata;
+    /**
+     * URL of this client's Client ID Metadata Document, when identity is URL-based.
+     */
+    get clientMetadataUrl(): string | undefined;
     /**
      * Returns a OAuth2 state parameter.
      *
@@ -172,30 +201,50 @@ export declare class MCPOAuthClientProvider implements OAuthClientProvider {
      *
      * Loopback callback servers may bind a fallback port when the preferred one
      * is in use. Call this before triggering authorization so the authorization
-     * request's redirect_uri matches the listening server, and so dynamic client
-     * registration registers every candidate callback URL (see
-     * getCallbackUrlCandidates) rather than only the preferred one.
+     * request's redirect_uri matches the listening server. The bound URL must be
+     * one of the redirect URIs the client is registered with (or lists in its
+     * metadata document).
      *
      * @param redirectUrl - The callback URL that is actually bound
-     * @param registeredRedirectUris - The redirect URIs to register during dynamic client registration
      */
-    applyResolvedRedirectUrl(redirectUrl: string | URL, registeredRedirectUris: (string | URL)[]): void;
+    applyResolvedRedirectUrl(redirectUrl: string | URL): void;
     /**
-     * Loads information about this OAuth client.
+     * The client's identity: pre-registered information, or the metadata
+     * document URL used as `client_id`.
      */
-    clientInformation(): Promise<OAuthClientInformation | undefined>;
+    clientInformation(): OAuthClientInformation;
+    private tokensKey;
     /**
-     * Saves dynamically registered client information.
+     * Serializes storage mutations so concurrent writes and invalidations settle
+     * in call order: a write started before `invalidateCredentials` cannot land
+     * after it completes.
      */
-    saveClientInformation(clientInformation: OAuthClientInformationFull): Promise<void>;
+    private enqueueCredentialMutation;
+    private readStored;
+    private readIssuerIndex;
+    private rememberIssuer;
     /**
      * Loads existing OAuth tokens.
+     *
+     * With an issuer context, only tokens minted by that authorization server are
+     * returned; without one, the most recently saved token set is returned for
+     * the transport's bearer-token read.
+     */
+    tokens(ctx?: OAuthClientInformationContext): Promise<StoredOAuthTokens | undefined>;
+    /**
+     * Stores new OAuth tokens after successful authorization, bound to the
+     * authorization server's issuer when known.
+     */
+    saveTokens(tokens: StoredOAuthTokens, ctx?: OAuthClientInformationContext): Promise<void>;
+    /**
+     * Persists authorization-server discovery state so the callback leg can
+     * verify the code is exchanged with the server that issued the redirect.
      */
-    tokens(): Promise<OAuthTokens | undefined>;
+    saveDiscoveryState(state: OAuthDiscoveryState): Promise<void>;
     /**
-     * Stores new OAuth tokens after successful authorization.
+     * Loads persisted authorization-server discovery state.
      */
-    saveTokens(tokens: OAuthTokens): Promise<void>;
+    discoveryState(): Promise<OAuthDiscoveryState | undefined>;
     /**
      * Invoked to redirect the user agent to the authorization URL.
      */
@@ -209,16 +258,17 @@ export declare class MCPOAuthClientProvider implements OAuthClientProvider {
      */
     codeVerifier(): Promise<string>;
     /**
-     * Invalidate credentials when server indicates they're no longer valid.
+     * Invalidate stored credentials when the server indicates they're no longer valid.
+     * Client identity is configuration, so the `client` scope has nothing to discard.
      */
-    invalidateCredentials(scope: 'all' | 'client' | 'tokens' | 'verifier'): Promise<void>;
+    invalidateCredentials(scope: 'all' | 'client' | 'tokens' | 'verifier' | 'discovery'): Promise<void>;
     /**
      * Clear all stored OAuth data.
      * Useful for logging out or resetting state.
      */
     clear(): Promise<void>;
     /**
-     * Check if the provider has valid (non-expired) tokens.
+     * Check if the provider has tokens with an access token.
      */
     hasValidTokens(): Promise<boolean>;
 }
@@ -240,19 +290,15 @@ export declare class MCPOAuthClientProvider implements OAuthClientProvider {
  *     redirect_uris: ['http://localhost:3000/callback'],
  *     client_name: 'Test Client',
  *   },
- * });
- *
- * const client = new MCPClient({
- *   servers: {
- *     test: { url: 'https://mcp.example.com', authProvider: provider }
- *   },
+ *   clientInformation: { client_id: 'test-client' },
  * });
  * ```
  */
 export declare function createSimpleTokenProvider(accessToken: string, options: {
     redirectUrl: string | URL;
     clientMetadata: OAuthClientMetadata;
-    clientInformation?: OAuthClientInformation;
+    /** Client identity used if the token must be refreshed. */
+    clientInformation: OAuthClientInformation;
     tokenType?: string;
     refreshToken?: string;
     expiresIn?: number;

package/dist/client/oauth-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/client/oauth-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/client/oauth-provider.ts"],"names":[],"mappings":"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"}