Move MCP into Deckle.API, available at /mcp

.github/workflows/build-and-deploy.yml

@@ -93,16 +93,11 @@ jobs:
           cd src/Deckle.Web
           docker build -t deckle-web:local .
 
-      - name: Build MCP container
-        run: |
-          cd src
-          docker build -f Deckle.MCP/Dockerfile -t deckle-mcp:local .
-
       - name: Prepare docker-compose artifacts
         run: |
           # Copy template and replace environment variables with actual image names
           cp docker-compose-artifacts/docker-compose.yaml docker-compose-artifacts/docker-compose.yaml.template
-          sed 's/\${API_IMAGE}/deckle-api:local/g; s/\${WEB_IMAGE}/deckle-web:local/g; s/\${MCP_IMAGE}/deckle-mcp:local/g' docker-compose-artifacts/docker-compose.yaml.template > docker-compose-artifacts/docker-compose.yaml
+          sed 's/\${API_IMAGE}/deckle-api:local/g; s/\${WEB_IMAGE}/deckle-web:local/g' docker-compose-artifacts/docker-compose.yaml.template > docker-compose-artifacts/docker-compose.yaml
 
       - name: Log in to GitHub Container Registry
         if: github.event_name != 'pull_request'
@@ -205,15 +200,11 @@ jobs:
         env:
           RAILWAY_API_WEBHOOK_URL: ${{ secrets.RAILWAY_API_WEBHOOK_URL }}
           RAILWAY_WEB_WEBHOOK_URL: ${{ secrets.RAILWAY_WEB_WEBHOOK_URL }}
-          RAILWAY_MCP_WEBHOOK_URL: ${{ secrets.RAILWAY_MCP_WEBHOOK_URL }}
         run: |
           echo "Triggering Railway API deployment..."
           curl -f -X POST "$RAILWAY_API_WEBHOOK_URL" || echo "Warning: API webhook failed"
 
           echo "Triggering Railway Web deployment..."
           curl -f -X POST "$RAILWAY_WEB_WEBHOOK_URL" || echo "Warning: Web webhook failed"
 
-          echo "Triggering Railway MCP deployment..."
-          curl -f -X POST "$RAILWAY_MCP_WEBHOOK_URL" || echo "Warning: MCP webhook failed"
-
           echo "Railway deployments triggered successfully"

docker-compose-artifacts/docker-compose.yaml

@@ -70,31 +70,6 @@ services:
         condition: "service_started"
     networks:
       - "aspire"
-  mcp:
-    image: "${MCP_IMAGE}"
-    environment:
-      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES: "true"
-      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
-      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
-      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
-      HTTP_PORTS: "${MCP_PORT}"
-      ConnectionStrings__deckledb: "Host=postgres;Port=5432;Username=postgres;Password=${POSTGRES_PASSWORD};Database=deckledb"
-      DECKLEDB_HOST: "postgres"
-      DECKLEDB_PORT: "5432"
-      DECKLEDB_USERNAME: "postgres"
-      DECKLEDB_PASSWORD: "${POSTGRES_PASSWORD}"
-      DECKLEDB_URI: "postgresql://postgres:${POSTGRES_PASSWORD}@postgres:5432/deckledb"
-      DECKLEDB_DATABASENAME: "deckledb"
-      OTEL_EXPORTER_OTLP_ENDPOINT: "http://compose-dashboard:18889"
-      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
-      OTEL_SERVICE_NAME: "mcp"
-    expose:
-      - "${MCP_PORT}"
-    depends_on:
-      postgres:
-        condition: "service_started"
-    networks:
-      - "aspire"
 networks:
   aspire:
     driver: "bridge"

src/Deckle.MCP.Tests/Auth/ApiKeyAuthenticationHandlerTests.cs → src/Deckle.API.Tests/Auth/ApiKeyAuthenticationHandlerTests.cs

@@ -1,17 +1,17 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Encodings.Web;
+using Deckle.API.Auth;
 using Deckle.Domain.Data;
 using Deckle.Domain.Entities;
-using Deckle.MCP.Auth;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Moq;
 
