using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; using ModelContextProtocol.Client; using ModelContextProtocol.Protocol; using ModelContextProtocol.Server; using ModelContextProtocol.Tests.Utils; using System.Collections.Concurrent; using System.Net; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; namespace ModelContextProtocol.AspNetCore.Tests; public class MapMcpStreamableHttpTests(ITestOutputHelper outputHelper) : MapMcpTests(outputHelper) { protected override bool UseStreamableHttp => true; protected override bool Stateless => false; [Theory] [InlineData("/a", "/a")] [InlineData("/a", "/a/")] [InlineData("/a/", "/a/")] [InlineData("/a/", "/a")] [InlineData("/a/b", "/a/b")] public async Task CanConnect_WithMcpClient_AfterCustomizingRoute(string routePattern, string requestPath) { Builder.Services.AddMcpServer(options => { options.ServerInfo = new() { Name = "TestCustomRouteServer", Version = "1.0.0", }; }).WithHttpTransport(ConfigureStateless); await using var app = Builder.Build(); app.MapMcp(routePattern); await app.StartAsync(TestContext.Current.CancellationToken); await using var mcpClient = await ConnectAsync(requestPath); Assert.Equal("TestCustomRouteServer", mcpClient.ServerInfo.Name); } [Fact] public async Task StreamableHttpMode_Works_WithRootEndpoint() { Builder.Services.AddMcpServer(options => { options.ServerInfo = new() { Name = "StreamableHttpTestServer", Version = "1.0.0", }; }).WithHttpTransport(ConfigureStateless); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var mcpClient = await ConnectAsync("/", new() { Endpoint = new("http://localhost:5000/"), TransportMode = HttpTransportMode.AutoDetect }); Assert.Equal("StreamableHttpTestServer", mcpClient.ServerInfo.Name); } [Fact] public async Task AutoDetectMode_Works_WithRootEndpoint() { Builder.Services.AddMcpServer(options => { options.ServerInfo = new() { Name = "AutoDetectTestServer", Version = "1.0.0", }; }).WithHttpTransport(ConfigureStateless); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var mcpClient = await ConnectAsync("/", new() { Endpoint = new("http://localhost:5000/"), TransportMode = HttpTransportMode.AutoDetect }); Assert.Equal("AutoDetectTestServer", mcpClient.ServerInfo.Name); } [Fact] public async Task BrowserPreflight_AllowsConfiguredOrigin_AndRequiredHeaders() { Builder.Services.AddCors(options => { options.AddPolicy("BrowserClient", policy => { policy.WithOrigins("http://localhost:5173") .WithMethods("GET", "POST", "DELETE") .WithHeaders("Content-Type", "Authorization", "MCP-Protocol-Version", "Mcp-Session-Id") .WithExposedHeaders("Mcp-Session-Id"); }); }); Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless); await using var app = Builder.Build(); app.UseCors(); app.MapMcp().RequireCors("BrowserClient"); await app.StartAsync(TestContext.Current.CancellationToken); using var request = new HttpRequestMessage(HttpMethod.Options, "http://localhost:5000/"); request.Headers.Add("Origin", "http://localhost:5173"); request.Headers.Add("Access-Control-Request-Method", "POST"); request.Headers.Add("Access-Control-Request-Headers", "content-type,authorization,mcp-protocol-version,mcp-session-id"); using var response = await HttpClient.SendAsync(request, TestContext.Current.CancellationToken); Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); Assert.Equal("http://localhost:5173", Assert.Single(response.Headers.GetValues("Access-Control-Allow-Origin"))); var allowHeaders = string.Join(",", response.Headers.GetValues("Access-Control-Allow-Headers")); Assert.Contains("content-type", allowHeaders, StringComparison.OrdinalIgnoreCase); Assert.Contains("authorization", allowHeaders, StringComparison.OrdinalIgnoreCase); Assert.Contains("mcp-protocol-version", allowHeaders, StringComparison.OrdinalIgnoreCase); Assert.Contains("mcp-session-id", allowHeaders, StringComparison.OrdinalIgnoreCase); } [Fact] public async Task BrowserPreflight_DoesNotCorsApprove_DisallowedOrigin() { Builder.Services.AddCors(options => { options.AddPolicy("BrowserClient", policy => { policy.WithOrigins("http://localhost:5173") .WithMethods("POST") .WithHeaders("Content-Type", "MCP-Protocol-Version"); }); }); Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless); await using var app = Builder.Build(); app.UseCors(); app.MapMcp().RequireCors("BrowserClient"); await app.StartAsync(TestContext.Current.CancellationToken); using var request = new HttpRequestMessage(HttpMethod.Options, "http://localhost:5000/"); // CORS matches the browser Origin exactly. "localhost" and "127.0.0.1" both // resolve to loopback, but they are different origins and do not match. request.Headers.Add("Origin", "http://127.0.0.1:5173"); request.Headers.Add("Access-Control-Request-Method", "POST"); request.Headers.Add("Access-Control-Request-Headers", "content-type,mcp-protocol-version"); using var response = await HttpClient.SendAsync(request, TestContext.Current.CancellationToken); // ASP.NET Core's CORS middleware commonly answers the preflight with 204 even when // the origin is not approved. The browser treats the request as disallowed because // the Access-Control-Allow-* approval headers are omitted from the response. Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); Assert.False(response.Headers.Contains("Access-Control-Allow-Origin")); Assert.False(response.Headers.Contains("Access-Control-Allow-Headers")); } [Fact] public async Task InitializeResponse_ExposesMcpSessionId_ForBrowserClients() { Builder.Services.AddCors(options => { options.AddPolicy("BrowserClient", policy => { policy.WithOrigins("http://localhost:5173") .WithMethods("POST") .WithHeaders("Content-Type", "MCP-Protocol-Version") .WithExposedHeaders("Mcp-Session-Id"); }); }); Builder.Services.AddMcpServer(options => { options.ServerInfo = new() { Name = "CorsSessionServer", Version = "1.0.0", }; }).WithHttpTransport(ConfigureStateless); await using var app = Builder.Build(); app.UseCors(); app.MapMcp().RequireCors("BrowserClient"); await app.StartAsync(TestContext.Current.CancellationToken); const string initializeRequest = """ {"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18","capabilities":{},"clientInfo":{"name":"browser-client","version":"1.0.0"}}} """; using var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost:5000/") { Content = new StringContent(initializeRequest, System.Text.Encoding.UTF8, "application/json") }; request.Headers.Add("Origin", "http://localhost:5173"); request.Headers.Accept.ParseAdd("application/json"); request.Headers.Accept.ParseAdd("text/event-stream"); using var response = await HttpClient.SendAsync(request, TestContext.Current.CancellationToken); Assert.True(response.IsSuccessStatusCode); Assert.Equal("http://localhost:5173", Assert.Single(response.Headers.GetValues("Access-Control-Allow-Origin"))); var exposedHeaders = string.Join(",", response.Headers.GetValues("Access-Control-Expose-Headers")); Assert.Contains("Mcp-Session-Id", exposedHeaders, StringComparison.OrdinalIgnoreCase); if (!Stateless) { Assert.True(response.Headers.Contains("Mcp-Session-Id")); } } [Fact] public async Task SseEndpoints_AreDisabledByDefault_InStatefulMode() { Builder.Services.AddMcpServer().WithHttpTransport(options => { // Stateful mode, but SSE not explicitly enabled. options.Stateless = false; }); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); using var sseResponse = await HttpClient.GetAsync("/sse", TestContext.Current.CancellationToken); Assert.Equal(HttpStatusCode.NotFound, sseResponse.StatusCode); using var messageResponse = await HttpClient.PostAsync("/message", new StringContent(""), TestContext.Current.CancellationToken); Assert.Equal(HttpStatusCode.NotFound, messageResponse.StatusCode); } [Fact] public async Task SseEndpoints_ThrowOnMapMcp_InStatelessMode_WithEnableLegacySse() { Builder.Services.AddMcpServer().WithHttpTransport(options => { options.Stateless = true; options.EnableLegacySse = true; }); await using var app = Builder.Build(); var ex = Assert.Throws(() => app.MapMcp()); Assert.Contains("stateless", ex.Message, StringComparison.OrdinalIgnoreCase); Assert.Contains("EnableLegacySse", ex.Message); } [Fact] public async Task AutoDetectMode_Works_WithSseEndpoint() { Assert.SkipWhen(Stateless, "SSE endpoint is disabled in stateless mode."); Builder.Services.AddMcpServer(options => { options.ServerInfo = new() { Name = "AutoDetectSseTestServer", Version = "1.0.0", }; }).WithHttpTransport(options => { ConfigureStateless(options); options.EnableLegacySse = true; }); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var mcpClient = await ConnectAsync("/sse", new() { Endpoint = new("http://localhost:5000/sse"), TransportMode = HttpTransportMode.AutoDetect }); Assert.Equal("AutoDetectSseTestServer", mcpClient.ServerInfo.Name); } [Fact] public async Task SseMode_Works_WithSseEndpoint() { Assert.SkipWhen(Stateless, "SSE endpoint is disabled in stateless mode."); Builder.Services.AddMcpServer(options => { options.ServerInfo = new() { Name = "SseTestServer", Version = "1.0.0", }; }).WithHttpTransport(options => { ConfigureStateless(options); options.EnableLegacySse = true; }); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var mcpClient = await ConnectAsync(transportOptions: new() { Endpoint = new("http://localhost:5000/sse"), TransportMode = HttpTransportMode.Sse }); Assert.Equal("SseTestServer", mcpClient.ServerInfo.Name); } [Fact] public async Task StreamableHttpClient_SendsMcpProtocolVersionHeader_AfterInitialization() { var protocolVersionHeaderValues = new ConcurrentQueue(); Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools(); await using var app = Builder.Build(); app.Use(next => { return async context => { if (!StringValues.IsNullOrEmpty(context.Request.Headers["mcp-protocol-version"])) { protocolVersionHeaderValues.Enqueue(context.Request.Headers["mcp-protocol-version"]); } await next(context); }; }); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var mcpClient = await ConnectAsync(configureClient: options => { options.ProtocolVersion = "2025-06-18"; }); Assert.Equal("2025-06-18", mcpClient.NegotiatedProtocolVersion); await mcpClient.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); await mcpClient.DisposeAsync(); // The GET request might not have started in time, and the DELETE request won't be sent in // Stateless mode due to the lack of an Mcp-Session-Id, but the header should be included in the // initialized notification and the tools/list call at a minimum. Assert.True(protocolVersionHeaderValues.Count > 1); Assert.All(protocolVersionHeaderValues, v => Assert.Equal("2025-06-18", v)); } [Fact] public async Task CanResumeSessionWithMapMcpAndRunSessionHandler() { Assert.SkipWhen(Stateless, "Session resumption relies on server-side session tracking."); var runSessionCount = 0; var serverTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); Builder.Services.AddMcpServer(options => { options.ServerInfo = new Implementation { Name = "ResumeServer", Version = "1.0.0", }; }).WithHttpTransport(opts => { ConfigureStateless(opts); #pragma warning disable MCPEXP002 // RunSessionHandler is experimental opts.RunSessionHandler = async (context, server, cancellationToken) => { Interlocked.Increment(ref runSessionCount); serverTcs.TrySetResult(server); await server.RunAsync(cancellationToken); }; #pragma warning restore MCPEXP002 }).WithTools(); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); ServerCapabilities? serverCapabilities = null; Implementation? serverInfo = null; string? serverInstructions = null; string? negotiatedProtocolVersion = null; string? resumedSessionId = null; await using var initialTransport = new HttpClientTransport(new() { Endpoint = new("http://localhost:5000/"), TransportMode = HttpTransportMode.StreamableHttp, OwnsSession = false, }, HttpClient, LoggerFactory); await using (var initialClient = await McpClient.CreateAsync(initialTransport, new McpClientOptions { ProtocolVersion = "2025-11-25" }, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken)) { resumedSessionId = initialClient.SessionId ?? throw new InvalidOperationException("SessionId not negotiated."); serverCapabilities = initialClient.ServerCapabilities; serverInfo = initialClient.ServerInfo; serverInstructions = initialClient.ServerInstructions; negotiatedProtocolVersion = initialClient.NegotiatedProtocolVersion; await initialClient.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); } Assert.NotNull(serverCapabilities); Assert.NotNull(serverInfo); Assert.False(string.IsNullOrEmpty(resumedSessionId)); await serverTcs.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken); await using var resumeTransport = new HttpClientTransport(new() { Endpoint = new("http://localhost:5000/"), TransportMode = HttpTransportMode.StreamableHttp, KnownSessionId = resumedSessionId!, }, HttpClient, LoggerFactory); var resumeOptions = new ResumeClientSessionOptions { ServerCapabilities = serverCapabilities!, ServerInfo = serverInfo!, ServerInstructions = serverInstructions, NegotiatedProtocolVersion = negotiatedProtocolVersion, }; await using (var resumedClient = await McpClient.ResumeSessionAsync( resumeTransport, resumeOptions, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken)) { var tools = await resumedClient.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); Assert.NotEmpty(tools); Assert.Equal(serverInstructions, resumedClient.ServerInstructions); Assert.Equal(negotiatedProtocolVersion, resumedClient.NegotiatedProtocolVersion); } Assert.Equal(1, runSessionCount); } [Fact] public async Task EnablePollingAsync_ThrowsInvalidOperationException_WhenNoEventStreamStoreConfigured() { Assert.SkipWhen(Stateless, "This test only applies to stateful mode without an event stream store."); InvalidOperationException? capturedException = null; var pollingTool = McpServerTool.Create(async (RequestContext context) => { try { await context.EnablePollingAsync(retryInterval: TimeSpan.FromSeconds(1)); } catch (InvalidOperationException ex) { capturedException = ex; } return "Complete"; }, options: new() { Name = "polling_tool" }); // Configure without EventStreamStore Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools([pollingTool]); await using var app = Builder.Build(); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); // Polling via an event-stream store is a stateful-session feature. Starting with the 2026-07-28 // protocol revision, Streamable HTTP no longer supports sessions, so pin to the latest stable version to keep exercising the stateful path. await using var mcpClient = await ConnectAsync(configureClient: options => options.ProtocolVersion = "2025-11-25"); await mcpClient.CallToolAsync("polling_tool", cancellationToken: TestContext.Current.CancellationToken); Assert.NotNull(capturedException); Assert.Contains("event stream store", capturedException.Message, StringComparison.OrdinalIgnoreCase); } [Fact] public async Task AdditionalHeaders_AreSent_InPostAndDeleteRequests() { Assert.SkipWhen(Stateless, "DELETE requests are not sent in stateless mode due to lack of session ID."); bool wasPostRequest = false; bool wasDeleteRequest = false; Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools(); await using var app = Builder.Build(); app.Use(next => { return async context => { Assert.Equal("Bearer testToken", context.Request.Headers["Authorize"]); if (context.Request.Method == HttpMethods.Post) { wasPostRequest = true; } else if (context.Request.Method == HttpMethods.Delete) { wasDeleteRequest = true; } await next(context); }; }); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); var transportOptions = new HttpClientTransportOptions { Endpoint = new("http://localhost:5000/"), Name = "In-memory Streamable HTTP Client", TransportMode = HttpTransportMode.StreamableHttp, AdditionalHeaders = new Dictionary { ["Authorize"] = "Bearer testToken" }, }; // DELETE requests are only sent when there's a session ID to delete - a legacy stateful // behavior. Starting with the 2026-07-28 protocol revision, Streamable HTTP no longer supports sessions. Pin to the latest stable version. await using var mcpClient = await ConnectAsync(transportOptions: transportOptions, configureClient: options => options.ProtocolVersion = "2025-11-25"); // Do a tool call to ensure there's more than just the initialize request await mcpClient.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); // Dispose the client to trigger the DELETE request await mcpClient.DisposeAsync(); Assert.True(wasPostRequest, "POST request was not made"); Assert.True(wasDeleteRequest, "DELETE request was not made"); } [Fact] public async Task DisposeAsync_DoesNotHang_WhenOwnsSessionIsFalse() { Assert.SkipWhen(Stateless, "Stateless mode doesn't support session management."); var getResponseStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools(); await using var app = Builder.Build(); // Track when the GET SSE response starts being written, which indicates // the server's HandleGetRequestAsync has fully initialized the SSE writer. app.Use(next => { return async context => { if (context.Request.Method == HttpMethods.Get) { context.Response.OnStarting(() => { getResponseStarted.TrySetResult(); return Task.CompletedTask; }); } await next(context); }; }); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var transport = new HttpClientTransport(new() { Endpoint = new("http://localhost:5000/"), TransportMode = HttpTransportMode.StreamableHttp, OwnsSession = false, }, HttpClient, LoggerFactory); var client = await McpClient.CreateAsync(transport, new McpClientOptions { ProtocolVersion = "2025-11-25" }, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken); // Call a tool to ensure the session is fully established var result = await client.CallToolAsync( "echo_claims_principal", new Dictionary() { ["message"] = "Hello!" }, cancellationToken: TestContext.Current.CancellationToken); Assert.NotNull(result); // Wait for the GET SSE stream to be fully established on the server await getResponseStarted.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken); // This should not hang. The issue reports that DisposeAsync hangs indefinitely // when OwnsSession is false. Use a timeout to detect the hang. await client.DisposeAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken); } [Fact] public async Task DisposeAsync_DoesNotHang_WhenOwnsSessionIsFalse_WithUnsolicitedMessages() { Assert.SkipWhen(Stateless, "Stateless mode doesn't support session management."); var getResponseStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var serverTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); Builder.Services.AddMcpServer().WithHttpTransport(opts => { ConfigureStateless(opts); #pragma warning disable MCPEXP002 // RunSessionHandler is experimental opts.RunSessionHandler = async (context, server, cancellationToken) => { serverTcs.TrySetResult(server); await server.RunAsync(cancellationToken); }; #pragma warning restore MCPEXP002 }).WithTools(); await using var app = Builder.Build(); // Track when the GET SSE response starts being written, which indicates // the server's HandleGetRequestAsync has fully initialized the SSE writer. app.Use(next => { return async context => { if (context.Request.Method == HttpMethods.Get) { context.Response.OnStarting(() => { getResponseStarted.TrySetResult(); return Task.CompletedTask; }); } await next(context); }; }); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); await using var transport = new HttpClientTransport(new() { Endpoint = new("http://localhost:5000/"), TransportMode = HttpTransportMode.StreamableHttp, OwnsSession = false, }, HttpClient, LoggerFactory); var client = await McpClient.CreateAsync(transport, new McpClientOptions { ProtocolVersion = "2025-11-25" }, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken); var result = await client.CallToolAsync( "echo_claims_principal", new Dictionary() { ["message"] = "Hello!" }, cancellationToken: TestContext.Current.CancellationToken); Assert.NotNull(result); // Wait for the GET SSE stream to be fully established on the server await getResponseStarted.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken); // Register a handler on the client to detect when the notification is received var notificationReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); await using var handlerRegistration = client.RegisterNotificationHandler("notifications/tools/list_changed", (notification, ct) => { notificationReceived.TrySetResult(); return default; }); // Get the server instance and send an unsolicited notification by modifying tools var server = await serverTcs.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken); await server.SendNotificationAsync("notifications/tools/list_changed", TestContext.Current.CancellationToken); // Wait for the client to actually receive the notification await notificationReceived.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken); // Dispose should still not hang await client.DisposeAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken); } [Fact] public async Task Client_CanReconnect_AfterSessionExpiry() { Assert.SkipWhen(Stateless, "Sessions don't exist in stateless mode."); string? expiredSessionId = null; Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools(); await using var app = Builder.Build(); // Middleware that returns 404 for the expired session, simulating server-side session expiry. app.Use(next => { return async context => { if (expiredSessionId is not null && context.Request.Headers["Mcp-Session-Id"].ToString() == expiredSessionId) { context.Response.StatusCode = StatusCodes.Status404NotFound; return; } await next(context); }; }); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); // Connect the first client and verify it works. // Server-side session expiry and reconnect rely on session IDs, a legacy stateful behavior. // Starting with the 2026-07-28 protocol revision, Streamable HTTP no longer supports sessions. Pin both clients to the latest stable version. var client1 = await ConnectAsync(configureClient: options => options.ProtocolVersion = "2025-11-25"); var originalSessionId = client1.SessionId; Assert.NotNull(originalSessionId); var tools = await client1.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); Assert.NotEmpty(tools); // Simulate session expiry by having the middleware reject the original session. expiredSessionId = originalSessionId; // The next request should fail. await Assert.ThrowsAnyAsync(async () => await client1.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken)); // Completion should resolve with a 404 status code. var details = await client1.Completion.WaitAsync(TestContext.Current.CancellationToken); var httpDetails = Assert.IsType(details); Assert.Equal(HttpStatusCode.NotFound, httpDetails.HttpStatusCode); await client1.DisposeAsync(); // Reconnect with a brand-new session. await using var client2 = await ConnectAsync(configureClient: options => options.ProtocolVersion = "2025-11-25"); Assert.NotNull(client2.SessionId); Assert.NotEqual(originalSessionId, client2.SessionId); // The new session works normally. tools = await client2.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); Assert.NotEmpty(tools); } [Fact] public async Task EndpointFilter_CanReadSessionId_BeforeAndAfterHandler() { var capturedSessionIds = new ConcurrentBag<(string? BeforeNext, string? AfterNext, string Method)>(); var capturedActivityTags = new ConcurrentBag<(string? TagValue, bool HadActivity, string Method)>(); var requestObserved = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools(); await using var app = Builder.Build(); // This is the pattern documented in sessions.md - verify it actually works. // Tag before next() so child spans inherit the value. app.MapMcp().AddEndpointFilter(async (context, next) => { var httpContext = context.HttpContext; // Read from request headers - available on all non-initialize requests in stateful mode. string? beforeSessionId = httpContext.Request.Headers["Mcp-Session-Id"]; // Tag before next() so child activities created during the handler inherit it. var activity = System.Diagnostics.Activity.Current; if (beforeSessionId != null) { activity?.AddTag("mcp.transport.session.id", beforeSessionId); } var tagValue = activity?.GetTagItem("mcp.transport.session.id")?.ToString(); var result = await next(context); // After the handler, check response headers too (for test validation only). string? afterSessionId = httpContext.Response.Headers["Mcp-Session-Id"]; capturedSessionIds.Add((beforeSessionId, afterSessionId, httpContext.Request.Method)); capturedActivityTags.Add((tagValue, activity is not null, httpContext.Request.Method)); requestObserved.TrySetResult(); return result; }); await app.StartAsync(TestContext.Current.CancellationToken); // The stateful (else) branch below asserts session-ID behavior, which only exists under the // legacy handshake. Starting with the 2026-07-28 protocol revision, Streamable HTTP no longer supports sessions. Pin legacy only for the stateful variant. await using var client = await ConnectAsync(configureClient: options => { if (!Stateless) { options.ProtocolVersion = "2025-11-25"; } }); await client.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken); // The filter records into the bag *after* await next(context) returns. For a streamed SSE // response the client can observe completion (and ListToolsAsync can return) before that // server-side continuation runs, so asserting the bag immediately races. Wait for the filter // to record at least one request first. Don't assert an exact minimum - the initialized // notification or GET stream may not have completed yet. await requestObserved.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken); Assert.NotEmpty(capturedSessionIds); if (Stateless) { // Stateless mode: no session IDs anywhere. Assert.All(capturedSessionIds, c => { Assert.Null(c.BeforeNext); Assert.Null(c.AfterNext); }); // Activity should exist but no transport session tag in stateless mode. Assert.All(capturedActivityTags, c => Assert.Null(c.TagValue)); } else { // Stateful mode: response header is set on every POST and GET response. var postCaptures = capturedSessionIds.Where(c => c.Method is "POST").ToList(); Assert.NotEmpty(postCaptures); Assert.All(postCaptures, c => { Assert.Equal(client.SessionId, c.AfterNext); }); // At least one POST should have the session ID in the request header too // (the initialized notification or list_tools - but not the initial initialize request). Assert.Contains(postCaptures, c => c.BeforeNext == client.SessionId); // Verify Activity.Current was available and the AddTag pattern works before next(). // The tag is only set on non-initialize requests (where the request header has the session ID). var taggedPosts = capturedActivityTags.Where(c => c.Method is "POST" && c.TagValue is not null).ToList(); Assert.NotEmpty(taggedPosts); Assert.All(taggedPosts, c => { Assert.True(c.HadActivity, "Activity.Current should be non-null in the endpoint filter"); Assert.Equal(client.SessionId, c.TagValue); }); } } [Fact] public async Task DeleteRequest_FromDifferentUser_IsRejected_AndSessionSurvives() { Assert.SkipWhen(Stateless, "Sessions don't exist in stateless mode."); Builder.Services.AddMcpServer().WithHttpTransport(ConfigureStateless).WithTools(); Builder.Services.AddHttpContextAccessor(); await using var app = Builder.Build(); // Pick the user from a test header so different HttpClient requests can act as different users. app.Use(next => async context => { var name = context.Request.Headers["X-Test-User"].ToString(); if (!string.IsNullOrEmpty(name)) { context.User = new ClaimsPrincipal(new ClaimsIdentity( [new Claim("name", name), new Claim(ClaimTypes.NameIdentifier, name)], "TestAuthType", "name", "role")); } await next(context); }); app.MapMcp(); await app.StartAsync(TestContext.Current.CancellationToken); const string initializeRequest = """ {"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18","capabilities":{},"clientInfo":{"name":"test-client","version":"1.0.0"}}} """; using var initRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:5000/") { Content = new StringContent(initializeRequest, System.Text.Encoding.UTF8, "application/json"), }; initRequest.Headers.Add("X-Test-User", "Alice"); initRequest.Headers.Accept.ParseAdd("application/json"); initRequest.Headers.Accept.ParseAdd("text/event-stream"); using var initResponse = await HttpClient.SendAsync(initRequest, TestContext.Current.CancellationToken); Assert.True(initResponse.IsSuccessStatusCode); var sessionId = Assert.Single(initResponse.Headers.GetValues("Mcp-Session-Id")); // A DELETE from a different authenticated user must not be able to tear down Alice's session. using var bobDelete = new HttpRequestMessage(HttpMethod.Delete, "http://localhost:5000/"); bobDelete.Headers.Add("X-Test-User", "Bob"); bobDelete.Headers.Add("Mcp-Session-Id", sessionId); using var bobDeleteResponse = await HttpClient.SendAsync(bobDelete, TestContext.Current.CancellationToken); Assert.Equal(HttpStatusCode.Forbidden, bobDeleteResponse.StatusCode); // Alice should still be able to use the session. const string toolCallRequest = """ {"jsonrpc":"2.0","id":2,"method":"tools/list"} """; using var aliceCall = new HttpRequestMessage(HttpMethod.Post, "http://localhost:5000/") { Content = new StringContent(toolCallRequest, System.Text.Encoding.UTF8, "application/json"), }; aliceCall.Headers.Add("X-Test-User", "Alice"); aliceCall.Headers.Add("Mcp-Session-Id", sessionId); aliceCall.Headers.Accept.ParseAdd("application/json"); aliceCall.Headers.Accept.ParseAdd("text/event-stream"); using var aliceCallResponse = await HttpClient.SendAsync(aliceCall, TestContext.Current.CancellationToken); Assert.True(aliceCallResponse.IsSuccessStatusCode); // Alice can still terminate her own session. using var aliceDelete = new HttpRequestMessage(HttpMethod.Delete, "http://localhost:5000/"); aliceDelete.Headers.Add("X-Test-User", "Alice"); aliceDelete.Headers.Add("Mcp-Session-Id", sessionId); using var aliceDeleteResponse = await HttpClient.SendAsync(aliceDelete, TestContext.Current.CancellationToken); Assert.True(aliceDeleteResponse.IsSuccessStatusCode); } }