Skip to content

Commit 362db92

Browse files
m-paternostrom-paternostro
authored
Merge branch 'modelcontextprotocol:main' into mp/delegatedauth
2 parents 96d2b31 + 6b3d326 commit 362db92

File tree

13 files changed

+378
-23
lines changed

13 files changed

+378
-23
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@modelcontextprotocol/sdk",
3-
"version": "1.12.2",
3+
"version": "1.12.3",
44
"description": "Model Context Protocol implementation for TypeScript",
55
"license": "MIT",
66
"author": "Anthropic, PBC (https://anthropic.com)",

‎src/client/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ export class Client<
165165

166166
this._serverCapabilities = result.capabilities;
167167
this._serverVersion = result.serverInfo;
168+
// HTTP transports must set the protocol version in each header after initialization.
169+
if (transport.setProtocolVersion) {
170+
transport.setProtocolVersion(result.protocolVersion);
171+
}
168172

169173
this._instructions = result.instructions;
170174

‎src/client/sse.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export class SSEClientTransport implements Transport {
6262
private _eventSourceInit?: EventSourceInit;
6363
private _requestInit?: RequestInit;
6464
private _authProvider?: OAuthClientProvider;
65+
private _protocolVersion?: string;
6566

6667
onclose?: () => void;
6768
onerror?: (error: Error) => void;
@@ -99,13 +100,18 @@ export class SSEClientTransport implements Transport {
99100
}
100101

101102
private async _commonHeaders(): Promise<HeadersInit> {
102-
const headers: HeadersInit = { ...this._requestInit?.headers };
103+
const headers = {
104+
...this._requestInit?.headers,
105+
} as HeadersInit & Record<string, string>;
103106
if (this._authProvider) {
104107
const tokens = await this._authProvider.tokens();
105108
if (tokens) {
106-
(headers as Record<string, string>)["Authorization"] = `Bearer ${tokens.access_token}`;
109+
headers["Authorization"] = `Bearer ${tokens.access_token}`;
107110
}
108111
}
112+
if (this._protocolVersion) {
113+
headers["mcp-protocol-version"] = this._protocolVersion;
114+
}
109115

110116
return headers;
111117
}
@@ -214,7 +220,7 @@ export class SSEClientTransport implements Transport {
214220

215221
try {
216222
const commonHeaders = await this._commonHeaders();
217-
const headers = new Headers({ ...commonHeaders, ...this._requestInit?.headers });
223+
const headers = new Headers(commonHeaders);
218224
headers.set("content-type", "application/json");
219225
const init = {
220226
...this._requestInit,
@@ -249,4 +255,8 @@ export class SSEClientTransport implements Transport {
249255
throw error;
250256
}
251257
}
258+
259+
setProtocolVersion(version: string): void {
260+
this._protocolVersion = version;
261+
}
252262
}

‎src/client/streamableHttp.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ export class StreamableHTTPClientTransport implements Transport {
124124
private _authProvider?: OAuthClientProvider;
125125
private _sessionId?: string;
126126
private _reconnectionOptions: StreamableHTTPReconnectionOptions;
127+
private _protocolVersion?: string;
127128

128129
onclose?: () => void;
129130
onerror?: (error: Error) => void;
@@ -162,7 +163,7 @@ export class StreamableHTTPClientTransport implements Transport {
162163
}
163164

164165
private async _commonHeaders(): Promise<Headers> {
165-
const headers: HeadersInit = {};
166+
const headers: HeadersInit & Record<string, string> = {};
166167
if (this._authProvider) {
167168
const tokens = await this._authProvider.tokens();
168169
if (tokens) {
@@ -173,6 +174,9 @@ export class StreamableHTTPClientTransport implements Transport {
173174
if (this._sessionId) {
174175
headers["mcp-session-id"] = this._sessionId;
175176
}
177+
if (this._protocolVersion) {
178+
headers["mcp-protocol-version"] = this._protocolVersion;
179+
}
176180

177181
return new Headers(
178182
{ ...headers, ...this._requestInit?.headers }
@@ -516,4 +520,11 @@ export class StreamableHTTPClientTransport implements Transport {
516520
throw error;
517521
}
518522
}
523+
524+
setProtocolVersion(version: string): void {
525+
this._protocolVersion = version;
526+
}
527+
get protocolVersion(): string | undefined {
528+
return this._protocolVersion;
529+
}
519530
}

‎src/integration-tests/stateManagementStreamableHttp.test.ts

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Client } from '../client/index.js';
55
import { StreamableHTTPClientTransport } from '../client/streamableHttp.js';
66
import { McpServer } from '../server/mcp.js';
77
import { StreamableHTTPServerTransport } from '../server/streamableHttp.js';
8-
import { CallToolResultSchema, ListToolsResultSchema, ListResourcesResultSchema, ListPromptsResultSchema } from '../types.js';
8+
import { CallToolResultSchema, ListToolsResultSchema, ListResourcesResultSchema, ListPromptsResultSchema, DEFAULT_NEGOTIATED_PROTOCOL_VERSION } from '../types.js';
99
import { z } from 'zod';
1010

1111
describe('Streamable HTTP Transport Session Management', () => {
@@ -211,6 +211,27 @@ describe('Streamable HTTP Transport Session Management', () => {
211211
// Clean up
212212
await transport.close();
213213
});
214+
215+
it('should set protocol version after connecting', async () => {
216+
// Create and connect a client
217+
const client = new Client({
218+
name: 'test-client',
219+
version: '1.0.0'
220+
});
221+
222+
const transport = new StreamableHTTPClientTransport(baseUrl);
223+
224+
// Verify protocol version is not set before connecting
225+
expect(transport.protocolVersion).toBeUndefined();
226+
227+
await client.connect(transport);
228+
229+
// Verify protocol version is set after connecting
230+
expect(transport.protocolVersion).toBe(DEFAULT_NEGOTIATED_PROTOCOL_VERSION);
231+
232+
// Clean up
233+
await transport.close();
234+
});
214235
});
215236

216237
describe('Stateful Mode', () => {

‎src/server/index.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,12 @@ export class Server<
251251
this._clientCapabilities = request.params.capabilities;
252252
this._clientVersion = request.params.clientInfo;
253253

254-
return {
255-
protocolVersion: SUPPORTED_PROTOCOL_VERSIONS.includes(requestedVersion)
254+
const protocolVersion = SUPPORTED_PROTOCOL_VERSIONS.includes(requestedVersion)
256255
? requestedVersion
257-
: LATEST_PROTOCOL_VERSION,
256+
: LATEST_PROTOCOL_VERSION;
257+
258+
return {
259+
protocolVersion,
258260
capabilities: this.getCapabilities(),
259261
serverInfo: this._serverInfo,
260262
...(this._instructions && { instructions: this._instructions }),

‎src/server/mcp.test.ts

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3457,4 +3457,144 @@ describe("prompt()", () => {
34573457
expect(typeof receivedRequestId === 'string' || typeof receivedRequestId === 'number').toBe(true);
34583458
expect(result.messages[0].content.text).toContain("Received request ID:");
34593459
});
3460+
3461+
/***
3462+
* Test: Resource Template Metadata Priority
3463+
*/
3464+
test("should prioritize individual resource metadata over template metadata", async () => {
3465+
const mcpServer = new McpServer({
3466+
name: "test server",
3467+
version: "1.0",
3468+
});
3469+
const client = new Client({
3470+
name: "test client",
3471+
version: "1.0",
3472+
});
3473+
3474+
mcpServer.resource(
3475+
"test",
3476+
new ResourceTemplate("test://resource/{id}", {
3477+
list: async () => ({
3478+
resources: [
3479+
{
3480+
name: "Resource 1",
3481+
uri: "test://resource/1",
3482+
description: "Individual resource description",
3483+
mimeType: "text/plain",
3484+
},
3485+
{
3486+
name: "Resource 2",
3487+
uri: "test://resource/2",
3488+
// This resource has no description or mimeType
3489+
},
3490+
],
3491+
}),
3492+
}),
3493+
{
3494+
description: "Template description",
3495+
mimeType: "application/json",
3496+
},
3497+
async (uri) => ({
3498+
contents: [
3499+
{
3500+
uri: uri.href,
3501+
text: "Test content",
3502+
},
3503+
],
3504+
}),
3505+
);
3506+
3507+
const [clientTransport, serverTransport] =
3508+
InMemoryTransport.createLinkedPair();
3509+
3510+
await Promise.all([
3511+
client.connect(clientTransport),
3512+
mcpServer.server.connect(serverTransport),
3513+
]);
3514+
3515+
const result = await client.request(
3516+
{
3517+
method: "resources/list",
3518+
},
3519+
ListResourcesResultSchema,
3520+
);
3521+
3522+
expect(result.resources).toHaveLength(2);
3523+
3524+
// Resource 1 should have its own metadata
3525+
expect(result.resources[0].name).toBe("Resource 1");
3526+
expect(result.resources[0].description).toBe("Individual resource description");
3527+
expect(result.resources[0].mimeType).toBe("text/plain");
3528+
3529+
// Resource 2 should inherit template metadata
3530+
expect(result.resources[1].name).toBe("Resource 2");
3531+
expect(result.resources[1].description).toBe("Template description");
3532+
expect(result.resources[1].mimeType).toBe("application/json");
3533+
});
3534+
3535+
/***
3536+
* Test: Resource Template Metadata Overrides All Fields
3537+
*/
3538+
test("should allow resource to override all template metadata fields", async () => {
3539+
const mcpServer = new McpServer({
3540+
name: "test server",
3541+
version: "1.0",
3542+
});
3543+
const client = new Client({
3544+
name: "test client",
3545+
version: "1.0",
3546+
});
3547+
3548+
mcpServer.resource(
3549+
"test",
3550+
new ResourceTemplate("test://resource/{id}", {
3551+
list: async () => ({
3552+
resources: [
3553+
{
3554+
name: "Overridden Name",
3555+
uri: "test://resource/1",
3556+
description: "Overridden description",
3557+
mimeType: "text/markdown",
3558+
// Add any other metadata fields if they exist
3559+
},
3560+
],
3561+
}),
3562+
}),
3563+
{
3564+
name: "Template Name",
3565+
description: "Template description",
3566+
mimeType: "application/json",
3567+
},
3568+
async (uri) => ({
3569+
contents: [
3570+
{
3571+
uri: uri.href,
3572+
text: "Test content",
3573+
},
3574+
],
3575+
}),
3576+
);
3577+
3578+
const [clientTransport, serverTransport] =
3579+
InMemoryTransport.createLinkedPair();
3580+
3581+
await Promise.all([
3582+
client.connect(clientTransport),
3583+
mcpServer.server.connect(serverTransport),
3584+
]);
3585+
3586+
const result = await client.request(
3587+
{
3588+
method: "resources/list",
3589+
},
3590+
ListResourcesResultSchema,
3591+
);
3592+
3593+
expect(result.resources).toHaveLength(1);
3594+
3595+
// All fields should be from the individual resource, not the template
3596+
expect(result.resources[0].name).toBe("Overridden Name");
3597+
expect(result.resources[0].description).toBe("Overridden description");
3598+
expect(result.resources[0].mimeType).toBe("text/markdown");
3599+
});
34603600
});

‎src/server/mcp.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,9 @@ export class McpServer {
373373
const result = await template.resourceTemplate.listCallback(extra);
374374
for (const resource of result.resources) {
375375
templateResources.push({
376-
...resource,
377376
...template.metadata,
377+
// the defined resource metadata should override the template metadata if present
378+
...resource,
378379
});
379380
}
380381
}

‎src/server/sse.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const MAXIMUM_MESSAGE_SIZE = "4mb";
1717
export class SSEServerTransport implements Transport {
1818
private _sseResponse?: ServerResponse;
1919
private _sessionId: string;
20-
2120
onclose?: () => void;
2221
onerror?: (error: Error) => void;
2322
onmessage?: (message: JSONRPCMessage, extra?: { authInfo?: AuthInfo }) => void;

0 commit comments

Comments
 (0)