fix: reorder schema unions and fix stdio test type errors

- Reorder EnumSchemaSchema union: LegacyTitledEnumSchemaSchema first
  (preserves enumNames field that would be stripped by UntitledSingleSelectEnumSchema)
- Fix stdio test type narrowing for JSONRPCMessage union type

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

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

Author: ochafik

scripts/generate-schemas.ts

@@ -705,6 +705,24 @@ function postProcess(content: string): string {
         console.log('    ✓ Added .passthrough() to ToolSchema.outputSchema');
     }
 
+    // Reorder PrimitiveSchemaDefinitionSchema union: EnumSchemaSchema must come FIRST
+    // Otherwise, { type: 'string', enum: [...] } matches StringSchemaSchema and loses the enum field
+    const primitiveUnionPattern = /PrimitiveSchemaDefinitionSchema\s*=\s*z\s*\n?\s*\.union\(\[StringSchemaSchema,\s*NumberSchemaSchema,\s*BooleanSchemaSchema,\s*EnumSchemaSchema\]\)/;
+    const reorderedUnion = 'PrimitiveSchemaDefinitionSchema = z\n    .union([EnumSchemaSchema, BooleanSchemaSchema, StringSchemaSchema, NumberSchemaSchema])';
+    if (primitiveUnionPattern.test(content)) {
+        content = content.replace(primitiveUnionPattern, reorderedUnion);
+        console.log('    ✓ Reordered PrimitiveSchemaDefinitionSchema union (EnumSchemaSchema first)');
+    }
+
+    // Reorder EnumSchemaSchema union: LegacyTitledEnumSchemaSchema must come FIRST
+    // Otherwise, { type: 'string', enum: [...], enumNames: [...] } matches UntitledSingleSelectEnumSchema and loses enumNames
+    const enumUnionPattern = /EnumSchemaSchema\s*=\s*z\.union\(\[SingleSelectEnumSchemaSchema,\s*MultiSelectEnumSchemaSchema,\s*LegacyTitledEnumSchemaSchema\]\)/;
+    const reorderedEnumUnion = 'EnumSchemaSchema = z.union([LegacyTitledEnumSchemaSchema, SingleSelectEnumSchemaSchema, MultiSelectEnumSchemaSchema])';
+    if (enumUnionPattern.test(content)) {
+        content = content.replace(enumUnionPattern, reorderedEnumUnion);
+        console.log('    ✓ Reordered EnumSchemaSchema union (LegacyTitledEnumSchemaSchema first)');
+    }
+
     // AST-based transforms using ts-morph
     const project = new Project({ useInMemoryFileSystem: true });
     const sourceFile = project.createSourceFile('schemas.ts', content);

src/generated/sdk.schemas.ts

@@ -1784,7 +1784,7 @@ export const LegacyTitledEnumSchemaSchema = z
  * @category `elicitation/create`
  */
 // Union type for all enum schemas
-export const EnumSchemaSchema = z.union([SingleSelectEnumSchemaSchema, MultiSelectEnumSchemaSchema, LegacyTitledEnumSchemaSchema]);
+export const EnumSchemaSchema = z.union([LegacyTitledEnumSchemaSchema, SingleSelectEnumSchemaSchema, MultiSelectEnumSchemaSchema]);
 
 /**
  * @description The client's response to an elicitation request.
@@ -2303,7 +2303,7 @@ without nested objects or arrays.
  * @category `elicitation/create`
  */
 export const PrimitiveSchemaDefinitionSchema = z
-    .union([StringSchemaSchema, NumberSchemaSchema, BooleanSchemaSchema, EnumSchemaSchema])
+    .union([EnumSchemaSchema, BooleanSchemaSchema, StringSchemaSchema, NumberSchemaSchema])
     .describe('Restricted schema definitions that only allow primitive types\nwithout nested objects or arrays.');
 
 /**

test/client/stdio.test.ts

@@ -54,7 +54,8 @@ test('should read messages', async () => {
 
             // Compare message content instead of JSON.stringify (Zod reorders keys)
             const msg1 = messages[1];
-            if (message.method === msg1.method && message.jsonrpc === msg1.jsonrpc) {
+            if ('method' in message && 'method' in msg1 &&
+                message.method === msg1.method && message.jsonrpc === msg1.jsonrpc) {
                 resolve();
             }
         };

test/server/stdio.test.ts

@@ -89,7 +89,8 @@ test('should read multiple messages', async () => {
             readMessages.push(message);
             // Compare message content instead of JSON.stringify (Zod reorders keys)
             const msg1 = messages[1];
-            if (message.method === msg1.method && message.jsonrpc === msg1.jsonrpc) {
+            if ('method' in message && 'method' in msg1 &&
+                message.method === msg1.method && message.jsonrpc === msg1.jsonrpc) {
                 resolve();
             }
         };