diff --git a/src/spec.types.ts b/src/spec.types.ts
index 49f2457ce..c510b4341 100644
--- a/src/spec.types.ts
+++ b/src/spec.types.ts
@@ -3,11 +3,34 @@
  *
  * Source: https://github.com/modelcontextprotocol/modelcontextprotocol
  * Pulled from: https://raw.githubusercontent.com/modelcontextprotocol/modelcontextprotocol/main/schema/draft/schema.ts
- * Last updated from commit: 7dcdd69262bd488ddec071bf4eefedabf1742023
+ * Last updated from commit: 5c25208be86db5033f644a4e0d005e08f699ef3d
  *
  * DO NOT EDIT THIS FILE MANUALLY. Changes will be overwritten by automated updates.
  * To update this file, run: npm run fetch:spec-types
- *//* JSON-RPC types */
+ *//* JSON types */
+
+/**
+ * @category Common Types
+ */
+export type JSONValue =
+  | string
+  | number
+  | boolean
+  | null
+  | JSONObject
+  | JSONArray;
+
+/**
+ * @category Common Types
+ */
+export type JSONObject = { [key: string]: JSONValue };
+
+/**
+ * @category Common Types
+ */
+export type JSONArray = JSONValue[];
+
+/* JSON-RPC types */
 
 /**
  * Refers to any valid JSON-RPC object that can be decoded off the wire, or encoded to be sent.
@@ -17,14 +40,48 @@
 export type JSONRPCMessage =
   | JSONRPCRequest
   | JSONRPCNotification
-  | JSONRPCResponse
-  | JSONRPCError;
+  | JSONRPCResponse;
 
 /** @internal */
-export const LATEST_PROTOCOL_VERSION = "DRAFT-2025-v3";
+export const LATEST_PROTOCOL_VERSION = "DRAFT-2026-v1";
 /** @internal */
 export const JSONRPC_VERSION = "2.0";
 
