Merge branch 'main' into copilot/fix-exception-for-null-mime-type

Author: stephentoub

src/ModelContextProtocol.Core/Client/McpClientImpl.cs

@@ -22,8 +22,6 @@ internal sealed partial class McpClientImpl : McpClient
     private readonly SemaphoreSlim _disposeLock = new(1, 1);
     private readonly McpTaskCancellationTokenProvider? _taskCancellationTokenProvider;
 
-    private CancellationTokenSource? _connectCts;
-
     private ServerCapabilities? _serverCapabilities;
     private Implementation? _serverInfo;
     private string? _serverInstructions;
@@ -526,9 +524,6 @@ private void RegisterTaskHandlers(RequestHandlers requestHandlers, IMcpTaskStore
     /// </summary>
     public async Task ConnectAsync(CancellationToken cancellationToken = default)
     {
-        _connectCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-        cancellationToken = _connectCts.Token;
-
         try
         {
             // We don't want the ConnectAsync token to cancel the message processing loop after we've successfully connected.

src/ModelContextProtocol.Core/Server/McpServerImpl.cs

@@ -58,8 +58,6 @@ public McpServerImpl(ITransport transport, McpServerOptions options, ILoggerFact
         Throw.IfNull(transport);
         Throw.IfNull(options);
 
-        options ??= new();
-
         _sessionTransport = transport;
         ServerOptions = options;
         Services = serviceProvider;

tests/ModelContextProtocol.Tests/DiagnosticTests.cs

@@ -35,8 +35,10 @@ await RunConnected(async (client, server) =>
 
             // Wait for server-side activities to be exported. The server processes messages
             // via fire-and-forget tasks, so activities may not be immediately available
-            // after the client operation completes.
-            await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 4);
+            // after the client operation completes. Wait for the specific activity we need
+            // rather than a count, as other server activities may be exported first.
+            await WaitForAsync(() => activities.Any(a =>
+                a.DisplayName == "tools/call DoubleValue" && a.Kind == ActivityKind.Server));
         }
 
         Assert.NotEmpty(activities);
@@ -103,8 +105,11 @@ await RunConnected(async (client, server) =>
                 await Assert.ThrowsAsync<McpProtocolException>(async () => await client.CallToolAsync("does-not-exist", cancellationToken: TestContext.Current.CancellationToken));
             }, []);
 
-            // Wait for server-side activities to be exported.
-            await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 4);
+            // Wait for server-side activities to be exported. Wait for specific activities
+            // rather than a count, as other server activities may be exported first.
+            await WaitForAsync(() =>
+                activities.Any(a => a.DisplayName == "tools/call Throw" && a.Kind == ActivityKind.Server) &&
+                activities.Any(a => a.DisplayName == "tools/call does-not-exist" && a.Kind == ActivityKind.Server));
         }
 
         Assert.NotEmpty(activities);
@@ -173,8 +178,10 @@ await RunConnected(async (client, server) =>
                 await tool.InvokeAsync(new() { ["amount"] = 42 }, TestContext.Current.CancellationToken);
             }, []);
 
-            // Wait for server-side activities to be exported.
-            await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 3);
+            // Wait for server-side activities to be exported. Wait for specific activities
+            // rather than a count, as other server activities may be exported first.
+            await WaitForAsync(() => activities.Any(a =>
+                a.DisplayName == "tools/call DoubleValue" && a.Kind == ActivityKind.Server));
         }
 
         // The outer activity should have MCP-specific attributes added to it