Rearrange adapter projects

.github/workflows/ci.yml

@@ -292,7 +292,7 @@ jobs:
         uses: ChilliCream/nitro-client-validate@v16.0.0-rc.1.43
         with:
           client-id: ${{ secrets.NITRO_API_CLIENT_ID }}
-          operations-file: src/Nitro/CommandLine/src/ChilliCream.Nitro.Client/persisted/operations.json
+          operations-file: src/Nitro/Common/src/ChilliCream.Nitro.Client/persisted/operations.json
           stage: Dev
           api-key: ${{ secrets.NITRO_API_KEY }}
           comment-mode: "review"

.github/workflows/release.yml

@@ -138,7 +138,7 @@ jobs:
         uses: ChilliCream/nitro-client-upload@v16.0.0-rc.1.43
         with:
           tag: ${{ env.GIT_TAG }}
-          operations-file: src/Nitro/CommandLine/src/ChilliCream.Nitro.Client/persisted/operations.json
+          operations-file: src/Nitro/Common/src/ChilliCream.Nitro.Client/persisted/operations.json
           client-id: ${{ secrets.NITRO_API_CLIENT_ID }}
           api-key: ${{ secrets.NITRO_API_KEY }}
 

src/All.slnx

@@ -185,19 +185,14 @@
   <Folder Name="/HotChocolate/Adapters/src/">
     <Project Path="HotChocolate/Adapters/src/Adapters.Mcp/HotChocolate.Adapters.Mcp.csproj" />
     <Project Path="HotChocolate/Adapters/src/Adapters.Mcp.Core/HotChocolate.Adapters.Mcp.Core.csproj" />
-    <Project Path="HotChocolate/Adapters/src/Adapters.Mcp.Packaging/HotChocolate.Adapters.Mcp.Packaging.csproj" />
     <Project Path="HotChocolate/Adapters/src/Adapters.OpenApi/HotChocolate.Adapters.OpenApi.csproj" />
     <Project Path="HotChocolate/Adapters/src/Adapters.OpenApi.AspNetCore/HotChocolate.Adapters.OpenApi.AspNetCore.csproj" />
     <Project Path="HotChocolate/Adapters/src/Adapters.OpenApi.Core/HotChocolate.Adapters.OpenApi.Core.csproj" />
-    <Project Path="HotChocolate/Adapters/src/Adapters.OpenApi.Packaging/HotChocolate.Adapters.OpenApi.Packaging.csproj" />
     <Project Path="HotChocolate/Adapters/src/Fusion.Adapters.Mcp/HotChocolate.Fusion.Adapters.Mcp.csproj" />
     <Project Path="HotChocolate/Adapters/src/Fusion.Adapters.OpenApi/HotChocolate.Fusion.Adapters.OpenApi.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Adapters/test/">
-    <Project Path="HotChocolate/Adapters/test/Adapters.Mcp.Core.Tests/HotChocolate.Adapters.Mcp.Core.Tests.csproj" />
-    <Project Path="HotChocolate/Adapters/test/Adapters.Mcp.Packaging.Tests/HotChocolate.Adapters.Mcp.Packaging.Tests.csproj" />
     <Project Path="HotChocolate/Adapters/test/Adapters.Mcp.Tests/HotChocolate.Adapters.Mcp.Tests.csproj" />
-    <Project Path="HotChocolate/Adapters/test/Adapters.OpenApi.Packaging.Tests/HotChocolate.Adapters.OpenApi.Packaging.Tests.csproj" />
     <Project Path="HotChocolate/Adapters/test/Adapters.OpenApi.Tests/HotChocolate.Adapters.OpenApi.Tests.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Fusion/" />
@@ -387,12 +382,25 @@
   <Folder Name="/Nitro/CommandLine/" />
   <Folder Name="/Nitro/CommandLine/src/">
     <Project Path="Nitro/CommandLine/src/CommandLine/Nitro.CommandLine.csproj" />
