MCP

MelbourneDeveloper · MelbourneDeveloper · commit 0ddf9bf4b12c · 2025-10-19T14:23:02.000+11:00
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -31,9 +31,20 @@ jobs:
       - name: Build solution
         run: dotnet build RestClient.sln --configuration Release --no-restore /warnaserror
 
+      - name: Verify Docker is available
+        run: |
+          docker --version
+          docker compose version
+
       - name: Run all tests with code coverage
         run: dotnet test RestClient.sln --configuration Release --no-build --verbosity normal --logger "console;verbosity=detailed" --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Threshold=100 DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ThresholdType=line,branch,method DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ThresholdStat=total
 
+      - name: Cleanup Docker containers
+        if: always()
+        run: |
+          cd Samples/NucliaDbClient
+          docker compose down -v --remove-orphans || true
+
       - name: Install Stryker Mutator
         run: dotnet tool install --global dotnet-stryker
 
diff --git a/RestClient.Net.McpGenerator.Cli/Program.cs b/RestClient.Net.McpGenerator.Cli/Program.cs
@@ -25,12 +25,22 @@ static void PrintUsage()
     Console.WriteLine("Usage:");
     Console.WriteLine("  mcp-generator [options]\n");
     Console.WriteLine("Options:");
-    Console.WriteLine("  -u, --openapi-url <url>       (Required) URL or file path to OpenAPI spec");
-    Console.WriteLine("  -o, --output-file <path>      (Required) Output file path for generated code");
-    Console.WriteLine("  -n, --namespace <namespace>   MCP server namespace (default: 'McpServer')");
+    Console.WriteLine(
+        "  -u, --openapi-url <url>       (Required) URL or file path to OpenAPI spec"
+    );
+    Console.WriteLine(
+        "  -o, --output-file <path>      (Required) Output file path for generated code"
+    );
+    Console.WriteLine(
+        "  -n, --namespace <namespace>   MCP server namespace (default: 'McpServer')"
+    );
     Console.WriteLine("  -s, --server-name <name>      MCP server name (default: 'ApiMcp')");
-    Console.WriteLine("  --ext-namespace <namespace>   Extensions namespace (default: 'Generated')");
-    Console.WriteLine("  --ext-class <class>           Extensions class name (default: 'ApiExtensions')");
+    Console.WriteLine(
+        "  --ext-namespace <namespace>   Extensions namespace (default: 'Generated')"
+    );
+    Console.WriteLine(
+        "  --ext-class <class>           Extensions class name (default: 'ApiExtensions')"
+    );
     Console.WriteLine("  -h, --help                    Show this help message");
 }
 
@@ -47,16 +57,20 @@ static void PrintUsage()
     {
         switch (args[i])
         {
-            case "-u" or "--openapi-url":
+            case "-u"
+            or "--openapi-url":
                 openApiUrl = GetNextArg(args, i++, "openapi-url");
                 break;
-            case "-o" or "--output-file":
+            case "-o"
+            or "--output-file":
                 outputFile = GetNextArg(args, i++, "output-file");
                 break;
-            case "-n" or "--namespace":
+            case "-n"
+            or "--namespace":
                 namespaceName = GetNextArg(args, i++, "namespace") ?? namespaceName;
                 break;
-            case "-s" or "--server-name":
+            case "-s"
+            or "--server-name":
                 serverName = GetNextArg(args, i++, "server-name") ?? serverName;
                 break;
             case "--ext-namespace":
@@ -146,16 +160,15 @@ static async Task GenerateCode(Config config)
         openApiSpec,
         @namespace: config.Namespace,
         serverName: config.ServerName,
-        extensionsNamespace: config.ExtensionsNamespace,
-        extensionsClassName: config.ExtensionsClass
+        extensionsNamespace: config.ExtensionsNamespace
     );
 
 #pragma warning disable IDE0010
     switch (result)
 #pragma warning restore IDE0010
     {
         case Outcome.Result<string, string>.Ok<string, string>(var code):
-            File.WriteAllText(config.OutputFile, code);
+            await File.WriteAllTextAsync(config.OutputFile, code).ConfigureAwait(false);
             Console.WriteLine($"Generated {code.Length} characters of MCP tools code");
             Console.WriteLine($"\nSaved to: {config.OutputFile}");
             Console.WriteLine("\nGeneration completed successfully!");
diff --git a/RestClient.Net.McpGenerator/GlobalUsings.cs b/RestClient.Net.McpGenerator/GlobalUsings.cs
@@ -1,2 +1,3 @@
 global using Microsoft.OpenApi;
 global using Microsoft.OpenApi.Reader;
+global using RestClient.Net.OpenApiGenerator;
diff --git a/RestClient.Net.McpGenerator/McpServerGenerator.cs b/RestClient.Net.McpGenerator/McpServerGenerator.cs
@@ -12,15 +12,13 @@ public static class McpServerGenerator
     /// <param name="namespace">The namespace for generated MCP tools.</param>
     /// <param name="serverName">The MCP server name.</param>
     /// <param name="extensionsNamespace">The namespace of the pre-generated extensions.</param>
-    /// <param name="extensionsClassName">The class name of the pre-generated extensions.</param>
     /// <returns>A Result containing the generated C# code or error message.</returns>
 #pragma warning disable CA1054
     public static Result<string, string> Generate(
         string openApiContent,
         string @namespace,
         string serverName,
-        string extensionsNamespace,
-        string extensionsClassName
+        string extensionsNamespace
     )
 #pragma warning restore CA1054
     {
@@ -43,8 +41,7 @@ string extensionsClassName
                     document,
                     @namespace,
                     serverName,
-                    extensionsNamespace,
-                    extensionsClassName
+                    extensionsNamespace
                 )
             );
         }
