[mcp] Renamed various types and methods to support other MCP features (#8968)

glen-84 · web-flow · commit a5b56eab3655 · 2025-12-04T12:13:29.000+02:00
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
@@ -61,12 +61,12 @@ public static void AddMcpSchemaServices(
 
         services
             .TryAddSingleton(
-                static sp => new ToolStorageObserver(
+                static sp => new McpStorageObserver(
                     sp.GetRequiredService<ISchemaDefinition>(),
-                    sp.GetRequiredService<ToolRegistry>(),
+                    sp.GetRequiredService<McpFeatureRegistry>(),
                     sp.GetRequiredService<OperationToolFactory>(),
                     sp.GetRequiredService<ConcurrentDictionary<string, McpServer>>(),
-                    sp.GetRequiredService<IOperationToolStorage>(),
+                    sp.GetRequiredService<IMcpStorage>(),
                     sp.GetRequiredService<IMcpDiagnosticEvents>()));
 
         services
@@ -78,7 +78,7 @@ public static void AddMcpSchemaServices(
                 static sp => sp
                     .GetRequiredService<IRootServiceProviderAccessor>().ServiceProvider
                     .GetRequiredService<ILoggerFactory>())
-            .AddSingleton<ToolRegistry>();
+            .AddSingleton<McpFeatureRegistry>();
 
         var mcpServers = new ConcurrentDictionary<string, McpServer>();
         services.AddSingleton(mcpServers);
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/CallToolHandler.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/CallToolHandler.cs
@@ -21,7 +21,7 @@ public static async ValueTask<CallToolResult> HandleAsync(
         CancellationToken cancellationToken)
     {
         var services = context.Services!;
-        var registry = services.GetRequiredService<ToolRegistry>();
+        var registry = services.GetRequiredService<McpFeatureRegistry>();
 
         if (!registry.TryGetTool(context.Params!.Name, out var tool))
         {
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/ListResourcesHandler.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/ListResourcesHandler.cs
@@ -8,10 +8,10 @@ internal static class ListResourcesHandler
 {
     public static ListResourcesResult Handle(RequestContext<ListResourcesRequestParams> context)
     {
-        var toolRegistry = context.Services!.GetRequiredService<ToolRegistry>();
+        var registry = context.Services!.GetRequiredService<McpFeatureRegistry>();
 
         var openAiComponentResources =
-            toolRegistry
+            registry
                 .GetTools()
                 .Select(t => t.OpenAiComponentResource)
                 .OfType<Resource>()
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/ListToolsHandler.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/ListToolsHandler.cs
@@ -8,7 +8,7 @@ internal static class ListToolsHandler
 {
     public static ListToolsResult Handle(RequestContext<ListToolsRequestParams> context)
     {
-        var registry = context.Services!.GetRequiredService<ToolRegistry>();
+        var registry = context.Services!.GetRequiredService<McpFeatureRegistry>();
 
         return new ListToolsResult
         {
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/ReadResourceHandler.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/ReadResourceHandler.cs
@@ -10,9 +10,9 @@ internal static class ReadResourceHandler
 {
     public static ReadResourceResult Handle(RequestContext<ReadResourceRequestParams> context)
     {
-        var toolRegistry = context.Services!.GetRequiredService<ToolRegistry>();
+        var registry = context.Services!.GetRequiredService<McpFeatureRegistry>();
 
-        if (!toolRegistry.TryGetToolByOpenAiComponentResourceUri(context.Params!.Uri, out var tool))
+        if (!registry.TryGetToolByOpenAiComponentResourceUri(context.Params!.Uri, out var tool))
         {
             // TODO: See https://github.com/modelcontextprotocol/csharp-sdk/issues/1025.
             throw new McpProtocolException(
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpFeatureRegistry.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpFeatureRegistry.cs
@@ -4,7 +4,7 @@
 
 namespace HotChocolate.Adapters.Mcp;
 
-internal sealed class ToolRegistry
+internal sealed class McpFeatureRegistry
 {
     private FrozenDictionary<string, OperationTool> _tools
         = FrozenDictionary<string, OperationTool>.Empty;
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpStorageObserver.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpStorageObserver.cs
@@ -11,16 +11,16 @@
 
 namespace HotChocolate.Adapters.Mcp;
 
-internal sealed class ToolStorageObserver : IDisposable
+internal sealed class McpStorageObserver : IDisposable
 {
     private readonly SemaphoreSlim _semaphore = new(initialCount: 1, maxCount: 1);
     private readonly CancellationTokenSource _cts = new();
     private readonly CancellationToken _ct;
     private readonly ISchemaDefinition _schema;
-    private readonly ToolRegistry _registry;
+    private readonly McpFeatureRegistry _registry;
     private readonly OperationToolFactory _toolFactory;
     private readonly ConcurrentDictionary<string, McpServer> _mcpServers;
-    private readonly IOperationToolStorage _storage;
+    private readonly IMcpStorage _storage;
     private readonly IMcpDiagnosticEvents _diagnosticEvents;
     private IDisposable? _subscription;
 #if NET10_0_OR_GREATER
@@ -32,12 +32,12 @@ private static readonly DocumentValidator s_documentValidator
         = DocumentValidatorBuilder.New().AddDefaultRules().Build();
     private bool _disposed;
 
-    public ToolStorageObserver(
+    public McpStorageObserver(
         ISchemaDefinition schema,
-        ToolRegistry registry,
+        McpFeatureRegistry registry,
         OperationToolFactory toolFactory,
         ConcurrentDictionary<string, McpServer> mcpServers,
-        IOperationToolStorage storage,
+        IMcpStorage storage,
         IMcpDiagnosticEvents diagnosticEvents)
     {
         _schema = schema;
@@ -71,7 +71,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 
             using var scope = _diagnosticEvents.InitializeTools();
 
-            foreach (var toolDefinition in await _storage.GetToolsAsync(cancellationToken))
+            foreach (var toolDefinition in await _storage.GetOperationToolDefinitionsAsync(cancellationToken))
             {
                 var validationResult = s_documentValidator.Validate(_schema, toolDefinition.Document);
 
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/OperationToolFactory.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/OperationToolFactory.cs
@@ -181,30 +181,30 @@ private static Resource CreateOpenAiComponentResource(
             meta["openai/widgetPrefersBorder"] = openAiComponent.PrefersBorder;
         }
 
-        if (openAiComponent.ContentSecurityPolicy is { } contentSecurityPolicy)
+        if (openAiComponent.Csp is { } csp)
         {
-            JsonObject? csp = null;
+            JsonObject? contentSecurityPolicy = null;
 
-            if (contentSecurityPolicy.ConnectDomains is { Length: > 0 } connectDomains)
+            if (csp.ConnectDomains is { Length: > 0 } connectDomains)
             {
-                csp ??= new JsonObject();
-                csp.Add(
+                contentSecurityPolicy ??= new JsonObject();
+                contentSecurityPolicy.Add(
                     "connect_domains",
                     new JsonArray(connectDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));
             }
 
-            if (contentSecurityPolicy.ResourceDomains is { Length: > 0 } resourceDomains)
+            if (csp.ResourceDomains is { Length: > 0 } resourceDomains)
             {
-                csp ??= new JsonObject();
-                csp.Add(
+                contentSecurityPolicy ??= new JsonObject();
+                contentSecurityPolicy.Add(
                     "resource_domains",
                     new JsonArray(resourceDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));
             }
 
-            if (csp is not null)
+            if (contentSecurityPolicy is not null)
             {
                 meta ??= new JsonObject();
-                meta.Add("openai/widgetCSP", csp);
+                meta.Add("openai/widgetCSP", contentSecurityPolicy);
             }
         }
 
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/IMcpStorage.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/IMcpStorage.cs
@@ -0,0 +1,19 @@
+namespace HotChocolate.Adapters.Mcp.Storage;
+
+/// <summary>
+/// Provides access to MCP feature definitions with change notification support.
+/// Implementations can retrieve definitions from various sources (file system, database, etc.).
+/// The Hot Chocolate MCP server will observe the <see cref="IMcpStorage"/>
+/// and when changes are detected will phase in new definitions, update definitions, or phase out
+/// definitions that have been removed from the storage.
+/// </summary>
+public interface IMcpStorage : IObservable<OperationToolStorageEventArgs>
+{
+    /// <summary>
+    /// Retrieves all available operation tool definitions from the storage.
+    /// </summary>
+    /// <param name="cancellationToken">Token to cancel the operation.</param>
+    /// <returns>A collection of all available operation tool definitions.</returns>
+    ValueTask<IEnumerable<OperationToolDefinition>> GetOperationToolDefinitionsAsync(
+        CancellationToken cancellationToken = default);
+}
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/IOperationToolStorage.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/IOperationToolStorage.cs
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OpenAiComponent.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OpenAiComponent.cs
@@ -13,7 +13,7 @@ public sealed class OpenAiComponent([StringSyntax("HTML")] string htmlTemplateTe
     /// <summary>
     /// Define connect_domains and resource_domains arrays for the component's CSP snapshot.
     /// </summary>
-    public OpenAiComponentCsp? ContentSecurityPolicy { get; init; }
+    public OpenAiComponentCsp? Csp { get; init; }
 
     /// <summary>
     /// Human-readable summary surfaced to the model when the component loads, reducing redundant
@@ -50,7 +50,7 @@ public string? ToolInvokingStatusText
     }
 
     /// <summary>
-    /// Short status text after the tool completes ≤ 64 chars.
+    /// Short status text after the tool completes (≤ 64 chars).
     /// </summary>
     public string? ToolInvokedStatusText
     {
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp/Extensions/RequestExecutorBuilderExtensions.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp/Extensions/RequestExecutorBuilderExtensions.cs
@@ -27,16 +27,16 @@ public static IRequestExecutorBuilder AddMcp(
             async (executor, cancellationToken) =>
             {
                 var schema = executor.Schema;
-                var storageObserver = schema.Services.GetRequiredService<ToolStorageObserver>();
+                var storageObserver = schema.Services.GetRequiredService<McpStorageObserver>();
                 await storageObserver.StartAsync(cancellationToken);
             });
 
         return builder;
     }
 
-    public static IRequestExecutorBuilder AddMcpToolStorage(
+    public static IRequestExecutorBuilder AddMcpStorage(
         this IRequestExecutorBuilder builder,
-        IOperationToolStorage storage)
+        IMcpStorage storage)
     {
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentNullException.ThrowIfNull(storage);
diff --git a/src/HotChocolate/Adapters/src/Fusion.Adapters.Mcp/Extensions/FusionGatewayBuilderExtensions.cs b/src/HotChocolate/Adapters/src/Fusion.Adapters.Mcp/Extensions/FusionGatewayBuilderExtensions.cs
@@ -22,16 +22,16 @@ public static IFusionGatewayBuilder AddMcp(
         builder.AddWarmupTask(async (executor, cancellationToken) =>
         {
             var schema = executor.Schema;
-            var storageObserver = schema.Services.GetRequiredService<ToolStorageObserver>();
+            var storageObserver = schema.Services.GetRequiredService<McpStorageObserver>();
             await storageObserver.StartAsync(cancellationToken);
         });
 
         return builder;
     }
 
-    public static IFusionGatewayBuilder AddMcpToolStorage(
+    public static IFusionGatewayBuilder AddMcpStorage(
         this IFusionGatewayBuilder builder,
-        IOperationToolStorage storage)
+        IMcpStorage storage)
     {
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentNullException.ThrowIfNull(storage);
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/CoreIntegrationTests.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/CoreIntegrationTests.cs
@@ -24,7 +24,7 @@ public sealed class CoreIntegrationTests : IntegrationTestBase
     public async Task ListTools_AfterSchemaUpdate_ReturnsUpdatedTools()
     {
         // arrange
-        var storage = new TestOperationToolStorage();
+        var storage = new TestMcpStorage();
         await storage.AddOrUpdateToolAsync(
             new OperationToolDefinition(
                 Utf8GraphQLParser.Parse(
@@ -37,7 +37,7 @@ await storage.AddOrUpdateToolAsync(
                     .AddGraphQL()
                     .AddTypeModule(_ => typeModule)
                     .AddMcp()
-                    .AddMcpToolStorage(storage))
+                    .AddMcpStorage(storage))
             .Configure(
                 app => app
                     .UseRouting()
@@ -95,7 +95,7 @@ await storage.AddOrUpdateToolAsync(
     }
 
     protected override Task<TestServer> CreateTestServerAsync(
-        IOperationToolStorage storage,
+        IMcpStorage storage,
         ITypeDefinition[]? additionalTypes = null,
         McpDiagnosticEventListener? diagnosticEventListener = null,
         Action<McpServerOptions>? configureMcpServerOptions = null,
@@ -123,7 +123,7 @@ protected override Task<TestServer> CreateTestServerAsync(
                             .AddGraphQL()
                             .AddAuthorization()
                             .AddMcp(configureMcpServerOptions, configureMcpServer)
-                            .AddMcpToolStorage(storage)
+                            .AddMcpStorage(storage)
                             .AddQueryType<TestSchema.Query>()
                             .AddMutationType<TestSchema.Mutation>()
                             .AddInterfaceType<TestSchema.IPet>()
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/FusionIntegrationTests.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/FusionIntegrationTests.cs
@@ -29,7 +29,7 @@ public sealed class FusionIntegrationTests : IntegrationTestBase
     public async Task ListTools_AfterSchemaUpdate_ReturnsUpdatedTools()
     {
         // arrange
-        var storage = new TestOperationToolStorage();
+        var storage = new TestMcpStorage();
         await storage.AddOrUpdateToolAsync(
             new OperationToolDefinition(
                 Utf8GraphQLParser.Parse(
@@ -55,7 +55,7 @@ [new SourceSchemaText(schemaDocument.Name, schemaDocument.ToString())],
                     .AddGraphQLGatewayServer()
                     .AddConfigurationProvider(_ => configProvider)
                     .AddMcp()
-                    .AddMcpToolStorage(storage))
+                    .AddMcpStorage(storage))
             .Configure(
                 app => app
                     .UseRouting()
@@ -118,7 +118,7 @@ [new SourceSchemaText(schemaDocument.Name, schemaDocument.ToString())],
     }
 
     protected override async Task<TestServer> CreateTestServerAsync(
-        IOperationToolStorage storage,
+        IMcpStorage storage,
         ITypeDefinition[]? additionalTypes = null,
         McpDiagnosticEventListener? diagnosticEventListener = null,
         Action<McpServerOptions>? configureMcpServerOptions = null,
@@ -157,7 +157,7 @@ [new SourceSchemaText(schemaDocument.Name, schemaDocument.ToString())],
                                 schemaDocument.Name,
                                 new Uri("http://localhost:5000/graphql"))
                             .AddMcp(configureMcpServerOptions, configureMcpServer)
-                            .AddMcpToolStorage(storage);
+                            .AddMcpStorage(storage);
 
                     if (diagnosticEventListener is not null)
                     {
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/Handlers/CallToolHandlerTests.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/Handlers/CallToolHandlerTests.cs
@@ -29,7 +29,7 @@ public async Task HandleAsync_MissingTool_ReturnsCallToolResultWithError()
     private static async Task<RequestContext<CallToolRequestParams>> CreateRequestContextAsync(
         string toolName)
     {
-        var storage = new TestOperationToolStorage();
+        var storage = new TestMcpStorage();
         await storage.AddOrUpdateToolAsync(
             new OperationToolDefinition(
                 Utf8GraphQLParser.Parse(
@@ -40,7 +40,7 @@ await storage.AddOrUpdateToolAsync(
             .AddGraphQL()
             .AddAuthorization()
             .AddMcp()
-            .AddMcpToolStorage(storage)
+            .AddMcpStorage(storage)
             .AddQueryType<TestSchema.Query>()
             .AddInterfaceType<TestSchema.IPet>()
             .AddUnionType<TestSchema.IPet>()
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/IntegrationTestBase.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/IntegrationTestBase.cs
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/TestMcpStorage.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/TestMcpStorage.cs

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static async ValueTask<CallToolResult> HandleAsync(`
`21`	`21`	`CancellationToken cancellationToken)`
`22`	`22`	`{`
`23`	`23`	`var services = context.Services!;`
`24`		`- var registry = services.GetRequiredService<ToolRegistry>();`
	`24`	`+ var registry = services.GetRequiredService<McpFeatureRegistry>();`
`25`	`25`
`26`	`26`	`if (!registry.TryGetTool(context.Params!.Name, out var tool))`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ internal static class ListResourcesHandler`
`8`	`8`	`{`
`9`	`9`	`public static ListResourcesResult Handle(RequestContext<ListResourcesRequestParams> context)`
`10`	`10`	`{`
`11`		`- var toolRegistry = context.Services!.GetRequiredService<ToolRegistry>();`
	`11`	`+ var registry = context.Services!.GetRequiredService<McpFeatureRegistry>();`
`12`	`12`
`13`	`13`	`var openAiComponentResources =`
`14`		`- toolRegistry`
	`14`	`+ registry`
`15`	`15`	`.GetTools()`
`16`	`16`	`.Select(t => t.OpenAiComponentResource)`
`17`	`17`	`.OfType<Resource>()`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ internal static class ListToolsHandler`
`8`	`8`	`{`
`9`	`9`	`public static ListToolsResult Handle(RequestContext<ListToolsRequestParams> context)`
`10`	`10`	`{`
`11`		`- var registry = context.Services!.GetRequiredService<ToolRegistry>();`
	`11`	`+ var registry = context.Services!.GetRequiredService<McpFeatureRegistry>();`
`12`	`12`
`13`	`13`	`return new ListToolsResult`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ internal static class ReadResourceHandler`
`10`	`10`	`{`
`11`	`11`	`public static ReadResourceResult Handle(RequestContext<ReadResourceRequestParams> context)`
`12`	`12`	`{`
`13`		`- var toolRegistry = context.Services!.GetRequiredService<ToolRegistry>();`
	`13`	`+ var registry = context.Services!.GetRequiredService<McpFeatureRegistry>();`
`14`	`14`
`15`		`- if (!toolRegistry.TryGetToolByOpenAiComponentResourceUri(context.Params!.Uri, out var tool))`
	`15`	`+ if (!registry.TryGetToolByOpenAiComponentResourceUri(context.Params!.Uri, out var tool))`
`16`	`16`	`{`
`17`	`17`	`// TODO: See https://github.com/modelcontextprotocol/csharp-sdk/issues/1025.`
`18`	`18`	`throw new McpProtocolException(`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace HotChocolate.Adapters.Mcp;`
`6`	`6`
`7`		`-internal sealed class ToolRegistry`
	`7`	`+internal sealed class McpFeatureRegistry`
`8`	`8`	`{`
`9`	`9`	`private FrozenDictionary<string, OperationTool> _tools`
`10`	`10`	`= FrozenDictionary<string, OperationTool>.Empty;`
Original file line number	Diff line number	Diff line change
`@@ -181,30 +181,30 @@ private static Resource CreateOpenAiComponentResource(`
`181`	`181`	`meta["openai/widgetPrefersBorder"] = openAiComponent.PrefersBorder;`
`182`	`182`	`}`
`183`	`183`
`184`		`- if (openAiComponent.ContentSecurityPolicy is { } contentSecurityPolicy)`
	`184`	`+ if (openAiComponent.Csp is { } csp)`
`185`	`185`	`{`
`186`		`- JsonObject? csp = null;`
	`186`	`+ JsonObject? contentSecurityPolicy = null;`
`187`	`187`
`188`		`- if (contentSecurityPolicy.ConnectDomains is { Length: > 0 } connectDomains)`
	`188`	`+ if (csp.ConnectDomains is { Length: > 0 } connectDomains)`
`189`	`189`	`{`
`190`		`- csp ??= new JsonObject();`
`191`		`- csp.Add(`
	`190`	`+ contentSecurityPolicy ??= new JsonObject();`
	`191`	`+ contentSecurityPolicy.Add(`
`192`	`192`	`"connect_domains",`
`193`	`193`	`new JsonArray(connectDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));`
`194`	`194`	`}`
`195`	`195`
`196`		`- if (contentSecurityPolicy.ResourceDomains is { Length: > 0 } resourceDomains)`
	`196`	`+ if (csp.ResourceDomains is { Length: > 0 } resourceDomains)`
`197`	`197`	`{`
`198`		`- csp ??= new JsonObject();`
`199`		`- csp.Add(`
	`198`	`+ contentSecurityPolicy ??= new JsonObject();`
	`199`	`+ contentSecurityPolicy.Add(`
`200`	`200`	`"resource_domains",`
`201`	`201`	`new JsonArray(resourceDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));`
`202`	`202`	`}`
`203`	`203`
`204`		`- if (csp is not null)`
	`204`	`+ if (contentSecurityPolicy is not null)`
`205`	`205`	`{`
`206`	`206`	`meta ??= new JsonObject();`
`207`		`- meta.Add("openai/widgetCSP", csp);`
	`207`	`+ meta.Add("openai/widgetCSP", contentSecurityPolicy);`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`