@modelcontextprotocol/sdk 1.21.1 → 1.22.0

package/dist/cjs/types.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourceListChangedNotificationSchema = exports.ReadResourceResultSchema = exports.ReadResourceRequestSchema = exports.ListResourceTemplatesResultSchema = exports.ListResourceTemplatesRequestSchema = exports.ListResourcesResultSchema = exports.ListResourcesRequestSchema = exports.ResourceTemplateSchema = exports.ResourceSchema = exports.BlobResourceContentsSchema = exports.TextResourceContentsSchema = exports.ResourceContentsSchema = exports.PaginatedResultSchema = exports.PaginatedRequestSchema = exports.ProgressNotificationSchema = exports.ProgressSchema = exports.PingRequestSchema = exports.isInitializedNotification = exports.InitializedNotificationSchema = exports.InitializeResultSchema = exports.ServerCapabilitiesSchema = exports.isInitializeRequest = exports.InitializeRequestSchema = exports.ClientCapabilitiesSchema = exports.ImplementationSchema = exports.BaseMetadataSchema = exports.IconsSchema = exports.IconSchema = exports.CancelledNotificationSchema = exports.EmptyResultSchema = exports.JSONRPCMessageSchema = exports.isJSONRPCError = exports.JSONRPCErrorSchema = exports.ErrorCode = exports.isJSONRPCResponse = exports.JSONRPCResponseSchema = exports.isJSONRPCNotification = exports.JSONRPCNotificationSchema = exports.isJSONRPCRequest = exports.JSONRPCRequestSchema = exports.RequestIdSchema = exports.ResultSchema = exports.NotificationSchema = exports.RequestSchema = exports.CursorSchema = exports.ProgressTokenSchema = exports.JSONRPC_VERSION = exports.SUPPORTED_PROTOCOL_VERSIONS = exports.DEFAULT_NEGOTIATED_PROTOCOL_VERSION = exports.LATEST_PROTOCOL_VERSION = void 0;
-exports.ClientRequestSchema = exports.RootsListChangedNotificationSchema = exports.ListRootsResultSchema = exports.ListRootsRequestSchema = exports.RootSchema = exports.CompleteResultSchema = exports.CompleteRequestSchema = exports.PromptReferenceSchema = exports.ResourceReferenceSchema = exports.ResourceTemplateReferenceSchema = exports.ElicitResultSchema = exports.ElicitRequestSchema = exports.PrimitiveSchemaDefinitionSchema = exports.EnumSchemaSchema = exports.NumberSchemaSchema = exports.StringSchemaSchema = exports.BooleanSchemaSchema = exports.CreateMessageResultSchema = exports.CreateMessageRequestSchema = exports.SamplingMessageSchema = exports.ModelPreferencesSchema = exports.ModelHintSchema = exports.LoggingMessageNotificationSchema = exports.SetLevelRequestSchema = exports.LoggingLevelSchema = exports.ToolListChangedNotificationSchema = exports.CallToolRequestSchema = exports.CompatibilityCallToolResultSchema = exports.CallToolResultSchema = exports.ListToolsResultSchema = exports.ListToolsRequestSchema = exports.ToolSchema = exports.ToolAnnotationsSchema = exports.PromptListChangedNotificationSchema = exports.GetPromptResultSchema = exports.PromptMessageSchema = exports.ContentBlockSchema = exports.ResourceLinkSchema = exports.EmbeddedResourceSchema = exports.AudioContentSchema = exports.ImageContentSchema = exports.TextContentSchema = exports.GetPromptRequestSchema = exports.ListPromptsResultSchema = exports.ListPromptsRequestSchema = exports.PromptSchema = exports.PromptArgumentSchema = exports.ResourceUpdatedNotificationSchema = exports.UnsubscribeRequestSchema = exports.SubscribeRequestSchema = void 0;
-exports.McpError = exports.ServerResultSchema = exports.ServerNotificationSchema = exports.ServerRequestSchema = exports.ClientResultSchema = exports.ClientNotificationSchema = void 0;
+exports.ListResourceTemplatesRequestSchema = exports.ListResourcesResultSchema = exports.ListResourcesRequestSchema = exports.ResourceTemplateSchema = exports.ResourceSchema = exports.BlobResourceContentsSchema = exports.TextResourceContentsSchema = exports.ResourceContentsSchema = exports.PaginatedResultSchema = exports.PaginatedRequestSchema = exports.PaginatedRequestParamsSchema = exports.ProgressNotificationSchema = exports.ProgressNotificationParamsSchema = exports.ProgressSchema = exports.PingRequestSchema = exports.isInitializedNotification = exports.InitializedNotificationSchema = exports.InitializeResultSchema = exports.ServerCapabilitiesSchema = exports.isInitializeRequest = exports.InitializeRequestSchema = exports.InitializeRequestParamsSchema = exports.ClientCapabilitiesSchema = exports.ImplementationSchema = exports.BaseMetadataSchema = exports.IconsSchema = exports.IconSchema = exports.CancelledNotificationSchema = exports.CancelledNotificationParamsSchema = exports.EmptyResultSchema = exports.JSONRPCMessageSchema = exports.isJSONRPCError = exports.JSONRPCErrorSchema = exports.ErrorCode = exports.isJSONRPCResponse = exports.JSONRPCResponseSchema = exports.isJSONRPCNotification = exports.JSONRPCNotificationSchema = exports.isJSONRPCRequest = exports.JSONRPCRequestSchema = exports.RequestIdSchema = exports.ResultSchema = exports.NotificationSchema = exports.RequestSchema = exports.CursorSchema = exports.ProgressTokenSchema = exports.JSONRPC_VERSION = exports.SUPPORTED_PROTOCOL_VERSIONS = exports.DEFAULT_NEGOTIATED_PROTOCOL_VERSION = exports.LATEST_PROTOCOL_VERSION = void 0;
+exports.NumberSchemaSchema = exports.StringSchemaSchema = exports.BooleanSchemaSchema = exports.CreateMessageResultSchema = exports.CreateMessageRequestSchema = exports.CreateMessageRequestParamsSchema = exports.SamplingMessageSchema = exports.ModelPreferencesSchema = exports.ModelHintSchema = exports.LoggingMessageNotificationSchema = exports.LoggingMessageNotificationParamsSchema = exports.SetLevelRequestSchema = exports.SetLevelRequestParamsSchema = exports.LoggingLevelSchema = exports.ToolListChangedNotificationSchema = exports.CallToolRequestSchema = exports.CallToolRequestParamsSchema = exports.CompatibilityCallToolResultSchema = exports.CallToolResultSchema = exports.ListToolsResultSchema = exports.ListToolsRequestSchema = exports.ToolSchema = exports.ToolAnnotationsSchema = exports.PromptListChangedNotificationSchema = exports.GetPromptResultSchema = exports.PromptMessageSchema = exports.ContentBlockSchema = exports.ResourceLinkSchema = exports.EmbeddedResourceSchema = exports.AudioContentSchema = exports.ImageContentSchema = exports.TextContentSchema = exports.GetPromptRequestSchema = exports.GetPromptRequestParamsSchema = exports.ListPromptsResultSchema = exports.ListPromptsRequestSchema = exports.PromptSchema = exports.PromptArgumentSchema = exports.ResourceUpdatedNotificationSchema = exports.ResourceUpdatedNotificationParamsSchema = exports.UnsubscribeRequestSchema = exports.UnsubscribeRequestParamsSchema = exports.SubscribeRequestSchema = exports.SubscribeRequestParamsSchema = exports.ResourceListChangedNotificationSchema = exports.ReadResourceResultSchema = exports.ReadResourceRequestSchema = exports.ReadResourceRequestParamsSchema = exports.ResourceRequestParamsSchema = exports.ListResourceTemplatesResultSchema = void 0;
+exports.McpError = exports.ServerResultSchema = exports.ServerNotificationSchema = exports.ServerRequestSchema = exports.ClientResultSchema = exports.ClientNotificationSchema = exports.ClientRequestSchema = exports.RootsListChangedNotificationSchema = exports.ListRootsResultSchema = exports.ListRootsRequestSchema = exports.RootSchema = exports.CompleteResultSchema = exports.CompleteRequestSchema = exports.CompleteRequestParamsSchema = exports.PromptReferenceSchema = exports.ResourceReferenceSchema = exports.ResourceTemplateReferenceSchema = exports.ElicitResultSchema = exports.ElicitRequestSchema = exports.ElicitRequestParamsSchema = exports.PrimitiveSchemaDefinitionSchema = exports.EnumSchemaSchema = exports.MultiSelectEnumSchemaSchema = exports.TitledMultiSelectEnumSchemaSchema = exports.UntitledMultiSelectEnumSchemaSchema = exports.SingleSelectEnumSchemaSchema = exports.LegacyTitledEnumSchemaSchema = exports.TitledSingleSelectEnumSchemaSchema = exports.UntitledSingleSelectEnumSchemaSchema = void 0;
+exports.assertCompleteRequestPrompt = assertCompleteRequestPrompt;
+exports.assertCompleteRequestResourceTemplate = assertCompleteRequestResourceTemplate;
 const zod_1 = require("zod");
 exports.LATEST_PROTOCOL_VERSION = '2025-06-18';
 exports.DEFAULT_NEGOTIATED_PROTOCOL_VERSION = '2025-03-26';
 exports.SUPPORTED_PROTOCOL_VERSIONS = [exports.LATEST_PROTOCOL_VERSION, '2025-03-26', '2024-11-05', '2024-10-07'];
 /* JSON-RPC types */
 exports.JSONRPC_VERSION = '2.0';
