Address PR feedback

Author: halter73

src/ModelContextProtocol.Core/McpSessionHandler.cs

@@ -317,16 +317,14 @@ private async Task HandleMessageAsync(JsonRpcMessage message, CancellationToken
                 AddTags(ref tags, activity, message, method, target);
             }
 
-            var filteredHandler = _incomingMessageFilter(async (msg, ct) =>
+            await _incomingMessageFilter(async (msg, ct) =>
             {
                 var result = await HandleMessageCoreAsync(msg, ct).ConfigureAwait(false);
                 if (addTags && result is not null)
                 {
                     AddResponseTags(ref tags, activity, result, method);
                 }
-            });
-
-            await filteredHandler(message, cancellationToken).ConfigureAwait(false);
+            })(message, cancellationToken).ConfigureAwait(false);
         }
         catch (Exception e) when (addTags)
         {
@@ -607,7 +605,7 @@ public async Task SendMessageAsync(JsonRpcMessage message, CancellationToken can
                 AddTags(ref tags, activity, message, method, target);
             }
 
-            var filteredHandler = _outgoingMessageFilter(async (msg, ct) =>
+            await _outgoingMessageFilter(async (msg, ct) =>
             {
                 if (_logger.IsEnabled(LogLevel.Trace))
                 {
@@ -629,9 +627,7 @@ public async Task SendMessageAsync(JsonRpcMessage message, CancellationToken can
                 {
                     tcs.TrySetCanceled(default);
                 }
-            });
-
-            await filteredHandler(message, cancellationToken).ConfigureAwait(false);
+            })(message, cancellationToken).ConfigureAwait(false);
         }
         catch (Exception ex) when (addTags)
         {

src/ModelContextProtocol.Core/Server/MessageContext.cs

@@ -19,9 +19,6 @@ namespace ModelContextProtocol.Server;
 /// </remarks>
 public class MessageContext
 {
-    /// <summary>The server with which this instance is associated.</summary>
-    private McpServer _server;
-
     /// <summary>
     /// Initializes a new instance of the <see cref="MessageContext"/> class with the specified server and JSON-RPC message.
     /// </summary>
@@ -32,7 +29,7 @@ public MessageContext(McpServer server, JsonRpcMessage jsonRpcMessage)
         Throw.IfNull(server);
         Throw.IfNull(jsonRpcMessage);
 
-        _server = server;
+        Server = server;
         JsonRpcMessage = jsonRpcMessage;
         Services = server.Services;
         User = jsonRpcMessage.Context?.User;
@@ -41,11 +38,11 @@ public MessageContext(McpServer server, JsonRpcMessage jsonRpcMessage)
     /// <summary>Gets or sets the server with which this instance is associated.</summary>
     public McpServer Server
     {
-        get => _server;
+        get => field;
         set
         {
             Throw.IfNull(value);
-            _server = value;
+            field = value;
         }
     }
 

src/ModelContextProtocol/McpServerBuilderExtensions.cs

@@ -1137,6 +1137,7 @@ public static IMcpServerBuilder AddSetLoggingLevelFilter(this IMcpServerBuilder
     public static IMcpServerBuilder AddIncomingMessageFilter(this IMcpServerBuilder builder, McpMessageFilter filter)
     {
         Throw.IfNull(builder);
+        Throw.IfNull(filter);
 
         builder.Services.Configure<McpServerOptions>(options => options.Filters.IncomingMessageFilters.Add(filter));
         return builder;