Merge branch 'main' into fix/utf8-stdio-encoding

Author: willibrandon

src/ModelContextProtocol/Server/McpToolAttribute.cs

@@ -12,7 +12,7 @@ public sealed class McpToolAttribute : Attribute
     /// <summary>
     /// Attribute to mark a method as an MCP tool.
     /// </summary>
-    /// <param name="name">The name of the tool. If not provided, the class name will be used.</param>
+    /// <param name="name">The name of the tool. If not provided, the method name will be used.</param>
     public McpToolAttribute(string? name = null)
     {
         Name = name;

tests/ModelContextProtocol.Tests/Server/McpServerTests.cs

@@ -89,10 +89,12 @@ public async Task StartAsync_Should_Throw_InvalidOperationException_If_Already_I
     {
         // Arrange
         await using var server = McpServerFactory.Create(_serverTransport.Object, _options, _loggerFactory.Object, _serviceProvider);
-        server.GetType().GetField("_isInitializing", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.SetValue(server, true);
+        var task = server.StartAsync(TestContext.Current.CancellationToken);
 
         // Act & Assert
         await Assert.ThrowsAsync<InvalidOperationException>(() => server.StartAsync(TestContext.Current.CancellationToken));
+
+        await task;
     }
 
     [Fact]

tests/ModelContextProtocol.Tests/Transport/SseClientTransportTests.cs

@@ -107,12 +107,49 @@ public async Task ConnectAsync_Should_Connect_Successfully()
     [Fact]
     public async Task ConnectAsync_Throws_If_Already_Connected()
     {
-        await using var transport = new SseClientTransport(_transportOptions, _serverConfig, NullLoggerFactory.Instance);
-        transport.GetType().BaseType!.GetField("_isConnected", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.SetValue(transport, true);
+        using var mockHttpHandler = new MockHttpHandler();
+        using var httpClient = new HttpClient(mockHttpHandler);
+        await using var transport = new SseClientTransport(_transportOptions, _serverConfig, httpClient, NullLoggerFactory.Instance);
+        var tcsConnected = new TaskCompletionSource();
+        var tcsDone = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var callIndex = 0;
+
+        mockHttpHandler.RequestHandler = async (request) =>
+        {
+            switch (callIndex++)
+            {
+                case 0:
+                    return new HttpResponseMessage
+                    {
+                        StatusCode = HttpStatusCode.OK,
+                        Content = new StringContent("event: endpoint\r\ndata: http://localhost\r\n\r\n")
+                    };
+                case 1:
+                    tcsConnected.SetResult();
+                    await tcsDone.Task;
+                    return new HttpResponseMessage
+                    {
+                        StatusCode = HttpStatusCode.OK,
+                        Content = new StringContent("")
+                    };
+                default:
+                    return new HttpResponseMessage
+                    {
+                        StatusCode = HttpStatusCode.OK,
+                        Content = new StringContent("")
+                    };
+            }
+        };
 
+        var task = transport.ConnectAsync(TestContext.Current.CancellationToken);
+        await tcsConnected.Task;
+        Assert.True(transport.IsConnected);
         var action = async () => await transport.ConnectAsync();
         var exception = await Assert.ThrowsAsync<McpTransportException>(action);
         Assert.Equal("Transport is already connected", exception.Message);
+        tcsDone.SetResult();
+        await transport.CloseAsync();
+        await task;
     }
 
     [Fact]