@ai-sdk/mcp 2.0.43 → 2.0.45

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/mcp
 
+## 2.0.45
+
+### Patch Changes
+
+- 33ba8fd: feat(mcp): surface server-provided tool annotations in tool metadata
+- 3da84fd: Accept MCP tool results that return `structuredContent` without `content` by adding the serialized structured result as text.
+
+## 2.0.44
+
+### Patch Changes
+
+- 809e922: fix(mcp): accept trailing slashes on origin-only OAuth issuers
+
 ## 2.0.43
 
 ### Patch Changes

package/dist/index.d.ts

@@ -373,8 +373,23 @@ type McpProviderMetadata = {
     clientName?: string;
     title?: string;
     toolName?: string;
+    annotations?: McpToolAnnotations;
     app?: JSONObject;
 };
+/**
+ * Behavioral hints reported by an MCP server for a tool.
+ *
+ * These annotations are untrusted unless the server itself is trusted.
+ *
+ * @see https://modelcontextprotocol.io/specification/2026-07-28/schema#toolannotations
+ */
+type McpToolAnnotations = {
+    title?: string;
+    readOnlyHint?: boolean;
+    destructiveHint?: boolean;
+    idempotentHint?: boolean;
+    openWorldHint?: boolean;
+};
 /** MCP tool metadata - keys should follow MCP _meta key format specification */
 declare const ToolMetaSchema: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 type ToolMeta = z.infer<typeof ToolMetaSchema>;
@@ -475,6 +490,10 @@ declare const ListToolsResultSchema: z.ZodObject<{
         outputSchema: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
         annotations: z.ZodOptional<z.ZodObject<{
             title: z.ZodOptional<z.ZodString>;
+            readOnlyHint: z.ZodOptional<z.ZodBoolean>;
+            destructiveHint: z.ZodOptional<z.ZodBoolean>;
+            idempotentHint: z.ZodOptional<z.ZodBoolean>;
+            openWorldHint: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$loose>>;
         _meta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     }, z.core.$loose>>;
@@ -494,7 +513,7 @@ declare const ListResourcesResultSchema: z.ZodObject<{
     }, z.core.$loose>>;
 }, z.core.$loose>;
 type ListResourcesResult = z.infer<typeof ListResourcesResultSchema>;
-declare const CallToolResultSchema: z.ZodUnion<[z.ZodObject<{
+declare const CallToolResultSchema: z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
     resultType: z.ZodOptional<z.ZodString>;
     content: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
@@ -525,13 +544,112 @@ declare const CallToolResultSchema: z.ZodUnion<[z.ZodObject<{
         name: z.ZodString;
         description: z.ZodOptional<z.ZodString>;
         mimeType: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>, z.ZodObject<{
+        type: z.ZodString;
+    }, z.core.$loose>]>>;
+    structuredContent: z.ZodOptional<z.ZodUnknown>;
+    isError: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
+}, z.core.$loose>, z.ZodPipe<z.ZodPipe<z.ZodObject<{
+    _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+    resultType: z.ZodOptional<z.ZodString>;
+    content: z.ZodOptional<z.ZodNever>;
+    structuredContent: z.ZodJSONSchema;
+    isError: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
+}, z.core.$loose>, z.ZodTransform<{
+    [x: string]: unknown;
+    content: ({
+        [x: string]: unknown;
+        type: "text";
+        text: string;
+    } | {
+        [x: string]: unknown;
+        type: "image";
+        data: string;
+        mimeType: string;
+    } | {
+        [x: string]: unknown;
+        type: "resource";
+        resource: {
+            [x: string]: unknown;
+            uri: string;
+            text: string;
+            name?: string | undefined;
+            title?: string | undefined;
+            mimeType?: string | undefined;
+        } | {
+            [x: string]: unknown;
+            uri: string;
+            blob: string;
+            name?: string | undefined;
+            title?: string | undefined;
+            mimeType?: string | undefined;
+        };
+    } | {
+        [x: string]: unknown;
+        type: "resource_link";
+        uri: string;
+        name: string;
+        description?: string | undefined;
+        mimeType?: string | undefined;
+    } | {
+        [x: string]: unknown;
+        type: string;
+    })[];
+    _meta?: {
+        [x: string]: unknown;
+    } | undefined;
+    resultType?: string | undefined;
+    structuredContent?: unknown;
+    isError?: boolean | undefined;
+}, {
+    [x: string]: unknown;
+    structuredContent: z.core.util.JSONType;
+    _meta?: {
+        [x: string]: unknown;
+    } | undefined;
+    resultType?: string | undefined;
+    content?: undefined;
+    isError?: boolean | undefined;
+}>>, z.ZodObject<{
+    _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+    resultType: z.ZodOptional<z.ZodString>;
+    content: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+        type: z.ZodLiteral<"text">;
+        text: z.ZodString;
+    }, z.core.$loose>, z.ZodObject<{
+        type: z.ZodLiteral<"image">;
+        data: z.ZodBase64;
+        mimeType: z.ZodString;
+    }, z.core.$loose>, z.ZodObject<{
+        type: z.ZodLiteral<"resource">;
+        resource: z.ZodUnion<readonly [z.ZodObject<{
+            uri: z.ZodString;
+            name: z.ZodOptional<z.ZodString>;
+            title: z.ZodOptional<z.ZodString>;
+            mimeType: z.ZodOptional<z.ZodString>;
+            text: z.ZodString;
+        }, z.core.$loose>, z.ZodObject<{
+            uri: z.ZodString;
+            name: z.ZodOptional<z.ZodString>;
+            title: z.ZodOptional<z.ZodString>;
+            mimeType: z.ZodOptional<z.ZodString>;
+            blob: z.ZodBase64;
+        }, z.core.$loose>]>;
+    }, z.core.$loose>, z.ZodObject<{
+        type: z.ZodLiteral<"resource_link">;
+        uri: z.ZodString;
+        name: z.ZodString;
+        description: z.ZodOptional<z.ZodString>;
+        mimeType: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>, z.ZodObject<{
+        type: z.ZodString;
     }, z.core.$loose>]>>;
     structuredContent: z.ZodOptional<z.ZodUnknown>;
     isError: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-}, z.core.$loose>, z.ZodObject<{
+}, z.core.$loose>>]>, z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
     resultType: z.ZodOptional<z.ZodString>;
