From 80cba358f9cb169aa49630c68639127aec7d98ab Mon Sep 17 00:00:00 2001
From: Glen <glen.84@gmail.com>
Date: Tue, 17 Mar 2026 17:11:17 +0200
Subject: [PATCH 1/2] [MCP] Update MCP SDK

---
 dictionary.txt                                      | 13 +++++++------
 src/Directory.Packages.props                        |  2 +-
 .../Extensions/ServiceCollectionExtensions.cs       |  2 ++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dictionary.txt b/dictionary.txt
index a97c1d6d0b1..59892de6787 100644
--- a/dictionary.txt
+++ b/dictionary.txt
@@ -5,6 +5,7 @@ accessibilities
 agrc
 Alderaan
 Andi
+apphost
 appsettings
 ASPDEPR004
 ASPDEPR008
@@ -41,8 +42,8 @@ contentfiles
 Contoso
 conv
 CQRS
-CUST
 creds
+CUST
 dataloaders
 debuggable
 decompile
@@ -58,6 +59,7 @@ entityframework
 EPSG
 esque
 evolvability
+Expando
 Fanout
 FFFFFFFZ
 fffzzz
@@ -83,8 +85,8 @@ Hmac
 hotchocolate
 Includable
 inheritdocs
-inmemory
 initializable
+inmemory
 inspectable
 Kellner
 Kydne
@@ -94,6 +96,7 @@ LICEN*
 Linq
 Marek
 matchesBrics
+MCPEXP
 MediatR
 Memberwise
 mercurius
@@ -197,6 +200,8 @@ Testcontainers
 Toub
 Touchpoint
 TOWGS
+traceparent
+tracestate
 Trimmable
 Tzdb
 unlisten
@@ -213,7 +218,3 @@ websockets
 Wilhuff
 Wunder
 xunit
-Expando
-traceparent
-tracestate
-apphost
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 7ef20f17d43..4added002cf 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -12,7 +12,7 @@
     <PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.3" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
     <PackageVersion Include="CaseConverter" Version="2.0.1" />
-    <PackageVersion Include="ChilliCream.ModelContextProtocol.AspNetCore" Version="0.0.1-rc.1" />
+    <PackageVersion Include="ChilliCream.ModelContextProtocol.AspNetCore" Version="1.1.0" />
     <PackageVersion Include="ChilliCream.Nitro.App" Version="$(NitroVersion)" />
     <PackageVersion Include="ChilliCream.Testing.Utilities" Version="0.2.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
index ff4046cf9a6..949b43c979d 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
@@ -96,7 +96,9 @@ public static void AddMcpSchemaServices(
                 })
                 .WithHttpTransport(options =>
                 {
+#pragma warning disable MCPEXP002 // https://github.com/modelcontextprotocol/csharp-sdk/issues/1416
                     options.RunSessionHandler = async (_, mcpServer, token) =>
+#pragma warning restore MCPEXP002
                     {
                         if (mcpServer.SessionId == null)
                         {

From 42a69d98b03afc39abb8c3d66af9fed6d089faf2 Mon Sep 17 00:00:00 2001
From: Glen <glen.84@gmail.com>
Date: Tue, 17 Mar 2026 17:19:03 +0200
Subject: [PATCH 2/2] Address Copilot feedback

---
 .../Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
index 949b43c979d..79125587170 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs
@@ -98,7 +98,6 @@ public static void AddMcpSchemaServices(
                 {
 #pragma warning disable MCPEXP002 // https://github.com/modelcontextprotocol/csharp-sdk/issues/1416
                     options.RunSessionHandler = async (_, mcpServer, token) =>
-#pragma warning restore MCPEXP002
                     {
                         if (mcpServer.SessionId == null)
                         {
@@ -118,6 +117,7 @@ public static void AddMcpSchemaServices(
                             mcpServers.TryRemove(mcpServer.SessionId, out var _);
                         }
                     };
+#pragma warning restore MCPEXP002
                 })
                 .WithListPromptsHandler(
                     (context, _) => ValueTask.FromResult(ListPromptsHandler.Handle(context)))