@atxp/client 0.10.2 → 0.10.4

package/dist/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js

@@ -1,90 +1,150 @@
-import { union as unionType, string as stringType, number as numberType, object as objectType, optional as optionalType, literal as literalType, unknown as unknownType, array as arrayType, boolean as booleanType, record as recordType, enum as enumType, discriminatedUnion as discriminatedUnionType } from '../../../../zod/v3/types.js';
+import { custom, union, string, number, looseObject, null as _null, object, literal, unknown, enum as _enum, array, intersection, record, boolean, preprocess, optional, discriminatedUnion } from '../../../../zod/v4/classic/schemas.js';
+import { datetime } from '../../../../zod/v4/classic/iso.js';
 
-const LATEST_PROTOCOL_VERSION = "2025-06-18";
-const SUPPORTED_PROTOCOL_VERSIONS = [
-    LATEST_PROTOCOL_VERSION,
-    "2025-03-26",
-    "2024-11-05",
-    "2024-10-07",
-];
+const LATEST_PROTOCOL_VERSION = '2025-11-25';
+const SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION, '2025-06-18', '2025-03-26', '2024-11-05', '2024-10-07'];
+const RELATED_TASK_META_KEY = 'io.modelcontextprotocol/related-task';
 /* JSON-RPC types */
-const JSONRPC_VERSION = "2.0";
+const JSONRPC_VERSION = '2.0';
+/**
+ * Assert 'object' type schema.
+ *
+ * @internal
+ */
+const AssertObjectSchema = custom((v) => v !== null && (typeof v === 'object' || typeof v === 'function'));
 /**
  * A progress token, used to associate progress notifications with the original request.
  */
-const ProgressTokenSchema = unionType([stringType(), numberType().int()]);
+const ProgressTokenSchema = union([string(), number().int()]);
 /**
  * An opaque token used to represent a cursor for pagination.
  */
-const CursorSchema = stringType();
-const RequestMetaSchema = objectType({
+const CursorSchema = string();
+/**
+ * Task creation parameters, used to ask that the server create a task to represent a request.
+ */
+looseObject({
+    /**
+     * Time in milliseconds to keep task results available after completion.
+     * If null, the task has unlimited lifetime until manually cleaned up.
+     */
+    ttl: union([number(), _null()]).optional(),
+    /**
+     * Time in milliseconds to wait between task status requests.
+     */
+    pollInterval: number().optional()
+});
+const TaskMetadataSchema = object({
+    ttl: number().optional()
+});
+/**
+ * Metadata for associating messages with a task.
+ * Include this in the `_meta` field under the key `io.modelcontextprotocol/related-task`.
+ */
+const RelatedTaskMetadataSchema = object({
+    taskId: string()
+});
+const RequestMetaSchema = 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: optionalType(ProgressTokenSchema),
-})
-    .passthrough();
-const BaseRequestParamsSchema = objectType({
-    _meta: optionalType(RequestMetaSchema),
-})
-    .passthrough();
-const RequestSchema = objectType({
-    method: stringType(),
-    params: optionalType(BaseRequestParamsSchema),
+    progressToken: ProgressTokenSchema.optional(),
+    /**
+     * If specified, this request is related to the provided task.
+     */
+    [RELATED_TASK_META_KEY]: RelatedTaskMetadataSchema.optional()
+});
+/**
+ * Common params for any request.
+ */
+const BaseRequestParamsSchema = object({
+    /**
+     * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
+     */
+    _meta: RequestMetaSchema.optional()
 });
-const BaseNotificationParamsSchema = objectType({
+/**
+ * Common params for any task-augmented request.
+ */
+const TaskAugmentedRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * If specified, the caller is requesting task-augmented execution for this request.
+     * The request will return a CreateTaskResult immediately, and the actual result can be
+     * retrieved later via tasks/result.
+     *
+     * Task augmentation is subject to capability negotiation - receivers MUST declare support
+     * for task augmentation of specific request types in their capabilities.
+     */
+    task: TaskMetadataSchema.optional()
+});
+/**
+ * Checks if a value is a valid TaskAugmentedRequestParams.
+ * @param value - The value to check.
+ *
+ * @returns True if the value is a valid TaskAugmentedRequestParams, false otherwise.
+ */
+const isTaskAugmentedRequestParams = (value) => TaskAugmentedRequestParamsSchema.safeParse(value).success;
+const RequestSchema = object({
+    method: string(),
+    params: BaseRequestParamsSchema.loose().optional()
+});
+const NotificationsParamsSchema = 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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
-const NotificationSchema = objectType({
-    method: stringType(),
-    params: optionalType(BaseNotificationParamsSchema),
+    _meta: RequestMetaSchema.optional()
 });
-const ResultSchema = objectType({
+const NotificationSchema = object({
+    method: string(),
+    params: NotificationsParamsSchema.loose().optional()
+});
+const ResultSchema = 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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: RequestMetaSchema.optional()
+});
 /**
  * A uniquely identifying ID for a request in JSON-RPC.
  */
-const RequestIdSchema = unionType([stringType(), numberType().int()]);
+const RequestIdSchema = union([string(), number().int()]);
 /**
  * A request that expects a response.
  */
