From b3eca1b6648b3f83718c5b66cdd6b96c645266eb Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Thu, 5 Jun 2025 14:44:39 +0800
Subject: [PATCH] fix: can choose mcp tools

---
 .../account-setting/model-provider-page/model-modal/Form.tsx   | 3 +++
 .../workflow/nodes/_base/components/agent-strategy.tsx         | 2 ++
 web/app/components/workflow/nodes/agent/node.tsx               | 2 +-
 web/app/components/workflow/nodes/agent/panel.tsx              | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
index c5af4ed8a1..f1e3595d1e 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
@@ -54,6 +54,7 @@ type FormProps<
   nodeId?: string
   nodeOutputVars?: NodeOutPutVar[],
   availableNodes?: Node[],
+  canChooseMCPTool?: boolean
 }
 
 function Form<
@@ -79,6 +80,7 @@ function Form<
   nodeId,
   nodeOutputVars,
   availableNodes,
+  canChooseMCPTool,
 }: FormProps<CustomFormSchema>) {
   const language = useLanguage()
   const [changeKey, setChangeKey] = useState('')
@@ -377,6 +379,7 @@ function Form<
             value={value[variable] || []}
             onChange={item => handleFormChange(variable, item as any)}
             supportCollapse
+            canChooseMCPTool={canChooseMCPTool}
           />
           {fieldMoreInfo?.(formSchema)}
           {validating && changeKey === variable && <ValidatingTip />}
diff --git a/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx b/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
index b9d42558c1..e9e84000d7 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
@@ -63,6 +63,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
   const {
     setControlPromptEditorRerenderKey,
   } = workflowStore.getState()
+
   const override: ComponentProps<typeof Form<CustomField>>['override'] = [
     [FormTypeEnum.textNumber, FormTypeEnum.textInput],
     (schema, props) => {
@@ -220,6 +221,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
             nodeId={nodeId}
             nodeOutputVars={nodeOutputVars || []}
             availableNodes={availableNodes || []}
+            canChooseMCPTool={canChooseMCPTool}
           />
         </div>
         : <ListEmpty
diff --git a/web/app/components/workflow/nodes/agent/node.tsx b/web/app/components/workflow/nodes/agent/node.tsx
index 57ad2a0b81..1c1f99b22d 100644
--- a/web/app/components/workflow/nodes/agent/node.tsx
+++ b/web/app/components/workflow/nodes/agent/node.tsx
@@ -104,7 +104,7 @@ const AgentNode: FC<NodeProps<AgentNodeType>> = (props) => {
       {t('workflow.nodes.agent.toolbox')}
     </GroupLabel>}>
       <div className='grid grid-cols-10 gap-0.5'>
-        {tools.map(tool => <ToolIcon {...tool} key={tool.id} />)}
+        {tools.map((tool, i) => <ToolIcon {...tool} key={tool.id + i} />)}
       </div>
     </Group>}
   </div>
diff --git a/web/app/components/workflow/nodes/agent/panel.tsx b/web/app/components/workflow/nodes/agent/panel.tsx
index a213ffc24b..4dc2d40a03 100644
--- a/web/app/components/workflow/nodes/agent/panel.tsx
+++ b/web/app/components/workflow/nodes/agent/panel.tsx
@@ -114,6 +114,7 @@ const AgentPanel: FC<NodePanelProps<AgentNodeType>> = (props) => {
         nodeOutputVars={availableVars}
         availableNodes={availableNodesWithParent}
         nodeId={props.id}
+        canChooseMCPTool={canChooseMCPTool}
       />
     </Field>
     <div className='px-4 py-2'>