-    <Project Path="Nitro/CommandLine/src/ChilliCream.Nitro.Client/ChilliCream.Nitro.Client.csproj" />
     <Project Path="Nitro/CommandLine/src/CommandLine.FusionCompatibility/Nitro.CommandLine.FusionCompatibility.csproj" />
   </Folder>
   <Folder Name="/Nitro/CommandLine/test/">
     <Project Path="Nitro/CommandLine/test/CommandLine.Tests/Nitro.CommandLine.Tests.csproj" />
   </Folder>
+  <Folder Name="/Nitro/Common/" />
+  <Folder Name="/Nitro/Common/src/">
+    <Project Path="Nitro/Common/src/ChilliCream.Nitro.Adapters.Mcp.Packaging/ChilliCream.Nitro.Adapters.Mcp.Packaging.csproj" />
+    <Project Path="Nitro/Common/src/ChilliCream.Nitro.Adapters.Mcp/ChilliCream.Nitro.Adapters.Mcp.csproj" />
+    <Project Path="Nitro/Common/src/ChilliCream.Nitro.Adapters.OpenApi.Packaging/ChilliCream.Nitro.Adapters.OpenApi.Packaging.csproj" />
+    <Project Path="Nitro/Common/src/ChilliCream.Nitro.Adapters.OpenApi/ChilliCream.Nitro.Adapters.OpenApi.csproj" />
+    <Project Path="Nitro/Common/src/ChilliCream.Nitro.Client/ChilliCream.Nitro.Client.csproj" />
+  </Folder>
+  <Folder Name="/Nitro/Common/test/">
+    <Project Path="Nitro/Common/test/ChilliCream.Nitro.Adapters.Mcp.Packaging.Tests/ChilliCream.Nitro.Adapters.Mcp.Packaging.Tests.csproj" />
+    <Project Path="Nitro/Common/test/ChilliCream.Nitro.Adapters.Mcp.Tests/ChilliCream.Nitro.Adapters.Mcp.Tests.csproj" />
+    <Project Path="Nitro/Common/test/ChilliCream.Nitro.Adapters.OpenApi.Packaging.Tests/ChilliCream.Nitro.Adapters.OpenApi.Packaging.Tests.csproj" />
+    <Project Path="Nitro/Common/test/ChilliCream.Nitro.Adapters.OpenApi.Tests/ChilliCream.Nitro.Adapters.OpenApi.Tests.csproj" />
+  </Folder>
   <Folder Name="/StrawberryShake/" />
   <Folder Name="/StrawberryShake/Client/" />
   <Folder Name="/StrawberryShake/Client/src/">
@@ -405,6 +413,8 @@
     <Project Path="StrawberryShake/Client/src/Transport.InMemory/StrawberryShake.Transport.InMemory.csproj" />
     <Project Path="StrawberryShake/Client/src/Transport.WebSockets/StrawberryShake.Transport.WebSockets.csproj" />
   </Folder>
+  <Folder Name="/StrawberryShake/Client/src/Core/" />
+  <Folder Name="/StrawberryShake/Client/src/Transport.Http/" />
   <Folder Name="/StrawberryShake/Client/test/">
     <Project Path="StrawberryShake/Client/test/Core.Tests/StrawberryShake.Core.Tests.csproj" />
     <Project Path="StrawberryShake/Client/test/Persistence.SQLite.Tests/StrawberryShake.Persistence.SQLite.Tests.csproj" />

src/HotChocolate/Adapters/Adapters.slnx

@@ -3,24 +3,19 @@
   <Folder Name="/src/Adapters.Mcp/">
     <Project Path="src\Adapters.Mcp\HotChocolate.Adapters.Mcp.csproj" />
     <Project Path="src\Adapters.Mcp.Core\HotChocolate.Adapters.Mcp.Core.csproj" />
