diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
index 9162cd16..121afd35 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
+++ b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
@@ -47,7 +47,8 @@
   </ItemGroup>
 
   <ItemGroup>    
-    <ProjectReference Include="..\BotSharp.Core\BotSharp.Core.csproj" />
+    <ProjectReference Include="..\BotSharp.Core\BotSharp.Core.csproj" />    
+    <ProjectReference Include="..\BotSharp.MCP\BotSharp.MCP.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
index 00c82ebe..6e49658d 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -1,4 +1,7 @@
 using BotSharp.Abstraction.Agents.Models;
+using BotSharp.Core.Mcp;
+using ModelContextProtocol.Client;
+using ModelContextProtocol.Protocol.Types;
 
 namespace BotSharp.OpenAPI.Controllers;
 
@@ -9,15 +12,19 @@ public class AgentController : ControllerBase
     private readonly IAgentService _agentService;
     private readonly IUserIdentity _user;
     private readonly IServiceProvider _services;
+    private readonly MCPClientManager _clientManager;
 
     public AgentController(
         IAgentService agentService,
         IUserIdentity user,
-        IServiceProvider services)
+        IServiceProvider services,
+        MCPClientManager mCPClientManager
+        )
     {
         _agentService = agentService;
         _user = user;
         _services = services;
+        _clientManager = mCPClientManager;
     }
 
     [HttpGet("/agent/settings")]
@@ -167,6 +174,16 @@ public class AgentController : ControllerBase
         return utilities.Where(x => !string.IsNullOrWhiteSpace(x.Name)).OrderBy(x => x.Name).ToList();
     }
 
