From 22f70dd488f57d7331192226a590672a1306d568 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 3 Sep 2025 10:56:31 +0800
Subject: [PATCH] fix: add conditional rendering for mcp_tool_id and update
 mcp_source assignment logic

---
 ui/src/workflow/nodes/ai-chat-node/index.vue | 4 +++-
 ui/src/workflow/nodes/mcp-node/index.vue     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/workflow/nodes/ai-chat-node/index.vue b/ui/src/workflow/nodes/ai-chat-node/index.vue
index 2b8e23509..46aee2ffd 100644
--- a/ui/src/workflow/nodes/ai-chat-node/index.vue
+++ b/ui/src/workflow/nodes/ai-chat-node/index.vue
@@ -137,7 +137,9 @@
             chat_data.mcp_tool_id || (chat_data.mcp_servers && chat_data.mcp_servers.length > 0)
           "
         >
-          <div class="flex-between border border-r-6 white-bg mb-4" style="padding: 5px 8px">
+          <div class="flex-between border border-r-6 white-bg mb-4" style="padding: 5px 8px"
+            v-if="relatedObject(mcpToolSelectOptions, chat_data.mcp_tool_id, 'id')"
+          >
             <div class="flex align-center" style="line-height: 20px">
               <el-avatar
                 v-if="relatedObject(mcpToolSelectOptions, chat_data.mcp_tool_id, 'id')?.icon"
diff --git a/ui/src/workflow/nodes/mcp-node/index.vue b/ui/src/workflow/nodes/mcp-node/index.vue
index 60d6a3eea..4d093de93 100644
--- a/ui/src/workflow/nodes/mcp-node/index.vue
+++ b/ui/src/workflow/nodes/mcp-node/index.vue
@@ -531,7 +531,7 @@ onMounted(() => {
       set(props.nodeModel.properties.node_data, 'is_result', true)
     }
   }
-  if (props.nodeModel.properties.node_data.mcp_servers) {
+  if (props.nodeModel.properties.node_data.mcp_servers && !props.nodeModel.properties.node_data.mcp_source) {
     set(props.nodeModel.properties.node_data, 'mcp_source', 'custom')
   }
   getMcpToolSelectOptions()