-    <Project Path="src\Adapters.Mcp.Packaging\HotChocolate.Adapters.Mcp.Packaging.csproj" />
     <Project Path="src\Fusion.Adapters.Mcp\HotChocolate.Fusion.Adapters.Mcp.csproj" />
   </Folder>
   <Folder Name="/src/Adapters.OpenApi/">
     <Project Path="src\Adapters.OpenApi\HotChocolate.Adapters.OpenApi.csproj" />
     <Project Path="src\Adapters.OpenApi.AspNetCore\HotChocolate.Adapters.OpenApi.AspNetCore.csproj" />
     <Project Path="src\Adapters.OpenApi.Core\HotChocolate.Adapters.OpenApi.Core.csproj" />
-    <Project Path="src\Adapters.OpenApi.Packaging\HotChocolate.Adapters.OpenApi.Packaging.csproj" />
     <Project Path="src\Fusion.Adapters.OpenApi\HotChocolate.Fusion.Adapters.OpenApi.csproj" />
   </Folder>
   <Folder Name="/test/" />
   <Folder Name="/test/Adapters.Mcp.Tests/">
-    <Project Path="test\Adapters.Mcp.Core.Tests\HotChocolate.Adapters.Mcp.Core.Tests.csproj" />
-    <Project Path="test\Adapters.Mcp.Packaging.Tests\HotChocolate.Adapters.Mcp.Packaging.Tests.csproj" />
     <Project Path="test\Adapters.Mcp.Tests\HotChocolate.Adapters.Mcp.Tests.csproj" />
   </Folder>
   <Folder Name="/test/Adapters.OpenApi.Tests/">
-    <Project Path="test\Adapters.OpenApi.Packaging.Tests\HotChocolate.Adapters.OpenApi.Packaging.Tests.csproj" />
     <Project Path="test\Adapters.OpenApi.Tests\HotChocolate.Adapters.OpenApi.Tests.csproj" />
   </Folder>
 </Solution>

src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolDefinition.cs

@@ -3,7 +3,6 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using CaseConverter;
-using HotChocolate.Adapters.Mcp.Serialization;
 using HotChocolate.Language;
 using static HotChocolate.Adapters.Mcp.Properties.McpAdapterResources;
 
@@ -138,56 +137,6 @@ public McpAppView? View
     /// </summary>
     public ImmutableArray<McpAppViewVisibility>? Visibility { get; init; }
 
-    public static OperationToolDefinition From(
-        DocumentNode document,
-        string name,
-        McpToolSettingsDto? settings,
-        string? viewHtml)
-    {
-        return new OperationToolDefinition(document)
-        {
-            Name = name,
-            Title = settings?.Title,
-            Icons =
-                settings?.Icons?.Select(
-                    i => new IconDefinition(i.Source)
-                    {
-                        MimeType = i.MimeType,
-                        Sizes = i.Sizes,
-                        Theme = i.Theme
-                    }).ToImmutableArray(),
-            DestructiveHint = settings?.Annotations?.DestructiveHint,
-            IdempotentHint = settings?.Annotations?.IdempotentHint,
-            OpenWorldHint = settings?.Annotations?.OpenWorldHint,
-            View = viewHtml is null ? null : new McpAppView(viewHtml)
-            {
-                Csp = settings?.View?.Csp is { } csp
-                    ? new McpAppViewCsp
-                    {
-                        BaseUriDomains = csp.BaseUriDomains?.ToImmutableArray(),
-                        ConnectDomains = csp.ConnectDomains?.ToImmutableArray(),
-                        FrameDomains = csp.FrameDomains?.ToImmutableArray(),
-                        ResourceDomains = csp.ResourceDomains?.ToImmutableArray()
-                    }
-                    : null,
-                Domain = settings?.View?.Domain,
-                Permissions = settings?.View?.Permissions is { } permissions
-                    ? new McpAppViewPermissions
-                    {
-                        Camera = permissions.Camera,
-                        ClipboardWrite = permissions.ClipboardWrite,
-                        Geolocation = permissions.Geolocation,
-                        Microphone = permissions.Microphone
-                    }
-                    : null,
-                PrefersBorder = settings?.View?.PrefersBorder
-            },
-            Visibility = settings?.Visibility is { } visibility
-                ? visibility.ToImmutableArray()
-                : null
-        };
-    }
-
     /// <summary>Regex that validates tool names.</summary>
     [GeneratedRegex(@"^[A-Za-z0-9_.-]{1,128}\z")]
     private static partial Regex ValidateToolNameRegex();

