diff --git a/colaflow-api/src/ColaFlow.API/ColaFlow.API.csproj b/colaflow-api/src/ColaFlow.API/ColaFlow.API.csproj
index c623d6b..1d3af72 100644
--- a/colaflow-api/src/ColaFlow.API/ColaFlow.API.csproj
+++ b/colaflow-api/src/ColaFlow.API/ColaFlow.API.csproj
@@ -22,6 +22,7 @@
+
diff --git a/colaflow-api/src/ColaFlow.API/Program.cs b/colaflow-api/src/ColaFlow.API/Program.cs
index b4d4ffe..e817a03 100644
--- a/colaflow-api/src/ColaFlow.API/Program.cs
+++ b/colaflow-api/src/ColaFlow.API/Program.cs
@@ -6,6 +6,7 @@ using ColaFlow.API.Services;
using ColaFlow.Modules.Identity.Application;
using ColaFlow.Modules.Identity.Infrastructure;
using ColaFlow.Modules.Identity.Infrastructure.Persistence;
+using ColaFlow.Modules.Mcp.Infrastructure.Extensions;
using ColaFlow.Modules.ProjectManagement.Infrastructure.Persistence;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.EntityFrameworkCore;
@@ -25,6 +26,9 @@ builder.Services.AddIssueManagementModule(builder.Configuration, builder.Environ
builder.Services.AddIdentityApplication();
builder.Services.AddIdentityInfrastructure(builder.Configuration, builder.Environment);
+// Register MCP Module
+builder.Services.AddMcpModule();
+
// Add Response Caching
builder.Services.AddResponseCaching();
builder.Services.AddMemoryCache();
@@ -177,6 +181,9 @@ app.UsePerformanceLogging();
// Global exception handler (should be first in pipeline)
app.UseExceptionHandler();
+// MCP middleware (before CORS and authentication)
+app.UseMcpMiddleware();
+
// Enable Response Compression (should be early in pipeline)
app.UseResponseCompression();
diff --git a/colaflow-api/src/Modules/Mcp/ColaFlow.Modules.Mcp.Application/ColaFlow.Modules.Mcp.Application.csproj b/colaflow-api/src/Modules/Mcp/ColaFlow.Modules.Mcp.Application/ColaFlow.Modules.Mcp.Application.csproj
new file mode 100644
index 0000000..6ff5bc7
--- /dev/null
+++ b/colaflow-api/src/Modules/Mcp/ColaFlow.Modules.Mcp.Application/ColaFlow.Modules.Mcp.Application.csproj
@@ -0,0 +1,20 @@
+
+
+
+ net9.0
+ enable
+ enable
+ ColaFlow.Modules.Mcp.Application
+ ColaFlow.Modules.Mcp.Application
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/colaflow-api/src/Modules/Mcp/ColaFlow.Modules.Mcp.Application/Handlers/IMcpMethodHandler.cs b/colaflow-api/src/Modules/Mcp/ColaFlow.Modules.Mcp.Application/Handlers/IMcpMethodHandler.cs
new file mode 100644
index 0000000..fb96921
--- /dev/null
+++ b/colaflow-api/src/Modules/Mcp/ColaFlow.Modules.Mcp.Application/Handlers/IMcpMethodHandler.cs
@@ -0,0 +1,22 @@
+using ColaFlow.Modules.Mcp.Contracts.JsonRpc;
+
+namespace ColaFlow.Modules.Mcp.Application.Handlers;
+
+///
+/// Interface for MCP method handlers
+///
+public interface IMcpMethodHandler
+{
+ ///
+ /// The method name this handler supports
+ ///
+ string MethodName { get; }
+
+ ///
+ /// Handles the MCP method request
+ ///
+ /// Request parameters
+ /// Cancellation token
+ /// Method result
+ Task