Merge branch 'main' into fixresources

Author: stephentoub

Directory.Packages.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <System10Version>10.0.0-preview.3.25171.5</System10Version>
-    <MicrosoftExtensionsAIVersion>9.4.4-preview.1.25259.16</MicrosoftExtensionsAIVersion>
+    <MicrosoftExtensionsAIVersion>9.5.0-preview.1.25262.9</MicrosoftExtensionsAIVersion>
   </PropertyGroup>
 
   <!-- Product dependencies netstandard -->
@@ -31,7 +31,7 @@
 
   <!-- Product dependencies shared -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.4.4-preview.1.25259.16" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
     <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
     <PackageVersion Include="System.Net.ServerSentEvents" Version="$(System10Version)" />
   </ItemGroup>

src/ModelContextProtocol.AspNetCore/HttpMcpServerBuilderExtensions.cs

@@ -26,6 +26,7 @@ public static IMcpServerBuilder WithHttpTransport(this IMcpServerBuilder builder
         builder.Services.TryAddSingleton<StreamableHttpHandler>();
         builder.Services.TryAddSingleton<SseHandler>();
         builder.Services.AddHostedService<IdleTrackingBackgroundService>();
+        builder.Services.AddDataProtection();
 
         if (configureOptions is not null)
         {

src/ModelContextProtocol.AspNetCore/HttpMcpSession.cs

@@ -1,10 +1,15 @@
-using ModelContextProtocol.Protocol.Transport;
+using ModelContextProtocol.AspNetCore.Stateless;
+using ModelContextProtocol.Protocol.Transport;
 using ModelContextProtocol.Server;
 using System.Security.Claims;
 
 namespace ModelContextProtocol.AspNetCore;
 
-internal sealed class HttpMcpSession<TTransport>(string sessionId, TTransport transport, ClaimsPrincipal user, TimeProvider timeProvider) : IAsyncDisposable
+internal sealed class HttpMcpSession<TTransport>(
+    string sessionId,
+    TTransport transport,
+    UserIdClaim? userId,
+    TimeProvider timeProvider) : IAsyncDisposable
     where TTransport : ITransport
 {
     private int _referenceCount;
@@ -13,7 +18,7 @@ internal sealed class HttpMcpSession<TTransport>(string sessionId, TTransport tr
 
     public string Id { get; } = sessionId;
     public TTransport Transport { get; } = transport;
-    public (string Type, string Value, string Issuer)? UserIdClaim { get; } = GetUserIdClaim(user);
+    public UserIdClaim? UserIdClaim { get; } = userId;
 
     public CancellationToken SessionClosed => _disposeCts.Token;
 
@@ -63,27 +68,7 @@ public async ValueTask DisposeAsync()
     }
 
     public bool HasSameUserId(ClaimsPrincipal user)
-        => UserIdClaim == GetUserIdClaim(user);
-
-    // SignalR only checks for ClaimTypes.NameIdentifier in HttpConnectionDispatcher, but AspNetCore.Antiforgery checks that plus the sub and UPN claims.
-    // However, we short-circuit unlike antiforgery since we expect to call this to verify MCP messages a lot more frequently than
-    // verifying antiforgery tokens from <form> posts.
-    private static (string Type, string Value, string Issuer)? GetUserIdClaim(ClaimsPrincipal user)
-    {
-        if (user?.Identity?.IsAuthenticated != true)
-        {
-            return null;
-        }
-
-        var claim = user.FindFirst(ClaimTypes.NameIdentifier) ?? user.FindFirst("sub") ?? user.FindFirst(ClaimTypes.Upn);
-
-        if (claim is { } idClaim)
-        {
-            return (idClaim.Type, idClaim.Value, idClaim.Issuer);
-        }
-
-        return null;
-    }
+        => UserIdClaim == StreamableHttpHandler.GetUserIdClaim(user);
 
     private sealed class UnreferenceDisposable(HttpMcpSession<TTransport> session, TimeProvider timeProvider) : IDisposable
     {

src/ModelContextProtocol.AspNetCore/HttpServerTransportOptions.cs

@@ -23,19 +23,37 @@ public class HttpServerTransportOptions
     public Func<HttpContext, IMcpServer, CancellationToken, Task>? RunSessionHandler { get; set; }
 
     /// <summary>
-    /// Represents the duration of time the server will wait between any active requests before timing out an
-    /// MCP session. This is checked in background every 5 seconds. A client trying to resume a session will
-    /// receive a 404 status code and should restart their session. A client can keep their session open by
-    /// keeping a GET request open. The default value is set to 2 hours.
+    /// Gets or sets whether the server should run in a stateless mode that does not require all requests for a given session
+    /// to arrive to the same ASP.NET Core application process.
     /// </summary>
+    /// <remarks>
+    /// If <see langword="true"/>, the "/sse" endpoint will be disabled, and client information will be round-tripped as part
+    /// of the "mcp-session-id" header instead of stored in memory. Unsolicited server-to-client messages and all server-to-client
+    /// requests are also unsupported, because any responses may arrive at another ASP.NET Core application process.
+    /// Client sampling and roots capabilities are also disabled in stateless mode, because the server cannot make requests.
+    /// Defaults to <see langword="false"/>.
+    /// </remarks>
+    public bool Stateless { get; set; }
+
+    /// <summary>
+    /// Gets or sets the duration of time the server will wait between any active requests before timing out an MCP session.
+    /// </summary>
+    /// <remarks>
+    /// This is checked in background every 5 seconds. A client trying to resume a session will receive a 404 status code
+    /// and should restart their session. A client can keep their session open by keeping a GET request open.
+    /// Defaults to 2 hours.
+    /// </remarks>
     public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromHours(2);
 
     /// <summary>
-    /// The maximum number of idle sessions to track. This is used to limit the number of sessions that can be idle at once.
+    /// Gets or sets maximum number of idle sessions to track in memory. This is used to limit the number of sessions that can be idle at once.
+    /// </summary>
+    /// <remarks>
     /// Past this limit, the server will log a critical error and terminate the oldest idle sessions even if they have not reached
     /// their <see cref="IdleTimeout"/> until the idle session count is below this limit. Clients that keep their session open by
-    /// keeping a GET request open will not count towards this limit. The default value is set to 100,000 sessions.
-    /// </summary>
+    /// keeping a GET request open will not count towards this limit.
+    /// Defaults to 100,000 sessions.
+    /// </remarks>
     public int MaxIdleSessionCount { get; set; } = 100_000;
 
     /// <summary>

src/ModelContextProtocol.AspNetCore/IdleTrackingBackgroundService.cs

@@ -12,7 +12,7 @@ internal sealed partial class IdleTrackingBackgroundService(
     ILogger<IdleTrackingBackgroundService> logger) : BackgroundService
 {
     // The compiler will complain about the parameter being unused otherwise despite the source generator.
-    private ILogger _logger = logger;
+    private readonly ILogger _logger = logger;
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {

src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs

@@ -35,20 +35,27 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo
             .WithMetadata(new AcceptsMetadata(["application/json"]))
             .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, contentTypes: ["text/event-stream"]))
             .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status202Accepted));
-        streamableHttpGroup.MapGet("", streamableHttpHandler.HandleGetRequestAsync)
-            .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, contentTypes: ["text/event-stream"]));
-        streamableHttpGroup.MapDelete("", streamableHttpHandler.HandleDeleteRequestAsync);
-
-        // Map legacy HTTP with SSE endpoints.
-        var sseHandler = endpoints.ServiceProvider.GetRequiredService<SseHandler>();
-        var sseGroup = mcpGroup.MapGroup("")
-            .WithDisplayName(b => $"MCP HTTP with SSE | {b.DisplayName}");
-
-        sseGroup.MapGet("/sse", sseHandler.HandleSseRequestAsync)
-            .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, contentTypes: ["text/event-stream"]));
-        sseGroup.MapPost("/message", sseHandler.HandleMessageRequestAsync)
-            .WithMetadata(new AcceptsMetadata(["application/json"]))
-            .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status202Accepted));
+
+        if (!streamableHttpHandler.HttpServerTransportOptions.Stateless)
+        {
+            // The GET and DELETE endpoints are not mapped in Stateless mode since there's no way to send unsolicited messages
+            // for the GET to handle, and there is no server-side state for the DELETE to clean up.
+            streamableHttpGroup.MapGet("", streamableHttpHandler.HandleGetRequestAsync)
+                .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, contentTypes: ["text/event-stream"]));
+            streamableHttpGroup.MapDelete("", streamableHttpHandler.HandleDeleteRequestAsync);
+
+            // Map legacy HTTP with SSE endpoints only if not in Stateless mode, because we cannot guarantee the /message requests
+            // will be handled by the same process as the /sse request.
+            var sseHandler = endpoints.ServiceProvider.GetRequiredService<SseHandler>();
+            var sseGroup = mcpGroup.MapGroup("")
+                .WithDisplayName(b => $"MCP HTTP with SSE | {b.DisplayName}");
+
+            sseGroup.MapGet("/sse", sseHandler.HandleSseRequestAsync)
+                .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, contentTypes: ["text/event-stream"]));
+            sseGroup.MapPost("/message", sseHandler.HandleMessageRequestAsync)
+                .WithMetadata(new AcceptsMetadata(["application/json"]))
+                .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status202Accepted));
+        }
 
         return mcpGroup;
     }

