Address PR feedback WIP

Author: halter73

src/ModelContextProtocol.AspNetCore/StatelessSessionId.cs

@@ -3,7 +3,7 @@
 
 namespace ModelContextProtocol.AspNetCore;
 
-internal class StatelessSessionId
+internal sealed class StatelessSessionId
 {
     [JsonPropertyName("capabilities")]
     public ClientCapabilities? Capabilities { get; init; }

src/ModelContextProtocol.AspNetCore/StreamableHttpHandler.cs

@@ -191,15 +191,15 @@ private async ValueTask<HttpMcpSession<StreamableHttpServerTransport>> StartNewS
         }
         else
         {
-            // "(uninitialized stateless id)" is not written anywhere. We delay writing th mcp-session-id
+            // "(uninitialized stateless id)" is not written anywhere. We delay writing the mcp-session-id
             // until after we receive the initialize request with the client info we need to serialize.
             sessionId = "(uninitialized stateless id)";
             ScheduleStatelessSessionIdWrite(context, transport);
         }
 
         var session = await CreateSessionAsync(context, transport, sessionId);
 
-        // The HttpMcpSession is not stored between requests in stateless mode. Instead the session is recreated from the mcp-session-id.
+        // The HttpMcpSession is not stored between requests in stateless mode. Instead, the session is recreated from the mcp-session-id.
         if (!HttpServerTransportOptions.Stateless)
         {
             if (!Sessions.TryAdd(sessionId, session))
@@ -224,8 +224,8 @@ private async ValueTask<HttpMcpSession<StreamableHttpServerTransport>> CreateSes
 
             if (statelessId is not null)
             {
-                mcpServerOptions.KnownClientInfo = statelessId.ClientInfo;
-                mcpServerOptions.KnownClientCapabilities = statelessId.Capabilities;
+                mcpServerOptions.KnownClientInfo = statelessId.ClientInfo ?? mcpServerOptions.KnownClientInfo;
+                mcpServerOptions.KnownClientCapabilities = statelessId.Capabilities ?? mcpServerOptions.KnownClientCapabilities;
             }
 
             if (HttpServerTransportOptions.ConfigureSessionOptions is { } configureSessionOptions)

src/ModelContextProtocol/Server/McpServerOptions.cs

@@ -72,18 +72,18 @@ public class McpServerOptions
     /// </summary>
     /// <remarks>
     /// <para>
-    /// When not specified, this information sourced from the client's initialize request.
+    /// When not specified, this information is sourced from the client's initialize request.
     /// </para>
     /// </remarks>
     public Implementation? KnownClientInfo { get; set; }
 
     /// <summary>
-    /// Gets or sets preexisting knowledge about the client client capabilities to help support
+    /// Gets or sets preexisting knowledge about the client's capabilities to help support
     /// stateless Streamable HTTP servers that encode this knowledge in the mcp-session-id header.
     /// </summary>
     /// <remarks>
     /// <para>
-    /// When not specified, this information sourced from the client's initialize request.
+    /// When not specified, this information is sourced from the client's initialize request.
     /// </para>
     /// </remarks>
     public ClientCapabilities? KnownClientCapabilities { get; set; }

tests/ModelContextProtocol.TestSseServer/Program.cs

@@ -3,7 +3,6 @@
 using ModelContextProtocol.Server;
 using ModelContextProtocol.Utils.Json;
 using Serilog;
-using System.Diagnostics;
 using System.Text;
 using System.Text.Json;