@ai-sdk/mcp 2.0.58 → 2.0.61

package/dist/index.js

@@ -520,17 +520,25 @@ var MCPClientOAuthError = class extends (_b2 = AISDKError2, _a2 = symbol2, _b2)
   }
 };
 var ServerError = class extends MCPClientOAuthError {
+  static {
+    this.errorCode = "server_error";
+  }
 };
-ServerError.errorCode = "server_error";
 var InvalidClientError = class extends MCPClientOAuthError {
+  static {
+    this.errorCode = "invalid_client";
+  }
 };
-InvalidClientError.errorCode = "invalid_client";
 var InvalidGrantError = class extends MCPClientOAuthError {
+  static {
+    this.errorCode = "invalid_grant";
+  }
 };
-InvalidGrantError.errorCode = "invalid_grant";
 var UnauthorizedClientError = class extends MCPClientOAuthError {
+  static {
+    this.errorCode = "unauthorized_client";
+  }
 };
-UnauthorizedClientError.errorCode = "unauthorized_client";
 var OAUTH_ERRORS = {
   [ServerError.errorCode]: ServerError,
   [InvalidClientError.errorCode]: InvalidClientError,
@@ -571,7 +579,7 @@ function checkResourceAllowed({
 // src/tool/oauth.ts
 import {
   fetchWithValidatedEndpoint,
-  fetchWithValidatedRedirects,
+  fetchUntrustedUrl,
   parseJSON as parseJSON2,
   validateDownloadUrl
 } from "@ai-sdk/provider-utils";
@@ -616,12 +624,11 @@ function validateAuthorizationResponseIssuer({
   }
 }
 function createAuthorizationServerInformation(authorizationServerUrl, metadata) {
-  var _a3;
   return {
-    issuer: (_a3 = metadata == null ? void 0 : metadata.issuer) != null ? _a3 : String(authorizationServerUrl),
+    issuer: metadata?.issuer ?? String(authorizationServerUrl),
     authorizationServerUrl: normalizeUrl(authorizationServerUrl),
     tokenEndpoint: normalizeUrl(
-      (metadata == null ? void 0 : metadata.token_endpoint) ? new URL(metadata.token_endpoint) : new URL("/token", authorizationServerUrl)
+      metadata?.token_endpoint ? new URL(metadata.token_endpoint) : new URL("/token", authorizationServerUrl)
     )
   };
 }
@@ -642,7 +649,7 @@ function addAuthorizationServerInformationToClientInformation(clientInformation,
   };
 }
 function getAuthorizationServerInformationFromCredentials(credentials) {
-  if (!(credentials == null ? void 0 : credentials.authorization_server) || !credentials.token_endpoint) {
+  if (!credentials?.authorization_server || !credentials.token_endpoint) {
     return void 0;
   }
   return {
@@ -656,12 +663,11 @@ async function getStoredAuthorizationServerInformation({
   clientInformation,
   tokens
 }) {
-  var _a3;
   const tokenAuthorizationServerInformation = getAuthorizationServerInformationFromCredentials(tokens);
   if (tokenAuthorizationServerInformation) {
     return tokenAuthorizationServerInformation;
   }
-  const providerAuthorizationServerInformation = await ((_a3 = provider.authorizationServerInformation) == null ? void 0 : _a3.call(provider));
+  const providerAuthorizationServerInformation = await provider.authorizationServerInformation?.();
   if (providerAuthorizationServerInformation) {
     return {
       issuer: providerAuthorizationServerInformation.issuer,
@@ -719,8 +725,7 @@ function assertAuthorizationServerInformationMatches({
   }
 }
 function extractWWWAuthenticateParams(response) {
-  var _a3, _b3;
-  const header = (_a3 = response.headers.get("www-authenticate")) != null ? _a3 : response.headers.get("WWW-Authenticate");
+  const header = response.headers.get("www-authenticate") ?? response.headers.get("WWW-Authenticate");
   if (!header) {
     return {};
   }
@@ -731,11 +736,11 @@ function extractWWWAuthenticateParams(response) {
   const resourceMetadataMatch = header.match(
     /(?:^|[,\s])resource_metadata="([^"]*)"/i
   );
-  const scope = (_b3 = header.match(/(?:^|[,\s])scope="([^"]*)"/i)) == null ? void 0 : _b3[1];
+  const scope = header.match(/(?:^|[,\s])scope="([^"]*)"/i)?.[1];
   let resourceMetadataUrl;
   try {
     resourceMetadataUrl = resourceMetadataMatch ? new URL(resourceMetadataMatch[1]) : void 0;
-  } catch (e) {
+  } catch {
   }
   return { resourceMetadataUrl, scope };
 }
@@ -744,11 +749,10 @@ function selectScope({
   resourceMetadata,
   clientMetadata
 }) {
-  var _a3;
   if (scope) {
     return scope;
   }
-  const resourceScopes = (_a3 = resourceMetadata == null ? void 0 : resourceMetadata.scopes_supported) == null ? void 0 : _a3.join(" ");
+  const resourceScopes = resourceMetadata?.scopes_supported?.join(" ");
   if (resourceScopes) {
     return resourceScopes;
   }
@@ -762,20 +766,21 @@ function buildWellKnownPath(wellKnownPrefix, pathname = "", options = {}) {
 }
 async function fetchWithCorsRetry(url, headers, fetchFn = fetch, trustedOrigin) {
   try {
-    return await fetchWithValidatedRedirects({
+    return await fetchUntrustedUrl({
       url: url.href,
       fetch: async (input, init) => fetchWithValidatedEndpoint({
         url: input,
         init: {
           ...init,
-          headers: new Headers(init == null ? void 0 : init.headers).has("MCP-Protocol-Version") ? headers : void 0
+          headers: new Headers(init?.headers).has("MCP-Protocol-Version") ? headers : void 0
         },
         fetch: fetchFn,
         trustedOrigin,
         redirect: "manual"
       }),
       headers,
-      trustedOrigin
+      trustedOrigin,
+      untrustedFirstHopHeaders: ["mcp-protocol-version"]
     });
   } catch (error) {
     if (error instanceof TypeError) {
@@ -798,30 +803,29 @@ function shouldAttemptFallback(response, pathname) {
   return !response || response.status >= 400 && response.status < 500 && pathname !== "/";
 }
 async function discoverMetadataWithFallback(serverUrl, wellKnownType, fetchFn, opts) {
-  var _a3, _b3;
   const issuer = new URL(serverUrl);
-  const protocolVersion = (_a3 = opts == null ? void 0 : opts.protocolVersion) != null ? _a3 : LATEST_PROTOCOL_VERSION;
+  const protocolVersion = opts?.protocolVersion ?? LATEST_PROTOCOL_VERSION;
   let url;
-  if (opts == null ? void 0 : opts.metadataUrl) {
+  if (opts?.metadataUrl) {
     url = new URL(opts.metadataUrl);
   } else {
     const wellKnownPath = buildWellKnownPath(wellKnownType, issuer.pathname);
-    url = new URL(wellKnownPath, (_b3 = opts == null ? void 0 : opts.metadataServerUrl) != null ? _b3 : issuer);
+    url = new URL(wellKnownPath, opts?.metadataServerUrl ?? issuer);
     url.search = issuer.search;
   }
   let response = await tryMetadataDiscovery(
     url,
     protocolVersion,
     fetchFn,
-    opts == null ? void 0 : opts.trustedOrigin
+    opts?.trustedOrigin
   );
-  if (!(opts == null ? void 0 : opts.metadataUrl) && shouldAttemptFallback(response, issuer.pathname)) {
+  if (!opts?.metadataUrl && shouldAttemptFallback(response, issuer.pathname)) {
     const rootUrl = new URL(`/.well-known/${wellKnownType}`, issuer);
     response = await tryMetadataDiscovery(
       rootUrl,
       protocolVersion,
       fetchFn,
-      opts == null ? void 0 : opts.trustedOrigin
+      opts?.trustedOrigin
     );
   }
   return response;
@@ -832,8 +836,8 @@ async function discoverOAuthProtectedResourceMetadata(serverUrl, opts, fetchFn =
     "oauth-protected-resource",
     fetchFn,
     {
-      protocolVersion: opts == null ? void 0 : opts.protocolVersion,
-      metadataUrl: opts == null ? void 0 : opts.resourceMetadataUrl,
+      protocolVersion: opts?.protocolVersion,
+      metadataUrl: opts?.resourceMetadataUrl,
       // The configured MCP server is trusted as a request target. Redirects
       // crossing its origin are still validated before they are followed.
       trustedOrigin: new URL(serverUrl).origin
@@ -912,7 +916,6 @@ async function discoverAuthorizationServerMetadata(authorizationServerUrl, {
   protocolVersion = LATEST_PROTOCOL_VERSION,
   trustedOrigin
 } = {}) {
-  var _a3;
   const headers = { "MCP-Protocol-Version": protocolVersion };
   const urlsToTry = buildDiscoveryUrls(authorizationServerUrl);
   for (const { url: endpointUrl, type, expectedIssuer } of urlsToTry) {
@@ -942,7 +945,7 @@ async function discoverAuthorizationServerMetadata(authorizationServerUrl, {
         await response.json()
       );
       assertMetadataIssuerMatches(metadata, expectedIssuer);
-      if (!((_a3 = metadata.code_challenge_methods_supported) == null ? void 0 : _a3.includes("S256"))) {
+      if (!metadata.code_challenge_methods_supported?.includes("S256")) {
         throw new Error(
           `Incompatible OIDC provider at ${endpointUrl}: does not support S256 code challenge method required by MCP specification`
         );
@@ -994,7 +997,7 @@ async function startAuthorization(authorizationServerUrl, {
   if (scope) {
     authorizationUrl.searchParams.set("scope", scope);
   }
-  if (scope == null ? void 0 : scope.includes("offline_access")) {
+  if (scope?.includes("offline_access")) {
     authorizationUrl.searchParams.append("prompt", "consent");
   }
   if (resource) {
@@ -1083,14 +1086,13 @@ async function exchangeAuthorization(authorizationServerUrl, {
   addClientAuthentication,
   fetchFn
 }) {
-  var _a3;
   const grantType = "authorization_code";
-  const tokenUrl = (metadata == null ? void 0 : metadata.token_endpoint) ? new URL(metadata.token_endpoint) : new URL("/token", authorizationServerUrl);
+  const tokenUrl = metadata?.token_endpoint ? new URL(metadata.token_endpoint) : new URL("/token", authorizationServerUrl);
   const trustedOrigin = getTrustedLoopbackOrigin(authorizationServerUrl);
   assertSafeOAuthEndpoint(tokenUrl, {
     allowLoopback: tokenUrl.origin === trustedOrigin
   });
-  if ((metadata == null ? void 0 : metadata.grant_types_supported) && !metadata.grant_types_supported.includes(grantType)) {
+  if (metadata?.grant_types_supported && !metadata.grant_types_supported.includes(grantType)) {
     throw new Error(
       `Incompatible auth server: does not support grant type ${grantType}`
     );
@@ -1113,7 +1115,7 @@ async function exchangeAuthorization(authorizationServerUrl, {
       metadata
     );
   } else {
-    const supportedMethods = (_a3 = metadata == null ? void 0 : metadata.token_endpoint_auth_methods_supported) != null ? _a3 : [];
+    const supportedMethods = metadata?.token_endpoint_auth_methods_supported ?? [];
     const authMethod = selectClientAuthMethod(
       clientInformation,
       supportedMethods
@@ -1146,7 +1148,6 @@ async function refreshAuthorization(authorizationServerUrl, {
   addClientAuthentication,
   fetchFn
 }) {
-  var _a3;
   const grantType = "refresh_token";
   let tokenUrl;
   if (metadata) {
@@ -1179,7 +1180,7 @@ async function refreshAuthorization(authorizationServerUrl, {
       metadata
     );
   } else {
-    const supportedMethods = (_a3 = metadata == null ? void 0 : metadata.token_endpoint_auth_methods_supported) != null ? _a3 : [];
+    const supportedMethods = metadata?.token_endpoint_auth_methods_supported ?? [];
     const authMethod = selectClientAuthMethod(
       clientInformation,
       supportedMethods
@@ -1212,7 +1213,6 @@ async function registerClient(authorizationServerUrl, {
   clientMetadata,
   fetchFn
 }) {
-  var _a3;
   let registrationUrl;
   if (metadata) {
     if (!metadata.registration_endpoint) {
@@ -1228,7 +1228,7 @@ async function registerClient(authorizationServerUrl, {
   assertSafeOAuthEndpoint(registrationUrl, {
     allowLoopback: registrationUrl.origin === trustedOrigin
   });
-  const applicationType = (_a3 = clientMetadata.application_type) != null ? _a3 : inferOAuthApplicationType(clientMetadata.redirect_uris);
+  const applicationType = clientMetadata.application_type ?? inferOAuthApplicationType(clientMetadata.redirect_uris);
   const response = await fetchWithValidatedEndpoint({
     url: registrationUrl,
     init: {
@@ -1257,18 +1257,17 @@ function inferOAuthApplicationType(redirectUris) {
   return redirectUris.every(isNativeRedirectUri) ? "native" : "web";
 }
 async function auth(provider, options) {
-  var _a3, _b3, _c;
   try {
     return await authInternal(provider, options);
   } catch (error) {
     if (error instanceof InvalidClientError || error instanceof UnauthorizedClientError) {
-      if (options.authorizationCode !== void 0 || !await ((_a3 = provider.isClientInformationDynamicallyRegistered) == null ? void 0 : _a3.call(provider))) {
+      if (options.authorizationCode !== void 0 || !await provider.isClientInformationDynamicallyRegistered?.()) {
         throw error;
       }
-      await ((_b3 = provider.invalidateCredentials) == null ? void 0 : _b3.call(provider, "all"));
+      await provider.invalidateCredentials?.("all");
       return await authInternal(provider, options);
     } else if (error instanceof InvalidGrantError) {
-      await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens"));
+      await provider.invalidateCredentials?.("tokens");
       return await authInternal(provider, options);
     }
     throw error;
@@ -1279,7 +1278,7 @@ async function selectResourceURL(serverUrl, provider, resourceMetadata) {
   if (provider.validateResourceURL) {
     return await provider.validateResourceURL(
       defaultResource,
-      resourceMetadata == null ? void 0 : resourceMetadata.resource
+      resourceMetadata?.resource
     );
   }
   if (!resourceMetadata) {
@@ -1304,7 +1303,6 @@ async function authInternal(provider, {
   resourceMetadataUrl,
   fetchFn
 }) {
-  var _a3, _b3, _c, _d, _e;
   let resourceMetadata;
   let authorizationServerUrl;
   let clientInformation;
@@ -1319,7 +1317,7 @@ async function authInternal(provider, {
     if (resourceMetadata.authorization_servers && resourceMetadata.authorization_servers.length > 0) {
       authorizationServerUrl = resourceMetadata.authorization_servers[0];
     }
-  } catch (e) {
+  } catch {
   }
   if (authorizationCode !== void 0) {
     clientInformation = await Promise.resolve(provider.clientInformation());
@@ -1331,7 +1329,7 @@ async function authInternal(provider, {
     }
   }
   if (!authorizationServerUrl) {
-    authorizationServerUrl = (_a3 = callbackAuthorizationServerInformation == null ? void 0 : callbackAuthorizationServerInformation.authorizationServerUrl) != null ? _a3 : serverUrl;
+    authorizationServerUrl = callbackAuthorizationServerInformation?.authorizationServerUrl ?? serverUrl;
   }
   const parsedServerUrl = new URL(serverUrl);
   const parsedAuthorizationServerUrl = new URL(authorizationServerUrl);
@@ -1346,11 +1344,10 @@ async function authInternal(provider, {
     provider,
     resourceMetadata
   );
-  await ((_b3 = provider.validateAuthorizationServerURL) == null ? void 0 : _b3.call(
-    provider,
+  await provider.validateAuthorizationServerURL?.(
     serverUrl,
     authorizationServerUrl
-  ));
+  );
   const metadata = await discoverAuthorizationServerMetadata(
     authorizationServerUrl,
     {
@@ -1368,8 +1365,8 @@ async function authInternal(provider, {
   if (authorizationCode === void 0) {
     clientInformation = await Promise.resolve(provider.clientInformation());
   }
-  if ((clientInformation == null ? void 0 : clientInformation.issuer) != null) {
-    const storedAuthorizationServerInformation = callbackAuthorizationServerInformation != null ? callbackAuthorizationServerInformation : await getStoredAuthorizationServerInformation({
+  if (clientInformation?.issuer != null) {
+    const storedAuthorizationServerInformation = callbackAuthorizationServerInformation ?? await getStoredAuthorizationServerInformation({
       provider,
       clientInformation
     });
@@ -1414,7 +1411,7 @@ async function authInternal(provider, {
         );
       }
     }
-    const storedAuthorizationServerInformation = callbackAuthorizationServerInformation != null ? callbackAuthorizationServerInformation : await getStoredAuthorizationServerInformation({
+    const storedAuthorizationServerInformation = callbackAuthorizationServerInformation ?? await getStoredAuthorizationServerInformation({
       provider,
       clientInformation
     });
@@ -1425,7 +1422,7 @@ async function authInternal(provider, {
     }
     validateAuthorizationResponseIssuer({
       callbackIssuer,
-      expectedIssuer: (_d = (_c = storedAuthorizationServerInformation.issuer) != null ? _c : metadata == null ? void 0 : metadata.issuer) != null ? _d : String(authorizationServerUrl)
+      expectedIssuer: storedAuthorizationServerInformation.issuer ?? metadata?.issuer ?? String(authorizationServerUrl)
     });
     assertAuthorizationServerInformationMatches({
       storedAuthorizationServerInformation,
@@ -1451,7 +1448,7 @@ async function authInternal(provider, {
     return "AUTHORIZED";
   }
   const tokens = await provider.tokens();
-  if (tokens == null ? void 0 : tokens.refresh_token) {
+  if (tokens?.refresh_token) {
     const storedAuthorizationServerInformation = await getStoredAuthorizationServerInformation({
       provider,
       clientInformation,
@@ -1463,7 +1460,7 @@ async function authInternal(provider, {
         currentAuthorizationServerInformation
       });
     } else {
-      await ((_e = provider.invalidateCredentials) == null ? void 0 : _e.call(provider, "tokens"));
+      await provider.invalidateCredentials?.("tokens");
     }
     try {
       if (storedAuthorizationServerInformation) {
@@ -1540,21 +1537,20 @@ var SseMCPTransport = class {
     this.headers = headers;
     this.authProvider = authProvider;
     this.redirectMode = redirect;
-    this.fetchFn = fetchFn != null ? fetchFn : globalThis.fetch;
+    this.fetchFn = fetchFn ?? globalThis.fetch;
   }
   setProtocolVersion(version) {
     this.protocolVersion = version;
   }
   async commonHeaders(base) {
-    var _a3;
     const headers = {
       ...this.headers,
       ...base,
-      "mcp-protocol-version": (_a3 = this.protocolVersion) != null ? _a3 : LATEST_LEGACY_PROTOCOL_VERSION
+      "mcp-protocol-version": this.protocolVersion ?? LATEST_LEGACY_PROTOCOL_VERSION
     };
     if (this.authProvider) {
       const tokens = await this.authProvider.tokens();
-      if (tokens == null ? void 0 : tokens.access_token) {
+      if (tokens?.access_token) {
         headers["Authorization"] = `Bearer ${tokens.access_token}`;
       }
     }
@@ -1584,8 +1580,7 @@ var SseMCPTransport = class {
     return this.authPromise;
   }
   async accessTokenChanged(requestAuthorization) {
-    var _a3, _b3;
-    const accessToken = (_b3 = await ((_a3 = this.authProvider) == null ? void 0 : _a3.tokens())) == null ? void 0 : _b3.access_token;
+    const accessToken = (await this.authProvider?.tokens())?.access_token;
     return accessToken != null && requestAuthorization !== `Bearer ${accessToken}`;
   }
   async start() {
@@ -1595,14 +1590,13 @@ var SseMCPTransport = class {
       }
       this.abortController = new AbortController();
       const establishConnection = async (triedAuth = false) => {
-        var _a3, _b3, _c, _d, _e;
         try {
           const headers = await this.commonHeaders({
             Accept: "text/event-stream"
           });
           const response = await this.fetchFn(this.url.href, {
             headers,
-            signal: (_a3 = this.abortController) == null ? void 0 : _a3.signal,
+            signal: this.abortController?.signal,
             redirect: this.redirectMode
           });
           if (response.status === 401 && this.authProvider && !triedAuth) {
@@ -1615,11 +1609,11 @@ var SseMCPTransport = class {
               );
               if (result !== "AUTHORIZED") {
                 const error = new UnauthorizedError();
-                (_b3 = this.onerror) == null ? void 0 : _b3.call(this, error);
+                this.onerror?.(error);
                 return reject(error);
               }
             } catch (error) {
-              (_c = this.onerror) == null ? void 0 : _c.call(this, error);
+              this.onerror?.(error);
               return reject(error);
             }
             return establishConnection(true);
@@ -1632,13 +1626,12 @@ var SseMCPTransport = class {
             const error = new MCPClientError({
               message: errorMessage
             });
-            (_d = this.onerror) == null ? void 0 : _d.call(this, error);
+            this.onerror?.(error);
             return reject(error);
           }
           const stream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream());
           const reader = stream.getReader();
           const processEvents = async () => {
-            var _a4, _b4, _c2, _d2, _e2;
             try {
               while (true) {
                 const { done, value } = await reader.read();
@@ -1660,8 +1653,8 @@ var SseMCPTransport = class {
                   if (endpoint.origin !== this.url.origin) {
                     this.connected = false;
                     this.endpoint = void 0;
-                    (_a4 = this.sseConnection) == null ? void 0 : _a4.close();
-                    (_b4 = this.abortController) == null ? void 0 : _b4.abort();
+                    this.sseConnection?.close();
+                    this.abortController?.abort();
                     throw new MCPClientError({
                       message: `MCP SSE Transport Error: Endpoint origin does not match connection origin: ${endpoint.origin}`
                     });
@@ -1672,13 +1665,13 @@ var SseMCPTransport = class {
                 } else if (isMessageEvent(event)) {
                   try {
                     const message = await parseJSONRPCMessage(data);
-                    (_c2 = this.onmessage) == null ? void 0 : _c2.call(this, message);
+                    this.onmessage?.(message);
                   } catch (error) {
                     const e = new MCPClientError({
                       message: "MCP SSE Transport Error: Failed to parse message",
                       cause: error
                     });
-                    (_d2 = this.onerror) == null ? void 0 : _d2.call(this, e);
+                    this.onerror?.(e);
                   }
                 }
               }
@@ -1686,7 +1679,7 @@ var SseMCPTransport = class {
               if (error instanceof Error && error.name === "AbortError") {
                 return;
               }
-              (_e2 = this.onerror) == null ? void 0 : _e2.call(this, error);
+              this.onerror?.(error);
               reject(error);
             }
           };
@@ -1698,7 +1691,7 @@ var SseMCPTransport = class {
           if (error instanceof Error && error.name === "AbortError") {
             return;
           }
-          (_e = this.onerror) == null ? void 0 : _e.call(this, error);
+          this.onerror?.(error);
           reject(error);
         }
       };
@@ -1706,26 +1699,23 @@ var SseMCPTransport = class {
     });
   }
   async close() {
-    var _a3, _b3, _c;
     this.connected = false;
     this.endpoint = void 0;
-    (_a3 = this.sseConnection) == null ? void 0 : _a3.close();
-    (_b3 = this.abortController) == null ? void 0 : _b3.abort();
-    (_c = this.onclose) == null ? void 0 : _c.call(this);
+    this.sseConnection?.close();
+    this.abortController?.abort();
+    this.onclose?.();
   }
   async send(message, options) {
-    var _a3, _b3;
-    (_a3 = options == null ? void 0 : options.signal) == null ? void 0 : _a3.throwIfAborted();
+    options?.signal?.throwIfAborted();
     if (!this.endpoint || !this.connected) {
       throw new MCPClientError({
         message: "MCP SSE Transport Error: Not connected"
       });
     }
     const endpoint = this.endpoint;
-    const transportSignal = (_b3 = this.abortController) == null ? void 0 : _b3.signal;
-    const requestSignal = (options == null ? void 0 : options.signal) == null ? transportSignal : transportSignal == null ? options.signal : AbortSignal.any([transportSignal, options.signal]);
+    const transportSignal = this.abortController?.signal;
+    const requestSignal = options?.signal == null ? transportSignal : transportSignal == null ? options.signal : AbortSignal.any([transportSignal, options.signal]);
     const attempt = async (triedAuth = false) => {
-      var _a4, _b4, _c;
       try {
         const headers = await this.commonHeaders({
           "Content-Type": "application/json"
@@ -1740,7 +1730,7 @@ var SseMCPTransport = class {
         const response = await this.fetchFn(endpoint.href, init);
         if (response.status === 401 && this.authProvider && !triedAuth) {
           if (await this.accessTokenChanged(
-            (_a4 = new Headers(headers).get("authorization")) != null ? _a4 : void 0
+            new Headers(headers).get("authorization") ?? void 0
           )) {
             return attempt(true);
           }
@@ -1761,15 +1751,15 @@ var SseMCPTransport = class {
             message: `MCP SSE Transport Error: POSTing to endpoint (HTTP ${response.status}): ${text}`,
             statusCode: response.status,
             url: endpoint.href,
-            responseBody: text != null ? text : void 0
+            responseBody: text ?? void 0
           });
           throw error;
         }
       } catch (error) {
-        if ((_b4 = options == null ? void 0 : options.signal) == null ? void 0 : _b4.aborted) {
+        if (options?.signal?.aborted) {
           throw error;
         }
-        (_c = this.onerror) == null ? void 0 : _c.call(this, error);
+        this.onerror?.(error);
         throw error;
       }
     };
@@ -1914,20 +1904,19 @@ var HttpMCPTransport = class {
     this.authProvider = authProvider;
     this.redirectMode = redirect;
     this.sessionId = initialSessionId;
-    this.protocolVersion = initialProtocolVersion != null ? initialProtocolVersion : LATEST_LEGACY_PROTOCOL_VERSION;
+    this.protocolVersion = initialProtocolVersion ?? LATEST_LEGACY_PROTOCOL_VERSION;
     this.onSessionIdChange = onSessionIdChange;
     this.onSessionExpired = onSessionExpired;
     this.terminateSessionOnClose = terminateSessionOnClose;
-    this.fetchFn = fetchFn != null ? fetchFn : globalThis.fetch;
+    this.fetchFn = fetchFn ?? globalThis.fetch;
   }
   setProtocolVersion(version) {
-    var _a3;
     this.protocolVersion = version;
     if (!this.abortController) {
       return;
     }
     if (this.isModernProtocol()) {
-      (_a3 = this.inboundSseConnection) == null ? void 0 : _a3.close();
+      this.inboundSseConnection?.close();
       this.inboundSseConnection = void 0;
       return;
     }
@@ -1936,25 +1925,23 @@ var HttpMCPTransport = class {
     }
   }
   isModernProtocol() {
-    var _a3;
-    return ((_a3 = this.protocolVersion) != null ? _a3 : LATEST_PROTOCOL_VERSION) === LATEST_PROTOCOL_VERSION;
+    return (this.protocolVersion ?? LATEST_PROTOCOL_VERSION) === LATEST_PROTOCOL_VERSION;
   }
   async commonHeaders({
     base,
     includeSessionId = true
   }) {
-    var _a3;
     const headers = {
       ...this.headers,
       ...base,
-      "mcp-protocol-version": (_a3 = this.protocolVersion) != null ? _a3 : LATEST_LEGACY_PROTOCOL_VERSION
+      "mcp-protocol-version": this.protocolVersion ?? LATEST_LEGACY_PROTOCOL_VERSION
     };
     if (!this.isModernProtocol() && includeSessionId && this.sessionId) {
       headers["mcp-session-id"] = this.sessionId;
     }
     if (this.authProvider) {
       const tokens = await this.authProvider.tokens();
-      if (tokens == null ? void 0 : tokens.access_token) {
+      if (tokens?.access_token) {
         headers["Authorization"] = `Bearer ${tokens.access_token}`;
       }
     }
@@ -1965,12 +1952,11 @@ var HttpMCPTransport = class {
     );
   }
   setSessionId(sessionId) {
-    var _a3;
     if (this.sessionId === sessionId) {
       return;
     }
     this.sessionId = sessionId;
-    (_a3 = this.onSessionIdChange) == null ? void 0 : _a3.call(this, sessionId);
+    this.onSessionIdChange?.(sessionId);
   }
   applySessionIdFromResponse(response) {
     if (this.isModernProtocol()) {
@@ -1982,11 +1968,10 @@ var HttpMCPTransport = class {
     }
   }
   expireSessionId(sessionId) {
-    var _a3;
     if (this.sessionId === sessionId) {
       this.setSessionId(void 0);
     }
-    (_a3 = this.onSessionExpired) == null ? void 0 : _a3.call(this, sessionId);
+    this.onSessionExpired?.(sessionId);
   }
   /**
    * Runs a single OAuth recovery flow for concurrent 401 responses.
@@ -2019,32 +2004,29 @@ var HttpMCPTransport = class {
     }
   }
   async close(options) {
-    var _a3, _b3, _c, _d, _e;
-    (_a3 = this.inboundSseConnection) == null ? void 0 : _a3.close();
-    (_b3 = this.abortController) == null ? void 0 : _b3.abort();
+    this.inboundSseConnection?.close();
+    this.abortController?.abort();
     try {
       if (!this.isModernProtocol() && this.sessionId && this.terminateSessionOnClose && this.abortController) {
-        (_c = options == null ? void 0 : options.signal) == null ? void 0 : _c.throwIfAborted();
+        options?.signal?.throwIfAborted();
         const headers = await this.commonHeaders({ base: {} });
-        (_d = options == null ? void 0 : options.signal) == null ? void 0 : _d.throwIfAborted();
+        options?.signal?.throwIfAborted();
         await this.fetchFn(this.url.href, {
           method: "DELETE",
           headers,
-          signal: options == null ? void 0 : options.signal,
+          signal: options?.signal,
           redirect: this.redirectMode
         }).catch(() => void 0);
       }
-    } catch (e) {
+    } catch {
     }
-    (_e = this.onclose) == null ? void 0 : _e.call(this);
+    this.onclose?.();
   }
   async send(message, options) {
-    var _a3, _b3;
-    (_a3 = options == null ? void 0 : options.signal) == null ? void 0 : _a3.throwIfAborted();
-    const transportSignal = (_b3 = this.abortController) == null ? void 0 : _b3.signal;
-    const requestSignal = (options == null ? void 0 : options.signal) == null ? transportSignal : transportSignal == null ? options.signal : AbortSignal.any([transportSignal, options.signal]);
+    options?.signal?.throwIfAborted();
+    const transportSignal = this.abortController?.signal;
+    const requestSignal = options?.signal == null ? transportSignal : transportSignal == null ? options.signal : AbortSignal.any([transportSignal, options.signal]);
     const attempt = async (triedAuth = false) => {
-      var _a4, _b4, _c, _d, _e, _f, _g, _h;
       try {
         const isInitializeRequest = "method" in message && message.method === "initialize";
         const sessionIdForRequest = isInitializeRequest ? void 0 : this.sessionId;
@@ -2052,7 +2034,7 @@ var HttpMCPTransport = class {
           base: {
             "Content-Type": "application/json",
             Accept: "application/json, text/event-stream",
-            ...this.isModernProtocol() ? options == null ? void 0 : options.headers : {},
+            ...this.isModernProtocol() ? options?.headers : {},
             ...this.isModernProtocol() && "method" in message && "id" in message ? this.getStandardRequestHeaders(message) : {}
           },
           includeSessionId: !isInitializeRequest
@@ -2079,7 +2061,7 @@ var HttpMCPTransport = class {
               throw error2;
             }
           } catch (error2) {
-            (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error2);
+            this.onerror?.(error2);
             throw error2;
           }
           return attempt(true);
@@ -2097,8 +2079,7 @@ var HttpMCPTransport = class {
               () => void 0
             );
             if (jsonRpcMessage != null && "error" in jsonRpcMessage) {
-              (_b4 = this.onmessage) == null ? void 0 : _b4.call(
-                this,
+              this.onmessage?.(
                 jsonRpcMessage.id == null ? { ...jsonRpcMessage, id: message.id } : jsonRpcMessage
               );
               return;
@@ -2117,9 +2098,9 @@ var HttpMCPTransport = class {
             message: errorMessage,
             statusCode: response.status,
             url: this.url.href,
-            responseBody: text != null ? text : void 0
+            responseBody: text ?? void 0
           });
-          (_c = this.onerror) == null ? void 0 : _c.call(this, error2);
+          this.onerror?.(error2);
           throw error2;
         }
         const isNotification = !("id" in message);
@@ -2131,7 +2112,7 @@ var HttpMCPTransport = class {
           const data = await response.json();
           const messages = Array.isArray(data) ? data.map((message2) => validateJSONRPCMessage(message2)) : [validateJSONRPCMessage(data)];
           for (const jsonRpcMessage of messages) {
-            (_d = this.onmessage) == null ? void 0 : _d.call(this, jsonRpcMessage);
+            this.onmessage?.(jsonRpcMessage);
           }
           return;
         }
@@ -2142,13 +2123,12 @@ var HttpMCPTransport = class {
               statusCode: response.status,
               url: this.url.href
             });
-            (_e = this.onerror) == null ? void 0 : _e.call(this, error2);
+            this.onerror?.(error2);
             throw error2;
           }
           const stream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream2());
           const reader = stream.getReader();
           const processEvents = async () => {
-            var _a5, _b5, _c2, _d2;
             try {
               while (true) {
                 const { done, value } = await reader.read();
@@ -2157,29 +2137,28 @@ var HttpMCPTransport = class {
                 if (isMessageEvent2(event)) {
                   try {
                     const jsonRpcMessage = await parseJSONRPCMessage(data);
-                    (_a5 = this.onmessage) == null ? void 0 : _a5.call(this, jsonRpcMessage);
+                    this.onmessage?.(jsonRpcMessage);
                   } catch (error2) {
                     const e = new MCPClientError({
                       message: "MCP HTTP Transport Error: Failed to parse message",
                       cause: error2
                     });
-                    (_b5 = this.onerror) == null ? void 0 : _b5.call(this, e);
+                    this.onerror?.(e);
                   }
                 }
               }
             } catch (error2) {
-              if (((_c2 = options == null ? void 0 : options.signal) == null ? void 0 : _c2.aborted) || error2 instanceof Error && error2.name === "AbortError") {
+              if (options?.signal?.aborted || error2 instanceof Error && error2.name === "AbortError") {
                 return;
               }
-              (_d2 = this.onerror) == null ? void 0 : _d2.call(this, error2);
+              this.onerror?.(error2);
             }
           };
           void processEvents().catch((error2) => {
-            var _a5, _b5;
-            if (((_a5 = options == null ? void 0 : options.signal) == null ? void 0 : _a5.aborted) || error2 instanceof Error && error2.name === "AbortError") {
+            if (options?.signal?.aborted || error2 instanceof Error && error2.name === "AbortError") {
               return;
             }
-            (_b5 = this.onerror) == null ? void 0 : _b5.call(this, error2);
+            this.onerror?.(error2);
           });
           return;
         }
@@ -2188,13 +2167,13 @@ var HttpMCPTransport = class {
           statusCode: response.status,
           url: this.url.href
         });
-        (_f = this.onerror) == null ? void 0 : _f.call(this, error);
+        this.onerror?.(error);
         throw error;
       } catch (error) {
-        if ((_g = options == null ? void 0 : options.signal) == null ? void 0 : _g.aborted) {
+        if (options?.signal?.aborted) {
           throw error;
         }
-        (_h = this.onerror) == null ? void 0 : _h.call(this, error);
+        this.onerror?.(error);
         throw error;
       }
     };
@@ -2205,7 +2184,7 @@ var HttpMCPTransport = class {
       "Mcp-Method": message.method
     };
     const params = message.params;
-    const name3 = message.method === "resources/read" ? params == null ? void 0 : params.uri : message.method === "tools/call" || message.method === "prompts/get" ? params == null ? void 0 : params.name : void 0;
+    const name3 = message.method === "resources/read" ? params?.uri : message.method === "tools/call" || message.method === "prompts/get" ? params?.name : void 0;
     if (typeof name3 === "string") {
       headers["Mcp-Name"] = encodeMCPHeaderValue(name3);
     }
@@ -2223,11 +2202,9 @@ var HttpMCPTransport = class {
     );
   }
   scheduleInboundSseReconnection() {
-    var _a3;
     const { maxRetries } = this.reconnectionOptions;
     if (maxRetries > 0 && this.inboundReconnectAttempts >= maxRetries) {
-      (_a3 = this.onerror) == null ? void 0 : _a3.call(
-        this,
+      this.onerror?.(
         new MCPClientError({
           message: `MCP HTTP Transport Error: Maximum reconnection attempts (${maxRetries}) exceeded.`
         })
@@ -2237,8 +2214,7 @@ var HttpMCPTransport = class {
     const delay = this.getNextReconnectionDelay(this.inboundReconnectAttempts);
     this.inboundReconnectAttempts += 1;
     setTimeout(() => {
-      var _a4;
-      if ((_a4 = this.abortController) == null ? void 0 : _a4.signal.aborted) return;
+      if (this.abortController?.signal.aborted) return;
       this.startInboundSse(false, this.lastInboundEventId);
     }, delay);
   }
@@ -2247,16 +2223,14 @@ var HttpMCPTransport = class {
       return;
     }
     void this.openInboundSse(triedAuth, resumeToken).catch((error) => {
-      var _a3;
       if (error instanceof Error && error.name === "AbortError") {
         return;
       }
-      (_a3 = this.onerror) == null ? void 0 : _a3.call(this, error);
+      this.onerror?.(error);
     });
   }
   // Open optional inbound SSE stream; best-effort and resumable
   async openInboundSse(triedAuth = false, resumeToken) {
-    var _a3, _b3, _c, _d, _e, _f;
     if (this.isModernProtocol()) {
       return;
     }
@@ -2273,7 +2247,7 @@ var HttpMCPTransport = class {
       const response = await this.fetchFn(this.url.href, {
         method: "GET",
         headers,
-        signal: (_a3 = this.abortController) == null ? void 0 : _a3.signal,
+        signal: this.abortController?.signal,
         redirect: this.redirectMode
       });
       this.applySessionIdFromResponse(response);
@@ -2287,11 +2261,11 @@ var HttpMCPTransport = class {
           );
           if (result !== "AUTHORIZED") {
             const error = new UnauthorizedError();
-            (_b3 = this.onerror) == null ? void 0 : _b3.call(this, error);
+            this.onerror?.(error);
             return;
           }
         } catch (error) {
-          (_c = this.onerror) == null ? void 0 : _c.call(this, error);
+          this.onerror?.(error);
           return;
         }
         return this.openInboundSse(true, resumeToken);
@@ -2308,13 +2282,12 @@ var HttpMCPTransport = class {
           statusCode: response.status,
           url: this.url.href
         });
-        (_d = this.onerror) == null ? void 0 : _d.call(this, error);
+        this.onerror?.(error);
         return;
       }
       const stream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream2());
       const reader = stream.getReader();
       const processEvents = async () => {
-        var _a4, _b4, _c2, _d2;
         try {
           while (true) {
             const { done, value } = await reader.read();
@@ -2326,13 +2299,13 @@ var HttpMCPTransport = class {
             if (isMessageEvent2(event)) {
               try {
                 const jsonRpcMessage = await parseJSONRPCMessage(data);
-                (_a4 = this.onmessage) == null ? void 0 : _a4.call(this, jsonRpcMessage);
+                this.onmessage?.(jsonRpcMessage);
               } catch (error) {
                 const e = new MCPClientError({
                   message: "MCP HTTP Transport Error: Failed to parse message",
                   cause: error
                 });
-                (_b4 = this.onerror) == null ? void 0 : _b4.call(this, e);
+                this.onerror?.(e);
               }
             }
           }
@@ -2340,8 +2313,8 @@ var HttpMCPTransport = class {
           if (error instanceof Error && error.name === "AbortError") {
             return;
           }
-          (_c2 = this.onerror) == null ? void 0 : _c2.call(this, error);
-          if (!((_d2 = this.abortController) == null ? void 0 : _d2.signal.aborted)) {
+          this.onerror?.(error);
+          if (!this.abortController?.signal.aborted) {
             this.scheduleInboundSseReconnection();
           }
         }
@@ -2349,22 +2322,20 @@ var HttpMCPTransport = class {
       this.inboundSseConnection = {
         close: () => {
           void reader.cancel().catch((error) => {
-            var _a4;
             if (error instanceof Error && error.name === "AbortError") {
               return;
             }
-            (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error);
+            this.onerror?.(error);
           });
         }
       };
       this.inboundReconnectAttempts = 0;
       void processEvents().catch((error) => {
-        var _a4, _b4;
         if (error instanceof Error && error.name === "AbortError") {
           return;
         }
-        (_a4 = this.onerror) == null ? void 0 : _a4.call(this, error);
-        if (!((_b4 = this.abortController) == null ? void 0 : _b4.signal.aborted)) {
+        this.onerror?.(error);
+        if (!this.abortController?.signal.aborted) {
           this.scheduleInboundSseReconnection();
         }
       });
@@ -2372,8 +2343,8 @@ var HttpMCPTransport = class {
       if (error instanceof Error && error.name === "AbortError") {
         return;
       }
-      (_e = this.onerror) == null ? void 0 : _e.call(this, error);
-      if (!((_f = this.abortController) == null ? void 0 : _f.signal.aborted)) {
+      this.onerror?.(error);
+      if (!this.abortController?.signal.aborted) {
         this.scheduleInboundSseReconnection();
       }
     }
@@ -2382,14 +2353,13 @@ var HttpMCPTransport = class {
 
 // src/tool/mcp-transport.ts
 function createMcpTransport(config) {
-  var _a3;
   switch (config.type) {
     case "sse":
       return new SseMCPTransport(config);
     case "http":
       return new HttpMCPTransport({
         ...config,
-        initialProtocolVersion: (_a3 = config.initialProtocolVersion) != null ? _a3 : LATEST_PROTOCOL_VERSION
+        initialProtocolVersion: config.initialProtocolVersion ?? LATEST_PROTOCOL_VERSION
       });
     default:
       throw new MCPClientError({
@@ -2416,7 +2386,7 @@ var mcpAppClientCapabilities = {
   }
 };
 function getToolUiMeta(meta) {
-  const uiMeta = meta == null ? void 0 : meta.ui;
+  const uiMeta = meta?.ui;
   return isJSONObject(uiMeta) ? uiMeta : void 0;
 }
 var optionalStringArray = z4.array(z4.unknown()).transform((items) => items.filter((v) => typeof v === "string")).optional().catch(void 0);
@@ -2432,7 +2402,7 @@ var MCPAppResourceMetaSchema = z4.looseObject({
 });
 function getResourceUiMeta(meta) {
   const resourceMeta = isJSONObject(meta) ? meta : void 0;
-  const rawUiMeta = resourceMeta == null ? void 0 : resourceMeta.ui;
+  const rawUiMeta = resourceMeta?.ui;
   if (!isJSONObject(rawUiMeta)) {
     return void 0;
   }
@@ -2445,10 +2415,9 @@ function parseVisibility(value) {
   ) : void 0;
 }
 function getMCPAppToolMeta(tool2) {
-  var _a3, _b3;
   const uiMeta = getToolUiMeta(tool2._meta);
-  const resourceUri = (_b3 = uiMeta == null ? void 0 : uiMeta.resourceUri) != null ? _b3 : (_a3 = tool2._meta) == null ? void 0 : _a3[MCP_APP_LEGACY_RESOURCE_URI_META_KEY];
-  const visibility = parseVisibility(uiMeta == null ? void 0 : uiMeta.visibility);
+  const resourceUri = uiMeta?.resourceUri ?? tool2._meta?.[MCP_APP_LEGACY_RESOURCE_URI_META_KEY];
+  const visibility = parseVisibility(uiMeta?.visibility);
   if (resourceUri !== void 0) {
     if (typeof resourceUri !== "string" || !resourceUri.startsWith("ui://")) {
       throw new Error(
@@ -2465,15 +2434,14 @@ function getMCPAppToolMeta(tool2) {
   };
 }
 function splitMCPAppTools(definitions) {
-  var _a3;
   const modelVisibleTools = [];
   const appVisibleTools = [];
   for (const tool2 of definitions.tools) {
-    const visibility = (_a3 = getMCPAppToolMeta(tool2)) == null ? void 0 : _a3.visibility;
+    const visibility = getMCPAppToolMeta(tool2)?.visibility;
     if (visibility == null || visibility.includes("model")) {
       modelVisibleTools.push(tool2);
     }
-    if ((visibility == null ? void 0 : visibility.includes("app")) === true) {
+    if (visibility?.includes("app") === true) {
       appVisibleTools.push(tool2);
     }
   }
@@ -2644,7 +2612,7 @@ var DefaultMCPClient = class {
   constructor({
     transport: transportConfig,
     name: name3,
-    clientName = name3 != null ? name3 : "ai-sdk-mcp-client",
+    clientName = name3 ?? "ai-sdk-mcp-client",
     version = CLIENT_VERSION,
     onUncaughtError,
     maxRetries,
@@ -2668,7 +2636,7 @@ var DefaultMCPClient = class {
     this.isClosed = true;
     this.onUncaughtError = onUncaughtError;
     this.maxRetries = prepareMaxRetries(maxRetries);
-    this.clientCapabilities = capabilities != null ? capabilities : {};
+    this.clientCapabilities = capabilities ?? {};
     this.initialInitializeResult = initialInitializeResult;
     this.initializationOptions = initializationOptions;
     this.protocolVersionDiscovery = protocolVersionDiscovery;
@@ -2709,11 +2677,10 @@ var DefaultMCPClient = class {
     return this._serverInstructions;
   }
   async init() {
-    var _a3;
-    const externalSignal = (_a3 = this.initializationOptions) == null ? void 0 : _a3.signal;
+    const externalSignal = this.initializationOptions?.signal;
     const timeout = this.initializationOptions ? getEffectiveTimeout(this.initializationOptions) : void 0;
     const timeoutController = timeout == null ? void 0 : new AbortController();
-    const signal = externalSignal == null ? timeoutController == null ? void 0 : timeoutController.signal : timeoutController == null ? externalSignal : AbortSignal.any([externalSignal, timeoutController.signal]);
+    const signal = externalSignal == null ? timeoutController?.signal : timeoutController == null ? externalSignal : AbortSignal.any([externalSignal, timeoutController.signal]);
     let timeoutId;
     let timeoutError;
     if (timeout != null) {
@@ -2721,12 +2688,12 @@ var DefaultMCPClient = class {
         timeoutError = new MCPClientError({
           message: `MCP client initialization timed out after ${timeout}ms`
         });
-        timeoutController == null ? void 0 : timeoutController.abort(timeoutError);
+        timeoutController?.abort(timeoutError);
       }, timeout);
     }
     try {
       this.isClosed = false;
-      signal == null ? void 0 : signal.throwIfAborted();
+      signal?.throwIfAborted();
       await waitForAbort(this.transport.start(), signal);
       if (this.initialInitializeResult) {
         const result2 = InitializeResultSchema.parse(
@@ -2772,13 +2739,13 @@ var DefaultMCPClient = class {
     } catch (error) {
       try {
         await waitForAbort(this.transport.close({ signal }), signal);
-      } catch (e) {
+      } catch {
       }
       this.onClose();
       if (timeoutError != null) {
         throw timeoutError;
       }
-      if (externalSignal == null ? void 0 : externalSignal.aborted) {
+      if (externalSignal?.aborted) {
         throw new MCPClientError({
           message: "MCP client initialization was aborted",
           cause: externalSignal.reason
@@ -2814,13 +2781,12 @@ var DefaultMCPClient = class {
     }
   }
   applyDiscoverResult(result) {
-    var _a3;
     if (!result.supportedVersions.includes(this.protocolVersion)) {
       throw new MCPClientError({
         message: `Server does not support the requested protocol version: ${this.protocolVersion}`
       });
     }
-    const serverInfo = (_a3 = result._meta) == null ? void 0 : _a3["io.modelcontextprotocol/serverInfo"];
+    const serverInfo = result._meta?.["io.modelcontextprotocol/serverInfo"];
     if (serverInfo != null && typeof serverInfo === "object" && "name" in serverInfo && typeof serverInfo.name === "string" && "version" in serverInfo && typeof serverInfo.version === "string") {
       this._serverInfo = serverInfo;
     }
@@ -2855,9 +2821,8 @@ var DefaultMCPClient = class {
     this._serverInstructions = result.instructions;
   }
   async close() {
-    var _a3;
     if (this.isClosed) return;
-    await ((_a3 = this.transport) == null ? void 0 : _a3.close());
+    await this.transport?.close();
     this.onClose();
   }
   send(message, options) {
@@ -2912,7 +2877,6 @@ var DefaultMCPClient = class {
     options
   }) {
     return new Promise((resolve, reject) => {
-      var _a3;
       if (this.isClosed) {
         return reject(
           new MCPClientError({
@@ -2921,11 +2885,11 @@ var DefaultMCPClient = class {
         );
       }
       this.assertCapability(request.method);
-      const signal = options == null ? void 0 : options.signal;
-      signal == null ? void 0 : signal.throwIfAborted();
+      const signal = options?.signal;
+      signal?.throwIfAborted();
       const timeout = options == null ? void 0 : getEffectiveTimeout(options);
       const timeoutController = timeout == null ? void 0 : new AbortController();
-      const transportSignal = signal == null ? timeoutController == null ? void 0 : timeoutController.signal : timeoutController == null ? signal : AbortSignal.any([signal, timeoutController.signal]);
+      const transportSignal = signal == null ? timeoutController?.signal : timeoutController == null ? signal : AbortSignal.any([signal, timeoutController.signal]);
       let timeoutId;
       const messageId = this.requestMessageId++;
       const preparedRequest = this.protocolEra === "modern" ? {
@@ -2933,7 +2897,7 @@ var DefaultMCPClient = class {
         params: {
           ...request.params,
           _meta: {
-            ...(_a3 = request.params) == null ? void 0 : _a3._meta,
+            ...request.params?._meta,
             "io.modelcontextprotocol/protocolVersion": this.protocolVersion,
             "io.modelcontextprotocol/clientCapabilities": this.clientCapabilities,
             "io.modelcontextprotocol/clientInfo": this.clientInfo
@@ -2950,13 +2914,13 @@ var DefaultMCPClient = class {
         reject(
           new MCPClientError({
             message: "Request was aborted",
-            cause: signal == null ? void 0 : signal.reason
+            cause: signal?.reason
           })
         );
       };
       const cleanup = () => {
         this.responseHandlers.delete(messageId);
-        signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
+        signal?.removeEventListener("abort", onAbort);
         if (timeoutId != null) {
           clearTimeout(timeoutId);
         }
@@ -2973,11 +2937,11 @@ var DefaultMCPClient = class {
         const error = new MCPClientError({
           message: `Request timed out after ${timeout}ms`
         });
-        timeoutController == null ? void 0 : timeoutController.abort(error);
+        timeoutController?.abort(error);
         rejectAndCleanup(error);
       };
       this.responseHandlers.set(messageId, (response) => {
-        if (signal == null ? void 0 : signal.aborted) {
+        if (signal?.aborted) {
           cleanup();
           return rejectWithAbortError();
         }
@@ -3006,7 +2970,7 @@ var DefaultMCPClient = class {
           rejectAndCleanup(parseError);
         }
       });
-      signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+      signal?.addEventListener("abort", onAbort, { once: true });
       if (timeout != null) {
         timeoutId = setTimeout(onTimeout, timeout);
       }
@@ -3029,7 +2993,7 @@ var DefaultMCPClient = class {
       resultSchema: ListToolsResultSchema,
       options
     });
-    return this.prepareToolDefinitions(result, (params == null ? void 0 : params.cursor) == null);
+    return this.prepareToolDefinitions(result, params?.cursor == null);
   }
   prepareToolDefinitions(definitions, resetHeaderBindings = false) {
     if (this.protocolEra !== "modern" || !this.transport.supportsMcpToolParameterHeaders) {
@@ -3054,8 +3018,7 @@ var DefaultMCPClient = class {
     return { ...definitions, tools };
   }
   getToolRequestHeaders(request) {
-    var _a3;
-    if (this.protocolEra !== "modern" || request.method !== "tools/call" || typeof ((_a3 = request.params) == null ? void 0 : _a3.name) !== "string") {
+    if (this.protocolEra !== "modern" || request.method !== "tools/call" || typeof request.params?.name !== "string") {
       return void 0;
     }
     const bindings = this.toolHeaderBindings.get(request.params.name);
@@ -3087,7 +3050,7 @@ var DefaultMCPClient = class {
     }
     return retryWithExponentialBackoff({
       maxRetries: this.maxRetries,
-      abortSignal: options == null ? void 0 : options.signal,
+      abortSignal: options?.signal,
       shouldRetry: isRetryableMCPToolCallError,
       createRetryError: ({ message, errors }) => new MCPClientError({
         message,
@@ -3180,9 +3143,9 @@ var DefaultMCPClient = class {
     await waitForAbort(
       this.send(
         jsonrpcNotification,
-        (options == null ? void 0 : options.signal) == null ? void 0 : { signal: options.signal }
+        options?.signal == null ? void 0 : { signal: options.signal }
       ),
-      options == null ? void 0 : options.signal
+      options?.signal
     );
   }
   /**
@@ -3209,7 +3172,6 @@ var DefaultMCPClient = class {
    * Creates AI SDK tools from tool definitions without fetching from the server.
    */
   toolsFromDefinitions(definitions, { schemas = "automatic" } = {}) {
-    var _a3, _b3;
     definitions = this.prepareToolDefinitions(definitions);
     const tools = {};
     for (const {
@@ -3220,12 +3182,12 @@ var DefaultMCPClient = class {
       annotations,
       _meta
     } of definitions.tools) {
-      const resolvedTitle = title != null ? title : annotations == null ? void 0 : annotations.title;
+      const resolvedTitle = title ?? annotations?.title;
       if (schemas !== "automatic" && !Object.prototype.hasOwnProperty.call(schemas, name3)) {
         continue;
       }
       const self = this;
-      const outputSchema = schemas !== "automatic" ? (_a3 = schemas[name3]) == null ? void 0 : _a3.outputSchema : void 0;
+      const outputSchema = schemas !== "automatic" ? schemas[name3]?.outputSchema : void 0;
       const appMeta = getMCPAppToolMeta({ _meta });
       const metadata = {
         clientName: this.clientInfo.name,
@@ -3240,7 +3202,7 @@ var DefaultMCPClient = class {
             ...annotations.openWorldHint != null ? { openWorldHint: annotations.openWorldHint } : {}
           }
         } : {},
-        ...(appMeta == null ? void 0 : appMeta.resourceUri) != null ? {
+        ...appMeta?.resourceUri != null ? {
           app: {
             ...appMeta,
             mimeType: MCP_APP_MIME_TYPE
@@ -3248,12 +3210,11 @@ var DefaultMCPClient = class {
         } : {}
       };
       const execute = async (args, options) => {
-        var _a4;
-        (_a4 = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a4.throwIfAborted();
+        options?.abortSignal?.throwIfAborted();
         const result = await self.callTool({
           name: name3,
           arguments: args,
-          options: { signal: options == null ? void 0 : options.abortSignal }
+          options: { signal: options?.abortSignal }
         });
         if (result.isError) {
           return result;
@@ -3269,7 +3230,7 @@ var DefaultMCPClient = class {
         metadata,
         inputSchema: jsonSchema({
           ...inputSchema,
-          properties: (_b3 = inputSchema.properties) != null ? _b3 : {},
+          properties: inputSchema.properties ?? {},
           additionalProperties: false
         }),
         execute,
@@ -3491,7 +3452,7 @@ import { convertUint8ArrayToBase64 as convertUint8ArrayToBase642 } from "@ai-sdk
 var encoder = new TextEncoder();
 function canonicalJSON(value) {
   if (value == null || typeof value !== "object") {
-    return JSON.stringify(value != null ? value : null);
+    return JSON.stringify(value ?? null);
   }
   if (Array.isArray(value)) {
     return `[${value.map(canonicalJSON).join(",")}]`;
@@ -3504,14 +3465,13 @@ function toBase64url(bytes) {
   return convertUint8ArrayToBase642(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
 async function fingerprintMCPAppResource(resource) {
-  var _a3, _b3, _c, _d;
   const digest = await crypto.subtle.digest(
     "SHA-256",
     encoder.encode(
       canonicalJSON({
         html: resource.html,
-        csp: (_b3 = (_a3 = resource.meta) == null ? void 0 : _a3.csp) != null ? _b3 : null,
-        permissions: (_d = (_c = resource.meta) == null ? void 0 : _c.permissions) != null ? _d : null
+        csp: resource.meta?.csp ?? null,
+        permissions: resource.meta?.permissions ?? null
       })
     )
   );