@ai-sdk/mcp 2.0.36 → 2.0.39

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @ai-sdk/mcp
 
+## 2.0.39
+
+### Patch Changes
+
+- Updated dependencies [3e125ba]
+  - @ai-sdk/provider-utils@5.0.32
+
+## 2.0.38
+
+### Patch Changes
+
+- bf591f0: Apply MCP scope selection to dynamic client registration as well as authorization.
+- fe69342: fix(mcp): reject private OAuth endpoints before sending credentials
+- Updated dependencies [a9782e1]
+- Updated dependencies [35841f5]
+- Updated dependencies [d2f3353]
+  - @ai-sdk/provider-utils@5.0.31
+
+## 2.0.37
+
+### Patch Changes
+
+- 1175434: Fetch all paginated tool definitions when creating an MCP tool set.
+- Updated dependencies [591d25b]
+  - @ai-sdk/provider@4.0.8
+  - @ai-sdk/provider-utils@5.0.30
+
 ## 2.0.36
 
 ### Patch Changes

package/dist/index.js

@@ -542,7 +542,10 @@ function checkResourceAllowed({
 }
 
 // src/tool/oauth.ts
-import { parseJSON as parseJSON2 } from "@ai-sdk/provider-utils";
+import {
+  parseJSON as parseJSON2,
+  validateDownloadUrl
+} from "@ai-sdk/provider-utils";
 var UnauthorizedError = class extends Error {
   constructor(message = "Unauthorized") {
     super(message);
@@ -552,6 +555,23 @@ var UnauthorizedError = class extends Error {
 function normalizeUrl(url) {
   return new URL(url).href;
 }
+function isOAuthLoopbackHost(hostname) {
+  const normalized = hostname.toLowerCase().replace(/\.+$/, "");
+  return normalized === "localhost" || normalized.endsWith(".localhost") || normalized === "127.0.0.1" || normalized === "[::1]" || normalized === "::1";
+}
+function assertSafeOAuthEndpoint(endpointUrl) {
+  if ((endpointUrl.protocol === "http:" || endpointUrl.protocol === "https:") && isOAuthLoopbackHost(endpointUrl.hostname)) {
+    return;
+  }
+  try {
+    validateDownloadUrl(endpointUrl.href);
+  } catch (error) {
+    throw new MCPClientOAuthError({
+      message: `OAuth endpoint URL is not allowed: ${endpointUrl.href}`,
+      cause: error
+    });
+  }
+}
 function validateAuthorizationResponseIssuer({
   callbackIssuer,
   expectedIssuer
@@ -1000,6 +1020,7 @@ async function exchangeAuthorization(authorizationServerUrl, {
   var _a3;
   const grantType = "authorization_code";
   const tokenUrl = (metadata == null ? void 0 : metadata.token_endpoint) ? new URL(metadata.token_endpoint) : new URL("/token", authorizationServerUrl);
+  assertSafeOAuthEndpoint(tokenUrl);
   if ((metadata == null ? void 0 : metadata.grant_types_supported) && !metadata.grant_types_supported.includes(grantType)) {
     throw new Error(
       `Incompatible auth server: does not support grant type ${grantType}`
@@ -1036,7 +1057,8 @@ async function exchangeAuthorization(authorizationServerUrl, {
   const response = await (fetchFn != null ? fetchFn : fetch)(tokenUrl, {
     method: "POST",
     headers,
-    body: params
+    body: params,
+    redirect: "error"
   });
   if (!response.ok) {
     throw await parseErrorResponse(response);
@@ -1064,6 +1086,7 @@ async function refreshAuthorization(authorizationServerUrl, {
   } else {
     tokenUrl = new URL("/token", authorizationServerUrl);
   }
+  assertSafeOAuthEndpoint(tokenUrl);
   const headers = new Headers({
     "Content-Type": "application/x-www-form-urlencoded",
     Accept: "application/json"
@@ -1093,7 +1116,8 @@ async function refreshAuthorization(authorizationServerUrl, {
   const response = await (fetchFn != null ? fetchFn : fetch)(tokenUrl, {
     method: "POST",
     headers,
-    body: params
+    body: params,
+    redirect: "error"
   });
   if (!response.ok) {
     throw await parseErrorResponse(response);
@@ -1120,6 +1144,7 @@ async function registerClient(authorizationServerUrl, {
   } else {
     registrationUrl = new URL("/register", authorizationServerUrl);
   }
+  assertSafeOAuthEndpoint(registrationUrl);
   const applicationType = (_a3 = clientMetadata.application_type) != null ? _a3 : inferOAuthApplicationType(clientMetadata.redirect_uris);
   const response = await (fetchFn != null ? fetchFn : fetch)(registrationUrl, {
     method: "POST",
@@ -1129,7 +1154,8 @@ async function registerClient(authorizationServerUrl, {
     body: JSON.stringify({
       ...clientMetadata,
       application_type: applicationType
-    })
+    }),
+    redirect: "error"
   });
   if (!response.ok) {
     throw await parseErrorResponse(response);
@@ -1139,7 +1165,7 @@ async function registerClient(authorizationServerUrl, {
 function inferOAuthApplicationType(redirectUris) {
   const isNativeRedirectUri = (redirectUri) => {
     const url = new URL(redirectUri);
-    return (url.protocol === "http:" || url.protocol === "https:") && (url.hostname === "localhost" || url.hostname.endsWith(".localhost") || url.hostname === "127.0.0.1" || url.hostname === "[::1]") || url.protocol !== "http:" && url.protocol !== "https:";
+    return (url.protocol === "http:" || url.protocol === "https:") && isOAuthLoopbackHost(url.hostname) || url.protocol !== "http:" && url.protocol !== "https:";
   };
   return redirectUris.every(isNativeRedirectUri) ? "native" : "web";
 }
@@ -1223,6 +1249,12 @@ async function authInternal(provider, {
     }
   );
   const currentAuthorizationServerInformation = createAuthorizationServerInformation(authorizationServerUrl, metadata);
+  const clientMetadata = provider.clientMetadata;
+  const selectedScope = selectScope({
+    scope,
+    resourceMetadata,
+    clientMetadata
+  });
   let clientInformation = await Promise.resolve(provider.clientInformation());
   if ((clientInformation == null ? void 0 : clientInformation.issuer) != null) {
     const storedAuthorizationServerInformation = await getStoredAuthorizationServerInformation({
@@ -1249,7 +1281,10 @@ async function authInternal(provider, {
     }
     const fullInformation = await registerClient(authorizationServerUrl, {
       metadata,
-      clientMetadata: provider.clientMetadata,
+      clientMetadata: {
+        ...clientMetadata,
+        scope: selectedScope
+      },
       fetchFn
     });
     clientInformation = addAuthorizationServerInformationToClientInformation(
@@ -1357,11 +1392,7 @@ async function authInternal(provider, {
       clientInformation,
       state,
       redirectUrl: provider.redirectUrl,
-      scope: selectScope({
-        scope,
-        resourceMetadata,
-        clientMetadata: provider.clientMetadata
-      }),
+      scope: selectedScope,
       resource
     }
   );
@@ -3051,8 +3082,15 @@ var DefaultMCPClient = class {
   async tools({
     schemas = "automatic"
   } = {}) {
-    const definitions = await this.listTools();
-    return this.toolsFromDefinitions(definitions, {
+    let definitions = await this.listTools();
+    const tools = [...definitions.tools];
+    while (definitions.nextCursor != null) {
+      definitions = await this.listTools({
+        params: { cursor: definitions.nextCursor }
+      });
+      tools.push(...definitions.tools);
+    }
+    return this.toolsFromDefinitions({ ...definitions, tools }, {
       schemas
     });
   }