+    [HttpGet("/agent/mcp/tools")]
+    public async Task<IEnumerable<Tool>> GetMCPTools(string serverId)
+    {
+        var client = await _clientManager.GetMcpClientAsync(serverId);
+        var tools = await client.ListToolsAsync().ToListAsync();
+         
+        return tools.Where(x => !string.IsNullOrWhiteSpace(x.Name))
+            .OrderBy(x => x.Name).ToList();
+    }
+
     [HttpGet("/agent/labels")]
     public async Task<IEnumerable<string>> GetAgentLabels()
     {
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
index c2f3f0ed..b151edf3 100644
--- a/src/WebStarter/WebStarter.csproj
+++ b/src/WebStarter/WebStarter.csproj
@@ -30,7 +30,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\tests\BotSharp.Plugin.PizzaBot\BotSharp.Plugin.PizzaBot.csproj" />
     <ProjectReference Include="..\BotSharp.ServiceDefaults\BotSharp.ServiceDefaults.csproj" />
-    <ProjectReference Include="..\Infrastructure\BotSharp.MCP\BotSharp.MCP.csproj" />
   </ItemGroup>
   
   <ItemGroup Condition="$(SolutionName)==BotSharp">
@@ -73,6 +72,7 @@
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.MetaGLM\BotSharp.Plugin.MetaGLM.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.Planner\BotSharp.Plugin.Planner.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.TencentCos\BotSharp.Plugin.TencentCos.csproj" />
+    <ProjectReference Include="..\Infrastructure\BotSharp.MCP\BotSharp.MCP.csproj" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/tests/BotSharp.Plugin.PizzaBot/Functions/GetPizzaPricesFn.cs b/tests/BotSharp.Plugin.PizzaBot/Functions/GetPizzaPricesFn.cs
index 9433c6a8..4fa39c7c 100644
--- a/tests/BotSharp.Plugin.PizzaBot/Functions/GetPizzaPricesFn.cs
+++ b/tests/BotSharp.Plugin.PizzaBot/Functions/GetPizzaPricesFn.cs
@@ -1,21 +1,21 @@
-//using BotSharp.Abstraction.Conversations.Models;
-//using System.Text.Json;
+using BotSharp.Abstraction.Conversations.Models;
+using System.Text.Json;
 
-//namespace BotSharp.Plugin.PizzaBot.Functions;
+namespace BotSharp.Plugin.PizzaBot.Functions;
 
-//public class GetPizzaPricesFn : IFunctionCallback
-//{
-//    public string Name => "get_pizza_price";
+public class GetPizzaPricesFn : IFunctionCallback
+{
+    public string Name => "get_pizza_price";
 
-//    public async Task<bool> Execute(RoleDialogModel message)
-//    {
-//        message.Data = new
-//        {
-//            pepperoni_unit_price = 3.2,
-//            cheese_unit_price = 3.5,
-//            margherita_unit_price = 3.8,
-//        };
-//        message.Content = JsonSerializer.Serialize(message.Data);
-//        return true;
-//    }
-//}
+    public async Task<bool> Execute(RoleDialogModel message)
+    {
+        message.Data = new
+        {
+            pepperoni_unit_price = 3.2,
+            cheese_unit_price = 3.5,
+            margherita_unit_price = 3.8,
+        };
+        message.Content = JsonSerializer.Serialize(message.Data);
+        return true;
+    }
+}
diff --git a/tests/BotSharp.Plugin.PizzaBot/Functions/MakePaymentFn.cs b/tests/BotSharp.Plugin.PizzaBot/Functions/MakePaymentFn.cs
index 5a34a6ce..144eb05a 100644
--- a/tests/BotSharp.Plugin.PizzaBot/Functions/MakePaymentFn.cs
+++ b/tests/BotSharp.Plugin.PizzaBot/Functions/MakePaymentFn.cs
@@ -1,19 +1,19 @@
-//using BotSharp.Abstraction.Conversations.Models;
+using BotSharp.Abstraction.Conversations.Models;
 
-//namespace BotSharp.Plugin.PizzaBot.Functions;
+namespace BotSharp.Plugin.PizzaBot.Functions;
 
-//public class MakePaymentFn : IFunctionCallback
-//{
-//    public string Name => "make_payment";
+public class MakePaymentFn : IFunctionCallback
+{
+    public string Name => "make_payment";
 
-//    public async Task<bool> Execute(RoleDialogModel message)
-//    {
-//        message.Content = "Payment proceed successfully. Thank you for your business. Have a great day!";
-//        message.Data = new
-//        {
-//            Transaction = Guid.NewGuid().ToString(),
-//            Status = "Success"
-//        };
-//        return true;
-//    }
-//}
+    public async Task<bool> Execute(RoleDialogModel message)
+    {
+        message.Content = "Payment proceed successfully. Thank you for your business. Have a great day!";
+        message.Data = new
+        {
+            Transaction = Guid.NewGuid().ToString(),
+            Status = "Success"
+        };
+        return true;
+    }
+}
diff --git a/tests/BotSharp.Plugin.PizzaBot/Functions/PlaceOrderFn.cs b/tests/BotSharp.Plugin.PizzaBot/Functions/PlaceOrderFn.cs
index 47d27363..87466956 100644
--- a/tests/BotSharp.Plugin.PizzaBot/Functions/PlaceOrderFn.cs
+++ b/tests/BotSharp.Plugin.PizzaBot/Functions/PlaceOrderFn.cs
@@ -1,24 +1,24 @@
-//using BotSharp.Abstraction.Conversations;
-//using BotSharp.Abstraction.Conversations.Models;
+using BotSharp.Abstraction.Conversations;
+using BotSharp.Abstraction.Conversations.Models;
 
-//namespace BotSharp.Plugin.PizzaBot.Functions;
+namespace BotSharp.Plugin.PizzaBot.Functions;
 
-//public class PlaceOrderFn : IFunctionCallback
-//{
-//    public string Name => "place_an_order";
+public class PlaceOrderFn : IFunctionCallback
+{
+    public string Name => "place_an_order";
 
-//    private readonly IServiceProvider _service;
-//    public PlaceOrderFn(IServiceProvider service)
-//    {
-//        _service = service;
-//    }
+    private readonly IServiceProvider _service;
+    public PlaceOrderFn(IServiceProvider service)
+    {
+        _service = service;
+    }
 
-//    public async Task<bool> Execute(RoleDialogModel message)
-//    {
-//        message.Content = "The order number is P123-01";
-//        var state = _service.GetRequiredService<IConversationStateService>();
-//        state.SetState("order_number", "P123-01");
+    public async Task<bool> Execute(RoleDialogModel message)
+    {
+        message.Content = "The order number is P123-01";
+        var state = _service.GetRequiredService<IConversationStateService>();
+        state.SetState("order_number", "P123-01");
 
-//        return true;
-//    }
-//}
+        return true;
+    }
+}
diff --git a/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotConversationHook.cs b/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotConversationHook.cs
index 92083ee7..9b31371f 100644
--- a/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotConversationHook.cs
+++ b/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotConversationHook.cs
@@ -37,11 +37,13 @@ public class PizzaBotConversationHook : ConversationHookBase
         var agentService = _services.GetRequiredService<IAgentService>();
         var state = _services.GetRequiredService<IConversationStateService>();
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
+#if USE_BOTSHARP
         if (agent.McpTools.Any(item => item.Functions.Any(x => x.Name == message.FunctionName)))
         {
             var data = JsonDocument.Parse(JsonSerializer.Serialize(message.Data));
             state.SaveStateByArgs(data);
         }
+#endif
         await base.OnResponseGenerated(message);
     }
 }