Merge branch 'mcp' of https://github.com/Ai4c-AI/BotSharp

Author: geffzhang

BotSharp.sln

@@ -127,7 +127,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Core.Rules", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.DeepSeekAI", "src\Plugins\BotSharp.Plugin.DeepSeekAI\BotSharp.Plugin.DeepSeekAI.csproj", "{AF329442-B48E-4B48-A18A-1C869D1BA6F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Core.Realtime", "src\Infrastructure\BotSharp.Core.Realtime\BotSharp.Core.Realtime.csproj", "{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.MCP", "src\Infrastructure\BotSharp.MCP\BotSharp.MCP.csproj", "{8ED8EEF4-06DD-45F5-AA91-BD2395E901B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.PizzaBot.MCPServer", "tests\BotSharp.PizzaBot.MCPServer\BotSharp.PizzaBot.MCPServer.csproj", "{AD91B4ED-0623-4710-913E-6D7C893E76EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -521,14 +523,6 @@ Global
 		{AF329442-B48E-4B48-A18A-1C869D1BA6F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF329442-B48E-4B48-A18A-1C869D1BA6F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF329442-B48E-4B48-A18A-1C869D1BA6F5}.Release|x64.Build.0 = Release|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -590,7 +584,6 @@ Global
 		{F812BAAE-5A7D-4DF7-8E71-70696B51C61F} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
 		{AFD64412-4D6A-452E-82A2-79E5D8842E29} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
 		{AF329442-B48E-4B48-A18A-1C869D1BA6F5} = {D5293208-2BEF-42FC-A64C-5954F61720BA}
-		{7ACD8C95-C66B-436A-80E7-541A57D8C3F4} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A9969D89-C98B-40A5-A12B-FC87E55B3A19}

src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs

@@ -57,5 +57,11 @@ public virtual void OnAgentLoaded(Agent agent)
 
     public virtual void OnAgentUtilityLoaded(Agent agent)
     {
+
+    }
+
+    public virtual void OnAgentMCPToolLoaded(Agent agent)
+    {
+
     }
 }

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs

@@ -19,6 +19,7 @@ public enum AgentField
     Sample,
     LlmConfig,
     Utility,
+    Acp,
     KnowledgeBase,
     Rule,
     MaxMessageCount

src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs

@@ -27,6 +27,8 @@ public interface IAgentHook
 
     void OnAgentUtilityLoaded(Agent agent);
 
+    void OnAgentMCPToolLoaded(Agent agent);
+
     /// <summary>
     /// Triggered when agent is loaded completely.
     /// </summary>

src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs

@@ -95,15 +95,20 @@ public class Agent
     public List<string> Labels { get; set; } = new();
 
     /// <summary>
-    /// Merge utilities from entry agent
+    /// Merge Utility from entry agent
     /// </summary>
     public bool MergeUtility { get; set; }
 
     /// <summary>
-    /// Agent utilities
+    /// Agent Utility
     /// </summary>
     public List<AgentUtility> Utilities { get; set; } = new();
 
+    /// <summary>
+    /// Agent MCP Tools
+    /// </summary>
+    public List<MCPTool> McpTools { get; set; } = new();
+
     /// <summary>
     /// Agent rules
     /// </summary>
@@ -157,6 +162,7 @@ public static Agent Clone(Agent agent)
             Responses = agent.Responses,
             Samples = agent.Samples,
             Utilities = agent.Utilities,
+            McpTools = agent.McpTools,
             Knowledges = agent.Knowledges,
             IsPublic = agent.IsPublic,
             Disabled = agent.Disabled,
@@ -298,4 +304,10 @@ public Agent SetLlmConfig(AgentLlmConfig? llmConfig)
         LlmConfig = llmConfig;
         return this;
     }
+
+    public Agent SetMcps(List<MCPTool> mcps)
+    {
+        McpTools = mcps ?? [];
+        return this;
+    }
 }

src/Infrastructure/BotSharp.Abstraction/Agents/Models/MCPTool.cs

