@modelcontextprotocol/sdk 1.21.2 → 1.23.0-beta.0

package/dist/cjs/types.js

@@ -1,94 +1,123 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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;
-const zod_1 = require("zod");
+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.CreateMessageRequestSchema = exports.CreateMessageRequestParamsSchema = exports.SamplingMessageSchema = exports.SamplingMessageContentBlockSchema = exports.ToolResultContentSchema = exports.ToolChoiceSchema = 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.ToolUseContentSchema = 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.UrlElicitationRequiredError = 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.ElicitationCompleteNotificationSchema = exports.ElicitationCompleteNotificationParamsSchema = exports.ElicitRequestSchema = exports.ElicitRequestParamsSchema = exports.ElicitRequestURLParamsSchema = exports.ElicitRequestFormParamsSchema = exports.PrimitiveSchemaDefinitionSchema = exports.EnumSchemaSchema = exports.MultiSelectEnumSchemaSchema = exports.TitledMultiSelectEnumSchemaSchema = exports.UntitledMultiSelectEnumSchemaSchema = exports.SingleSelectEnumSchemaSchema = exports.LegacyTitledEnumSchemaSchema = exports.TitledSingleSelectEnumSchemaSchema = exports.UntitledSingleSelectEnumSchemaSchema = exports.NumberSchemaSchema = exports.StringSchemaSchema = exports.BooleanSchemaSchema = exports.CreateMessageResultSchema = void 0;
+exports.assertCompleteRequestPrompt = assertCompleteRequestPrompt;
+exports.assertCompleteRequestResourceTemplate = assertCompleteRequestResourceTemplate;
+const z = __importStar(require("zod/v4"));
 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 = z.custom((v) => v !== null && (typeof v === 'object' || typeof v === 'function'));
 /**
  * A progress token, used to associate progress notifications with the original request.
  */
-exports.ProgressTokenSchema = zod_1.z.union([zod_1.z.string(), zod_1.z.number().int()]);
+exports.ProgressTokenSchema = z.union([z.string(), z.number().int()]);
 /**
  * An opaque token used to represent a cursor for pagination.
  */
