From d68fe04d5eb7e2deebb0dbe63e5b767ad63f9fab Mon Sep 17 00:00:00 2001
From: Henry <hzj94@hotmail.com>
Date: Sat, 31 May 2025 16:58:40 +0100
Subject: [PATCH] fix custom tool not selected

---
 packages/components/nodes/agentflow/Tool/Tool.ts   | 10 +++++-----
 .../marketplaces/agentflowsv2/Slack Agent.json     | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/components/nodes/agentflow/Tool/Tool.ts b/packages/components/nodes/agentflow/Tool/Tool.ts
index c3945ff3e..f2ab96e75 100644
--- a/packages/components/nodes/agentflow/Tool/Tool.ts
+++ b/packages/components/nodes/agentflow/Tool/Tool.ts
@@ -28,7 +28,7 @@ class Tool_Agentflow implements INode {
     constructor() {
         this.label = 'Tool'
         this.name = 'toolAgentflow'
-        this.version = 1.0
+        this.version = 1.1
         this.type = 'Tool'
         this.category = 'Agent Flows'
         this.description = 'Tools allow LLM to interact with external systems'
@@ -37,7 +37,7 @@ class Tool_Agentflow implements INode {
         this.inputs = [
             {
                 label: 'Tool',
-                name: 'selectedTool',
+                name: 'toolAgentflowSelectedTool',
                 type: 'asyncOptions',
                 loadMethod: 'listTools',
                 loadConfig: true
@@ -64,7 +64,7 @@ class Tool_Agentflow implements INode {
                     }
                 ],
                 show: {
-                    selectedTool: '.+'
+                    toolAgentflowSelectedTool: '.+'
                 }
             },
             {
@@ -124,7 +124,7 @@ class Tool_Agentflow implements INode {
         },
         async listToolInputArgs(nodeData: INodeData, options: ICommonObject): Promise<INodeOptionsValue[]> {
             const currentNode = options.currentNode as ICommonObject
-            const selectedTool = currentNode?.inputs?.selectedTool as string
+            const selectedTool = (currentNode?.inputs?.selectedTool as string) || (currentNode?.inputs?.toolAgentflowSelectedTool as string)
             const selectedToolConfig = currentNode?.inputs?.selectedToolConfig as ICommonObject
 
             const nodeInstanceFilePath = options.componentNodes[selectedTool].filePath as string
@@ -183,7 +183,7 @@ class Tool_Agentflow implements INode {
     }
 
     async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<any> {
-        const selectedTool = nodeData.inputs?.selectedTool as string
+        const selectedTool = (nodeData.inputs?.selectedTool as string) || (nodeData.inputs?.toolAgentflowSelectedTool as string)
         const selectedToolConfig = nodeData.inputs?.selectedToolConfig as ICommonObject
 
         const toolInputArgs = nodeData.inputs?.toolInputArgs as IToolInputArgs[]
diff --git a/packages/server/marketplaces/agentflowsv2/Slack Agent.json b/packages/server/marketplaces/agentflowsv2/Slack Agent.json
index ec95fb4b9..a36876f8b 100644
--- a/packages/server/marketplaces/agentflowsv2/Slack Agent.json	
+++ b/packages/server/marketplaces/agentflowsv2/Slack Agent.json	
@@ -526,7 +526,7 @@
             "data": {
                 "id": "toolAgentflow_0",
                 "label": "Slack Reply",
-                "version": 1,
+                "version": 1.1,
                 "name": "toolAgentflow",
                 "type": "Tool",
                 "color": "#d4a373",
@@ -536,11 +536,11 @@
                 "inputParams": [
                     {
                         "label": "Tool",
-                        "name": "selectedTool",
+                        "name": "toolAgentflowSelectedTool",
                         "type": "asyncOptions",
                         "loadMethod": "listTools",
                         "loadConfig": true,
-                        "id": "toolAgentflow_0-input-selectedTool-asyncOptions",
+                        "id": "toolAgentflow_0-input-toolAgentflowSelectedTool-asyncOptions",
                         "display": true
                     },
                     {
@@ -565,7 +565,7 @@
                             }
                         ],
                         "show": {
-                            "selectedTool": ".+"
+                            "toolAgentflowSelectedTool": ".+"
                         },
                         "id": "toolAgentflow_0-input-toolInputArgs-array",
                         "display": true
@@ -599,7 +599,7 @@
                 ],
                 "inputAnchors": [],
                 "inputs": {
-                    "selectedTool": "slackMCP",
+                    "toolAgentflowSelectedTool": "slackMCP",
                     "toolInputArgs": [
                         {
                             "inputArgName": "channel_id",
@@ -611,9 +611,9 @@
                         }
                     ],
                     "toolUpdateState": "",
-                    "selectedToolConfig": {
+                    "toolAgentflowSelectedToolConfig": {
                         "mcpActions": "[\"slack_post_message\"]",
-                        "selectedTool": "slackMCP"
+                        "toolAgentflowSelectedTool": "slackMCP"
                     }
                 },
                 "outputAnchors": [