-namespace Deckle.MCP.Tests.Auth;
+namespace Deckle.API.Tests.Auth;
 
 public class ApiKeyAuthenticationHandlerTests : IDisposable
 {
@@ -49,7 +49,7 @@
 
         var handler = new ApiKeyAuthenticationHandler(
             optionsMock.Object,
             new NullLoggerFactory(),
             UrlEncoder.Default,
             _context);
 

src/Deckle.MCP.Tests/Tools/ComponentToolsTests.cs → src/Deckle.API.Tests/McpTools/ComponentToolsTests.cs

@@ -1,13 +1,13 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Deckle.API.McpTools;
 using Deckle.Domain.Data;
 using Deckle.Domain.Entities;
-using Deckle.MCP.Tools;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Moq;
 
-namespace Deckle.MCP.Tests.Tools;
+namespace Deckle.API.Tests.McpTools;
 
 public class ComponentToolsTests : IDisposable
 {

src/Deckle.MCP.Tests/Tools/DataSourceToolsTests.cs → src/Deckle.API.Tests/McpTools/DataSourceToolsTests.cs

@@ -1,13 +1,13 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Deckle.API.McpTools;
 using Deckle.Domain.Data;
 using Deckle.Domain.Entities;
-using Deckle.MCP.Tools;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Moq;
 
-namespace Deckle.MCP.Tests.Tools;
+namespace Deckle.API.Tests.McpTools;
 
 public class DataSourceToolsTests : IDisposable
 {
@@ -274,7 +274,7 @@
         _context.ChangeTracker.Clear();
         var updated = await _context.DataSources.FindAsync(ds.Id);
         Assert.Equal(42, updated!.RowCount);
         Assert.Equal(3, updated!.Headers.Count);
     }
 
     [Fact]

src/Deckle.MCP.Tests/Tools/FileToolsTests.cs → src/Deckle.API.Tests/McpTools/FileToolsTests.cs

@@ -1,14 +1,14 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Deckle.API.McpTools;
 using Deckle.Domain.Data;
 using Deckle.Domain.Entities;
-using Deckle.MCP.Tools;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Moq;
 using File = Deckle.Domain.Entities.File;
 
-namespace Deckle.MCP.Tests.Tools;
+namespace Deckle.API.Tests.McpTools;
 
 public class FileToolsTests : IDisposable
 {

src/Deckle.MCP.Tests/Tools/ProjectToolsTests.cs → src/Deckle.API.Tests/McpTools/ProjectToolsTests.cs

@@ -1,13 +1,13 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Deckle.API.McpTools;
 using Deckle.Domain.Data;
 using Deckle.Domain.Entities;
-using Deckle.MCP.Tools;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Moq;
 
-namespace Deckle.MCP.Tests.Tools;
+namespace Deckle.API.Tests.McpTools;
 
 public class ProjectToolsTests : IDisposable
 {

src/Deckle.MCP/Auth/ApiKeyAuthenticationHandler.cs → src/Deckle.API/Auth/ApiKeyAuthenticationHandler.cs

@@ -7,7 +7,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Deckle.MCP.Auth;
+namespace Deckle.API.Auth;
 
 public class ApiKeyAuthenticationHandler(
     IOptionsMonitor<AuthenticationSchemeOptions> options,

src/Deckle.API/Deckle.API.csproj

@@ -10,8 +10,15 @@
     <UserSecretsId>c83e7564-be8d-476c-8dea-73ae93b7199e</UserSecretsId>
   </PropertyGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>Deckle.API.Tests</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.1" />
+    <PackageReference Include="ModelContextProtocol.AspNetCore" Version="1.3.0" />
     <PackageReference Include="AWSSDK.S3" Version="4.0.18.6" />
     <PackageReference Include="Exceptionless.AspNetCore" Version="6.1.0" />
     <PackageReference Include="MediatR" Version="14.0.0" />

src/Deckle.API/Extensions/AuthenticationExtensions.cs

@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Deckle.API.Auth;
 using Deckle.API.DTOs;
 using Deckle.API.Services;
 using Microsoft.AspNetCore.Authentication;
@@ -21,7 +22,9 @@ public static IServiceCollection AddDeckleAuthentication(
             options.DefaultChallengeScheme = GoogleDefaults.AuthenticationScheme;
         })
         .AddCookie(options => ConfigureCookieOptions(options, configuration, environment))
-        .AddGoogle(options => ConfigureGoogleOptions(options, configuration));
+        .AddGoogle(options => ConfigureGoogleOptions(options, configuration))
+        .AddScheme<AuthenticationSchemeOptions, ApiKeyAuthenticationHandler>(
+            ApiKeyAuthenticationHandler.SchemeName, null);
 
         return services;
     }
@@ -32,6 +35,10 @@ public static IServiceCollection AddDeckleAuthorization(this IServiceCollection
         {
             options.AddPolicy("AdminOnly", policy =>
                 policy.RequireRole("Administrator"));
+
+            options.AddPolicy("ApiKey", policy =>
+                policy.AddAuthenticationSchemes(ApiKeyAuthenticationHandler.SchemeName)
+                      .RequireAuthenticatedUser());
         });
 
         return services;

src/Deckle.API/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
 using Deckle.API.Configurators;
+using Deckle.API.McpTools;
 using Deckle.API.Services;
 using Deckle.API.Services.Email;
 using Deckle.Domain.Entities;
@@ -92,6 +93,20 @@ public static IServiceCollection AddDeckleInfrastructure(
         return services;
     }
 
+    public static IServiceCollection AddDeckleMcpTools(this IServiceCollection services)
+    {
+        services.AddHttpContextAccessor();
+        services
+            .AddMcpServer()
+            .WithHttpTransport()
+            .WithTools<ProjectTools>()
+            .WithTools<ComponentTools>()
+            .WithTools<DataSourceTools>()
+            .WithTools<FileTools>();
+
+        return services;
+    }
+
     public static IServiceCollection AddDeckleRateLimiting(this IServiceCollection services)
     {
         services.AddRateLimiter(options =>

src/Deckle.API/Extensions/WebApplicationExtensions.cs

@@ -4,6 +4,7 @@
 using Exceptionless;
 using Hangfire;
 using Microsoft.EntityFrameworkCore;
+using ModelContextProtocol.AspNetCore;
 using Scalar.AspNetCore;
 
 namespace Deckle.API.Extensions;
@@ -75,6 +76,8 @@ public static WebApplication MapDeckleEndpoints(this WebApplication app)
         app.MapUserEndpoints();
         app.MapApiKeyEndpoints();
 
+        app.MapMcp("/mcp").RequireAuthorization("ApiKey");
+
         return app;
     }
 

src/Deckle.MCP/Tools/BaseMcpTool.cs → src/Deckle.API/McpTools/BaseMcpTool.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 
-namespace Deckle.MCP.Tools;
+namespace Deckle.API.McpTools;
 
 public abstract class BaseMcpTool(AppDbContext db, IHttpContextAccessor httpContextAccessor)
 {

src/Deckle.MCP/Tools/ComponentTools.cs → src/Deckle.API/McpTools/ComponentTools.cs

@@ -6,7 +6,7 @@
 using Microsoft.EntityFrameworkCore;
 using ModelContextProtocol.Server;
 
-namespace Deckle.MCP.Tools;
+namespace Deckle.API.McpTools;
 
 [McpServerToolType]
 public sealed class ComponentTools(AppDbContext db, IHttpContextAccessor httpContextAccessor)

src/Deckle.MCP/Tools/DataSourceTools.cs → src/Deckle.API/McpTools/DataSourceTools.cs

@@ -7,7 +7,7 @@
 using Microsoft.EntityFrameworkCore;
 using ModelContextProtocol.Server;
 
-namespace Deckle.MCP.Tools;
+namespace Deckle.API.McpTools;
 
 [McpServerToolType]
 public sealed class DataSourceTools(AppDbContext db, IHttpContextAccessor httpContextAccessor)

src/Deckle.MCP/Tools/FileTools.cs → src/Deckle.API/McpTools/FileTools.cs

@@ -5,7 +5,7 @@
 using Microsoft.EntityFrameworkCore;
 using ModelContextProtocol.Server;
 
-namespace Deckle.MCP.Tools;
+namespace Deckle.API.McpTools;
 
 [McpServerToolType]
 public sealed class FileTools(AppDbContext db, IHttpContextAccessor httpContextAccessor)

src/Deckle.MCP/Tools/McpErrors.cs → src/Deckle.API/McpTools/McpErrors.cs

@@ -1,4 +1,4 @@
-namespace Deckle.MCP.Tools;
+namespace Deckle.API.McpTools;
 
 internal static class McpErrors
 {

src/Deckle.MCP/Tools/ProjectTools.cs → src/Deckle.API/McpTools/ProjectTools.cs

@@ -6,7 +6,7 @@
 using Microsoft.EntityFrameworkCore;
 using ModelContextProtocol.Server;
 
-namespace Deckle.MCP.Tools;
+namespace Deckle.API.McpTools;
 
 [McpServerToolType]
 public sealed class ProjectTools(AppDbContext db, IHttpContextAccessor httpContextAccessor)

src/Deckle.API/Program.cs

@@ -27,6 +27,9 @@
 // Application services
 builder.Services.AddDeckleApplicationServices();
 
+// MCP tools
+builder.Services.AddDeckleMcpTools();
+
 // Exception tracking
 builder.Services.AddExceptionlessIfConfigured(builder.Configuration);
 

src/Deckle.AppHost/AppHost.cs

@@ -38,14 +38,6 @@
         service.Name = "api";
     });
 
-var mcp = builder.AddProject<Projects.Deckle_MCP>("mcp")
-    .WithReference(database)
-    .WaitFor(database)
-    .PublishAsDockerComposeService((resource, service) =>
-    {
-        service.Name = "mcp";
-    });
-
 web.WithReference(api)
     .WithEnvironment("PUBLIC_API_URL", api.GetEndpoint("http"));
 

src/Deckle.AppHost/Deckle.AppHost.csproj

@@ -16,7 +16,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Deckle.API\Deckle.API.csproj" />
-    <ProjectReference Include="..\Deckle.MCP\Deckle.MCP.csproj" />
   </ItemGroup>
 
 </Project>