+/**
+ * Assert 'object' type schema.
+ *
+ * @internal
+ */
+const AssertObjectSchema = zod_1.z.custom((v) => v !== null && (typeof v === 'object' || typeof v === 'function'));
 /**
  * A progress token, used to associate progress notifications with the original request.
  */
@@ -22,30 +30,35 @@ const RequestMetaSchema = zod_1.z
     /**
      * If specified, the caller is requesting out-of-band progress notifications for this request (as represented by notifications/progress). The value of this parameter is an opaque token that will be attached to any subsequent notifications. The receiver is not obligated to provide these notifications.
      */
-    progressToken: zod_1.z.optional(exports.ProgressTokenSchema)
-})
-    .passthrough();
-const BaseRequestParamsSchema = zod_1.z
-    .object({
-    _meta: zod_1.z.optional(RequestMetaSchema)
+    progressToken: exports.ProgressTokenSchema.optional()
 })
+    /**
+     * Passthrough required here because we want to allow any additional fields to be added to the request meta.
+     */
     .passthrough();
+/**
+ * Common params for any request.
+ */
+const BaseRequestParamsSchema = zod_1.z.object({
+    /**
+     * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
+     */
+    _meta: RequestMetaSchema.optional()
+});
 exports.RequestSchema = zod_1.z.object({
     method: zod_1.z.string(),
-    params: zod_1.z.optional(BaseRequestParamsSchema)
+    params: BaseRequestParamsSchema.passthrough().optional()
 });
