feat: remap generated schemas to SDK-compatible hierarchy

Post-process generated schemas to use SDK-compatible type hierarchy:
- XxxNotificationSchema extends NotificationSchema (not JSONRPCNotificationSchema)
- XxxRequestSchema extends RequestSchema (not JSONRPCRequestSchema)

This makes generated schemas drop-in compatible with the existing types.ts
hierarchy where jsonrpc/id fields are handled at the transport layer.

Updated comparison tests to verify notification schemas now work correctly.
97 tests passing.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: ochafik

scripts/generate-schemas.ts

@@ -116,7 +116,11 @@ function postProcess(content: string): string {
     // ts-to-zod can't translate `typeof CONST` and falls back to z.any()
     content = fixTypeOfExpressions(content);
 
-    // 4. Add header comment
+    // 4. Remap notification/request schemas to SDK-compatible hierarchy
+    // (extend Notification/Request instead of JSONRPCNotification/JSONRPCRequest)
+    content = remapToSdkHierarchy(content);
+
+    // 5. Add header comment
     content = content.replace(
         '// Generated by ts-to-zod',
         `// Generated by ts-to-zod
@@ -150,6 +154,78 @@ function fixTypeOfExpressions(content: string): string {
     return content;
 }
 
+/**
+ * Remap notification and request schemas to use SDK-compatible hierarchy.
+ *
+ * The spec defines:
+ * - XxxNotification extends JSONRPCNotification (includes jsonrpc field)
+ * - XxxRequest extends JSONRPCRequest (includes jsonrpc, id fields)
+ *
+ * The SDK types.ts uses:
+ * - XxxNotification extends Notification (no jsonrpc field)
+ * - XxxRequest extends Request (no jsonrpc, id fields)
+ *
+ * This allows the jsonrpc/id fields to be handled at the transport layer.
+ */
+function remapToSdkHierarchy(content: string): string {
+    // List of notifications that should extend NotificationSchema instead of JSONRPCNotificationSchema
+    const notifications = [
+        'CancelledNotification',
+        'InitializedNotification',
+        'ProgressNotification',
+        'ResourceListChangedNotification',
+        'ResourceUpdatedNotification',
+        'PromptListChangedNotification',
+        'ToolListChangedNotification',
+        'TaskStatusNotification',
+        'LoggingMessageNotification',
+        'RootsListChangedNotification',
+        'ElicitationCompleteNotification',
+    ];
+
+    // List of requests that should extend RequestSchema instead of JSONRPCRequestSchema
+    const requests = [
+        'InitializeRequest',
+        'PingRequest',
+        'ListResourcesRequest',
+        'ListResourceTemplatesRequest',
+        'ReadResourceRequest',
+        'SubscribeRequest',
+        'UnsubscribeRequest',
+        'ListPromptsRequest',
+        'GetPromptRequest',
+        'ListToolsRequest',
+        'CallToolRequest',
+        'GetTaskRequest',
+        'ListTasksRequest',
+        'GetTaskPayloadRequest',
+        'CancelTaskRequest',
+        'SetLevelRequest',
+        'CreateMessageRequest',
+        'CompleteRequest',
+        'ListRootsRequest',
+        'ElicitRequest',
+    ];
+
+    // Replace JSONRPCNotificationSchema.extend with NotificationSchema.extend for specific schemas
+    for (const name of notifications) {
+        content = content.replace(
+            new RegExp(`export const ${name}Schema = JSONRPCNotificationSchema\\.extend\\(`),
+            `export const ${name}Schema = NotificationSchema.extend(`
+        );
+    }
+
+    // Replace JSONRPCRequestSchema.extend with RequestSchema.extend for specific schemas
+    for (const name of requests) {
+        content = content.replace(
+            new RegExp(`export const ${name}Schema = JSONRPCRequestSchema\\.extend\\(`),
+            `export const ${name}Schema = RequestSchema.extend(`
+        );
+    }
+
+    return content;
+}
+
 /**
  * Replace z.record(z.string(), z.unknown()).and(z.object({...})) with z.looseObject({...})
  * Uses brace-counting to handle nested objects correctly.

src/generated/index.ts

@@ -1,27 +1,23 @@
 /**
- * Generated Zod Schemas from MCP Specification
+ * Generated Zod Schemas for MCP SDK
  *
  * This module provides auto-generated Zod schemas from spec.types.ts,
- * plus SDK version constants.
+ * post-processed for SDK compatibility (extends Notification/Request
+ * instead of JSONRPCNotification/JSONRPCRequest).
  *
- * For production use with SDK-specific refinements and extras,
- * import from '@modelcontextprotocol/sdk/types.js'.
+ * The schemas here are designed to be drop-in replacements for the
+ * manually-defined schemas in types.ts.
  *
- * @see spec.types.ts - Source TypeScript interfaces from MCP spec
- * @see spec.schemas.ts - Auto-generated Zod schemas
- * @see ../types.ts - Production schemas with SDK refinements
+ * @see spec.types.ts - MCP specification types
+ * @see spec.schemas.ts - Auto-generated Zod schemas (SDK-compatible)
+ * @see ../types.ts - Production schemas with SDK extras
  */
 
-// Re-export all generated schemas
+// Re-export all generated schemas (SDK-compatible hierarchy via post-processing)
 export * from './spec.schemas.js';
 
-// Re-export spec types (interfaces/types from MCP specification)
+// Re-export spec types
 export * from '../spec.types.js';
 
-// Re-export SDK version constants (these differ from spec's DRAFT version)
-export {
-    LATEST_PROTOCOL_VERSION,
-    DEFAULT_NEGOTIATED_PROTOCOL_VERSION,
-    SUPPORTED_PROTOCOL_VERSIONS,
-    JSONRPC_VERSION,
-} from '../types.js';
+// Re-export SDK version constants
+export { LATEST_PROTOCOL_VERSION, DEFAULT_NEGOTIATED_PROTOCOL_VERSION, SUPPORTED_PROTOCOL_VERSIONS, JSONRPC_VERSION } from '../types.js';

src/generated/spec.schemas.ts

@@ -242,7 +242,7 @@ export const CancelledNotificationParamsSchema = NotificationParamsSchema.extend
  *
  * @category `notifications/cancelled`
  */
-export const CancelledNotificationSchema = JSONRPCNotificationSchema.extend({
+export const CancelledNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/cancelled'),
     params: CancelledNotificationParamsSchema
 });
@@ -504,7 +504,7 @@ export const ServerCapabilitiesSchema = z.object({
  *
  * @category `notifications/initialized`
  */
-export const InitializedNotificationSchema = JSONRPCNotificationSchema.extend({
+export const InitializedNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/initialized'),
     params: NotificationParamsSchema.optional()
 });
@@ -672,7 +672,7 @@ export const ImplementationSchema = BaseMetadataSchema.extend(IconsSchema.shape)
  *
  * @category `ping`
  */
-export const PingRequestSchema = JSONRPCRequestSchema.extend({
+export const PingRequestSchema = RequestSchema.extend({
     method: z.literal('ping'),
     params: RequestParamsSchema.optional()
 });
@@ -719,7 +719,7 @@ export const ProgressNotificationParamsSchema = NotificationParamsSchema.extend(
  *
  * @category `notifications/progress`
  */
-export const ProgressNotificationSchema = JSONRPCNotificationSchema.extend({
+export const ProgressNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/progress'),
     params: ProgressNotificationParamsSchema
 });
@@ -811,7 +811,7 @@ export const ReadResourceRequestParamsSchema = ResourceRequestParamsSchema;
  *
  * @category `resources/read`
  */
-export const ReadResourceRequestSchema = JSONRPCRequestSchema.extend({
+export const ReadResourceRequestSchema = RequestSchema.extend({
     method: z.literal('resources/read'),
     params: ReadResourceRequestParamsSchema
 });
@@ -822,7 +822,7 @@ export const ReadResourceRequestSchema = JSONRPCRequestSchema.extend({
  *
  * @category `notifications/resources/list_changed`
  */
-export const ResourceListChangedNotificationSchema = JSONRPCNotificationSchema.extend({
+export const ResourceListChangedNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/resources/list_changed'),
     params: NotificationParamsSchema.optional()
 });
@@ -842,7 +842,7 @@ export const SubscribeRequestParamsSchema = ResourceRequestParamsSchema;
  *
  * @category `resources/subscribe`
  */
-export const SubscribeRequestSchema = JSONRPCRequestSchema.extend({
+export const SubscribeRequestSchema = RequestSchema.extend({
     method: z.literal('resources/subscribe'),
     params: SubscribeRequestParamsSchema
 });
@@ -862,7 +862,7 @@ export const UnsubscribeRequestParamsSchema = ResourceRequestParamsSchema;
  *
  * @category `resources/unsubscribe`
  */
-export const UnsubscribeRequestSchema = JSONRPCRequestSchema.extend({
+export const UnsubscribeRequestSchema = RequestSchema.extend({
     method: z.literal('resources/unsubscribe'),
     params: UnsubscribeRequestParamsSchema
 });
@@ -893,7 +893,7 @@ export const ResourceUpdatedNotificationParamsSchema = NotificationParamsSchema.
  *
  * @category `notifications/resources/updated`
  */
-export const ResourceUpdatedNotificationSchema = JSONRPCNotificationSchema.extend({
+export const ResourceUpdatedNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/resources/updated'),
     params: ResourceUpdatedNotificationParamsSchema
 });
@@ -989,7 +989,7 @@ export const GetPromptRequestParamsSchema = RequestParamsSchema.extend({
  *
  * @category `prompts/get`
  */
-export const GetPromptRequestSchema = JSONRPCRequestSchema.extend({
+export const GetPromptRequestSchema = RequestSchema.extend({
     method: z.literal('prompts/get'),
     params: GetPromptRequestParamsSchema
 });
@@ -1085,7 +1085,7 @@ export const AnnotationsSchema = z.object({
  *
  * @category `notifications/prompts/list_changed`
  */
-export const PromptListChangedNotificationSchema = JSONRPCNotificationSchema.extend({
+export const PromptListChangedNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/prompts/list_changed'),
     params: NotificationParamsSchema.optional()
 });
@@ -1147,7 +1147,7 @@ export const CallToolRequestParamsSchema = TaskAugmentedRequestParamsSchema.exte
  *
  * @category `notifications/tools/list_changed`
  */
-export const ToolListChangedNotificationSchema = JSONRPCNotificationSchema.extend({
+export const ToolListChangedNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/tools/list_changed'),
     params: NotificationParamsSchema.optional()
 });
@@ -1421,7 +1421,7 @@ export const CreateTaskResultSchema = ResultSchema.extend({
  *
  * @category `tasks/get`
  */
-export const GetTaskRequestSchema = JSONRPCRequestSchema.extend({
+export const GetTaskRequestSchema = RequestSchema.extend({
     method: z.literal('tasks/get'),
     params: z.object({
         /**
@@ -1446,7 +1446,7 @@ export const GetTaskResultSchema = ResultSchema.and(TaskSchema).describe('The re
  *
  * @category `tasks/result`
  */
-export const GetTaskPayloadRequestSchema = JSONRPCRequestSchema.extend({
+export const GetTaskPayloadRequestSchema = RequestSchema.extend({
     method: z.literal('tasks/result'),
     params: z.object({
         /**
@@ -1473,7 +1473,7 @@ export const GetTaskPayloadResultSchema = ResultSchema.and(z.record(z.string(),
  *
  * @category `tasks/cancel`
  */
-export const CancelTaskRequestSchema = JSONRPCRequestSchema.extend({
+export const CancelTaskRequestSchema = RequestSchema.extend({
     method: z.literal('tasks/cancel'),
     params: z.object({
         /**
@@ -1528,7 +1528,7 @@ export const TaskStatusNotificationParamsSchema = NotificationParamsSchema.and(T
  *
  * @category `notifications/tasks/status`
  */
-export const TaskStatusNotificationSchema = JSONRPCNotificationSchema.extend({
+export const TaskStatusNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/tasks/status'),
     params: TaskStatusNotificationParamsSchema
 });
@@ -1604,7 +1604,7 @@ export const LoggingMessageNotificationParamsSchema = NotificationParamsSchema.e
  *
  * @category `notifications/message`
  */
-export const LoggingMessageNotificationSchema = JSONRPCNotificationSchema.extend({
+export const LoggingMessageNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/message'),
     params: LoggingMessageNotificationParamsSchema
 });
@@ -1947,7 +1947,7 @@ export const CompleteResultSchema = ResultSchema.extend({
  *
  * @category `roots/list`
  */
-export const ListRootsRequestSchema = JSONRPCRequestSchema.extend({
+export const ListRootsRequestSchema = RequestSchema.extend({
     method: z.literal('roots/list'),
     params: RequestParamsSchema.optional()
 });
@@ -2002,7 +2002,7 @@ export const RootSchema = z.object({
  *
  * @category `notifications/roots/list_changed`
  */
-export const RootsListChangedNotificationSchema = JSONRPCNotificationSchema.extend({
+export const RootsListChangedNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/roots/list_changed'),
     params: NotificationParamsSchema.optional()
 });
@@ -2346,7 +2346,7 @@ export const ElicitResultSchema = ResultSchema.extend({
  *
  * @category `notifications/elicitation/complete`
  */
-export const ElicitationCompleteNotificationSchema = JSONRPCNotificationSchema.extend({
+export const ElicitationCompleteNotificationSchema = NotificationSchema.extend({
     method: z.literal('notifications/elicitation/complete'),
     params: z.object({
         /**
@@ -2363,7 +2363,7 @@ export const ElicitationCompleteNotificationSchema = JSONRPCNotificationSchema.e
  *
  * @category `completion/complete`
  */
-export const CompleteRequestSchema = JSONRPCRequestSchema.extend({
+export const CompleteRequestSchema = RequestSchema.extend({
     method: z.literal('completion/complete'),
     params: CompleteRequestParamsSchema
 });
@@ -2374,7 +2374,7 @@ export const CompleteRequestSchema = JSONRPCRequestSchema.extend({
  *
  * @category `logging/setLevel`
  */
-export const SetLevelRequestSchema = JSONRPCRequestSchema.extend({
+export const SetLevelRequestSchema = RequestSchema.extend({
     method: z.literal('logging/setLevel'),
     params: SetLevelRequestParamsSchema
 });
@@ -2385,7 +2385,7 @@ export const SetLevelRequestSchema = JSONRPCRequestSchema.extend({
  *
  * @category `tools/call`
  */
-export const CallToolRequestSchema = JSONRPCRequestSchema.extend({
+export const CallToolRequestSchema = RequestSchema.extend({
     method: z.literal('tools/call'),
     params: CallToolRequestParamsSchema
 });
@@ -2543,7 +2543,7 @@ export const InitializeRequestParamsSchema = RequestParamsSchema.extend({
  *
  * @category `initialize`
  */
-export const InitializeRequestSchema = JSONRPCRequestSchema.extend({
+export const InitializeRequestSchema = RequestSchema.extend({
     method: z.literal('initialize'),
     params: InitializeRequestParamsSchema
 });
@@ -2944,7 +2944,7 @@ export const ClientRequestSchema = z.union([
  *
  * @category `elicitation/create`
  */
-export const ElicitRequestSchema = JSONRPCRequestSchema.extend({
+export const ElicitRequestSchema = RequestSchema.extend({
     method: z.literal('elicitation/create'),
     params: ElicitRequestParamsSchema
 });
@@ -3214,7 +3214,7 @@ export const ClientResultSchema = z.union([
  *
  * @category `sampling/createMessage`
  */
-export const CreateMessageRequestSchema = JSONRPCRequestSchema.extend({
+export const CreateMessageRequestSchema = RequestSchema.extend({
     method: z.literal('sampling/createMessage'),
     params: CreateMessageRequestParamsSchema
 });