fix(be): avoid using node_data.version for judgement tool node version

api/core/workflow/nodes/agent/agent_node.py

@@ -249,7 +249,15 @@ class AgentNode(ToolNode):
                         )
 
                         extra = tool.get("extra", {})
-                        runtime_variable_pool = variable_pool if self.node_data.version != "1" else None
+                        node_data = cast(AgentNodeData, self.node_data)
+
+                        # This is an issue that caused problems before.
+                        # Logically, we shouldn't use the node_data.version field for judgment
+                        # But for backward compatibility with historical data
+                        # this version field judgment is still preserved here.
+                        runtime_variable_pool = (
+                            variable_pool if node_data.version != "1" or node_data.tool_node_version != "1" else None
+                        )
                         tool_runtime = ToolManager.get_agent_tool_runtime(
                             self.tenant_id, self.app_id, entity, self.invoke_from, runtime_variable_pool
                         )

api/core/workflow/nodes/agent/entities.py

@@ -13,6 +13,7 @@ class AgentNodeData(BaseNodeData):
     agent_strategy_name: str
     agent_strategy_label: str  # redundancy
     memory: MemoryConfig | None = None
+    tool_node_version: str | None = None
 
     class AgentInput(BaseModel):
         value: Union[list[str], list[ToolSelector], Any]

api/core/workflow/nodes/node_mapping.py

@@ -73,7 +73,6 @@ NODE_TYPE_CLASSES_MAPPING: Mapping[NodeType, Mapping[str, type[BaseNode]]] = {
     },
     NodeType.TOOL: {
         LATEST_VERSION: ToolNode,
-        "2": ToolNode,
         "1": ToolNode,
     },
     NodeType.VARIABLE_AGGREGATOR: {
@@ -123,7 +122,6 @@ NODE_TYPE_CLASSES_MAPPING: Mapping[NodeType, Mapping[str, type[BaseNode]]] = {
     },
     NodeType.AGENT: {
         LATEST_VERSION: AgentNode,
-        "2": AgentNode,
         "1": AgentNode,
     },
 }

api/core/workflow/nodes/tool/entities.py

@@ -58,6 +58,7 @@ class ToolNodeData(BaseNodeData, ToolEntity):
             return typ
 
     tool_parameters: dict[str, ToolInput]
+    tool_node_version: str | None = None
 
     @field_validator("tool_parameters", mode="before")
     @classmethod

api/core/workflow/nodes/tool/tool_node.py

@@ -67,7 +67,15 @@ class ToolNode(BaseNode[ToolNodeData]):
         try:
             from core.tools.tool_manager import ToolManager
 
-            variable_pool = self.graph_runtime_state.variable_pool if self.node_data.version != "1" else None
+            # This is an issue that caused problems before.
+            # Logically, we shouldn't use the node_data.version field for judgment
+            # But for backward compatibility with historical data
+            # this version field judgment is still preserved here.
+            variable_pool = (
+                self.graph_runtime_state.variable_pool
+                if self.node_data.version != "1" or self.node_data.tool_node_version != "1"
+                else None
+            )
             tool_runtime = ToolManager.get_workflow_tool_runtime(
                 self.tenant_id, self.app_id, self.node_id, self.node_data, self.invoke_from, variable_pool
             )