-const BaseNotificationParamsSchema = zod_1.z
-    .object({
+const NotificationsParamsSchema = zod_1.z.object({
     /**
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 exports.NotificationSchema = zod_1.z.object({
     method: zod_1.z.string(),
-    params: zod_1.z.optional(BaseNotificationParamsSchema)
+    params: NotificationsParamsSchema.passthrough().optional()
 });
 exports.ResultSchema = zod_1.z
     .object({
@@ -53,8 +66,11 @@ exports.ResultSchema = zod_1.z
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
 })
+    /**
+     * Passthrough required here because we want to allow any additional fields to be added to the result.
+     */
     .passthrough();
 /**
  * A uniquely identifying ID for a request in JSON-RPC.
@@ -141,6 +157,18 @@ exports.JSONRPCMessageSchema = zod_1.z.union([exports.JSONRPCRequestSchema, expo
  * A response that indicates success but carries no data.
  */
 exports.EmptyResultSchema = exports.ResultSchema.strict();
+exports.CancelledNotificationParamsSchema = NotificationsParamsSchema.extend({
+    /**
+     * The ID of the request to cancel.
+     *
+     * This MUST correspond to the ID of a request previously issued in the same direction.
+     */
+    requestId: exports.RequestIdSchema,
+    /**
+     * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
+     */
+    reason: zod_1.z.string().optional()
+});
 /* Cancellation */
 /**
  * This notification can be sent by either side to indicate that it is cancelling a previously-issued request.
@@ -153,25 +181,13 @@ exports.EmptyResultSchema = exports.ResultSchema.strict();
  */
 exports.CancelledNotificationSchema = exports.NotificationSchema.extend({
     method: zod_1.z.literal('notifications/cancelled'),
-    params: BaseNotificationParamsSchema.extend({
-        /**
-         * The ID of the request to cancel.
-         *
-         * This MUST correspond to the ID of a request previously issued in the same direction.
-         */
-        requestId: exports.RequestIdSchema,
-        /**
-         * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
-         */
-        reason: zod_1.z.string().optional()
-    })
+    params: exports.CancelledNotificationParamsSchema
 });
 /* Base Metadata */
 /**
  * Icon schema for use in tools, prompts, resources, and implementations.
  */
-exports.IconSchema = zod_1.z
-    .object({
+exports.IconSchema = zod_1.z.object({
     /**
      * URL or data URI for the icon.
      */
@@ -179,22 +195,20 @@ exports.IconSchema = zod_1.z
     /**
      * Optional MIME type for the icon.
      */
-    mimeType: zod_1.z.optional(zod_1.z.string()),
+    mimeType: zod_1.z.string().optional(),
     /**
      * Optional array of strings that specify sizes at which the icon can be used.
      * Each string should be in WxH format (e.g., `"48x48"`, `"96x96"`) or `"any"` for scalable formats like SVG.
      *
      * If not provided, the client should assume that the icon can be used at any size.
      */
-    sizes: zod_1.z.optional(zod_1.z.array(zod_1.z.string()))
-})
-    .passthrough();
+    sizes: zod_1.z.array(zod_1.z.string()).optional()
+});
 /**
  * Base schema to add `icons` property.
  *
  */
-exports.IconsSchema = zod_1.z
-    .object({
+exports.IconsSchema = zod_1.z.object({
     /**
      * Optional set of sized icons that the client can display in a user interface.
      *
@@ -207,13 +221,11 @@ exports.IconsSchema = zod_1.z
      * - `image/webp` - WebP images (modern, efficient format)
      */
     icons: zod_1.z.array(exports.IconSchema).optional()
-})
-    .passthrough();
+});
 /**
  * Base metadata interface for common properties across resources, tools, prompts, and implementations.
  */
-exports.BaseMetadataSchema = zod_1.z
-    .object({
+exports.BaseMetadataSchema = zod_1.z.object({
     /** Intended for programmatic or logical use, but used as a display name in past specs or fallback */
     name: zod_1.z.string(),
     /**
@@ -224,9 +236,8 @@ exports.BaseMetadataSchema = zod_1.z
      * where `annotations.title` should be given precedence over using `name`,
      * if present).
      */
-    title: zod_1.z.optional(zod_1.z.string())
-})
-    .passthrough();
+    title: zod_1.z.string().optional()
+});
 /* Initialization */
 /**
  * Describes the name and version of an MCP implementation.
@@ -236,110 +247,112 @@ exports.ImplementationSchema = exports.BaseMetadataSchema.extend({
     /**
      * An optional URL of the website for this implementation.
      */
-    websiteUrl: zod_1.z.optional(zod_1.z.string())
+    websiteUrl: zod_1.z.string().optional()
 }).merge(exports.IconsSchema);
 /**
  * Capabilities a client may support. Known capabilities are defined here, in this schema, but this is not a closed set: any client can define its own, additional capabilities.
  */
-exports.ClientCapabilitiesSchema = zod_1.z
-    .object({
+exports.ClientCapabilitiesSchema = zod_1.z.object({
     /**
      * Experimental, non-standard capabilities that the client supports.
      */
-    experimental: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    experimental: zod_1.z.record(zod_1.z.string(), AssertObjectSchema).optional(),
     /**
      * Present if the client supports sampling from an LLM.
      */
-    sampling: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    sampling: AssertObjectSchema.optional(),
     /**
      * Present if the client supports eliciting user input.
      */
-    elicitation: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    elicitation: zod_1.z.intersection(zod_1.z
+        .object({
+        /**
+         * Whether the client should apply defaults to the user input.
+         */
+        applyDefaults: zod_1.z.boolean().optional()
+    })
+        .optional(), zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()),
     /**
      * Present if the client supports listing roots.
      */
-    roots: zod_1.z.optional(zod_1.z
+    roots: zod_1.z
         .object({
         /**
          * Whether the client supports issuing notifications for changes to the roots list.
          */
-        listChanged: zod_1.z.optional(zod_1.z.boolean())
+        listChanged: zod_1.z.boolean().optional()
     })
-        .passthrough())
-})
-    .passthrough();
+        .optional()
+});
+exports.InitializeRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The latest version of the Model Context Protocol that the client supports. The client MAY decide to support older versions as well.
+     */
+    protocolVersion: zod_1.z.string(),
+    capabilities: exports.ClientCapabilitiesSchema,
+    clientInfo: exports.ImplementationSchema
+});
 /**
  * This request is sent from the client to the server when it first connects, asking it to begin initialization.
  */
 exports.InitializeRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('initialize'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The latest version of the Model Context Protocol that the client supports. The client MAY decide to support older versions as well.
-         */
-        protocolVersion: zod_1.z.string(),
-        capabilities: exports.ClientCapabilitiesSchema,
-        clientInfo: exports.ImplementationSchema
-    })
+    params: exports.InitializeRequestParamsSchema
 });
 const isInitializeRequest = (value) => exports.InitializeRequestSchema.safeParse(value).success;
 exports.isInitializeRequest = isInitializeRequest;
 /**
  * Capabilities that a server may support. Known capabilities are defined here, in this schema, but this is not a closed set: any server can define its own, additional capabilities.
  */
-exports.ServerCapabilitiesSchema = zod_1.z
-    .object({
+exports.ServerCapabilitiesSchema = zod_1.z.object({
     /**
      * Experimental, non-standard capabilities that the server supports.
      */
-    experimental: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    experimental: zod_1.z.record(zod_1.z.string(), AssertObjectSchema).optional(),
     /**
      * Present if the server supports sending log messages to the client.
      */
-    logging: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    logging: AssertObjectSchema.optional(),
     /**
      * Present if the server supports sending completions to the client.
      */
-    completions: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    completions: AssertObjectSchema.optional(),
     /**
      * Present if the server offers any prompt templates.
      */
-    prompts: zod_1.z.optional(zod_1.z
-        .object({
+    prompts: zod_1.z.optional(zod_1.z.object({
         /**
          * Whether this server supports issuing notifications for changes to the prompt list.
          */
         listChanged: zod_1.z.optional(zod_1.z.boolean())
-    })
-        .passthrough()),
+    })),
     /**
      * Present if the server offers any resources to read.
      */
-    resources: zod_1.z.optional(zod_1.z
+    resources: zod_1.z
         .object({
         /**
          * Whether this server supports clients subscribing to resource updates.
          */
-        subscribe: zod_1.z.optional(zod_1.z.boolean()),
+        subscribe: zod_1.z.boolean().optional(),
         /**
          * Whether this server supports issuing notifications for changes to the resource list.
          */
-        listChanged: zod_1.z.optional(zod_1.z.boolean())
+        listChanged: zod_1.z.boolean().optional()
     })
-        .passthrough()),
+        .optional(),
     /**
      * Present if the server offers any tools to call.
      */
-    tools: zod_1.z.optional(zod_1.z
+    tools: zod_1.z
         .object({
         /**
          * Whether this server supports issuing notifications for changes to the tool list.
          */
-        listChanged: zod_1.z.optional(zod_1.z.boolean())
+        listChanged: zod_1.z.boolean().optional()
     })
-        .passthrough())
-})
-    .passthrough();
+        .optional()
+});
 /**
  * After receiving an initialize request from the client, the server sends this response.
  */
