resolve conflict.

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationHook.cs

@@ -69,21 +69,6 @@ public interface IConversationHook
 
     Task OnResponseGenerated(RoleDialogModel message);
 
-    /// <summary>
-    /// LLM detected user requested a new task different from previous topic.
-    /// </summary>
-    /// <param name="message"></param>
-    /// <returns></returns>
-    Task OnNewTaskDetected(RoleDialogModel message, string reason);
-
-    /// <summary>
-    /// LLM detected the current task is completed.
-    /// It's useful for the situation of multiple tasks in the same conversation.
-    /// </summary>
-    /// <param name="conversation"></param>
-    /// <returns></returns>
-    Task OnTaskCompleted(RoleDialogModel message);
-
     /// <summary>
     /// LLM detected the whole conversation is going to be end.
     /// </summary>

src/Infrastructure/BotSharp.Abstraction/Functions/Models/FunctionCallFromLlm.cs

@@ -36,13 +36,6 @@ public override string ToString()
     {
         var route = string.IsNullOrEmpty(AgentName) ? "" : $"<Route to {AgentName.ToUpper()} because {NextActionReason}>";
 
-        if (string.IsNullOrEmpty(Response))
-        {
-            return $"[{Function} {route} {JsonSerializer.Serialize(Arguments)}]: {Question}";
-        }
-        else
-        {
-            return $"[{Function} {route} {JsonSerializer.Serialize(Arguments)}]: {Question} => {Response}";
-        }
+        return $"[{Function} {route} {JsonSerializer.Serialize(Arguments)}]: {Question}";
     }
 }

src/Infrastructure/BotSharp.Abstraction/Routing/IRoutingHandler.cs

@@ -26,23 +26,21 @@ public interface IRoutingService
     /// <returns></returns>
     RoutingRule[] GetRulesByAgentId(string id);
 
-    List<RoutingHandlerDef> GetHandlers(Agent router);
-
     //void ResetRecursiveCounter();
     //int GetRecursiveCounter();
     //void SetRecursiveCounter(int counter);
 
     Task<bool> InvokeAgent(string agentId, List<RoleDialogModel> dialogs);
     Task<bool> InvokeFunction(string name, RoleDialogModel messages);
-    Task<RoleDialogModel> InstructLoop(RoleDialogModel message, List<RoleDialogModel> dialogs);
+    Task<RoleDialogModel> InstructLoop(Agent agent, RoleDialogModel message, List<RoleDialogModel> dialogs);
 
     /// <summary>
     /// Talk to a specific Agent directly, bypassing the Router
     /// </summary>
     /// <param name="agent"></param>
     /// <param name="message"></param>
     /// <returns></returns>
-    Task<RoleDialogModel> InstructDirect(Agent agent, RoleDialogModel message);
+    Task<RoleDialogModel> InstructDirect(Agent agent, RoleDialogModel message, List<RoleDialogModel> dialogs);
 
     Task<string> GetConversationContent(List<RoleDialogModel> dialogs, int maxDialogCount = 100);
 

src/Infrastructure/BotSharp.Abstraction/Routing/IRoutingService.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Routing.Models;
+
+public class ResponseUserArgs
+{
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+}

src/Infrastructure/BotSharp.Abstraction/Routing/Models/ResponseUserArgs.cs

@@ -15,19 +15,6 @@ public class RoutingArgs
     [JsonPropertyName("conversation_end")]
     public bool ConversationEnd { get; set; }
 