+/**
+ * Represents the contents of a `_meta` field, which clients and servers use to attach additional metadata to their interactions.
+ *
+ * Certain key names are reserved by MCP for protocol-level metadata; implementations MUST NOT make assumptions about values at these keys. Additionally, specific schema definitions may reserve particular names for purpose-specific metadata, as declared in those definitions.
+ *
+ * Valid keys have two segments:
+ *
+ * **Prefix:**
+ * - Optional — if specified, MUST be a series of _labels_ separated by dots (`.`), followed by a slash (`/`).
+ * - Labels MUST start with a letter and end with a letter or digit. Interior characters may be letters, digits, or hyphens (`-`).
+ * - Any prefix consisting of zero or more labels, followed by `modelcontextprotocol` or `mcp`, followed by any label, is **reserved** for MCP use. For example: `modelcontextprotocol.io/`, `mcp.dev/`, `api.modelcontextprotocol.org/`, and `tools.mcp.com/` are all reserved.
+ *
+ * **Name:**
+ * - Unless empty, MUST start and end with an alphanumeric character (`[a-z0-9A-Z]`).
+ * - Interior characters may be alphanumeric, hyphens (`-`), underscores (`_`), or dots (`.`).
+ *
+ * @see [General fields: `_meta`](/specification/draft/basic/index#meta) for more details.
+ * @category Common Types
+ */
+export type MetaObject = Record<string, unknown>;
+
+/**
+ * Extends {@link MetaObject} with additional request-specific fields. All key naming rules from `MetaObject` apply.
+ *
+ * @see {@link MetaObject} for key naming rules and reserved prefixes.
+ * @see [General fields: `_meta`](/specification/draft/basic/index#meta) for more details.
+ * @category Common Types
+ */
+export interface RequestMetaObject extends MetaObject {
+  /**
+   * If specified, the caller is requesting out-of-band progress notifications for this request (as represented by {@link ProgressNotification | 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?: ProgressToken;
+}
+
 /**
  * A progress token, used to associate progress notifications with the original request.
  *
@@ -40,21 +97,29 @@ export type ProgressToken = string | number;
 export type Cursor = string;
 
 /**
- * Common params for any request.
+ * Common params for any task-augmented request.
  *
  * @internal
  */
-export interface RequestParams {
+export interface TaskAugmentedRequestParams extends RequestParams {
   /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
+   * If specified, the caller is requesting task-augmented execution for this request.
+   * The request will return a {@link CreateTaskResult} immediately, and the actual result can be
+   * retrieved later via {@link GetTaskPayloadRequest | tasks/result}.
+   *
+   * Task augmentation is subject to capability negotiation - receivers MUST declare support
+   * for task augmentation of specific request types in their capabilities.
    */
-  _meta?: {
-    /**
-     * 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?: ProgressToken;
-    [key: string]: unknown;
-  };
+  task?: TaskMetadata;
+}
+
+/**
+ * Common params for any request.
+ *
+ * @category Common Types
+ */
+export interface RequestParams {
+  _meta?: RequestMetaObject;
 }
 
 /** @internal */
@@ -65,12 +130,13 @@ export interface Request {
   params?: { [key: string]: any };
 }
 
-/** @internal */
+/**
+ * Common params for any notification.
+ *
+ * @category Common Types
+ */
 export interface NotificationParams {
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /** @internal */
@@ -82,18 +148,17 @@ export interface Notification {
 }
 
 /**
+ * Common result fields.
+ *
  * @category Common Types
  */
 export interface Result {
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
   [key: string]: unknown;
 }
 
 /**
- * @category Common Types
+ * @category Errors
  */
 export interface Error {
   /**
@@ -141,12 +206,30 @@ export interface JSONRPCNotification extends Notification {
  *
  * @category JSON-RPC
  */
-export interface JSONRPCResponse {
+export interface JSONRPCResultResponse {
   jsonrpc: typeof JSONRPC_VERSION;
   id: RequestId;
   result: Result;
 }
 
+/**
+ * A response to a request that indicates an error occurred.
+ *
+ * @category JSON-RPC
+ */
+export interface JSONRPCErrorResponse {
+  jsonrpc: typeof JSONRPC_VERSION;
+  id?: RequestId;
+  error: Error;
+}
+
+/**
+ * A response to a request, containing either the result or error.
+ *
+ * @category JSON-RPC
+ */
+export type JSONRPCResponse = JSONRPCResultResponse | JSONRPCErrorResponse;
+
 // Standard JSON-RPC error codes
 export const PARSE_ERROR = -32700;
 export const INVALID_REQUEST = -32600;
@@ -154,28 +237,113 @@ export const METHOD_NOT_FOUND = -32601;
 export const INVALID_PARAMS = -32602;
 export const INTERNAL_ERROR = -32603;
 
-// Implementation-specific JSON-RPC error codes [-32000, -32099]
-/** @internal */
-export const URL_ELICITATION_REQUIRED = -32042;
+/**
+ * A JSON-RPC error indicating that invalid JSON was received by the server. This error is returned when the server cannot parse the JSON text of a message.
+ *
+ * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+ *
+ * @example Invalid JSON
+ * {@includeCode ./examples/ParseError/invalid-json.json}
+ *
+ * @category Errors
+ */
+export interface ParseError extends Error {
+  code: typeof PARSE_ERROR;
+}
 
 /**
- * A response to a request that indicates an error occurred.
+ * A JSON-RPC error indicating that the request is not a valid request object. This error is returned when the message structure does not conform to the JSON-RPC 2.0 specification requirements for a request (e.g., missing required fields like `jsonrpc` or `method`, or using invalid types for these fields).
  *
- * @category JSON-RPC
+ * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+ *
+ * @category Errors
  */
-export interface JSONRPCError {
-  jsonrpc: typeof JSONRPC_VERSION;
-  id: RequestId;
-  error: Error;
+export interface InvalidRequestError extends Error {
+  code: typeof INVALID_REQUEST;
+}
+
+/**
+ * A JSON-RPC error indicating that the requested method does not exist or is not available.
+ *
+ * In MCP, this error is returned when a request is made for a method that requires a capability that has not been declared. This can occur in either direction:
+ *
+ * - A server returning this error when the client requests a capability it doesn't support (e.g., requesting completions when the `completions` capability was not advertised)
+ * - A client returning this error when the server requests a capability it doesn't support (e.g., requesting roots when the client did not declare the `roots` capability)
+ *
+ * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+ *
+ * @example Roots not supported
+ * {@includeCode ./examples/MethodNotFoundError/roots-not-supported.json}
+ *
+ * @category Errors
+ */
+export interface MethodNotFoundError extends Error {
+  code: typeof METHOD_NOT_FOUND;
+}
+
+/**
+ * A JSON-RPC error indicating that the method parameters are invalid or malformed.
+ *
+ * In MCP, this error is returned in various contexts when request parameters fail validation:
+ *
+ * - **Tools**: Unknown tool name or invalid tool arguments
+ * - **Prompts**: Unknown prompt name or missing required arguments
+ * - **Pagination**: Invalid or expired cursor values
+ * - **Logging**: Invalid log level
+ * - **Tasks**: Invalid or nonexistent task ID, invalid cursor, or attempting to cancel a task already in a terminal status
+ * - **Elicitation**: Server requests an elicitation mode not declared in client capabilities
+ * - **Sampling**: Missing tool result or tool results mixed with other content
+ *
+ * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+ *
+ * @example Unknown tool
+ * {@includeCode ./examples/InvalidParamsError/unknown-tool.json}
+ *
+ * @example Invalid tool arguments
+ * {@includeCode ./examples/InvalidParamsError/invalid-tool-arguments.json}
+ *
+ * @example Unknown prompt
+ * {@includeCode ./examples/InvalidParamsError/unknown-prompt.json}
+ *
+ * @example Invalid cursor
+ * {@includeCode ./examples/InvalidParamsError/invalid-cursor.json}
+ *
+ * @category Errors
+ */
+export interface InvalidParamsError extends Error {
+  code: typeof INVALID_PARAMS;
+}
+
+/**
+ * A JSON-RPC error indicating that an internal error occurred on the receiver. This error is returned when the receiver encounters an unexpected condition that prevents it from fulfilling the request.
+ *
+ * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+ *
+ * @example Unexpected error
+ * {@includeCode ./examples/InternalError/unexpected-error.json}
+ *
+ * @category Errors
+ */
+export interface InternalError extends Error {
+  code: typeof INTERNAL_ERROR;
 }
 
+// Implementation-specific JSON-RPC error codes [-32000, -32099]
+/** @internal */
+export const URL_ELICITATION_REQUIRED = -32042;
+
 /**
  * An error response that indicates that the server requires the client to provide additional information via an elicitation request.
  *
+ * @example Authorization required
+ * {@includeCode ./examples/URLElicitationRequiredError/authorization-required.json}
+ *
  * @internal
  */
-export interface URLElicitationRequiredError
-  extends Omit<JSONRPCError, "error"> {
+export interface URLElicitationRequiredError extends Omit<
+  JSONRPCErrorResponse,
+  "error"
+> {
   error: Error & {
     code: typeof URL_ELICITATION_REQUIRED;
     data: {
@@ -187,7 +355,7 @@ export interface URLElicitationRequiredError
 
 /* Empty result */
 /**
- * A response that indicates success but carries no data.
+ * A result that indicates success but carries no data.
  *
  * @category Common Types
  */
@@ -197,6 +365,9 @@ export type EmptyResult = Result;
 /**
  * Parameters for a `notifications/cancelled` notification.
  *
+ * @example User-requested cancellation
+ * {@includeCode ./examples/CancelledNotificationParams/user-requested-cancellation.json}
+ *
  * @category `notifications/cancelled`
  */
 export interface CancelledNotificationParams extends NotificationParams {
@@ -204,8 +375,10 @@ export interface CancelledNotificationParams extends NotificationParams {
    * The ID of the request to cancel.
    *
    * This MUST correspond to the ID of a request previously issued in the same direction.
+   * This MUST be provided for cancelling non-task requests.
+   * This MUST NOT be used for cancelling tasks (use the {@link CancelTaskRequest | tasks/cancel} request instead).
    */
-  requestId: RequestId;
+  requestId?: RequestId;
 
   /**
    * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
@@ -222,6 +395,11 @@ export interface CancelledNotificationParams extends NotificationParams {
  *
  * A client MUST NOT attempt to cancel its `initialize` request.
  *
+ * For task cancellation, use the {@link CancelTaskRequest | tasks/cancel} request instead of this notification.
+ *
+ * @example User-requested cancellation
+ * {@includeCode ./examples/CancelledNotification/user-requested-cancellation.json}
+ *
  * @category `notifications/cancelled`
  */
 export interface CancelledNotification extends JSONRPCNotification {
@@ -233,6 +411,9 @@ export interface CancelledNotification extends JSONRPCNotification {
 /**
  * Parameters for an `initialize` request.
  *
+ * @example Full client capabilities
+ * {@includeCode ./examples/InitializeRequestParams/full-client-capabilities.json}
+ *
  * @category `initialize`
  */
 export interface InitializeRequestParams extends RequestParams {
@@ -247,6 +428,9 @@ export interface InitializeRequestParams extends RequestParams {
 /**
  * This request is sent from the client to the server when it first connects, asking it to begin initialization.
  *
+ * @example Initialize request
+ * {@includeCode ./examples/InitializeRequest/initialize-request.json}
+ *
  * @category `initialize`
  */
 export interface InitializeRequest extends JSONRPCRequest {
@@ -255,7 +439,10 @@ export interface InitializeRequest extends JSONRPCRequest {
 }
 
 /**
- * After receiving an initialize request from the client, the server sends this response.
+ * The result returned by the server for an {@link InitializeRequest | initialize} request.
+ *
+ * @example Full server capabilities
+ * {@includeCode ./examples/InitializeResult/full-server-capabilities.json}
  *
  * @category `initialize`
  */
@@ -270,14 +457,34 @@ export interface InitializeResult extends Result {
   /**
    * Instructions describing how to use the server and its features.
    *
-   * 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 should focus on information that helps the model use the server effectively (e.g., cross-tool relationships, workflow patterns, constraints), but should not duplicate information already in tool descriptions.
+   *
+   * Clients MAY add this information to the system prompt.
+   *
+   * @example Server with workflow instructions
+   * {@includeCode ./examples/InitializeResult/with-instructions.json}
    */
   instructions?: string;
 }
 
+/**
+ * A successful response from the server for a {@link InitializeRequest | initialize} request.
+ *
+ * @example Initialize result response
+ * {@includeCode ./examples/InitializeResultResponse/initialize-result-response.json}
+ *
+ * @category `initialize`
+ */
+export interface InitializeResultResponse extends JSONRPCResultResponse {
+  result: InitializeResult;
+}
+
 /**
  * This notification is sent from the client to the server after initialization has finished.
  *
+ * @example Initialized notification
+ * {@includeCode ./examples/InitializedNotification/initialized-notification.json}
+ *
  * @category `notifications/initialized`
  */
 export interface InitializedNotification extends JSONRPCNotification {
@@ -294,9 +501,15 @@ export interface ClientCapabilities {
   /**
    * Experimental, non-standard capabilities that the client supports.
    */
-  experimental?: { [key: string]: object };
+  experimental?: { [key: string]: JSONObject };
   /**
    * Present if the client supports listing roots.
+   *
+   * @example Roots — minimum baseline support
+   * {@includeCode ./examples/ClientCapabilities/roots-minimum-baseline-support.json}
+   *
+   * @example Roots — list changed notifications
+   * {@includeCode ./examples/ClientCapabilities/roots-list-changed-notifications.json}
    */
   roots?: {
     /**
@@ -306,22 +519,86 @@ export interface ClientCapabilities {
   };
   /**
    * Present if the client supports sampling from an LLM.
+   *
+   * @example Sampling — minimum baseline support
+   * {@includeCode ./examples/ClientCapabilities/sampling-minimum-baseline-support.json}
+   *
+   * @example Sampling — tool use support
+   * {@includeCode ./examples/ClientCapabilities/sampling-tool-use-support.json}
+   *
+   * @example Sampling — context inclusion support (soft-deprecated)
+   * {@includeCode ./examples/ClientCapabilities/sampling-context-inclusion-support-soft-deprecated.json}
    */
   sampling?: {
     /**
-     * Whether the client supports context inclusion via includeContext parameter.
+     * Whether the client supports context inclusion via `includeContext` parameter.
      * If not declared, servers SHOULD only use `includeContext: "none"` (or omit it).
      */
-    context?: object;
+    context?: JSONObject;
     /**
-     * Whether the client supports tool use via tools and toolChoice parameters.
+     * Whether the client supports tool use via `tools` and `toolChoice` parameters.
      */
-    tools?: object;
+    tools?: JSONObject;
   };
   /**
    * Present if the client supports elicitation from the server.
+   *
+   * @example Elicitation — form and URL mode support
+   * {@includeCode ./examples/ClientCapabilities/elicitation-form-and-url-mode-support.json}
+   *
+   * @example Elicitation — form mode only (implicit)
+   * {@includeCode ./examples/ClientCapabilities/elicitation-form-only-implicit.json}
+   */
+  elicitation?: {
+    form?: JSONObject;
+    url?: JSONObject;
+  };
+
+  /**
+   * Present if the client supports task-augmented requests.
    */
-  elicitation?: { form?: object; url?: object };
+  tasks?: {
+    /**
+     * Whether this client supports {@link ListTasksRequest | tasks/list}.
+     */
+    list?: JSONObject;
+    /**
+     * Whether this client supports {@link CancelTaskRequest | tasks/cancel}.
+     */
+    cancel?: JSONObject;
+    /**
+     * Specifies which request types can be augmented with tasks.
+     */
+    requests?: {
+      /**
+       * Task support for sampling-related requests.
+       */
+      sampling?: {
+        /**
+         * Whether the client supports task-augmented `sampling/createMessage` requests.
+         */
+        createMessage?: JSONObject;
+      };
+      /**
+       * Task support for elicitation-related requests.
+       */
+      elicitation?: {
+        /**
+         * Whether the client supports task-augmented {@link ElicitRequest | elicitation/create} requests.
+         */
+        create?: JSONObject;
+      };
+    };
+  };
+  /**
+   * Optional MCP extensions that the client supports. Keys are extension identifiers
+   * (e.g., "io.modelcontextprotocol/oauth-client-credentials"), and values are
+   * per-extension settings objects. An empty object indicates support with no settings.
+   *
+   * @example Extensions — UI extension with MIME type support
+   * {@includeCode ./examples/ClientCapabilities/extensions-ui-mime-types.json}
+   */
+  extensions?: { [key: string]: JSONObject };
 }
 
 /**
@@ -333,17 +610,29 @@ export interface ServerCapabilities {
   /**
    * Experimental, non-standard capabilities that the server supports.
    */
-  experimental?: { [key: string]: object };
+  experimental?: { [key: string]: JSONObject };
   /**
    * Present if the server supports sending log messages to the client.
+   *
+   * @example Logging — minimum baseline support
+   * {@includeCode ./examples/ServerCapabilities/logging-minimum-baseline-support.json}
    */
-  logging?: object;
+  logging?: JSONObject;
   /**
    * Present if the server supports argument autocompletion suggestions.
+   *
+   * @example Completions — minimum baseline support
+   * {@includeCode ./examples/ServerCapabilities/completions-minimum-baseline-support.json}
    */
-  completions?: object;
+  completions?: JSONObject;
   /**
    * Present if the server offers any prompt templates.
+   *
+   * @example Prompts — minimum baseline support
+   * {@includeCode ./examples/ServerCapabilities/prompts-minimum-baseline-support.json}
+   *
+   * @example Prompts — list changed notifications
+   * {@includeCode ./examples/ServerCapabilities/prompts-list-changed-notifications.json}
    */
   prompts?: {
     /**
@@ -353,6 +642,18 @@ export interface ServerCapabilities {
   };
   /**
    * Present if the server offers any resources to read.
+   *
+   * @example Resources — minimum baseline support
+   * {@includeCode ./examples/ServerCapabilities/resources-minimum-baseline-support.json}
+   *
+   * @example Resources — subscription to individual resource updates (only)
+   * {@includeCode ./examples/ServerCapabilities/resources-subscription-to-individual-resource-updates-only.json}
+   *
+   * @example Resources — list changed notifications (only)
+   * {@includeCode ./examples/ServerCapabilities/resources-list-changed-notifications-only.json}
+   *
+   * @example Resources — all notifications
+   * {@includeCode ./examples/ServerCapabilities/resources-all-notifications.json}
    */
   resources?: {
     /**
@@ -366,6 +667,12 @@ export interface ServerCapabilities {
   };
   /**
    * Present if the server offers any tools to call.
+   *
+   * @example Tools — minimum baseline support
+   * {@includeCode ./examples/ServerCapabilities/tools-minimum-baseline-support.json}
+   *
+   * @example Tools — list changed notifications
+   * {@includeCode ./examples/ServerCapabilities/tools-list-changed-notifications.json}
    */
   tools?: {
     /**
@@ -373,6 +680,42 @@ export interface ServerCapabilities {
      */
     listChanged?: boolean;
   };
+  /**
+   * Present if the server supports task-augmented requests.
+   */
+  tasks?: {
+    /**
+     * Whether this server supports {@link ListTasksRequest | tasks/list}.
+     */
+    list?: JSONObject;
+    /**
+     * Whether this server supports {@link CancelTaskRequest | tasks/cancel}.
+     */
+    cancel?: JSONObject;
+    /**
+     * Specifies which request types can be augmented with tasks.
+     */
+    requests?: {
+      /**
+       * Task support for tool-related requests.
+       */
+      tools?: {
+        /**
+         * Whether the server supports task-augmented {@link CallToolRequest | tools/call} requests.
+         */
+        call?: JSONObject;
+      };
+    };
+  };
+  /**
+   * Optional MCP extensions that the server supports. Keys are extension identifiers
+   * (e.g., "io.modelcontextprotocol/apps"), and values are per-extension settings
+   * objects. An empty object indicates support with no settings.
+   *
+   * @example Extensions — UI extension support
+   * {@includeCode ./examples/ServerCapabilities/extensions-ui.json}
+   */
+  extensions?: { [key: string]: JSONObject };
 }
 
 /**
@@ -385,7 +728,7 @@ export interface Icon {
    * A standard URI pointing to an icon resource. May be an HTTP/HTTPS URL or a
    * `data:` URI with Base64-encoded image data.
    *
-   * Consumers SHOULD takes steps to ensure URLs serving icons are from the
+   * Consumers SHOULD take steps to ensure URLs serving icons are from the
    * same domain as the client/server or a trusted domain.
    *
    * Consumers SHOULD take appropriate precautions when consuming SVGs as they can contain
@@ -410,8 +753,8 @@ export interface Icon {
   sizes?: string[];
 
   /**
-   * 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
+   * 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.
@@ -454,7 +797,7 @@ export interface BaseMetadata {
    * 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,
+   * If not provided, the name should be used for display (except for {@link Tool},
    * where `annotations.title` should be given precedence over using `name`,
    * if present).
    */
@@ -467,6 +810,9 @@ export interface BaseMetadata {
  * @category `initialize`
  */
 export interface Implementation extends BaseMetadata, Icons {
+  /**
+   * The version of this implementation.
+   */
   version: string;
 
   /**
@@ -490,6 +836,9 @@ export interface Implementation extends BaseMetadata, Icons {
 /**
  * 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.
  *
+ * @example Ping request
+ * {@includeCode ./examples/PingRequest/ping-request.json}
+ *
  * @category `ping`
  */
 export interface PingRequest extends JSONRPCRequest {
@@ -497,10 +846,25 @@ export interface PingRequest extends JSONRPCRequest {
   params?: RequestParams;
 }
 
+/**
+ * A successful response for a {@link PingRequest | ping} request.
+ *
+ * @example Ping result response
+ * {@includeCode ./examples/PingResultResponse/ping-result-response.json}
+ *
+ * @category `ping`
+ */
+export interface PingResultResponse extends JSONRPCResultResponse {
+  result: EmptyResult;
+}
+
 /* Progress notifications */
 
 /**
- * Parameters for a `notifications/progress` notification.
+ * Parameters for a {@link ProgressNotification | notifications/progress} notification.
+ *
+ * @example Progress message
+ * {@includeCode ./examples/ProgressNotificationParams/progress-message.json}
  *
  * @category `notifications/progress`
  */
@@ -530,6 +894,9 @@ export interface ProgressNotificationParams extends NotificationParams {
 /**
  * An out-of-band notification used to inform the receiver of a progress update for a long-running request.
  *
+ * @example Progress message
+ * {@includeCode ./examples/ProgressNotification/progress-message.json}
+ *
  * @category `notifications/progress`
  */
 export interface ProgressNotification extends JSONRPCNotification {
@@ -539,9 +906,12 @@ export interface ProgressNotification extends JSONRPCNotification {
 
 /* Pagination */
 /**
- * Common parameters for paginated requests.
+ * Common params for paginated requests.
  *
- * @internal
+ * @example List request with cursor
+ * {@includeCode ./examples/PaginatedRequestParams/list-with-cursor.json}
+ *
+ * @category Common Types
  */
 export interface PaginatedRequestParams extends RequestParams {
   /**
@@ -569,6 +939,9 @@ export interface PaginatedResult extends Result {
 /**
  * Sent from the client to request a list of resources the server has.
  *
+ * @example List resources request
+ * {@includeCode ./examples/ListResourcesRequest/list-resources-request.json}
+ *
  * @category `resources/list`
  */
 export interface ListResourcesRequest extends PaginatedRequest {
@@ -576,7 +949,10 @@ export interface ListResourcesRequest extends PaginatedRequest {
 }
 
 /**
- * The server's response to a resources/list request from the client.
+ * The result returned by the server for a {@link ListResourcesRequest | resources/list} request.
+ *
+ * @example Resources list with cursor
+ * {@includeCode ./examples/ListResourcesResult/resources-list-with-cursor.json}
  *
  * @category `resources/list`
  */
@@ -584,9 +960,24 @@ export interface ListResourcesResult extends PaginatedResult {
   resources: Resource[];
 }
 
+/**
+ * A successful response from the server for a {@link ListResourcesRequest | resources/list} request.
+ *
+ * @example List resources result response
+ * {@includeCode ./examples/ListResourcesResultResponse/list-resources-result-response.json}
+ *
+ * @category `resources/list`
+ */
+export interface ListResourcesResultResponse extends JSONRPCResultResponse {
+  result: ListResourcesResult;
+}
+
 /**
  * Sent from the client to request a list of resource templates the server has.
  *
+ * @example List resource templates request
+ * {@includeCode ./examples/ListResourceTemplatesRequest/list-resource-templates-request.json}
+ *
  * @category `resources/templates/list`
  */
 export interface ListResourceTemplatesRequest extends PaginatedRequest {
@@ -594,7 +985,10 @@ export interface ListResourceTemplatesRequest extends PaginatedRequest {
 }
 
 /**
- * The server's response to a resources/templates/list request from the client.
+ * The result returned by the server for a {@link ListResourceTemplatesRequest | resources/templates/list} request.
+ *
+ * @example Resource templates list
+ * {@includeCode ./examples/ListResourceTemplatesResult/resource-templates-list.json}
  *
  * @category `resources/templates/list`
  */
@@ -603,7 +997,19 @@ export interface ListResourceTemplatesResult extends PaginatedResult {
 }
 
 /**
- * Common parameters when working with resources.
+ * A successful response from the server for a {@link ListResourceTemplatesRequest | resources/templates/list} request.
+ *
+ * @example List resource templates result response
+ * {@includeCode ./examples/ListResourceTemplatesResultResponse/list-resource-templates-result-response.json}
+ *
+ * @category `resources/templates/list`
+ */
+export interface ListResourceTemplatesResultResponse extends JSONRPCResultResponse {
+  result: ListResourceTemplatesResult;
+}
+
+/**
+ * Common params for resource-related requests.
  *
  * @internal
  */
@@ -622,11 +1028,14 @@ export interface ResourceRequestParams extends RequestParams {
  * @category `resources/read`
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export interface ReadResourceRequestParams extends ResourceRequestParams { }
+export interface ReadResourceRequestParams extends ResourceRequestParams {}
 
 /**
  * Sent from the client to the server, to read a specific resource URI.
  *
+ * @example Read resource request
+ * {@includeCode ./examples/ReadResourceRequest/read-resource-request.json}
+ *
  * @category `resources/read`
  */
 export interface ReadResourceRequest extends JSONRPCRequest {
@@ -635,7 +1044,10 @@ export interface ReadResourceRequest extends JSONRPCRequest {
 }
 
 /**
- * The server's response to a resources/read request from the client.
+ * The result returned by the server for a {@link ReadResourceRequest | resources/read} request.
+ *
+ * @example File resource contents
+ * {@includeCode ./examples/ReadResourceResult/file-resource-contents.json}
  *
  * @category `resources/read`
  */
@@ -643,9 +1055,24 @@ export interface ReadResourceResult extends Result {
   contents: (TextResourceContents | BlobResourceContents)[];
 }
 
+/**
+ * A successful response from the server for a {@link ReadResourceRequest | resources/read} request.
+ *
+ * @example Read resource result response
+ * {@includeCode ./examples/ReadResourceResultResponse/read-resource-result-response.json}
+ *
+ * @category `resources/read`
+ */
+export interface ReadResourceResultResponse extends JSONRPCResultResponse {
+  result: ReadResourceResult;
+}
+
 /**
  * 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.
  *
+ * @example Resources list changed
+ * {@includeCode ./examples/ResourceListChangedNotification/resources-list-changed.json}
+ *
  * @category `notifications/resources/list_changed`
  */
 export interface ResourceListChangedNotification extends JSONRPCNotification {
@@ -656,13 +1083,19 @@ export interface ResourceListChangedNotification extends JSONRPCNotification {
 /**
  * Parameters for a `resources/subscribe` request.
  *
+ * @example Subscribe to file resource
+ * {@includeCode ./examples/SubscribeRequestParams/subscribe-to-file-resource.json}
+ *
  * @category `resources/subscribe`
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export interface SubscribeRequestParams extends ResourceRequestParams { }
+export interface SubscribeRequestParams extends ResourceRequestParams {}
 
 /**
- * Sent from the client to request resources/updated notifications from the server whenever a particular resource changes.
+ * Sent from the client to request {@link ResourceUpdatedNotification | resources/updated} notifications from the server whenever a particular resource changes.
+ *
+ * @example Subscribe request
+ * {@includeCode ./examples/SubscribeRequest/subscribe-request.json}
  *
  * @category `resources/subscribe`
  */
@@ -671,16 +1104,31 @@ export interface SubscribeRequest extends JSONRPCRequest {
   params: SubscribeRequestParams;
 }
 
+/**
+ * A successful response from the server for a {@link SubscribeRequest | resources/subscribe} request.
+ *
+ * @example Subscribe result response
+ * {@includeCode ./examples/SubscribeResultResponse/subscribe-result-response.json}
+ *
+ * @category `resources/subscribe`
+ */
+export interface SubscribeResultResponse extends JSONRPCResultResponse {
+  result: EmptyResult;
+}
+
 /**
  * Parameters for a `resources/unsubscribe` request.
  *
  * @category `resources/unsubscribe`
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export interface UnsubscribeRequestParams extends ResourceRequestParams { }
+export interface UnsubscribeRequestParams extends ResourceRequestParams {}
 
 /**
- * Sent from the client to request cancellation of resources/updated notifications from the server. This should follow a previous resources/subscribe request.
+ * Sent from the client to request cancellation of {@link ResourceUpdatedNotification | resources/updated} notifications from the server. This should follow a previous {@link SubscribeRequest | resources/subscribe} request.
+ *
+ * @example Unsubscribe request
+ * {@includeCode ./examples/UnsubscribeRequest/unsubscribe-request.json}
  *
  * @category `resources/unsubscribe`
  */
@@ -689,9 +1137,24 @@ export interface UnsubscribeRequest extends JSONRPCRequest {
   params: UnsubscribeRequestParams;
 }
 
+/**
+ * A successful response from the server for a {@link UnsubscribeRequest | resources/unsubscribe} request.
+ *
+ * @example Unsubscribe result response
+ * {@includeCode ./examples/UnsubscribeResultResponse/unsubscribe-result-response.json}
+ *
+ * @category `resources/unsubscribe`
+ */
+export interface UnsubscribeResultResponse extends JSONRPCResultResponse {
+  result: EmptyResult;
+}
+
 /**
  * Parameters for a `notifications/resources/updated` notification.
  *
+ * @example File resource updated
+ * {@includeCode ./examples/ResourceUpdatedNotificationParams/file-resource-updated.json}
+ *
  * @category `notifications/resources/updated`
  */
 export interface ResourceUpdatedNotificationParams extends NotificationParams {
@@ -704,7 +1167,10 @@ export interface ResourceUpdatedNotificationParams extends NotificationParams {
 }
 
 /**
- * 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.
+ * 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 {@link SubscribeRequest | resources/subscribe} request.
+ *
+ * @example File resource updated notification
+ * {@includeCode ./examples/ResourceUpdatedNotification/file-resource-updated-notification.json}
  *
  * @category `notifications/resources/updated`
  */
@@ -716,6 +1182,9 @@ export interface ResourceUpdatedNotification extends JSONRPCNotification {
 /**
  * A known resource that the server is capable of reading.
  *
+ * @example File resource with annotations
+ * {@includeCode ./examples/Resource/file-resource-with-annotations.json}
+ *
  * @category `resources/list`
  */
 export interface Resource extends BaseMetadata, Icons {
@@ -750,10 +1219,7 @@ export interface Resource extends BaseMetadata, Icons {
    */
   size?: number;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
@@ -786,10 +1252,7 @@ export interface ResourceTemplate extends BaseMetadata, Icons {
    */
   annotations?: Annotations;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
@@ -809,13 +1272,13 @@ export interface ResourceContents {
    */
   mimeType?: string;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
+ * @example Text file contents
+ * {@includeCode ./examples/TextResourceContents/text-file-contents.json}
+ *
  * @category Content
  */
 export interface TextResourceContents extends ResourceContents {
@@ -826,6 +1289,9 @@ export interface TextResourceContents extends ResourceContents {
 }
 
 /**
+ * @example Image file contents
+ * {@includeCode ./examples/BlobResourceContents/image-file-contents.json}
+ *
  * @category Content
  */
 export interface BlobResourceContents extends ResourceContents {
@@ -841,6 +1307,9 @@ export interface BlobResourceContents extends ResourceContents {
 /**
  * Sent from the client to request a list of prompts and prompt templates the server has.
  *
+ * @example List prompts request
+ * {@includeCode ./examples/ListPromptsRequest/list-prompts-request.json}
+ *
  * @category `prompts/list`
  */
 export interface ListPromptsRequest extends PaginatedRequest {
@@ -848,7 +1317,10 @@ export interface ListPromptsRequest extends PaginatedRequest {
 }
 
 /**
- * The server's response to a prompts/list request from the client.
+ * The result returned by the server for a {@link ListPromptsRequest | prompts/list} request.
+ *
+ * @example Prompts list with cursor
+ * {@includeCode ./examples/ListPromptsResult/prompts-list-with-cursor.json}
  *
  * @category `prompts/list`
  */
@@ -856,9 +1328,24 @@ export interface ListPromptsResult extends PaginatedResult {
   prompts: Prompt[];
 }
 
+/**
+ * A successful response from the server for a {@link ListPromptsRequest | prompts/list} request.
+ *
+ * @example List prompts result response
+ * {@includeCode ./examples/ListPromptsResultResponse/list-prompts-result-response.json}
+ *
+ * @category `prompts/list`
+ */
+export interface ListPromptsResultResponse extends JSONRPCResultResponse {
+  result: ListPromptsResult;
+}
+
 /**
  * Parameters for a `prompts/get` request.
  *
+ * @example Get code review prompt
+ * {@includeCode ./examples/GetPromptRequestParams/get-code-review-prompt.json}
+ *
  * @category `prompts/get`
  */
 export interface GetPromptRequestParams extends RequestParams {
@@ -875,6 +1362,9 @@ export interface GetPromptRequestParams extends RequestParams {
 /**
  * Used by the client to get a prompt provided by the server.
  *
+ * @example Get prompt request
+ * {@includeCode ./examples/GetPromptRequest/get-prompt-request.json}
+ *
  * @category `prompts/get`
  */
 export interface GetPromptRequest extends JSONRPCRequest {
@@ -883,7 +1373,10 @@ export interface GetPromptRequest extends JSONRPCRequest {
 }
 
 /**
- * The server's response to a prompts/get request from the client.
+ * The result returned by the server for a {@link GetPromptRequest | prompts/get} request.
+ *
+ * @example Code review prompt
+ * {@includeCode ./examples/GetPromptResult/code-review-prompt.json}
  *
  * @category `prompts/get`
  */
@@ -895,6 +1388,18 @@ export interface GetPromptResult extends Result {
   messages: PromptMessage[];
 }
 
+/**
+ * A successful response from the server for a {@link GetPromptRequest | prompts/get} request.
+ *
+ * @example Get prompt result response
+ * {@includeCode ./examples/GetPromptResultResponse/get-prompt-result-response.json}
+ *
+ * @category `prompts/get`
+ */
+export interface GetPromptResultResponse extends JSONRPCResultResponse {
+  result: GetPromptResult;
+}
+
 /**
  * A prompt or prompt template that the server offers.
  *
@@ -911,10 +1416,7 @@ export interface Prompt extends BaseMetadata, Icons {
    */
   arguments?: PromptArgument[];
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
@@ -943,7 +1445,7 @@ export type Role = "user" | "assistant";
 /**
  * Describes a message returned as part of a prompt.
  *
- * This is similar to `SamplingMessage`, but also supports the embedding of
+ * This is similar to {@link SamplingMessage}, but also supports the embedding of
  * resources from the MCP server.
  *
  * @category `prompts/get`
@@ -956,7 +1458,10 @@ export interface PromptMessage {
 /**
  * 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.
+ * Note: resource links returned by tools are not guaranteed to appear in the results of {@link ListResourcesRequest | resources/list} requests.
+ *
+ * @example File resource link
+ * {@includeCode ./examples/ResourceLink/file-resource-link.json}
  *
  * @category Content
  */
@@ -970,6 +1475,9 @@ export interface ResourceLink extends Resource {
  * It is up to the client how best to render embedded resources for the benefit
  * of the LLM and/or the user.
  *
+ * @example Embedded file resource with annotations
+ * {@includeCode ./examples/EmbeddedResource/embedded-file-resource-with-annotations.json}
+ *
  * @category Content
  */
 export interface EmbeddedResource {
@@ -981,14 +1489,14 @@ export interface EmbeddedResource {
    */
   annotations?: Annotations;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 /**
  * 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.
  *
+ * @example Prompts list changed
+ * {@includeCode ./examples/PromptListChangedNotification/prompts-list-changed.json}
+ *
  * @category `notifications/prompts/list_changed`
  */
 export interface PromptListChangedNotification extends JSONRPCNotification {
@@ -1000,6 +1508,9 @@ export interface PromptListChangedNotification extends JSONRPCNotification {
 /**
  * Sent from the client to request a list of tools the server has.
  *
+ * @example List tools request
+ * {@includeCode ./examples/ListToolsRequest/list-tools-request.json}
+ *
  * @category `tools/list`
  */
 export interface ListToolsRequest extends PaginatedRequest {
@@ -1007,7 +1518,10 @@ export interface ListToolsRequest extends PaginatedRequest {
 }
 
 /**
- * The server's response to a tools/list request from the client.
+ * The result returned by the server for a {@link ListToolsRequest | tools/list} request.
+ *
+ * @example Tools list with cursor
+ * {@includeCode ./examples/ListToolsResult/tools-list-with-cursor.json}
  *
  * @category `tools/list`
  */
@@ -1016,7 +1530,28 @@ export interface ListToolsResult extends PaginatedResult {
 }
 
 /**
- * The server's response to a tool call.
+ * A successful response from the server for a {@link ListToolsRequest | tools/list} request.
+ *
+ * @example List tools result response
+ * {@includeCode ./examples/ListToolsResultResponse/list-tools-result-response.json}
+ *
+ * @category `tools/list`
+ */
+export interface ListToolsResultResponse extends JSONRPCResultResponse {
+  result: ListToolsResult;
+}
+
+/**
+ * The result returned by the server for a {@link CallToolRequest | tools/call} request.
+ *
+ * @example Result with unstructured text
+ * {@includeCode ./examples/CallToolResult/result-with-unstructured-text.json}
+ *
+ * @example Result with structured content
+ * {@includeCode ./examples/CallToolResult/result-with-structured-content.json}
+ *
+ * @example Invalid tool input error
+ * {@includeCode ./examples/CallToolResult/invalid-tool-input-error.json}
  *
  * @category `tools/call`
  */
@@ -1048,12 +1583,30 @@ export interface CallToolResult extends Result {
   isError?: boolean;
 }
 
+/**
+ * A successful response from the server for a {@link CallToolRequest | tools/call} request.
+ *
+ * @example Call tool result response
+ * {@includeCode ./examples/CallToolResultResponse/call-tool-result-response.json}
+ *
+ * @category `tools/call`
+ */
+export interface CallToolResultResponse extends JSONRPCResultResponse {
+  result: CallToolResult;
+}
+
 /**
  * Parameters for a `tools/call` request.
  *
+ * @example `get_weather` tool call params
+ * {@includeCode ./examples/CallToolRequestParams/get-weather-tool-call-params.json}
+ *
+ * @example Tool call params with progress token
+ * {@includeCode ./examples/CallToolRequestParams/tool-call-params-with-progress-token.json}
+ *
  * @category `tools/call`
  */
-export interface CallToolRequestParams extends RequestParams {
+export interface CallToolRequestParams extends TaskAugmentedRequestParams {
   /**
    * The name of the tool.
    */
@@ -1067,6 +1620,9 @@ export interface CallToolRequestParams extends RequestParams {
 /**
  * Used by the client to invoke a tool provided by the server.
  *
+ * @example Call tool request
+ * {@includeCode ./examples/CallToolRequest/call-tool-request.json}
+ *
  * @category `tools/call`
  */
 export interface CallToolRequest extends JSONRPCRequest {
@@ -1077,6 +1633,9 @@ export interface CallToolRequest extends JSONRPCRequest {
 /**
  * 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.
  *
+ * @example Tools list changed
+ * {@includeCode ./examples/ToolListChangedNotification/tools-list-changed.json}
+ *
  * @category `notifications/tools/list_changed`
  */
 export interface ToolListChangedNotification extends JSONRPCNotification {
@@ -1085,13 +1644,13 @@ export interface ToolListChangedNotification extends JSONRPCNotification {
 }
 
 /**
- * Additional properties describing a Tool to clients.
+ * Additional properties describing a {@link Tool} to clients.
  *
- * NOTE: all properties in ToolAnnotations are **hints**.
+ * NOTE: all properties in `ToolAnnotations` are **hints**.
  * They are not guaranteed to provide a faithful description of
  * tool behavior (including descriptive properties like `title`).
  *
- * Clients should never make tool use decisions based on ToolAnnotations
+ * Clients should never make tool use decisions based on `ToolAnnotations`
  * received from untrusted servers.
  *
  * @category `tools/list`
@@ -1140,9 +1699,41 @@ export interface ToolAnnotations {
   openWorldHint?: boolean;
 }
 
+/**
+ * Execution-related properties for a tool.
+ *
+ * @category `tools/list`
+ */
+export interface ToolExecution {
+  /**
+   * Indicates whether this tool supports task-augmented execution.
+   * This allows clients to handle long-running operations through polling
+   * the task system.
+   *
+   * - `"forbidden"`: Tool does not support task-augmented execution (default when absent)
+   * - `"optional"`: Tool may support task-augmented execution
+   * - `"required"`: Tool requires task-augmented execution
+   *
+   * Default: `"forbidden"`
+   */
+  taskSupport?: "forbidden" | "optional" | "required";
+}
+
 /**
  * Definition for a tool the client can call.
  *
+ * @example With default 2020-12 input schema
+ * {@includeCode ./examples/Tool/with-default-2020-12-input-schema.json}
+ *
+ * @example With explicit draft-07 input schema
+ * {@includeCode ./examples/Tool/with-explicit-draft-07-input-schema.json}
+ *
+ * @example With no parameters
+ * {@includeCode ./examples/Tool/with-no-parameters.json}
+ *
+ * @example With output schema for structured content
+ * {@includeCode ./examples/Tool/with-output-schema-for-structured-content.json}
+ *
  * @category `tools/list`
  */
 export interface Tool extends BaseMetadata, Icons {
@@ -1157,32 +1748,285 @@ export interface Tool extends BaseMetadata, Icons {
    * A JSON Schema object defining the expected parameters for the tool.
    */
   inputSchema: {
+    $schema?: string;
     type: "object";
-    properties?: { [key: string]: object };
+    properties?: { [key: string]: JSONValue };
     required?: string[];
   };
 
+  /**
+   * Execution-related properties for this tool.
+   */
+  execution?: ToolExecution;
+
   /**
    * An optional JSON Schema object defining the structure of the tool's output returned in
-   * the structuredContent field of a CallToolResult.
+   * the structuredContent field of a {@link CallToolResult}.
+   *
+   * Defaults to JSON Schema 2020-12 when no explicit `$schema` is provided.
+   * Currently restricted to `type: "object"` at the root level.
    */
   outputSchema?: {
+    $schema?: string;
     type: "object";
-    properties?: { [key: string]: object };
+    properties?: { [key: string]: JSONValue };
     required?: string[];
   };
 
   /**
    * Optional additional tool information.
    *
-   * Display name precedence order is: title, annotations.title, then name.
+   * Display name precedence order is: `title`, `annotations.title`, then `name`.
    */
   annotations?: ToolAnnotations;
 
+  _meta?: MetaObject;
+}
+
+/* Tasks */
+
+/**
+ * The status of a task.
+ *
+ * @category `tasks`
+ */
+export type TaskStatus =
+  | "working" // The request is currently being processed
+  | "input_required" // The task is waiting for input (e.g., elicitation or sampling)
+  | "completed" // The request completed successfully and results are available
+  | "failed" // The associated request did not complete successfully. For tool calls specifically, this includes cases where the tool call result has `isError` set to true.
+  | "cancelled"; // The request was cancelled before completion
+
+/**
+ * Metadata for augmenting a request with task execution.
+ * Include this in the `task` field of the request parameters.
+ *
+ * @category `tasks`
+ */
+export interface TaskMetadata {
+  /**
+   * Requested duration in milliseconds to retain task from creation.
+   */
+  ttl?: number;
+}
+
+/**
+ * Metadata for associating messages with a task.
+ * Include this in the `_meta` field under the key `io.modelcontextprotocol/related-task`.
+ *
+ * @category `tasks`
+ */
+export interface RelatedTaskMetadata {
+  /**
+   * The task identifier this message is associated with.
+   */
+  taskId: string;
+}
+
+/**
+ * Data associated with a task.
+ *
+ * @category `tasks`
+ */
+export interface Task {
+  /**
+   * The task identifier.
+   */
+  taskId: string;
+
+  /**
+   * Current task state.
+   */
+  status: TaskStatus;
+
+  /**
+   * Optional human-readable message describing the current task state.
+   * This can provide context for any status, including:
+   * - Reasons for "cancelled" status
+   * - Summaries for "completed" status
+   * - Diagnostic information for "failed" status (e.g., error details, what went wrong)
+   */
+  statusMessage?: string;
+
+  /**
+   * ISO 8601 timestamp when the task was created.
+   */
+  createdAt: string;
+
+  /**
+   * ISO 8601 timestamp when the task was last updated.
+   */
+  lastUpdatedAt: string;
+
   /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
+   * Actual retention duration from creation in milliseconds, null for unlimited.
+   * @nullable
    */
-  _meta?: { [key: string]: unknown };
+  ttl: number | null;
+
+  /**
+   * Suggested polling interval in milliseconds.
+   */
+  pollInterval?: number;
+}
+
+/**
+ * The result returned for a task-augmented request.
+ *
+ * @category `tasks`
+ */
+export interface CreateTaskResult extends Result {
+  task: Task;
+}
+
+/**
+ * A successful response for a task-augmented request.
+ *
+ * @category `tasks`
+ */
+export interface CreateTaskResultResponse extends JSONRPCResultResponse {
+  result: CreateTaskResult;
+}
+
+/**
+ * A request to retrieve the state of a task.
+ *
+ * @category `tasks/get`
+ */
+export interface GetTaskRequest extends JSONRPCRequest {
+  method: "tasks/get";
+  params: {
+    /**
+     * The task identifier to query.
+     */
+    taskId: string;
+  };
+}
+
+/**
+ * The result returned for a {@link GetTaskRequest | tasks/get} request.
+ *
+ * @category `tasks/get`
+ */
+export type GetTaskResult = Result & Task;
+
+/**
+ * A successful response for a {@link GetTaskRequest | tasks/get} request.
+ *
+ * @category `tasks/get`
+ */
+export interface GetTaskResultResponse extends JSONRPCResultResponse {
+  result: GetTaskResult;
+}
+
+/**
+ * A request to retrieve the result of a completed task.
+ *
+ * @category `tasks/result`
+ */
+export interface GetTaskPayloadRequest extends JSONRPCRequest {
+  method: "tasks/result";
+  params: {
+    /**
+     * The task identifier to retrieve results for.
+     */
+    taskId: string;
+  };
+}
+
+/**
+ * The result returned for a {@link GetTaskPayloadRequest | tasks/result} request.
+ * The structure matches the result type of the original request.
+ * For example, a {@link CallToolRequest | tools/call} task would return the {@link CallToolResult} structure.
+ *
+ * @category `tasks/result`
+ */
+export interface GetTaskPayloadResult extends Result {
+  [key: string]: unknown;
+}
+
+/**
+ * A successful response for a {@link GetTaskPayloadRequest | tasks/result} request.
+ *
+ * @category `tasks/result`
+ */
+export interface GetTaskPayloadResultResponse extends JSONRPCResultResponse {
+  result: GetTaskPayloadResult;
+}
+
+/**
+ * A request to cancel a task.
+ *
+ * @category `tasks/cancel`
+ */
+export interface CancelTaskRequest extends JSONRPCRequest {
+  method: "tasks/cancel";
+  params: {
+    /**
+     * The task identifier to cancel.
+     */
+    taskId: string;
+  };
+}
+
+/**
+ * The result returned for a {@link CancelTaskRequest | tasks/cancel} request.
+ *
+ * @category `tasks/cancel`
+ */
+export type CancelTaskResult = Result & Task;
+
+/**
+ * A successful response for a {@link CancelTaskRequest | tasks/cancel} request.
+ *
+ * @category `tasks/cancel`
+ */
+export interface CancelTaskResultResponse extends JSONRPCResultResponse {
+  result: CancelTaskResult;
+}
+
+/**
+ * A request to retrieve a list of tasks.
+ *
+ * @category `tasks/list`
+ */
+export interface ListTasksRequest extends PaginatedRequest {
+  method: "tasks/list";
+}
+
+/**
+ * The result returned for a {@link ListTasksRequest | tasks/list} request.
+ *
+ * @category `tasks/list`
+ */
+export interface ListTasksResult extends PaginatedResult {
+  tasks: Task[];
+}
+
+/**
+ * A successful response for a {@link ListTasksRequest | tasks/list} request.
+ *
+ * @category `tasks/list`
+ */
+export interface ListTasksResultResponse extends JSONRPCResultResponse {
+  result: ListTasksResult;
+}
+
+/**
+ * Parameters for a `notifications/tasks/status` notification.
+ *
+ * @category `notifications/tasks/status`
+ */
+export type TaskStatusNotificationParams = NotificationParams & Task;
+
+/**
+ * An optional notification from the receiver to the requestor, informing them that a task's status has changed. Receivers are not required to send these notifications.
+ *
+ * @category `notifications/tasks/status`
+ */
+export interface TaskStatusNotification extends JSONRPCNotification {
+  method: "notifications/tasks/status";
+  params: TaskStatusNotificationParams;
 }
 
 /* Logging */
@@ -1190,11 +2034,14 @@ export interface Tool extends BaseMetadata, Icons {
 /**
  * Parameters for a `logging/setLevel` request.
  *
+ * @example Set log level to "info"
+ * {@includeCode ./examples/SetLevelRequestParams/set-log-level-to-info.json}
+ *
  * @category `logging/setLevel`
  */
 export interface SetLevelRequestParams extends RequestParams {
   /**
-   * 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/message.
+   * 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 {@link LoggingMessageNotification | notifications/message}.
    */
   level: LoggingLevel;
 }
@@ -1202,6 +2049,9 @@ export interface SetLevelRequestParams extends RequestParams {
 /**
  * A request from the client to the server, to enable or adjust logging.
  *
+ * @example Set logging level request
+ * {@includeCode ./examples/SetLevelRequest/set-logging-level-request.json}
+ *
  * @category `logging/setLevel`
  */
 export interface SetLevelRequest extends JSONRPCRequest {
@@ -1209,9 +2059,24 @@ export interface SetLevelRequest extends JSONRPCRequest {
   params: SetLevelRequestParams;
 }
 
+/**
+ * A successful response from the server for a {@link SetLevelRequest | logging/setLevel} request.
+ *
+ * @example Set logging level result response
+ * {@includeCode ./examples/SetLevelResultResponse/set-logging-level-result-response.json}
+ *
+ * @category `logging/setLevel`
+ */
+export interface SetLevelResultResponse extends JSONRPCResultResponse {
+  result: EmptyResult;
+}
+
 /**
  * Parameters for a `notifications/message` notification.
  *
+ * @example Log database connection failed
+ * {@includeCode ./examples/LoggingMessageNotificationParams/log-database-connection-failed.json}
+ *
  * @category `notifications/message`
  */
 export interface LoggingMessageNotificationParams extends NotificationParams {
@@ -1230,7 +2095,10 @@ export interface LoggingMessageNotificationParams extends NotificationParams {
 }
 
 /**
- * JSONRPCNotification 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.
+ * JSONRPCNotification 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.
+ *
+ * @example Log database connection failed
+ * {@includeCode ./examples/LoggingMessageNotification/log-database-connection-failed.json}
  *
  * @category `notifications/message`
  */
@@ -1261,9 +2129,18 @@ export type LoggingLevel =
 /**
  * Parameters for a `sampling/createMessage` request.
  *
+ * @example Basic request
+ * {@includeCode ./examples/CreateMessageRequestParams/basic-request.json}
+ *
+ * @example Request with tools
+ * {@includeCode ./examples/CreateMessageRequestParams/request-with-tools.json}
+ *
+ * @example Follow-up request with tool results
+ * {@includeCode ./examples/CreateMessageRequestParams/follow-up-with-tool-results.json}
+ *
  * @category `sampling/createMessage`
  */
-export interface CreateMessageRequestParams extends RequestParams {
+export interface CreateMessageRequestParams extends TaskAugmentedRequestParams {
   messages: SamplingMessage[];
   /**
    * The server's preferences for which model to select. The client MAY ignore these preferences.
@@ -1277,8 +2154,8 @@ export interface CreateMessageRequestParams extends RequestParams {
    * 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.
+   * Default is `"none"`. Values `"thisServer"` and `"allServers"` are soft-deprecated. Servers SHOULD only use these values if the client
+   * declares {@link ClientCapabilities.sampling.context}. These values may be removed in future spec releases.
    */
   includeContext?: "none" | "thisServer" | "allServers";
   /**
@@ -1295,15 +2172,15 @@ export interface CreateMessageRequestParams extends RequestParams {
   /**
    * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
    */
-  metadata?: object;
+  metadata?: JSONObject;
   /**
    * 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.
+   * The client MUST return an error if this field is provided but {@link ClientCapabilities.sampling.tools} is not declared.
    */
   tools?: Tool[];
   /**
    * Controls how the model uses tools.
-   * The client MUST return an error if this field is provided but ClientCapabilities.sampling.tools is not declared.
+   * The client MUST return an error if this field is provided but {@link ClientCapabilities.sampling.tools} is not declared.
    * Default is `{ mode: "auto" }`.
    */
   toolChoice?: ToolChoice;
@@ -1317,9 +2194,9 @@ export interface CreateMessageRequestParams extends RequestParams {
 export interface ToolChoice {
   /**
    * Controls the tool use ability of the model:
-   * - "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
+   * - `"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?: "auto" | "required" | "none";
 }
@@ -1327,6 +2204,9 @@ export interface ToolChoice {
 /**
  * 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.
  *
+ * @example Sampling request
+ * {@includeCode ./examples/CreateMessageRequest/sampling-request.json}
+ *
  * @category `sampling/createMessage`
  */
 export interface CreateMessageRequest extends JSONRPCRequest {
@@ -1335,7 +2215,18 @@ export interface CreateMessageRequest extends JSONRPCRequest {
 }
 
 /**
- * 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 result returned by the client for a {@link CreateMessageRequest | sampling/createMessage} request.
+ * 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.
+ *
+ * @example Text response
+ * {@includeCode ./examples/CreateMessageResult/text-response.json}
+ *
+ * @example Tool use response
+ * {@includeCode ./examples/CreateMessageResult/tool-use-response.json}
+ *
+ * @example Final response after tool use
+ * {@includeCode ./examples/CreateMessageResult/final-response.json}
  *
  * @category `sampling/createMessage`
  */
@@ -1349,29 +2240,48 @@ export interface CreateMessageResult extends Result, SamplingMessage {
    * 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
+   * - `"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?: "endTurn" | "stopSequence" | "maxTokens" | "toolUse" | string;
 }
 
+/**
+ * A successful response from the client for a {@link CreateMessageRequest | sampling/createMessage} request.
+ *
+ * @example Sampling result response
+ * {@includeCode ./examples/CreateMessageResultResponse/sampling-result-response.json}
+ *
+ * @category `sampling/createMessage`
+ */
+export interface CreateMessageResultResponse extends JSONRPCResultResponse {
+  result: CreateMessageResult;
+}
+
 /**
  * Describes a message issued to or received from an LLM API.
  *
+ * @example Single content block
+ * {@includeCode ./examples/SamplingMessage/single-content-block.json}
+ *
+ * @example Multiple content blocks
+ * {@includeCode ./examples/SamplingMessage/multiple-content-blocks.json}
+ *
  * @category `sampling/createMessage`
  */
 export interface SamplingMessage {
   role: Role;
   content: SamplingMessageContentBlock | SamplingMessageContentBlock[];
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
+
+/**
+ * @category `sampling/createMessage`
+ */
 export type SamplingMessageContentBlock =
   | TextContent
   | ImageContent
@@ -1429,6 +2339,9 @@ export type ContentBlock =
 /**
  * Text provided to or from an LLM.
  *
+ * @example Text content
+ * {@includeCode ./examples/TextContent/text-content.json}
+ *
  * @category Content
  */
 export interface TextContent {
@@ -1444,15 +2357,15 @@ export interface TextContent {
    */
   annotations?: Annotations;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
  * An image provided to or from an LLM.
  *
+ * @example `image/png` content with annotations
+ * {@includeCode ./examples/ImageContent/image-png-content-with-annotations.json}
+ *
  * @category Content
  */
 export interface ImageContent {
@@ -1475,15 +2388,15 @@ export interface ImageContent {
    */
   annotations?: Annotations;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
  * Audio provided to or from an LLM.
  *
+ * @example `audio/wav` content
+ * {@includeCode ./examples/AudioContent/audio-wav-content.json}
+ *
  * @category Content
  */
 export interface AudioContent {
@@ -1506,15 +2419,15 @@ export interface AudioContent {
    */
   annotations?: Annotations;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
  * A request from the assistant to call a tool.
  *
+ * @example `get_weather` tool use
+ * {@includeCode ./examples/ToolUseContent/get-weather-tool-use.json}
+ *
  * @category `sampling/createMessage`
  */
 export interface ToolUseContent {
@@ -1540,15 +2453,16 @@ export interface ToolUseContent {
   /**
    * Optional metadata about the tool use. Clients SHOULD preserve this field when
    * including tool uses in subsequent sampling requests to enable caching optimizations.
-   *
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
    */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
  * The result of a tool use, provided by the user back to the assistant.
  *
+ * @example `get_weather` tool result
+ * {@includeCode ./examples/ToolResultContent/get-weather-tool-result.json}
+ *
  * @category `sampling/createMessage`
  */
 export interface ToolResultContent {
@@ -1557,14 +2471,14 @@ export interface ToolResultContent {
   /**
    * The ID of the tool use this result corresponds to.
    *
-   * This MUST match the ID from a previous ToolUseContent.
+   * This MUST match the ID from a previous {@link ToolUseContent}.
    */
   toolUseId: string;
 
   /**
    * The unstructured result content of the tool use.
    *
-   * This has the same format as CallToolResult.content and can include text, images,
+   * This has the same format as {@link CallToolResult.content} and can include text, images,
    * audio, resource links, and embedded resources.
    */
   content: ContentBlock[];
@@ -1572,7 +2486,7 @@ export interface ToolResultContent {
   /**
    * An optional structured result object.
    *
-   * If the tool defined an outputSchema, this SHOULD conform to that schema.
+   * If the tool defined an {@link Tool.outputSchema}, this SHOULD conform to that schema.
    */
   structuredContent?: { [key: string]: unknown };
 
@@ -1587,10 +2501,8 @@ export interface ToolResultContent {
   /**
    * Optional metadata about the tool result. Clients SHOULD preserve this field when
    * including tool results in subsequent sampling requests to enable caching optimizations.
-   *
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
    */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
@@ -1606,6 +2518,9 @@ export interface ToolResultContent {
  * up to the client to decide how to interpret these preferences and how to
  * balance them against other considerations.
  *
+ * @example With hints and priorities
+ * {@includeCode ./examples/ModelPreferences/with-hints-and-priorities.json}
+ *
  * @category `sampling/createMessage`
  */
 export interface ModelPreferences {
@@ -1682,6 +2597,12 @@ export interface ModelHint {
  * Parameters for a `completion/complete` request.
  *
  * @category `completion/complete`
+ *
+ * @example Prompt argument completion
+ * {@includeCode ./examples/CompleteRequestParams/prompt-argument-completion.json}
+ *
+ * @example Prompt argument completion with context
+ * {@includeCode ./examples/CompleteRequestParams/prompt-argument-completion-with-context.json}
  */
 export interface CompleteRequestParams extends RequestParams {
   ref: PromptReference | ResourceTemplateReference;
@@ -1713,6 +2634,9 @@ export interface CompleteRequestParams extends RequestParams {
 /**
  * A request from the client to the server, to ask for completion options.
  *
+ * @example Completion request
+ * {@includeCode ./examples/CompleteRequest/completion-request.json}
+ *
  * @category `completion/complete`
  */
 export interface CompleteRequest extends JSONRPCRequest {
@@ -1721,14 +2645,22 @@ export interface CompleteRequest extends JSONRPCRequest {
 }
 
 /**
- * The server's response to a completion/complete request
+ * The result returned by the server for a {@link CompleteRequest | completion/complete} request.
  *
  * @category `completion/complete`
+ *
+ * @example Single completion value
+ * {@includeCode ./examples/CompleteResult/single-completion-value.json}
+ *
+ * @example Multiple completion values with more available
+ * {@includeCode ./examples/CompleteResult/multiple-completion-values-with-more-available.json}
  */
 export interface CompleteResult extends Result {
   completion: {
     /**
      * An array of completion values. Must not exceed 100 items.
+     *
+     * @maxItems 100
      */
     values: string[];
     /**
@@ -1742,6 +2674,18 @@ export interface CompleteResult extends Result {
   };
 }
 
+/**
+ * A successful response from the server for a {@link CompleteRequest | completion/complete} request.
+ *
+ * @example Completion result response
+ * {@includeCode ./examples/CompleteResultResponse/completion-result-response.json}
+ *
+ * @category `completion/complete`
+ */
+export interface CompleteResultResponse extends JSONRPCResultResponse {
+  result: CompleteResult;
+}
+
 /**
  * A reference to a resource or resource template definition.
  *
@@ -1776,6 +2720,9 @@ export interface PromptReference extends BaseMetadata {
  * This request is typically used when the server needs to understand the file system
  * structure or access specific locations that the client has permission to read from.
  *
+ * @example List roots request
+ * {@includeCode ./examples/ListRootsRequest/list-roots-request.json}
+ *
  * @category `roots/list`
  */
 export interface ListRootsRequest extends JSONRPCRequest {
@@ -1784,24 +2731,45 @@ export interface ListRootsRequest extends JSONRPCRequest {
 }
 
 /**
- * The client's response to a roots/list request from the server.
- * This result contains an array of Root objects, each representing a root directory
+ * The result returned by the client for a {@link ListRootsRequest | roots/list} request.
+ * This result contains an array of {@link Root} objects, each representing a root directory
  * or file that the server can operate on.
  *
+ * @example Single root directory
+ * {@includeCode ./examples/ListRootsResult/single-root-directory.json}
+ *
+ * @example Multiple root directories
+ * {@includeCode ./examples/ListRootsResult/multiple-root-directories.json}
+ *
  * @category `roots/list`
  */
 export interface ListRootsResult extends Result {
   roots: Root[];
 }
 
+/**
+ * A successful response from the client for a {@link ListRootsRequest | roots/list} request.
+ *
+ * @example List roots result response
+ * {@includeCode ./examples/ListRootsResultResponse/list-roots-result-response.json}
+ *
+ * @category `roots/list`
+ */
+export interface ListRootsResultResponse extends JSONRPCResultResponse {
+  result: ListRootsResult;
+}
+
 /**
  * Represents a root directory or file that the server can operate on.
  *
+ * @example Project directory root
+ * {@includeCode ./examples/Root/project-directory.json}
+ *
  * @category `roots/list`
  */
 export interface Root {
   /**
-   * The URI identifying the root. This *must* start with file:// for now.
+   * The URI identifying the root. This *must* start with `file://` for now.
    * This restriction may be relaxed in future versions of the protocol to allow
    * other URI schemes.
    *
@@ -1815,16 +2783,16 @@ export interface Root {
    */
   name?: string;
 
-  /**
-   * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-   */
-  _meta?: { [key: string]: unknown };
+  _meta?: MetaObject;
 }
 
 /**
  * A notification from the client to the server, informing it that the list of roots has changed.
  * This notification should be sent whenever the client adds, removes, or modifies any root.
- * The server should then request an updated list of roots using the ListRootsRequest.
+ * The server should then request an updated list of roots using the {@link ListRootsRequest}.
+ *
+ * @example Roots list changed
+ * {@includeCode ./examples/RootsListChangedNotification/roots-list-changed.json}
  *
  * @category `notifications/roots/list_changed`
  */
@@ -1836,9 +2804,15 @@ export interface RootsListChangedNotification extends JSONRPCNotification {
 /**
  * The parameters for a request to elicit non-sensitive information from the user via a form in the client.
  *
+ * @example Elicit single field
+ * {@includeCode ./examples/ElicitRequestFormParams/elicit-single-field.json}
+ *
+ * @example Elicit multiple fields
+ * {@includeCode ./examples/ElicitRequestFormParams/elicit-multiple-fields.json}
+ *
  * @category `elicitation/create`
  */
-export interface ElicitRequestFormParams extends RequestParams {
+export interface ElicitRequestFormParams extends TaskAugmentedRequestParams {
   /**
    * The elicitation mode.
    */
@@ -1866,9 +2840,12 @@ export interface ElicitRequestFormParams extends RequestParams {
 /**
  * The parameters for a request to elicit information from the user via a URL in the client.
  *
+ * @example Elicit sensitive data
+ * {@includeCode ./examples/ElicitRequestURLParams/elicit-sensitive-data.json}
+ *
  * @category `elicitation/create`
  */
-export interface ElicitRequestURLParams extends RequestParams {
+export interface ElicitRequestURLParams extends TaskAugmentedRequestParams {
   /**
    * The elicitation mode.
    */
@@ -1905,6 +2882,9 @@ export type ElicitRequestParams =
 /**
  * A request from the server to elicit additional information from the user via the client.
  *
+ * @example Elicitation request
+ * {@includeCode ./examples/ElicitRequest/elicitation-request.json}
+ *
  * @category `elicitation/create`
  */
 export interface ElicitRequest extends JSONRPCRequest {
@@ -1925,6 +2905,9 @@ export type PrimitiveSchemaDefinition =
   | EnumSchema;
 
 /**
+ * @example Email input schema
+ * {@includeCode ./examples/StringSchema/email-input-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface StringSchema {
@@ -1938,6 +2921,9 @@ export interface StringSchema {
 }
 
 /**
+ * @example Number input schema
+ * {@includeCode ./examples/NumberSchema/number-input-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface NumberSchema {
@@ -1950,6 +2936,9 @@ export interface NumberSchema {
 }
 
 /**
+ * @example Boolean input schema
+ * {@includeCode ./examples/BooleanSchema/boolean-input-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface BooleanSchema {
@@ -1962,6 +2951,9 @@ export interface BooleanSchema {
 /**
  * Schema for single-selection enumeration without display titles for options.
  *
+ * @example Color select schema
+ * {@includeCode ./examples/UntitledSingleSelectEnumSchema/color-select-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface UntitledSingleSelectEnumSchema {
@@ -1987,6 +2979,9 @@ export interface UntitledSingleSelectEnumSchema {
 /**
  * Schema for single-selection enumeration with display titles for each option.
  *
+ * @example Titled color select schema
+ * {@includeCode ./examples/TitledSingleSelectEnumSchema/titled-color-select-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface TitledSingleSelectEnumSchema {
@@ -2029,6 +3024,9 @@ export type SingleSelectEnumSchema =
 /**
  * Schema for multiple-selection enumeration without display titles for options.
  *
+ * @example Color multi-select schema
+ * {@includeCode ./examples/UntitledMultiSelectEnumSchema/color-multi-select-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface UntitledMultiSelectEnumSchema {
@@ -2068,6 +3066,9 @@ export interface UntitledMultiSelectEnumSchema {
 /**
  * Schema for multiple-selection enumeration with display titles for each option.
  *
+ * @example Titled color multi-select schema
+ * {@includeCode ./examples/TitledMultiSelectEnumSchema/titled-color-multi-select-schema.json}
+ *
  * @category `elicitation/create`
  */
 export interface TitledMultiSelectEnumSchema {
@@ -2121,7 +3122,7 @@ export type MultiSelectEnumSchema =
   | TitledMultiSelectEnumSchema;
 
 /**
- * Use TitledSingleSelectEnumSchema instead.
+ * Use {@link TitledSingleSelectEnumSchema} instead.
  * This interface will be removed in a future version.
  *
  * @category `elicitation/create`
@@ -2149,30 +3150,54 @@ export type EnumSchema =
   | LegacyTitledEnumSchema;
 
 /**
- * The client's response to an elicitation request.
+ * The result returned by the client for an {@link ElicitRequest | elicitation/create} request.
+ *
+ * @example Input single field
+ * {@includeCode ./examples/ElicitResult/input-single-field.json}
+ *
+ * @example Input multiple fields
+ * {@includeCode ./examples/ElicitResult/input-multiple-fields.json}
+ *
+ * @example Accept URL mode (no content)
+ * {@includeCode ./examples/ElicitResult/accept-url-mode-no-content.json}
  *
  * @category `elicitation/create`
  */
 export interface ElicitResult extends Result {
   /**
    * 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
+   * - `"accept"`: User submitted the form/confirmed the action
+   * - `"decline"`: User explicitly declined the action
+   * - `"cancel"`: User dismissed without making an explicit choice
    */
   action: "accept" | "decline" | "cancel";
 
   /**
-   * The submitted form data, only present when action is "accept" and mode was "form".
+   * The submitted form data, only present when action is `"accept"` and mode was `"form"`.
    * Contains values matching the requested schema.
    * Omitted for out-of-band mode responses.
    */
   content?: { [key: string]: string | number | boolean | string[] };
 }
 
+/**
+ * A successful response from the client for a {@link ElicitRequest | elicitation/create} request.
+ *
+ * @example Elicitation result response
+ * {@includeCode ./examples/ElicitResultResponse/elicitation-result-response.json}
+ *
+ * @category `elicitation/create`
+ */
+export interface ElicitResultResponse extends JSONRPCResultResponse {
+  result: ElicitResult;
+}
+
 /**
  * An optional notification from the server to the client, informing it of a completion of a out-of-band elicitation request.
  *
+ * @example Elicitation complete
+ * {@includeCode ./examples/ElicitationCompleteNotification/elicitation-complete.json}
+ *
  * @category `notifications/elicitation/complete`
  */
 export interface ElicitationCompleteNotification extends JSONRPCNotification {
@@ -2200,21 +3225,30 @@ export type ClientRequest =
   | SubscribeRequest
   | UnsubscribeRequest
   | CallToolRequest
-  | ListToolsRequest;
+  | ListToolsRequest
+  | GetTaskRequest
+  | GetTaskPayloadRequest
+  | ListTasksRequest
+  | CancelTaskRequest;
 
 /** @internal */
 export type ClientNotification =
   | CancelledNotification
   | ProgressNotification
   | InitializedNotification
-  | RootsListChangedNotification;
+  | RootsListChangedNotification
+  | TaskStatusNotification;
 
 /** @internal */
 export type ClientResult =
   | EmptyResult
   | CreateMessageResult
   | ListRootsResult
-  | ElicitResult;
+  | ElicitResult
+  | GetTaskResult
+  | GetTaskPayloadResult
+  | ListTasksResult
+  | CancelTaskResult;
 
 /* Server messages */
 /** @internal */
@@ -2222,7 +3256,11 @@ export type ServerRequest =
   | PingRequest
   | CreateMessageRequest
   | ListRootsRequest
-  | ElicitRequest;
+  | ElicitRequest
+  | GetTaskRequest
+  | GetTaskPayloadRequest
+  | ListTasksRequest
+  | CancelTaskRequest;
 
 /** @internal */
 export type ServerNotification =
@@ -2233,7 +3271,8 @@ export type ServerNotification =
   | ResourceListChangedNotification
   | ToolListChangedNotification
   | PromptListChangedNotification
-  | ElicitationCompleteNotification;
+  | ElicitationCompleteNotification
+  | TaskStatusNotification;
 
 /** @internal */
 export type ServerResult =
@@ -2246,4 +3285,9 @@ export type ServerResult =
   | ListResourcesResult
   | ReadResourceResult
   | CallToolResult
-  | ListToolsResult;
+  | CreateTaskResult
+  | ListToolsResult
+  | GetTaskResult
+  | GetTaskPayloadResult
+  | ListTasksResult
+  | CancelTaskResult;