-    toolResult: z.ZodUnknown;
+    toolResult: z.ZodNonOptional<z.ZodUnknown>;
 }, z.core.$loose>]>;
 type CallToolResult = z.infer<typeof CallToolResultSchema>;
 declare const ListResourceTemplatesResultSchema: z.ZodObject<{
@@ -858,4 +976,4 @@ declare function fingerprintMCPAppResource(resource: MCPAppResource): Promise<st
  */
 declare function detectMCPAppResourceDrift(current: string, baseline: string): boolean;
 
-export { type CallToolResult, type CompleteRequestParams, type CompleteResult, type Configuration, type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type InitializeResult, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type ListToolsResult, type MCPAppResource, type MCPAppResourceCSP, type MCPAppResourceMeta, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, type MCPTransportCloseOptions, type MCPTransportSendOptions, MCP_APP_MIME_TYPE, type McpProviderMetadata, type OAuthAuthorizationServerInformation, type OAuthClientInformation, type OAuthClientMetadata, type OAuthClientProvider, type OAuthTokens, UnauthorizedError, auth, createMCPClient, detectMCPAppResourceDrift, type MCPClient as experimental_MCPClient, type ClientCapabilities as experimental_MCPClientCapabilities, type MCPClientConfig as experimental_MCPClientConfig, createMCPClient as experimental_createMCPClient, fingerprintMCPAppResource, mcpAppClientCapabilities, readMCPAppResource, splitMCPAppTools, validateJSONRPCMessage };
+export { type CallToolResult, type CompleteRequestParams, type CompleteResult, type Configuration, type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type InitializeResult, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type ListToolsResult, type MCPAppResource, type MCPAppResourceCSP, type MCPAppResourceMeta, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, type MCPTransportCloseOptions, type MCPTransportSendOptions, MCP_APP_MIME_TYPE, type McpProviderMetadata, type McpToolAnnotations, type OAuthAuthorizationServerInformation, type OAuthClientInformation, type OAuthClientMetadata, type OAuthClientProvider, type OAuthTokens, UnauthorizedError, auth, createMCPClient, detectMCPAppResourceDrift, type MCPClient as experimental_MCPClient, type ClientCapabilities as experimental_MCPClientCapabilities, type MCPClientConfig as experimental_MCPClientConfig, createMCPClient as experimental_createMCPClient, fingerprintMCPAppResource, mcpAppClientCapabilities, readMCPAppResource, splitMCPAppTools, validateJSONRPCMessage };

package/dist/index.js

@@ -90,7 +90,11 @@ var ToolSchema = z.object({
   outputSchema: z.optional(z.object({}).loose()),
   annotations: z.optional(
     z.object({
-      title: z.optional(z.string())
+      title: z.optional(z.string()),
+      readOnlyHint: z.optional(z.boolean()),
+      destructiveHint: z.optional(z.boolean()),
+      idempotentHint: z.optional(z.boolean()),
+      openWorldHint: z.optional(z.boolean())
     }).loose()
   ),
   _meta: ToolMetaSchema
@@ -153,23 +157,46 @@ var ResourceLinkContentSchema = z.object({
   description: z.optional(z.string()),
   mimeType: z.optional(z.string())
 }).loose();
-var CallToolResultSchema = ResultSchema.extend({
+var UnknownContentSchema = z.object({ type: z.string() }).loose().refine(
+  (content) => !["text", "image", "resource", "resource_link"].includes(content.type),
+  { message: "Known content types must match their schema" }
+);
+var CallToolResultWithContentSchema = ResultSchema.extend({
   content: z.array(
     z.union([
       TextContentSchema,
       ImageContentSchema,
       EmbeddedResourceSchema,
-      ResourceLinkContentSchema
+      ResourceLinkContentSchema,
+      UnknownContentSchema
     ])
   ),
   /**
-   * @see https://modelcontextprotocol.io/specification/2025-06-18/server/tools#structured-content
+   * @see https://modelcontextprotocol.io/specification/2026-07-28/server/tools#structured-content
    */
   structuredContent: z.optional(z.unknown()),
   isError: z.boolean().default(false).optional()
-}).or(
+});
+var CallToolResultWithStructuredContentSchema = ResultSchema.extend({
+  content: z.never().optional(),
+  structuredContent: z.json(),
+  isError: z.boolean().default(false).optional()
+}).transform(
+  (result) => ({
+    ...result,
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify(result.structuredContent)
+      }
+    ]
+  })
+).pipe(CallToolResultWithContentSchema);
+var CallToolResultSchema = CallToolResultWithContentSchema.or(
+  CallToolResultWithStructuredContentSchema
+).or(
   ResultSchema.extend({
-    toolResult: z.unknown()
+    toolResult: z.unknown().nonoptional()
   })
 );
 var ResourceTemplateSchema = z.object({
@@ -840,7 +867,8 @@ function buildDiscoveryUrls(authorizationServerUrl) {
   return urlsToTry;
 }
 function assertMetadataIssuerMatches(metadata, expectedIssuer) {
-  if (metadata.issuer !== expectedIssuer) {
+  const issuerMatches = metadata.issuer === expectedIssuer || expectedIssuer === new URL(expectedIssuer).origin && metadata.issuer === `${expectedIssuer}/`;
+  if (!issuerMatches) {
     throw new MCPClientOAuthError({
       message: `OAuth authorization server metadata issuer ${metadata.issuer} does not match expected issuer ${expectedIssuer}`
     });
@@ -3120,6 +3148,15 @@ var DefaultMCPClient = class {
         clientName: this.clientInfo.name,
         toolName: name3,
         ...resolvedTitle != null ? { title: resolvedTitle } : {},
+        ...annotations != null ? {
+          annotations: {
+            ...annotations.title != null ? { title: annotations.title } : {},
+            ...annotations.readOnlyHint != null ? { readOnlyHint: annotations.readOnlyHint } : {},
+            ...annotations.destructiveHint != null ? { destructiveHint: annotations.destructiveHint } : {},
+            ...annotations.idempotentHint != null ? { idempotentHint: annotations.idempotentHint } : {},
+            ...annotations.openWorldHint != null ? { openWorldHint: annotations.openWorldHint } : {}
+          }
+        } : {},
         ...(appMeta == null ? void 0 : appMeta.resourceUri) != null ? {
           app: {
             ...appMeta,
@@ -3185,7 +3222,9 @@ var DefaultMCPClient = class {
       return validationResult.value;
     }
     if ("content" in result && Array.isArray(result.content)) {
-      const textContent = result.content.find((c) => c.type === "text");
+      const textContent = result.content.find(
+        (content) => content.type === "text"
+      );
       if (textContent && "text" in textContent) {
         const parseResult = await safeParseJSON({
           text: textContent.text,