diff --git a/src/spec.types.test.ts b/src/spec.types.test.ts
index 5aa497f4a..816dba4cd 100644
--- a/src/spec.types.test.ts
+++ b/src/spec.types.test.ts
@@ -17,9 +17,11 @@ type RemovePassthrough<T> = T extends object
   ? T extends Array<infer U>
     ? Array<RemovePassthrough<U>>
     : T extends Function
-        ? T
-        : {[K in keyof T as string extends K ? never : K]: RemovePassthrough<T[K]>}
-    : T;
+    ? T
+    : {
+        [K in keyof T as string extends K ? never : K]: RemovePassthrough<T[K]>;
+      }
+  : T;
 
 // Adds the `jsonrpc` property to a type, to match the on-wire format of notifications.
 type WithJSONRPC<T> = T & { jsonrpc: "2.0" };
@@ -27,694 +29,696 @@ type WithJSONRPC<T> = T & { jsonrpc: "2.0" };
 // Adds the `jsonrpc` and `id` properties to a type, to match the on-wire format of requests.
 type WithJSONRPCRequest<T> = T & { jsonrpc: "2.0"; id: SDKTypes.RequestId };
 
-type IsUnknown<T> = [unknown] extends [T] ? [T] extends [unknown] ? true : false : false;
+type IsUnknown<T> = [unknown] extends [T]
+  ? [T] extends [unknown]
+    ? true
+    : false
+  : false;
 
 // Turns {x?: unknown} into {x: unknown} but keeps {_meta?: unknown} unchanged (and leaves other optional properties unchanged, e.g. {x?: string}).
 // This works around an apparent quirk of ZodObject.unknown() (makes fields optional)
-type MakeUnknownsNotOptional<T> =
-  IsUnknown<T> extends true
-    ? unknown
-    : (T extends object
-      ? (T extends Array<infer U>
-        ? Array<MakeUnknownsNotOptional<U>>
-        : (T extends Function
-          ? T
-          : Pick<T, never> & {
-            // Start with empty object to avoid duplicates
-            // Make unknown properties required (except _meta)
-            [K in keyof T as '_meta' extends K ? never : IsUnknown<T[K]> extends true ? K : never]-?: unknown;
-          } &
-          Pick<T, {
+type MakeUnknownsNotOptional<T> = IsUnknown<T> extends true
+  ? unknown
+  : T extends object
+  ? T extends Array<infer U>
+    ? Array<MakeUnknownsNotOptional<U>>
+    : T extends Function
+    ? T
+    : Pick<T, never> & {
+        // Start with empty object to avoid duplicates
+        // Make unknown properties required (except _meta)
+        [K in keyof T as "_meta" extends K
+          ? never
+          : IsUnknown<T[K]> extends true
+          ? K
+          : never]-?: unknown;
+      } & Pick<
+          T,
+          {
             // Pick all _meta and non-unknown properties with original modifiers
-            [K in keyof T]: '_meta' extends K ? K : IsUnknown<T[K]> extends true ? never : K
-          }[keyof T]> & {
-            // Recurse on the picked properties
-            [K in keyof Pick<T, {[K in keyof T]: '_meta' extends K ? K : IsUnknown<T[K]> extends true ? never : K}[keyof T]>]: MakeUnknownsNotOptional<T[K]>
-          }))
-      : T);
+            [K in keyof T]: "_meta" extends K
+              ? K
+              : IsUnknown<T[K]> extends true
+              ? never
+              : K;
+          }[keyof T]
+        > & {
+          // Recurse on the picked properties
+          [K in keyof Pick<
+            T,
+            {
+              [K in keyof T]: "_meta" extends K
+                ? K
+                : IsUnknown<T[K]> extends true
+                ? never
+                : K;
+            }[keyof T]
+          >]: MakeUnknownsNotOptional<T[K]>;
+        }
+  : T;
 
