From b9d896ed2eebf9361d4e420a4267f3add2ac0d86 Mon Sep 17 00:00:00 2001
From: Henry <hzj94@hotmail.com>
Date: Tue, 24 Jun 2025 16:59:12 +0100
Subject: [PATCH] Refactor: Remove humanInput parameter from
 determineNodesToIgnore function

- Updated the determineNodesToIgnore function to eliminate the humanInput parameter, simplifying the logic for decision nodes.
- Adjusted related function calls to ensure compatibility with the new signature.
- Enhanced handling of humanInput within the executeNode function, ensuring it is cleared after consumption to prevent unintended behavior in subsequent nodes.
---
 packages/server/src/utils/buildAgentflow.ts | 22 +++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/utils/buildAgentflow.ts b/packages/server/src/utils/buildAgentflow.ts
index b8ab88e26..632017842 100644
--- a/packages/server/src/utils/buildAgentflow.ts
+++ b/packages/server/src/utils/buildAgentflow.ts
@@ -558,7 +558,6 @@ function hasReceivedRequiredInputs(waitingNode: IWaitingNode): boolean {
 async function determineNodesToIgnore(
     currentNode: IReactFlowNode,
     result: any,
-    humanInput: IHumanInput | undefined,
     edges: IReactFlowEdge[],
     nodeId: string
 ): Promise<string[]> {
@@ -568,7 +567,7 @@ async function determineNodesToIgnore(
     const isDecisionNode =
         currentNode.data.name === 'conditionAgentflow' ||
         currentNode.data.name === 'conditionAgentAgentflow' ||
-        (currentNode.data.name === 'humanInputAgentflow' && humanInput)
+        currentNode.data.name === 'humanInputAgentflow'
 
     if (isDecisionNode && result.output?.conditions) {
         const outputConditions: ICondition[] = result.output.conditions
@@ -619,7 +618,7 @@ async function processNodeOutputs({
     if (!currentNode) return { humanInput: updatedHumanInput }
 
     // Get nodes to ignore based on conditions
-    const ignoreNodeIds = await determineNodesToIgnore(currentNode, result, humanInput, edges, nodeId)
+    const ignoreNodeIds = await determineNodesToIgnore(currentNode, result, edges, nodeId)
     if (ignoreNodeIds.length) {
         logger.debug(`  ⏭️  Skipping nodes: [${ignoreNodeIds.join(', ')}]`)
     }
@@ -838,6 +837,7 @@ const executeNode = async ({
     result: any
     shouldStop?: boolean
     agentFlowExecutedData?: IAgentflowExecutedData[]
+    humanInput?: IHumanInput
 }> => {
     try {
         if (abortController?.signal?.aborted) {
@@ -910,6 +910,7 @@ const executeNode = async ({
 
         // Handle human input if present
         let humanInputAction: Record<string, any> | undefined
+        let updatedHumanInput = humanInput
 
         if (agentFlowExecutedData.length) {
             const lastNodeOutput = agentFlowExecutedData[agentFlowExecutedData.length - 1]?.data?.output as ICommonObject | undefined
@@ -921,6 +922,10 @@ const executeNode = async ({
             reactFlowNodeData.inputs = { ...reactFlowNodeData.inputs, humanInput }
             // Remove the stopped humanInput from execution data
             agentFlowExecutedData = agentFlowExecutedData.filter((execData) => execData.nodeId !== nodeId)
+
+            // Clear humanInput after it's been consumed to prevent subsequent humanInputAgentflow nodes from proceeding
+            logger.debug(`🧹 Clearing humanInput after consumption by node: ${nodeId}`)
+            updatedHumanInput = undefined
         }
 
         // Check if this is the last node for streaming purpose
@@ -1165,7 +1170,7 @@ const executeNode = async ({
 
             sseStreamer?.streamActionEvent(chatId, humanInputAction)
 
-            return { result: results, shouldStop: true, agentFlowExecutedData }
+            return { result: results, shouldStop: true, agentFlowExecutedData, humanInput: updatedHumanInput }
         }
 
         // Stop going through the current route if the node is a agent node waiting for human input before using the tool
@@ -1212,10 +1217,10 @@ const executeNode = async ({
 
             sseStreamer?.streamActionEvent(chatId, humanInputAction)
 
-            return { result: results, shouldStop: true, agentFlowExecutedData }
+            return { result: results, shouldStop: true, agentFlowExecutedData, humanInput: updatedHumanInput }
         }
 
-        return { result: results, agentFlowExecutedData }
+        return { result: results, agentFlowExecutedData, humanInput: updatedHumanInput }
     } catch (error) {
         logger.error(`[server]: Error executing node ${nodeId}: ${getErrorMessage(error)}`)
         throw error
@@ -1695,6 +1700,11 @@ export const executeAgentFlow = async ({
                 agentFlowExecutedData = executionResult.agentFlowExecutedData
             }
 
+            // Update humanInput if it was cleared by the executed node
+            if (executionResult.humanInput !== currentHumanInput) {
+                currentHumanInput = executionResult.humanInput
+            }
+
             if (executionResult.shouldStop) {
                 status = 'STOPPED'
                 break