From cee91acaaad512c268db6c8b59d71f6e481d3b80 Mon Sep 17 00:00:00 2001
From: Haiping Chen <101423@smsassist.com>
Date: Thu, 26 Oct 2023 20:23:06 -0500
Subject: [PATCH] Fix OriginAgentId

---
 .../BotSharp.Abstraction/Routing/Models/RoutingContext.cs    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs b/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs
index 49b38274c..b24c7941b 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs
@@ -18,8 +18,11 @@ public RoutingContext(RoutingSettings setting)
     /// </summary>
     public string IntentName { get; set; }
 
+    /// <summary>
+    /// Agent that can handl user original goal.
+    /// </summary>
     public string OriginAgentId
-        => _stack.Last();
+        => _stack.Where(x => x != _setting.RouterId).Last();
 
     public string GetCurrentAgentId()
     {