-const JSONRPCRequestSchema = objectType({
-    jsonrpc: literalType(JSONRPC_VERSION),
+const JSONRPCRequestSchema = object({
+    jsonrpc: literal(JSONRPC_VERSION),
     id: RequestIdSchema,
+    ...RequestSchema.shape
 })
-    .merge(RequestSchema)
     .strict();
 const isJSONRPCRequest = (value) => JSONRPCRequestSchema.safeParse(value).success;
 /**
  * A notification which does not expect a response.
  */
-const JSONRPCNotificationSchema = objectType({
-    jsonrpc: literalType(JSONRPC_VERSION),
+const JSONRPCNotificationSchema = object({
+    jsonrpc: literal(JSONRPC_VERSION),
+    ...NotificationSchema.shape
 })
-    .merge(NotificationSchema)
     .strict();
 const isJSONRPCNotification = (value) => JSONRPCNotificationSchema.safeParse(value).success;
 /**
  * A successful (non-error) response to a request.
  */
-const JSONRPCResponseSchema = objectType({
-    jsonrpc: literalType(JSONRPC_VERSION),
+const JSONRPCResultResponseSchema = object({
+    jsonrpc: literal(JSONRPC_VERSION),
     id: RequestIdSchema,
-    result: ResultSchema,
+    result: ResultSchema
 })
     .strict();
-const isJSONRPCResponse = (value) => JSONRPCResponseSchema.safeParse(value).success;
+/**
+ * Checks if a value is a valid JSONRPCResultResponse.
+ * @param value - The value to check.
+ *
+ * @returns True if the value is a valid JSONRPCResultResponse, false otherwise.
+ */
+const isJSONRPCResultResponse = (value) => JSONRPCResultResponseSchema.safeParse(value).success;
 /**
  * Error codes defined by the JSON-RPC specification.
  */
@@ -99,41 +159,62 @@ 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 || (ErrorCode = {}));
 /**
  * A response to a request that indicates an error occurred.
  */
-const JSONRPCErrorSchema = objectType({
-    jsonrpc: literalType(JSONRPC_VERSION),
-    id: RequestIdSchema,
-    error: objectType({
+const JSONRPCErrorResponseSchema = object({
+    jsonrpc: literal(JSONRPC_VERSION),
+    id: RequestIdSchema.optional(),
+    error: object({
         /**
          * The error type that occurred.
          */
-        code: numberType().int(),
+        code: number().int(),
         /**
          * A short description of the error. The message SHOULD be limited to a concise single sentence.
          */
-        message: stringType(),
+        message: 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: optionalType(unknownType()),
-    }),
+        data: unknown().optional()
+    })
 })
     .strict();
-const isJSONRPCError = (value) => JSONRPCErrorSchema.safeParse(value).success;
-const JSONRPCMessageSchema = unionType([
+/**
+ * Checks if a value is a valid JSONRPCErrorResponse.
+ * @param value - The value to check.
+ *
+ * @returns True if the value is a valid JSONRPCErrorResponse, false otherwise.
+ */
+const isJSONRPCErrorResponse = (value) => JSONRPCErrorResponseSchema.safeParse(value).success;
+const JSONRPCMessageSchema = union([
     JSONRPCRequestSchema,
     JSONRPCNotificationSchema,
-    JSONRPCResponseSchema,
-    JSONRPCErrorSchema,
+    JSONRPCResultResponseSchema,
+    JSONRPCErrorResponseSchema
 ]);
+union([JSONRPCResultResponseSchema, JSONRPCErrorResponseSchema]);
 /* Empty result */
 /**
  * A response that indicates success but carries no data.
  */
 const EmptyResultSchema = ResultSchema.strict();
+const 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: RequestIdSchema.optional(),
+    /**
+     * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
+     */
+    reason: string().optional()
+});
 /* Cancellation */
 /**
  * This notification can be sent by either side to indicate that it is cancelling a previously-issued request.
@@ -145,170 +226,278 @@ const EmptyResultSchema = ResultSchema.strict();
  * A client MUST NOT attempt to cancel its `initialize` request.
  */
 const CancelledNotificationSchema = NotificationSchema.extend({
-    method: literalType("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: RequestIdSchema,
-        /**
-         * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
-         */
-        reason: stringType().optional(),
-    }),
+    method: literal('notifications/cancelled'),
+    params: CancelledNotificationParamsSchema
 });
 /* Base Metadata */
 /**
  * Icon schema for use in tools, prompts, resources, and implementations.
  */
-const IconSchema = objectType({
+const IconSchema = object({
     /**
      * URL or data URI for the icon.
      */
-    src: stringType(),
+    src: string(),
     /**
      * Optional MIME type for the icon.
      */
-    mimeType: optionalType(stringType()),
+    mimeType: string().optional(),
     /**
-     * Optional string specifying icon dimensions (e.g., "48x48 96x96").
+     * 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: optionalType(stringType()),
-})
-    .passthrough();
+    sizes: array(string()).optional(),
+    /**
+     * Optional specifier for the theme this icon is designed for. `light` indicates
+     * the icon is designed to be used with a light background, and `dark` indicates
+     * the icon is designed to be used with a dark background.
+     *
+     * If not provided, the client should assume the icon can be used with any theme.
+     */
+    theme: _enum(['light', 'dark']).optional()
+});
+/**
+ * Base schema to add `icons` property.
+ *
+ */
+const IconsSchema = object({
+    /**
+     * Optional set of sized icons that the client can display in a user interface.
+     *
+     * Clients that support rendering icons MUST support at least the following MIME types:
+     * - `image/png` - PNG images (safe, universal compatibility)
+     * - `image/jpeg` (and `image/jpg`) - JPEG images (safe, universal compatibility)
+     *
+     * Clients that support rendering icons SHOULD also support:
+     * - `image/svg+xml` - SVG images (scalable but requires security precautions)
+     * - `image/webp` - WebP images (modern, efficient format)
+     */
+    icons: array(IconSchema).optional()
+});
 /**
  * Base metadata interface for common properties across resources, tools, prompts, and implementations.
  */
-const BaseMetadataSchema = objectType({
+const BaseMetadataSchema = object({
     /** Intended for programmatic or logical use, but used as a display name in past specs or fallback */
-    name: stringType(),
-    /**
-    * Intended for UI and end-user contexts — optimized to be human-readable and easily understood,
-    * even by those unfamiliar with domain-specific terminology.
-    *
-    * If not provided, the name should be used for display (except for Tool,
-    * where `annotations.title` should be given precedence over using `name`,
-    * if present).
-    */
-    title: optionalType(stringType()),
-})
-    .passthrough();
+    name: string(),
+    /**
+     * Intended for UI and end-user contexts — optimized to be human-readable and easily understood,
+     * even by those unfamiliar with domain-specific terminology.
+     *
+     * If not provided, the name should be used for display (except for Tool,
+     * where `annotations.title` should be given precedence over using `name`,
+     * if present).
+     */
+    title: string().optional()
+});
 /* Initialization */
 /**
  * Describes the name and version of an MCP implementation.
  */
 const ImplementationSchema = BaseMetadataSchema.extend({
-    version: stringType(),
+    ...BaseMetadataSchema.shape,
+    ...IconsSchema.shape,
+    version: string(),
     /**
      * An optional URL of the website for this implementation.
      */
-    websiteUrl: optionalType(stringType()),
+    websiteUrl: string().optional(),
+    /**
+     * An optional human-readable description of what this implementation does.
+     *
+     * This can be used by clients or servers to provide context about their purpose
+     * and capabilities. For example, a server might describe the types of resources
+     * or tools it provides, while a client might describe its intended use case.
+     */
+    description: string().optional()
+});
+const FormElicitationCapabilitySchema = intersection(object({
+    applyDefaults: boolean().optional()
+}), record(string(), unknown()));
+const ElicitationCapabilitySchema = preprocess(value => {
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+        if (Object.keys(value).length === 0) {
+            return { form: {} };
+        }
+    }
+    return value;
+}, intersection(object({
+    form: FormElicitationCapabilitySchema.optional(),
+    url: AssertObjectSchema.optional()
+}), record(string(), unknown()).optional()));
+/**
+ * Task capabilities for clients, indicating which request types support task creation.
+ */
+const ClientTasksCapabilitySchema = looseObject({
+    /**
+     * Present if the client supports listing tasks.
+     */
+    list: AssertObjectSchema.optional(),
+    /**
+     * Present if the client supports cancelling tasks.
+     */
+    cancel: AssertObjectSchema.optional(),
     /**
-     * An optional list of icons for this implementation.
-     * This can be used by clients to display the implementation in a user interface.
-     * Each icon should have a `kind` property that specifies whether it is a data representation or a URL source, a `src` property that points to the icon file or data representation, and may also include a `mimeType` and `sizes` property.
-     * The `mimeType` property should be a valid MIME type for the icon file, such as "image/png" or "image/svg+xml".
-     * The `sizes` property should be a string that specifies one or more sizes at which the icon file can be used, such as "48x48" or "any" for scalable formats like SVG.
-     * The `sizes` property is optional, and if not provided, the client should assume that the icon can be used at any size.
+     * Capabilities for task creation on specific request types.
      */
-    icons: optionalType(arrayType(IconSchema)),
+    requests: looseObject({
+        /**
+         * Task support for sampling requests.
+         */
+        sampling: looseObject({
+            createMessage: AssertObjectSchema.optional()
+        })
+            .optional(),
+        /**
+         * Task support for elicitation requests.
+         */
+        elicitation: looseObject({
+            create: AssertObjectSchema.optional()
+        })
+            .optional()
+    })
+        .optional()
+});
+/**
+ * Task capabilities for servers, indicating which request types support task creation.
+ */
+const ServerTasksCapabilitySchema = looseObject({
+    /**
+     * Present if the server supports listing tasks.
+     */
+    list: AssertObjectSchema.optional(),
+    /**
+     * Present if the server supports cancelling tasks.
+     */
+    cancel: AssertObjectSchema.optional(),
+    /**
+     * Capabilities for task creation on specific request types.
+     */
+    requests: looseObject({
+        /**
+         * Task support for tool requests.
+         */
+        tools: looseObject({
+            call: AssertObjectSchema.optional()
+        })
+            .optional()
+    })
+        .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.
  */
-const ClientCapabilitiesSchema = objectType({
+const ClientCapabilitiesSchema = object({
     /**
      * Experimental, non-standard capabilities that the client supports.
      */
-    experimental: optionalType(objectType({}).passthrough()),
+    experimental: record(string(), AssertObjectSchema).optional(),
     /**
      * Present if the client supports sampling from an LLM.
      */
-    sampling: optionalType(objectType({}).passthrough()),
+    sampling: 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: optionalType(objectType({}).passthrough()),
+    elicitation: ElicitationCapabilitySchema.optional(),
     /**
      * Present if the client supports listing roots.
      */
-    roots: optionalType(objectType({
+    roots: object({
         /**
          * Whether the client supports issuing notifications for changes to the roots list.
          */
-        listChanged: optionalType(booleanType()),
+        listChanged: boolean().optional()
     })
-        .passthrough()),
-})
-    .passthrough();
+        .optional(),
+    /**
+     * Present if the client supports task creation.
+     */
+    tasks: ClientTasksCapabilitySchema.optional()
+});
+const 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: string(),
+    capabilities: ClientCapabilitiesSchema,
+    clientInfo: ImplementationSchema
+});
 /**
  * This request is sent from the client to the server when it first connects, asking it to begin initialization.
  */
 const InitializeRequestSchema = RequestSchema.extend({
-    method: literalType("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: stringType(),
-        capabilities: ClientCapabilitiesSchema,
-        clientInfo: ImplementationSchema,
-    }),
+    method: literal('initialize'),
+    params: InitializeRequestParamsSchema
 });
 /**
  * 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.
  */
-const ServerCapabilitiesSchema = objectType({
+const ServerCapabilitiesSchema = object({
     /**
      * Experimental, non-standard capabilities that the server supports.
      */
-    experimental: optionalType(objectType({}).passthrough()),
+    experimental: record(string(), AssertObjectSchema).optional(),
     /**
      * Present if the server supports sending log messages to the client.
      */
-    logging: optionalType(objectType({}).passthrough()),
+    logging: AssertObjectSchema.optional(),
     /**
      * Present if the server supports sending completions to the client.
      */
-    completions: optionalType(objectType({}).passthrough()),
+    completions: AssertObjectSchema.optional(),
     /**
      * Present if the server offers any prompt templates.
      */
-    prompts: optionalType(objectType({
+    prompts: object({
         /**
          * Whether this server supports issuing notifications for changes to the prompt list.
          */
-        listChanged: optionalType(booleanType()),
+        listChanged: boolean().optional()
     })
-        .passthrough()),
+        .optional(),
     /**
      * Present if the server offers any resources to read.
      */
-    resources: optionalType(objectType({
+    resources: object({
         /**
          * Whether this server supports clients subscribing to resource updates.
          */
-        subscribe: optionalType(booleanType()),
+        subscribe: boolean().optional(),
         /**
          * Whether this server supports issuing notifications for changes to the resource list.
          */
-        listChanged: optionalType(booleanType()),
+        listChanged: boolean().optional()
     })
-        .passthrough()),
+        .optional(),
     /**
      * Present if the server offers any tools to call.
      */
-    tools: optionalType(objectType({
+    tools: object({
         /**
          * Whether this server supports issuing notifications for changes to the tool list.
          */
-        listChanged: optionalType(booleanType()),
+        listChanged: boolean().optional()
     })
-        .passthrough()),
-})
-    .passthrough();
+        .optional(),
+    /**
+     * Present if the server supports task creation.
+     */
+    tasks: ServerTasksCapabilitySchema.optional()
+});
 /**
  * After receiving an initialize request from the client, the server sends this response.
  */
@@ -316,7 +505,7 @@ const InitializeResultSchema = 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: stringType(),
+    protocolVersion: string(),
     capabilities: ServerCapabilitiesSchema,
     serverInfo: ImplementationSchema,
     /**
@@ -324,13 +513,14 @@ const InitializeResultSchema = 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: optionalType(stringType()),
+    instructions: string().optional()
 });
 /**
  * This notification is sent from the client to the server after initialization has finished.
  */
 const InitializedNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/initialized"),
+    method: literal('notifications/initialized'),
+    params: NotificationsParamsSchema.optional()
 });
 const isInitializedNotification = (value) => InitializedNotificationSchema.safeParse(value).success;
 /* Ping */
@@ -338,327 +528,470 @@ const isInitializedNotification = (value) => InitializedNotificationSchema.safeP
  * 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.
  */
 const PingRequestSchema = RequestSchema.extend({
-    method: literalType("ping"),
+    method: literal('ping'),
+    params: BaseRequestParamsSchema.optional()
 });
 /* Progress notifications */
-const ProgressSchema = objectType({
+const ProgressSchema = object({
     /**
      * The progress thus far. This should increase every time progress is made, even if the total is unknown.
      */
-    progress: numberType(),
+    progress: number(),
     /**
      * Total number of items to process (or total progress required), if known.
      */
-    total: optionalType(numberType()),
+    total: optional(number()),
     /**
      * An optional message describing the current progress.
      */
-    message: optionalType(stringType()),
-})
-    .passthrough();
+    message: optional(string())
+});
+const ProgressNotificationParamsSchema = object({
+    ...NotificationsParamsSchema.shape,
+    ...ProgressSchema.shape,
+    /**
+     * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
+     */
+    progressToken: ProgressTokenSchema
+});
 /**
  * An out-of-band notification used to inform the receiver of a progress update for a long-running request.
+ *
+ * @category notifications/progress
  */
 const ProgressNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/progress"),
-    params: BaseNotificationParamsSchema.merge(ProgressSchema).extend({
-        /**
-         * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
-         */
-        progressToken: ProgressTokenSchema,
-    }),
+    method: literal('notifications/progress'),
+    params: ProgressNotificationParamsSchema
+});
+const PaginatedRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * An opaque token representing the current pagination position.
+     * If provided, the server should return results starting after this cursor.
+     */
+    cursor: CursorSchema.optional()
 });
 /* Pagination */
 const PaginatedRequestSchema = 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: optionalType(CursorSchema),
-    }).optional(),
+    params: PaginatedRequestParamsSchema.optional()
 });
 const PaginatedResultSchema = ResultSchema.extend({
     /**
      * An opaque token representing the pagination position after the last returned result.
      * If present, there may be more results available.
      */
-    nextCursor: optionalType(CursorSchema),
+    nextCursor: CursorSchema.optional()
 });
+/**
+ * The status of a task.
+ * */
+const TaskStatusSchema = _enum(['working', 'input_required', 'completed', 'failed', 'cancelled']);
+/* Tasks */
+/**
+ * A pollable state object associated with a request.
+ */
+const TaskSchema = object({
+    taskId: string(),
+    status: TaskStatusSchema,
+    /**
+     * Time in milliseconds to keep task results available after completion.
+     * If null, the task has unlimited lifetime until manually cleaned up.
+     */
+    ttl: union([number(), _null()]),
+    /**
+     * ISO 8601 timestamp when the task was created.
+     */
+    createdAt: string(),
+    /**
+     * ISO 8601 timestamp when the task was last updated.
+     */
+    lastUpdatedAt: string(),
+    pollInterval: optional(number()),
+    /**
+     * Optional diagnostic message for failed tasks or other status information.
+     */
+    statusMessage: optional(string())
+});
+/**
+ * Result returned when a task is created, containing the task data wrapped in a task field.
+ */
+const CreateTaskResultSchema = ResultSchema.extend({
+    task: TaskSchema
+});
+/**
+ * Parameters for task status notification.
+ */
+const TaskStatusNotificationParamsSchema = NotificationsParamsSchema.merge(TaskSchema);
+/**
+ * A notification sent when a task's status changes.
+ */
+const TaskStatusNotificationSchema = NotificationSchema.extend({
+    method: literal('notifications/tasks/status'),
+    params: TaskStatusNotificationParamsSchema
+});
+/**
+ * A request to get the state of a specific task.
+ */
+const GetTaskRequestSchema = RequestSchema.extend({
+    method: literal('tasks/get'),
+    params: BaseRequestParamsSchema.extend({
+        taskId: string()
+    })
+});
+/**
+ * The response to a tasks/get request.
+ */
+const GetTaskResultSchema = ResultSchema.merge(TaskSchema);
+/**
+ * A request to get the result of a specific task.
+ */
+const GetTaskPayloadRequestSchema = RequestSchema.extend({
+    method: literal('tasks/result'),
+    params: BaseRequestParamsSchema.extend({
+        taskId: string()
+    })
+});
+/**
+ * The response to a tasks/result request.
+ * The structure matches the result type of the original request.
+ * For example, a tools/call task would return the CallToolResult structure.
+ *
+ */
+ResultSchema.loose();
+/**
+ * A request to list tasks.
+ */
+const ListTasksRequestSchema = PaginatedRequestSchema.extend({
+    method: literal('tasks/list')
+});
+/**
+ * The response to a tasks/list request.
+ */
+const ListTasksResultSchema = PaginatedResultSchema.extend({
+    tasks: array(TaskSchema)
+});
+/**
+ * A request to cancel a specific task.
+ */
+const CancelTaskRequestSchema = RequestSchema.extend({
+    method: literal('tasks/cancel'),
+    params: BaseRequestParamsSchema.extend({
+        taskId: string()
+    })
+});
+/**
+ * The response to a tasks/cancel request.
+ */
+const CancelTaskResultSchema = ResultSchema.merge(TaskSchema);
 /* Resources */
 /**
  * The contents of a specific resource or sub-resource.
  */
-const ResourceContentsSchema = objectType({
+const ResourceContentsSchema = object({
     /**
      * The URI of this resource.
      */
-    uri: stringType(),
+    uri: string(),
     /**
      * The MIME type of this resource, if known.
      */
-    mimeType: optionalType(stringType()),
+    mimeType: optional(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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: record(string(), unknown()).optional()
+});
 const TextResourceContentsSchema = 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: stringType(),
+    text: 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 = stringType().refine((val) => {
+const Base64Schema = string().refine(val => {
     try {
         // atob throws a DOMException if the string contains characters
         // that are not part of the Base64 character set.
         atob(val);
         return true;
     }
-    catch (_a) {
+    catch {
         return false;
     }
-}, { message: "Invalid Base64 string" });
+}, { message: 'Invalid Base64 string' });
 const BlobResourceContentsSchema = ResourceContentsSchema.extend({
     /**
      * A base64-encoded string representing the binary data of the item.
      */
-    blob: Base64Schema,
+    blob: Base64Schema
+});
+/**
+ * The sender or recipient of messages and data in a conversation.
+ */
+const RoleSchema = _enum(['user', 'assistant']);
+/**
+ * Optional annotations providing clients additional context about a resource.
+ */
+const AnnotationsSchema = object({
+    /**
+     * Intended audience(s) for the resource.
+     */
+    audience: array(RoleSchema).optional(),
+    /**
+     * Importance hint for the resource, from 0 (least) to 1 (most).
+     */
+    priority: number().min(0).max(1).optional(),
+    /**
+     * ISO 8601 timestamp for the most recent modification.
+     */
+    lastModified: datetime({ offset: true }).optional()
 });
 /**
  * A known resource that the server is capable of reading.
  */
-const ResourceSchema = BaseMetadataSchema.extend({
+const ResourceSchema = object({
+    ...BaseMetadataSchema.shape,
+    ...IconsSchema.shape,
     /**
      * The URI of this resource.
      */
-    uri: stringType(),
+    uri: 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: optionalType(stringType()),
+    description: optional(string()),
     /**
      * The MIME type of this resource, if known.
      */
-    mimeType: optionalType(stringType()),
+    mimeType: optional(string()),
     /**
-     * An optional list of icons for this resource.
+     * Optional annotations for the client.
      */
-    icons: optionalType(arrayType(IconSchema)),
+    annotations: AnnotationsSchema.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: optionalType(objectType({}).passthrough()),
+    _meta: optional(looseObject({}))
 });
 /**
  * A template description for resources available on the server.
  */
-const ResourceTemplateSchema = BaseMetadataSchema.extend({
+const ResourceTemplateSchema = object({
+    ...BaseMetadataSchema.shape,
+    ...IconsSchema.shape,
     /**
      * A URI template (according to RFC 6570) that can be used to construct resource URIs.
      */
-    uriTemplate: stringType(),
+    uriTemplate: 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: optionalType(stringType()),
+    description: optional(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: optionalType(stringType()),
+    mimeType: optional(string()),
+    /**
+     * Optional annotations for the client.
+     */
+    annotations: AnnotationsSchema.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: optionalType(objectType({}).passthrough()),
+    _meta: optional(looseObject({}))
 });
 /**
  * Sent from the client to request a list of resources the server has.
  */
 const ListResourcesRequestSchema = PaginatedRequestSchema.extend({
-    method: literalType("resources/list"),
+    method: literal('resources/list')
 });
 /**
  * The server's response to a resources/list request from the client.
  */
 const ListResourcesResultSchema = PaginatedResultSchema.extend({
-    resources: arrayType(ResourceSchema),
+    resources: array(ResourceSchema)
 });
 /**
  * Sent from the client to request a list of resource templates the server has.
  */
 const ListResourceTemplatesRequestSchema = PaginatedRequestSchema.extend({
-    method: literalType("resources/templates/list"),
+    method: literal('resources/templates/list')
 });
 /**
  * The server's response to a resources/templates/list request from the client.
  */
 const ListResourceTemplatesResultSchema = PaginatedResultSchema.extend({
-    resourceTemplates: arrayType(ResourceTemplateSchema),
+    resourceTemplates: array(ResourceTemplateSchema)
+});
+const 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: string()
 });
+/**
+ * Parameters for a `resources/read` request.
+ */
+const ReadResourceRequestParamsSchema = ResourceRequestParamsSchema;
 /**
  * Sent from the client to the server, to read a specific resource URI.
  */
 const ReadResourceRequestSchema = RequestSchema.extend({
-    method: literalType("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: stringType(),
-    }),
+    method: literal('resources/read'),
+    params: ReadResourceRequestParamsSchema
 });
 /**
  * The server's response to a resources/read request from the client.
  */
 const ReadResourceResultSchema = ResultSchema.extend({
-    contents: arrayType(unionType([TextResourceContentsSchema, BlobResourceContentsSchema])),
+    contents: array(union([TextResourceContentsSchema, 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.
  */
 const ResourceListChangedNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/resources/list_changed"),
+    method: literal('notifications/resources/list_changed'),
+    params: NotificationsParamsSchema.optional()
 });
+const SubscribeRequestParamsSchema = ResourceRequestParamsSchema;
 /**
  * Sent from the client to request resources/updated notifications from the server whenever a particular resource changes.
  */
 const SubscribeRequestSchema = RequestSchema.extend({
-    method: literalType("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: stringType(),
-    }),
+    method: literal('resources/subscribe'),
+    params: SubscribeRequestParamsSchema
 });
+const UnsubscribeRequestParamsSchema = ResourceRequestParamsSchema;
 /**
  * Sent from the client to request cancellation of resources/updated notifications from the server. This should follow a previous resources/subscribe request.
  */
 const UnsubscribeRequestSchema = RequestSchema.extend({
-    method: literalType("resources/unsubscribe"),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The URI of the resource to unsubscribe from.
-         */
-        uri: stringType(),
-    }),
+    method: literal('resources/unsubscribe'),
+    params: UnsubscribeRequestParamsSchema
+});
+/**
+ * Parameters for a `notifications/resources/updated` notification.
+ */
+const 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: 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.
  */
 const ResourceUpdatedNotificationSchema = NotificationSchema.extend({
-    method: literalType("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: stringType(),
-    }),
+    method: literal('notifications/resources/updated'),
+    params: ResourceUpdatedNotificationParamsSchema
 });
 /* Prompts */
 /**
  * Describes an argument that a prompt can accept.
  */
-const PromptArgumentSchema = objectType({
+const PromptArgumentSchema = object({
     /**
      * The name of the argument.
      */
-    name: stringType(),
+    name: string(),
     /**
      * A human-readable description of the argument.
      */
-    description: optionalType(stringType()),
+    description: optional(string()),
     /**
      * Whether this argument must be provided.
      */
-    required: optionalType(booleanType()),
-})
-    .passthrough();
+    required: optional(boolean())
+});
 /**
  * A prompt or prompt template that the server offers.
  */
-const PromptSchema = BaseMetadataSchema.extend({
+const PromptSchema = object({
+    ...BaseMetadataSchema.shape,
+    ...IconsSchema.shape,
     /**
      * An optional description of what this prompt provides
      */
-    description: optionalType(stringType()),
+    description: optional(string()),
     /**
      * A list of arguments to use for templating the prompt.
      */
-    arguments: optionalType(arrayType(PromptArgumentSchema)),
-    /**
-     * An optional list of icons for this prompt.
-     */
-    icons: optionalType(arrayType(IconSchema)),
+    arguments: optional(array(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: optionalType(objectType({}).passthrough()),
+    _meta: optional(looseObject({}))
 });
 /**
  * Sent from the client to request a list of prompts and prompt templates the server has.
  */
 const ListPromptsRequestSchema = PaginatedRequestSchema.extend({
-    method: literalType("prompts/list"),
+    method: literal('prompts/list')
 });
 /**
  * The server's response to a prompts/list request from the client.
  */
 const ListPromptsResultSchema = PaginatedResultSchema.extend({
-    prompts: arrayType(PromptSchema),
+    prompts: array(PromptSchema)
+});
+/**
+ * Parameters for a `prompts/get` request.
+ */
+const GetPromptRequestParamsSchema = BaseRequestParamsSchema.extend({
+    /**
+     * The name of the prompt or prompt template.
+     */
+    name: string(),
+    /**
+     * Arguments to use for templating the prompt.
+     */
+    arguments: record(string(), string()).optional()
 });
 /**
  * Used by the client to get a prompt provided by the server.
  */
 const GetPromptRequestSchema = RequestSchema.extend({
-    method: literalType("prompts/get"),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The name of the prompt or prompt template.
-         */
-        name: stringType(),
-        /**
-         * Arguments to use for templating the prompt.
-         */
-        arguments: optionalType(recordType(stringType())),
-    }),
+    method: literal('prompts/get'),
+    params: GetPromptRequestParamsSchema
 });
 /**
  * Text provided to or from an LLM.
  */
-const TextContentSchema = objectType({
-    type: literalType("text"),
+const TextContentSchema = object({
+    type: literal('text'),
     /**
      * The text content of the message.
      */
-    text: stringType(),
+    text: string(),
+    /**
+     * Optional annotations for the client.
+     */
+    annotations: AnnotationsSchema.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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: record(string(), unknown()).optional()
+});
 /**
  * An image provided to or from an LLM.
  */
-const ImageContentSchema = objectType({
-    type: literalType("image"),
+const ImageContentSchema = object({
+    type: literal('image'),
     /**
      * The base64-encoded image data.
      */
@@ -666,19 +999,22 @@ const ImageContentSchema = objectType({
     /**
      * The MIME type of the image. Different providers may support different image types.
      */
-    mimeType: stringType(),
+    mimeType: string(),
+    /**
+     * Optional annotations for the client.
+     */
+    annotations: AnnotationsSchema.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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: record(string(), unknown()).optional()
+});
 /**
  * An Audio provided to or from an LLM.
  */
-const AudioContentSchema = objectType({
-    type: literalType("audio"),
+const AudioContentSchema = object({
+    type: literal('audio'),
     /**
      * The base64-encoded audio data.
      */
@@ -686,53 +1022,85 @@ const AudioContentSchema = objectType({
     /**
      * The MIME type of the audio. Different providers may support different audio types.
      */
-    mimeType: stringType(),
+    mimeType: string(),
+    /**
+     * Optional annotations for the client.
+     */
+    annotations: AnnotationsSchema.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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: record(string(), unknown()).optional()
+});
+/**
+ * A tool call request from an assistant (LLM).
+ * Represents the assistant's request to use a tool.
+ */
+const ToolUseContentSchema = object({
+    type: literal('tool_use'),
+    /**
+     * The name of the tool to invoke.
+     * Must match a tool name from the request's tools array.
+     */
+    name: string(),
+    /**
+     * Unique identifier for this tool call.
+     * Used to correlate with ToolResultContent in subsequent messages.
+     */
+    id: string(),
+    /**
+     * Arguments to pass to the tool.
+     * Must conform to the tool's inputSchema.
+     */
+    input: record(string(), unknown()),
+    /**
+     * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
+     * for notes on _meta usage.
+     */
+    _meta: record(string(), unknown()).optional()
+});
 /**
  * The contents of a resource, embedded into a prompt or tool call result.
  */
-const EmbeddedResourceSchema = objectType({
-    type: literalType("resource"),
-    resource: unionType([TextResourceContentsSchema, BlobResourceContentsSchema]),
+const EmbeddedResourceSchema = object({
+    type: literal('resource'),
+    resource: union([TextResourceContentsSchema, BlobResourceContentsSchema]),
+    /**
+     * Optional annotations for the client.
+     */
+    annotations: AnnotationsSchema.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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: record(string(), 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.
  */
 const ResourceLinkSchema = ResourceSchema.extend({
-    type: literalType("resource_link"),
+    type: literal('resource_link')
 });
 /**
  * A content block that can be used in prompts and tool results.
  */
-const ContentBlockSchema = unionType([
+const ContentBlockSchema = union([
     TextContentSchema,
     ImageContentSchema,
     AudioContentSchema,
     ResourceLinkSchema,
-    EmbeddedResourceSchema,
+    EmbeddedResourceSchema
 ]);
 /**
  * Describes a message returned as part of a prompt.
  */
-const PromptMessageSchema = objectType({
-    role: enumType(["user", "assistant"]),
-    content: ContentBlockSchema,
-})
-    .passthrough();
+const PromptMessageSchema = object({
+    role: RoleSchema,
+    content: ContentBlockSchema
+});
 /**
  * The server's response to a prompts/get request from the client.
  */
@@ -740,14 +1108,15 @@ const GetPromptResultSchema = ResultSchema.extend({
     /**
      * An optional description for the prompt.
      */
-    description: optionalType(stringType()),
-    messages: arrayType(PromptMessageSchema),
+    description: string().optional(),
+    messages: array(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.
  */
 const PromptListChangedNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/prompts/list_changed"),
+    method: literal('notifications/prompts/list_changed'),
+    params: NotificationsParamsSchema.optional()
 });
 /* Tools */
 /**
@@ -760,17 +1129,17 @@ const PromptListChangedNotificationSchema = NotificationSchema.extend({
  * Clients should never make tool use decisions based on ToolAnnotations
  * received from untrusted servers.
  */
-const ToolAnnotationsSchema = objectType({
+const ToolAnnotationsSchema = object({
     /**
      * A human-readable title for the tool.
      */
-    title: optionalType(stringType()),
+    title: string().optional(),
     /**
      * If true, the tool does not modify its environment.
      *
      * Default: false
      */
-    readOnlyHint: optionalType(booleanType()),
+    readOnlyHint: boolean().optional(),
     /**
      * If true, the tool may perform destructive updates to its environment.
      * If false, the tool performs only additive updates.
@@ -779,7 +1148,7 @@ const ToolAnnotationsSchema = objectType({
      *
      * Default: true
      */
-    destructiveHint: optionalType(booleanType()),
+    destructiveHint: boolean().optional(),
     /**
      * If true, calling the tool repeatedly with the same arguments
      * will have no additional effect on the its environment.
@@ -788,7 +1157,7 @@ const ToolAnnotationsSchema = objectType({
      *
      * Default: false
      */
-    idempotentHint: optionalType(booleanType()),
+    idempotentHint: 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.
@@ -797,61 +1166,79 @@ const ToolAnnotationsSchema = objectType({
      *
      * Default: true
      */
-    openWorldHint: optionalType(booleanType()),
-})
-    .passthrough();
+    openWorldHint: boolean().optional()
+});
+/**
+ * Execution-related properties for a tool.
+ */
+const ToolExecutionSchema = object({
+    /**
+     * Indicates the tool's preference for task-augmented execution.
+     * - "required": Clients MUST invoke the tool as a task
+     * - "optional": Clients MAY invoke the tool as a task or normal request
+     * - "forbidden": Clients MUST NOT attempt to invoke the tool as a task
+     *
+     * If not present, defaults to "forbidden".
+     */
+    taskSupport: _enum(['required', 'optional', 'forbidden']).optional()
+});
 /**
  * Definition for a tool the client can call.
  */
-const ToolSchema = BaseMetadataSchema.extend({
+const ToolSchema = object({
+    ...BaseMetadataSchema.shape,
+    ...IconsSchema.shape,
     /**
      * A human-readable description of the tool.
      */
-    description: optionalType(stringType()),
+    description: string().optional(),
     /**
-     * A JSON Schema object defining the expected parameters for the tool.
+     * A JSON Schema 2020-12 object defining the expected parameters for the tool.
+     * Must have type: 'object' at the root level per MCP spec.
      */
-    inputSchema: objectType({
-        type: literalType("object"),
-        properties: optionalType(objectType({}).passthrough()),
-        required: optionalType(arrayType(stringType())),
+    inputSchema: object({
+        type: literal('object'),
+        properties: record(string(), AssertObjectSchema).optional(),
+        required: array(string()).optional()
     })
-        .passthrough(),
+        .catchall(unknown()),
     /**
-     * An optional JSON Schema object defining the structure of the tool's output returned in
-     * the structuredContent field of a CallToolResult.
+     * An optional JSON Schema 2020-12 object defining the structure of the tool's output
+     * returned in the structuredContent field of a CallToolResult.
+     * Must have type: 'object' at the root level per MCP spec.
      */
-    outputSchema: optionalType(objectType({
-        type: literalType("object"),
-        properties: optionalType(objectType({}).passthrough()),
-        required: optionalType(arrayType(stringType())),
+    outputSchema: object({
+        type: literal('object'),
+        properties: record(string(), AssertObjectSchema).optional(),
+        required: array(string()).optional()
     })
-        .passthrough()),
+        .catchall(unknown())
+        .optional(),
     /**
      * Optional additional tool information.
      */
-    annotations: optionalType(ToolAnnotationsSchema),
+    annotations: ToolAnnotationsSchema.optional(),
     /**
-     * An optional list of icons for this tool.
+     * Execution-related properties for this tool.
      */
-    icons: optionalType(arrayType(IconSchema)),
+    execution: ToolExecutionSchema.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: optionalType(objectType({}).passthrough()),
+    _meta: record(string(), unknown()).optional()
 });
 /**
  * Sent from the client to request a list of tools the server has.
  */
 const ListToolsRequestSchema = PaginatedRequestSchema.extend({
-    method: literalType("tools/list"),
+    method: literal('tools/list')
 });
 /**
  * The server's response to a tools/list request from the client.
  */
 const ListToolsResultSchema = PaginatedResultSchema.extend({
-    tools: arrayType(ToolSchema),
+    tools: array(ToolSchema)
 });
 /**
  * The server's response to a tool call.
@@ -863,13 +1250,13 @@ const CallToolResultSchema = 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: arrayType(ContentBlockSchema).default([]),
+    content: array(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: objectType({}).passthrough().optional(),
+    structuredContent: record(string(), unknown()).optional(),
     /**
      * Whether the tool call ended in an error.
      *
@@ -884,368 +1271,629 @@ const CallToolResultSchema = ResultSchema.extend({
      * server does not support tool calls, or any other exceptional conditions,
      * should be reported as an MCP error response.
      */
-    isError: optionalType(booleanType()),
+    isError: boolean().optional()
 });
 /**
  * CallToolResultSchema extended with backwards compatibility to protocol version 2024-10-07.
  */
 CallToolResultSchema.or(ResultSchema.extend({
-    toolResult: unknownType(),
+    toolResult: unknown()
 }));
+/**
+ * Parameters for a `tools/call` request.
+ */
+const CallToolRequestParamsSchema = TaskAugmentedRequestParamsSchema.extend({
+    /**
+     * The name of the tool to call.
+     */
+    name: string(),
+    /**
+     * Arguments to pass to the tool.
+     */
+    arguments: record(string(), unknown()).optional()
+});
 /**
  * Used by the client to invoke a tool provided by the server.
  */
 const CallToolRequestSchema = RequestSchema.extend({
-    method: literalType("tools/call"),
-    params: BaseRequestParamsSchema.extend({
-        name: stringType(),
-        arguments: optionalType(recordType(unknownType())),
-    }),
+    method: literal('tools/call'),
+    params: 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.
  */
 const ToolListChangedNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/tools/list_changed"),
+    method: literal('notifications/tools/list_changed'),
+    params: NotificationsParamsSchema.optional()
+});
+/**
+ * Base schema for list changed subscription options (without callback).
+ * Used internally for Zod validation of autoRefresh and debounceMs.
+ */
+const ListChangedOptionsBaseSchema = object({
+    /**
+     * If true, the list will be refreshed automatically when a list changed notification is received.
+     * The callback will be called with the updated list.
+     *
+     * If false, the callback will be called with null items, allowing manual refresh.
+     *
+     * @default true
+     */
+    autoRefresh: boolean().default(true),
+    /**
+     * Debounce time in milliseconds for list changed notification processing.
+     *
+     * Multiple notifications received within this timeframe will only trigger one refresh.
+     * Set to 0 to disable debouncing.
+     *
+     * @default 300
+     */
+    debounceMs: number().int().nonnegative().default(300)
 });
 /* Logging */
 /**
  * The severity of a log message.
  */
-const LoggingLevelSchema = enumType([
-    "debug",
-    "info",
-    "notice",
-    "warning",
-    "error",
-    "critical",
-    "alert",
-    "emergency",
-]);
+const LoggingLevelSchema = _enum(['debug', 'info', 'notice', 'warning', 'error', 'critical', 'alert', 'emergency']);
+/**
+ * Parameters for a `logging/setLevel` request.
+ */
+const 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: LoggingLevelSchema
+});
 /**
  * A request from the client to the server, to enable or adjust logging.
  */
 const SetLevelRequestSchema = RequestSchema.extend({
-    method: literalType("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: LoggingLevelSchema,
-    }),
+    method: literal('logging/setLevel'),
+    params: SetLevelRequestParamsSchema
+});
+/**
+ * Parameters for a `notifications/message` notification.
+ */
+const LoggingMessageNotificationParamsSchema = NotificationsParamsSchema.extend({
+    /**
+     * The severity of this log message.
+     */
+    level: LoggingLevelSchema,
+    /**
+     * An optional name of the logger issuing this message.
+     */
+    logger: string().optional(),
+    /**
+     * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
+     */
+    data: 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.
  */
 const LoggingMessageNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/message"),
-    params: BaseNotificationParamsSchema.extend({
-        /**
-         * The severity of this log message.
-         */
-        level: LoggingLevelSchema,
-        /**
-         * An optional name of the logger issuing this message.
-         */
-        logger: optionalType(stringType()),
-        /**
-         * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
-         */
-        data: unknownType(),
-    }),
+    method: literal('notifications/message'),
+    params: LoggingMessageNotificationParamsSchema
 });
 /* Sampling */
 /**
  * Hints to use for model selection.
  */
-const ModelHintSchema = objectType({
+const ModelHintSchema = object({
     /**
      * A hint for a model name.
      */
-    name: stringType().optional(),
-})
-    .passthrough();
+    name: string().optional()
+});
 /**
  * The server's preferences for model selection, requested of the client during sampling.
  */
-const ModelPreferencesSchema = objectType({
+const ModelPreferencesSchema = object({
     /**
      * Optional hints to use for model selection.
      */
-    hints: optionalType(arrayType(ModelHintSchema)),
+    hints: array(ModelHintSchema).optional(),
     /**
      * How much to prioritize cost when selecting a model.
      */
-    costPriority: optionalType(numberType().min(0).max(1)),
+    costPriority: number().min(0).max(1).optional(),
     /**
      * How much to prioritize sampling speed (latency) when selecting a model.
      */
-    speedPriority: optionalType(numberType().min(0).max(1)),
+    speedPriority: number().min(0).max(1).optional(),
     /**
      * How much to prioritize intelligence and capabilities when selecting a model.
      */
-    intelligencePriority: optionalType(numberType().min(0).max(1)),
-})
-    .passthrough();
+    intelligencePriority: number().min(0).max(1).optional()
+});
+/**
+ * Controls tool usage behavior in sampling requests.
+ */
+const ToolChoiceSchema = 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: _enum(['auto', 'required', 'none']).optional()
+});
+/**
+ * The result of a tool execution, provided by the user (server).
+ * Represents the outcome of invoking a tool requested via ToolUseContent.
+ */
+const ToolResultContentSchema = object({
+    type: literal('tool_result'),
+    toolUseId: string().describe('The unique identifier for the corresponding tool call.'),
+    content: array(ContentBlockSchema).default([]),
+    structuredContent: object({}).loose().optional(),
+    isError: boolean().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: record(string(), unknown()).optional()
+});
+/**
+ * Basic content types for sampling responses (without tool use).
+ * Used for backwards-compatible CreateMessageResult when tools are not used.
+ */
+const SamplingContentSchema = discriminatedUnion('type', [TextContentSchema, ImageContentSchema, AudioContentSchema]);
+/**
+ * Content block types allowed in sampling messages.
+ * This includes text, image, audio, tool use requests, and tool results.
+ */
+const SamplingMessageContentBlockSchema = discriminatedUnion('type', [
+    TextContentSchema,
+    ImageContentSchema,
+    AudioContentSchema,
+    ToolUseContentSchema,
+    ToolResultContentSchema
+]);
 /**
  * Describes a message issued to or received from an LLM API.
  */
-const SamplingMessageSchema = objectType({
-    role: enumType(["user", "assistant"]),
-    content: unionType([TextContentSchema, ImageContentSchema, AudioContentSchema]),
-})
-    .passthrough();
+const SamplingMessageSchema = object({
+    role: RoleSchema,
+    content: union([SamplingMessageContentBlockSchema, array(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: record(string(), unknown()).optional()
+});
+/**
+ * Parameters for a `sampling/createMessage` request.
+ */
+const CreateMessageRequestParamsSchema = TaskAugmentedRequestParamsSchema.extend({
+    messages: array(SamplingMessageSchema),
+    /**
+     * The server's preferences for which model to select. The client MAY modify or omit this request.
+     */
+    modelPreferences: ModelPreferencesSchema.optional(),
+    /**
+     * An optional system prompt the server wants to use for sampling. The client MAY modify or omit this prompt.
+     */
+    systemPrompt: 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: _enum(['none', 'thisServer', 'allServers']).optional(),
+    temperature: 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: number().int(),
+    stopSequences: array(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: array(ToolSchema).optional(),
+    /**
+     * 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: ToolChoiceSchema.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.
  */
 const CreateMessageRequestSchema = RequestSchema.extend({
-    method: literalType("sampling/createMessage"),
-    params: BaseRequestParamsSchema.extend({
-        messages: arrayType(SamplingMessageSchema),
-        /**
-         * An optional system prompt the server wants to use for sampling. The client MAY modify or omit this prompt.
-         */
-        systemPrompt: optionalType(stringType()),
-        /**
-         * 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: optionalType(enumType(["none", "thisServer", "allServers"])),
-        temperature: optionalType(numberType()),
-        /**
-         * The maximum number of tokens to sample, as requested by the server. The client MAY choose to sample fewer tokens than requested.
-         */
-        maxTokens: numberType().int(),
-        stopSequences: optionalType(arrayType(stringType())),
-        /**
-         * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
-         */
-        metadata: optionalType(objectType({}).passthrough()),
-        /**
-         * The server's preferences for which model to select.
-         */
-        modelPreferences: optionalType(ModelPreferencesSchema),
-    }),
+    method: literal('sampling/createMessage'),
+    params: 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.
+ * The client's response to a sampling/create_message request from the server.
+ * This is the backwards-compatible version that returns single content (no arrays).
+ * Used when the request does not include tools.
  */
 const CreateMessageResultSchema = ResultSchema.extend({
     /**
      * The name of the model that generated the message.
      */
-    model: stringType(),
+    model: string(),
+    /**
+     * 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
+     *
+     * This field is an open string to allow for provider-specific stop reasons.
+     */
+    stopReason: optional(_enum(['endTurn', 'stopSequence', 'maxTokens']).or(string())),
+    role: RoleSchema,
+    /**
+     * Response content. Single content block (text, image, or audio).
+     */
+    content: SamplingContentSchema
+});
+/**
+ * The client's response to a sampling/create_message request when tools were provided.
+ * This version supports array content for tool use flows.
+ */
+const CreateMessageResultWithToolsSchema = ResultSchema.extend({
+    /**
+     * The name of the model that generated the message.
+     */
+    model: string(),
+    /**
+     * 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: optional(_enum(['endTurn', 'stopSequence', 'maxTokens', 'toolUse']).or(string())),
+    role: RoleSchema,
     /**
-     * The reason why sampling stopped.
+     * Response content. May be a single block or array. May include ToolUseContent if stopReason is "toolUse".
      */
-    stopReason: optionalType(enumType(["endTurn", "stopSequence", "maxTokens"]).or(stringType())),
-    role: enumType(["user", "assistant"]),
-    content: discriminatedUnionType("type", [
-        TextContentSchema,
-        ImageContentSchema,
-        AudioContentSchema
-    ]),
+    content: union([SamplingMessageContentBlockSchema, array(SamplingMessageContentBlockSchema)])
 });
 /* Elicitation */
 /**
  * Primitive schema definition for boolean fields.
  */
-const BooleanSchemaSchema = objectType({
-    type: literalType("boolean"),
-    title: optionalType(stringType()),
-    description: optionalType(stringType()),
-    default: optionalType(booleanType()),
-})
-    .passthrough();
+const BooleanSchemaSchema = object({
+    type: literal('boolean'),
+    title: string().optional(),
+    description: string().optional(),
+    default: boolean().optional()
+});
 /**
  * Primitive schema definition for string fields.
  */
-const StringSchemaSchema = objectType({
-    type: literalType("string"),
-    title: optionalType(stringType()),
-    description: optionalType(stringType()),
-    minLength: optionalType(numberType()),
-    maxLength: optionalType(numberType()),
-    format: optionalType(enumType(["email", "uri", "date", "date-time"])),
-})
-    .passthrough();
+const StringSchemaSchema = object({
+    type: literal('string'),
+    title: string().optional(),
+    description: string().optional(),
+    minLength: number().optional(),
+    maxLength: number().optional(),
+    format: _enum(['email', 'uri', 'date', 'date-time']).optional(),
+    default: string().optional()
+});
 /**
  * Primitive schema definition for number fields.
  */
-const NumberSchemaSchema = objectType({
-    type: enumType(["number", "integer"]),
-    title: optionalType(stringType()),
-    description: optionalType(stringType()),
-    minimum: optionalType(numberType()),
-    maximum: optionalType(numberType()),
-})
-    .passthrough();
+const NumberSchemaSchema = object({
+    type: _enum(['number', 'integer']),
+    title: string().optional(),
+    description: string().optional(),
+    minimum: number().optional(),
+    maximum: number().optional(),
+    default: number().optional()
+});
+/**
+ * Schema for single-selection enumeration without display titles for options.
+ */
+const UntitledSingleSelectEnumSchemaSchema = object({
+    type: literal('string'),
+    title: string().optional(),
+    description: string().optional(),
+    enum: array(string()),
+    default: string().optional()
+});
+/**
+ * Schema for single-selection enumeration with display titles for each option.
+ */
+const TitledSingleSelectEnumSchemaSchema = object({
+    type: literal('string'),
+    title: string().optional(),
+    description: string().optional(),
+    oneOf: array(object({
+        const: string(),
+        title: string()
+    })),
+    default: string().optional()
+});
+/**
+ * Use TitledSingleSelectEnumSchema instead.
+ * This interface will be removed in a future version.
+ */
+const LegacyTitledEnumSchemaSchema = object({
+    type: literal('string'),
+    title: string().optional(),
+    description: string().optional(),
+    enum: array(string()),
+    enumNames: array(string()).optional(),
+    default: string().optional()
+});
+// Combined single selection enumeration
+const SingleSelectEnumSchemaSchema = union([UntitledSingleSelectEnumSchemaSchema, TitledSingleSelectEnumSchemaSchema]);
+/**
+ * Schema for multiple-selection enumeration without display titles for options.
+ */
+const UntitledMultiSelectEnumSchemaSchema = object({
+    type: literal('array'),
+    title: string().optional(),
+    description: string().optional(),
+    minItems: number().optional(),
+    maxItems: number().optional(),
+    items: object({
+        type: literal('string'),
+        enum: array(string())
+    }),
+    default: array(string()).optional()
+});
+/**
+ * Schema for multiple-selection enumeration with display titles for each option.
+ */
+const TitledMultiSelectEnumSchemaSchema = object({
+    type: literal('array'),
+    title: string().optional(),
+    description: string().optional(),
+    minItems: number().optional(),
+    maxItems: number().optional(),
+    items: object({
+        anyOf: array(object({
+            const: string(),
+            title: string()
+        }))
+    }),
+    default: array(string()).optional()
+});
+/**
+ * Combined schema for multiple-selection enumeration
+ */
+const MultiSelectEnumSchemaSchema = union([UntitledMultiSelectEnumSchemaSchema, TitledMultiSelectEnumSchemaSchema]);
 /**
  * Primitive schema definition for enum fields.
  */
-const EnumSchemaSchema = objectType({
-    type: literalType("string"),
-    title: optionalType(stringType()),
-    description: optionalType(stringType()),
-    enum: arrayType(stringType()),
-    enumNames: optionalType(arrayType(stringType())),
-})
-    .passthrough();
+const EnumSchemaSchema = union([LegacyTitledEnumSchemaSchema, SingleSelectEnumSchemaSchema, MultiSelectEnumSchemaSchema]);
 /**
  * Union of all primitive schema definitions.
  */
-const PrimitiveSchemaDefinitionSchema = unionType([
-    BooleanSchemaSchema,
-    StringSchemaSchema,
-    NumberSchemaSchema,
-    EnumSchemaSchema,
-]);
+const PrimitiveSchemaDefinitionSchema = union([EnumSchemaSchema, BooleanSchemaSchema, StringSchemaSchema, NumberSchemaSchema]);
+/**
+ * Parameters for an `elicitation/create` request for form-based elicitation.
+ */
+const ElicitRequestFormParamsSchema = TaskAugmentedRequestParamsSchema.extend({
+    /**
+     * The elicitation mode.
+     *
+     * Optional for backward compatibility. Clients MUST treat missing mode as "form".
+     */
+    mode: literal('form').optional(),
+    /**
+     * The message to present to the user describing what information is being requested.
+     */
+    message: string(),
+    /**
+     * A restricted subset of JSON Schema.
+     * Only top-level properties are allowed, without nesting.
+     */
+    requestedSchema: object({
+        type: literal('object'),
+        properties: record(string(), PrimitiveSchemaDefinitionSchema),
+        required: array(string()).optional()
+    })
+});
+/**
+ * Parameters for an `elicitation/create` request for URL-based elicitation.
+ */
+const ElicitRequestURLParamsSchema = TaskAugmentedRequestParamsSchema.extend({
+    /**
+     * The elicitation mode.
+     */
+    mode: literal('url'),
+    /**
+     * The message to present to the user explaining why the interaction is needed.
+     */
+    message: 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: string(),
+    /**
+     * The URL that the user should navigate to.
+     */
+    url: string().url()
+});
+/**
+ * The parameters for a request to elicit additional information from the user via the client.
+ */
+const ElicitRequestParamsSchema = union([ElicitRequestFormParamsSchema, 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).
  */
 const ElicitRequestSchema = RequestSchema.extend({
-    method: literalType("elicitation/create"),
-    params: BaseRequestParamsSchema.extend({
-        /**
-         * The message to present to the user.
-         */
-        message: stringType(),
-        /**
-         * The schema for the requested user input.
-         */
-        requestedSchema: objectType({
-            type: literalType("object"),
-            properties: recordType(stringType(), PrimitiveSchemaDefinitionSchema),
-            required: optionalType(arrayType(stringType())),
-        })
-            .passthrough(),
-    }),
+    method: literal('elicitation/create'),
+    params: ElicitRequestParamsSchema
+});
+/**
+ * Parameters for a `notifications/elicitation/complete` notification.
+ *
+ * @category notifications/elicitation/complete
+ */
+const ElicitationCompleteNotificationParamsSchema = NotificationsParamsSchema.extend({
+    /**
+     * The ID of the elicitation that completed.
+     */
+    elicitationId: 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
+ */
+const ElicitationCompleteNotificationSchema = NotificationSchema.extend({
+    method: literal('notifications/elicitation/complete'),
+    params: ElicitationCompleteNotificationParamsSchema
 });
 /**
  * The client's response to an elicitation/create request from the server.
  */
 const ElicitResultSchema = 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: enumType(["accept", "decline", "cancel"]),
+    action: _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.
+     * Per MCP spec, content is "typically omitted" for decline/cancel actions.
+     * We normalize null to undefined for leniency while maintaining type compatibility.
      */
-    content: optionalType(recordType(stringType(), unknownType())),
+    content: preprocess(val => (val === null ? undefined : val), record(string(), union([string(), number(), boolean(), array(string())])).optional())
 });
 /* Autocomplete */
 /**
  * A reference to a resource or resource template definition.
  */
-const ResourceTemplateReferenceSchema = objectType({
-    type: literalType("ref/resource"),
+const ResourceTemplateReferenceSchema = object({
+    type: literal('ref/resource'),
     /**
      * The URI or URI template of the resource.
      */
-    uri: stringType(),
-})
-    .passthrough();
+    uri: string()
+});
 /**
  * Identifies a prompt.
  */
-const PromptReferenceSchema = objectType({
-    type: literalType("ref/prompt"),
+const PromptReferenceSchema = object({
+    type: literal('ref/prompt'),
     /**
      * The name of the prompt or prompt template
      */
-    name: stringType(),
-})
-    .passthrough();
+    name: string()
+});
 /**
- * A request from the client to the server, to ask for completion options.
+ * Parameters for a `completion/complete` request.
  */
-const CompleteRequestSchema = RequestSchema.extend({
-    method: literalType("completion/complete"),
-    params: BaseRequestParamsSchema.extend({
-        ref: unionType([PromptReferenceSchema, ResourceTemplateReferenceSchema]),
+const CompleteRequestParamsSchema = BaseRequestParamsSchema.extend({
+    ref: union([PromptReferenceSchema, ResourceTemplateReferenceSchema]),
+    /**
+     * The argument's information
+     */
+    argument: object({
         /**
-         * The argument's information
+         * The name of the argument
          */
-        argument: objectType({
-            /**
-             * The name of the argument
-             */
-            name: stringType(),
-            /**
-             * The value of the argument to use for completion matching.
-             */
-            value: stringType(),
-        })
-            .passthrough(),
-        context: optionalType(objectType({
-            /**
-             * Previously-resolved variables in a URI template or prompt.
-             */
-            arguments: optionalType(recordType(stringType(), stringType())),
-        })),
+        name: string(),
+        /**
+         * The value of the argument to use for completion matching.
+         */
+        value: string()
     }),
+    context: object({
+        /**
+         * Previously-resolved variables in a URI template or prompt.
+         */
+        arguments: record(string(), string()).optional()
+    })
+        .optional()
+});
+/**
+ * A request from the client to the server, to ask for completion options.
+ */
+const CompleteRequestSchema = RequestSchema.extend({
+    method: literal('completion/complete'),
+    params: CompleteRequestParamsSchema
 });
 /**
  * The server's response to a completion/complete request
  */
 const CompleteResultSchema = ResultSchema.extend({
-    completion: objectType({
+    completion: looseObject({
         /**
          * An array of completion values. Must not exceed 100 items.
          */
-        values: arrayType(stringType()).max(100),
+        values: array(string()).max(100),
         /**
          * The total number of completion options available. This can exceed the number of values actually sent in the response.
          */
-        total: optionalType(numberType().int()),
+        total: optional(number().int()),
         /**
          * Indicates whether there are additional completion options beyond those provided in the current response, even if the exact total is unknown.
          */
-        hasMore: optionalType(booleanType()),
+        hasMore: optional(boolean())
     })
-        .passthrough(),
 });
 /* Roots */
 /**
  * Represents a root directory or file that the server can operate on.
  */
-const RootSchema = objectType({
+const RootSchema = object({
     /**
      * The URI identifying the root. This *must* start with file:// for now.
      */
-    uri: stringType().startsWith("file://"),
+    uri: string().startsWith('file://'),
     /**
      * An optional name for the root.
      */
-    name: optionalType(stringType()),
+    name: 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: optionalType(objectType({}).passthrough()),
-})
-    .passthrough();
+    _meta: record(string(), unknown()).optional()
+});
 /**
  * Sent from the server to request a list of root URIs from the client.
  */
 const ListRootsRequestSchema = RequestSchema.extend({
-    method: literalType("roots/list"),
+    method: literal('roots/list'),
+    params: BaseRequestParamsSchema.optional()
 });
 /**
  * The client's response to a roots/list request from the server.
  */
 const ListRootsResultSchema = ResultSchema.extend({
-    roots: arrayType(RootSchema),
+    roots: array(RootSchema)
 });
 /**
  * A notification from the client to the server, informing it that the list of roots has changed.
  */
 const RootsListChangedNotificationSchema = NotificationSchema.extend({
-    method: literalType("notifications/roots/list_changed"),
+    method: literal('notifications/roots/list_changed'),
+    params: NotificationsParamsSchema.optional()
 });
 /* Client messages */
-unionType([
+union([
     PingRequestSchema,
     InitializeRequestSchema,
     CompleteRequestSchema,
@@ -1259,27 +1907,40 @@ unionType([
     UnsubscribeRequestSchema,
     CallToolRequestSchema,
     ListToolsRequestSchema,
+    GetTaskRequestSchema,
+    GetTaskPayloadRequestSchema,
+    ListTasksRequestSchema,
+    CancelTaskRequestSchema
 ]);
-unionType([
+union([
     CancelledNotificationSchema,
     ProgressNotificationSchema,
     InitializedNotificationSchema,
     RootsListChangedNotificationSchema,
+    TaskStatusNotificationSchema
 ]);
-unionType([
+union([
     EmptyResultSchema,
     CreateMessageResultSchema,
+    CreateMessageResultWithToolsSchema,
     ElicitResultSchema,
     ListRootsResultSchema,
+    GetTaskResultSchema,
+    ListTasksResultSchema,
+    CreateTaskResultSchema
 ]);
 /* Server messages */
-unionType([
+union([
     PingRequestSchema,
     CreateMessageRequestSchema,
     ElicitRequestSchema,
     ListRootsRequestSchema,
+    GetTaskRequestSchema,
+    GetTaskPayloadRequestSchema,
+    ListTasksRequestSchema,
+    CancelTaskRequestSchema
 ]);
-unionType([
+union([
     CancelledNotificationSchema,
     ProgressNotificationSchema,
     LoggingMessageNotificationSchema,
@@ -1287,8 +1948,10 @@ unionType([
     ResourceListChangedNotificationSchema,
     ToolListChangedNotificationSchema,
     PromptListChangedNotificationSchema,
+    TaskStatusNotificationSchema,
+    ElicitationCompleteNotificationSchema
 ]);
-unionType([
+union([
     EmptyResultSchema,
     InitializeResultSchema,
     CompleteResultSchema,
@@ -1299,15 +1962,46 @@ unionType([
     ReadResourceResultSchema,
     CallToolResultSchema,
     ListToolsResultSchema,
+    GetTaskResultSchema,
+    ListTasksResultSchema,
+    CreateTaskResultSchema
 ]);
 class McpError extends Error {
     constructor(code, message, data) {
         super(`MCP error ${code}: ${message}`);
         this.code = code;
         this.data = data;
-        this.name = "McpError";
+        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);
+    }
+}
+/**
+ * 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() {
+        return this.data?.elicitations ?? [];
     }
 }
 
-export { AudioContentSchema, BaseMetadataSchema, BlobResourceContentsSchema, BooleanSchemaSchema, CallToolRequestSchema, CallToolResultSchema, CancelledNotificationSchema, ClientCapabilitiesSchema, CompleteRequestSchema, CompleteResultSchema, ContentBlockSchema, CreateMessageRequestSchema, CreateMessageResultSchema, CursorSchema, ElicitRequestSchema, ElicitResultSchema, EmbeddedResourceSchema, EmptyResultSchema, EnumSchemaSchema, ErrorCode, GetPromptRequestSchema, GetPromptResultSchema, IconSchema, ImageContentSchema, ImplementationSchema, InitializeRequestSchema, InitializeResultSchema, InitializedNotificationSchema, JSONRPCErrorSchema, JSONRPCMessageSchema, JSONRPCNotificationSchema, JSONRPCRequestSchema, JSONRPCResponseSchema, JSONRPC_VERSION, LATEST_PROTOCOL_VERSION, ListPromptsRequestSchema, ListPromptsResultSchema, ListResourceTemplatesRequestSchema, ListResourceTemplatesResultSchema, ListResourcesRequestSchema, ListResourcesResultSchema, ListRootsRequestSchema, ListRootsResultSchema, ListToolsRequestSchema, ListToolsResultSchema, LoggingLevelSchema, LoggingMessageNotificationSchema, McpError, ModelHintSchema, ModelPreferencesSchema, NotificationSchema, NumberSchemaSchema, PaginatedRequestSchema, PaginatedResultSchema, PingRequestSchema, PrimitiveSchemaDefinitionSchema, ProgressNotificationSchema, ProgressSchema, ProgressTokenSchema, PromptArgumentSchema, PromptListChangedNotificationSchema, PromptMessageSchema, PromptReferenceSchema, PromptSchema, ReadResourceRequestSchema, ReadResourceResultSchema, RequestIdSchema, RequestSchema, ResourceContentsSchema, ResourceLinkSchema, ResourceListChangedNotificationSchema, ResourceSchema, ResourceTemplateReferenceSchema, ResourceTemplateSchema, ResourceUpdatedNotificationSchema, ResultSchema, RootSchema, RootsListChangedNotificationSchema, SUPPORTED_PROTOCOL_VERSIONS, SamplingMessageSchema, ServerCapabilitiesSchema, SetLevelRequestSchema, StringSchemaSchema, SubscribeRequestSchema, TextContentSchema, TextResourceContentsSchema, ToolAnnotationsSchema, ToolListChangedNotificationSchema, ToolSchema, UnsubscribeRequestSchema, isInitializedNotification, isJSONRPCError, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResponse };
+export { AnnotationsSchema, AudioContentSchema, BaseMetadataSchema, BlobResourceContentsSchema, BooleanSchemaSchema, CallToolRequestParamsSchema, CallToolRequestSchema, CallToolResultSchema, CancelTaskRequestSchema, CancelTaskResultSchema, CancelledNotificationParamsSchema, CancelledNotificationSchema, ClientCapabilitiesSchema, ClientTasksCapabilitySchema, CompleteRequestParamsSchema, CompleteRequestSchema, CompleteResultSchema, ContentBlockSchema, CreateMessageRequestParamsSchema, CreateMessageRequestSchema, CreateMessageResultSchema, CreateMessageResultWithToolsSchema, CreateTaskResultSchema, CursorSchema, ElicitRequestFormParamsSchema, ElicitRequestParamsSchema, ElicitRequestSchema, ElicitRequestURLParamsSchema, ElicitResultSchema, ElicitationCompleteNotificationParamsSchema, ElicitationCompleteNotificationSchema, EmbeddedResourceSchema, EmptyResultSchema, EnumSchemaSchema, ErrorCode, GetPromptRequestParamsSchema, GetPromptRequestSchema, GetPromptResultSchema, GetTaskPayloadRequestSchema, GetTaskRequestSchema, GetTaskResultSchema, IconSchema, IconsSchema, ImageContentSchema, ImplementationSchema, InitializeRequestParamsSchema, InitializeRequestSchema, InitializeResultSchema, InitializedNotificationSchema, JSONRPCErrorResponseSchema, JSONRPCMessageSchema, JSONRPCNotificationSchema, JSONRPCRequestSchema, JSONRPCResultResponseSchema, JSONRPC_VERSION, LATEST_PROTOCOL_VERSION, LegacyTitledEnumSchemaSchema, ListChangedOptionsBaseSchema, ListPromptsRequestSchema, ListPromptsResultSchema, ListResourceTemplatesRequestSchema, ListResourceTemplatesResultSchema, ListResourcesRequestSchema, ListResourcesResultSchema, ListRootsRequestSchema, ListRootsResultSchema, ListTasksRequestSchema, ListTasksResultSchema, ListToolsRequestSchema, ListToolsResultSchema, LoggingLevelSchema, LoggingMessageNotificationParamsSchema, LoggingMessageNotificationSchema, McpError, ModelHintSchema, ModelPreferencesSchema, MultiSelectEnumSchemaSchema, NotificationSchema, NumberSchemaSchema, PaginatedRequestParamsSchema, PaginatedRequestSchema, PaginatedResultSchema, PingRequestSchema, PrimitiveSchemaDefinitionSchema, ProgressNotificationParamsSchema, ProgressNotificationSchema, ProgressSchema, ProgressTokenSchema, PromptArgumentSchema, PromptListChangedNotificationSchema, PromptMessageSchema, PromptReferenceSchema, PromptSchema, RELATED_TASK_META_KEY, ReadResourceRequestParamsSchema, ReadResourceRequestSchema, ReadResourceResultSchema, RelatedTaskMetadataSchema, RequestIdSchema, RequestSchema, ResourceContentsSchema, ResourceLinkSchema, ResourceListChangedNotificationSchema, ResourceRequestParamsSchema, ResourceSchema, ResourceTemplateReferenceSchema, ResourceTemplateSchema, ResourceUpdatedNotificationParamsSchema, ResourceUpdatedNotificationSchema, ResultSchema, RoleSchema, RootSchema, RootsListChangedNotificationSchema, SUPPORTED_PROTOCOL_VERSIONS, SamplingContentSchema, SamplingMessageContentBlockSchema, SamplingMessageSchema, ServerCapabilitiesSchema, ServerTasksCapabilitySchema, SetLevelRequestParamsSchema, SetLevelRequestSchema, SingleSelectEnumSchemaSchema, StringSchemaSchema, SubscribeRequestParamsSchema, SubscribeRequestSchema, TaskAugmentedRequestParamsSchema, TaskMetadataSchema, TaskSchema, TaskStatusNotificationParamsSchema, TaskStatusNotificationSchema, TaskStatusSchema, TextContentSchema, TextResourceContentsSchema, TitledMultiSelectEnumSchemaSchema, TitledSingleSelectEnumSchemaSchema, ToolAnnotationsSchema, ToolChoiceSchema, ToolExecutionSchema, ToolListChangedNotificationSchema, ToolResultContentSchema, ToolSchema, ToolUseContentSchema, UnsubscribeRequestParamsSchema, UnsubscribeRequestSchema, UntitledMultiSelectEnumSchemaSchema, UntitledSingleSelectEnumSchemaSchema, UrlElicitationRequiredError, isInitializedNotification, isJSONRPCErrorResponse, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResultResponse, isTaskAugmentedRequestParams };
 //# sourceMappingURL=types.js.map