modelcontextprotocol/csharp-sdk
Watch
1
0
Fork
You've already forked csharp-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Gate 2026-07-28 result fields on negotiated protocol version (#1721) (#1753)

Browse source 
Co-authored-by: Tarek Mahmoud Sayed <tarekms@ntdev.microsoft.com>
Copilot-Session: 80653343-5dcb-43cb-89b0-8ac8e572c4f7
This commit is contained in:
Tarek Mahmoud Sayed 2026-07-27 12:57:50 -07:00 • committed by GitHub
commit 6787c0cc19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 219 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

112
tests/ModelContextProtocol.Tests/Server/ProtocolVersionResultDecorationTests.cs Normal file
View file

@ -0,0 +1,112 @@
using Microsoft.Extensions.DependencyInjection;
using ModelContextProtocol.Client;
using ModelContextProtocol.Protocol;
using ModelContextProtocol.Server;
namespace ModelContextProtocol.Tests.Server;
/// <summary>
/// Regression tests for issue #1721: the SDK-provided <c>resultType</c>, <c>ttlMs</c>, and
/// <c>cacheScope</c> result decorations are exclusive to the 2026-07-28 protocol revision and
/// must be absent from result objects on a session negotiated to an earlier revision
/// (e.g. <c>2025-11-25</c>). Emitting them breaks clients that strictly validate the 2025-11-25
/// schema.
/// </summary>
/// <remarks>
/// These drive the in-process <see cref="ClientServerTestBase"/> client/server pair and inspect the
/// raw JSON-RPC result wire shape (via <see cref="McpSession.SendRequestAsync(JsonRpcRequest, System.Threading.CancellationToken)"/>)
/// so the assertions are about the actual serialized fields rather than deserialized objects.
/// <c>tools/list</c> exercises the <c>SetHandler</c> decoration path (its result is both an
/// <see cref="ICacheableResult"/> and a <see cref="Result"/>), while <c>tools/call</c> exercises the
/// <c>SetWithAlternateHandler</c> path.
/// </remarks>
public class ProtocolVersionResultDecorationTests : ClientServerTestBase
{
public ProtocolVersionResultDecorationTests(ITestOutputHelper testOutputHelper)
: base(testOutputHelper)
{
}
protected override void ConfigureServices(ServiceCollection services, IMcpServerBuilder mcpServerBuilder)
{
mcpServerBuilder.WithTools([McpServerTool.Create(() => "ok", new() { Name = "echo" })]);
}
[Fact]
public async Task ToolsList_On2025_11_25Session_OmitsResultTypeAndCacheHints()
{
await using var client = await CreateMcpClientForServer(
new McpClientOptions { ProtocolVersion = McpProtocolVersions.November2025ProtocolVersion });
Assert.Equal(McpProtocolVersions.November2025ProtocolVersion, client.NegotiatedProtocolVersion);
var response = await client.SendRequestAsync(
new JsonRpcRequest { Method = RequestMethods.ToolsList },
TestContext.Current.CancellationToken);
var result = response.Result!.AsObject();
Assert.False(result.ContainsKey("resultType"), "resultType must be absent on a 2025-11-25 tools/list result.");
Assert.False(result.ContainsKey("ttlMs"), "ttlMs must be absent on a 2025-11-25 tools/list result.");
Assert.False(result.ContainsKey("cacheScope"), "cacheScope must be absent on a 2025-11-25 tools/list result.");
}
[Fact]
public async Task ToolsCall_On2025_11_25Session_OmitsResultType()
{
await using var client = await CreateMcpClientForServer(
new McpClientOptions { ProtocolVersion = McpProtocolVersions.November2025ProtocolVersion });
Assert.Equal(McpProtocolVersions.November2025ProtocolVersion, client.NegotiatedProtocolVersion);
var response = await client.SendRequestAsync(
new JsonRpcRequest
{
Method = RequestMethods.ToolsCall,
Params = System.Text.Json.JsonSerializer.SerializeToNode(
new CallToolRequestParams { Name = "echo" }, McpJsonUtilities.DefaultOptions),
},
TestContext.Current.CancellationToken);
var result = response.Result!.AsObject();
Assert.False(result.ContainsKey("resultType"), "resultType must be absent on a 2025-11-25 tools/call result.");
}
[Fact]
public async Task ToolsList_On2026_07_28Session_IncludesResultTypeAndCacheHints()
{
await using var client = await CreateMcpClientForServer(
new McpClientOptions { ProtocolVersion = McpProtocolVersions.July2026ProtocolVersion });
Assert.Equal(McpProtocolVersions.July2026ProtocolVersion, client.NegotiatedProtocolVersion);
var response = await client.SendRequestAsync(
new JsonRpcRequest { Method = RequestMethods.ToolsList },
TestContext.Current.CancellationToken);
var result = response.Result!.AsObject();
Assert.Equal("complete", result["resultType"]!.GetValue<string>());
Assert.True(result.ContainsKey("ttlMs"), "ttlMs must be present on a 2026-07-28 tools/list result.");
Assert.True(result.ContainsKey("cacheScope"), "cacheScope must be present on a 2026-07-28 tools/list result.");
}
[Fact]
public async Task ToolsCall_On2026_07_28Session_IncludesResultType()
{
await using var client = await CreateMcpClientForServer(
new McpClientOptions { ProtocolVersion = McpProtocolVersions.July2026ProtocolVersion });
Assert.Equal(McpProtocolVersions.July2026ProtocolVersion, client.NegotiatedProtocolVersion);
var response = await client.SendRequestAsync(
new JsonRpcRequest
{
Method = RequestMethods.ToolsCall,
Params = System.Text.Json.JsonSerializer.SerializeToNode(
new CallToolRequestParams { Name = "echo" }, McpJsonUtilities.DefaultOptions),
},
TestContext.Current.CancellationToken);
var result = response.Result!.AsObject();
Assert.Equal("complete", result["resultType"]!.GetValue<string>());
}
}