src/ModelContextProtocol.AspNetCore/SseHandler.cs

@@ -34,7 +34,10 @@ public async Task HandleSseRequestAsync(HttpContext context)
         var requestPath = (context.Request.PathBase + context.Request.Path).ToString();
         var endpointPattern = requestPath[..(requestPath.LastIndexOf('/') + 1)];
         await using var transport = new SseResponseStreamTransport(context.Response.Body, $"{endpointPattern}message?sessionId={sessionId}");
-        await using var httpMcpSession = new HttpMcpSession<SseResponseStreamTransport>(sessionId, transport, context.User, httpMcpServerOptions.Value.TimeProvider);
+
+        var userIdClaim = StreamableHttpHandler.GetUserIdClaim(context.User);
+        await using var httpMcpSession = new HttpMcpSession<SseResponseStreamTransport>(sessionId, transport, userIdClaim, httpMcpServerOptions.Value.TimeProvider);
+
         if (!_sessions.TryAdd(sessionId, httpMcpSession))
         {
             throw new UnreachableException($"Unreachable given good entropy! Session with ID '{sessionId}' has already been created.");

src/ModelContextProtocol.AspNetCore/Stateless/StatelessSessionId.cs

@@ -0,0 +1,13 @@
+using ModelContextProtocol.Protocol.Types;
+using System.Text.Json.Serialization;
+
+namespace ModelContextProtocol.AspNetCore.Stateless;
+
+internal sealed class StatelessSessionId
+{
+    [JsonPropertyName("clientInfo")]
+    public Implementation? ClientInfo { get; init; }
+
+    [JsonPropertyName("userIdClaim")]
+    public UserIdClaim? UserIdClaim { get; init; }
+}

src/ModelContextProtocol.AspNetCore/Stateless/StatelessSessionIdJsonContext.cs

@@ -0,0 +1,6 @@
+using System.Text.Json.Serialization;
+
+namespace ModelContextProtocol.AspNetCore.Stateless;
+
+[JsonSerializable(typeof(StatelessSessionId))]
+internal sealed partial class StatelessSessionIdJsonContext : JsonSerializerContext;

src/ModelContextProtocol.AspNetCore/Stateless/UserIdClaim.cs

@@ -0,0 +1,3 @@
+namespace ModelContextProtocol.AspNetCore.Stateless;
+
+internal sealed record UserIdClaim(string Type, string Value, string Issuer);