src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptDefinition.cs

@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using HotChocolate.Adapters.Mcp.Serialization;
 
 namespace HotChocolate.Adapters.Mcp.Storage;
 
@@ -34,50 +33,4 @@ public sealed class PromptDefinition(string name)
     /// Gets the messages that make up the prompt.
     /// </summary>
     public ImmutableArray<PromptMessageDefinition> Messages { get; init; } = [];
-
-    public static PromptDefinition From(string name, McpPromptSettingsDto settings)
-    {
-        return new PromptDefinition(name)
-        {
-            Title = settings.Title,
-            Description = settings.Description,
-            Arguments = settings.Arguments?.Select(
-                a => new PromptArgumentDefinition(a.Name)
-                {
-                    Title = a.Title,
-                    Description = a.Description,
-                    Required = a.Required
-                }).ToImmutableArray(),
-            Icons = settings.Icons?.Select(
-                i => new IconDefinition(i.Source)
-                {
-                    MimeType = i.MimeType,
-                    Sizes = i.Sizes,
-                    Theme = i.Theme
-                }).ToImmutableArray(),
-            Messages = settings.Messages.Select(
-                m =>
-                {
-                    return m.Content switch
-                    {
-                        McpPromptSettingsTextContentDto content => new PromptMessageDefinition(
-                            MapRole(m.Role),
-                            new TextContentBlockDefinition(content.Text)),
-                        _ =>
-                            throw new NotSupportedException(
-                                $"Message content type '{m.Content.GetType().Name}' is not supported.")
-                    };
-                }).ToImmutableArray()
-        };
-    }
-
-    private static RoleDefinition MapRole(string role)
-    {
-        return role switch
-        {
-            "user" => RoleDefinition.User,
-            "assistant" => RoleDefinition.Assistant,
-            _ => throw new NotSupportedException($"Role '{role}' is not supported.")
-        };
-    }
 }

src/HotChocolate/Adapters/src/Adapters.OpenApi.Core/Definitions/OpenApiEndpointDefinition.cs

@@ -5,7 +5,7 @@ namespace HotChocolate.Adapters.OpenApi;
 
 public sealed class OpenApiEndpointDefinition : IOpenApiDefinition
 {
-    internal OpenApiEndpointDefinition(
+    public OpenApiEndpointDefinition(
         string httpMethod,
         string route,
         string? description,
@@ -48,32 +48,4 @@ internal OpenApiEndpointDefinition(
     public Dictionary<string, FragmentDefinitionNode> LocalFragmentsByName { get; }
 
     public HashSet<string> ExternalFragmentReferences { get; }
-
-    public static OpenApiEndpointDefinition From(
-        OpenApiEndpointSettingsDto settings,
-        string httpMethod,
-        string route,
-        DocumentNode document)
-    {
-        var operationDefinition = document.Definitions.OfType<OperationDefinitionNode>().SingleOrDefault() ??
-            throw new ArgumentException("The document must contain exactly one operation definition.",
-                nameof(document));
-
-        var fragmentReferences = FragmentReferenceFinder.Find(document);
-
-        return new OpenApiEndpointDefinition(
-            httpMethod,
-            route,
-            settings.Description,
-            settings.RouteParameters,
-            settings.QueryParameters,
-            settings.BodyVariableName,
-            document,
-            operationDefinition,
-            fragmentReferences.Local,
-            fragmentReferences.External);
-    }
-
-    public OpenApiEndpointSettingsDto ToDto()
-        => new OpenApiEndpointSettingsDto(Description, RouteParameters, QueryParameters, BodyVariableName);
 }