Minor cleanup

Author: mikekistler

samples/EverythingServer/Tools/SampleLlmTool.cs

@@ -15,7 +15,7 @@ public static async Task<string> SampleLLM(
         CancellationToken cancellationToken)
     {
         var samplingParams = CreateRequestSamplingParams(prompt ?? string.Empty, "sampleLLM", maxTokens);
-        var sampleResult = await server.SampleAsync(samplingParams, options: null, cancellationToken);
+        var sampleResult = await server.SampleAsync(samplingParams, cancellationToken: cancellationToken);
 
         return $"LLM sampling result: {(sampleResult.Content as TextContentBlock)?.Text}";
     }

samples/TestServerWithHosting/Tools/SampleLlmTool.cs

@@ -18,7 +18,7 @@ public static async Task<string> SampleLLM(
         CancellationToken cancellationToken)
     {
         var samplingParams = CreateRequestSamplingParams(prompt ?? string.Empty, "sampleLLM", maxTokens);
-        var sampleResult = await thisServer.SampleAsync(samplingParams, options: null, cancellationToken);
+        var sampleResult = await thisServer.SampleAsync(samplingParams, cancellationToken: cancellationToken);
 
         return $"LLM sampling result: {(sampleResult.Content as TextContentBlock)?.Text}";
     }

src/ModelContextProtocol.Core/README.md

@@ -50,7 +50,7 @@ foreach (var tool in await client.ListToolsAsync())
 var result = await client.CallToolAsync(
     "echo",
     new Dictionary<string, object?>() { ["message"] = "Hello MCP!" },
-    cancellationToken:CancellationToken.None);
+    cancellationToken: CancellationToken.None);
 
 // echo always returns one and only one text content object
 Console.WriteLine(result.Content.First(c => c.Type == "text").Text);
@@ -83,13 +83,13 @@ using System.ComponentModel;
 var serverOptions = new McpServerOptions();
 
 // Add tools directly
-serverOptions.Capabilities.Tools = new() 
+serverOptions.Capabilities.Tools = new()
 {
     ListChanged = true,
     ToolCollection = [
         McpServerTool.Create((string message) => $"hello {message}", new()
         {
-            Name = "echo", 
+            Name = "echo",
             Description = "Echoes the message back to the client."
         })
     ]

src/ModelContextProtocol.Core/Server/McpServer.Methods.cs

@@ -467,7 +467,7 @@ private sealed class SamplingChatClient(McpServer server) : IChatClient
 
         /// <inheritdoc/>
         public Task<ChatResponse> GetResponseAsync(IEnumerable<ChatMessage> messages, ChatOptions? options = null, CancellationToken cancellationToken = default) =>
-            _server.SampleAsync(messages, options, requestOptions: null, cancellationToken);
+            _server.SampleAsync(messages, options: options, cancellationToken: cancellationToken);
 
         /// <inheritdoc/>
         async IAsyncEnumerable<ChatResponseUpdate> IChatClient.GetStreamingResponseAsync(

src/ModelContextProtocol.Core/Server/McpServerExtensions.cs

@@ -31,7 +31,7 @@ public static class McpServerExtensions
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<CreateMessageResult> SampleAsync(
         this IMcpServer server, CreateMessageRequestParams request, CancellationToken cancellationToken = default)
-        => AsServerOrThrow(server).SampleAsync(request, options: null, cancellationToken);
+        => AsServerOrThrow(server).SampleAsync(request, cancellationToken: cancellationToken);
 
     /// <summary>
     /// Requests to sample an LLM via the client using the provided chat messages and options.
@@ -53,7 +53,7 @@ public static ValueTask<CreateMessageResult> SampleAsync(
     public static Task<ChatResponse> SampleAsync(
         this IMcpServer server,
         IEnumerable<ChatMessage> messages, ChatOptions? options = default, CancellationToken cancellationToken = default)
-        => AsServerOrThrow(server).SampleAsync(messages, options, requestOptions: null, cancellationToken);
+        => AsServerOrThrow(server).SampleAsync(messages, options, cancellationToken: cancellationToken);
 
     /// <summary>
     /// Creates an <see cref="IChatClient"/> wrapper that can be used to send sampling requests to the client.
@@ -94,7 +94,7 @@ public static ILoggerProvider AsClientLoggerProvider(this IMcpServer server)
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<ListRootsResult> RequestRootsAsync(
         this IMcpServer server, ListRootsRequestParams request, CancellationToken cancellationToken = default)
-        => AsServerOrThrow(server).RequestRootsAsync(request, options: null, cancellationToken);
+        => AsServerOrThrow(server).RequestRootsAsync(request, cancellationToken: cancellationToken);
 
     /// <summary>
     /// Requests additional information from the user via the client, allowing the server to elicit structured data.

src/ModelContextProtocol.Core/TokenProgress.cs

@@ -11,6 +11,6 @@ internal sealed class TokenProgress(McpSession session, ProgressToken progressTo
     /// <inheritdoc />
     public void Report(ProgressNotificationValue value)
     {
-        _ = session.NotifyProgressAsync(progressToken, value, options: null, CancellationToken.None);
+        _ = session.NotifyProgressAsync(progressToken, value, cancellationToken: CancellationToken.None);
     }
 }

tests/ModelContextProtocol.TestServer/Program.cs

@@ -193,7 +193,7 @@ private static void ConfigureTools(McpServerOptions options, string? cliArg)
                     throw new McpProtocolException("Missing required arguments 'prompt' and 'maxTokens'", McpErrorCode.InvalidParams);
                 }
                 var sampleResult = await request.Server.SampleAsync(CreateRequestSamplingParams(prompt.ToString(), "sampleLLM", Convert.ToInt32(maxTokens.GetRawText())),
-                    options: null, cancellationToken);
+                    cancellationToken: cancellationToken);
 
                 return new CallToolResult
                 {

tests/ModelContextProtocol.TestSseServer/Program.cs

@@ -187,7 +187,7 @@ static CreateMessageRequestParams CreateRequestSamplingParams(string context, st
                         throw new McpProtocolException("Missing required arguments 'prompt' and 'maxTokens'", McpErrorCode.InvalidParams);
                     }
                     var sampleResult = await request.Server.SampleAsync(CreateRequestSamplingParams(prompt.ToString(), "sampleLLM", Convert.ToInt32(maxTokens.ToString())),
-                        options: null, cancellationToken);
+                        cancellationToken: cancellationToken);
 
                     return new CallToolResult
                     {

tests/ModelContextProtocol.Tests/Server/EmptyCollectionTests.cs

@@ -158,8 +158,8 @@ public async Task ListFails()
 
         var client = await CreateMcpClientForServer();
 
-        await Assert.ThrowsAsync<McpProtocolException>(async () => await client.ListToolsAsync(options: null, cancellationToken: TestContext.Current.CancellationToken));
-        await Assert.ThrowsAsync<McpProtocolException>(async () => await client.ListPromptsAsync(options: null, TestContext.Current.CancellationToken));
-        await Assert.ThrowsAsync<McpProtocolException>(async () => await client.ListResourcesAsync(options: null, TestContext.Current.CancellationToken));
+        await Assert.ThrowsAsync<McpProtocolException>(async () => await client.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken));
+        await Assert.ThrowsAsync<McpProtocolException>(async () => await client.ListPromptsAsync(cancellationToken: TestContext.Current.CancellationToken));
+        await Assert.ThrowsAsync<McpProtocolException>(async () => await client.ListResourcesAsync(cancellationToken: TestContext.Current.CancellationToken));
     }
 }