Clean code, merge PizzaBot.MCPServer into WebStarter.

Oceania2018 · Oceania2018 · commit 282693219694 · 2026-03-30T11:04:06.000-05:00
diff --git a/BotSharp.sln b/BotSharp.sln
@@ -127,8 +127,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.DeepSeekAI"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Core.Realtime", "src\Infrastructure\BotSharp.Core.Realtime\BotSharp.Core.Realtime.csproj", "{781F1465-365C-0F22-1775-25025DAFA4C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.PizzaBot.MCPServer", "tests\BotSharp.PizzaBot.MCPServer\BotSharp.PizzaBot.MCPServer.csproj", "{8D2AD45F-836A-516F-DE6A-71443CEBB18A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Test.ComputerUse", "tests\BotSharp.Test.ComputerUse\BotSharp.Test.ComputerUse.csproj", "{C19D9AC1-97DD-8E65-E8DB-D295A095AA2D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.OsDriver", "src\Plugins\BotSharp.Plugin.OsDriver\BotSharp.Plugin.OsDriver.csproj", "{B268E2F0-060F-8466-7D81-ABA4D735CA59}"
@@ -549,14 +547,6 @@ Global
 		{781F1465-365C-0F22-1775-25025DAFA4C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{781F1465-365C-0F22-1775-25025DAFA4C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{781F1465-365C-0F22-1775-25025DAFA4C7}.Release|x64.Build.0 = Release|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Debug|x64.Build.0 = Debug|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A}.Release|x64.Build.0 = Release|Any CPU
 		{C19D9AC1-97DD-8E65-E8DB-D295A095AA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C19D9AC1-97DD-8E65-E8DB-D295A095AA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C19D9AC1-97DD-8E65-E8DB-D295A095AA2D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -730,7 +720,6 @@ Global
 		{AFD64412-4D6A-452E-82A2-79E5D8842E29} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
 		{AF329442-B48E-4B48-A18A-1C869D1BA6F5} = {D5293208-2BEF-42FC-A64C-5954F61720BA}
 		{781F1465-365C-0F22-1775-25025DAFA4C7} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
-		{8D2AD45F-836A-516F-DE6A-71443CEBB18A} = {32FAFFFE-A4CB-4FEE-BF7C-84518BBC6DCC}
 		{C19D9AC1-97DD-8E65-E8DB-D295A095AA2D} = {32FAFFFE-A4CB-4FEE-BF7C-84518BBC6DCC}
 		{B268E2F0-060F-8466-7D81-ABA4D735CA59} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
 		{970BE341-9AC8-99A5-6572-E703C1E02FCB} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -98,8 +98,8 @@
     <PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
     <PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
-    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.4.0-preview.3" />
+    <PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
+    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.2.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="BotSharp.Core" Version="$(BotSharpVersion)" />
diff --git a/src/BotSharp.AppHost/BotSharp.AppHost.csproj b/src/BotSharp.AppHost/BotSharp.AppHost.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
   
   <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
   <PropertyGroup>
@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\tests\BotSharp.PizzaBot.MCPServer\BotSharp.PizzaBot.MCPServer.csproj" />
     <ProjectReference Include="..\BotSharp.ServiceDefaults\BotSharp.ServiceDefaults.csproj" />
     <ProjectReference Include="..\WebStarter\WebStarter.csproj" />
   </ItemGroup>
diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="AspNet.Security.OAuth.Weixin" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" />
+    <PackageReference Include="ModelContextProtocol.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs b/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs
@@ -1,18 +1,19 @@
 using BotSharp.Abstraction.Messaging.JsonConverters;
+using BotSharp.Core.MCP.Settings;
 using BotSharp.Core.Users.Services;
+using BotSharp.OpenAPI.BackgroundServices;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.Net.Http.Headers;
-using Microsoft.IdentityModel.JsonWebTokens;
-using BotSharp.OpenAPI.BackgroundServices;
-using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.OpenApi;
+using System.Text.Json.Serialization;
 #if NET8_0
 using Microsoft.OpenApi.Models;
 #endif
diff --git a/src/WebStarter/Program.cs b/src/WebStarter/Program.cs
@@ -1,12 +1,13 @@
+using BotSharp.Abstraction.Messaging.JsonConverters;
 using BotSharp.Core;
 using BotSharp.Core.MCP;
-using BotSharp.OpenAPI;
 using BotSharp.Logger;
+using BotSharp.OpenAPI;
+using BotSharp.PizzaBot.MCPServer.Tools;
 using BotSharp.Plugin.ChatHub;
+using BotSharp.Plugin.MultiTenancy.Extensions;
 using Serilog;
-using BotSharp.Abstraction.Messaging.JsonConverters;
 using StackExchange.Redis;
-using BotSharp.Plugin.MultiTenancy.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -43,6 +44,13 @@
     {
         o.Configuration.ChannelPrefix = RedisChannel.Literal("botsharp");
     })*/;
+
+builder.Services.AddMcpServer()
+    .WithHttpTransport()
+    .WithTools<MakePaymentTool>()
+    .WithTools<PizzaPricesTool>()
+    .WithTools<PlaceOrderTool>();
+
 var app = builder.Build();
 
 app.UseWebSockets();
@@ -60,4 +68,7 @@
     .UseBotSharpOpenAPI(app.Environment)
     .UseBotSharpUI();
 
+// Map MCP endpoint – clients connect to: https://<host>/mcp
+app.MapMcp("/mcp");
+
 app.Run();
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
@@ -669,7 +669,7 @@
   },
 
   "MCP": {
-    "Enabled": false,
+    "Enabled": true,
     "McpClientOptions": {
       "ClientInfo": {
         "Name": "SimpleToolsBotsharp",
@@ -681,7 +681,7 @@
       //  "Id": "PizzaServer",
       //  "Name": "PizzaServer",
       //  "SseConfig": {
-      //    "Endpoint": "http://localhost:58905/sse"
+      //    "Endpoint": "http://localhost:5500/mcp"
       //  }
       //}
     ]
diff --git a/tests/BotSharp.PizzaBot.MCPServer/BotSharp.PizzaBot.MCPServer.csproj b/tests/BotSharp.PizzaBot.MCPServer/BotSharp.PizzaBot.MCPServer.csproj
diff --git a/tests/BotSharp.PizzaBot.MCPServer/Program.cs b/tests/BotSharp.PizzaBot.MCPServer/Program.cs
diff --git a/tests/BotSharp.PizzaBot.MCPServer/Properties/launchSettings.json b/tests/BotSharp.PizzaBot.MCPServer/Properties/launchSettings.json
diff --git a/tests/BotSharp.Plugin.PizzaBot/BotSharp.Plugin.PizzaBot.csproj b/tests/BotSharp.Plugin.PizzaBot/BotSharp.Plugin.PizzaBot.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
diff --git a/tests/BotSharp.Plugin.PizzaBot/McpServerTools/MakePaymentTool.cs b/tests/BotSharp.Plugin.PizzaBot/McpServerTools/MakePaymentTool.cs
@@ -1,15 +1,10 @@
-using ModelContextProtocol;
-using ModelContextProtocol.Server;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
 namespace BotSharp.PizzaBot.MCPServer.Tools;
 
 [McpServerToolType]
-public static class MakePayment
+public class MakePaymentTool
 {
     [McpServerTool(Name = "make_payment"), Description("call this function to make payment.")]
-    public static string Make_Payment(
+    public string Make_Payment(
         [Description("order number"),Required] string order_number,
         [Description("total amount"),Required] int total_amount)
     {
diff --git a/tests/BotSharp.Plugin.PizzaBot/McpServerTools/PizzaPricesTool.cs b/tests/BotSharp.Plugin.PizzaBot/McpServerTools/PizzaPricesTool.cs
@@ -1,14 +1,10 @@
-using ModelContextProtocol;
-using ModelContextProtocol.Server;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
 using System.Dynamic;
 using System.Text.Json;
 
 namespace BotSharp.PizzaBot.MCPServer.Tools;
 
 [McpServerToolType]
-public static class PizzaPrices
+public class PizzaPricesTool
 {
     [McpServerTool(Name = "get_pizza_prices"), Description("call this function to get pizza unit price.")]
     public static string GetPizzaPrices(
diff --git a/tests/BotSharp.Plugin.PizzaBot/McpServerTools/PlaceOrderTool.cs b/tests/BotSharp.Plugin.PizzaBot/McpServerTools/PlaceOrderTool.cs
@@ -1,15 +1,10 @@
-using ModelContextProtocol;
-using ModelContextProtocol.Server;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
 namespace BotSharp.PizzaBot.MCPServer.Tools;
 
 [McpServerToolType]
-public static class PlaceOrder
+public class PlaceOrderTool
 {
     [McpServerTool(Name = "place_an_order"), Description("Place an order when user has confirmed the pizza type and quantity.")]
-    public static string PlaceAnOrder(
+    public string PlaceAnOrder(
       [Description("The pizza type."), Required] string pizza_type,
       [Description("quantity of pizza"), Required] int quantity,
       [Description("pizza unit price"),Required] double unit_price)
diff --git a/tests/BotSharp.Plugin.PizzaBot/PizzaBotPlugin.cs b/tests/BotSharp.Plugin.PizzaBot/PizzaBotPlugin.cs
@@ -9,15 +9,15 @@ public class PizzaBotPlugin : IBotSharpPlugin
     public string Name => "Pizza AI Assistant";
     public string Description => "An example of an enterprise-grade AI Chatbot.";
     public string IconUrl => "https://cdn-icons-png.flaticon.com/512/6978/6978255.png";
-    public string[] AgentIds => new[] 
-    {
+    public string[] AgentIds =>
+    [
         "8970b1e5-d260-4e2c-90b1-f1415a257c18",
         "b284db86-e9c2-4c25-a59e-4649797dd130",
         "c2b57a74-ae4e-4c81-b3ad-9ac5bff982bd",
         "dfd9b46d-d00c-40af-8a75-3fbdc2b89869",
         "fe8c60aa-b114-4ef3-93cb-a8efeac80f75",
         "cdd9023f-a371-407a-43bf-f36ddccce340"
-    };
+    ];
 
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
diff --git a/tests/BotSharp.Plugin.PizzaBot/Using.cs b/tests/BotSharp.Plugin.PizzaBot/Using.cs
@@ -3,8 +3,14 @@
 global using System.Text;
 global using System.Threading.Tasks;
 global using System.ComponentModel.DataAnnotations;
+global using System.ComponentModel;
+
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
+
+global using ModelContextProtocol;
+global using ModelContextProtocol.Server;
+
 global using BotSharp.Abstraction.Plugins;
 global using BotSharp.Abstraction.Functions;
 global using BotSharp.Plugin.PizzaBot.Functions;