-exports.CursorSchema = zod_1.z.string();
-const RequestMetaSchema = zod_1.z
-    .object({
+exports.CursorSchema = z.string();
+const RequestMetaSchema = z.looseObject({
     /**
      * 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)
-})
-    .passthrough();
-exports.RequestSchema = zod_1.z.object({
-    method: zod_1.z.string(),
-    params: zod_1.z.optional(BaseRequestParamsSchema)
+    progressToken: exports.ProgressTokenSchema.optional()
 });
-const BaseNotificationParamsSchema = zod_1.z
-    .object({
+/**
+ * Common params for any request.
+ */
+const BaseRequestParamsSchema = z.looseObject({
+    /**
+     * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
+     */
+    _meta: RequestMetaSchema.optional()
+});
+exports.RequestSchema = z.object({
+    method: z.string(),
+    params: BaseRequestParamsSchema.optional()
+});
+const NotificationsParamsSchema = z.looseObject({
     /**
      * 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();
-exports.NotificationSchema = zod_1.z.object({
-    method: zod_1.z.string(),
-    params: zod_1.z.optional(BaseNotificationParamsSchema)
+    _meta: z.record(z.string(), z.unknown()).optional()
 });
-exports.ResultSchema = zod_1.z
-    .object({
+exports.NotificationSchema = z.object({
+    method: z.string(),
+    params: NotificationsParamsSchema.optional()
+});
+exports.ResultSchema = z.looseObject({
     /**
      * 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: z.record(z.string(), z.unknown()).optional()
+});
 /**
  * A uniquely identifying ID for a request in JSON-RPC.
  */
-exports.RequestIdSchema = zod_1.z.union([zod_1.z.string(), zod_1.z.number().int()]);
+exports.RequestIdSchema = z.union([z.string(), z.number().int()]);
 /**
  * A request that expects a response.
  */
-exports.JSONRPCRequestSchema = zod_1.z
+exports.JSONRPCRequestSchema = z
     .object({
-    jsonrpc: zod_1.z.literal(exports.JSONRPC_VERSION),
-    id: exports.RequestIdSchema
+    jsonrpc: z.literal(exports.JSONRPC_VERSION),
+    id: exports.RequestIdSchema,
+    ...exports.RequestSchema.shape
 })
-    .merge(exports.RequestSchema)
     .strict();
 const isJSONRPCRequest = (value) => exports.JSONRPCRequestSchema.safeParse(value).success;
 exports.isJSONRPCRequest = isJSONRPCRequest;
 /**
  * A notification which does not expect a response.
  */
-exports.JSONRPCNotificationSchema = zod_1.z
+exports.JSONRPCNotificationSchema = z
     .object({
-    jsonrpc: zod_1.z.literal(exports.JSONRPC_VERSION)
+    jsonrpc: z.literal(exports.JSONRPC_VERSION),
+    ...exports.NotificationSchema.shape
 })
-    .merge(exports.NotificationSchema)
     .strict();
 const isJSONRPCNotification = (value) => exports.JSONRPCNotificationSchema.safeParse(value).success;
 exports.isJSONRPCNotification = isJSONRPCNotification;
 /**
  * A successful (non-error) response to a request.
  */
-exports.JSONRPCResponseSchema = zod_1.z
+exports.JSONRPCResponseSchema = z
     .object({
-    jsonrpc: zod_1.z.literal(exports.JSONRPC_VERSION),
+    jsonrpc: z.literal(exports.JSONRPC_VERSION),
     id: exports.RequestIdSchema,
     result: exports.ResultSchema
 })
@@ -109,38 +138,52 @@ var ErrorCode;
     ErrorCode[ErrorCode["MethodNotFound"] = -32601] = "MethodNotFound";
     ErrorCode[ErrorCode["InvalidParams"] = -32602] = "InvalidParams";
     ErrorCode[ErrorCode["InternalError"] = -32603] = "InternalError";
+    // MCP-specific error codes
+    ErrorCode[ErrorCode["UrlElicitationRequired"] = -32042] = "UrlElicitationRequired";
 })(ErrorCode || (exports.ErrorCode = ErrorCode = {}));
 /**
  * A response to a request that indicates an error occurred.
  */
-exports.JSONRPCErrorSchema = zod_1.z
+exports.JSONRPCErrorSchema = z
     .object({
-    jsonrpc: zod_1.z.literal(exports.JSONRPC_VERSION),
+    jsonrpc: z.literal(exports.JSONRPC_VERSION),
     id: exports.RequestIdSchema,
-    error: zod_1.z.object({
+    error: z.object({
         /**
          * The error type that occurred.
          */
-        code: zod_1.z.number().int(),
+        code: z.number().int(),
         /**
          * A short description of the error. The message SHOULD be limited to a concise single sentence.
          */
-        message: zod_1.z.string(),
+        message: z.string(),
         /**
          * Additional information about the error. The value of this member is defined by the sender (e.g. detailed error information, nested errors etc.).
          */
-        data: zod_1.z.optional(zod_1.z.unknown())
+        data: z.optional(z.unknown())
     })
 })
     .strict();
 const isJSONRPCError = (value) => exports.JSONRPCErrorSchema.safeParse(value).success;
 exports.isJSONRPCError = isJSONRPCError;
-exports.JSONRPCMessageSchema = zod_1.z.union([exports.JSONRPCRequestSchema, exports.JSONRPCNotificationSchema, exports.JSONRPCResponseSchema, exports.JSONRPCErrorSchema]);
+exports.JSONRPCMessageSchema = z.union([exports.JSONRPCRequestSchema, exports.JSONRPCNotificationSchema, exports.JSONRPCResponseSchema, exports.JSONRPCErrorSchema]);
 /* Empty result */
 /**
  * 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: z.string().optional()
+});
 /* Cancellation */
 /**
  * This notification can be sent by either side to indicate that it is cancelling a previously-issued request.
@@ -152,49 +195,35 @@ exports.EmptyResultSchema = exports.ResultSchema.strict();
  * A client MUST NOT attempt to cancel its `initialize` request.
  */
 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()
-    })
+    method: z.literal('notifications/cancelled'),
+    params: exports.CancelledNotificationParamsSchema
 });
 /* Base Metadata */
 /**
  * Icon schema for use in tools, prompts, resources, and implementations.
  */
-exports.IconSchema = zod_1.z
-    .object({
+exports.IconSchema = z.object({
     /**
      * URL or data URI for the icon.
      */
-    src: zod_1.z.string(),
+    src: z.string(),
     /**
      * Optional MIME type for the icon.
      */
-    mimeType: zod_1.z.optional(zod_1.z.string()),
+    mimeType: 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: z.array(z.string()).optional()
+});
 /**
  * Base schema to add `icons` property.
  *
  */
-exports.IconsSchema = zod_1.z
-    .object({
+exports.IconsSchema = z.object({
     /**
      * Optional set of sized icons that the client can display in a user interface.
      *
@@ -206,16 +235,14 @@ exports.IconsSchema = zod_1.z
      * - `image/svg+xml` - SVG images (scalable but requires security precautions)
      * - `image/webp` - WebP images (modern, efficient format)
      */
-    icons: zod_1.z.array(exports.IconSchema).optional()
-})
-    .passthrough();
+    icons: z.array(exports.IconSchema).optional()
+});
 /**
  * Base metadata interface for common properties across resources, tools, prompts, and implementations.
  */
-exports.BaseMetadataSchema = zod_1.z
-    .object({
+exports.BaseMetadataSchema = z.object({
     /** Intended for programmatic or logical use, but used as a display name in past specs or fallback */
-    name: zod_1.z.string(),
+    name: z.string(),
     /**
      * Intended for UI and end-user contexts — optimized to be human-readable and easily understood,
      * even by those unfamiliar with domain-specific terminology.
@@ -224,122 +251,144 @@ 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: z.string().optional()
+});
 /* Initialization */
 /**
  * Describes the name and version of an MCP implementation.
  */
 exports.ImplementationSchema = exports.BaseMetadataSchema.extend({
-    version: zod_1.z.string(),
+    ...exports.BaseMetadataSchema.shape,
+    ...exports.IconsSchema.shape,
+    version: z.string(),
     /**
      * An optional URL of the website for this implementation.
      */
-    websiteUrl: zod_1.z.optional(zod_1.z.string())
-}).merge(exports.IconsSchema);
+    websiteUrl: z.string().optional()
+});
+const FormElicitationCapabilitySchema = z.intersection(z.object({
+    applyDefaults: z.boolean().optional()
+}), z.record(z.string(), z.unknown()));
+const ElicitationCapabilitySchema = z.preprocess(value => {
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+        if (Object.keys(value).length === 0) {
+            return { form: {} };
+        }
+    }
+    return value;
+}, z.intersection(z.object({
+    form: FormElicitationCapabilitySchema.optional(),
+    url: AssertObjectSchema.optional()
+}), z.record(z.string(), z.unknown()).optional()));
 /**
  * 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 = z.object({
     /**
      * Experimental, non-standard capabilities that the client supports.
      */
-    experimental: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    experimental: z.record(z.string(), AssertObjectSchema).optional(),
     /**
      * Present if the client supports sampling from an LLM.
      */
-    sampling: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    sampling: z
+        .object({
+        /**
+         * Present if the client supports context inclusion via includeContext parameter.
+         * If not declared, servers SHOULD only use `includeContext: "none"` (or omit it).
+         */
+        context: AssertObjectSchema.optional(),
+        /**
+         * Present if the client supports tool use via tools and toolChoice parameters.
+         */
+        tools: AssertObjectSchema.optional()
+    })
+        .optional(),
     /**
      * Present if the client supports eliciting user input.
      */
-    elicitation: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    elicitation: ElicitationCapabilitySchema.optional(),
     /**
      * Present if the client supports listing roots.
      */
-    roots: zod_1.z.optional(zod_1.z
+    roots: z
         .object({
         /**
          * Whether the client supports issuing notifications for changes to the roots list.
          */
-        listChanged: zod_1.z.optional(zod_1.z.boolean())
+        listChanged: 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: 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
-    })
+    method: z.literal('initialize'),
+    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 = z.object({
     /**
      * Experimental, non-standard capabilities that the server supports.
      */
-    experimental: zod_1.z.optional(zod_1.z.object({}).passthrough()),
+    experimental: z.record(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: z.optional(z.object({
         /**
          * Whether this server supports issuing notifications for changes to the prompt list.
          */
-        listChanged: zod_1.z.optional(zod_1.z.boolean())
-    })
-        .passthrough()),
+        listChanged: z.optional(z.boolean())
+    })),
     /**
      * Present if the server offers any resources to read.
      */
-    resources: zod_1.z.optional(zod_1.z
+    resources: z
         .object({
         /**
          * Whether this server supports clients subscribing to resource updates.
          */
-        subscribe: zod_1.z.optional(zod_1.z.boolean()),
+        subscribe: 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: z.boolean().optional()
     })
-        .passthrough()),
+        .optional(),
     /**
      * Present if the server offers any tools to call.
      */
-    tools: zod_1.z.optional(zod_1.z
+    tools: z
         .object({
         /**
          * Whether this server supports issuing notifications for changes to the tool list.
          */
-        listChanged: zod_1.z.optional(zod_1.z.boolean())
+        listChanged: z.boolean().optional()
     })
-        .passthrough())
-})
-    .passthrough();
+        .optional()
+});
 /**
  * After receiving an initialize request from the client, the server sends this response.
  */
@@ -347,7 +396,7 @@ exports.InitializeResultSchema = exports.ResultSchema.extend({
     /**
      * The version of the Model Context Protocol that the server wants to use. This may not match the version that the client requested. If the client cannot support this version, it MUST disconnect.
      */
-    protocolVersion: zod_1.z.string(),
+    protocolVersion: z.string(),
     capabilities: exports.ServerCapabilitiesSchema,
     serverInfo: exports.ImplementationSchema,
     /**
@@ -355,13 +404,13 @@ 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: z.string().optional()
 });
 /**
  * This notification is sent from the client to the server after initialization has finished.
  */
 exports.InitializedNotificationSchema = exports.NotificationSchema.extend({
-    method: zod_1.z.literal('notifications/initialized')
+    method: z.literal('notifications/initialized')
 });
 const isInitializedNotification = (value) => exports.InitializedNotificationSchema.safeParse(value).success;
 exports.isInitializedNotification = isInitializedNotification;
@@ -370,87 +419,89 @@ exports.isInitializedNotification = isInitializedNotification;
  * A ping, issued by either the server or the client, to check that the other party is still alive. The receiver must promptly respond, or else may be disconnected.
  */
 exports.PingRequestSchema = exports.RequestSchema.extend({
-    method: zod_1.z.literal('ping')
+    method: z.literal('ping')
 });
 /* Progress notifications */
-exports.ProgressSchema = zod_1.z
-    .object({
+exports.ProgressSchema = z.object({
     /**
      * The progress thus far. This should increase every time progress is made, even if the total is unknown.
      */
-    progress: zod_1.z.number(),
+    progress: z.number(),
     /**
      * Total number of items to process (or total progress required), if known.
      */
-    total: zod_1.z.optional(zod_1.z.number()),
+    total: z.optional(z.number()),
     /**
      * An optional message describing the current progress.
      */
-    message: zod_1.z.optional(zod_1.z.string())
-})
-    .passthrough();
+    message: z.optional(z.string())
+});
+exports.ProgressNotificationParamsSchema = z.object({
+    ...NotificationsParamsSchema.shape,
+    ...exports.ProgressSchema.shape,
+    /**
+     * 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
-    })
+    method: z.literal('notifications/progress'),
+    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({
     /**
      * An opaque token representing the pagination position after the last returned result.
      * If present, there may be more results available.
      */
-    nextCursor: zod_1.z.optional(exports.CursorSchema)
+    nextCursor: z.optional(exports.CursorSchema)
 });
 /* Resources */
 /**
  * The contents of a specific resource or sub-resource.
  */
-exports.ResourceContentsSchema = zod_1.z
-    .object({
+exports.ResourceContentsSchema = z.object({
     /**
      * The URI of this resource.
      */
-    uri: zod_1.z.string(),
+    uri: z.string(),
     /**
      * The MIME type of this resource, if known.
      */
-    mimeType: zod_1.z.optional(zod_1.z.string()),
+    mimeType: z.optional(z.string()),
     /**
      * 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: z.record(z.string(), 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).
      */
-    text: zod_1.z.string()
+    text: z.string()
 });
 /**
  * A Zod schema for validating Base64 strings that is more performant and
  * robust for very large inputs than the default regex-based check. It avoids
  * stack overflows by using the native `atob` function for validation.
  */
-const Base64Schema = zod_1.z.string().refine(val => {
+const Base64Schema = z.string().refine(val => {
     try {
         // atob throws a DOMException if the string contains characters
         // that are not part of the Base64 character set.
@@ -470,224 +521,232 @@ exports.BlobResourceContentsSchema = exports.ResourceContentsSchema.extend({
 /**
  * A known resource that the server is capable of reading.
  */
-exports.ResourceSchema = exports.BaseMetadataSchema.extend({
+exports.ResourceSchema = z.object({
+    ...exports.BaseMetadataSchema.shape,
+    ...exports.IconsSchema.shape,
     /**
      * The URI of this resource.
      */
-    uri: zod_1.z.string(),
+    uri: z.string(),
     /**
      * A description of what this resource represents.
      *
      * This can be used by clients to improve the LLM's understanding of available resources. It can be thought of like a "hint" to the model.
      */
-    description: zod_1.z.optional(zod_1.z.string()),
+    description: z.optional(z.string()),
     /**
      * The MIME type of this resource, if known.
      */
-    mimeType: zod_1.z.optional(zod_1.z.string()),
+    mimeType: z.optional(z.string()),
     /**
      * 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())
-}).merge(exports.IconsSchema);
+    _meta: z.optional(z.looseObject({}))
+});
 /**
  * A template description for resources available on the server.
  */
-exports.ResourceTemplateSchema = exports.BaseMetadataSchema.extend({
+exports.ResourceTemplateSchema = z.object({
+    ...exports.BaseMetadataSchema.shape,
+    ...exports.IconsSchema.shape,
     /**
      * A URI template (according to RFC 6570) that can be used to construct resource URIs.
      */
-    uriTemplate: zod_1.z.string(),
+    uriTemplate: z.string(),
     /**
      * A description of what this template is for.
      *
      * This can be used by clients to improve the LLM's understanding of available resources. It can be thought of like a "hint" to the model.
      */
-    description: zod_1.z.optional(zod_1.z.string()),
+    description: z.optional(z.string()),
     /**
      * The MIME type for all resources that match this template. This should only be included if all resources matching this template have the same type.
      */
-    mimeType: zod_1.z.optional(zod_1.z.string()),
+    mimeType: z.optional(z.string()),
     /**
      * 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())
-}).merge(exports.IconsSchema);
+    _meta: z.optional(z.looseObject({}))
+});
 /**
  * Sent from the client to request a list of resources the server has.
  */
 exports.ListResourcesRequestSchema = exports.PaginatedRequestSchema.extend({
-    method: zod_1.z.literal('resources/list')
+    method: z.literal('resources/list')
 });
 /**
  * The server's response to a resources/list request from the client.
  */
 exports.ListResourcesResultSchema = exports.PaginatedResultSchema.extend({
-    resources: zod_1.z.array(exports.ResourceSchema)
+    resources: z.array(exports.ResourceSchema)
 });
 /**
  * Sent from the client to request a list of resource templates the server has.
  */
 exports.ListResourceTemplatesRequestSchema = exports.PaginatedRequestSchema.extend({
-    method: zod_1.z.literal('resources/templates/list')
+    method: z.literal('resources/templates/list')
 });
 /**
  * The server's response to a resources/templates/list request from the client.
  */
 exports.ListResourceTemplatesResultSchema = exports.PaginatedResultSchema.extend({
-    resourceTemplates: zod_1.z.array(exports.ResourceTemplateSchema)
+    resourceTemplates: 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: 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()
-    })
+    method: z.literal('resources/read'),
+    params: exports.ReadResourceRequestParamsSchema
 });
 /**
  * The server's response to a resources/read request from the client.
  */
 exports.ReadResourceResultSchema = exports.ResultSchema.extend({
-    contents: zod_1.z.array(zod_1.z.union([exports.TextResourceContentsSchema, exports.BlobResourceContentsSchema]))
+    contents: z.array(z.union([exports.TextResourceContentsSchema, exports.BlobResourceContentsSchema]))
 });
 /**
  * An optional notification from the server to the client, informing it that the list of resources it can read from has changed. This may be issued by servers without any previous subscription from the client.
  */
 exports.ResourceListChangedNotificationSchema = exports.NotificationSchema.extend({
-    method: zod_1.z.literal('notifications/resources/list_changed')
+    method: 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()
-    })
+    method: z.literal('resources/subscribe'),
+    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()
-    })
+    method: z.literal('resources/unsubscribe'),
+    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: 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()
-    })
+    method: z.literal('notifications/resources/updated'),
+    params: exports.ResourceUpdatedNotificationParamsSchema
 });
 /* Prompts */
 /**
  * Describes an argument that a prompt can accept.
  */
-exports.PromptArgumentSchema = zod_1.z
-    .object({
+exports.PromptArgumentSchema = z.object({
     /**
      * The name of the argument.
      */
-    name: zod_1.z.string(),
+    name: z.string(),
     /**
      * A human-readable description of the argument.
      */
-    description: zod_1.z.optional(zod_1.z.string()),
+    description: z.optional(z.string()),
     /**
      * Whether this argument must be provided.
      */
-    required: zod_1.z.optional(zod_1.z.boolean())
-})
-    .passthrough();
+    required: z.optional(z.boolean())
+});
 /**
  * A prompt or prompt template that the server offers.
  */
-exports.PromptSchema = exports.BaseMetadataSchema.extend({
+exports.PromptSchema = z.object({
+    ...exports.BaseMetadataSchema.shape,
+    ...exports.IconsSchema.shape,
     /**
      * An optional description of what this prompt provides
      */
-    description: zod_1.z.optional(zod_1.z.string()),
+    description: z.optional(z.string()),
     /**
      * A list of arguments to use for templating the prompt.
      */
-    arguments: zod_1.z.optional(zod_1.z.array(exports.PromptArgumentSchema)),
+    arguments: z.optional(z.array(exports.PromptArgumentSchema)),
     /**
      * 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())
-}).merge(exports.IconsSchema);
+    _meta: z.optional(z.looseObject({}))
+});
 /**
  * Sent from the client to request a list of prompts and prompt templates the server has.
  */
 exports.ListPromptsRequestSchema = exports.PaginatedRequestSchema.extend({
-    method: zod_1.z.literal('prompts/list')
+    method: z.literal('prompts/list')
 });
 /**
  * The server's response to a prompts/list request from the client.
  */
 exports.ListPromptsResultSchema = exports.PaginatedResultSchema.extend({
-    prompts: zod_1.z.array(exports.PromptSchema)
+    prompts: z.array(exports.PromptSchema)
+});
+/**
+ * Parameters for a `prompts/get` request.
+ */
+exports.GetPromptRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The name of the prompt or prompt template.
+     */
+    name: z.string(),
+    /**
+     * Arguments to use for templating the prompt.
+     */
+    arguments: z.record(z.string(), 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()))
-    })
+    method: z.literal('prompts/get'),
+    params: exports.GetPromptRequestParamsSchema
 });
 /**
  * Text provided to or from an LLM.
  */
-exports.TextContentSchema = zod_1.z
-    .object({
-    type: zod_1.z.literal('text'),
+exports.TextContentSchema = z.object({
+    type: z.literal('text'),
     /**
      * The text content of the message.
      */
-    text: zod_1.z.string(),
+    text: z.string(),
     /**
      * 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: z.record(z.string(), z.unknown()).optional()
+});
 /**
  * An image provided to or from an LLM.
  */
-exports.ImageContentSchema = zod_1.z
-    .object({
-    type: zod_1.z.literal('image'),
+exports.ImageContentSchema = z.object({
+    type: z.literal('image'),
     /**
      * The base64-encoded image data.
      */
@@ -695,20 +754,18 @@ exports.ImageContentSchema = zod_1.z
     /**
      * The MIME type of the image. Different providers may support different image types.
      */
-    mimeType: zod_1.z.string(),
+    mimeType: z.string(),
     /**
      * 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: z.record(z.string(), z.unknown()).optional()
+});
 /**
  * An Audio provided to or from an LLM.
  */
-exports.AudioContentSchema = zod_1.z
-    .object({
-    type: zod_1.z.literal('audio'),
+exports.AudioContentSchema = z.object({
+    type: z.literal('audio'),
     /**
      * The base64-encoded audio data.
      */
@@ -716,40 +773,66 @@ exports.AudioContentSchema = zod_1.z
     /**
      * The MIME type of the audio. Different providers may support different audio types.
      */
-    mimeType: zod_1.z.string(),
+    mimeType: z.string(),
     /**
      * 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: z.record(z.string(), z.unknown()).optional()
+});
 /**
- * The contents of a resource, embedded into a prompt or tool call result.
+ * A tool call request from an assistant (LLM).
+ * Represents the assistant's request to use a tool.
  */
-exports.EmbeddedResourceSchema = zod_1.z
+exports.ToolUseContentSchema = z
     .object({
-    type: zod_1.z.literal('resource'),
-    resource: zod_1.z.union([exports.TextResourceContentsSchema, exports.BlobResourceContentsSchema]),
+    type: z.literal('tool_use'),
+    /**
+     * The name of the tool to invoke.
+     * Must match a tool name from the request's tools array.
+     */
+    name: z.string(),
+    /**
+     * Unique identifier for this tool call.
+     * Used to correlate with ToolResultContent in subsequent messages.
+     */
+    id: z.string(),
+    /**
+     * Arguments to pass to the tool.
+     * Must conform to the tool's inputSchema.
+     */
+    input: z.object({}).passthrough(),
     /**
      * 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: z.optional(z.object({}).passthrough())
 })
     .passthrough();
+/**
+ * The contents of a resource, embedded into a prompt or tool call result.
+ */
+exports.EmbeddedResourceSchema = z.object({
+    type: z.literal('resource'),
+    resource: 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: z.record(z.string(), z.unknown()).optional()
+});
 /**
  * A resource that the server is capable of reading, included in a prompt or tool call result.
  *
  * Note: resource links returned by tools are not guaranteed to appear in the results of `resources/list` requests.
  */
 exports.ResourceLinkSchema = exports.ResourceSchema.extend({
-    type: zod_1.z.literal('resource_link')
+    type: z.literal('resource_link')
 });
 /**
  * A content block that can be used in prompts and tool results.
  */
-exports.ContentBlockSchema = zod_1.z.union([
+exports.ContentBlockSchema = z.union([
     exports.TextContentSchema,
     exports.ImageContentSchema,
     exports.AudioContentSchema,
@@ -759,12 +842,10 @@ exports.ContentBlockSchema = zod_1.z.union([
 /**
  * Describes a message returned as part of a prompt.
  */
-exports.PromptMessageSchema = zod_1.z
-    .object({
-    role: zod_1.z.enum(['user', 'assistant']),
+exports.PromptMessageSchema = z.object({
+    role: z.enum(['user', 'assistant']),
     content: exports.ContentBlockSchema
-})
-    .passthrough();
+});
 /**
  * The server's response to a prompts/get request from the client.
  */
@@ -772,14 +853,14 @@ exports.GetPromptResultSchema = exports.ResultSchema.extend({
     /**
      * An optional description for the prompt.
      */
-    description: zod_1.z.optional(zod_1.z.string()),
-    messages: zod_1.z.array(exports.PromptMessageSchema)
+    description: z.optional(z.string()),
+    messages: z.array(exports.PromptMessageSchema)
 });
 /**
  * An optional notification from the server to the client, informing it that the list of prompts it offers has changed. This may be issued by servers without any previous subscription from the client.
  */
 exports.PromptListChangedNotificationSchema = exports.NotificationSchema.extend({
-    method: zod_1.z.literal('notifications/prompts/list_changed')
+    method: z.literal('notifications/prompts/list_changed')
 });
 /* Tools */
 /**
@@ -792,18 +873,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 = z.object({
     /**
      * A human-readable title for the tool.
      */
-    title: zod_1.z.optional(zod_1.z.string()),
+    title: z.string().optional(),
     /**
      * If true, the tool does not modify its environment.
      *
      * Default: false
      */
-    readOnlyHint: zod_1.z.optional(zod_1.z.boolean()),
+    readOnlyHint: z.boolean().optional(),
     /**
      * If true, the tool may perform destructive updates to its environment.
      * If false, the tool performs only additive updates.
@@ -812,7 +892,7 @@ exports.ToolAnnotationsSchema = zod_1.z
      *
      * Default: true
      */
-    destructiveHint: zod_1.z.optional(zod_1.z.boolean()),
+    destructiveHint: z.boolean().optional(),
     /**
      * If true, calling the tool repeatedly with the same arguments
      * will have no additional effect on the its environment.
@@ -821,7 +901,7 @@ exports.ToolAnnotationsSchema = zod_1.z
      *
      * Default: false
      */
-    idempotentHint: zod_1.z.optional(zod_1.z.boolean()),
+    idempotentHint: 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,59 +910,59 @@ exports.ToolAnnotationsSchema = zod_1.z
      *
      * Default: true
      */
-    openWorldHint: zod_1.z.optional(zod_1.z.boolean())
-})
-    .passthrough();
+    openWorldHint: z.boolean().optional()
+});
 /**
  * Definition for a tool the client can call.
  */
-exports.ToolSchema = exports.BaseMetadataSchema.extend({
+exports.ToolSchema = z.object({
+    ...exports.BaseMetadataSchema.shape,
+    ...exports.IconsSchema.shape,
     /**
      * A human-readable description of the tool.
      */
-    description: zod_1.z.optional(zod_1.z.string()),
+    description: z.string().optional(),
     /**
      * A JSON Schema object defining the expected parameters for the tool.
      */
-    inputSchema: 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()))
-    })
-        .passthrough(),
+    inputSchema: z.object({
+        type: z.literal('object'),
+        properties: z.record(z.string(), AssertObjectSchema).optional(),
+        required: z.optional(z.array(z.string()))
+    }),
     /**
      * 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: 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()))
+        type: z.literal('object'),
+        properties: z.record(z.string(), AssertObjectSchema).optional(),
+        required: z.optional(z.array(z.string())),
+        additionalProperties: z.optional(z.boolean())
     })
-        .passthrough()),
+        .optional(),
     /**
      * Optional additional tool information.
      */
-    annotations: zod_1.z.optional(exports.ToolAnnotationsSchema),
+    annotations: z.optional(exports.ToolAnnotationsSchema),
     /**
      * 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())
-}).merge(exports.IconsSchema);
+    _meta: z.record(z.string(), z.unknown()).optional()
+});
 /**
  * Sent from the client to request a list of tools the server has.
  */
 exports.ListToolsRequestSchema = exports.PaginatedRequestSchema.extend({
-    method: zod_1.z.literal('tools/list')
+    method: z.literal('tools/list')
 });
 /**
  * The server's response to a tools/list request from the client.
  */
 exports.ListToolsResultSchema = exports.PaginatedResultSchema.extend({
-    tools: zod_1.z.array(exports.ToolSchema)
+    tools: z.array(exports.ToolSchema)
 });
 /**
  * The server's response to a tool call.
@@ -894,13 +974,13 @@ exports.CallToolResultSchema = exports.ResultSchema.extend({
      * If the Tool does not define an outputSchema, this field MUST be present in the result.
      * For backwards compatibility, this field is always present, but it may be empty.
      */
-    content: zod_1.z.array(exports.ContentBlockSchema).default([]),
+    content: z.array(exports.ContentBlockSchema).default([]),
     /**
      * An object containing structured tool output.
      *
      * 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: z.record(z.string(), z.unknown()).optional(),
     /**
      * Whether the tool call ended in an error.
      *
@@ -915,141 +995,222 @@ exports.CallToolResultSchema = exports.ResultSchema.extend({
      * server does not support tool calls, or any other exceptional conditions,
      * should be reported as an MCP error response.
      */
-    isError: zod_1.z.optional(zod_1.z.boolean())
+    isError: z.optional(z.boolean())
 });
 /**
  * CallToolResultSchema extended with backwards compatibility to protocol version 2024-10-07.
  */
 exports.CompatibilityCallToolResultSchema = exports.CallToolResultSchema.or(exports.ResultSchema.extend({
-    toolResult: zod_1.z.unknown()
+    toolResult: z.unknown()
 }));
+/**
+ * Parameters for a `tools/call` request.
+ */
+exports.CallToolRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The name of the tool to call.
+     */
+    name: z.string(),
+    /**
+     * Arguments to pass to the tool.
+     */
+    arguments: z.optional(z.record(z.string(), 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()))
-    })
+    method: z.literal('tools/call'),
+    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.
  */
 exports.ToolListChangedNotificationSchema = exports.NotificationSchema.extend({
-    method: zod_1.z.literal('notifications/tools/list_changed')
+    method: z.literal('notifications/tools/list_changed')
 });
 /* Logging */
 /**
  * The severity of a log message.
  */
-exports.LoggingLevelSchema = zod_1.z.enum(['debug', 'info', 'notice', 'warning', 'error', 'critical', 'alert', 'emergency']);
+exports.LoggingLevelSchema = 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
-    })
+    method: z.literal('logging/setLevel'),
+    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: z.string().optional(),
+    /**
+     * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
+     */
+    data: 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()
-    })
+    method: z.literal('notifications/message'),
+    params: exports.LoggingMessageNotificationParamsSchema
 });
 /* Sampling */
 /**
  * Hints to use for model selection.
  */
-exports.ModelHintSchema = zod_1.z
-    .object({
+exports.ModelHintSchema = z.object({
     /**
      * A hint for a model name.
      */
-    name: zod_1.z.string().optional()
-})
-    .passthrough();
+    name: z.string().optional()
+});
 /**
  * The server's preferences for model selection, requested of the client during sampling.
  */
-exports.ModelPreferencesSchema = zod_1.z
-    .object({
+exports.ModelPreferencesSchema = z.object({
     /**
      * Optional hints to use for model selection.
      */
-    hints: zod_1.z.optional(zod_1.z.array(exports.ModelHintSchema)),
+    hints: z.optional(z.array(exports.ModelHintSchema)),
     /**
      * How much to prioritize cost when selecting a model.
      */
-    costPriority: zod_1.z.optional(zod_1.z.number().min(0).max(1)),
+    costPriority: z.optional(z.number().min(0).max(1)),
     /**
      * How much to prioritize sampling speed (latency) when selecting a model.
      */
-    speedPriority: zod_1.z.optional(zod_1.z.number().min(0).max(1)),
+    speedPriority: z.optional(z.number().min(0).max(1)),
     /**
      * How much to prioritize intelligence and capabilities when selecting a model.
      */
-    intelligencePriority: zod_1.z.optional(zod_1.z.number().min(0).max(1))
+    intelligencePriority: z.optional(z.number().min(0).max(1))
+});
+/**
+ * Controls tool usage behavior in sampling requests.
+ */
+exports.ToolChoiceSchema = z.object({
+    /**
+     * Controls when tools are used:
+     * - "auto": Model decides whether to use tools (default)
+     * - "required": Model MUST use at least one tool before completing
+     * - "none": Model MUST NOT use any tools
+     */
+    mode: z.optional(z.enum(['auto', 'required', 'none']))
+});
+/**
+ * The result of a tool execution, provided by the user (server).
+ * Represents the outcome of invoking a tool requested via ToolUseContent.
+ */
+exports.ToolResultContentSchema = z
+    .object({
+    type: z.literal('tool_result'),
+    toolUseId: z.string().describe('The unique identifier for the corresponding tool call.'),
+    content: z.array(exports.ContentBlockSchema).default([]),
+    structuredContent: z.object({}).passthrough().optional(),
+    isError: z.optional(z.boolean()),
+    /**
+     * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
+     * for notes on _meta usage.
+     */
+    _meta: z.optional(z.object({}).passthrough())
 })
     .passthrough();
+/**
+ * Content block types allowed in sampling messages.
+ * This includes text, image, audio, tool use requests, and tool results.
+ */
+exports.SamplingMessageContentBlockSchema = z.discriminatedUnion('type', [
+    exports.TextContentSchema,
+    exports.ImageContentSchema,
+    exports.AudioContentSchema,
+    exports.ToolUseContentSchema,
+    exports.ToolResultContentSchema
+]);
 /**
  * Describes a message issued to or received from an LLM API.
  */
-exports.SamplingMessageSchema = zod_1.z
+exports.SamplingMessageSchema = z
     .object({
-    role: zod_1.z.enum(['user', 'assistant']),
-    content: zod_1.z.union([exports.TextContentSchema, exports.ImageContentSchema, exports.AudioContentSchema])
+    role: z.enum(['user', 'assistant']),
+    content: z.union([exports.SamplingMessageContentBlockSchema, z.array(exports.SamplingMessageContentBlockSchema)]),
+    /**
+     * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
+     * for notes on _meta usage.
+     */
+    _meta: z.optional(z.object({}).passthrough())
 })
     .passthrough();
+/**
+ * Parameters for a `sampling/createMessage` request.
+ */
+exports.CreateMessageRequestParamsSchema = BaseRequestParamsSchema.extend({
+    messages: 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: 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.
+     *
+     * Default is "none". Values "thisServer" and "allServers" are soft-deprecated. Servers SHOULD only use these values if the client
+     * declares ClientCapabilities.sampling.context. These values may be removed in future spec releases.
+     */
+    includeContext: z.enum(['none', 'thisServer', 'allServers']).optional(),
+    temperature: 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: z.number().int(),
+    stopSequences: z.array(z.string()).optional(),
+    /**
+     * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
+     */
+    metadata: AssertObjectSchema.optional(),
+    /**
+     * Tools that the model may use during generation.
+     * The client MUST return an error if this field is provided but ClientCapabilities.sampling.tools is not declared.
+     */
+    tools: z.optional(z.array(exports.ToolSchema)),
+    /**
+     * Controls how the model uses tools.
+     * The client MUST return an error if this field is provided but ClientCapabilities.sampling.tools is not declared.
+     * Default is `{ mode: "auto" }`.
+     */
+    toolChoice: z.optional(exports.ToolChoiceSchema)
+});
 /**
  * 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)
-    })
+    method: z.literal('sampling/createMessage'),
+    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.
@@ -1058,116 +1219,244 @@ exports.CreateMessageResultSchema = exports.ResultSchema.extend({
     /**
      * The name of the model that generated the message.
      */
-    model: zod_1.z.string(),
+    model: z.string(),
     /**
-     * The reason why sampling stopped.
+     * The reason why sampling stopped, if known.
+     *
+     * Standard values:
+     * - "endTurn": Natural end of the assistant's turn
+     * - "stopSequence": A stop sequence was encountered
+     * - "maxTokens": Maximum token limit was reached
+     * - "toolUse": The model wants to use one or more tools
+     *
+     * This field is an open string to allow for provider-specific stop reasons.
+     */
+    stopReason: z.optional(z.enum(['endTurn', 'stopSequence', 'maxTokens', 'toolUse']).or(z.string())),
+    role: z.enum(['user', 'assistant']),
+    /**
+     * Response content. May be ToolUseContent if stopReason is "toolUse".
      */
-    stopReason: zod_1.z.optional(zod_1.z.enum(['endTurn', 'stopSequence', 'maxTokens']).or(zod_1.z.string())),
-    role: zod_1.z.enum(['user', 'assistant']),
-    content: zod_1.z.discriminatedUnion('type', [exports.TextContentSchema, exports.ImageContentSchema, exports.AudioContentSchema])
+    content: z.union([exports.SamplingMessageContentBlockSchema, z.array(exports.SamplingMessageContentBlockSchema)])
 });
 /* Elicitation */
 /**
  * Primitive schema definition for boolean fields.
  */
-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();
+exports.BooleanSchemaSchema = z.object({
+    type: z.literal('boolean'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    default: z.boolean().optional()
+});
 /**
  * Primitive schema definition for string fields.
  */
-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();
+exports.StringSchemaSchema = z.object({
+    type: z.literal('string'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    minLength: z.number().optional(),
+    maxLength: z.number().optional(),
+    format: z.enum(['email', 'uri', 'date', 'date-time']).optional(),
+    default: z.string().optional()
+});
 /**
  * Primitive schema definition for number fields.
  */
-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();
+exports.NumberSchemaSchema = z.object({
+    type: z.enum(['number', 'integer']),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    minimum: z.number().optional(),
+    maximum: z.number().optional(),
+    default: z.number().optional()
+});
+/**
+ * Schema for single-selection enumeration without display titles for options.
+ */
+exports.UntitledSingleSelectEnumSchemaSchema = z.object({
+    type: z.literal('string'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    enum: z.array(z.string()),
+    default: z.string().optional()
+});
+/**
+ * Schema for single-selection enumeration with display titles for each option.
+ */
+exports.TitledSingleSelectEnumSchemaSchema = z.object({
+    type: z.literal('string'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    oneOf: z.array(z.object({
+        const: z.string(),
+        title: z.string()
+    })),
+    default: z.string().optional()
+});
+/**
+ * Use TitledSingleSelectEnumSchema instead.
+ * This interface will be removed in a future version.
+ */
+exports.LegacyTitledEnumSchemaSchema = z.object({
+    type: z.literal('string'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    enum: z.array(z.string()),
+    enumNames: z.array(z.string()).optional(),
+    default: z.string().optional()
+});
+// Combined single selection enumeration
+exports.SingleSelectEnumSchemaSchema = z.union([exports.UntitledSingleSelectEnumSchemaSchema, exports.TitledSingleSelectEnumSchemaSchema]);
+/**
+ * Schema for multiple-selection enumeration without display titles for options.
+ */
+exports.UntitledMultiSelectEnumSchemaSchema = z.object({
+    type: z.literal('array'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    minItems: z.number().optional(),
+    maxItems: z.number().optional(),
+    items: z.object({
+        type: z.literal('string'),
+        enum: z.array(z.string())
+    }),
+    default: z.array(z.string()).optional()
+});
+/**
+ * Schema for multiple-selection enumeration with display titles for each option.
+ */
+exports.TitledMultiSelectEnumSchemaSchema = z.object({
+    type: z.literal('array'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    minItems: z.number().optional(),
+    maxItems: z.number().optional(),
+    items: z.object({
+        anyOf: z.array(z.object({
+            const: z.string(),
+            title: z.string()
+        }))
+    }),
+    default: z.array(z.string()).optional()
+});
+/**
+ * Combined schema for multiple-selection enumeration
+ */
+exports.MultiSelectEnumSchemaSchema = z.union([exports.UntitledMultiSelectEnumSchemaSchema, exports.TitledMultiSelectEnumSchemaSchema]);
 /**
  * Primitive schema definition for enum fields.
  */
-exports.EnumSchemaSchema = 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()),
-    enum: zod_1.z.array(zod_1.z.string()),
-    enumNames: zod_1.z.optional(zod_1.z.array(zod_1.z.string()))
-})
-    .passthrough();
+exports.EnumSchemaSchema = 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 = z.union([exports.EnumSchemaSchema, exports.BooleanSchemaSchema, exports.StringSchemaSchema, exports.NumberSchemaSchema]);
+/**
+ * Parameters for an `elicitation/create` request for form-based elicitation.
+ */
+exports.ElicitRequestFormParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The elicitation mode.
+     */
+    mode: z.literal('form'),
+    /**
+     * The message to present to the user describing what information is being requested.
+     */
+    message: z.string(),
+    /**
+     * A restricted subset of JSON Schema.
+     * Only top-level properties are allowed, without nesting.
+     */
+    requestedSchema: z.object({
+        type: z.literal('object'),
+        properties: z.record(z.string(), exports.PrimitiveSchemaDefinitionSchema),
+        required: z.array(z.string()).optional()
+    })
+});
+/**
+ * Parameters for an `elicitation/create` request for URL-based elicitation.
+ */
+exports.ElicitRequestURLParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The elicitation mode.
+     */
+    mode: z.literal('url'),
+    /**
+     * The message to present to the user explaining why the interaction is needed.
+     */
+    message: z.string(),
+    /**
+     * The ID of the elicitation, which must be unique within the context of the server.
+     * The client MUST treat this ID as an opaque value.
+     */
+    elicitationId: z.string(),
+    /**
+     * The URL that the user should navigate to.
+     */
+    url: z.string().url()
+});
+/**
+ * The parameters for a request to elicit additional information from the user via the client.
+ */
+exports.ElicitRequestParamsSchema = z.union([exports.ElicitRequestFormParamsSchema, exports.ElicitRequestURLParamsSchema]);
 /**
  * A request from the server to elicit user input via the client.
- * The client should present the message and form fields to the user.
+ * The client should present the message and form fields to the user (form mode)
+ * or navigate to a URL (URL mode).
  */
 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()
-    })
+    method: z.literal('elicitation/create'),
+    params: exports.ElicitRequestParamsSchema
+});
+/**
+ * Parameters for a `notifications/elicitation/complete` notification.
+ *
+ * @category notifications/elicitation/complete
+ */
+exports.ElicitationCompleteNotificationParamsSchema = NotificationsParamsSchema.extend({
+    /**
+     * The ID of the elicitation that completed.
+     */
+    elicitationId: z.string()
+});
+/**
+ * A notification from the server to the client, informing it of a completion of an out-of-band elicitation request.
+ *
+ * @category notifications/elicitation/complete
+ */
+exports.ElicitationCompleteNotificationSchema = exports.NotificationSchema.extend({
+    method: z.literal('notifications/elicitation/complete'),
+    params: exports.ElicitationCompleteNotificationParamsSchema
 });
 /**
  * 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']),
+    action: 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: z.record(z.string(), z.union([z.string(), z.number(), z.boolean(), z.array(z.string())])).optional()
 });
 /* Autocomplete */
 /**
  * A reference to a resource or resource template definition.
  */
-exports.ResourceTemplateReferenceSchema = zod_1.z
-    .object({
-    type: zod_1.z.literal('ref/resource'),
+exports.ResourceTemplateReferenceSchema = z.object({
+    type: z.literal('ref/resource'),
     /**
      * The URI or URI template of the resource.
      */
-    uri: zod_1.z.string()
-})
-    .passthrough();
+    uri: z.string()
+});
 /**
  * @deprecated Use ResourceTemplateReferenceSchema instead
  */
@@ -1175,107 +1464,117 @@ exports.ResourceReferenceSchema = exports.ResourceTemplateReferenceSchema;
 /**
  * Identifies a prompt.
  */
-exports.PromptReferenceSchema = zod_1.z
-    .object({
-    type: zod_1.z.literal('ref/prompt'),
+exports.PromptReferenceSchema = z.object({
+    type: z.literal('ref/prompt'),
     /**
      * The name of the prompt or prompt template
      */
-    name: zod_1.z.string()
-})
-    .passthrough();
+    name: z.string()
+});
 /**
- * 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: z.union([exports.PromptReferenceSchema, exports.ResourceTemplateReferenceSchema]),
+    /**
+     * The argument's information
+     */
+    argument: 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: z.string(),
+        /**
+         * The value of the argument to use for completion matching.
+         */
+        value: z.string()
+    }),
+    context: z
+        .object({
+        /**
+         * Previously-resolved variables in a URI template or prompt.
+         */
+        arguments: z.record(z.string(), z.string()).optional()
     })
+        .optional()
+});
+/**
+ * A request from the client to the server, to ask for completion options.
+ */
+exports.CompleteRequestSchema = exports.RequestSchema.extend({
+    method: 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}`);
+    }
+    void request;
+}
+function assertCompleteRequestResourceTemplate(request) {
+    if (request.params.ref.type !== 'ref/resource') {
+        throw new TypeError(`Expected CompleteRequestResourceTemplate, but got ${request.params.ref.type}`);
+    }
+    void request;
+}
 /**
  * The server's response to a completion/complete request
  */
 exports.CompleteResultSchema = exports.ResultSchema.extend({
-    completion: zod_1.z
-        .object({
+    completion: z.looseObject({
         /**
          * An array of completion values. Must not exceed 100 items.
          */
-        values: zod_1.z.array(zod_1.z.string()).max(100),
+        values: z.array(z.string()).max(100),
         /**
          * The total number of completion options available. This can exceed the number of values actually sent in the response.
          */
-        total: zod_1.z.optional(zod_1.z.number().int()),
+        total: z.optional(z.number().int()),
         /**
          * Indicates whether there are additional completion options beyond those provided in the current response, even if the exact total is unknown.
          */
-        hasMore: zod_1.z.optional(zod_1.z.boolean())
+        hasMore: z.optional(z.boolean())
     })
-        .passthrough()
 });
 /* Roots */
 /**
  * Represents a root directory or file that the server can operate on.
  */
-exports.RootSchema = zod_1.z
-    .object({
+exports.RootSchema = z.object({
     /**
      * The URI identifying the root. This *must* start with file:// for now.
      */
-    uri: zod_1.z.string().startsWith('file://'),
+    uri: z.string().startsWith('file://'),
     /**
      * An optional name for the root.
      */
-    name: zod_1.z.optional(zod_1.z.string()),
+    name: 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: z.record(z.string(), z.unknown()).optional()
+});
 /**
  * Sent from the server to request a list of root URIs from the client.
  */
 exports.ListRootsRequestSchema = exports.RequestSchema.extend({
-    method: zod_1.z.literal('roots/list')
+    method: z.literal('roots/list')
 });
 /**
  * The client's response to a roots/list request from the server.
  */
 exports.ListRootsResultSchema = exports.ResultSchema.extend({
-    roots: zod_1.z.array(exports.RootSchema)
+    roots: z.array(exports.RootSchema)
 });
 /**
  * A notification from the client to the server, informing it that the list of roots has changed.
  */
 exports.RootsListChangedNotificationSchema = exports.NotificationSchema.extend({
-    method: zod_1.z.literal('notifications/roots/list_changed')
+    method: z.literal('notifications/roots/list_changed')
 });
 /* Client messages */
-exports.ClientRequestSchema = zod_1.z.union([
+exports.ClientRequestSchema = z.union([
     exports.PingRequestSchema,
     exports.InitializeRequestSchema,
     exports.CompleteRequestSchema,
@@ -1290,25 +1589,26 @@ exports.ClientRequestSchema = zod_1.z.union([
     exports.CallToolRequestSchema,
     exports.ListToolsRequestSchema
 ]);
-exports.ClientNotificationSchema = zod_1.z.union([
+exports.ClientNotificationSchema = z.union([
     exports.CancelledNotificationSchema,
     exports.ProgressNotificationSchema,
     exports.InitializedNotificationSchema,
     exports.RootsListChangedNotificationSchema
 ]);
-exports.ClientResultSchema = zod_1.z.union([exports.EmptyResultSchema, exports.CreateMessageResultSchema, exports.ElicitResultSchema, exports.ListRootsResultSchema]);
+exports.ClientResultSchema = z.union([exports.EmptyResultSchema, exports.CreateMessageResultSchema, exports.ElicitResultSchema, exports.ListRootsResultSchema]);
 /* Server messages */
-exports.ServerRequestSchema = zod_1.z.union([exports.PingRequestSchema, exports.CreateMessageRequestSchema, exports.ElicitRequestSchema, exports.ListRootsRequestSchema]);
-exports.ServerNotificationSchema = zod_1.z.union([
+exports.ServerRequestSchema = z.union([exports.PingRequestSchema, exports.CreateMessageRequestSchema, exports.ElicitRequestSchema, exports.ListRootsRequestSchema]);
+exports.ServerNotificationSchema = z.union([
     exports.CancelledNotificationSchema,
     exports.ProgressNotificationSchema,
     exports.LoggingMessageNotificationSchema,
     exports.ResourceUpdatedNotificationSchema,
     exports.ResourceListChangedNotificationSchema,
     exports.ToolListChangedNotificationSchema,
-    exports.PromptListChangedNotificationSchema
+    exports.PromptListChangedNotificationSchema,
+    exports.ElicitationCompleteNotificationSchema
 ]);
-exports.ServerResultSchema = zod_1.z.union([
+exports.ServerResultSchema = z.union([
     exports.EmptyResultSchema,
     exports.InitializeResultSchema,
     exports.CompleteResultSchema,
@@ -1327,6 +1627,36 @@ class McpError extends Error {
         this.data = data;
         this.name = 'McpError';
     }
+    /**
+     * Factory method to create the appropriate error type based on the error code and data
+     */
+    static fromError(code, message, data) {
+        // Check for specific error types
+        if (code === ErrorCode.UrlElicitationRequired && data) {
+            const errorData = data;
+            if (errorData.elicitations) {
+                return new UrlElicitationRequiredError(errorData.elicitations, message);
+            }
+        }
+        // Default to generic McpError
+        return new McpError(code, message, data);
+    }
 }
 exports.McpError = McpError;
+/**
+ * Specialized error type when a tool requires a URL mode elicitation.
+ * This makes it nicer for the client to handle since there is specific data to work with instead of just a code to check against.
+ */
+class UrlElicitationRequiredError extends McpError {
+    constructor(elicitations, message = `URL elicitation${elicitations.length > 1 ? 's' : ''} required`) {
+        super(ErrorCode.UrlElicitationRequired, message, {
+            elicitations: elicitations
+        });
+    }
+    get elicitations() {
+        var _a, _b;
+        return (_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.elicitations) !== null && _b !== void 0 ? _b : [];
+    }
+}
+exports.UrlElicitationRequiredError = UrlElicitationRequiredError;
 //# sourceMappingURL=types.js.map