-    [JsonPropertyName("task_completed")]
-    public bool TaskCompleted { get; set; }
-
-    [JsonPropertyName("is_new_task")]
-    public bool IsNewTask { get; set; }
-
-    /// <summary>
-    /// The content of replying to user
-    /// </summary>
-    [JsonPropertyName("response")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public string Response { get; set; } = string.Empty;
-
     /// <summary>
     /// Agent for next action based on user latest response
     /// </summary>
@@ -38,10 +25,12 @@ public class RoutingArgs
     /// <summary>
     /// Agent who can achieve user original goal
     /// </summary>
+    [Obsolete("Will be replaced by dedicate Reasoner")]
     [JsonPropertyName("user_goal_agent")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string OriginalAgent { get; set; } = string.Empty;
 
+    [Obsolete("Will be replaced by dedicate Reasoner")]
     [JsonPropertyName("user_goal_description")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string UserGoal { get; set; } = string.Empty;
@@ -50,13 +39,6 @@ public override string ToString()
     {
         var route = string.IsNullOrEmpty(AgentName) ? "" : $"<Route to {AgentName.ToUpper()} because {NextActionReason}>";
 
-        if (string.IsNullOrEmpty(Response))
-        {
-            return $"[{Function} {route}]";
-        }
-        else
-        {
-            return $"[{Function} {route}] => {Response}";
-        }
+        return $"[{Function} {route}]";
     }
 }

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingArgs.cs

@@ -150,17 +150,6 @@ public static void RegisterPlugins(IServiceCollection services, IConfiguration c
         var loader = new PluginLoader(services, config, pluginSettings);
         loader.Load(assembly =>
         {
-            // Register routing handlers
-            var handlers = assembly.GetTypes()
-                .Where(x => x.IsClass)
-                .Where(x => x.GetInterface(nameof(IRoutingHandler)) != null)
-                .ToArray();
-
-            foreach (var handler in handlers)
-            {
-                services.AddScoped(typeof(IRoutingHandler), handler);
-            }
-
             // Register function callback
             var functions = assembly.GetTypes()
                 .Where(x => x.IsClass

src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs

@@ -38,17 +38,6 @@ public async Task<bool> SendMessage(string agentId,
         var routing = _services.GetRequiredService<IRoutingService>();
         routing.Context.SetMessageId(_conversationId, message.MessageId);
 
-        // Check the routing mode
-        var states = _services.GetRequiredService<IConversationStateService>();
-        var routingMode = states.GetState(StateConst.ROUTING_MODE, "hard");
-        routing.Context.Push(agent.Id, reason: "request started", updateLazyRouting: false);
-
-        if (routingMode == "lazy")
-        {
-            message.CurrentAgentId = states.GetState(StateConst.LAZY_ROUTING_AGENT_ID, message.CurrentAgentId);
-            routing.Context.Push(message.CurrentAgentId, reason: "lazy routing", updateLazyRouting: false);
-        }
-
         // Save payload in order to assign the payload before hook is invoked
         if (replyMessage != null && !string.IsNullOrEmpty(replyMessage.Payload))
         {
@@ -91,11 +80,22 @@ public async Task<bool> SendMessage(string agentId,
 
             if (agent.Type == AgentType.Routing)
             {
-                response = await routing.InstructLoop(message, dialogs);
+                // Check the routing mode
+                var states = _services.GetRequiredService<IConversationStateService>();
+                var routingMode = states.GetState(StateConst.ROUTING_MODE, "eager");
+                routing.Context.Push(agent.Id, reason: "request started", updateLazyRouting: false);
+
+                if (routingMode == "lazy")
+                {
+                    message.CurrentAgentId = states.GetState(StateConst.LAZY_ROUTING_AGENT_ID, message.CurrentAgentId);
+                    routing.Context.Push(message.CurrentAgentId, reason: "lazy routing", updateLazyRouting: false);
+                }
+
+                response = await routing.InstructLoop(agent, message, dialogs);
             }
             else
             {
-                response = await routing.InstructDirect(agent, message);
+                response = await routing.InstructDirect(agent, message, dialogs);
             }
 
             routing.Context.ResetRecursiveCounter();
@@ -155,14 +155,6 @@ response.RichContent is RichContent<IRichMessage> template &&
             var conversation = _services.GetRequiredService<IConversationService>();
             var updatedConversation = await conversation.UpdateConversationTitle(_conversationId, response.Instruction.NextActionReason);
 
-            // Emit conversation task completed hook
-            if (response.Instruction.TaskCompleted)
-            {
-                await HookEmitter.Emit<IConversationHook>(_services, async hook =>
-                    await hook.OnTaskCompleted(response)
-                );
-            }
-
             // Emit conversation ending hook
             if (response.Instruction.ConversationEnd)
             {

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs

@@ -20,8 +20,8 @@ public ResponseToUserFn(IServiceProvider services, IRoutingContext context)
 
     public Task<bool> Execute(RoleDialogModel message)
     {
-        var args = JsonSerializer.Deserialize<RoutingArgs>(message.FunctionArgs);
-        message.Content = args.Response;
+        var args = JsonSerializer.Deserialize<ResponseUserArgs>(message.FunctionArgs);
+        message.Content = args.Content;
         message.Handled = true;
         message.StopCompletion = true;
         return Task.FromResult(true);