@@ -21,6 +21,9 @@ Task BeforeCompletion();
 Task OnFunctionExecuting(RoleDialogModel message);
 Task OnFunctionExecuted(RoleDialogModel message);
 Task AfterCompletion(RoleDialogModel message);
+
+// LLM detected the user's intention to end the conversation
+Task ConversationEnding(RoleDialogModel conversation);
 ```
 More information about conversation hook please go to [Conversation Hook](../conversation/hook.md).
 
 
@@ -61,4 +61,9 @@ public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)
         _dialogs = dialogs;
         return Task.CompletedTask;
     }
+
+    public virtual Task ConversationEnding(RoleDialogModel message)
+    {
+        return Task.CompletedTask;
+    }
 }
@@ -24,4 +24,6 @@ public interface IConversationHook
     Task OnFunctionExecuting(RoleDialogModel message);
     Task OnFunctionExecuted(RoleDialogModel message);
     Task AfterCompletion(RoleDialogModel message);
+
+    Task ConversationEnding(RoleDialogModel conversation);
 }
@@ -6,10 +6,6 @@ public partial class ConversationService
 {
     public async Task CallFunctions(RoleDialogModel msg)
     {
-        var hooks = _services.GetServices<IConversationHook>()
-            .OrderBy(x => x.Priority)
-            .ToList();
-
         // Invoke functions
         var functions = _services.GetServices<IFunctionCallback>()
             .Where(x => x.Name == msg.FunctionName)
@@ -22,6 +18,10 @@ public async Task CallFunctions(RoleDialogModel msg)
             return;
         }
 
+        var hooks = _services.GetServices<IConversationHook>()
+            .OrderBy(x => x.Priority)
+            .ToList();
+
         foreach (var fn in functions)
         {
             // Before executing functions
 
@@ -25,6 +25,16 @@ public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallF
             FunctionName = inst.Function,
             ExecutionData = inst
         };
+
+        var hooks = _services.GetServices<IConversationHook>()
+            .OrderBy(x => x.Priority)
+            .ToList();
+
+        foreach (var hook in hooks)
+        {
+            await hook.OnFunctionExecuting(result);
+        }
+
         return result;
     }
 }
@@ -29,12 +29,7 @@ public async Task<AgentViewModel> GetAgent([FromRoute] string id)
     public async Task<List<AgentViewModel>> GetAgents()
     {
         var agents = await _agentService.GetAgents();
-
-        // Add the router as agent
-        var routing = _services.GetRequiredService<IRouterInstance>();
-        agents.Insert(0, routing.Load().Router);
-
-        return agents.Select(x => AgentViewModel.FromAgent(x)).ToList();
+         return agents.Select(x => AgentViewModel.FromAgent(x)).ToList();
     }
 
     [HttpPost("/agent")]
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,9 @@ public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)`
`61`	`61`	`_dialogs = dialogs;`
`62`	`62`	`return Task.CompletedTask;`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+ public virtual Task ConversationEnding(RoleDialogModel message)`
	`66`	`+ {`
	`67`	`+ return Task.CompletedTask;`
	`68`	`+ }`
`64`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@ public interface IConversationHook`
`24`	`24`	`Task OnFunctionExecuting(RoleDialogModel message);`
`25`	`25`	`Task OnFunctionExecuted(RoleDialogModel message);`
`26`	`26`	`Task AfterCompletion(RoleDialogModel message);`
	`27`	`+`
	`28`	`+ Task ConversationEnding(RoleDialogModel conversation);`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,6 @@ public partial class ConversationService`
`6`	`6`	`{`
`7`	`7`	`public async Task CallFunctions(RoleDialogModel msg)`
`8`	`8`	`{`
`9`		`- var hooks = _services.GetServices<IConversationHook>()`
`10`		`- .OrderBy(x => x.Priority)`
`11`		`- .ToList();`
`12`		`-`
`13`	`9`	`// Invoke functions`
`14`	`10`	`var functions = _services.GetServices<IFunctionCallback>()`
`15`	`11`	`.Where(x => x.Name == msg.FunctionName)`
`@@ -22,6 +18,10 @@ public async Task CallFunctions(RoleDialogModel msg)`
`22`	`18`	`return;`
`23`	`19`	`}`
`24`	`20`
	`21`	`+ var hooks = _services.GetServices<IConversationHook>()`
	`22`	`+ .OrderBy(x => x.Priority)`
	`23`	`+ .ToList();`
	`24`	`+`
`25`	`25`	`foreach (var fn in functions)`
`26`	`26`	`{`
`27`	`27`	`// Before executing functions`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,7 @@ public async Task<AgentViewModel> GetAgent([FromRoute] string id)`
`29`	`29`	`public async Task<List<AgentViewModel>> GetAgents()`
`30`	`30`	`{`
`31`	`31`	`var agents = await _agentService.GetAgents();`
`32`		`-`
`33`		`- // Add the router as agent`
`34`		`- var routing = _services.GetRequiredService<IRouterInstance>();`
`35`		`- agents.Insert(0, routing.Load().Router);`
`36`		`-`
`37`		`- return agents.Select(x => AgentViewModel.FromAgent(x)).ToList();`
	`32`	`+ return agents.Select(x => AgentViewModel.FromAgent(x)).ToList();`
`38`	`33`	`}`
`39`	`34`
`40`	`35`	`[HttpPost("/agent")]`