add incoming edge

Jicheng Lu · Jicheng Lu · commit 17beef29a476 · 2026-03-18T11:59:29.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/Rules/Hooks/IRuleTriggerHook.cs b/src/Infrastructure/BotSharp.Abstraction/Rules/Hooks/IRuleTriggerHook.cs
@@ -5,9 +5,9 @@ namespace BotSharp.Abstraction.Rules.Hooks;
 
 public interface IRuleTriggerHook : IHookBase
 {
-    Task BeforeRuleConditionExecuting(Agent agent, RuleNode conditionNode, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;
-    Task AfterRuleConditionExecuted(Agent agent, RuleNode conditionNode, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;
+    Task BeforeRuleConditionExecuting(Agent agent, RuleNode conditionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;
+    Task AfterRuleConditionExecuted(Agent agent, RuleNode conditionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;
 
-    Task BeforeRuleActionExecuting(Agent agent, RuleNode actionNode, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;
-    Task AfterRuleActionExecuted(Agent agent, RuleNode actionNode, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;
+    Task BeforeRuleActionExecuting(Agent agent, RuleNode actionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;
+    Task AfterRuleActionExecuted(Agent agent, RuleNode actionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;
 }
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Conditions/LoopingCondition.cs b/src/Infrastructure/BotSharp.Core.Rules/Conditions/LoopingCondition.cs
@@ -158,6 +158,7 @@ private void CleanLoopState(RuleFlowContext context)
         context.Parameters?.Remove(PARAM_ITERATE_INDEX);
         context.Parameters?.Remove(PARAM_ITERATE_ITEM_KEY);
         context.Parameters?.Remove(PARAM_ITERATE_NEXT_ITEM);
+        context.Parameters?.Remove(PARAM_LIST_ITEMS_KEY);
 
         if (!string.IsNullOrEmpty(itemKey))
         {
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs b/src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs
@@ -228,7 +228,7 @@ private async Task ExecuteGraphNodeDfs(
             if (RuleConstant.CONDITION_NODE_TYPES.Contains(nextNode.Type))
             {
                 // Execute condition node
-                var conditionResult = await ExecuteCondition(nextNode, graph, agent, trigger, context);
+                var conditionResult = await ExecuteCondition(nextNode, edge, graph, agent, trigger, context);
                 if (conditionResult == null)
                 {
                     results.Add(RuleFlowStepResult.FromResult(new()
@@ -255,7 +255,7 @@ private async Task ExecuteGraphNodeDfs(
             else if (RuleConstant.ACTION_NODE_TYPES.Contains(nextNode.Type))
             {
                 // Execute action node
-                var actionResult = await ExecuteAction(nextNode, graph, agent, trigger, context);
+                var actionResult = await ExecuteAction(nextNode, edge, graph, agent, trigger, context);
                 if (actionResult == null)
                 {
                     results.Add(RuleFlowStepResult.FromResult(new()
@@ -337,7 +337,7 @@ private async Task ExecuteGraphNodeBfs(
             if (RuleConstant.CONDITION_NODE_TYPES.Contains(nextNode.Type))
             {
                 // Execute condition node
-                var conditionResult = await ExecuteCondition(nextNode, graph, agent, trigger, context);
+                var conditionResult = await ExecuteCondition(nextNode, nextEdge, graph, agent, trigger, context);
                 innerData = new(context.Parameters ?? []);
 
                 if (conditionResult == null)
@@ -369,7 +369,7 @@ private async Task ExecuteGraphNodeBfs(
             else if (RuleConstant.ACTION_NODE_TYPES.Contains(nextNode.Type))
             {
                 // Execute action node
-                var actionResult = await ExecuteAction(nextNode, graph, agent, trigger, context);
+                var actionResult = await ExecuteAction(nextNode, nextEdge, graph, agent, trigger, context);
                 innerData = new(context.Parameters ?? []);
 
                 if (actionResult == null)
@@ -413,6 +413,7 @@ private async Task ExecuteGraphNodeBfs(
     #region Action
     private async Task<RuleNodeResult?> ExecuteAction(
         RuleNode node,
+        RuleEdge incomingEdge,
         RuleGraph graph,
         Agent agent,
         IRuleTrigger trigger,
@@ -435,7 +436,7 @@ private async Task ExecuteGraphNodeBfs(
             var hooks = _services.GetHooks<IRuleTriggerHook>(agent.Id);
             foreach (var hook in hooks)
             {
-                await hook.BeforeRuleActionExecuting(agent, node, trigger, context);
+                await hook.BeforeRuleActionExecuting(agent, node, incomingEdge, trigger, context);
             }
 
             // Execute action
@@ -444,7 +445,7 @@ private async Task ExecuteGraphNodeBfs(
 
             foreach (var hook in hooks)
             {
-                await hook.AfterRuleActionExecuted(agent, node, trigger, context, result);
+                await hook.AfterRuleActionExecuted(agent, node, incomingEdge, trigger, context, result);
             }
 
             return result;
@@ -499,6 +500,7 @@ private async Task ExecuteGraphNodeBfs(
     #region Condition
     private async Task<RuleNodeResult?> ExecuteCondition(
         RuleNode node,
+        RuleEdge incomingEdge,
         RuleGraph graph,
         Agent agent,
         IRuleTrigger trigger,
@@ -521,7 +523,7 @@ private async Task ExecuteGraphNodeBfs(
             var hooks = _services.GetHooks<IRuleTriggerHook>(agent.Id);
             foreach (var hook in hooks)
             {
-                await hook.BeforeRuleConditionExecuting(agent, node, trigger, context);
+                await hook.BeforeRuleConditionExecuting(agent, node, incomingEdge, trigger, context);
             }
 
             // Execute condition
@@ -530,7 +532,7 @@ private async Task ExecuteGraphNodeBfs(
 
             foreach (var hook in hooks)
             {
-                await hook.AfterRuleConditionExecuted(agent, node, trigger, context, result);
+                await hook.AfterRuleConditionExecuted(agent, node, incomingEdge, trigger, context, result);
             }
 
             return result;

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ namespace BotSharp.Abstraction.Rules.Hooks;`
`5`	`5`
`6`	`6`	`public interface IRuleTriggerHook : IHookBase`
`7`	`7`	`{`
`8`		`- Task BeforeRuleConditionExecuting(Agent agent, RuleNode conditionNode, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;`
`9`		`- Task AfterRuleConditionExecuted(Agent agent, RuleNode conditionNode, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;`
	`8`	`+ Task BeforeRuleConditionExecuting(Agent agent, RuleNode conditionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;`
	`9`	`+ Task AfterRuleConditionExecuted(Agent agent, RuleNode conditionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;`
`10`	`10`
`11`		`- Task BeforeRuleActionExecuting(Agent agent, RuleNode actionNode, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;`
`12`		`- Task AfterRuleActionExecuted(Agent agent, RuleNode actionNode, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;`
	`11`	`+ Task BeforeRuleActionExecuting(Agent agent, RuleNode actionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context) => Task.CompletedTask;`
	`12`	`+ Task AfterRuleActionExecuted(Agent agent, RuleNode actionNode, RuleEdge incomingEdge, IRuleTrigger trigger, RuleFlowContext context, RuleNodeResult result) => Task.CompletedTask;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ private void CleanLoopState(RuleFlowContext context)`
`158`	`158`	`context.Parameters?.Remove(PARAM_ITERATE_INDEX);`
`159`	`159`	`context.Parameters?.Remove(PARAM_ITERATE_ITEM_KEY);`
`160`	`160`	`context.Parameters?.Remove(PARAM_ITERATE_NEXT_ITEM);`
	`161`	`+ context.Parameters?.Remove(PARAM_LIST_ITEMS_KEY);`
`161`	`162`
`162`	`163`	`if (!string.IsNullOrEmpty(itemKey))`
`163`	`164`	`{`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ private async Task ExecuteGraphNodeDfs(`
`228`	`228`	`if (RuleConstant.CONDITION_NODE_TYPES.Contains(nextNode.Type))`
`229`	`229`	`{`
`230`	`230`	`// Execute condition node`
`231`		`- var conditionResult = await ExecuteCondition(nextNode, graph, agent, trigger, context);`
	`231`	`+ var conditionResult = await ExecuteCondition(nextNode, edge, graph, agent, trigger, context);`
`232`	`232`	`if (conditionResult == null)`
`233`	`233`	`{`
`234`	`234`	`results.Add(RuleFlowStepResult.FromResult(new()`
`@@ -255,7 +255,7 @@ private async Task ExecuteGraphNodeDfs(`
`255`	`255`	`else if (RuleConstant.ACTION_NODE_TYPES.Contains(nextNode.Type))`
`256`	`256`	`{`
`257`	`257`	`// Execute action node`
`258`		`- var actionResult = await ExecuteAction(nextNode, graph, agent, trigger, context);`
	`258`	`+ var actionResult = await ExecuteAction(nextNode, edge, graph, agent, trigger, context);`
`259`	`259`	`if (actionResult == null)`
`260`	`260`	`{`
`261`	`261`	`results.Add(RuleFlowStepResult.FromResult(new()`
`@@ -337,7 +337,7 @@ private async Task ExecuteGraphNodeBfs(`
`337`	`337`	`if (RuleConstant.CONDITION_NODE_TYPES.Contains(nextNode.Type))`
`338`	`338`	`{`
`339`	`339`	`// Execute condition node`
`340`		`- var conditionResult = await ExecuteCondition(nextNode, graph, agent, trigger, context);`
	`340`	`+ var conditionResult = await ExecuteCondition(nextNode, nextEdge, graph, agent, trigger, context);`
`341`	`341`	`innerData = new(context.Parameters ?? []);`
`342`	`342`
`343`	`343`	`if (conditionResult == null)`
`@@ -369,7 +369,7 @@ private async Task ExecuteGraphNodeBfs(`
`369`	`369`	`else if (RuleConstant.ACTION_NODE_TYPES.Contains(nextNode.Type))`
`370`	`370`	`{`
`371`	`371`	`// Execute action node`
`372`		`- var actionResult = await ExecuteAction(nextNode, graph, agent, trigger, context);`
	`372`	`+ var actionResult = await ExecuteAction(nextNode, nextEdge, graph, agent, trigger, context);`
`373`	`373`	`innerData = new(context.Parameters ?? []);`
`374`	`374`
`375`	`375`	`if (actionResult == null)`
`@@ -413,6 +413,7 @@ private async Task ExecuteGraphNodeBfs(`
`413`	`413`	`#region Action`
`414`	`414`	`private async Task<RuleNodeResult?> ExecuteAction(`
`415`	`415`	`RuleNode node,`
	`416`	`+ RuleEdge incomingEdge,`
`416`	`417`	`RuleGraph graph,`
`417`	`418`	`Agent agent,`
`418`	`419`	`IRuleTrigger trigger,`
`@@ -435,7 +436,7 @@ private async Task ExecuteGraphNodeBfs(`
`435`	`436`	`var hooks = _services.GetHooks<IRuleTriggerHook>(agent.Id);`
`436`	`437`	`foreach (var hook in hooks)`
`437`	`438`	`{`
`438`		`- await hook.BeforeRuleActionExecuting(agent, node, trigger, context);`
	`439`	`+ await hook.BeforeRuleActionExecuting(agent, node, incomingEdge, trigger, context);`
`439`	`440`	`}`
`440`	`441`
`441`	`442`	`// Execute action`
`@@ -444,7 +445,7 @@ private async Task ExecuteGraphNodeBfs(`
`444`	`445`
`445`	`446`	`foreach (var hook in hooks)`
`446`	`447`	`{`
`447`		`- await hook.AfterRuleActionExecuted(agent, node, trigger, context, result);`
	`448`	`+ await hook.AfterRuleActionExecuted(agent, node, incomingEdge, trigger, context, result);`
`448`	`449`	`}`
`449`	`450`
`450`	`451`	`return result;`
`@@ -499,6 +500,7 @@ private async Task ExecuteGraphNodeBfs(`
`499`	`500`	`#region Condition`
`500`	`501`	`private async Task<RuleNodeResult?> ExecuteCondition(`
`501`	`502`	`RuleNode node,`
	`503`	`+ RuleEdge incomingEdge,`
`502`	`504`	`RuleGraph graph,`
`503`	`505`	`Agent agent,`
`504`	`506`	`IRuleTrigger trigger,`
`@@ -521,7 +523,7 @@ private async Task ExecuteGraphNodeBfs(`
`521`	`523`	`var hooks = _services.GetHooks<IRuleTriggerHook>(agent.Id);`
`522`	`524`	`foreach (var hook in hooks)`
`523`	`525`	`{`
`524`		`- await hook.BeforeRuleConditionExecuting(agent, node, trigger, context);`
	`526`	`+ await hook.BeforeRuleConditionExecuting(agent, node, incomingEdge, trigger, context);`
`525`	`527`	`}`
`526`	`528`
`527`	`529`	`// Execute condition`
`@@ -530,7 +532,7 @@ private async Task ExecuteGraphNodeBfs(`
`530`	`532`
`531`	`533`	`foreach (var hook in hooks)`
`532`	`534`	`{`
`533`		`- await hook.AfterRuleConditionExecuted(agent, node, trigger, context, result);`
	`535`	`+ await hook.AfterRuleConditionExecuted(agent, node, incomingEdge, trigger, context, result);`
`534`	`536`	`}`
`535`	`537`
`536`	`538`	`return result;`