resolve conflict

Jicheng Lu · Jicheng Lu · commit 8de7e699a7c6 · 2025-04-25T13:48:42.000-05:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="EntityFramework" Version="6.4.4" />
-    <PackageVersion Include="Google_GenerativeAI" Version="2.5.5" />
-    <PackageVersion Include="Google_GenerativeAI.Live" Version="2.5.5" />
+    <PackageVersion Include="Google_GenerativeAI" Version="2.5.8" />
+    <PackageVersion Include="Google_GenerativeAI.Live" Version="2.5.8" />
     <PackageVersion Include="LLMSharp.Google.Palm" Version="1.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeHubConnection.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeHubConnection.cs
@@ -3,6 +3,7 @@ namespace BotSharp.Abstraction.Realtime.Models;
 public class RealtimeHubConnection
 {
     public string StreamId { get; set; } = null!;
+    public string UserSessionId {get;set;} = null!; 
     public string? LastAssistantItemId { get; set; } = null!;
     public long LatestMediaTimestamp { get; set; }
     public long? ResponseStartTimestamp { get; set; }
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/Abstraction/ICrontabHook.cs b/src/Infrastructure/BotSharp.Core.Crontab/Abstraction/ICrontabHook.cs
@@ -5,6 +5,10 @@ public interface ICrontabHook
     string[]? Triggers
         => null;
 
+    void OnAuthenticate(CrontabItem item)
+    {
+    }
+
     Task OnCronTriggered(CrontabItem item)
         => Task.CompletedTask;
 
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs b/src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs
@@ -115,11 +115,12 @@ private string FormatCrontabName(string trigger, string agent)
     public async Task ScheduledTimeArrived(CrontabItem item)
     {
         _logger.LogDebug($"ScheduledTimeArrived {item}");
-        
+
         await HookEmitter.Emit<ICrontabHook>(_services, async hook =>
         {
             if (hook.Triggers == null || hook.Triggers.Contains(item.Title))
             {
+                hook.OnAuthenticate(item);
                 await hook.OnTaskExecuting(item);
                 await hook.OnCronTriggered(item);
                 await hook.OnTaskExecuted(item);
diff --git a/src/Infrastructure/BotSharp.Core.Realtime/Hooks/RealtimeConversationHook.cs b/src/Infrastructure/BotSharp.Core.Realtime/Hooks/RealtimeConversationHook.cs
@@ -17,6 +17,12 @@ public async Task OnFunctionExecuting(RoleDialogModel message)
         {
             return;
         }
+        
+        if (message.FunctionName == "response_to_user")
+        {
+            return;
+        }
+
         // Save states
         if (message.FunctionArgs != null && message.FunctionArgs.Length > 3)
         {
@@ -51,13 +57,22 @@ public async Task OnFunctionExecuted(RoleDialogModel message)
             await hub.Completer.UpdateSession(hub.HubConn);
             await hub.Completer.TriggerModelInference();
         }
+        else if (message.FunctionName == "response_to_user")
+        {
+            await hub.Completer.InsertConversationItem(message);
+            await hub.Completer.TriggerModelInference();
+        }
         else
         {
             // Update session for changed states
             var instruction = await hub.Completer.UpdateSession(hub.HubConn);
             await hub.Completer.InsertConversationItem(message);
 
-            if (message.StopCompletion)
+            if (string.IsNullOrEmpty(message.Content))
+            {
+                return;
+            }
+            else if (message.StopCompletion)
             {
                 await hub.Completer.TriggerModelInference($"Say to user: \"{message.Content}\"");
             }
diff --git a/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs b/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs
@@ -28,23 +28,14 @@ public async Task ConnectToModel(Func<string, Task>? responseToUser = null, Func
         convService.SetConversationId(_conn.ConversationId, []);
         var conversation = await convService.GetConversation(_conn.ConversationId);
 
-        var agentService = _services.GetRequiredService<IAgentService>();
-        var agent = await agentService.LoadAgent(conversation.AgentId);
-        _conn.CurrentAgentId = agent.Id;
-
         var routing = _services.GetRequiredService<IRoutingService>();
-        routing.Context.Push(agent.Id);
+        var agentService = _services.GetRequiredService<IAgentService>();
+        var agent = await agentService.GetAgent(_conn.CurrentAgentId);
 
         var storage = _services.GetRequiredService<IConversationStorage>();
         var dialogs = convService.GetDialogHistory();
-        if (dialogs.Count == 0)
-        {
-            dialogs.Add(new RoleDialogModel(AgentRole.User, "Hi"));
-            storage.Append(_conn.ConversationId, dialogs.First());
-        }
-
         routing.Context.SetDialogs(dialogs);
-        routing.Context.SetMessageId(_conn.ConversationId, dialogs.LastOrDefault()?.MessageId ?? Guid.NewGuid().ToString());
+        routing.Context.SetMessageId(_conn.ConversationId, Guid.Empty.ToString());
 
         var states = _services.GetRequiredService<IConversationStateService>();
         var settings = _services.GetRequiredService<RealtimeModelSettings>();
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Engines/IRuleEngine.cs b/src/Infrastructure/BotSharp.Core.Rules/Engines/IRuleEngine.cs
@@ -4,5 +4,5 @@ namespace BotSharp.Core.Rules.Engines;
 
 public interface IRuleEngine
 {
-    Task Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null);
+    Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null);
 }
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs b/src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs
@@ -18,7 +18,7 @@ public RuleEngine(IServiceProvider services, ILogger<RuleEngine> logger)
         _logger = logger;
     }
 
-    public async Task Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null)
+    public async Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null)
     {
         // Pull all user defined rules
         var agentService = _services.GetRequiredService<IAgentService>();
@@ -36,7 +36,7 @@ public async Task Triggered(IRuleTrigger trigger, string data, List<MessageState
 
         // Trigger the agents
         var instructService = _services.GetRequiredService<IInstructService>();
-        
+        var newConversationIds = new List<string>();
 
         foreach (var agent in preFilteredAgents)
         {
@@ -68,6 +68,7 @@ await convService.SendMessage(agent.Id,
                 msg => Task.CompletedTask);
 
             convService.SaveStates();
+            newConversationIds.Add(conv.Id);
 
             /*foreach (var rule in agent.Rules)
             {
@@ -88,5 +89,7 @@ await convService.SendMessage(agent.Id,
                 }
             }*/
         }
+
+        return newConversationIds;
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -123,6 +123,9 @@
     <Content Include="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\agent.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\functions\response_to_user.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\instructions\instruction.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Functions/ResponseToUserFn.cs b/src/Infrastructure/BotSharp.Core/Routing/Functions/ResponseToUserFn.cs
@@ -0,0 +1,29 @@
+using BotSharp.Abstraction.Functions;
+using BotSharp.Abstraction.Routing.Models;
+
+namespace BotSharp.Core.Routing.Functions;
+
+/// <summary>
+/// Response to user if router doesn't need to route to agent.
+/// </summary>
+public class ResponseToUserFn : IFunctionCallback
+{
+    public string Name => "response_to_user";
+    private readonly IServiceProvider _services;
+    private readonly IRoutingContext _context;
+
+    public ResponseToUserFn(IServiceProvider services, IRoutingContext context)
+    {
+        _services = services;
+        _context = context;
+    }
+
+    public Task<bool> Execute(RoleDialogModel message)
+    {
+        var args = JsonSerializer.Deserialize<RoutingArgs>(message.FunctionArgs);
+        message.Content = args.Response;
+        message.Handled = true;
+        message.StopCompletion = true;
+        return Task.FromResult(true);
+    }
+}
diff --git a/src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/functions/response_to_user.json b/src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/functions/response_to_user.json
@@ -0,0 +1,15 @@
+{
+  "name": "response_to_user",
+  "description": "Response to user without routing to any other agent",
+  "visibility_expression": "{% if states.routing_mode == 'lazy' %}visible{% endif %}",
+  "parameters": {
+    "type": "object",
+    "properties": {
+      "response": {
+        "type": "string",
+        "description": "Response content"
+      }
+    },
+    "required": [ "response" ]
+  }
+}
diff --git a/src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/instructions/instruction.liquid b/src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/instructions/instruction.liquid
@@ -7,6 +7,8 @@ Follow these steps to handle user request:
 4. You must include all required args for the selected agent, but you must not make up any parameters when there is no exact value provided, those parameters must set value as null if not declared.
 {% if routing_mode != 'lazy' %}
 5. Response must be in JSON format.
+{% else %}
+5. If user is greeting, you can call function response_to_user with a greeting message.
 {% endif %}
 
 {% if routing_requirements and routing_requirements != empty %}
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -194,9 +194,20 @@ private async Task ReceiveMessage(RealtimeHubConnection conn,
             else if (response.Type == "response.done")
             {
                 _logger.LogInformation($"{response.Type}: {receivedText}");
-
-                var messages = await OnResponsedDone(conn, receivedText);
-                onModelResponseDone(messages);
+                var data = JsonSerializer.Deserialize<ResponseDone>(receivedText).Body;
+                if (data.Status != "completed")
+                {
+                    if (data.StatusDetails.Type == "incomplete" && data.StatusDetails.Reason == "max_output_tokens")
+                    {
+                        onInterruptionDetected();
+                        await TriggerModelInference("Response user concisely");
+                    }
+                }
+                else
+                {
+                    var messages = await OnResponsedDone(conn, receivedText);
+                    onModelResponseDone(messages);
+                }
             }
             else if (response.Type == "conversation.item.created")
             {
@@ -312,6 +323,8 @@ await HookEmitter.Emit<IContentGeneratingHook>(_services, async hook =>
 
         await SendEventToModel(sessionUpdate);
 
+        await Task.Delay(300);
+
         return instruction;
     }
 
@@ -577,7 +590,11 @@ public async Task<List<RoleDialogModel>> OnResponsedDone(RealtimeHubConnection c
         var data = JsonSerializer.Deserialize<ResponseDone>(response).Body;
         if (data.Status != "completed")
         {
-            _logger.LogError($"{data.StatusDetails.ToString()}");
+            _logger.LogError(data.StatusDetails.ToString());
+            /*if (data.StatusDetails.Type == "incomplete" && data.StatusDetails.Reason == "max_output_tokens")
+            {
+                await TriggerModelInference("Response user concisely");
+            }*/
             return [];
         }
 
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioInboundController.cs b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioInboundController.cs
@@ -74,7 +74,7 @@ await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
         }
         else
         {
-            if (agent.Profiles.Contains("realtime"))
+            if (agent.Labels.Contains("realtime"))
             {
                 response = twilio.ReturnBidirectionalMediaStreamsInstructions(instruction, agent);
             }
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioReconnectController.cs b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioReconnectController.cs
@@ -0,0 +1,42 @@
+using BotSharp.Plugin.Twilio.Models;
+using BotSharp.Plugin.Twilio.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BotSharp.Plugin.Twilio.Controllers;
+
+public class TwilioReconnectController : TwilioController
+{
+    private readonly TwilioSetting _settings;
+    private readonly IServiceProvider _services;
+    private readonly ILogger _logger;
+
+    public TwilioReconnectController(IServiceProvider services, TwilioSetting settings, ILogger<TwilioReconnectController> logger)
+    {
+        _services = services;
+        _settings = settings;
+        _logger = logger;
+    }
+
+    [ValidateRequest]
+    [HttpPost("twilio/stream/reconnect")]
+    public async Task<TwiMLResult> Reconnect(ConversationalVoiceRequest request)
+    {
+        var response = new VoiceResponse();
+        var connect = new Connect();
+        var host = _settings.CallbackHost.Split("://").Last();
+        connect.Stream(url: $"wss://{host}/twilio/stream/{request.AgentId}/{request.ConversationId}");
+        if (!string.IsNullOrEmpty(request.InitAudioFile))
+        {
+            var twilio = _services.GetRequiredService<TwilioService>();
+            var audioUrl = twilio.GetSpeechPath(request.ConversationId, request.InitAudioFile);
+            response.Play(new Uri(audioUrl));
+        }
+        else
+        {
+            // Leave a pause to allow disposing objects.
+            response.Pause(1);
+        }
+        response.Append(connect);
+        return TwiML(response);
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs
@@ -176,7 +176,7 @@ await HookEmitter.Emit<ITwilioSessionHook>(_services, async hook =>
                     ActionOnEmptyResult = true
                 };
 
-                if (request.Attempts == 3)
+                if (request.Attempts == 5)
                 {
                     instruction.SpeechPaths.Add($"twilio/say-it-again-{Random.Shared.Next(1, 5)}.mp3");
                 }
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Hooks/TwilioConversationHook.cs b/src/Plugins/BotSharp.Plugin.Twilio/Hooks/TwilioConversationHook.cs
@@ -0,0 +1,63 @@
+using BotSharp.Abstraction.Routing;
+using Task = System.Threading.Tasks.Task;
+using Twilio.Rest.Api.V2010.Account;
+using BotSharp.Plugin.Twilio.Interfaces;
+using BotSharp.Plugin.Twilio.Models;
+
+namespace BotSharp.Plugin.Twilio.Hooks;
+
+public class TwilioConversationHook : ConversationHookBase, IConversationHook
+{
+    private readonly IServiceProvider _services;
+    private readonly TwilioSetting _setting;
+    private readonly ILogger _logger;
+
+    public TwilioConversationHook(IServiceProvider services,
+        TwilioSetting setting,
+        ILogger<TwilioConversationHook> logger)
+    {
+        _services = services;
+        _setting = setting;
+        _logger = logger;
+    }
+
+    public override async Task OnFunctionExecuted(RoleDialogModel message)
+    {
+        var hooks = _services.GetServices<ITwilioSessionHook>();
+
+        var routing = _services.GetRequiredService<IRoutingService>();
+        var conversationId = routing.Context.ConversationId;
+
+        var states = _services.GetRequiredService<IConversationStateService>();
+        var sid = states.GetState("twilio_call_sid");
+
+        var request = new ConversationalVoiceRequest
+        {
+            AgentId = message.CurrentAgentId,
+            ConversationId = conversationId,
+            CallSid = sid,
+        };
+
+        foreach (var hook in hooks)
+        {
+            if (await hook.ShouldReconnect(request, message))
+            {
+                var processUrl = $"{_setting.CallbackHost}/twilio/stream/reconnect?agent-id={message.CurrentAgentId}&conversation-id={conversationId}";
+
+                if (!string.IsNullOrEmpty(request.InitAudioFile))
+                {
+                    processUrl += $"&init-audio-file={request.InitAudioFile}";
+                }
+
+                // Save all states before reconnect
+                states.Save();
+
+                CallResource.Update(
+                    pathSid: sid,
+                    url: new Uri(processUrl));
+
+                break;
+            }
+        }
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Interfaces/ITwilioSessionHook.cs b/src/Plugins/BotSharp.Plugin.Twilio/Interfaces/ITwilioSessionHook.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/OutboundPhoneCallHandler/Functions/HangupPhoneCallFn.cs b/src/Plugins/BotSharp.Plugin.Twilio/OutboundPhoneCallHandler/Functions/HangupPhoneCallFn.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/OutboundPhoneCallHandler/Functions/OutboundPhoneCallFn.cs b/src/Plugins/BotSharp.Plugin.Twilio/OutboundPhoneCallHandler/Functions/OutboundPhoneCallFn.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Services/TwilioService.cs b/src/Plugins/BotSharp.Plugin.Twilio/Services/TwilioService.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Settings/TwilioSetting.cs b/src/Plugins/BotSharp.Plugin.Twilio/Settings/TwilioSetting.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/TwilioPlugin.cs b/src/Plugins/BotSharp.Plugin.Twilio/TwilioPlugin.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs b/src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/functions/util-twilio-hangup_phone_call.json b/src/Plugins/BotSharp.Plugin.Twilio/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/functions/util-twilio-hangup_phone_call.json

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace BotSharp.Abstraction.Realtime.Models;`
`3`	`3`	`public class RealtimeHubConnection`
`4`	`4`	`{`
`5`	`5`	`public string StreamId { get; set; } = null!;`
	`6`	`+ public string UserSessionId {get;set;} = null!;`
`6`	`7`	`public string? LastAssistantItemId { get; set; } = null!;`
`7`	`8`	`public long LatestMediaTimestamp { get; set; }`
`8`	`9`	`public long? ResponseStartTimestamp { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,12 @@ private string FormatCrontabName(string trigger, string agent)`
`115`	`115`	`public async Task ScheduledTimeArrived(CrontabItem item)`
`116`	`116`	`{`
`117`	`117`	`_logger.LogDebug($"ScheduledTimeArrived {item}");`
`118`		`-`
	`118`	`+`
`119`	`119`	`await HookEmitter.Emit<ICrontabHook>(_services, async hook =>`
`120`	`120`	`{`
`121`	`121`	`if (hook.Triggers == null \|\| hook.Triggers.Contains(item.Title))`
`122`	`122`	`{`
	`123`	`+ hook.OnAuthenticate(item);`
`123`	`124`	`await hook.OnTaskExecuting(item);`
`124`	`125`	`await hook.OnCronTriggered(item);`
`125`	`126`	`await hook.OnTaskExecuted(item);`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,12 @@ public async Task OnFunctionExecuting(RoleDialogModel message)`
`17`	`17`	`{`
`18`	`18`	`return;`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ if (message.FunctionName == "response_to_user")`
	`22`	`+ {`
	`23`	`+ return;`
	`24`	`+ }`
	`25`	`+`
`20`	`26`	`// Save states`
`21`	`27`	`if (message.FunctionArgs != null && message.FunctionArgs.Length > 3)`
`22`	`28`	`{`
`@@ -51,13 +57,22 @@ public async Task OnFunctionExecuted(RoleDialogModel message)`
`51`	`57`	`await hub.Completer.UpdateSession(hub.HubConn);`
`52`	`58`	`await hub.Completer.TriggerModelInference();`
`53`	`59`	`}`
	`60`	`+ else if (message.FunctionName == "response_to_user")`
	`61`	`+ {`
	`62`	`+ await hub.Completer.InsertConversationItem(message);`
	`63`	`+ await hub.Completer.TriggerModelInference();`
	`64`	`+ }`
`54`	`65`	`else`
`55`	`66`	`{`
`56`	`67`	`// Update session for changed states`
`57`	`68`	`var instruction = await hub.Completer.UpdateSession(hub.HubConn);`
`58`	`69`	`await hub.Completer.InsertConversationItem(message);`
`59`	`70`
`60`		`- if (message.StopCompletion)`
	`71`	`+ if (string.IsNullOrEmpty(message.Content))`
	`72`	`+ {`
	`73`	`+ return;`
	`74`	`+ }`
	`75`	`+ else if (message.StopCompletion)`
`61`	`76`	`{`
`62`	`77`	`await hub.Completer.TriggerModelInference($"Say to user: \"{message.Content}\"");`
`63`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ namespace BotSharp.Core.Rules.Engines;`
`4`	`4`
`5`	`5`	`public interface IRuleEngine`
`6`	`6`	`{`
`7`		`- Task Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null);`
	`7`	`+ Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null);`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public RuleEngine(IServiceProvider services, ILogger<RuleEngine> logger)`
`18`	`18`	`_logger = logger;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public async Task Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null)`
	`21`	`+ public async Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string data, List<MessageState>? states = null)`
`22`	`22`	`{`
`23`	`23`	`// Pull all user defined rules`
`24`	`24`	`var agentService = _services.GetRequiredService<IAgentService>();`
`@@ -36,7 +36,7 @@ public async Task Triggered(IRuleTrigger trigger, string data, List<MessageState`
`36`	`36`
`37`	`37`	`// Trigger the agents`
`38`	`38`	`var instructService = _services.GetRequiredService<IInstructService>();`
`39`		`-`
	`39`	`+ var newConversationIds = new List<string>();`
`40`	`40`
`41`	`41`	`foreach (var agent in preFilteredAgents)`
`42`	`42`	`{`
`@@ -68,6 +68,7 @@ await convService.SendMessage(agent.Id,`
`68`	`68`	`msg => Task.CompletedTask);`
`69`	`69`
`70`	`70`	`convService.SaveStates();`
	`71`	`+ newConversationIds.Add(conv.Id);`
`71`	`72`
`72`	`73`	`/*foreach (var rule in agent.Rules)`
`73`	`74`	`{`
`@@ -88,5 +89,7 @@ await convService.SendMessage(agent.Id,`
`88`	`89`	`}`
`89`	`90`	`}*/`
`90`	`91`	`}`
	`92`	`+`
	`93`	`+ return newConversationIds;`
`91`	`94`	`}`
`92`	`95`	`}`