@@ -355,7 +368,7 @@ exports.InitializeResultSchema = exports.ResultSchema.extend({
      *
      * This can be used by clients to improve the LLM's understanding of available tools, resources, etc. It can be thought of like a "hint" to the model. For example, this information MAY be added to the system prompt.
      */
-    instructions: zod_1.z.optional(zod_1.z.string())
+    instructions: zod_1.z.string().optional()
 });
 /**
  * This notification is sent from the client to the server after initialization has finished.
@@ -373,8 +386,7 @@ exports.PingRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('ping')
 });
 /* Progress notifications */
-exports.ProgressSchema = zod_1.z
-    .object({
+exports.ProgressSchema = zod_1.z.object({
     /**
      * The progress thus far. This should increase every time progress is made, even if the total is unknown.
      */
@@ -387,29 +399,32 @@ exports.ProgressSchema = zod_1.z
      * An optional message describing the current progress.
      */
     message: zod_1.z.optional(zod_1.z.string())
-})
-    .passthrough();
+});
+exports.ProgressNotificationParamsSchema = NotificationsParamsSchema.merge(exports.ProgressSchema).extend({
+    /**
+     * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
+     */
+    progressToken: exports.ProgressTokenSchema
+});
 /**
  * An out-of-band notification used to inform the receiver of a progress update for a long-running request.
+ *
+ * @category notifications/progress
  */
 exports.ProgressNotificationSchema = exports.NotificationSchema.extend({
     method: zod_1.z.literal('notifications/progress'),
-    params: BaseNotificationParamsSchema.merge(exports.ProgressSchema).extend({
-        /**
-         * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
-         */
-        progressToken: exports.ProgressTokenSchema
-    })
+    params: exports.ProgressNotificationParamsSchema
+});
+exports.PaginatedRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * An opaque token representing the current pagination position.
+     * If provided, the server should return results starting after this cursor.
+     */
+    cursor: exports.CursorSchema.optional()
 });
 /* Pagination */
 exports.PaginatedRequestSchema = exports.RequestSchema.extend({
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * An opaque token representing the current pagination position.
-         * If provided, the server should return results starting after this cursor.
-         */
-        cursor: zod_1.z.optional(exports.CursorSchema)
-    }).optional()
+    params: exports.PaginatedRequestParamsSchema.optional()
 });
 exports.PaginatedResultSchema = exports.ResultSchema.extend({
     /**
@@ -422,8 +437,7 @@ exports.PaginatedResultSchema = exports.ResultSchema.extend({
 /**
  * The contents of a specific resource or sub-resource.
  */
-exports.ResourceContentsSchema = zod_1.z
-    .object({
+exports.ResourceContentsSchema = zod_1.z.object({
     /**
      * The URI of this resource.
      */
@@ -436,9 +450,8 @@ exports.ResourceContentsSchema = zod_1.z
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 exports.TextResourceContentsSchema = exports.ResourceContentsSchema.extend({
     /**
      * The text of the item. This must only be set if the item can actually be represented as text (not binary data).
@@ -539,17 +552,24 @@ exports.ListResourceTemplatesRequestSchema = exports.PaginatedRequestSchema.exte
 exports.ListResourceTemplatesResultSchema = exports.PaginatedResultSchema.extend({
     resourceTemplates: zod_1.z.array(exports.ResourceTemplateSchema)
 });
+exports.ResourceRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The URI of the resource to read. The URI can use any protocol; it is up to the server how to interpret it.
+     *
+     * @format uri
+     */
+    uri: zod_1.z.string()
+});
+/**
+ * Parameters for a `resources/read` request.
+ */
+exports.ReadResourceRequestParamsSchema = exports.ResourceRequestParamsSchema;
 /**
  * Sent from the client to the server, to read a specific resource URI.
  */
 exports.ReadResourceRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('resources/read'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The URI of the resource to read. The URI can use any protocol; it is up to the server how to interpret it.
-         */
-        uri: zod_1.z.string()
-    })
+    params: exports.ReadResourceRequestParamsSchema
 });
 /**
  * The server's response to a resources/read request from the client.
@@ -563,48 +583,43 @@ exports.ReadResourceResultSchema = exports.ResultSchema.extend({
 exports.ResourceListChangedNotificationSchema = exports.NotificationSchema.extend({
     method: zod_1.z.literal('notifications/resources/list_changed')
 });
+exports.SubscribeRequestParamsSchema = exports.ResourceRequestParamsSchema;
 /**
  * Sent from the client to request resources/updated notifications from the server whenever a particular resource changes.
  */
 exports.SubscribeRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('resources/subscribe'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The URI of the resource to subscribe to. The URI can use any protocol; it is up to the server how to interpret it.
-         */
-        uri: zod_1.z.string()
-    })
+    params: exports.SubscribeRequestParamsSchema
 });
+exports.UnsubscribeRequestParamsSchema = exports.ResourceRequestParamsSchema;
 /**
  * Sent from the client to request cancellation of resources/updated notifications from the server. This should follow a previous resources/subscribe request.
  */
 exports.UnsubscribeRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('resources/unsubscribe'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The URI of the resource to unsubscribe from.
-         */
-        uri: zod_1.z.string()
-    })
+    params: exports.UnsubscribeRequestParamsSchema
+});
+/**
+ * Parameters for a `notifications/resources/updated` notification.
+ */
+exports.ResourceUpdatedNotificationParamsSchema = NotificationsParamsSchema.extend({
+    /**
+     * The URI of the resource that has been updated. This might be a sub-resource of the one that the client actually subscribed to.
+     */
+    uri: zod_1.z.string()
 });
 /**
  * A notification from the server to the client, informing it that a resource has changed and may need to be read again. This should only be sent if the client previously sent a resources/subscribe request.
  */
 exports.ResourceUpdatedNotificationSchema = exports.NotificationSchema.extend({
     method: zod_1.z.literal('notifications/resources/updated'),
-    params: BaseNotificationParamsSchema.extend({
-        /**
-         * The URI of the resource that has been updated. This might be a sub-resource of the one that the client actually subscribed to.
-         */
-        uri: zod_1.z.string()
-    })
+    params: exports.ResourceUpdatedNotificationParamsSchema
 });
 /* Prompts */
 /**
  * Describes an argument that a prompt can accept.
  */
-exports.PromptArgumentSchema = zod_1.z
-    .object({
+exports.PromptArgumentSchema = zod_1.z.object({
     /**
      * The name of the argument.
      */
@@ -617,8 +632,7 @@ exports.PromptArgumentSchema = zod_1.z
      * Whether this argument must be provided.
      */
     required: zod_1.z.optional(zod_1.z.boolean())
-})
-    .passthrough();
+});
 /**
  * A prompt or prompt template that the server offers.
  */
