Merge pull request #1283 from yileicn/master

yileicn · web-flow · commit a02bbcd16b0a · 2026-01-23T11:35:34.000+08:00
optimize IAgentHook use async method
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs
@@ -24,44 +24,45 @@ public void SetAgent(Agent agent)
         _agent = agent;
     }
 
-    public virtual bool OnAgentLoading(ref string id)
+    public virtual Task<string?> OnAgentLoading(string id)
     {
-        return true;
+        return Task.FromResult<string?>(id);
     }
 
-    public virtual bool OnInstructionLoaded(string template, IDictionary<string, object> dict)
+    public virtual Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)
     {
         dict["current_date"] = $"{DateTime.Now:MMM dd, yyyy}";
         dict["current_time"] = $"{DateTime.Now:hh:mm tt}";
         dict["current_weekday"] = $"{DateTime.Now:dddd}";
         dict["current_utc_datetime"] = $"{DateTime.UtcNow}";
 
-        return true;
+        return Task.FromResult(true);
     }
 
-    public virtual bool OnFunctionsLoaded(List<FunctionDef> functions)
+    public virtual Task<bool> OnFunctionsLoaded(List<FunctionDef> functions)
     {
         _agent.Functions = functions;
-        return true;
+        return Task.FromResult(true);
     }
 
-    public virtual bool OnSamplesLoaded(List<string> samples)
+    public virtual Task<bool> OnSamplesLoaded(List<string> samples)
     {
         _agent.Samples = samples;
-        return true;
+        return Task.FromResult(true);
     }
 
-    public virtual void OnAgentLoaded(Agent agent)
+    public virtual Task OnAgentLoaded(Agent agent)
     {
+        return Task.CompletedTask;
     }
 
-    public virtual void OnAgentUtilityLoaded(Agent agent)
+    public virtual Task OnAgentUtilityLoaded(Agent agent)
     {
-
+        return Task.CompletedTask;
     }
 
-    public virtual void OnAgentMcpToolLoaded(Agent agent)
+    public virtual Task OnAgentMcpToolLoaded(Agent agent)
     {
-
+        return Task.CompletedTask;
     }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs
@@ -10,26 +10,26 @@ public interface IAgentHook : IHookBase
 
     /// <summary>
     /// Triggered when agent is loading.
-    /// Return different agent for redirection purpose.
+    /// Return different agent id for redirection purpose.
     /// </summary>
     /// <param name="id">Agent Id</param>
-    /// <returns></returns>
-    bool OnAgentLoading(ref string id);
+    /// <returns>New agent id if redirection is needed, null otherwise</returns>
+    Task<string?> OnAgentLoading(string id);
 
-    bool OnInstructionLoaded(string template, IDictionary<string, object> dict);
+    Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict);
 
-    bool OnFunctionsLoaded(List<FunctionDef> functions);
+    Task<bool> OnFunctionsLoaded(List<FunctionDef> functions);
 
-    bool OnSamplesLoaded(List<string> samples);
+    Task<bool> OnSamplesLoaded(List<string> samples);
 
-    void OnAgentUtilityLoaded(Agent agent);
+    Task OnAgentUtilityLoaded(Agent agent);
 
-    void OnAgentMcpToolLoaded(Agent agent);
+    Task OnAgentMcpToolLoaded(Agent agent);
 
     /// <summary>
     /// Triggered when agent is loaded completely.
     /// </summary>
     /// <param name="agent"></param>
     /// <returns></returns>
-    void OnAgentLoaded(Agent agent);
+    Task OnAgentLoaded(Agent agent);
 }
diff --git a/src/Infrastructure/BotSharp.Core.A2A/Hooks/A2AAgentHook.cs b/src/Infrastructure/BotSharp.Core.A2A/Hooks/A2AAgentHook.cs
@@ -23,29 +23,29 @@ public A2AAgentHook(IServiceProvider services, IA2AService a2aService, A2ASettin
         _a2aSettings = a2aSettings;
     }
 
-    public override bool OnAgentLoading(ref string id)
+    public override async Task<string?> OnAgentLoading(string id)
     {
-        var agentId = id;
-        var remoteConfig = _a2aSettings.Agents?.FirstOrDefault(x => x.Id == agentId);
+        var remoteConfig = _a2aSettings.Agents?.FirstOrDefault(x => x.Id == id);
         if (remoteConfig != null)
         {
-            return true;
+            return id; // No redirection needed, continue with current id
         }
-        return base.OnAgentLoading(ref id);
+        return await base.OnAgentLoading(id);
     }
 
