MCP

Author: MelbourneDeveloper

RestClient.Net.McpGenerator/McpToolGenerator.cs

@@ -78,11 +78,13 @@ public static string GenerateTools(
             using System.Text.Json;
             using Outcome;
             using {{extensionsNamespace}};
+            using ModelContextProtocol.Server;
 
             namespace {{@namespace}};
 
             /// <summary>MCP server tools for {{serverName}} API.</summary>
-            public class {{serverName}}Tools(IHttpClientFactory httpClientFactory)
+            [McpServerToolType]
+            public static class {{serverName}}Tools
             {
                 private static readonly JsonSerializerOptions JsonOptions = new()
                 {
@@ -225,13 +227,16 @@ string errorType
         var okAlias = $"Ok{responseType}";
         var errorAlias = $"Error{responseType}";
 
+        var httpClientParam = methodParamsStr.Length > 0 ? "HttpClient httpClient, " : "HttpClient httpClient";
+        var allParams = httpClientParam + methodParamsStr;
+
         return $$"""
             /// <summary>{{SanitizeDescription(summary)}}</summary>
                 {{paramDescriptions}}
-                [Description("{{SanitizeDescription(summary)}}")]
-                public async Task<string> {{toolName}}({{methodParamsStr}})
+                /// <param name="httpClient">HttpClient instance</param>
+                [McpServerTool, Description("{{SanitizeDescription(summary)}}")]
+                public static async Task<string> {{toolName}}({{allParams}})
                 {
-                    var httpClient = httpClientFactory.CreateClient();
                     var result = await httpClient.{{extensionMethodName}}({{extensionCallArgsStr}});
 
                     return result switch

Samples/NucliaDbClient.McpServer/Program.cs

@@ -16,7 +16,7 @@
 var nucleaBaseUrl =
     Environment.GetEnvironmentVariable("NUCLIA_BASE_URL") ?? "http://localhost:8080/api/v1";
 
-// Configure HttpClient with base URL
+// Configure default HttpClient with base URL
 builder.Services.AddHttpClient(
     string.Empty,
     client =>
@@ -26,9 +26,6 @@
     }
 );
 
-// Add the NucliaDB tools to DI
-builder.Services.AddSingleton<NucliaDbTools>();
-
 // Add MCP server with stdio transport and tools from assembly
 builder.Services.AddMcpServer().WithStdioServerTransport().WithToolsFromAssembly();
 

Samples/NucliaDbClient.McpServer/run-mcp-server.sh

@@ -1,25 +1,15 @@
 #!/bin/bash
-
-# Quick run script for the MCP server (assumes NucliaDB is already running)
 set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+COMPOSE_DIR="$SCRIPT_DIR/../NucliaDbClient"
 
-echo "Starting NucliaDB MCP Server..."
-echo "==============================="
-echo ""
+cd "$COMPOSE_DIR"
+docker compose down -v
+docker compose up -d
 
-# Check if NucliaDB is running
-if ! curl -s -f "http://localhost:8080" > /dev/null 2>&1; then
-    echo "⚠ Warning: NucliaDB doesn't appear to be running on http://localhost:8080"
-    echo "Run ./start-mcp-server.sh to start both docker-compose and the MCP server"
-    echo ""
-fi
+until curl -s -f "http://localhost:8080" > /dev/null 2>&1; do sleep 1; done
 
 cd "$SCRIPT_DIR"
-
-# Set environment variable for NucliaDB URL
 export NUCLIA_BASE_URL="http://localhost:8080/api/v1"
-
-# Run the MCP server
 dotnet run

Samples/NucliaDbClient.McpServer/test-mcp.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Test if MCP server exposes tools correctly
+
+# Send tools/list request to the MCP server
+echo '{"jsonrpc":"2.0","id":1,"method":"tools/list","params":{}}' | \
+  dotnet run --project /Users/christianfindlay/Documents/Code/RestClient.Net/Samples/NucliaDbClient.McpServer/NucliaDbClient.McpServer.csproj --no-build 2>/dev/null | \
+  grep -v "^info:" | \
+  head -20