Completing the tools as best as possible

Author: aaronpowell

samples/EverythingServer/Program.cs

@@ -42,17 +42,6 @@
         {
             Messages = messages
         });
-    })
-    .WithCallToolHandler((request, ct) =>
-    {
-        if (request.Params?.Name == "tiny_image")
-        {
-            return Task.FromResult(new CallToolResponse
-            {
-                Content = [new Content { Type = "image", Data = TinyImageTool.MCP_TINY_IMAGE, MimeType = "image/png" }]
-            });
-        }
-        throw new NotSupportedException($"Unknown tool name: {request.Params?.Name}");
     });
 
 await builder.Build().RunAsync();

samples/EverythingServer/Tools/AddTool.cs

@@ -6,6 +6,6 @@ namespace EverythingServer.Tools;
 [McpServerToolType]
 public static class AddTool
 {
-    [McpServerTool, Description("Adds two numbers.")]
+    [McpServerTool("add"), Description("Adds two numbers.")]
     public static string Add(int a, int b) => $"The sum of {a} and {b} is {a + b}";
 }

samples/EverythingServer/Tools/AnnotatedMessageTool.cs

@@ -13,9 +13,9 @@ public enum MessageType
         Debug,
     }
 
-    [McpServerTool, Description("Generates an annotated message")]
+    [McpServerTool("annotatedMessage"), Description("Generates an annotated message")]
     public static IEnumerable<string> AnnotatedMessage(MessageType messageType, bool includeImage = true)
     {
-        return ["incomplete"];
+        throw new NotSupportedException("Unable to write annotations to the output.");
     }
 }

samples/EverythingServer/Tools/EchoTool.cs

@@ -6,6 +6,6 @@ namespace EverythingServer.Tools;
 [McpServerToolType]
 public static class EchoTool
 {
-    [McpServerTool, Description("Echoes the message back to the client.")]
+    [McpServerTool("echo"), Description("Echoes the message back to the client.")]
     public static string Echo(string message) => $"Echo: {message}";
 }

samples/EverythingServer/Tools/LongRunningTool.cs

@@ -1,28 +1,42 @@
-//using ModelContextProtocol.Server;
-//using System;
-//using System.Collections.Generic;
-//using System.ComponentModel;
-//using System.Linq;
-//using System.Text;
-//using System.Threading.Tasks;
+using ModelContextProtocol.Protocol.Messages;
+using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Server;
+using System.ComponentModel;
 
-//namespace EverythingServer.Tools;
+namespace EverythingServer.Tools;
 
-//[McpServerToolType]
-//public static class LongRunningTool
-//{
-//    [McpServerTool, Description("Demonstrates a long running operation with progress updates")]
-//    public static async Task<string> LongRunningOperation(int duration, int steps)
-//    {
-//        var stepDuration = duration / steps;
+[McpServerToolType]
+public static class LongRunningTool
+{
+    [McpServerTool("longRunningOperation"), Description("Demonstrates a long running operation with progress updates")]
+    public static async Task<string> LongRunningOperation(
+        IMcpServer server,
+        RequestContext<CallToolRequestParams> context,
+        int duration = 10,
+        int steps = 5)
+    {
+        var progressToken = context.Params?.Meta?.ProgressToken;
+        var stepDuration = duration / steps;
 
-//        for (int i = 1; i <= steps + 1; i++)
-//        {
-//            // Simulate a long-running operation
-//            await Task.Delay(stepDuration);
-//            // Report progress
-//            var progress = (i * 100) / steps;
-//            Console.WriteLine($"Progress: {progress}%");
-//        }
-//    }
-//}
+        for (int i = 1; i <= steps + 1; i++)
+        {
+            await Task.Delay(stepDuration * 1000);
+            
+            if (progressToken is not null)
+            {
+                await server.SendMessageAsync(new JsonRpcNotification
+                {
+                    Method = "notifications/progress",
+                    Params = new
+                    {
+                        Progress = i,
+                        Total = steps,
+                        progressToken
+                    }
+                });
+            }
+        }
+
+        return $"Long running operation completed. Duration: {duration} seconds. Steps: {steps}.";
+    }
+}

samples/EverythingServer/Tools/PrintEnvTool.cs

@@ -13,7 +13,7 @@ public static class PrintEnvTool
         WriteIndented = true
     };
 
-    [McpServerTool, Description("Prints all environment variables, helpful for debugging MCP server configuration")]
+    [McpServerTool("printEnv"), Description("Prints all environment variables, helpful for debugging MCP server configuration")]
     public static string PrintEnv()
     {
         Debugger.Launch();

samples/EverythingServer/Tools/TinyImageTool.cs

@@ -14,7 +14,7 @@ public static IEnumerable<AIContent> GetTinyImage()
         Debugger.Launch();
         return [
             new TextContent("This is a tiny image:"),
-            new DataContent(MCP_TINY_IMAGE, "image/png"),
+            new DataContent(MCP_TINY_IMAGE),
             new TextContent("The image above is the MCP tiny image.")
         ];
     }