Merge branch 'main' into mdk/expose-meta

Author: stephentoub

src/ModelContextProtocol.Core/Client/McpClient.Methods.cs

@@ -129,36 +129,6 @@ public async ValueTask<IList<McpClientTool>> ListToolsAsync(
         return tools;
     }
 
-    /// <summary>
-    /// Creates an enumerable for asynchronously enumerating all available tools from the server.
-    /// </summary>
-    /// <param name="options">Optional request options including metadata, serialization settings, and progress tracking.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>An asynchronous sequence of all available tools as <see cref="McpClientTool"/> instances.</returns>
-    public async IAsyncEnumerable<McpClientTool> EnumerateToolsAsync(
-        RequestOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        string? cursor = null;
-        do
-        {
-            var toolResults = await SendRequestAsync(
-                RequestMethods.ToolsList,
-                new() { Cursor = cursor, Meta = options?.Meta },
-                McpJsonUtilities.JsonContext.Default.ListToolsRequestParams,
-                McpJsonUtilities.JsonContext.Default.ListToolsResult,
-                cancellationToken: cancellationToken).ConfigureAwait(false);
-
-            foreach (var tool in toolResults.Tools)
-            {
-                yield return new McpClientTool(this, tool, options?.JsonSerializerOptions);
-            }
-
-            cursor = toolResults.NextCursor;
-        }
-        while (cursor is not null);
-    }
-
     /// <summary>
     /// Retrieves a list of available prompts from the server.
     /// </summary>
@@ -193,36 +163,6 @@ public async ValueTask<IList<McpClientPrompt>> ListPromptsAsync(
         return prompts;
     }
 
-    /// <summary>
-    /// Creates an enumerable for asynchronously enumerating all available prompts from the server.
-    /// </summary>
-    /// <param name="options">Optional request options including metadata, serialization settings, and progress tracking.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>An asynchronous sequence of all available prompts as <see cref="McpClientPrompt"/> instances.</returns>
-    public async IAsyncEnumerable<McpClientPrompt> EnumeratePromptsAsync(
-        RequestOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        string? cursor = null;
-        do
-        {
-            var promptResults = await SendRequestAsync(
-                RequestMethods.PromptsList,
-                new() { Cursor = cursor, Meta = options?.Meta },
-                McpJsonUtilities.JsonContext.Default.ListPromptsRequestParams,
-                McpJsonUtilities.JsonContext.Default.ListPromptsResult,
-                cancellationToken: cancellationToken).ConfigureAwait(false);
-
-            foreach (var prompt in promptResults.Prompts)
-            {
-                yield return new(this, prompt);
-            }
-
-            cursor = promptResults.NextCursor;
-        }
-        while (cursor is not null);
-    }
-
     /// <summary>
     /// Retrieves a specific prompt from the MCP server.
     /// </summary>
@@ -285,36 +225,6 @@ public async ValueTask<IList<McpClientResourceTemplate>> ListResourceTemplatesAs
         return resourceTemplates;
     }
 
-    /// <summary>
-    /// Creates an enumerable for asynchronously enumerating all available resource templates from the server.
-    /// </summary>
-    /// <param name="options">Optional request options including metadata, serialization settings, and progress tracking.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>An asynchronous sequence of all available resource templates as <see cref="ResourceTemplate"/> instances.</returns>
-    public async IAsyncEnumerable<McpClientResourceTemplate> EnumerateResourceTemplatesAsync(
-        RequestOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        string? cursor = null;
-        do
-        {
-            var templateResults = await SendRequestAsync(
-                RequestMethods.ResourcesTemplatesList,
-                new() { Cursor = cursor, Meta = options?.Meta },
-                McpJsonUtilities.JsonContext.Default.ListResourceTemplatesRequestParams,
-                McpJsonUtilities.JsonContext.Default.ListResourceTemplatesResult,
-                cancellationToken: cancellationToken).ConfigureAwait(false);
-
-            foreach (var templateResult in templateResults.ResourceTemplates)
-            {
-                yield return new McpClientResourceTemplate(this, templateResult);
-            }
-
-            cursor = templateResults.NextCursor;
-        }
-        while (cursor is not null);
-    }
-
     /// <summary>
     /// Retrieves a list of available resources from the server.
     /// </summary>
@@ -350,36 +260,6 @@ public async ValueTask<IList<McpClientResource>> ListResourcesAsync(
         return resources;
     }
 
-    /// <summary>
-    /// Creates an enumerable for asynchronously enumerating all available resources from the server.
-    /// </summary>
-    /// <param name="options">Optional request options including metadata, serialization settings, and progress tracking.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>An asynchronous sequence of all available resources as <see cref="Resource"/> instances.</returns>
-    public async IAsyncEnumerable<McpClientResource> EnumerateResourcesAsync(
-        RequestOptions? options = null,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        string? cursor = null;
-        do
-        {
-            var resourceResults = await SendRequestAsync(
-                RequestMethods.ResourcesList,
-                new() { Cursor = cursor, Meta = options?.Meta },
-                McpJsonUtilities.JsonContext.Default.ListResourcesRequestParams,
-                McpJsonUtilities.JsonContext.Default.ListResourcesResult,
-                cancellationToken: cancellationToken).ConfigureAwait(false);
-
-            foreach (var resource in resourceResults.Resources)
-            {
-                yield return new McpClientResource(this, resource);
-            }
-
-            cursor = resourceResults.NextCursor;
-        }
-        while (cursor is not null);
-    }
-
     /// <summary>
     /// Reads a resource from the server.
     /// </summary>

