@ai-sdk/mcp 2.0.65 → 2.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/mcp",
-  "version": "2.0.65",
+  "version": "2.0.67",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -31,8 +31,8 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/provider": "4.0.21",
-    "@ai-sdk/provider-utils": "5.0.53",
+    "@ai-sdk/provider": "4.0.22",
+    "@ai-sdk/provider-utils": "5.0.54",
     "cross-spawn": "^7.0.6",
     "pkce-challenge": "^5.0.1"
   },

package/src/error/oauth-error.ts

@@ -42,6 +42,24 @@ export class UnauthorizedClientError extends MCPClientOAuthError {
   static errorCode = 'unauthorized_client';
 }
 
+const mismatchName = 'AI_AuthorizationServerMismatchError';
+const mismatchMarker = `vercel.ai.error.${mismatchName}`;
+const mismatchSymbol = Symbol.for(mismatchMarker);
+
+export class AuthorizationServerMismatchError extends MCPClientOAuthError {
+  private readonly [mismatchSymbol] = true;
+
+  static errorCode = 'authorization_server_mismatch';
+
+  constructor({ message, cause }: { message: string; cause?: unknown }) {
+    super({ name: 'AuthorizationServerMismatchError', message, cause });
+  }
+
+  static isInstance(error: unknown): error is AuthorizationServerMismatchError {
+    return AISDKError.hasMarker(error, mismatchMarker);
+  }
+}
+
 export const OAUTH_ERRORS = {
   [ServerError.errorCode]: ServerError,
   [InvalidClientError.errorCode]: InvalidClientError,

package/src/index.ts

@@ -41,6 +41,11 @@ export type {
   ClientCapabilities as MCPClientCapabilities,
 } from './tool/types';
 export { auth, UnauthorizedError } from './tool/oauth';
+export {
+  MCPClientOAuthError,
+  AuthorizationServerMismatchError,
+} from './error/oauth-error';
+export { MCPClientError } from './error/mcp-client-error';
 export type {
   OAuthAuthorizationServerInformation,
   OAuthClientProvider,

package/src/tool/mcp-sse-transport.ts

@@ -190,6 +190,10 @@ export class SseMCPTransport implements MCPTransport {
                 const { done, value } = await reader.read();
 
                 if (done) {
+                  if (this.abortController?.signal.aborted) {
+                    return;
+                  }
+
                   if (this.connected) {
                     this.connected = false;
                     throw new MCPClientError({
@@ -197,7 +201,11 @@ export class SseMCPTransport implements MCPTransport {
                         'MCP SSE Transport Error: Connection closed unexpectedly',
                     });
                   }
-                  return;
+
+                  throw new MCPClientError({
+                    message:
+                      'MCP SSE Transport Error: Connection closed before endpoint event was received',
+                  });
                 }
 
                 const { event, data } = value;

package/src/tool/oauth.ts

@@ -20,6 +20,7 @@ import {
   InvalidClientError,
   InvalidGrantError,
   UnauthorizedClientError,
+  AuthorizationServerMismatchError,
 } from '../error/oauth-error';
 import {
   resourceUrlFromServerUrl,
@@ -360,7 +361,7 @@ function assertAuthorizationServerInformationMatches({
     storedAuthorizationServerInformation.tokenEndpoint !==
       currentAuthorizationServerInformation.tokenEndpoint
   ) {
-    throw new MCPClientOAuthError({
+    throw new AuthorizationServerMismatchError({
       message:
         'OAuth authorization server metadata does not match the metadata that issued the stored credentials',
     });
@@ -1284,14 +1285,11 @@ export async function auth(
 
       await provider.invalidateCredentials?.('all');
       return await authInternal(provider, options);
-    } else if (error instanceof InvalidGrantError) {
-      if (refreshAttempt.tokens) {
-        await provider.invalidateCredentials?.('tokens', {
-          tokens: refreshAttempt.tokens,
-        });
-      } else {
-        await provider.invalidateCredentials?.('tokens');
-      }
+    } else if (error instanceof InvalidGrantError && refreshAttempt.tokens) {
+      // Only invalidate the tokens used by a failed refresh.
+      await provider.invalidateCredentials?.('tokens', {
+        tokens: refreshAttempt.tokens,
+      });
       return await authInternal(provider, options);
     }