-    public override void OnAgentLoaded(Agent agent)
+    public override async Task OnAgentLoaded(Agent agent)
     {
         // Check if this is an A2A remote agent
         if (agent.Type != AgentType.A2ARemote)
         {
+            await base.OnAgentLoaded(agent);
             return;
         }
 
         var remoteConfig = _a2aSettings.Agents?.FirstOrDefault(x => x.Id == agent.Id);
         if (remoteConfig != null)
         {
-            var agentCard = _a2aService.GetCapabilitiesAsync(remoteConfig.Endpoint).GetAwaiter().GetResult();
+            var agentCard = await _a2aService.GetCapabilitiesAsync(remoteConfig.Endpoint);
             if (agentCard != null)
             {
                 agent.Name = agentCard.Name;
@@ -83,6 +83,6 @@ public override void OnAgentLoaded(Agent agent)
                 });
             }
         }
-        base.OnAgentLoaded(agent);
+        await base.OnAgentLoaded(agent);
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs b/src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs
@@ -11,11 +11,11 @@ public BasicAgentHook(IServiceProvider services, AgentSettings settings)
     {
     }
 
-    public override void OnAgentUtilityLoaded(Agent agent)
+    public override Task OnAgentUtilityLoaded(Agent agent)
     {
         var conv = _services.GetRequiredService<IConversationService>();
         var isConvMode = conv.IsConversationMode();
-        if (!isConvMode) return;
+        if (!isConvMode) return Task.CompletedTask;
 
         agent.Utilities ??= [];
         agent.SecondaryFunctions ??= [];
@@ -26,6 +26,8 @@ public override void OnAgentUtilityLoaded(Agent agent)
         agent.SecondaryFunctions = agent.SecondaryFunctions.Concat(functions).DistinctBy(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList();
         var contents = templates.Select(x => x.Content);
         agent.SecondaryInstructions = agent.SecondaryInstructions.Concat(contents).Distinct(StringComparer.OrdinalIgnoreCase).ToList();
+        
+        return Task.CompletedTask;
     }
      
 
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Hooks;
 using BotSharp.Abstraction.Routing.Models;
 using System.Collections.Concurrent;
 
@@ -15,7 +16,16 @@ public async Task<Agent> LoadAgent(string id, bool loadUtility = true)
             return null;
         }
 
-        HookEmitter.Emit<IAgentHook>(_services, hook => hook.OnAgentLoading(ref id), id);
+        var hooks = _services.GetHooks<IAgentHook>(id);
+        foreach (var hook in hooks)
+        {
+            var newId = await hook.OnAgentLoading(id);
+            if (!string.IsNullOrEmpty(newId) && newId != id)
+            {
+                id = newId;
+                break; // Only the first hook that redirects takes effect
+            }
+        }
 
         var agent = await GetAgent(id);
         if (agent == null)
@@ -35,35 +45,35 @@ public async Task<Agent> LoadAgent(string id, bool loadUtility = true)
         PopulateState(agent);
 
         // After agent is loaded
