Add McpClient/Session methods using .Protocol types

Also fix up some consistency issues, and tweak RequestOptions.

Author: stephentoub

docs/concepts/elicitation/samples/server/Tools/InteractiveTools.cs

@@ -14,7 +14,7 @@ public sealed class InteractiveTools
     [McpServerTool, Description("A simple game where the user has to guess a number between 1 and 10.")]
     public async Task<string> GuessTheNumber(
         McpServer server, // Get the McpServer from DI container
-        CancellationToken token
+        CancellationToken cancellationToken
     )
     {
         // Check if the client supports elicitation
@@ -37,7 +37,7 @@ CancellationToken token
         {
             Message = "Do you want to play a game?",
             RequestedSchema = playSchema
-        }, token);
+        }, cancellationToken);
 
         // Check if user wants to play
         if (playResponse.Action != "accept" || playResponse.Content?["Answer"].ValueKind != JsonValueKind.True)
@@ -64,7 +64,7 @@ CancellationToken token
         {
             Message = "What is your name?",
             RequestedSchema = nameSchema
-        }, token);
+        }, cancellationToken);
 
         if (nameResponse.Action != "accept")
         {
@@ -100,7 +100,7 @@ CancellationToken token
             {
                 Message = message,
                 RequestedSchema = guessSchema
-            }, token);
+            }, cancellationToken);
 
             if (guessResponse.Action != "accept")
             {
@@ -128,7 +128,7 @@ CancellationToken token
     [McpServerTool, Description("Example tool demonstrating various enum schema types")]
     public async Task<string> EnumExamples(
         McpServer server,
-        CancellationToken token
+        CancellationToken cancellationToken
     )
     {
         // Example 1: UntitledSingleSelectEnumSchema - Simple enum without display titles
@@ -150,7 +150,7 @@ CancellationToken token
         {
             Message = "Select a priority level:",
             RequestedSchema = prioritySchema
-        }, token);
+        }, cancellationToken);
 
         if (priorityResponse.Action != "accept")
         {
@@ -184,7 +184,7 @@ CancellationToken token
         {
             Message = "Select the issue severity:",
             RequestedSchema = severitySchema
-        }, token);
+        }, cancellationToken);
 
         if (severityResponse.Action != "accept")
         {
@@ -218,7 +218,7 @@ CancellationToken token
         {
             Message = "Select up to 3 tags:",
             RequestedSchema = tagsSchema
-        }, token);
+        }, cancellationToken);
 
         if (tagsResponse.Action != "accept")
         {
@@ -257,7 +257,7 @@ CancellationToken token
         {
             Message = "Select desired features:",
             RequestedSchema = featuresSchema
-        }, token);
+        }, cancellationToken);
 
         if (featuresResponse.Action != "accept")
         {

docs/concepts/logging/samples/client/Program.cs

@@ -30,7 +30,7 @@
     if (Enum.TryParse<LoggingLevel>(firstArgument, true, out var loggingLevel))
     {
         // <snippet_LoggingLevel>
-        await mcpClient.SetLoggingLevel(loggingLevel);
+        await mcpClient.SetLoggingLevelAsync(loggingLevel);
         // </snippet_LoggingLevel>
     }
     else

samples/ProtectedMcpClient/Program.cs

@@ -70,7 +70,7 @@
 /// </summary>
 /// <param name="authorizationUrl">The authorization URL to open in the browser.</param>
 /// <param name="redirectUri">The redirect URI where the authorization code will be sent.</param>
-/// <param name="cancellationToken">The cancellation token.</param>
+/// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
 /// <returns>The authorization code extracted from the callback, or null if the operation failed.</returns>
 static async Task<string?> HandleAuthorizationUrlAsync(Uri authorizationUrl, Uri redirectUri, CancellationToken cancellationToken)
 {

src/ModelContextProtocol.Core/Authentication/AuthorizationRedirectDelegate.cs

@@ -6,7 +6,7 @@ namespace ModelContextProtocol.Authentication;
 /// </summary>
 /// <param name="authorizationUri">The authorization URL that the user needs to visit.</param>
 /// <param name="redirectUri">The redirect URI where the authorization code will be sent.</param>
-/// <param name="cancellationToken">The cancellation token.</param>
+/// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
 /// <returns>A task that represents the asynchronous operation. The task result contains the authorization code if successful, or null if the operation failed or was cancelled.</returns>
 /// <remarks>
 /// <para>

src/ModelContextProtocol.Core/Authentication/ClientOAuthProvider.cs

@@ -102,7 +102,7 @@ public ClientOAuthProvider(
     /// </summary>
     /// <param name="authorizationUrl">The authorization URL to handle.</param>
     /// <param name="redirectUri">The redirect URI where the authorization code will be sent.</param>
-    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The authorization code entered by the user, or null if none was provided.</returns>
     private static Task<string?> DefaultAuthorizationUrlHandler(Uri authorizationUrl, Uri redirectUri, CancellationToken cancellationToken)
     {
@@ -135,7 +135,7 @@ public ClientOAuthProvider(
     /// </summary>
     /// <param name="scheme">The authentication scheme to use.</param>
     /// <param name="resourceUri">The URI of the resource requiring authentication.</param>
-    /// <param name="cancellationToken">A token to cancel the operation.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>An authentication token string, or null if no token could be obtained for the specified scheme.</returns>
     public async Task<string?> GetCredentialAsync(string scheme, Uri resourceUri, CancellationToken cancellationToken = default)
     {
@@ -168,7 +168,7 @@ public ClientOAuthProvider(
     /// </summary>
     /// <param name="scheme">The authentication scheme that was used when the unauthorized response was received.</param>
     /// <param name="response">The HTTP response that contained the 401 status code.</param>
-    /// <param name="cancellationToken">A token to cancel the operation.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>
     /// A result object indicating if the provider was able to handle the unauthorized response,
     /// and the authentication scheme that should be used for the next attempt, if any.
@@ -186,7 +186,7 @@ public async Task HandleUnauthorizedResponseAsync(
     /// Performs OAuth authorization by selecting an appropriate authorization server and completing the OAuth flow.
     /// </summary>
     /// <param name="response">The 401 Unauthorized response containing authentication challenge.</param>
-    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>A result object indicating whether authorization was successful.</returns>
     private async Task PerformOAuthAuthorizationAsync(
         HttpResponseMessage response,
@@ -473,7 +473,7 @@ private async Task<TokenContainer> HandleSuccessfulTokenResponseAsync(HttpRespon
     /// Fetches the protected resource metadata from the provided URL.
     /// </summary>
     /// <param name="metadataUrl">The URL to fetch the metadata from.</param>
-    /// <param name="cancellationToken">A token to cancel the operation.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The fetched ProtectedResourceMetadata, or null if it couldn't be fetched.</returns>
     private async Task<ProtectedResourceMetadata?> FetchProtectedResourceMetadataAsync(Uri metadataUrl, CancellationToken cancellationToken = default)
     {
@@ -488,7 +488,7 @@ private async Task<TokenContainer> HandleSuccessfulTokenResponseAsync(HttpRespon
     /// Performs dynamic client registration with the authorization server.
     /// </summary>
     /// <param name="authServerMetadata">The authorization server metadata.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>A task representing the asynchronous operation.</returns>
     private async Task PerformDynamicClientRegistrationAsync(
         AuthorizationServerMetadata authServerMetadata,
@@ -609,7 +609,7 @@ private static string NormalizeUri(Uri uri)
     /// </summary>
     /// <param name="response">The HTTP response containing the WWW-Authenticate header.</param>
     /// <param name="serverUrl">The server URL to verify against the resource metadata.</param>
-    /// <param name="cancellationToken">A token to cancel the operation.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The resource metadata if the resource matches the server, otherwise throws an exception.</returns>
     /// <exception cref="InvalidOperationException">Thrown when the response is not a 401, lacks a WWW-Authenticate header,
     /// lacks a resource_metadata parameter, the metadata can't be fetched, or the resource URI doesn't match the server URL.</exception>