Merge origin/main into feature/sep-990

Conflicts:
  test/conformance/src/everythingClient.ts
    - kept both pre-registration (from #1650) and cross-app-access
      discriminated union variants

Also: drop unused OAuthClientInformation import from crossAppAccess.ts
(lint failure from ef35f0b).

Author: pcarleton

CLAUDE.md

@@ -102,10 +102,10 @@ The SDK uses `zod/v4` internally. Schema utilities live in:
 
 ### Validation
 
-Pluggable JSON Schema validation (`packages/core/src/validation/`):
+Pluggable JSON Schema validation (`packages/core/src/validators/`):
 
-- `ajv-provider.ts` - Default Ajv-based validator
-- `cfworker-provider.ts` - Cloudflare Workers-compatible alternative
+- `ajvProvider.ts` - Default Ajv-based validator
+- `cfWorkerProvider.ts` - Cloudflare Workers-compatible alternative
 
 ### Examples
 

packages/client/src/client/crossAppAccess.ts

@@ -8,7 +8,7 @@
  * @module
  */
 
-import type { FetchLike, OAuthClientInformation } from '@modelcontextprotocol/core';
+import type { FetchLike } from '@modelcontextprotocol/core';
 import { IdJagTokenExchangeResponseSchema, OAuthErrorResponseSchema, OAuthTokensSchema } from '@modelcontextprotocol/core';
 
 import type { ClientAuthMethod } from './auth.js';

packages/core/src/index.examples.ts

@@ -7,8 +7,8 @@
  * @module
  */
 
-import { AjvJsonSchemaValidator } from './validation/ajvProvider.js';
-import { CfWorkerJsonSchemaValidator } from './validation/cfWorkerProvider.js';
+import { AjvJsonSchemaValidator } from './validators/ajvProvider.js';
+import { CfWorkerJsonSchemaValidator } from './validators/cfWorkerProvider.js';
 
 /**
  * Example: AJV validator for Node.js.

packages/core/src/index.ts

@@ -15,20 +15,20 @@ export * from './util/schema.js';
 
 // experimental exports
 export * from './experimental/index.js';
-export * from './validation/ajvProvider.js';
-export * from './validation/cfWorkerProvider.js';
+export * from './validators/ajvProvider.js';
+export * from './validators/cfWorkerProvider.js';
 /**
  * JSON Schema validation
  *
  * This module provides configurable JSON Schema validation for the MCP SDK.
  * Choose a validator based on your runtime environment:
  *
  * - {@linkcode AjvJsonSchemaValidator}: Best for Node.js (default, fastest)
- *   Import from: @modelcontextprotocol/sdk/validation/ajv
+ *   Import from: @modelcontextprotocol/sdk/validators/ajv
  *   Requires peer dependencies: ajv, ajv-formats
  *
  * - {@linkcode CfWorkerJsonSchemaValidator}: Best for edge runtimes
- *   Import from: @modelcontextprotocol/sdk/validation/cfworker
+ *   Import from: @modelcontextprotocol/sdk/validators/cfworker
  *   Requires peer dependency: @cfworker/json-schema
  *
  * @example For Node.js with AJV
@@ -45,4 +45,4 @@ export * from './validation/cfWorkerProvider.js';
  */
 
 // Core types only - implementations are exported via separate entry points
-export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validation/types.js';
+export type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator, JsonSchemaValidatorResult } from './validators/types.js';