diff --git a/RestClient.Net.McpGenerator/McpToolGenerator.cs b/RestClient.Net.McpGenerator/McpToolGenerator.cs
@@ -1,5 +1,3 @@
-using RestClient.Net.OpenApiGenerator;
-
 namespace RestClient.Net.McpGenerator;
 
 internal readonly record struct McpParameterInfo(
@@ -20,14 +18,12 @@ internal static class McpToolGenerator
     /// <param name="namespace">The namespace for the MCP server.</param>
     /// <param name="serverName">The MCP server name.</param>
     /// <param name="extensionsNamespace">The namespace of the extensions.</param>
-    /// <param name="extensionsClassName">The class name of the extensions.</param>
     /// <returns>The generated MCP tools code.</returns>
     public static string GenerateTools(
         OpenApiDocument document,
         string @namespace,
         string serverName,
-        string extensionsNamespace,
-        string extensionsClassName
+        string extensionsNamespace
     )
     {
         var tools = new List<string>();
@@ -47,8 +43,6 @@ string extensionsClassName
                     operation.Key,
                     operation.Value,
                     document.Components?.Schemas,
-                    extensionsNamespace,
-                    extensionsClassName,
                     methodNameCounts
                 );
 
@@ -71,6 +65,7 @@ string extensionsClassName
 
             namespace {{@namespace}};
 
+            /// <summary>MCP server tools for {{serverName}} API.</summary>
             [McpServerToolType]
             public class {{serverName}}Tools(IHttpClientFactory httpClientFactory)
             {
@@ -90,8 +85,6 @@ private static string GenerateTool(
         HttpMethod operationType,
         OpenApiOperation operation,
         IDictionary<string, IOpenApiSchema>? schemas,
-        string extensionsNamespace,
-        string extensionsClassName,
         Dictionary<string, int> methodNameCounts
     )
     {
@@ -123,7 +116,6 @@ Dictionary<string, int> methodNameCounts
         return GenerateToolMethod(
             mcpToolName,
             extensionMethodName,
-            extensionsClassName,
             summary,
             parameters,
             hasBody,
@@ -135,7 +127,6 @@ Dictionary<string, int> methodNameCounts
     private static string GenerateToolMethod(
         string toolName,
         string extensionMethodName,
-        string extensionsClassName,
         string summary,
         List<McpParameterInfo> parameters,
         bool hasBody,
@@ -177,6 +168,9 @@ string responseType
                 ? string.Join(", ", extensionCallArgs) + ", "
                 : string.Empty;
 
+        var okAlias = $"Ok{responseType}";
+        var errorAlias = $"Error{responseType}";
+
         return $$"""
             /// <summary>{{SanitizeDescription(summary)}}</summary>
                 {{paramDescriptions}}
@@ -189,9 +183,9 @@ string responseType
 
                     return result switch
                     {
-                        Result<{{responseType}}, HttpError<string>>.Ok(var success) =>
+                        {{okAlias}}(var success) =>
                             JsonSerializer.Serialize(success, JsonOptions),
-                        Result<{{responseType}}, HttpError<string>>.Error(var error) =>
+                        {{errorAlias}}(var error) =>
                             $"Error: {error.StatusCode} - {error.Body}",
                         _ => "Unknown error"
                     };
@@ -201,11 +195,13 @@ string responseType
 
     private static string FormatParameter(McpParameterInfo param)
     {
+        var isNullable = param.Type.Contains('?', StringComparison.Ordinal);
+
         var defaultPart =
-            param.DefaultValue != null
+            isNullable ? " = null"
+            : param.DefaultValue != null
                 ? param.Type switch
                 {
-                    var t when t.Contains('?', StringComparison.Ordinal) => " = null",
                     var t when t.StartsWith("string", StringComparison.Ordinal) =>
                         $" = \"{param.DefaultValue}\"",
                     var t when t.StartsWith("bool", StringComparison.Ordinal) =>
@@ -214,7 +210,6 @@ var t when t.StartsWith("bool", StringComparison.Ordinal) =>
                             : " = false",
                     _ => $" = {param.DefaultValue}",
                 }
-            : param.Type.Contains('?', StringComparison.Ordinal) ? " = null"
             : string.Empty;
 
         return $"{param.Type} {param.Name}{defaultPart}";
@@ -245,9 +240,31 @@ private static List<McpParameterInfo> GetParameters(
             var description = param.Description ?? sanitizedName;
             var isPath = param.In == ParameterLocation.Path;
             var isHeader = param.In == ParameterLocation.Header;
+            var isQuery = param.In == ParameterLocation.Query;
+
+            // Extract default value - match the extension generator logic
+            var rawDefaultValue = param.Schema?.Default?.ToString();
+            var isSimpleType =
+                baseType
+                    is "string"
+                        or "int"
+                        or "long"
+                        or "float"
+                        or "double"
+                        or "decimal"
+                        or "bool";
+            var defaultValue =
+                isSimpleType && !string.IsNullOrEmpty(rawDefaultValue) ? rawDefaultValue : null;
+
+            // For optional string query parameters without a schema default, use empty string
+            var hasNoDefault = defaultValue == null;
+            if (!required && baseType == "string" && isQuery && hasNoDefault)
+            {
+                defaultValue = "";
+            }
 
-            var defaultValue = param.Schema?.Default?.ToString();
-            var makeNullable = !required && defaultValue == null && !baseType.EndsWith('?');
+            // Make nullable if not required and no default value
+            var makeNullable = !required && hasNoDefault && !baseType.EndsWith('?');
             var type = makeNullable ? $"{baseType}?" : baseType;
 
             parameters.Add(
diff --git a/RestClient.Net.McpGenerator/RestClient.Net.McpGenerator.csproj b/RestClient.Net.McpGenerator/RestClient.Net.McpGenerator.csproj
@@ -11,5 +11,6 @@
   <ItemGroup>
     <ProjectReference Include="..\RestClient.Net.OpenApiGenerator\RestClient.Net.OpenApiGenerator.csproj" />
     <ProjectReference Include="..\RestClient.Net\RestClient.Net.csproj" />
+    <PackageReference Include="Outcome" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Samples/NucliaDbClient.Tests/NucliaDbFixture.cs b/Samples/NucliaDbClient.Tests/NucliaDbFixture.cs
diff --git a/Samples/NucliaDbClient/Generated/NucliaDbMcpTools.g.cs b/Samples/NucliaDbClient/Generated/NucliaDbMcpTools.g.cs
diff --git a/Samples/NucliaDbClient/NucliaDbClient.csproj b/Samples/NucliaDbClient/NucliaDbClient.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`global using Microsoft.OpenApi;`
`2`	`2`	`global using Microsoft.OpenApi.Reader;`
	`3`	`+global using RestClient.Net.OpenApiGenerator;`