-function checkCancelledNotification(
-  sdk: WithJSONRPC<SDKTypes.CancelledNotification>,
-  spec: SpecTypes.CancelledNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkBaseMetadata(
-  sdk: RemovePassthrough<SDKTypes.BaseMetadata>,
-  spec: SpecTypes.BaseMetadata
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkImplementation(
-  sdk: RemovePassthrough<SDKTypes.Implementation>,
-  spec: SpecTypes.Implementation
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkProgressNotification(
-  sdk: WithJSONRPC<SDKTypes.ProgressNotification>,
-  spec: SpecTypes.ProgressNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-
-function checkSubscribeRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.SubscribeRequest>,
-  spec: SpecTypes.SubscribeRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkUnsubscribeRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.UnsubscribeRequest>,
-  spec: SpecTypes.UnsubscribeRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPaginatedRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.PaginatedRequest>,
-  spec: SpecTypes.PaginatedRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPaginatedResult(
-  sdk: SDKTypes.PaginatedResult,
-  spec: SpecTypes.PaginatedResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListRootsRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.ListRootsRequest>,
-  spec: SpecTypes.ListRootsRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListRootsResult(
-  sdk: RemovePassthrough<SDKTypes.ListRootsResult>,
-  spec: SpecTypes.ListRootsResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkRoot(
-  sdk: RemovePassthrough<SDKTypes.Root>,
-  spec: SpecTypes.Root
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkElicitRequest(
-  sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.ElicitRequest>>,
-  spec: SpecTypes.ElicitRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkElicitResult(
-  sdk: RemovePassthrough<SDKTypes.ElicitResult>,
-  spec: SpecTypes.ElicitResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCompleteRequest(
-  sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.CompleteRequest>>,
-  spec: SpecTypes.CompleteRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCompleteResult(
-  sdk: SDKTypes.CompleteResult,
-  spec: SpecTypes.CompleteResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkProgressToken(
-  sdk: SDKTypes.ProgressToken,
-  spec: SpecTypes.ProgressToken
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCursor(
-  sdk: SDKTypes.Cursor,
-  spec: SpecTypes.Cursor
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkRequest(
-  sdk: SDKTypes.Request,
-  spec: SpecTypes.Request
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResult(
-  sdk: SDKTypes.Result,
-  spec: SpecTypes.Result
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkRequestId(
-  sdk: SDKTypes.RequestId,
-  spec: SpecTypes.RequestId
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkJSONRPCRequest(
-  sdk: SDKTypes.JSONRPCRequest,
-  spec: SpecTypes.JSONRPCRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkJSONRPCNotification(
-  sdk: SDKTypes.JSONRPCNotification,
-  spec: SpecTypes.JSONRPCNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkJSONRPCResponse(
-  sdk: SDKTypes.JSONRPCResponse,
-  spec: SpecTypes.JSONRPCResponse
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkEmptyResult(
-  sdk: SDKTypes.EmptyResult,
-  spec: SpecTypes.EmptyResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkNotification(
-  sdk: SDKTypes.Notification,
-  spec: SpecTypes.Notification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkClientResult(
-  sdk: SDKTypes.ClientResult,
-  spec: SpecTypes.ClientResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkClientNotification(
-  sdk: WithJSONRPC<SDKTypes.ClientNotification>,
-  spec: SpecTypes.ClientNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkServerResult(
-  sdk: SDKTypes.ServerResult,
-  spec: SpecTypes.ServerResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResourceTemplateReference(
-  sdk: RemovePassthrough<SDKTypes.ResourceTemplateReference>,
-  spec: SpecTypes.ResourceTemplateReference
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPromptReference(
-  sdk: RemovePassthrough<SDKTypes.PromptReference>,
-  spec: SpecTypes.PromptReference
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkToolAnnotations(
-  sdk: RemovePassthrough<SDKTypes.ToolAnnotations>,
-  spec: SpecTypes.ToolAnnotations
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkTool(
-  sdk: RemovePassthrough<SDKTypes.Tool>,
-  spec: SpecTypes.Tool
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListToolsRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.ListToolsRequest>,
-  spec: SpecTypes.ListToolsRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListToolsResult(
-  sdk: RemovePassthrough<SDKTypes.ListToolsResult>,
-  spec: SpecTypes.ListToolsResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCallToolResult(
-  sdk: RemovePassthrough<SDKTypes.CallToolResult>,
-  spec: SpecTypes.CallToolResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCallToolRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.CallToolRequest>,
-  spec: SpecTypes.CallToolRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkToolListChangedNotification(
-  sdk: WithJSONRPC<SDKTypes.ToolListChangedNotification>,
-  spec: SpecTypes.ToolListChangedNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResourceListChangedNotification(
-  sdk: WithJSONRPC<SDKTypes.ResourceListChangedNotification>,
-  spec: SpecTypes.ResourceListChangedNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPromptListChangedNotification(
-  sdk: WithJSONRPC<SDKTypes.PromptListChangedNotification>,
-  spec: SpecTypes.PromptListChangedNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkRootsListChangedNotification(
-  sdk: WithJSONRPC<SDKTypes.RootsListChangedNotification>,
-  spec: SpecTypes.RootsListChangedNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResourceUpdatedNotification(
-  sdk: WithJSONRPC<SDKTypes.ResourceUpdatedNotification>,
-  spec: SpecTypes.ResourceUpdatedNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkSamplingMessage(
-  sdk: RemovePassthrough<SDKTypes.SamplingMessage>,
-  spec: SpecTypes.SamplingMessage
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCreateMessageResult(
-  sdk: RemovePassthrough<SDKTypes.CreateMessageResult>,
-  spec: SpecTypes.CreateMessageResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkSetLevelRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.SetLevelRequest>,
-  spec: SpecTypes.SetLevelRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPingRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.PingRequest>,
-  spec: SpecTypes.PingRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkInitializedNotification(
-  sdk: WithJSONRPC<SDKTypes.InitializedNotification>,
-  spec: SpecTypes.InitializedNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListResourcesRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.ListResourcesRequest>,
-  spec: SpecTypes.ListResourcesRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListResourcesResult(
-  sdk: RemovePassthrough<SDKTypes.ListResourcesResult>,
-  spec: SpecTypes.ListResourcesResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListResourceTemplatesRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.ListResourceTemplatesRequest>,
-  spec: SpecTypes.ListResourceTemplatesRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListResourceTemplatesResult(
-  sdk: RemovePassthrough<SDKTypes.ListResourceTemplatesResult>,
-  spec: SpecTypes.ListResourceTemplatesResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkReadResourceRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.ReadResourceRequest>,
-  spec: SpecTypes.ReadResourceRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkReadResourceResult(
-  sdk: RemovePassthrough<SDKTypes.ReadResourceResult>,
-  spec: SpecTypes.ReadResourceResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResourceContents(
-  sdk: RemovePassthrough<SDKTypes.ResourceContents>,
-  spec: SpecTypes.ResourceContents
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkTextResourceContents(
-  sdk: RemovePassthrough<SDKTypes.TextResourceContents>,
-  spec: SpecTypes.TextResourceContents
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkBlobResourceContents(
-  sdk: RemovePassthrough<SDKTypes.BlobResourceContents>,
-  spec: SpecTypes.BlobResourceContents
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResource(
-  sdk: RemovePassthrough<SDKTypes.Resource>,
-  spec: SpecTypes.Resource
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResourceTemplate(
-  sdk: RemovePassthrough<SDKTypes.ResourceTemplate>,
-  spec: SpecTypes.ResourceTemplate
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPromptArgument(
-  sdk: RemovePassthrough<SDKTypes.PromptArgument>,
-  spec: SpecTypes.PromptArgument
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPrompt(
-  sdk: RemovePassthrough<SDKTypes.Prompt>,
-  spec: SpecTypes.Prompt
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListPromptsRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.ListPromptsRequest>,
-  spec: SpecTypes.ListPromptsRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkListPromptsResult(
-  sdk: RemovePassthrough<SDKTypes.ListPromptsResult>,
-  spec: SpecTypes.ListPromptsResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkGetPromptRequest(
-  sdk: WithJSONRPCRequest<SDKTypes.GetPromptRequest>,
-  spec: SpecTypes.GetPromptRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkTextContent(
-  sdk: RemovePassthrough<SDKTypes.TextContent>,
-  spec: SpecTypes.TextContent
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkImageContent(
-  sdk: RemovePassthrough<SDKTypes.ImageContent>,
-  spec: SpecTypes.ImageContent
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkAudioContent(
-  sdk: RemovePassthrough<SDKTypes.AudioContent>,
-  spec: SpecTypes.AudioContent
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkEmbeddedResource(
-  sdk: RemovePassthrough<SDKTypes.EmbeddedResource>,
-  spec: SpecTypes.EmbeddedResource
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkResourceLink(
-  sdk: RemovePassthrough<SDKTypes.ResourceLink>,
-  spec: SpecTypes.ResourceLink
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkContentBlock(
-  sdk: RemovePassthrough<SDKTypes.ContentBlock>,
-  spec: SpecTypes.ContentBlock
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPromptMessage(
-  sdk: RemovePassthrough<SDKTypes.PromptMessage>,
-  spec: SpecTypes.PromptMessage
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkGetPromptResult(
-  sdk: RemovePassthrough<SDKTypes.GetPromptResult>,
-  spec: SpecTypes.GetPromptResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkBooleanSchema(
-  sdk: RemovePassthrough<SDKTypes.BooleanSchema>,
-  spec: SpecTypes.BooleanSchema
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkStringSchema(
-  sdk: RemovePassthrough<SDKTypes.StringSchema>,
-  spec: SpecTypes.StringSchema
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkNumberSchema(
-  sdk: RemovePassthrough<SDKTypes.NumberSchema>,
-  spec: SpecTypes.NumberSchema
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkEnumSchema(
-  sdk: RemovePassthrough<SDKTypes.EnumSchema>,
-  spec: SpecTypes.EnumSchema
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkPrimitiveSchemaDefinition(
-  sdk: RemovePassthrough<SDKTypes.PrimitiveSchemaDefinition>,
-  spec: SpecTypes.PrimitiveSchemaDefinition
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkJSONRPCError(
-  sdk: SDKTypes.JSONRPCError,
-  spec: SpecTypes.JSONRPCError
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkJSONRPCMessage(
-  sdk: SDKTypes.JSONRPCMessage,
-  spec: SpecTypes.JSONRPCMessage
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkCreateMessageRequest(
-  sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.CreateMessageRequest>>,
-  spec: SpecTypes.CreateMessageRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkInitializeRequest(
-  sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.InitializeRequest>>,
-  spec: SpecTypes.InitializeRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkInitializeResult(
-  sdk: RemovePassthrough<SDKTypes.InitializeResult>,
-  spec: SpecTypes.InitializeResult
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkClientCapabilities(
-  sdk: RemovePassthrough<SDKTypes.ClientCapabilities>,
-  spec: SpecTypes.ClientCapabilities
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkServerCapabilities(
-  sdk: RemovePassthrough<SDKTypes.ServerCapabilities>,
-  spec: SpecTypes.ServerCapabilities
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkClientRequest(
-  sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.ClientRequest>>,
-  spec: SpecTypes.ClientRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkServerRequest(
-  sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.ServerRequest>>,
-  spec: SpecTypes.ServerRequest
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkLoggingMessageNotification(
-  sdk: MakeUnknownsNotOptional<WithJSONRPC<SDKTypes.LoggingMessageNotification>>,
-  spec: SpecTypes.LoggingMessageNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkServerNotification(
-  sdk: MakeUnknownsNotOptional<WithJSONRPC<SDKTypes.ServerNotification>>,
-  spec: SpecTypes.ServerNotification
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkLoggingLevel(
-  sdk: SDKTypes.LoggingLevel,
-  spec: SpecTypes.LoggingLevel
-) {
-  sdk = spec;
-  spec = sdk;
-}
-function checkIcon(
-  sdk: RemovePassthrough<SDKTypes.Icon>,
-  spec: SpecTypes.Icon
-) {
-  sdk = spec;
-  spec = sdk;
-}
+const sdkTypeChecks = {
+  CancelledNotification: (
+    sdk: WithJSONRPC<SDKTypes.CancelledNotification>,
+    spec: SpecTypes.CancelledNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  BaseMetadata: (
+    sdk: RemovePassthrough<SDKTypes.BaseMetadata>,
+    spec: SpecTypes.BaseMetadata
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Implementation: (
+    sdk: RemovePassthrough<SDKTypes.Implementation>,
+    spec: SpecTypes.Implementation
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ProgressNotification: (
+    sdk: WithJSONRPC<SDKTypes.ProgressNotification>,
+    spec: SpecTypes.ProgressNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  SubscribeRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.SubscribeRequest>,
+    spec: SpecTypes.SubscribeRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  UnsubscribeRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.UnsubscribeRequest>,
+    spec: SpecTypes.UnsubscribeRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PaginatedRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.PaginatedRequest>,
+    spec: SpecTypes.PaginatedRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PaginatedResult: (
+    sdk: SDKTypes.PaginatedResult,
+    spec: SpecTypes.PaginatedResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListRootsRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.ListRootsRequest>,
+    spec: SpecTypes.ListRootsRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListRootsResult: (
+    sdk: RemovePassthrough<SDKTypes.ListRootsResult>,
+    spec: SpecTypes.ListRootsResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Root: (sdk: RemovePassthrough<SDKTypes.Root>, spec: SpecTypes.Root) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ElicitRequest: (
+    sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.ElicitRequest>>,
+    spec: SpecTypes.ElicitRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ElicitResult: (
+    sdk: RemovePassthrough<SDKTypes.ElicitResult>,
+    spec: SpecTypes.ElicitResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  CompleteRequest: (
+    sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.CompleteRequest>>,
+    spec: SpecTypes.CompleteRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  CompleteResult: (
+    sdk: SDKTypes.CompleteResult,
+    spec: SpecTypes.CompleteResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ProgressToken: (
+    sdk: SDKTypes.ProgressToken,
+    spec: SpecTypes.ProgressToken
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Cursor: (sdk: SDKTypes.Cursor, spec: SpecTypes.Cursor) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Request: (sdk: SDKTypes.Request, spec: SpecTypes.Request) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Result: (sdk: SDKTypes.Result, spec: SpecTypes.Result) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  RequestId: (sdk: SDKTypes.RequestId, spec: SpecTypes.RequestId) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  JSONRPCRequest: (
+    sdk: SDKTypes.JSONRPCRequest,
+    spec: SpecTypes.JSONRPCRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  JSONRPCNotification: (
+    sdk: SDKTypes.JSONRPCNotification,
+    spec: SpecTypes.JSONRPCNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  JSONRPCResponse: (
+    sdk: SDKTypes.JSONRPCResponse,
+    spec: SpecTypes.JSONRPCResponse
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  EmptyResult: (sdk: SDKTypes.EmptyResult, spec: SpecTypes.EmptyResult) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Notification: (sdk: SDKTypes.Notification, spec: SpecTypes.Notification) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ClientResult: (sdk: SDKTypes.ClientResult, spec: SpecTypes.ClientResult) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ClientNotification: (
+    sdk: WithJSONRPC<SDKTypes.ClientNotification>,
+    spec: SpecTypes.ClientNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ServerResult: (sdk: SDKTypes.ServerResult, spec: SpecTypes.ServerResult) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ResourceTemplateReference: (
+    sdk: RemovePassthrough<SDKTypes.ResourceTemplateReference>,
+    spec: SpecTypes.ResourceTemplateReference
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PromptReference: (
+    sdk: RemovePassthrough<SDKTypes.PromptReference>,
+    spec: SpecTypes.PromptReference
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ToolAnnotations: (
+    sdk: RemovePassthrough<SDKTypes.ToolAnnotations>,
+    spec: SpecTypes.ToolAnnotations
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Tool: (sdk: RemovePassthrough<SDKTypes.Tool>, spec: SpecTypes.Tool) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListToolsRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.ListToolsRequest>,
+    spec: SpecTypes.ListToolsRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListToolsResult: (
+    sdk: RemovePassthrough<SDKTypes.ListToolsResult>,
+    spec: SpecTypes.ListToolsResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  CallToolResult: (
+    sdk: RemovePassthrough<SDKTypes.CallToolResult>,
+    spec: SpecTypes.CallToolResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  CallToolRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.CallToolRequest>,
+    spec: SpecTypes.CallToolRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ToolListChangedNotification: (
+    sdk: WithJSONRPC<SDKTypes.ToolListChangedNotification>,
+    spec: SpecTypes.ToolListChangedNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ResourceListChangedNotification: (
+    sdk: WithJSONRPC<SDKTypes.ResourceListChangedNotification>,
+    spec: SpecTypes.ResourceListChangedNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PromptListChangedNotification: (
+    sdk: WithJSONRPC<SDKTypes.PromptListChangedNotification>,
+    spec: SpecTypes.PromptListChangedNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  RootsListChangedNotification: (
+    sdk: WithJSONRPC<SDKTypes.RootsListChangedNotification>,
+    spec: SpecTypes.RootsListChangedNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ResourceUpdatedNotification: (
+    sdk: WithJSONRPC<SDKTypes.ResourceUpdatedNotification>,
+    spec: SpecTypes.ResourceUpdatedNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  SamplingMessage: (
+    sdk: RemovePassthrough<SDKTypes.SamplingMessage>,
+    spec: SpecTypes.SamplingMessage
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  CreateMessageResult: (
+    sdk: RemovePassthrough<SDKTypes.CreateMessageResult>,
+    spec: SpecTypes.CreateMessageResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  SetLevelRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.SetLevelRequest>,
+    spec: SpecTypes.SetLevelRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PingRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.PingRequest>,
+    spec: SpecTypes.PingRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  InitializedNotification: (
+    sdk: WithJSONRPC<SDKTypes.InitializedNotification>,
+    spec: SpecTypes.InitializedNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListResourcesRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.ListResourcesRequest>,
+    spec: SpecTypes.ListResourcesRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListResourcesResult: (
+    sdk: RemovePassthrough<SDKTypes.ListResourcesResult>,
+    spec: SpecTypes.ListResourcesResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListResourceTemplatesRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.ListResourceTemplatesRequest>,
+    spec: SpecTypes.ListResourceTemplatesRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListResourceTemplatesResult: (
+    sdk: RemovePassthrough<SDKTypes.ListResourceTemplatesResult>,
+    spec: SpecTypes.ListResourceTemplatesResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ReadResourceRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.ReadResourceRequest>,
+    spec: SpecTypes.ReadResourceRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ReadResourceResult: (
+    sdk: RemovePassthrough<SDKTypes.ReadResourceResult>,
+    spec: SpecTypes.ReadResourceResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ResourceContents: (
+    sdk: RemovePassthrough<SDKTypes.ResourceContents>,
+    spec: SpecTypes.ResourceContents
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  TextResourceContents: (
+    sdk: RemovePassthrough<SDKTypes.TextResourceContents>,
+    spec: SpecTypes.TextResourceContents
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  BlobResourceContents: (
+    sdk: RemovePassthrough<SDKTypes.BlobResourceContents>,
+    spec: SpecTypes.BlobResourceContents
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Resource: (
+    sdk: RemovePassthrough<SDKTypes.Resource>,
+    spec: SpecTypes.Resource
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ResourceTemplate: (
+    sdk: RemovePassthrough<SDKTypes.ResourceTemplate>,
+    spec: SpecTypes.ResourceTemplate
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PromptArgument: (
+    sdk: RemovePassthrough<SDKTypes.PromptArgument>,
+    spec: SpecTypes.PromptArgument
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Prompt: (sdk: RemovePassthrough<SDKTypes.Prompt>, spec: SpecTypes.Prompt) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListPromptsRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.ListPromptsRequest>,
+    spec: SpecTypes.ListPromptsRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ListPromptsResult: (
+    sdk: RemovePassthrough<SDKTypes.ListPromptsResult>,
+    spec: SpecTypes.ListPromptsResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  GetPromptRequest: (
+    sdk: WithJSONRPCRequest<SDKTypes.GetPromptRequest>,
+    spec: SpecTypes.GetPromptRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  TextContent: (
+    sdk: RemovePassthrough<SDKTypes.TextContent>,
+    spec: SpecTypes.TextContent
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ImageContent: (
+    sdk: RemovePassthrough<SDKTypes.ImageContent>,
+    spec: SpecTypes.ImageContent
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  AudioContent: (
+    sdk: RemovePassthrough<SDKTypes.AudioContent>,
+    spec: SpecTypes.AudioContent
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  EmbeddedResource: (
+    sdk: RemovePassthrough<SDKTypes.EmbeddedResource>,
+    spec: SpecTypes.EmbeddedResource
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ResourceLink: (
+    sdk: RemovePassthrough<SDKTypes.ResourceLink>,
+    spec: SpecTypes.ResourceLink
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ContentBlock: (
+    sdk: RemovePassthrough<SDKTypes.ContentBlock>,
+    spec: SpecTypes.ContentBlock
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PromptMessage: (
+    sdk: RemovePassthrough<SDKTypes.PromptMessage>,
+    spec: SpecTypes.PromptMessage
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  GetPromptResult: (
+    sdk: RemovePassthrough<SDKTypes.GetPromptResult>,
+    spec: SpecTypes.GetPromptResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  BooleanSchema: (
+    sdk: RemovePassthrough<SDKTypes.BooleanSchema>,
+    spec: SpecTypes.BooleanSchema
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  StringSchema: (
+    sdk: RemovePassthrough<SDKTypes.StringSchema>,
+    spec: SpecTypes.StringSchema
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  NumberSchema: (
+    sdk: RemovePassthrough<SDKTypes.NumberSchema>,
+    spec: SpecTypes.NumberSchema
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  EnumSchema: (
+    sdk: RemovePassthrough<SDKTypes.EnumSchema>,
+    spec: SpecTypes.EnumSchema
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  PrimitiveSchemaDefinition: (
+    sdk: RemovePassthrough<SDKTypes.PrimitiveSchemaDefinition>,
+    spec: SpecTypes.PrimitiveSchemaDefinition
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  JSONRPCError: (sdk: SDKTypes.JSONRPCError, spec: SpecTypes.JSONRPCError) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  JSONRPCMessage: (
+    sdk: SDKTypes.JSONRPCMessage,
+    spec: SpecTypes.JSONRPCMessage
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  CreateMessageRequest: (
+    sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.CreateMessageRequest>>,
+    spec: SpecTypes.CreateMessageRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  InitializeRequest: (
+    sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.InitializeRequest>>,
+    spec: SpecTypes.InitializeRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  InitializeResult: (
+    sdk: RemovePassthrough<SDKTypes.InitializeResult>,
+    spec: SpecTypes.InitializeResult
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ClientCapabilities: (
+    sdk: RemovePassthrough<SDKTypes.ClientCapabilities>,
+    spec: SpecTypes.ClientCapabilities
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ServerCapabilities: (
+    sdk: RemovePassthrough<SDKTypes.ServerCapabilities>,
+    spec: SpecTypes.ServerCapabilities
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ClientRequest: (
+    sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.ClientRequest>>,
+    spec: SpecTypes.ClientRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ServerRequest: (
+    sdk: WithJSONRPCRequest<RemovePassthrough<SDKTypes.ServerRequest>>,
+    spec: SpecTypes.ServerRequest
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  LoggingMessageNotification: (
+    sdk: MakeUnknownsNotOptional<
+      WithJSONRPC<SDKTypes.LoggingMessageNotification>
+    >,
+    spec: SpecTypes.LoggingMessageNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  ServerNotification: (
+    sdk: MakeUnknownsNotOptional<WithJSONRPC<SDKTypes.ServerNotification>>,
+    spec: SpecTypes.ServerNotification
+  ) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  LoggingLevel: (sdk: SDKTypes.LoggingLevel, spec: SpecTypes.LoggingLevel) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Icon: (sdk: RemovePassthrough<SDKTypes.Icon>, spec: SpecTypes.Icon) => {
+    sdk = spec;
+    spec = sdk;
+  },
+  Icons: (sdk: RemovePassthrough<SDKTypes.Icons>, spec: SpecTypes.Icons) => {
+    sdk = spec;
+    spec = sdk;
+  },
+};
 
 // This file is .gitignore'd, and fetched by `npm run fetch:spec-types` (called by `npm run test`)
-const SPEC_TYPES_FILE  = 'spec.types.ts';
-const SDK_TYPES_FILE  = 'src/types.ts';
+const SPEC_TYPES_FILE = "spec.types.ts";
+const SDK_TYPES_FILE = "src/types.ts";
 
 const MISSING_SDK_TYPES = [
   // These are inlined in the SDK:
-  'Role',
-  'Error', // The inner error object of a JSONRPCError
+  "Role",
+  "Error", // The inner error object of a JSONRPCError
 
   // These aren't supported by the SDK yet:
   // TODO: Add definitions to the SDK
-  'Annotations',
-  'ModelHint',
-  'ModelPreferences',
-  'Icons',
-]
+  "Annotations",
+  "ModelHint",
+  "ModelPreferences",
+];
 
 function extractExportedTypes(source: string): string[] {
-  return [...source.matchAll(/export\s+(?:interface|class|type)\s+(\w+)\b/g)].map(m => m[1]);
+  return [
+    ...source.matchAll(/export\s+(?:interface|class|type)\s+(\w+)\b/g),
+  ].map((m) => m[1]);
 }
 
-describe('Spec Types', () => {
-  const specTypes = extractExportedTypes(fs.readFileSync(SPEC_TYPES_FILE, 'utf-8'));
-  const sdkTypes = extractExportedTypes(fs.readFileSync(SDK_TYPES_FILE, 'utf-8'));
-  const testSource = fs.readFileSync(__filename, 'utf-8');
+describe("Spec Types", () => {
+  const specTypes = extractExportedTypes(
+    fs.readFileSync(SPEC_TYPES_FILE, "utf-8")
+  );
+  const sdkTypes = extractExportedTypes(
+    fs.readFileSync(SDK_TYPES_FILE, "utf-8")
+  );
+  const typesToCheck = specTypes.filter(
+    (type) => !MISSING_SDK_TYPES.includes(type)
+  );
 
-  it('should define some expected types', () => {
-    expect(specTypes).toContain('JSONRPCNotification');
-    expect(specTypes).toContain('ElicitResult');
+  it("should define some expected types", () => {
+    expect(specTypes).toContain("JSONRPCNotification");
+    expect(specTypes).toContain("ElicitResult");
     expect(specTypes).toHaveLength(94);
   });
 
-  it('should have up to date list of missing sdk types', () => {
+  it("should have up to date list of missing sdk types", () => {
     for (const typeName of MISSING_SDK_TYPES) {
       expect(sdkTypes).not.toContain(typeName);
     }
   });
 
-  for (const type of specTypes) {
-    if (MISSING_SDK_TYPES.includes(type)) {
-      continue; // Skip missing SDK types
-    }
-    it(`${type} should have a compatibility test`, () => {
-      expect(testSource).toContain(`function check${type}(`);
+  describe("Compatibility tests", () => {
+    it.each(typesToCheck)("%s should have a compatibility test", (type) => {
+      expect(sdkTypeChecks[type as keyof typeof sdkTypeChecks]).toBeDefined();
     });
-  }
+  });
+
+  describe("Missing SDK Types", () => {
+    it.each(MISSING_SDK_TYPES)(
+      "%s should not be present in MISSING_SDK_TYPES if it has a compatibility test",
+      (type) => {
+        expect(
+          sdkTypeChecks[type as keyof typeof sdkTypeChecks]
+        ).toBeUndefined();
+      }
+    );
+  });
 });
diff --git a/src/types.ts b/src/types.ts
index 9ca4e4d8a..ee2ceb5ed 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -215,13 +215,33 @@ export const IconSchema = z
     mimeType: z.optional(z.string()),
     /**
      * 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.
+     * 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: z.optional(z.array(z.string())),
   })
   .passthrough();
 
+/**
+ * Base schema to add `icons` property.
+ *
+ */
+export const IconsSchema = z.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: z.array(IconSchema).optional(),
+}).passthrough();
+
 /**
  * Base metadata interface for common properties across resources, tools, prompts, and implementations.
  */
@@ -251,16 +271,7 @@ export const ImplementationSchema = BaseMetadataSchema.extend({
    * An optional URL of the website for this implementation.
    */
   websiteUrl: z.optional(z.string()),
-  /**
-   * 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.
-   */
-  icons: z.optional(z.array(IconSchema)),
-});
+}).merge(IconsSchema);
 
 /**
  * Capabilities a client may support. Known capabilities are defined here, in this schema, but this is not a closed set: any client can define its own, additional capabilities.
@@ -541,17 +552,12 @@ export const ResourceSchema = BaseMetadataSchema.extend({
    */
   mimeType: z.optional(z.string()),
 
-  /**
-   * An optional list of icons for this resource.
-   */
-  icons: z.optional(z.array(IconSchema)),
-
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
   _meta: z.optional(z.object({}).passthrough()),
-});
+}).merge(IconsSchema);
 
 /**
  * A template description for resources available on the server.
@@ -579,7 +585,7 @@ export const ResourceTemplateSchema = BaseMetadataSchema.extend({
    * for notes on _meta usage.
    */
   _meta: z.optional(z.object({}).passthrough()),
-});
+}).merge(IconsSchema);
 
 /**
  * Sent from the client to request a list of resources the server has.
@@ -712,16 +718,12 @@ export const PromptSchema = BaseMetadataSchema.extend({
    * A list of arguments to use for templating the prompt.
    */
   arguments: z.optional(z.array(PromptArgumentSchema)),
-  /**
-   * An optional list of icons for this prompt.
-   */
-  icons: z.optional(z.array(IconSchema)),
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
   _meta: z.optional(z.object({}).passthrough()),
-});
+}).merge(IconsSchema);
 
 /**
  * Sent from the client to request a list of prompts and prompt templates the server has.
@@ -974,17 +976,12 @@ export const ToolSchema = BaseMetadataSchema.extend({
    */
   annotations: z.optional(ToolAnnotationsSchema),
 
-  /**
-   * An optional list of icons for this tool.
-   */
-  icons: z.optional(z.array(IconSchema)),
-
   /**
    * See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
    * for notes on _meta usage.
    */
   _meta: z.optional(z.object({}).passthrough()),
-});
+}).merge(IconsSchema);
 
 /**
  * Sent from the client to request a list of tools the server has.
@@ -1585,6 +1582,7 @@ export type CancelledNotification = Infer<typeof CancelledNotificationSchema>;
 
 /* Base Metadata */
 export type Icon = Infer<typeof IconSchema>;
+export type Icons = Infer<typeof IconsSchema>;
 export type BaseMetadata = Infer<typeof BaseMetadataSchema>;
 
 /* Initialization */