@@ -0,0 +1,37 @@
+namespace BotSharp.Abstraction.Agents.Models;
+
+public class MCPTool
+{
+    public string ServerId { get; set; }
+
+    public bool Disabled { get; set; }
+
+    public IEnumerable<MCPFunction> Functions { get; set; } = [];
+
+    public MCPTool()
+    {
+        
+    }
+
+    public MCPTool(
+        IEnumerable<MCPFunction>? functions = null)
+    {
+        Functions = functions ?? [];
+    }
+
+    public override string ToString()
+    {
+        return ServerId;
+    }
+}
+
+
+public class MCPFunction
+{
+    public string Name { get; set; }
+
+    public MCPFunction(string name)
+    {
+        this.Name = name;
+    } 
+}

src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs

@@ -38,6 +38,7 @@ public override void OnAgentUtilityLoaded(Agent agent)
             agent.SecondaryInstructions.Add(prompt);
         }
     }
+     
 
     private (IEnumerable<FunctionDef>, IEnumerable<string>) GetUtilityContent(Agent agent)
     {
@@ -81,5 +82,5 @@ public override void OnAgentUtilityLoaded(Agent agent)
                                      .Distinct().ToList();
 
         return (functionNames, templateNames);
-    }
+    }   
 }

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs

@@ -71,6 +71,11 @@ public async Task<Agent> LoadAgent(string id, bool loadUtility = true)
             {
                 hook.OnAgentUtilityLoaded(agent);
             }
+
+            if(agent.McpTools != null && agent.McpTools.Count >0)
+            {
+                hook.OnAgentMCPToolLoaded(agent);
+            }
 
             hook.OnAgentLoaded(agent);
         }

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs

@@ -40,6 +40,7 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
         record.Responses = agent.Responses ?? [];
         record.Samples = agent.Samples ?? [];
         record.Utilities = agent.Utilities ?? [];
+        record.McpTools = agent.McpTools ?? [];
         record.KnowledgeBases = agent.KnowledgeBases ?? [];
         record.Rules = agent.Rules ?? [];
         if (agent.LlmConfig != null && !agent.LlmConfig.IsInherit)
@@ -106,6 +107,7 @@ public async Task<string> UpdateAgentFromFile(string id)
                        .SetResponses(foundAgent.Responses)
                        .SetSamples(foundAgent.Samples)
                        .SetUtilities(foundAgent.Utilities)
+                       .SetMcps(foundAgent.McpTools)
                        .SetKnowledgeBases(foundAgent.KnowledgeBases)
                        .SetRules(foundAgent.Rules)
                        .SetLlmConfig(foundAgent.LlmConfig);

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs

@@ -60,6 +60,9 @@ public void UpdateAgent(Agent agent, AgentField field)
                 case AgentField.Utility:
                     UpdateAgentUtilities(agent.Id, agent.MergeUtility, agent.Utilities);
                     break;
+                case AgentField.Acp:
+                    UpdateAgentMcpTools(agent.Id, agent.McpTools);
+                    break;
                 case AgentField.KnowledgeBase:
                     UpdateAgentKnowledgeBases(agent.Id, agent.KnowledgeBases);
                     break;
@@ -191,6 +194,20 @@ private void UpdateAgentUtilities(string agentId, bool mergeUtility, List<AgentU
             File.WriteAllText(agentFile, json);
         }
 
+        private void UpdateAgentMcpTools(string agentId, List<MCPTool> mcptools)
+        {
+            if (mcptools == null) return;
+
+            var (agent, agentFile) = GetAgentFromFile(agentId);
+            if (agent == null) return;
+
+   
+            agent.McpTools = mcptools;
+            agent.UpdatedDateTime = DateTime.UtcNow;
+            var json = JsonSerializer.Serialize(agent, _options);
+            File.WriteAllText(agentFile, json);
+        }
+
         private void UpdateAgentKnowledgeBases(string agentId, List<AgentKnowledgeBase> knowledgeBases)
         {
             if (knowledgeBases == null) return;
@@ -360,6 +377,7 @@ private void UpdateAgentAllFields(Agent inputAgent)
             agent.Profiles = inputAgent.Profiles;
             agent.Labels = inputAgent.Labels;
             agent.Utilities = inputAgent.Utilities;
+            agent.McpTools = inputAgent.McpTools;
             agent.KnowledgeBases = inputAgent.KnowledgeBases;
             agent.RoutingRules = inputAgent.RoutingRules;
             agent.Rules = inputAgent.Rules;