Merge pull request #1048 from hchen2020/master

Avoid duplicated utility templates.

Author: Oceania2018

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

@@ -35,12 +35,15 @@ public override void OnAgentUtilityLoaded(Agent agent)
 
         foreach (var prompt in templates)
         {
-            agent.SecondaryInstructions.Add(prompt);
+            if (!agent.SecondaryInstructions.Any(x => x.Contains(prompt.Content, StringComparison.OrdinalIgnoreCase)))
+            {
+                agent.SecondaryInstructions.Add(prompt.Content);
+            }
         }
     }
 
 
-    private (IEnumerable<FunctionDef>, IEnumerable<string>) GetUtilityContent(Agent agent)
+    private (IEnumerable<FunctionDef>, IEnumerable<AgentTemplate>) GetUtilityContent(Agent agent)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var (functionNames, templateNames) = GetUniqueContent(agent.Utilities);
@@ -60,7 +63,7 @@ public override void OnAgentUtilityLoaded(Agent agent)
 
         var ua = db.GetAgent(BuiltInAgentId.UtilityAssistant);
         var functions = ua?.Functions?.Where(x => functionNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.ToList() ?? [];
-        var templates = ua?.Templates?.Where(x => templateNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.Select(x => x.Content)?.ToList() ?? [];
+        var templates = ua?.Templates?.Where(x => templateNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.ToList() ?? [];
         return (functions, templates);
     }
 

src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioInboundController.cs

@@ -167,6 +167,12 @@ protected Dictionary<string, string> ParseStates(List<string> states)
             new("twilio_call_sid", request.CallSid),
         };
 
+        if (request.Direction == "inbound")
+        {
+            states.Add(new MessageState("calling_phone_from", request.From));
+            states.Add(new MessageState("calling_phone_to", request.To));
+        }
+
         var requestStates = ParseStates(request.States);
         foreach (var s in requestStates)
         {