feat(core): include OAuth schemas in specTypeSchema() map

specTypeSchema()/isSpecType() now also cover the OAuth/OpenID types from
shared/auth.ts (OAuthTokens, OAuthMetadata, OAuthClientMetadata, etc.),
addressing the standalone-validation use noted in #1680 for auth
implementers.

Author: felixweinberger

packages/core/src/types/specTypeSchema.ts

@@ -1,9 +1,10 @@
 import type * as z from 'zod/v4';
 
+import * as authSchemas from '../shared/auth.js';
 import type { StandardSchemaV1 } from '../util/standardSchema.js';
 import * as schemas from './schemas.js';
 
-type SchemaModule = typeof schemas;
+type SchemaModule = typeof schemas & typeof authSchemas;
 
 type StripSchemaSuffix<K> = K extends `${infer N}Schema` ? N : never;
 
@@ -17,8 +18,9 @@ type SchemaKey = {
 }[keyof SchemaModule];
 
 /**
- * Union of every named type in the MCP spec schema (e.g. `'CallToolResult'`, `'ContentBlock'`,
- * `'Tool'`). Derived from the SDK's internal Zod schemas, so it stays in sync with the spec.
+ * Union of every named type in the SDK's protocol and OAuth schemas (e.g. `'CallToolResult'`,
+ * `'ContentBlock'`, `'Tool'`, `'OAuthTokens'`). Derived from the internal Zod schemas, so it stays
+ * in sync with the spec.
  */
 export type SpecTypeName = StripSchemaSuffix<SchemaKey>;
 
@@ -32,9 +34,11 @@ export type SpecTypes = {
 };
 
 const specTypeSchemas: Record<string, z.ZodTypeAny> = {};
-for (const [key, value] of Object.entries(schemas)) {
-    if (key.endsWith('Schema') && value !== null && typeof value === 'object') {
-        specTypeSchemas[key.slice(0, -'Schema'.length)] = value as z.ZodTypeAny;
+for (const source of [schemas, authSchemas]) {
+    for (const [key, value] of Object.entries(source)) {
+        if (key.endsWith('Schema') && value !== null && typeof value === 'object') {
+            specTypeSchemas[key.slice(0, -'Schema'.length)] = value as z.ZodTypeAny;
+        }
     }
 }
 

packages/core/test/types/specTypeSchema.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, expectTypeOf, it } from 'vitest';
 
+import type { OAuthMetadata, OAuthTokens } from '../../src/shared/auth.js';
 import type { SpecTypeName, SpecTypes } from '../../src/types/specTypeSchema.js';
 import { isSpecType, specTypeSchema } from '../../src/types/specTypeSchema.js';
 import type { CallToolResult, ContentBlock, Implementation, JSONRPCRequest, Tool } from '../../src/types/types.js';
@@ -25,6 +26,13 @@ describe('specTypeSchema()', () => {
         const ok = specTypeSchema('JSONRPCRequest')['~standard'].validate({ jsonrpc: '2.0', id: 1, method: 'ping' });
         expect((ok as { issues?: unknown }).issues).toBeUndefined();
     });
+
+    it('covers OAuth types from shared/auth.ts', () => {
+        const ok = specTypeSchema('OAuthTokens')['~standard'].validate({ access_token: 'x', token_type: 'Bearer' });
+        expect((ok as { issues?: unknown }).issues).toBeUndefined();
+        const bad = specTypeSchema('OAuthTokens')['~standard'].validate({ token_type: 'Bearer' });
+        expect((bad as { issues?: readonly unknown[] }).issues?.length).toBeGreaterThan(0);
+    });
 });
 
 describe('isSpecType()', () => {
@@ -65,6 +73,8 @@ describe('SpecTypeName / SpecTypes (type-level)', () => {
         expectTypeOf<'Tool'>().toMatchTypeOf<SpecTypeName>();
         expectTypeOf<'Implementation'>().toMatchTypeOf<SpecTypeName>();
         expectTypeOf<'JSONRPCRequest'>().toMatchTypeOf<SpecTypeName>();
+        expectTypeOf<'OAuthTokens'>().toMatchTypeOf<SpecTypeName>();
+        expectTypeOf<'OAuthMetadata'>().toMatchTypeOf<SpecTypeName>();
     });
 
     it('SpecTypes[K] matches the named export type', () => {
@@ -73,5 +83,7 @@ describe('SpecTypeName / SpecTypes (type-level)', () => {
         expectTypeOf<SpecTypes['Tool']>().toEqualTypeOf<Tool>();
         expectTypeOf<SpecTypes['Implementation']>().toEqualTypeOf<Implementation>();
         expectTypeOf<SpecTypes['JSONRPCRequest']>().toEqualTypeOf<JSONRPCRequest>();
+        expectTypeOf<SpecTypes['OAuthTokens']>().toEqualTypeOf<OAuthTokens>();
+        expectTypeOf<SpecTypes['OAuthMetadata']>().toEqualTypeOf<OAuthMetadata>();
     });
 });