Merge branch 'main' of https://github.com/Tyler-R-Kendrick/mcp-csharp-sdk into cancellation-enhancements

Author: Tyler-R-Kendrick

samples/AspNetCoreSseServer/Properties/launchSettings.json

@@ -4,7 +4,6 @@
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
       "applicationUrl": "http://localhost:3001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -13,7 +12,6 @@
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
       "applicationUrl": "https://localhost:7133;http://localhost:3001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

samples/EverythingServer/Program.cs

@@ -115,7 +115,7 @@ await ctx.Server.RequestSamplingAsync([
         }
         return Task.FromResult(new EmptyResult());
     })
-    .WithGetCompletionHandler((ctx, ct) =>
+    .WithCompleteHandler((ctx, ct) =>
     {
         var exampleCompletions = new Dictionary<string, IEnumerable<string>>
         {

samples/QuickstartWeatherServer/Tools/WeatherTools.cs

@@ -42,8 +42,11 @@ public static async Task<string> GetForecast(
         [Description("Longitude of the location.")] double longitude)
     {
         using var jsonDocument = await client.ReadJsonDocumentAsync($"/points/{latitude},{longitude}");
-        var jsonElement = jsonDocument.RootElement;
-        var periods = jsonElement.GetProperty("properties").GetProperty("periods").EnumerateArray();
+        var forecastUrl = jsonDocument.RootElement.GetProperty("properties").GetProperty("forecast").GetString()
+            ?? throw new Exception($"No forecast URL provided by {client.BaseAddress}points/{latitude},{longitude}");
+
+        using var forecastDocument = await client.ReadJsonDocumentAsync(forecastUrl);
+        var periods = forecastDocument.RootElement.GetProperty("properties").GetProperty("periods").EnumerateArray();
 
         return string.Join("\n---\n", periods.Select(period => $"""
                 {period.GetProperty("name").GetString()}
@@ -52,4 +55,4 @@ public static async Task<string> GetForecast(
                 Forecast: {period.GetProperty("detailedForecast").GetString()}
                 """));
     }
-}
+}

src/ModelContextProtocol/Client/McpClientExtensions.cs

@@ -1,6 +1,8 @@
 using Microsoft.Extensions.AI;
+using Microsoft.Extensions.Logging;
 using ModelContextProtocol.Protocol.Messages;
 using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Server;
 using ModelContextProtocol.Utils;
 using ModelContextProtocol.Utils.Json;
 using System.Runtime.CompilerServices;
@@ -386,7 +388,7 @@ public static Task<ReadResourceResult> ReadResourceAsync(
     /// <param name="argumentName">Name of argument. Must be non-null and non-empty.</param>
     /// <param name="argumentValue">Value of argument. Must be non-null.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    public static Task<CompleteResult> GetCompletionAsync(this IMcpClient client, Reference reference, string argumentName, string argumentValue, CancellationToken cancellationToken = default)
+    public static Task<CompleteResult> CompleteAsync(this IMcpClient client, Reference reference, string argumentName, string argumentValue, CancellationToken cancellationToken = default)
     {
         Throw.IfNull(client);
         Throw.IfNull(reference);
@@ -631,6 +633,15 @@ public static Task SetLoggingLevel(this IMcpClient client, LoggingLevel level, C
             cancellationToken: cancellationToken);
     }
 
+    /// <summary>
+    /// Configures the minimum logging level for the server.
+    /// </summary>
+    /// <param name="client">The client.</param>
+    /// <param name="level">The minimum log level of messages to be generated.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    public static Task SetLoggingLevel(this IMcpClient client, LogLevel level, CancellationToken cancellationToken = default) =>
+        SetLoggingLevel(client, McpServer.ToLoggingLevel(level), cancellationToken);
+
     /// <summary>Convers a dictionary with <see cref="object"/> values to a dictionary with <see cref="JsonElement"/> values.</summary>
     private static IReadOnlyDictionary<string, JsonElement>? ToArgumentsDictionary(
         IReadOnlyDictionary<string, object?>? arguments, JsonSerializerOptions options)

src/ModelContextProtocol/Configuration/McpServerBuilderExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using ModelContextProtocol.Hosting;
 using ModelContextProtocol.Protocol.Transport;
@@ -288,15 +289,15 @@ public static IMcpServerBuilder WithReadResourceHandler(this IMcpServerBuilder b
     }
 
     /// <summary>
-    /// Sets the handler for get completion requests.
+    /// Sets the handler for completion complete requests.
     /// </summary>
     /// <param name="builder">The builder instance.</param>
     /// <param name="handler">The handler.</param>
-    public static IMcpServerBuilder WithGetCompletionHandler(this IMcpServerBuilder builder, Func<RequestContext<CompleteRequestParams>, CancellationToken, Task<CompleteResult>> handler)
+    public static IMcpServerBuilder WithCompleteHandler(this IMcpServerBuilder builder, Func<RequestContext<CompleteRequestParams>, CancellationToken, Task<CompleteResult>> handler)
     {
         Throw.IfNull(builder);
 
-        builder.Services.Configure<McpServerHandlers>(s => s.GetCompletionHandler = handler);
+        builder.Services.Configure<McpServerHandlers>(s => s.CompleteHandler = handler);
         return builder;
     }
 
@@ -348,17 +349,8 @@ public static IMcpServerBuilder WithStdioServerTransport(this IMcpServerBuilder
     {
         Throw.IfNull(builder);
 
+        AddSingleSessionServerDependencies(builder.Services);
         builder.Services.AddSingleton<ITransport, StdioServerTransport>();
-        builder.Services.AddHostedService<SingleSessionMcpServerHostedService>();
-
-        builder.Services.AddSingleton(services =>
-        {
-            ITransport serverTransport = services.GetRequiredService<ITransport>();
-            IOptions<McpServerOptions> options = services.GetRequiredService<IOptions<McpServerOptions>>();
-            ILoggerFactory? loggerFactory = services.GetService<ILoggerFactory>();
-
-            return McpServerFactory.Create(serverTransport, options.Value, loggerFactory, services);
-        });
 
         return builder;
     }
@@ -378,19 +370,22 @@ public static IMcpServerBuilder WithStreamServerTransport(
         Throw.IfNull(inputStream);
         Throw.IfNull(outputStream);
 
+        AddSingleSessionServerDependencies(builder.Services);
         builder.Services.AddSingleton<ITransport>(new StreamServerTransport(inputStream, outputStream));
-        builder.Services.AddHostedService<SingleSessionMcpServerHostedService>();
 
-        builder.Services.AddSingleton(services =>
+        return builder;
+    }
+
+    private static void AddSingleSessionServerDependencies(IServiceCollection services)
+    {
+        services.AddHostedService<SingleSessionMcpServerHostedService>();
+        services.TryAddSingleton(services =>
         {
             ITransport serverTransport = services.GetRequiredService<ITransport>();
             IOptions<McpServerOptions> options = services.GetRequiredService<IOptions<McpServerOptions>>();
             ILoggerFactory? loggerFactory = services.GetService<ILoggerFactory>();
-
             return McpServerFactory.Create(serverTransport, options.Value, loggerFactory, services);
         });
-
-        return builder;
     }
     #endregion
 }

src/ModelContextProtocol/McpEndpointExtensions.cs

@@ -83,7 +83,7 @@ internal static async Task<TResult> SendRequestAsync<TParameters, TResult>(
     }
 
     /// <summary>
-    /// Sends a notification to the server with parameters.
+    /// Sends a notification to the server with no parameters.
     /// </summary>
     /// <param name="client">The client.</param>
     /// <param name="method">The notification method name.</param>