@@ -649,27 +663,30 @@ exports.ListPromptsRequestSchema = exports.PaginatedRequestSchema.extend({
 exports.ListPromptsResultSchema = exports.PaginatedResultSchema.extend({
     prompts: zod_1.z.array(exports.PromptSchema)
 });
+/**
+ * Parameters for a `prompts/get` request.
+ */
+exports.GetPromptRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The name of the prompt or prompt template.
+     */
+    name: zod_1.z.string(),
+    /**
+     * Arguments to use for templating the prompt.
+     */
+    arguments: zod_1.z.record(zod_1.z.string(), zod_1.z.string()).optional()
+});
 /**
  * Used by the client to get a prompt provided by the server.
  */
 exports.GetPromptRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('prompts/get'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The name of the prompt or prompt template.
-         */
-        name: zod_1.z.string(),
-        /**
-         * Arguments to use for templating the prompt.
-         */
-        arguments: zod_1.z.optional(zod_1.z.record(zod_1.z.string()))
-    })
+    params: exports.GetPromptRequestParamsSchema
 });
 /**
  * Text provided to or from an LLM.
  */
-exports.TextContentSchema = zod_1.z
-    .object({
+exports.TextContentSchema = zod_1.z.object({
     type: zod_1.z.literal('text'),
     /**
      * The text content of the message.
@@ -679,14 +696,12 @@ exports.TextContentSchema = zod_1.z
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 /**
  * An image provided to or from an LLM.
  */
-exports.ImageContentSchema = zod_1.z
-    .object({
+exports.ImageContentSchema = zod_1.z.object({
     type: zod_1.z.literal('image'),
     /**
      * The base64-encoded image data.
@@ -700,14 +715,12 @@ exports.ImageContentSchema = zod_1.z
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 /**
  * An Audio provided to or from an LLM.
  */
-exports.AudioContentSchema = zod_1.z
-    .object({
+exports.AudioContentSchema = zod_1.z.object({
     type: zod_1.z.literal('audio'),
     /**
      * The base64-encoded audio data.
@@ -721,23 +734,20 @@ exports.AudioContentSchema = zod_1.z
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 /**
  * The contents of a resource, embedded into a prompt or tool call result.
  */
-exports.EmbeddedResourceSchema = zod_1.z
-    .object({
+exports.EmbeddedResourceSchema = zod_1.z.object({
     type: zod_1.z.literal('resource'),
     resource: zod_1.z.union([exports.TextResourceContentsSchema, exports.BlobResourceContentsSchema]),
     /**
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 /**
  * A resource that the server is capable of reading, included in a prompt or tool call result.
  *
@@ -759,12 +769,10 @@ exports.ContentBlockSchema = zod_1.z.union([
 /**
  * Describes a message returned as part of a prompt.
  */
-exports.PromptMessageSchema = zod_1.z
-    .object({
+exports.PromptMessageSchema = zod_1.z.object({
     role: zod_1.z.enum(['user', 'assistant']),
     content: exports.ContentBlockSchema
-})
-    .passthrough();
+});
 /**
  * The server's response to a prompts/get request from the client.
  */
@@ -792,18 +800,17 @@ exports.PromptListChangedNotificationSchema = exports.NotificationSchema.extend(
  * Clients should never make tool use decisions based on ToolAnnotations
  * received from untrusted servers.
  */
-exports.ToolAnnotationsSchema = zod_1.z
-    .object({
+exports.ToolAnnotationsSchema = zod_1.z.object({
     /**
      * A human-readable title for the tool.
      */
-    title: zod_1.z.optional(zod_1.z.string()),
+    title: zod_1.z.string().optional(),
     /**
      * If true, the tool does not modify its environment.
      *
      * Default: false
      */
-    readOnlyHint: zod_1.z.optional(zod_1.z.boolean()),
+    readOnlyHint: zod_1.z.boolean().optional(),
     /**
      * If true, the tool may perform destructive updates to its environment.
      * If false, the tool performs only additive updates.
@@ -812,7 +819,7 @@ exports.ToolAnnotationsSchema = zod_1.z
      *
      * Default: true
      */
-    destructiveHint: zod_1.z.optional(zod_1.z.boolean()),
+    destructiveHint: zod_1.z.boolean().optional(),
     /**
      * If true, calling the tool repeatedly with the same arguments
      * will have no additional effect on the its environment.
@@ -821,7 +828,7 @@ exports.ToolAnnotationsSchema = zod_1.z
      *
      * Default: false
      */
-    idempotentHint: zod_1.z.optional(zod_1.z.boolean()),
+    idempotentHint: zod_1.z.boolean().optional(),
     /**
      * If true, this tool may interact with an "open world" of external
      * entities. If false, the tool's domain of interaction is closed.
@@ -830,9 +837,8 @@ exports.ToolAnnotationsSchema = zod_1.z
      *
      * Default: true
      */
-    openWorldHint: zod_1.z.optional(zod_1.z.boolean())
-})
-    .passthrough();
+    openWorldHint: zod_1.z.boolean().optional()
+});
 /**
  * Definition for a tool the client can call.
  */
@@ -840,28 +846,30 @@ exports.ToolSchema = exports.BaseMetadataSchema.extend({
     /**
      * A human-readable description of the tool.
      */
-    description: zod_1.z.optional(zod_1.z.string()),
+    description: zod_1.z.string().optional(),
     /**
      * A JSON Schema object defining the expected parameters for the tool.
      */
-    inputSchema: zod_1.z
-        .object({
+    inputSchema: zod_1.z.object({
         type: zod_1.z.literal('object'),
-        properties: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+        properties: zod_1.z.record(zod_1.z.string(), AssertObjectSchema).optional(),
         required: zod_1.z.optional(zod_1.z.array(zod_1.z.string()))
-    })
-        .passthrough(),
+    }),
     /**
      * An optional JSON Schema object defining the structure of the tool's output returned in
      * the structuredContent field of a CallToolResult.
      */
-    outputSchema: zod_1.z.optional(zod_1.z
+    outputSchema: zod_1.z
         .object({
         type: zod_1.z.literal('object'),
-        properties: zod_1.z.optional(zod_1.z.object({}).passthrough()),
-        required: zod_1.z.optional(zod_1.z.array(zod_1.z.string()))
+        properties: zod_1.z.record(zod_1.z.string(), AssertObjectSchema).optional(),
+        required: zod_1.z.optional(zod_1.z.array(zod_1.z.string())),
+        /**
+         * Not in the MCP specification, but added to support the Ajv validator while removing .passthrough() which previously allowed additionalProperties to be passed through.
+         */
+        additionalProperties: zod_1.z.optional(zod_1.z.boolean())
     })
-        .passthrough()),
+        .optional(),
     /**
      * Optional additional tool information.
      */
@@ -870,7 +878,7 @@ exports.ToolSchema = exports.BaseMetadataSchema.extend({
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
 }).merge(exports.IconsSchema);
 /**
  * Sent from the client to request a list of tools the server has.
@@ -900,7 +908,7 @@ exports.CallToolResultSchema = exports.ResultSchema.extend({
      *
      * If the Tool defines an outputSchema, this field MUST be present in the result, and contain a JSON object that matches the schema.
      */
-    structuredContent: zod_1.z.object({}).passthrough().optional(),
+    structuredContent: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional(),
     /**
      * Whether the tool call ended in an error.
      *
@@ -923,15 +931,25 @@ exports.CallToolResultSchema = exports.ResultSchema.extend({
 exports.CompatibilityCallToolResultSchema = exports.CallToolResultSchema.or(exports.ResultSchema.extend({
     toolResult: zod_1.z.unknown()
 }));
+/**
+ * Parameters for a `tools/call` request.
+ */
+exports.CallToolRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The name of the tool to call.
+     */
+    name: zod_1.z.string(),
+    /**
+     * Arguments to pass to the tool.
+     */
+    arguments: zod_1.z.optional(zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()))
+});
 /**
  * Used by the client to invoke a tool provided by the server.
  */
 exports.CallToolRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('tools/call'),
-    params: BaseRequestParamsSchema.extend({
-        name: zod_1.z.string(),
-        arguments: zod_1.z.optional(zod_1.z.record(zod_1.z.unknown()))
-    })
+    params: exports.CallToolRequestParamsSchema
 });
 /**
  * An optional notification from the server to the client, informing it that the list of tools it offers has changed. This may be issued by servers without any previous subscription from the client.
@@ -944,55 +962,60 @@ exports.ToolListChangedNotificationSchema = exports.NotificationSchema.extend({
  * The severity of a log message.
  */
 exports.LoggingLevelSchema = zod_1.z.enum(['debug', 'info', 'notice', 'warning', 'error', 'critical', 'alert', 'emergency']);
+/**
+ * Parameters for a `logging/setLevel` request.
+ */
+exports.SetLevelRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The level of logging that the client wants to receive from the server. The server should send all logs at this level and higher (i.e., more severe) to the client as notifications/logging/message.
+     */
+    level: exports.LoggingLevelSchema
+});
 /**
  * A request from the client to the server, to enable or adjust logging.
  */
 exports.SetLevelRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('logging/setLevel'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The level of logging that the client wants to receive from the server. The server should send all logs at this level and higher (i.e., more severe) to the client as notifications/logging/message.
-         */
-        level: exports.LoggingLevelSchema
-    })
+    params: exports.SetLevelRequestParamsSchema
+});
+/**
+ * Parameters for a `notifications/message` notification.
+ */
+exports.LoggingMessageNotificationParamsSchema = NotificationsParamsSchema.extend({
+    /**
+     * The severity of this log message.
+     */
+    level: exports.LoggingLevelSchema,
+    /**
+     * An optional name of the logger issuing this message.
+     */
+    logger: zod_1.z.string().optional(),
+    /**
+     * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
+     */
+    data: zod_1.z.unknown()
 });
 /**
  * Notification of a log message passed from server to client. If no logging/setLevel request has been sent from the client, the server MAY decide which messages to send automatically.
  */
 exports.LoggingMessageNotificationSchema = exports.NotificationSchema.extend({
     method: zod_1.z.literal('notifications/message'),
-    params: BaseNotificationParamsSchema.extend({
-        /**
-         * The severity of this log message.
-         */
-        level: exports.LoggingLevelSchema,
-        /**
-         * An optional name of the logger issuing this message.
-         */
-        logger: zod_1.z.optional(zod_1.z.string()),
-        /**
-         * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
-         */
-        data: zod_1.z.unknown()
-    })
+    params: exports.LoggingMessageNotificationParamsSchema
 });
 /* Sampling */
 /**
  * Hints to use for model selection.
  */
-exports.ModelHintSchema = zod_1.z
-    .object({
+exports.ModelHintSchema = zod_1.z.object({
     /**
      * A hint for a model name.
      */
     name: zod_1.z.string().optional()
-})
-    .passthrough();
+});
 /**
  * The server's preferences for model selection, requested of the client during sampling.
  */
-exports.ModelPreferencesSchema = zod_1.z
-    .object({
+exports.ModelPreferencesSchema = zod_1.z.object({
     /**
      * Optional hints to use for model selection.
      */
@@ -1009,47 +1032,50 @@ exports.ModelPreferencesSchema = zod_1.z
      * How much to prioritize intelligence and capabilities when selecting a model.
      */
     intelligencePriority: zod_1.z.optional(zod_1.z.number().min(0).max(1))
-})
-    .passthrough();
+});
 /**
  * Describes a message issued to or received from an LLM API.
  */
-exports.SamplingMessageSchema = zod_1.z
-    .object({
+exports.SamplingMessageSchema = zod_1.z.object({
     role: zod_1.z.enum(['user', 'assistant']),
     content: zod_1.z.union([exports.TextContentSchema, exports.ImageContentSchema, exports.AudioContentSchema])
-})
-    .passthrough();
+});
+/**
+ * Parameters for a `sampling/createMessage` request.
+ */
+exports.CreateMessageRequestParamsSchema = BaseRequestParamsSchema.extend({
+    messages: zod_1.z.array(exports.SamplingMessageSchema),
+    /**
+     * The server's preferences for which model to select. The client MAY modify or omit this request.
+     */
+    modelPreferences: exports.ModelPreferencesSchema.optional(),
+    /**
+     * An optional system prompt the server wants to use for sampling. The client MAY modify or omit this prompt.
+     */
+    systemPrompt: zod_1.z.string().optional(),
+    /**
+     * A request to include context from one or more MCP servers (including the caller), to be attached to the prompt. The client MAY ignore this request.
+     */
+    includeContext: zod_1.z.enum(['none', 'thisServer', 'allServers']).optional(),
+    temperature: zod_1.z.number().optional(),
+    /**
+     * The requested maximum number of tokens to sample (to prevent runaway completions).
+     *
+     * The client MAY choose to sample fewer tokens than the requested maximum.
+     */
+    maxTokens: zod_1.z.number().int(),
+    stopSequences: zod_1.z.array(zod_1.z.string()).optional(),
+    /**
+     * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
+     */
+    metadata: AssertObjectSchema.optional()
+});
 /**
  * A request from the server to sample an LLM via the client. The client has full discretion over which model to select. The client should also inform the user before beginning sampling, to allow them to inspect the request (human in the loop) and decide whether to approve it.
  */
 exports.CreateMessageRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('sampling/createMessage'),
-    params: BaseRequestParamsSchema.extend({
-        messages: zod_1.z.array(exports.SamplingMessageSchema),
-        /**
-         * An optional system prompt the server wants to use for sampling. The client MAY modify or omit this prompt.
-         */
-        systemPrompt: zod_1.z.optional(zod_1.z.string()),
-        /**
-         * A request to include context from one or more MCP servers (including the caller), to be attached to the prompt. The client MAY ignore this request.
-         */
-        includeContext: zod_1.z.optional(zod_1.z.enum(['none', 'thisServer', 'allServers'])),
-        temperature: zod_1.z.optional(zod_1.z.number()),
-        /**
-         * The maximum number of tokens to sample, as requested by the server. The client MAY choose to sample fewer tokens than requested.
-         */
-        maxTokens: zod_1.z.number().int(),
-        stopSequences: zod_1.z.optional(zod_1.z.array(zod_1.z.string())),
-        /**
-         * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
-         */
-        metadata: zod_1.z.optional(zod_1.z.object({}).passthrough()),
-        /**
-         * The server's preferences for which model to select.
-         */
-        modelPreferences: zod_1.z.optional(exports.ModelPreferencesSchema)
-    })
+    params: exports.CreateMessageRequestParamsSchema
 });
 /**
  * The client's response to a sampling/create_message request from the server. The client should inform the user before returning the sampled message, to allow them to inspect the response (human in the loop) and decide whether to allow the server to see it.
@@ -1070,104 +1096,170 @@ exports.CreateMessageResultSchema = exports.ResultSchema.extend({
 /**
  * Primitive schema definition for boolean fields.
  */
-exports.BooleanSchemaSchema = zod_1.z
-    .object({
+exports.BooleanSchemaSchema = zod_1.z.object({
     type: zod_1.z.literal('boolean'),
-    title: zod_1.z.optional(zod_1.z.string()),
-    description: zod_1.z.optional(zod_1.z.string()),
-    default: zod_1.z.optional(zod_1.z.boolean())
-})
-    .passthrough();
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    default: zod_1.z.boolean().optional()
+});
 /**
  * Primitive schema definition for string fields.
  */
-exports.StringSchemaSchema = zod_1.z
-    .object({
+exports.StringSchemaSchema = zod_1.z.object({
     type: zod_1.z.literal('string'),
-    title: zod_1.z.optional(zod_1.z.string()),
-    description: zod_1.z.optional(zod_1.z.string()),
-    minLength: zod_1.z.optional(zod_1.z.number()),
-    maxLength: zod_1.z.optional(zod_1.z.number()),
-    format: zod_1.z.optional(zod_1.z.enum(['email', 'uri', 'date', 'date-time']))
-})
-    .passthrough();
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    minLength: zod_1.z.number().optional(),
+    maxLength: zod_1.z.number().optional(),
+    format: zod_1.z.enum(['email', 'uri', 'date', 'date-time']).optional(),
+    default: zod_1.z.string().optional()
+});
 /**
  * Primitive schema definition for number fields.
  */
-exports.NumberSchemaSchema = zod_1.z
-    .object({
+exports.NumberSchemaSchema = zod_1.z.object({
     type: zod_1.z.enum(['number', 'integer']),
-    title: zod_1.z.optional(zod_1.z.string()),
-    description: zod_1.z.optional(zod_1.z.string()),
-    minimum: zod_1.z.optional(zod_1.z.number()),
-    maximum: zod_1.z.optional(zod_1.z.number())
-})
-    .passthrough();
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    minimum: zod_1.z.number().optional(),
+    maximum: zod_1.z.number().optional(),
+    default: zod_1.z.number().optional()
+});
 /**
- * Primitive schema definition for enum fields.
+ * Schema for single-selection enumeration without display titles for options.
  */
-exports.EnumSchemaSchema = zod_1.z
-    .object({
+exports.UntitledSingleSelectEnumSchemaSchema = zod_1.z.object({
     type: zod_1.z.literal('string'),
-    title: zod_1.z.optional(zod_1.z.string()),
-    description: zod_1.z.optional(zod_1.z.string()),
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
     enum: zod_1.z.array(zod_1.z.string()),
-    enumNames: zod_1.z.optional(zod_1.z.array(zod_1.z.string()))
-})
-    .passthrough();
+    default: zod_1.z.string().optional()
+});
+/**
+ * Schema for single-selection enumeration with display titles for each option.
+ */
+exports.TitledSingleSelectEnumSchemaSchema = zod_1.z.object({
+    type: zod_1.z.literal('string'),
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    oneOf: zod_1.z.array(zod_1.z.object({
+        const: zod_1.z.string(),
+        title: zod_1.z.string()
+    })),
+    default: zod_1.z.string().optional()
+});
+/**
+ * Use TitledSingleSelectEnumSchema instead.
+ * This interface will be removed in a future version.
+ */
+exports.LegacyTitledEnumSchemaSchema = zod_1.z.object({
+    type: zod_1.z.literal('string'),
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    enum: zod_1.z.array(zod_1.z.string()),
+    enumNames: zod_1.z.array(zod_1.z.string()).optional(),
+    default: zod_1.z.string().optional()
+});
+// Combined single selection enumeration
+exports.SingleSelectEnumSchemaSchema = zod_1.z.union([exports.UntitledSingleSelectEnumSchemaSchema, exports.TitledSingleSelectEnumSchemaSchema]);
+/**
+ * Schema for multiple-selection enumeration without display titles for options.
+ */
+exports.UntitledMultiSelectEnumSchemaSchema = zod_1.z.object({
+    type: zod_1.z.literal('array'),
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    minItems: zod_1.z.number().optional(),
+    maxItems: zod_1.z.number().optional(),
+    items: zod_1.z.object({
+        type: zod_1.z.literal('string'),
+        enum: zod_1.z.array(zod_1.z.string())
+    }),
+    default: zod_1.z.array(zod_1.z.string()).optional()
+});
+/**
+ * Schema for multiple-selection enumeration with display titles for each option.
+ */
+exports.TitledMultiSelectEnumSchemaSchema = zod_1.z.object({
+    type: zod_1.z.literal('array'),
+    title: zod_1.z.string().optional(),
+    description: zod_1.z.string().optional(),
+    minItems: zod_1.z.number().optional(),
+    maxItems: zod_1.z.number().optional(),
+    items: zod_1.z.object({
+        anyOf: zod_1.z.array(zod_1.z.object({
+            const: zod_1.z.string(),
+            title: zod_1.z.string()
+        }))
+    }),
+    default: zod_1.z.array(zod_1.z.string()).optional()
+});
+/**
+ * Combined schema for multiple-selection enumeration
+ */
+exports.MultiSelectEnumSchemaSchema = zod_1.z.union([exports.UntitledMultiSelectEnumSchemaSchema, exports.TitledMultiSelectEnumSchemaSchema]);
+/**
+ * Primitive schema definition for enum fields.
+ */
+exports.EnumSchemaSchema = zod_1.z.union([exports.LegacyTitledEnumSchemaSchema, exports.SingleSelectEnumSchemaSchema, exports.MultiSelectEnumSchemaSchema]);
 /**
  * Union of all primitive schema definitions.
  */
-exports.PrimitiveSchemaDefinitionSchema = zod_1.z.union([exports.BooleanSchemaSchema, exports.StringSchemaSchema, exports.NumberSchemaSchema, exports.EnumSchemaSchema]);
+exports.PrimitiveSchemaDefinitionSchema = zod_1.z.union([exports.EnumSchemaSchema, exports.BooleanSchemaSchema, exports.StringSchemaSchema, exports.NumberSchemaSchema]);
+/**
+ * Parameters for an `elicitation/create` request.
+ */
+exports.ElicitRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The message to present to the user.
+     */
+    message: zod_1.z.string(),
+    /**
+     * A restricted subset of JSON Schema.
+     * Only top-level properties are allowed, without nesting.
+     */
+    requestedSchema: zod_1.z.object({
+        type: zod_1.z.literal('object'),
+        properties: zod_1.z.record(zod_1.z.string(), exports.PrimitiveSchemaDefinitionSchema),
+        required: zod_1.z.array(zod_1.z.string()).optional()
+    })
+});
 /**
  * A request from the server to elicit user input via the client.
  * The client should present the message and form fields to the user.
  */
 exports.ElicitRequestSchema = exports.RequestSchema.extend({
     method: zod_1.z.literal('elicitation/create'),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The message to present to the user.
-         */
-        message: zod_1.z.string(),
-        /**
-         * The schema for the requested user input.
-         */
-        requestedSchema: zod_1.z
-            .object({
-            type: zod_1.z.literal('object'),
-            properties: zod_1.z.record(zod_1.z.string(), exports.PrimitiveSchemaDefinitionSchema),
-            required: zod_1.z.optional(zod_1.z.array(zod_1.z.string()))
-        })
-            .passthrough()
-    })
+    params: exports.ElicitRequestParamsSchema
 });
 /**
  * The client's response to an elicitation/create request from the server.
  */
 exports.ElicitResultSchema = exports.ResultSchema.extend({
     /**
-     * The user's response action.
+     * The user action in response to the elicitation.
+     * - "accept": User submitted the form/confirmed the action
+     * - "decline": User explicitly decline the action
+     * - "cancel": User dismissed without making an explicit choice
      */
     action: zod_1.z.enum(['accept', 'decline', 'cancel']),
     /**
-     * The collected user input content (only present if action is "accept").
+     * The submitted form data, only present when action is "accept".
+     * Contains values matching the requested schema.
      */
-    content: zod_1.z.optional(zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()))
+    content: zod_1.z.record(zod_1.z.union([zod_1.z.string(), zod_1.z.number(), zod_1.z.boolean(), zod_1.z.array(zod_1.z.string())])).optional()
 });
 /* Autocomplete */
 /**
  * A reference to a resource or resource template definition.
  */
-exports.ResourceTemplateReferenceSchema = zod_1.z
-    .object({
+exports.ResourceTemplateReferenceSchema = zod_1.z.object({
     type: zod_1.z.literal('ref/resource'),
     /**
      * The URI or URI template of the resource.
      */
     uri: zod_1.z.string()
-})
-    .passthrough();
+});
 /**
  * @deprecated Use ResourceTemplateReferenceSchema instead
  */
@@ -1175,45 +1267,57 @@ exports.ResourceReferenceSchema = exports.ResourceTemplateReferenceSchema;
 /**
  * Identifies a prompt.
  */
-exports.PromptReferenceSchema = zod_1.z
-    .object({
+exports.PromptReferenceSchema = zod_1.z.object({
     type: zod_1.z.literal('ref/prompt'),
     /**
      * The name of the prompt or prompt template
      */
     name: zod_1.z.string()
-})
-    .passthrough();
+});
 /**
- * A request from the client to the server, to ask for completion options.
+ * Parameters for a `completion/complete` request.
  */
-exports.CompleteRequestSchema = exports.RequestSchema.extend({
-    method: zod_1.z.literal('completion/complete'),
-    params: BaseRequestParamsSchema.extend({
-        ref: zod_1.z.union([exports.PromptReferenceSchema, exports.ResourceTemplateReferenceSchema]),
+exports.CompleteRequestParamsSchema = BaseRequestParamsSchema.extend({
+    ref: zod_1.z.union([exports.PromptReferenceSchema, exports.ResourceTemplateReferenceSchema]),
+    /**
+     * The argument's information
+     */
+    argument: zod_1.z.object({
         /**
-         * The argument's information
+         * The name of the argument
          */
-        argument: zod_1.z
-            .object({
-            /**
-             * The name of the argument
-             */
-            name: zod_1.z.string(),
-            /**
-             * The value of the argument to use for completion matching.
-             */
-            value: zod_1.z.string()
-        })
-            .passthrough(),
-        context: zod_1.z.optional(zod_1.z.object({
-            /**
-             * Previously-resolved variables in a URI template or prompt.
-             */
-            arguments: zod_1.z.optional(zod_1.z.record(zod_1.z.string(), zod_1.z.string()))
-        }))
+        name: zod_1.z.string(),
+        /**
+         * The value of the argument to use for completion matching.
+         */
+        value: zod_1.z.string()
+    }),
+    context: zod_1.z
+        .object({
+        /**
+         * Previously-resolved variables in a URI template or prompt.
+         */
+        arguments: zod_1.z.record(zod_1.z.string(), zod_1.z.string()).optional()
     })
+        .optional()
+});
+/**
+ * A request from the client to the server, to ask for completion options.
+ */
+exports.CompleteRequestSchema = exports.RequestSchema.extend({
+    method: zod_1.z.literal('completion/complete'),
+    params: exports.CompleteRequestParamsSchema
 });
+function assertCompleteRequestPrompt(request) {
+    if (request.params.ref.type !== 'ref/prompt') {
+        throw new TypeError(`Expected CompleteRequestPrompt, but got ${request.params.ref.type}`);
+    }
+}
+function assertCompleteRequestResourceTemplate(request) {
+    if (request.params.ref.type !== 'ref/resource') {
+        throw new TypeError(`Expected CompleteRequestResourceTemplate, but got ${request.params.ref.type}`);
+    }
+}
 /**
  * The server's response to a completion/complete request
  */
@@ -1239,8 +1343,7 @@ exports.CompleteResultSchema = exports.ResultSchema.extend({
 /**
  * Represents a root directory or file that the server can operate on.
  */
-exports.RootSchema = zod_1.z
-    .object({
+exports.RootSchema = zod_1.z.object({
     /**
      * The URI identifying the root. This *must* start with file:// for now.
      */
@@ -1248,14 +1351,13 @@ exports.RootSchema = zod_1.z
     /**
      * An optional name for the root.
      */
-    name: zod_1.z.optional(zod_1.z.string()),
+    name: zod_1.z.string().optional(),
     /**
      * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
      * for notes on _meta usage.
      */
-    _meta: zod_1.z.optional(zod_1.z.object({}).passthrough())
-})
-    .passthrough();
+    _meta: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional()
+});
 /**
  * Sent from the server to request a list of root URIs from the client.
  */