Align with specification schemas

Author: PederHP

src/mcpdotnet/Configuration/McpServerBuilderExtensions.Handler.cs

@@ -107,7 +107,7 @@ public static IMcpServerBuilder WithGetCompletionHandler(this IMcpServerBuilder
     /// </summary>
     /// <param name="builder">The builder instance.</param>
     /// <param name="handler">The handler.</param>
-    public static IMcpServerBuilder WithSubscribeToResourcesHandler(this IMcpServerBuilder builder, Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>> handler)
+    public static IMcpServerBuilder WithSubscribeToResourcesHandler(this IMcpServerBuilder builder, Func<RequestContext<SubscribeRequestParams>, CancellationToken, Task<EmptyResult>> handler)
     {
         Throw.IfNull(builder);
 
@@ -120,7 +120,7 @@ public static IMcpServerBuilder WithSubscribeToResourcesHandler(this IMcpServerB
     /// </summary>
     /// <param name="builder">The builder instance.</param>
     /// <param name="handler">The handler.</param>
-    public static IMcpServerBuilder WithUnsubscribeFromResourcesHandler(this IMcpServerBuilder builder, Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>> handler)
+    public static IMcpServerBuilder WithUnsubscribeFromResourcesHandler(this IMcpServerBuilder builder, Func<RequestContext<UnsubscribeRequestParams>, CancellationToken, Task<EmptyResult>> handler)
     {
         Throw.IfNull(builder);
 

src/mcpdotnet/Protocol/Types/Capabilities.cs

@@ -126,13 +126,13 @@ public record ResourcesCapability
     /// Gets or sets the handler for subscribe to resources messages.
     /// </summary>
     [JsonIgnore]
-    public Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>>? SubscribeToResourcesHandler { get; init; }
+    public Func<RequestContext<SubscribeRequestParams>, CancellationToken, Task<EmptyResult>>? SubscribeToResourcesHandler { get; init; }
 
     /// <summary>
     /// Gets or sets the handler for unsubscribe from resources messages.
     /// </summary>
     [JsonIgnore]
-    public Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>>? UnsubscribeFromResourcesHandler { get; init; }
+    public Func<RequestContext<UnsubscribeRequestParams>, CancellationToken, Task<EmptyResult>>? UnsubscribeFromResourcesHandler { get; init; }
 }
 
 /// <summary>

src/mcpdotnet/Protocol/Types/ResourceUpdatedNotificationParams.cs

@@ -0,0 +1,14 @@
+namespace McpDotNet.Protocol.Types;
+
+/// <summary>
+/// Sent from the server as the payload of "notifications/resources/updated" notifications whenever a subscribed resource changes.
+/// <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/2024-11-05/schema.json">See the schema for details</see>
+/// </summary>
+public class ResourceUpdatedNotificationParams
+{
+    /// <summary>
+    /// The URI of the resource to subscribe to. The URI can use any protocol; it is up to the server how to interpret it.
+    /// </summary>
+    [System.Text.Json.Serialization.JsonPropertyName("uri")]
+    public string? Uri { get; init; }
+}

src/mcpdotnet/Protocol/Types/SubscribeToResourceRequestParams.cs renamed to src/mcpdotnet/Protocol/Types/SubscribeRequestParams.cs

@@ -1,10 +1,10 @@
 namespace McpDotNet.Protocol.Types;
 
 /// <summary>
-/// Sent from the client to request resources/updated notifications from the server whenever a particular resource changes.
+/// Sent from the client to request updated notifications from the server whenever a particular primitive changes.
 /// <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/2024-11-05/schema.json">See the schema for details</see>
 /// </summary>
-public class SubscribeToResourceRequestParams
+public class SubscribeRequestParams
 {
     /// <summary>
     /// The URI of the resource to subscribe to. The URI can use any protocol; it is up to the server how to interpret it.

src/mcpdotnet/Protocol/Types/UnsubscribeRequestParams.cs

@@ -0,0 +1,14 @@
+namespace McpDotNet.Protocol.Types;
+
+/// <summary>
+/// Sent from the client to request not receiving updated notifications from the server whenever a primitive resource changes.
+/// <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/2024-11-05/schema.json">See the schema for details</see>
+/// </summary>
+public class UnsubscribeRequestParams
+{
+    /// <summary>
+    /// The URI of the resource to unsubscribe fro. The URI can use any protocol; it is up to the server how to interpret it.
+    /// </summary>
+    [System.Text.Json.Serialization.JsonPropertyName("uri")]
+    public string? Uri { get; init; }
+}

src/mcpdotnet/Server/McpServer.cs

@@ -163,8 +163,8 @@ private void SetResourcesHandler(McpServerOptions options)
             throw new McpServerException("Resources capability was enabled with subscribe support, but SubscribeToResources and/or UnsubscribeFromResources handlers were not specified.");
         }
 
-        SetRequestHandler<SubscribeToResourceRequestParams, EmptyResult>("resources/subscribe", request => subscribeHandler(new(this, request), cancellationToken));
-        SetRequestHandler<SubscribeToResourceRequestParams, EmptyResult>("resources/unsubscribe", request => unsubscribeHandler(new(this, request), cancellationToken));
+        SetRequestHandler<SubscribeRequestParams, EmptyResult>("resources/subscribe", request => subscribeHandler(new(this, request), cancellationToken));
+        SetRequestHandler<UnsubscribeRequestParams, EmptyResult>("resources/unsubscribe", request => unsubscribeHandler(new(this, request), cancellationToken));
     }
 
     private void SetPromptsHandler(McpServerOptions options)

src/mcpdotnet/Server/McpServerHandlers.cs

@@ -45,12 +45,12 @@ public sealed class McpServerHandlers
     /// <summary>
     /// Gets or sets the handler for subscribe to resources messages.
     /// </summary>
-    public Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>>? SubscribeToResourcesHandler { get; set; }
+    public Func<RequestContext<SubscribeRequestParams>, CancellationToken, Task<EmptyResult>>? SubscribeToResourcesHandler { get; set; }
 
     /// <summary>
     /// Gets or sets the handler for unsubscribe from resources messages.
     /// </summary>
-    public Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>>? UnsubscribeFromResourcesHandler { get; set; }
+    public Func<RequestContext<UnsubscribeRequestParams>, CancellationToken, Task<EmptyResult>>? UnsubscribeFromResourcesHandler { get; set; }
 
     /// <summary>
     /// Overwrite any handlers in McpServerOptions with non-null handlers from this instance.

tests/mcpdotnet.TestServer/Program.cs

@@ -68,11 +68,11 @@ private static async Task Main(string[] args)
 
             foreach (var resource in resources)
             {
-                SubscribeToResourceRequestParams responseParams = new() { Uri = resource };
+                ResourceUpdatedNotificationParams notificationParams = new() { Uri = resource };
                 await server.SendMessageAsync(new JsonRpcNotification()
                 {
                     Method = NotificationMethods.ResourceUpdatedNotification,
-                    Params = responseParams
+                    Params = notificationParams
                 });
             }
         }

tests/mcpdotnet.Tests/ClientIntegrationTests.cs

@@ -221,7 +221,7 @@ public async Task SubscribeResource_Stdio()
         await using var client = await _fixture.CreateClientAsync(clientId);
         client.AddNotificationHandler(NotificationMethods.ResourceUpdatedNotification, (notification) =>
         {
-            var notificationParams = JsonSerializer.Deserialize<SubscribeToResourceRequestParams>(notification.Params!.ToString() ?? string.Empty);
+            var notificationParams = JsonSerializer.Deserialize<ResourceUpdatedNotificationParams>(notification.Params!.ToString() ?? string.Empty);
             ++counter;
             return Task.CompletedTask;
         });
@@ -246,7 +246,7 @@ public async Task UnsubscribeResource_Stdio()
         await using var client = await _fixture.CreateClientAsync(clientId);
         client.AddNotificationHandler(NotificationMethods.ResourceUpdatedNotification, (notification) =>
         {
-            var notificationParams = JsonSerializer.Deserialize<SubscribeToResourceRequestParams>(notification.Params!.ToString() ?? string.Empty);
+            var notificationParams = JsonSerializer.Deserialize<ResourceUpdatedNotificationParams>(notification.Params!.ToString() ?? string.Empty);
             ++counter;
             return Task.CompletedTask;
         });

tests/mcpdotnet.Tests/Configuration/McpServerBuilderExtensionsHandlerTests.cs

@@ -113,7 +113,7 @@ public void WithGetCompletionHandler_Sets_Handler()
     [Fact]
     public void WithSubscribeToResourcesHandler_Sets_Handler()
     {
-        Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>> handler = (context, token) => Task.FromResult(new EmptyResult());
+        Func<RequestContext<SubscribeRequestParams>, CancellationToken, Task<EmptyResult>> handler = (context, token) => Task.FromResult(new EmptyResult());
 
         _builder.Object.WithSubscribeToResourcesHandler(handler);
 
@@ -126,7 +126,7 @@ public void WithSubscribeToResourcesHandler_Sets_Handler()
     [Fact]
     public void WithUnsubscribeFromResourcesHandler_Sets_Handler()
     {
-        Func<RequestContext<SubscribeToResourceRequestParams>, CancellationToken, Task<EmptyResult>> handler = (context, token) => Task.FromResult(new EmptyResult());
+        Func<RequestContext<UnsubscribeRequestParams>, CancellationToken, Task<EmptyResult>> handler = (context, token) => Task.FromResult(new EmptyResult());
 
         _builder.Object.WithUnsubscribeFromResourcesHandler(handler);