feat: generate sdk.types.ts with SDK-compatible type hierarchy

Write pre-processed types to sdk.types.ts so types.ts can re-export them:

1. spec.types.ts → preProcessTypes() → sdk.types.ts
2. sdk.types.ts → ts-to-zod → sdk.schemas.ts
3. types.ts can now re-export from sdk.types.ts + sdk.schemas.ts

Generated files:
- sdk.types.ts: Types with `extends Request`/`Notification` (not JSONRPC*)
- sdk.schemas.ts: Zod schemas matching SDK hierarchy
- sdk.schemas.zod.test.ts: Integration tests

This enables types.ts to become a thin re-export layer in a follow-up.

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

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

Author: ochafik

scripts/generate-schemas.ts

@@ -39,9 +39,10 @@ const __dirname = dirname(__filename);
 const PROJECT_ROOT = join(__dirname, '..');
 
 const SPEC_TYPES_FILE = join(PROJECT_ROOT, 'src', 'spec.types.ts');
+const SDK_TYPES_FILE = join(PROJECT_ROOT, 'src', 'generated', 'sdk.types.ts');
 const GENERATED_DIR = join(PROJECT_ROOT, 'src', 'generated');
-const SCHEMA_OUTPUT_FILE = join(GENERATED_DIR, 'spec.schemas.ts');
-const SCHEMA_TEST_OUTPUT_FILE = join(GENERATED_DIR, 'spec.schemas.zod.test.ts');
+const SCHEMA_OUTPUT_FILE = join(GENERATED_DIR, 'sdk.schemas.ts');
+const SCHEMA_TEST_OUTPUT_FILE = join(GENERATED_DIR, 'sdk.schemas.zod.test.ts');
 
 // =============================================================================
 // Pre-processing: Transform spec types to SDK-compatible hierarchy
@@ -98,10 +99,28 @@ async function main() {
 
     // Read and pre-process spec types to match SDK hierarchy
     const rawSourceText = readFileSync(SPEC_TYPES_FILE, 'utf-8');
-    const sourceText = preProcessTypes(rawSourceText);
+    const sdkTypesContent = preProcessTypes(rawSourceText);
+
+    // Write pre-processed types to sdk.types.ts
+    const sdkTypesWithHeader = `/**
+ * SDK-compatible types generated from spec.types.ts
+ *
+ * This file is auto-generated by scripts/generate-schemas.ts
+ * DO NOT EDIT MANUALLY
+ *
+ * Transformations applied:
+ * - \`extends JSONRPCRequest\` → \`extends Request\`
+ * - \`extends JSONRPCNotification\` → \`extends Notification\`
+ *
+ * This allows SDK types to omit jsonrpc/id fields, which are
+ * handled at the transport layer.
+ */
+${sdkTypesContent.replace(/^\/\*\*[\s\S]*?\*\/\n/, '')}`;
+    writeFileSync(SDK_TYPES_FILE, sdkTypesWithHeader, 'utf-8');
+    console.log(`✅ Written: ${SDK_TYPES_FILE}`);
 
     const result = generate({
-        sourceText,
+        sourceText: sdkTypesContent,
         keepComments: true,
         skipParseJSDoc: false,
         // Use PascalCase naming to match existing types.ts convention
@@ -121,17 +140,17 @@ async function main() {
         console.warn('⚠️  Warning: Circular dependencies detected in types');
     }
 
-    // Generate schema file with relative import to spec.types
-    let schemasContent = result.getZodSchemasFile('../spec.types.js');
+    // Generate schema file with relative import to sdk.types
+    let schemasContent = result.getZodSchemasFile('./sdk.types.js');
     schemasContent = postProcess(schemasContent);
 
     writeFileSync(SCHEMA_OUTPUT_FILE, schemasContent, 'utf-8');
     console.log(`✅ Written: ${SCHEMA_OUTPUT_FILE}`);
 
     // Generate integration tests that verify schemas match TypeScript types
     const testsContent = result.getIntegrationTestFile(
-        '../spec.types.js',
-        './spec.schemas.js',
+        './sdk.types.js',
+        './sdk.schemas.js',
     );
     if (testsContent) {
         const processedTests = postProcessTests(testsContent);

src/generated/index.ts

@@ -1,12 +1,20 @@
 /**
- * Generated Zod Schemas for MCP SDK
+ * Generated Zod Schemas and Types for MCP SDK
  *
- * This module provides auto-generated Zod schemas from spec.types.ts,
- * post-processed for SDK compatibility.
+ * This module provides:
+ * - sdk.types.ts: Pre-processed types with SDK-compatible hierarchy
+ * - sdk.schemas.ts: Zod schemas generated from sdk.types.ts
  *
- * @see spec.types.ts - MCP specification types
- * @see spec.schemas.ts - Auto-generated Zod schemas
- * @see ../types.ts - Production schemas with SDK extras
+ * Pre-processing transforms:
+ * - `extends JSONRPCRequest` → `extends Request`
+ * - `extends JSONRPCNotification` → `extends Notification`
+ *
+ * This allows SDK types/schemas to omit jsonrpc/id fields, which are
+ * handled at the transport layer.
+ *
+ * @see sdk.types.ts - Pre-processed types (SDK hierarchy)
+ * @see sdk.schemas.ts - Generated Zod schemas
+ * @see ../types.ts - Re-exports from here + SDK extras
  */
 
 // =============================================================================
@@ -200,10 +208,10 @@ export {
     ServerRequestSchema,
     ServerNotificationSchema,
     ServerResultSchema
-} from './spec.schemas.js';
+} from './sdk.schemas.js';
 
 // =============================================================================
-// Spec Types (interfaces and type aliases)
+// SDK-Compatible Types (pre-processed from spec.types.ts)
 // =============================================================================
 
 export type {
@@ -393,7 +401,7 @@ export type {
     ServerRequest,
     ServerNotification,
     ServerResult
-} from '../spec.types.js';
+} from './sdk.types.js';
 
 // =============================================================================
 // SDK Constants (from types.ts, not spec)

src/generated/spec.schemas.ts src/generated/sdk.schemas.tssrc/generated/spec.schemas.ts renamed to src/generated/sdk.schemas.ts

@@ -3,8 +3,8 @@
 // Run: npm run generate:schemas
 import { z } from 'zod/v4';
 
-import * as spec from '../spec.types.js';
-import * as generated from './spec.schemas.js';
+import * as spec from './sdk.types.js';
+import * as generated from './sdk.schemas.js';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function expectType<T>(_: T) {