-        HookEmitter.Emit<IAgentHook>(_services, hook => {
+        await HookEmitter.Emit<IAgentHook>(_services, async hook => {
             hook.SetAgent(agent);
 
             if (!string.IsNullOrEmpty(agent.Instruction))
             {
-                hook.OnInstructionLoaded(agent.Instruction, agent.TemplateDict);
+                await hook.OnInstructionLoaded(agent.Instruction, agent.TemplateDict);
             }
 
             if (agent.Functions != null)
             {
-                hook.OnFunctionsLoaded(agent.Functions);
+                await hook.OnFunctionsLoaded(agent.Functions);
             }
 
             if (agent.Samples != null)
             {
-                hook.OnSamplesLoaded(agent.Samples);
+                await hook.OnSamplesLoaded(agent.Samples);
             }
 
             if (loadUtility && !agent.Utilities.IsNullOrEmpty())
             {
-                hook.OnAgentUtilityLoaded(agent);
+                await hook.OnAgentUtilityLoaded(agent);
             }
 
             if (!agent.McpTools.IsNullOrEmpty())
             {
-                hook.OnAgentMcpToolLoaded(agent);
+                await hook.OnAgentMcpToolLoaded(agent);
             }
 
-            hook.OnAgentLoaded(agent);
+            await hook.OnAgentLoaded(agent);
 
         }, id);
 
diff --git a/src/Infrastructure/BotSharp.Core/MCP/Hooks/MCPToolAgentHook.cs b/src/Infrastructure/BotSharp.Core/MCP/Hooks/MCPToolAgentHook.cs
@@ -14,7 +14,7 @@ public McpToolAgentHook(IServiceProvider services, AgentSettings settings)
     {
     }
 
-    public override void OnAgentMcpToolLoaded(Agent agent)
+    public override async Task OnAgentMcpToolLoaded(Agent agent)
     {
         if (agent.Type == AgentType.Routing)
         {
@@ -27,7 +27,7 @@ public override void OnAgentMcpToolLoaded(Agent agent)
 
         agent.SecondaryFunctions ??= [];
 
-        var functions = GetMcpContent(agent).ConfigureAwait(false).GetAwaiter().GetResult();
+        var functions = await GetMcpContent(agent);
         agent.SecondaryFunctions = agent.SecondaryFunctions.Concat(functions).DistinctBy(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList();
     }
 
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Hooks/RoutingAgentHook.cs b/src/Infrastructure/BotSharp.Core/Routing/Hooks/RoutingAgentHook.cs
@@ -13,11 +13,11 @@ public RoutingAgentHook(IServiceProvider services, AgentSettings settings, Routi
         _routingSetting = routingSetting;
     }
 
-    public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)
+    public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)
     {
         if (_agent.Type != AgentType.Routing)
         {
-            return base.OnInstructionLoaded(template, dict);
+            return await base.OnInstructionLoaded(template, dict);
         }
         dict["router"] = _agent;
 
@@ -59,10 +59,10 @@ public override bool OnInstructionLoaded(string template, IDictionary<string, ob
 
         dict["routing_agents"] = agents;
 
-        return base.OnInstructionLoaded(template, dict);
+        return await base.OnInstructionLoaded(template, dict);
     }
 
-    public override bool OnFunctionsLoaded(List<FunctionDef> functions)
+    public override async Task<bool> OnFunctionsLoaded(List<FunctionDef> functions)
     {
         if (_agent.Type == AgentType.Task)
         {
@@ -73,7 +73,7 @@ public override bool OnFunctionsLoaded(List<FunctionDef> functions)
             if (rule != null)
             {
                 var agentService = _services.GetRequiredService<IAgentService>();
-                var redirectAgent = agentService.GetAgent(rule.RedirectTo).ConfigureAwait(false).GetAwaiter().GetResult();
+                var redirectAgent = await agentService.GetAgent(rule.RedirectTo);
 
                 var json = JsonSerializer.Serialize(new
                 {
@@ -111,6 +111,6 @@ public override bool OnFunctionsLoaded(List<FunctionDef> functions)
             }
         }
 
-        return base.OnFunctionsLoaded(functions);
+        return await base.OnFunctionsLoaded(functions);
     }
 }
diff --git a/src/Plugins/BotSharp.Plugin.Planner/SqlGeneration/Hooks/SqlPlannerAgentHook.cs b/src/Plugins/BotSharp.Plugin.Planner/SqlGeneration/Hooks/SqlPlannerAgentHook.cs
@@ -1,3 +1,9 @@
+using BotSharp.Abstraction.Agents;
+using BotSharp.Abstraction.Agents.Settings;
+using BotSharp.Abstraction.Knowledges;
+using BotSharp.Abstraction.MLTasks;
+using BotSharp.Plugin.Planner.Enums;
+
 namespace BotSharp.Plugin.Planner.SqlGeneration.Hooks;
 
 public class SqlPlannerAgentHook : AgentHookBase
@@ -9,18 +15,18 @@ public SqlPlannerAgentHook(IServiceProvider services, AgentSettings settings)
     {
     }
 
-    public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)
+    public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)
     {
         var knowledgeHooks = _services.GetServices<IKnowledgeHook>();
 
         // Get global knowledges
         var knowledges = new List<string>();
         foreach (var hook in knowledgeHooks)
         {
-            var k = hook.GetGlobalKnowledges(new RoleDialogModel(AgentRole.User, template)
+            var k = await hook.GetGlobalKnowledges(new RoleDialogModel(AgentRole.User, template)
             {
                 CurrentAgentId = PlannerAgentId.SqlPlanner
-            }).ConfigureAwait(false).GetAwaiter().GetResult();
+            });
             knowledges.AddRange(k);
         }
         dict["global_knowledges"] = knowledges;
diff --git a/tests/BotSharp.Plugin.PizzaBot/Hooks/CommonAgentHook.cs b/tests/BotSharp.Plugin.PizzaBot/Hooks/CommonAgentHook.cs
@@ -11,11 +11,11 @@ public CommonAgentHook(IServiceProvider services, AgentSettings settings)
     {
     }
 
-    public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)
+    public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)
     {
         dict["current_date"] = DateTime.Now.ToString("MM/dd/yyyy");
         dict["current_time"] = DateTime.Now.ToString("hh:mm tt");
         dict["current_weekday"] = DateTime.Now.DayOfWeek;
-        return base.OnInstructionLoaded(template, dict);
+        return await base.OnInstructionLoaded(template, dict);
     }
 }
