Merge branch 'main' into feature/ts-sdk-hooks

Author: KKonstantinov

packages/core/src/types/spec.types.ts

@@ -586,7 +586,7 @@ export interface ClientCapabilities {
      * @example Extensions — UI extension with MIME type support
      * {@includeCode ./examples/ClientCapabilities/extensions-ui-mime-types.json}
      */
-    extensions?: { [key: string]: object };
+    extensions?: { [key: string]: JSONObject };
 }
 
 /**
@@ -703,7 +703,7 @@ export interface ServerCapabilities {
      * @example Extensions — UI extension support
      * {@includeCode ./examples/ServerCapabilities/extensions-ui.json}
      */
-    extensions?: { [key: string]: object };
+    extensions?: { [key: string]: JSONObject };
 }
 
 /**

packages/core/src/types/types.ts

@@ -557,7 +557,11 @@ export const ClientCapabilitiesSchema = z.object({
     /**
      * Present if the client supports task creation.
      */
-    tasks: ClientTasksCapabilitySchema.optional()
+    tasks: ClientTasksCapabilitySchema.optional(),
+    /**
+     * Extensions that the client supports. Keys are extension identifiers (vendor-prefix/extension-name).
+     */
+    extensions: z.record(z.string(), JSONObjectSchema).optional()
 });
 
 export const InitializeRequestParamsSchema = BaseRequestParamsSchema.extend({
@@ -635,7 +639,11 @@ export const ServerCapabilitiesSchema = z.object({
     /**
      * Present if the server supports task creation.
      */
-    tasks: ServerTasksCapabilitySchema.optional()
+    tasks: ServerTasksCapabilitySchema.optional(),
+    /**
+     * Extensions that the server supports. Keys are extension identifiers (vendor-prefix/extension-name).
+     */
+    extensions: z.record(z.string(), JSONObjectSchema).optional()
 });
 
 /**
@@ -2340,7 +2348,7 @@ export class ProtocolError extends Error {
         message: string,
         public readonly data?: unknown
     ) {
-        super(`MCP error ${code}: ${message}`);
+        super(message);
         this.name = 'ProtocolError';
     }
 

test/conformance/README.md

@@ -60,8 +60,24 @@ npx @modelcontextprotocol/conformance server \
 
 ## Files
 
-- `everything-client.ts` - Client that handles all client conformance scenarios
-- `everything-server.ts` - Server that implements all server conformance features
-- `helpers/` - Shared utilities for conformance tests
+- `src/everythingClient.ts` - Client that handles all client conformance scenarios
+- `src/everythingServer.ts` - Server that implements all server conformance features
+- `src/authTestServer.ts` - Server with OAuth authentication for auth conformance tests
+- `src/helpers/` - Shared utilities for conformance tests
+- `scripts/` - Conformance test runner scripts
 
-Scripts are in `scripts/` at the repo root.
+## Auth Test Server
+
+The `authTestServer.ts` is designed for testing server-side OAuth implementation. It requires an authorization server URL and validates tokens via introspection.
+
+```bash
+# Start with a fake auth server
+MCP_CONFORMANCE_AUTH_SERVER_URL=http://localhost:3000 \
+  npx tsx src/authTestServer.ts
+```
+
+The server:
+
+- Requires Bearer token authentication on all MCP endpoints
+- Validates tokens via the AS's introspection endpoint (RFC 7662)
+- Serves Protected Resource Metadata at `/.well-known/oauth-protected-resource`