src/ModelContextProtocol.Core/Client/McpClientPrompt.cs

@@ -10,8 +10,7 @@ namespace ModelContextProtocol.Client;
 /// <para>
 /// This class provides a client-side wrapper around a prompt defined on an MCP server. It allows
 /// retrieving the prompt's content by sending a request to the server with optional arguments.
-/// Instances of this class are typically obtained by calling <see cref="McpClient.ListPromptsAsync"/>
-/// or <see cref="McpClient.EnumeratePromptsAsync"/>.
+/// Instances of this class are typically obtained by calling <see cref="McpClient.ListPromptsAsync"/>.
 /// </para>
 /// <para>
 /// Each prompt has a name and optionally a description, and it can be invoked with arguments

src/ModelContextProtocol.Core/Client/McpClientResource.cs

@@ -9,8 +9,7 @@ namespace ModelContextProtocol.Client;
 /// <para>
 /// This class provides a client-side wrapper around a resource defined on an MCP server. It allows
 /// retrieving the resource's content by sending a request to the server with the resource's URI.
-/// Instances of this class are typically obtained by calling <see cref="McpClient.ListResourcesAsync"/>
-/// or <see cref="McpClient.EnumerateResourcesAsync"/>.
+/// Instances of this class are typically obtained by calling <see cref="McpClient.ListResourcesAsync"/>.
 /// </para>
 /// </remarks>
 public sealed class McpClientResource

src/ModelContextProtocol.Core/Client/McpClientResourceTemplate.cs

@@ -9,8 +9,7 @@ namespace ModelContextProtocol.Client;
 /// <para>
 /// This class provides a client-side wrapper around a resource template defined on an MCP server. It allows
 /// retrieving the resource template's content by sending a request to the server with the resource's URI.
-/// Instances of this class are typically obtained by calling <see cref="McpClient.ListResourceTemplatesAsync"/>
-/// or <see cref="McpClient.EnumerateResourceTemplatesAsync"/>.
+/// Instances of this class are typically obtained by calling <see cref="McpClient.ListResourceTemplatesAsync"/>.
 /// </para>
 /// </remarks>
 public sealed class McpClientResourceTemplate

src/ModelContextProtocol.Core/Client/McpClientTool.cs

@@ -20,7 +20,7 @@ namespace ModelContextProtocol.Client;
 /// </para>
 /// <para>
 /// Typically, you would get instances of this class by calling the <see cref="McpClient.ListToolsAsync"/>
-/// or <see cref="McpClient.EnumerateToolsAsync"/> extension methods on an <see cref="McpClient"/> instance.
+/// method on an <see cref="McpClient"/> instance.
 /// </para>
 /// </remarks>
 public sealed class McpClientTool : AIFunction

tests/ModelContextProtocol.Tests/Client/McpClientTests.cs

@@ -286,55 +286,6 @@ public async Task ListToolsAsync_AllToolsReturned()
         Assert.False(valuesSetViaOptions.ProtocolTool.Annotations?.OpenWorldHint);
     }
 
-    [Fact]
-    public async Task EnumerateToolsAsync_AllToolsReturned()
-    {
-        await using McpClient client = await CreateMcpClientForServer();
-
-        await foreach (var tool in client.EnumerateToolsAsync(cancellationToken: TestContext.Current.CancellationToken))
-        {
-            if (tool.Name == "Method4")
-            {
-                var result = await tool.InvokeAsync(new() { ["i"] = 42 }, TestContext.Current.CancellationToken);
-                Assert.Contains("Method4 Result 42", result?.ToString());
-                return;
-            }
-        }
-
-        Assert.Fail("Couldn't find target method");
-    }
-
-    [Fact]
-    public async Task EnumerateToolsAsync_FlowsJsonSerializerOptions()
-    {
-        JsonSerializerOptions options = new(JsonSerializerOptions.Default);
-        await using McpClient client = await CreateMcpClientForServer();
-        bool hasTools = false;
-
-        await foreach (var tool in client.EnumerateToolsAsync(new RequestOptions { JsonSerializerOptions = options }, TestContext.Current.CancellationToken))
-        {
-            Assert.Same(options, tool.JsonSerializerOptions);
-            hasTools = true;
-        }
-
-        foreach (var tool in await client.ListToolsAsync(new RequestOptions { JsonSerializerOptions = options }, TestContext.Current.CancellationToken))
-        {
-            Assert.Same(options, tool.JsonSerializerOptions);
-        }
-
-        Assert.True(hasTools);
-    }
-
-    [Fact]
-    public async Task EnumerateToolsAsync_HonorsJsonSerializerOptions()
-    {
-        JsonSerializerOptions emptyOptions = new() { TypeInfoResolver = JsonTypeInfoResolver.Combine() };
-        await using McpClient client = await CreateMcpClientForServer();
-
-        var tool = (await client.ListToolsAsync(new RequestOptions { JsonSerializerOptions = emptyOptions }, TestContext.Current.CancellationToken)).First();
-        await Assert.ThrowsAsync<NotSupportedException>(async () => await tool.InvokeAsync(new() { ["i"] = 42 }, TestContext.Current.CancellationToken));
-    }
-
     [Fact]
     public async Task SendRequestAsync_HonorsJsonSerializerOptions()
     {