Fix tests

Author: mikekistler

src/ModelContextProtocol.Core/Client/McpClientExtensions.cs

@@ -28,7 +28,7 @@ public static class McpClientExtensions
     /// <remarks>
     /// <para>
     /// This method is used to check if the MCP server is online and responding to requests.
-    /// It can be useful for health checking, ensuring the connection is established, or verifying 
+    /// It can be useful for health checking, ensuring the connection is established, or verifying
     /// that the client has proper authorization to communicate with the server.
     /// </para>
     /// <para>
@@ -41,7 +41,7 @@ public static class McpClientExtensions
     [Obsolete($"Use {nameof(McpClient)}.{nameof(McpClient.PingAsync)} instead. This member will be removed in a subsequent release.")] // See: https://github.com/modelcontextprotocol/csharp-sdk/issues/774
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static Task PingAsync(this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).PingAsync(cancellationToken);
+        => AsClientOrThrow(client).PingAsync(null, cancellationToken).AsTask();
 
     /// <summary>
     /// Retrieves a list of available tools from the server.
@@ -56,7 +56,7 @@ public static Task PingAsync(this IMcpClient client, CancellationToken cancellat
     /// It automatically handles pagination with cursors if the server responds with only a portion per request.
     /// </para>
     /// <para>
-    /// For servers with a large number of tools and that responds with paginated responses, consider using 
+    /// For servers with a large number of tools and that responds with paginated responses, consider using
     /// <see cref="EnumerateToolsAsync"/> instead, as it streams tools as they arrive rather than loading them all at once.
     /// </para>
     /// <para>
@@ -68,13 +68,13 @@ public static Task PingAsync(this IMcpClient client, CancellationToken cancellat
     /// <code>
     /// // Get all tools available on the server
     /// var tools = await mcpClient.ListToolsAsync();
-    /// 
+    ///
     /// // Use tools with an AI client
     /// ChatOptions chatOptions = new()
     /// {
     ///     Tools = [.. tools]
     /// };
-    /// 
+    ///
     /// await foreach (var update in chatClient.GetStreamingResponseAsync(userMessage, chatOptions))
     /// {
     ///     Console.Write(update);
@@ -88,7 +88,7 @@ public static ValueTask<IList<McpClientTool>> ListToolsAsync(
         this IMcpClient client,
         JsonSerializerOptions? serializerOptions = null,
         CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ListToolsAsync(serializerOptions, cancellationToken);
+        => AsClientOrThrow(client).ListToolsAsync(new RequestOptions { JsonSerializerOptions = serializerOptions }, cancellationToken);
 
     /// <summary>
     /// Creates an enumerable for asynchronously enumerating all available tools from the server.
@@ -128,7 +128,7 @@ public static IAsyncEnumerable<McpClientTool> EnumerateToolsAsync(
         this IMcpClient client,
         JsonSerializerOptions? serializerOptions = null,
         CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).EnumerateToolsAsync(serializerOptions, cancellationToken);
+        => AsClientOrThrow(client).EnumerateToolsAsync(new RequestOptions { JsonSerializerOptions = serializerOptions }, cancellationToken);
 
     /// <summary>
     /// Retrieves a list of available prompts from the server.
@@ -142,7 +142,7 @@ public static IAsyncEnumerable<McpClientTool> EnumerateToolsAsync(
     /// It automatically handles pagination with cursors if the server responds with only a portion per request.
     /// </para>
     /// <para>
-    /// For servers with a large number of prompts and that responds with paginated responses, consider using 
+    /// For servers with a large number of prompts and that responds with paginated responses, consider using
     /// <see cref="EnumeratePromptsAsync"/> instead, as it streams prompts as they arrive rather than loading them all at once.
     /// </para>
     /// </remarks>
@@ -151,7 +151,7 @@ public static IAsyncEnumerable<McpClientTool> EnumerateToolsAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<IList<McpClientPrompt>> ListPromptsAsync(
         this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ListPromptsAsync(cancellationToken);
+        => AsClientOrThrow(client).ListPromptsAsync(null, cancellationToken);
 
     /// <summary>
     /// Creates an enumerable for asynchronously enumerating all available prompts from the server.
@@ -184,7 +184,7 @@ public static ValueTask<IList<McpClientPrompt>> ListPromptsAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static IAsyncEnumerable<McpClientPrompt> EnumeratePromptsAsync(
         this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).EnumeratePromptsAsync(cancellationToken);
+        => AsClientOrThrow(client).EnumeratePromptsAsync(null, cancellationToken);
 
     /// <summary>
     /// Retrieves a specific prompt from the MCP server.
@@ -201,7 +201,7 @@ public static IAsyncEnumerable<McpClientPrompt> EnumeratePromptsAsync(
     /// The server will process the arguments and return a prompt containing messages or other content.
     /// </para>
     /// <para>
-    /// Arguments are serialized into JSON and passed to the server, where they may be used to customize the 
+    /// Arguments are serialized into JSON and passed to the server, where they may be used to customize the
     /// prompt's behavior or content. Each prompt may have different argument requirements.
     /// </para>
     /// <para>
@@ -219,7 +219,7 @@ public static ValueTask<GetPromptResult> GetPromptAsync(
         IReadOnlyDictionary<string, object?>? arguments = null,
         JsonSerializerOptions? serializerOptions = null,
         CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).GetPromptAsync(name, arguments, serializerOptions, cancellationToken);
+        => AsClientOrThrow(client).GetPromptAsync(name, arguments, new RequestOptions { JsonSerializerOptions = serializerOptions }, cancellationToken);
 
     /// <summary>
     /// Retrieves a list of available resource templates from the server.
@@ -233,7 +233,7 @@ public static ValueTask<GetPromptResult> GetPromptAsync(
     /// It automatically handles pagination with cursors if the server responds with only a portion per request.
     /// </para>
     /// <para>
-    /// For servers with a large number of resource templates and that responds with paginated responses, consider using 
+    /// For servers with a large number of resource templates and that responds with paginated responses, consider using
     /// <see cref="EnumerateResourceTemplatesAsync"/> instead, as it streams templates as they arrive rather than loading them all at once.
     /// </para>
     /// </remarks>
@@ -242,7 +242,7 @@ public static ValueTask<GetPromptResult> GetPromptAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<IList<McpClientResourceTemplate>> ListResourceTemplatesAsync(
         this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ListResourceTemplatesAsync(cancellationToken);
+        => AsClientOrThrow(client).ListResourceTemplatesAsync(null, cancellationToken);
 
     /// <summary>
     /// Creates an enumerable for asynchronously enumerating all available resource templates from the server.
@@ -275,7 +275,7 @@ public static ValueTask<IList<McpClientResourceTemplate>> ListResourceTemplatesA
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static IAsyncEnumerable<McpClientResourceTemplate> EnumerateResourceTemplatesAsync(
         this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).EnumerateResourceTemplatesAsync(cancellationToken);
+        => AsClientOrThrow(client).EnumerateResourceTemplatesAsync(null, cancellationToken);
 
     /// <summary>
     /// Retrieves a list of available resources from the server.
@@ -289,15 +289,15 @@ public static IAsyncEnumerable<McpClientResourceTemplate> EnumerateResourceTempl
     /// It automatically handles pagination with cursors if the server responds with only a portion per request.
     /// </para>
     /// <para>
-    /// For servers with a large number of resources and that responds with paginated responses, consider using 
+    /// For servers with a large number of resources and that responds with paginated responses, consider using
     /// <see cref="EnumerateResourcesAsync"/> instead, as it streams resources as they arrive rather than loading them all at once.
     /// </para>
     /// </remarks>
     /// <example>
     /// <code>
     /// // Get all resources available on the server
     /// var resources = await client.ListResourcesAsync();
-    /// 
+    ///
     /// // Display information about each resource
     /// foreach (var resource in resources)
     /// {
@@ -310,7 +310,7 @@ public static IAsyncEnumerable<McpClientResourceTemplate> EnumerateResourceTempl
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<IList<McpClientResource>> ListResourcesAsync(
         this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ListResourcesAsync(cancellationToken);
+        => AsClientOrThrow(client).ListResourcesAsync(null, cancellationToken);
 
     /// <summary>
     /// Creates an enumerable for asynchronously enumerating all available resources from the server.
@@ -343,7 +343,7 @@ public static ValueTask<IList<McpClientResource>> ListResourcesAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static IAsyncEnumerable<McpClientResource> EnumerateResourcesAsync(
         this IMcpClient client, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).EnumerateResourcesAsync(cancellationToken);
+        => AsClientOrThrow(client).EnumerateResourcesAsync(null, cancellationToken);
 
     /// <summary>
     /// Reads a resource from the server.
@@ -358,7 +358,7 @@ public static IAsyncEnumerable<McpClientResource> EnumerateResourcesAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<ReadResourceResult> ReadResourceAsync(
         this IMcpClient client, string uri, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ReadResourceAsync(uri, cancellationToken);
+        => AsClientOrThrow(client).ReadResourceAsync(uri, null, cancellationToken);
 
     /// <summary>
     /// Reads a resource from the server.
@@ -372,7 +372,7 @@ public static ValueTask<ReadResourceResult> ReadResourceAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<ReadResourceResult> ReadResourceAsync(
         this IMcpClient client, Uri uri, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ReadResourceAsync(uri, cancellationToken);
+        => AsClientOrThrow(client).ReadResourceAsync(uri, null, cancellationToken);
 
     /// <summary>
     /// Reads a resource from the server.
@@ -388,7 +388,7 @@ public static ValueTask<ReadResourceResult> ReadResourceAsync(
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static ValueTask<ReadResourceResult> ReadResourceAsync(
         this IMcpClient client, string uriTemplate, IReadOnlyDictionary<string, object?> arguments, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).ReadResourceAsync(uriTemplate, arguments, cancellationToken);
+        => AsClientOrThrow(client).ReadResourceAsync(uriTemplate, arguments, null, cancellationToken);
 
     /// <summary>
     /// Requests completion suggestions for a prompt argument or resource reference.
@@ -410,7 +410,7 @@ public static ValueTask<ReadResourceResult> ReadResourceAsync(
     /// auto-completion in user interfaces.
     /// </para>
     /// <para>
-    /// When working with resource references, the server will return suggestions relevant to the specified 
+    /// When working with resource references, the server will return suggestions relevant to the specified
     /// resource URI.
     /// </para>
     /// </remarks>
@@ -452,7 +452,7 @@ public static ValueTask<CompleteResult> CompleteAsync(this IMcpClient client, Re
     [Obsolete($"Use {nameof(McpClient)}.{nameof(McpClient.SubscribeToResourceAsync)} instead. This member will be removed in a subsequent release.")] // See: https://github.com/modelcontextprotocol/csharp-sdk/issues/774
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static Task SubscribeToResourceAsync(this IMcpClient client, string uri, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).SubscribeToResourceAsync(uri, cancellationToken);
+        => AsClientOrThrow(client).SubscribeToResourceAsync(uri, null, cancellationToken);
 
     /// <summary>
     /// Subscribes to a resource on the server to receive notifications when it changes.
@@ -481,7 +481,7 @@ public static Task SubscribeToResourceAsync(this IMcpClient client, string uri,
     [Obsolete($"Use {nameof(McpClient)}.{nameof(McpClient.SubscribeToResourceAsync)} instead. This member will be removed in a subsequent release.")] // See: https://github.com/modelcontextprotocol/csharp-sdk/issues/774
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static Task SubscribeToResourceAsync(this IMcpClient client, Uri uri, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).SubscribeToResourceAsync(uri, cancellationToken);
+        => AsClientOrThrow(client).SubscribeToResourceAsync(uri, null, cancellationToken);
 
     /// <summary>
     /// Unsubscribes from a resource on the server to stop receiving notifications about its changes.
@@ -510,7 +510,7 @@ public static Task SubscribeToResourceAsync(this IMcpClient client, Uri uri, Can
     [Obsolete($"Use {nameof(McpClient)}.{nameof(McpClient.UnsubscribeFromResourceAsync)} instead. This member will be removed in a subsequent release.")] // See: https://github.com/modelcontextprotocol/csharp-sdk/issues/774
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static Task UnsubscribeFromResourceAsync(this IMcpClient client, string uri, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).UnsubscribeFromResourceAsync(uri, cancellationToken);
+        => AsClientOrThrow(client).UnsubscribeFromResourceAsync(uri, null, cancellationToken);
 
     /// <summary>
     /// Unsubscribes from a resource on the server to stop receiving notifications about its changes.
@@ -538,7 +538,7 @@ public static Task UnsubscribeFromResourceAsync(this IMcpClient client, string u
     [Obsolete($"Use {nameof(McpClient)}.{nameof(McpClient.UnsubscribeFromResourceAsync)} instead. This member will be removed in a subsequent release.")] // See: https://github.com/modelcontextprotocol/csharp-sdk/issues/774
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static Task UnsubscribeFromResourceAsync(this IMcpClient client, Uri uri, CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).UnsubscribeFromResourceAsync(uri, cancellationToken);
+        => AsClientOrThrow(client).UnsubscribeFromResourceAsync(uri, null, cancellationToken);
 
     /// <summary>
     /// Invokes a tool on the server.
@@ -584,7 +584,7 @@ public static ValueTask<CallToolResult> CallToolAsync(
         IProgress<ProgressNotificationValue>? progress = null,
         JsonSerializerOptions? serializerOptions = null,
         CancellationToken cancellationToken = default)
-        => AsClientOrThrow(client).CallToolAsync(toolName, arguments, progress, serializerOptions, cancellationToken);
+        => AsClientOrThrow(client).CallToolAsync(toolName, arguments, progress, new RequestOptions { JsonSerializerOptions = serializerOptions }, cancellationToken);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #pragma warning disable CS0618 // Type or member is obsolete

src/ModelContextProtocol.Core/McpEndpointExtensions.cs

@@ -56,8 +56,8 @@ public static ValueTask<TResult> SendRequestAsync<TParameters, TResult>(
     /// <returns>A task that represents the asynchronous send operation.</returns>
     /// <remarks>
     /// <para>
-    /// This method sends a notification without any parameters. Notifications are one-way messages 
-    /// that don't expect a response. They are commonly used for events, status updates, or to signal 
+    /// This method sends a notification without any parameters. Notifications are one-way messages
+    /// that don't expect a response. They are commonly used for events, status updates, or to signal
     /// changes in state.
     /// </para>
     /// </remarks>
@@ -78,11 +78,11 @@ public static Task SendNotificationAsync(this IMcpEndpoint client, string method
     /// <returns>A task that represents the asynchronous send operation.</returns>
     /// <remarks>
     /// <para>
-    /// This method sends a notification with parameters to the connected endpoint. Notifications are one-way 
+    /// This method sends a notification with parameters to the connected endpoint. Notifications are one-way
     /// messages that don't expect a response, commonly used for events, status updates, or signaling changes.
     /// </para>
     /// <para>
-    /// The parameters object is serialized to JSON according to the provided serializer options or the default 
+    /// The parameters object is serialized to JSON according to the provided serializer options or the default
     /// options if none are specified.
     /// </para>
     /// <para>
@@ -126,7 +126,7 @@ public static Task NotifyProgressAsync(
         ProgressToken progressToken,
         ProgressNotificationValue progress,
         CancellationToken cancellationToken = default)
-        => AsSessionOrThrow(endpoint).NotifyProgressAsync(progressToken, progress, cancellationToken);
+        => AsSessionOrThrow(endpoint).NotifyProgressAsync(progressToken, progress, null, cancellationToken);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #pragma warning disable CS0618 // Type or member is obsolete

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, cancellationToken);
+        => AsServerOrThrow(server).SampleAsync(request, options: null, 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, cancellationToken);
+        => AsServerOrThrow(server).SampleAsync(messages, options, requestOptions: null, 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, cancellationToken);
+        => AsServerOrThrow(server).RequestRootsAsync(request, options: null, cancellationToken);
 
     /// <summary>
     /// Requests additional information from the user via the client, allowing the server to elicit structured data.