diff --git a/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotAgentHook.cs b/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotAgentHook.cs
@@ -12,8 +12,8 @@ public PizzaBotAgentHook(IServiceProvider services, AgentSettings settings)
     {
     }
 
-    public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)
+    public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)
     {
-        return base.OnInstructionLoaded(template, dict);
+        return await base.OnInstructionLoaded(template, dict);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,44 +24,45 @@ public void SetAgent(Agent agent)`
`24`	`24`	`_agent = agent;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public virtual bool OnAgentLoading(ref string id)`
	`27`	`+ public virtual Task<string?> OnAgentLoading(string id)`
`28`	`28`	`{`
`29`		`- return true;`
	`29`	`+ return Task.FromResult<string?>(id);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public virtual bool OnInstructionLoaded(string template, IDictionary<string, object> dict)`
	`32`	`+ public virtual Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)`
`33`	`33`	`{`
`34`	`34`	`dict["current_date"] = $"{DateTime.Now:MMM dd, yyyy}";`
`35`	`35`	`dict["current_time"] = $"{DateTime.Now:hh:mm tt}";`
`36`	`36`	`dict["current_weekday"] = $"{DateTime.Now:dddd}";`
`37`	`37`	`dict["current_utc_datetime"] = $"{DateTime.UtcNow}";`
`38`	`38`
`39`		`- return true;`
	`39`	`+ return Task.FromResult(true);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public virtual bool OnFunctionsLoaded(List<FunctionDef> functions)`
	`42`	`+ public virtual Task<bool> OnFunctionsLoaded(List<FunctionDef> functions)`
`43`	`43`	`{`
`44`	`44`	`_agent.Functions = functions;`
`45`		`- return true;`
	`45`	`+ return Task.FromResult(true);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public virtual bool OnSamplesLoaded(List<string> samples)`
	`48`	`+ public virtual Task<bool> OnSamplesLoaded(List<string> samples)`
`49`	`49`	`{`
`50`	`50`	`_agent.Samples = samples;`
`51`		`- return true;`
	`51`	`+ return Task.FromResult(true);`
`52`	`52`	`}`
`53`	`53`
`54`		`- public virtual void OnAgentLoaded(Agent agent)`
	`54`	`+ public virtual Task OnAgentLoaded(Agent agent)`
`55`	`55`	`{`
	`56`	`+ return Task.CompletedTask;`
`56`	`57`	`}`
`57`	`58`
`58`		`- public virtual void OnAgentUtilityLoaded(Agent agent)`
	`59`	`+ public virtual Task OnAgentUtilityLoaded(Agent agent)`
`59`	`60`	`{`
`60`		`-`
	`61`	`+ return Task.CompletedTask;`
`61`	`62`	`}`
`62`	`63`
`63`		`- public virtual void OnAgentMcpToolLoaded(Agent agent)`
	`64`	`+ public virtual Task OnAgentMcpToolLoaded(Agent agent)`
`64`	`65`	`{`
`65`		`-`
	`66`	`+ return Task.CompletedTask;`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,29 +23,29 @@ public A2AAgentHook(IServiceProvider services, IA2AService a2aService, A2ASettin`
`23`	`23`	`_a2aSettings = a2aSettings;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public override bool OnAgentLoading(ref string id)`
	`26`	`+ public override async Task<string?> OnAgentLoading(string id)`
`27`	`27`	`{`
`28`		`- var agentId = id;`
`29`		`- var remoteConfig = _a2aSettings.Agents?.FirstOrDefault(x => x.Id == agentId);`
	`28`	`+ var remoteConfig = _a2aSettings.Agents?.FirstOrDefault(x => x.Id == id);`
`30`	`29`	`if (remoteConfig != null)`
`31`	`30`	`{`
`32`		`- return true;`
	`31`	`+ return id; // No redirection needed, continue with current id`
`33`	`32`	`}`
`34`		`- return base.OnAgentLoading(ref id);`
	`33`	`+ return await base.OnAgentLoading(id);`
`35`	`34`	`}`
`36`	`35`
`37`		`- public override void OnAgentLoaded(Agent agent)`
	`36`	`+ public override async Task OnAgentLoaded(Agent agent)`
`38`	`37`	`{`
`39`	`38`	`// Check if this is an A2A remote agent`
`40`	`39`	`if (agent.Type != AgentType.A2ARemote)`
`41`	`40`	`{`
	`41`	`+ await base.OnAgentLoaded(agent);`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`var remoteConfig = _a2aSettings.Agents?.FirstOrDefault(x => x.Id == agent.Id);`
`46`	`46`	`if (remoteConfig != null)`
`47`	`47`	`{`
`48`		`- var agentCard = _a2aService.GetCapabilitiesAsync(remoteConfig.Endpoint).GetAwaiter().GetResult();`
	`48`	`+ var agentCard = await _a2aService.GetCapabilitiesAsync(remoteConfig.Endpoint);`
`49`	`49`	`if (agentCard != null)`
`50`	`50`	`{`
`51`	`51`	`agent.Name = agentCard.Name;`
`@@ -83,6 +83,6 @@ public override void OnAgentLoaded(Agent agent)`
`83`	`83`	`});`
`84`	`84`	`}`
`85`	`85`	`}`
`86`		`- base.OnAgentLoaded(agent);`
	`86`	`+ await base.OnAgentLoaded(agent);`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ public BasicAgentHook(IServiceProvider services, AgentSettings settings)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`- public override void OnAgentUtilityLoaded(Agent agent)`
	`14`	`+ public override Task OnAgentUtilityLoaded(Agent agent)`
`15`	`15`	`{`
`16`	`16`	`var conv = _services.GetRequiredService<IConversationService>();`
`17`	`17`	`var isConvMode = conv.IsConversationMode();`
`18`		`- if (!isConvMode) return;`
	`18`	`+ if (!isConvMode) return Task.CompletedTask;`
`19`	`19`
`20`	`20`	`agent.Utilities ??= [];`
`21`	`21`	`agent.SecondaryFunctions ??= [];`
`@@ -26,6 +26,8 @@ public override void OnAgentUtilityLoaded(Agent agent)`
`26`	`26`	`agent.SecondaryFunctions = agent.SecondaryFunctions.Concat(functions).DistinctBy(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList();`
`27`	`27`	`var contents = templates.Select(x => x.Content);`
`28`	`28`	`agent.SecondaryInstructions = agent.SecondaryInstructions.Concat(contents).Distinct(StringComparer.OrdinalIgnoreCase).ToList();`
	`29`	`+`
	`30`	`+ return Task.CompletedTask;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using BotSharp.Abstraction.Hooks;`
`1`	`2`	`using BotSharp.Abstraction.Routing.Models;`
`2`	`3`	`using System.Collections.Concurrent;`
`3`	`4`
`@@ -15,7 +16,16 @@ public async Task<Agent> LoadAgent(string id, bool loadUtility = true)`
`15`	`16`	`return null;`
`16`	`17`	`}`
`17`	`18`
`18`		`- HookEmitter.Emit<IAgentHook>(_services, hook => hook.OnAgentLoading(ref id), id);`
	`19`	`+ var hooks = _services.GetHooks<IAgentHook>(id);`
	`20`	`+ foreach (var hook in hooks)`
	`21`	`+ {`
	`22`	`+ var newId = await hook.OnAgentLoading(id);`
	`23`	`+ if (!string.IsNullOrEmpty(newId) && newId != id)`
	`24`	`+ {`
	`25`	`+ id = newId;`
	`26`	`+ break; // Only the first hook that redirects takes effect`
	`27`	`+ }`
	`28`	`+ }`
`19`	`29`
`20`	`30`	`var agent = await GetAgent(id);`
`21`	`31`	`if (agent == null)`
`@@ -35,35 +45,35 @@ public async Task<Agent> LoadAgent(string id, bool loadUtility = true)`
`35`	`45`	`PopulateState(agent);`
`36`	`46`
`37`	`47`	`// After agent is loaded`
`38`		`- HookEmitter.Emit<IAgentHook>(_services, hook => {`
	`48`	`+ await HookEmitter.Emit<IAgentHook>(_services, async hook => {`
`39`	`49`	`hook.SetAgent(agent);`
`40`	`50`
`41`	`51`	`if (!string.IsNullOrEmpty(agent.Instruction))`
`42`	`52`	`{`
`43`		`- hook.OnInstructionLoaded(agent.Instruction, agent.TemplateDict);`
	`53`	`+ await hook.OnInstructionLoaded(agent.Instruction, agent.TemplateDict);`
`44`	`54`	`}`
`45`	`55`
`46`	`56`	`if (agent.Functions != null)`
`47`	`57`	`{`
`48`		`- hook.OnFunctionsLoaded(agent.Functions);`
	`58`	`+ await hook.OnFunctionsLoaded(agent.Functions);`
`49`	`59`	`}`
`50`	`60`
`51`	`61`	`if (agent.Samples != null)`
`52`	`62`	`{`
`53`		`- hook.OnSamplesLoaded(agent.Samples);`
	`63`	`+ await hook.OnSamplesLoaded(agent.Samples);`
`54`	`64`	`}`
`55`	`65`
`56`	`66`	`if (loadUtility && !agent.Utilities.IsNullOrEmpty())`
`57`	`67`	`{`
`58`		`- hook.OnAgentUtilityLoaded(agent);`
	`68`	`+ await hook.OnAgentUtilityLoaded(agent);`
`59`	`69`	`}`
`60`	`70`
`61`	`71`	`if (!agent.McpTools.IsNullOrEmpty())`
`62`	`72`	`{`
`63`		`- hook.OnAgentMcpToolLoaded(agent);`
	`73`	`+ await hook.OnAgentMcpToolLoaded(agent);`
`64`	`74`	`}`
`65`	`75`
`66`		`- hook.OnAgentLoaded(agent);`
	`76`	`+ await hook.OnAgentLoaded(agent);`
`67`	`77`
`68`	`78`	`}, id);`
`69`	`79`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public McpToolAgentHook(IServiceProvider services, AgentSettings settings)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`- public override void OnAgentMcpToolLoaded(Agent agent)`
	`17`	`+ public override async Task OnAgentMcpToolLoaded(Agent agent)`
`18`	`18`	`{`
`19`	`19`	`if (agent.Type == AgentType.Routing)`
`20`	`20`	`{`
`@@ -27,7 +27,7 @@ public override void OnAgentMcpToolLoaded(Agent agent)`
`27`	`27`
`28`	`28`	`agent.SecondaryFunctions ??= [];`
`29`	`29`
`30`		`- var functions = GetMcpContent(agent).ConfigureAwait(false).GetAwaiter().GetResult();`
	`30`	`+ var functions = await GetMcpContent(agent);`
`31`	`31`	`agent.SecondaryFunctions = agent.SecondaryFunctions.Concat(functions).DistinctBy(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList();`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ public RoutingAgentHook(IServiceProvider services, AgentSettings settings, Routi`
`13`	`13`	`_routingSetting = routingSetting;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)`
	`16`	`+ public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)`
`17`	`17`	`{`
`18`	`18`	`if (_agent.Type != AgentType.Routing)`
`19`	`19`	`{`
`20`		`- return base.OnInstructionLoaded(template, dict);`
	`20`	`+ return await base.OnInstructionLoaded(template, dict);`
`21`	`21`	`}`
`22`	`22`	`dict["router"] = _agent;`
`23`	`23`
`@@ -59,10 +59,10 @@ public override bool OnInstructionLoaded(string template, IDictionary<string, ob`
`59`	`59`
`60`	`60`	`dict["routing_agents"] = agents;`
`61`	`61`
`62`		`- return base.OnInstructionLoaded(template, dict);`
	`62`	`+ return await base.OnInstructionLoaded(template, dict);`
`63`	`63`	`}`
`64`	`64`
`65`		`- public override bool OnFunctionsLoaded(List<FunctionDef> functions)`
	`65`	`+ public override async Task<bool> OnFunctionsLoaded(List<FunctionDef> functions)`
`66`	`66`	`{`
`67`	`67`	`if (_agent.Type == AgentType.Task)`
`68`	`68`	`{`
`@@ -73,7 +73,7 @@ public override bool OnFunctionsLoaded(List<FunctionDef> functions)`
`73`	`73`	`if (rule != null)`
`74`	`74`	`{`
`75`	`75`	`var agentService = _services.GetRequiredService<IAgentService>();`
`76`		`- var redirectAgent = agentService.GetAgent(rule.RedirectTo).ConfigureAwait(false).GetAwaiter().GetResult();`
	`76`	`+ var redirectAgent = await agentService.GetAgent(rule.RedirectTo);`
`77`	`77`
`78`	`78`	`var json = JsonSerializer.Serialize(new`
`79`	`79`	`{`
`@@ -111,6 +111,6 @@ public override bool OnFunctionsLoaded(List<FunctionDef> functions)`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- return base.OnFunctionsLoaded(functions);`
	`114`	`+ return await base.OnFunctionsLoaded(functions);`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,9 @@`
	`1`	`+using BotSharp.Abstraction.Agents;`
	`2`	`+using BotSharp.Abstraction.Agents.Settings;`
	`3`	`+using BotSharp.Abstraction.Knowledges;`
	`4`	`+using BotSharp.Abstraction.MLTasks;`
	`5`	`+using BotSharp.Plugin.Planner.Enums;`
	`6`	`+`
`1`	`7`	`namespace BotSharp.Plugin.Planner.SqlGeneration.Hooks;`
`2`	`8`
`3`	`9`	`public class SqlPlannerAgentHook : AgentHookBase`
`@@ -9,18 +15,18 @@ public SqlPlannerAgentHook(IServiceProvider services, AgentSettings settings)`
`9`	`15`	`{`
`10`	`16`	`}`
`11`	`17`
`12`		`- public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)`
	`18`	`+ public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)`
`13`	`19`	`{`
`14`	`20`	`var knowledgeHooks = _services.GetServices<IKnowledgeHook>();`
`15`	`21`
`16`	`22`	`// Get global knowledges`
`17`	`23`	`var knowledges = new List<string>();`
`18`	`24`	`foreach (var hook in knowledgeHooks)`
`19`	`25`	`{`
`20`		`- var k = hook.GetGlobalKnowledges(new RoleDialogModel(AgentRole.User, template)`
	`26`	`+ var k = await hook.GetGlobalKnowledges(new RoleDialogModel(AgentRole.User, template)`
`21`	`27`	`{`
`22`	`28`	`CurrentAgentId = PlannerAgentId.SqlPlanner`
`23`		`- }).ConfigureAwait(false).GetAwaiter().GetResult();`
	`29`	`+ });`
`24`	`30`	`knowledges.AddRange(k);`
`25`	`31`	`}`
`26`	`32`	`dict["global_knowledges"] = knowledges;`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ public CommonAgentHook(IServiceProvider services, AgentSettings settings)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`- public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)`
	`14`	`+ public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)`
`15`	`15`	`{`
`16`	`16`	`dict["current_date"] = DateTime.Now.ToString("MM/dd/yyyy");`
`17`	`17`	`dict["current_time"] = DateTime.Now.ToString("hh:mm tt");`
`18`	`18`	`dict["current_weekday"] = DateTime.Now.DayOfWeek;`
`19`		`- return base.OnInstructionLoaded(template, dict);`
	`19`	`+ return await base.OnInstructionLoaded(template, dict);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public PizzaBotAgentHook(IServiceProvider services, AgentSettings settings)`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- public override bool OnInstructionLoaded(string template, IDictionary<string, object> dict)`
	`15`	`+ public override async Task<bool> OnInstructionLoaded(string template, IDictionary<string, object> dict)`
`16`	`16`	`{`
`17`		`- return base.OnInstructionLoaded(template, dict);`
	`17`	`+ return await base.OnInstructionLoaded(template, dict);`
`18`	`18`	`}`
`19`	`19`	`}`