From b237113311ec4c8582695ddc8e732a42fdc6b433 Mon Sep 17 00:00:00 2001
From: wangsen3 <690275538@qq.com>
Date: Thu, 10 Jul 2025 09:18:50 +0800
Subject: [PATCH 01/39] Update clean_document_task.py (#22090)

---
 api/tasks/clean_document_task.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/tasks/clean_document_task.py b/api/tasks/clean_document_task.py
index 5824121e8f..c72a3319c1 100644
--- a/api/tasks/clean_document_task.py
+++ b/api/tasks/clean_document_task.py
@@ -72,6 +72,7 @@ def clean_document_task(document_id: str, dataset_id: str, doc_form: str, file_i
             DatasetMetadataBinding.dataset_id == dataset_id,
             DatasetMetadataBinding.document_id == document_id,
         ).delete()
+        db.session.commit()
 
         end_at = time.perf_counter()
         logging.info(

From 4403bc67a142d11fd302be5f48da5aa4526ed26c Mon Sep 17 00:00:00 2001
From: Heyang Wang <baikalwang@qq.com>
Date: Thu, 10 Jul 2025 09:20:02 +0800
Subject: [PATCH 02/39] fix(Drawer): add overflow hidden to ensure copy button
 is always clickable (#21992) (#22103)

Co-authored-by: wangheyang <wangheyang@corp.netease.com>
---
 web/app/components/base/chat/chat/question.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/components/base/chat/chat/question.tsx b/web/app/components/base/chat/chat/question.tsx
index 30077125f9..d221587940 100644
--- a/web/app/components/base/chat/chat/question.tsx
+++ b/web/app/components/base/chat/chat/question.tsx
@@ -98,7 +98,7 @@ const Question: FC<QuestionProps> = ({
 
   return (
     <div className='mb-2 flex justify-end last:mb-0'>
-      <div className={cn('group relative mr-4 flex max-w-full items-start pl-14', isEditing && 'flex-1')}>
+      <div className={cn('group relative mr-4 flex max-w-full items-start pl-14 overflow-x-hidden', isEditing && 'flex-1')}>
         <div className={cn('mr-2 gap-1', isEditing ? 'hidden' : 'flex')}>
           <div
             className="absolute hidden gap-0.5 rounded-[10px] border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg p-0.5 shadow-md backdrop-blur-sm group-hover:flex"

From 785c4caa67203d7b861c56ecc161bbc2ae18097e Mon Sep 17 00:00:00 2001
From: NFish <douxc512@gmail.com>
Date: Thu, 10 Jul 2025 09:58:48 +0800
Subject: [PATCH 03/39] fix: allow update plugin install settings (#22111)

---
 web/app/components/plugins/plugin-page/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/components/plugins/plugin-page/index.tsx b/web/app/components/plugins/plugin-page/index.tsx
index bf2d327d31..94fd3fee9b 100644
--- a/web/app/components/plugins/plugin-page/index.tsx
+++ b/web/app/components/plugins/plugin-page/index.tsx
@@ -136,7 +136,7 @@ const PluginPage = ({
   const options = usePluginPageContext(v => v.options)
   const activeTab = usePluginPageContext(v => v.activeTab)
   const setActiveTab = usePluginPageContext(v => v.setActiveTab)
-  const { enable_marketplace, branding } = useGlobalPublicStore(s => s.systemFeatures)
+  const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
 
   const isPluginsTab = useMemo(() => activeTab === PLUGIN_PAGE_TABS_MAP.plugins, [activeTab])
   const isExploringMarketplace = useMemo(() => {
@@ -225,7 +225,7 @@ const PluginPage = ({
               )
             }
             {
-              canSetPermissions && !branding.enabled && (
+              canSetPermissions && (
                 <Tooltip
                   popupContent={t('plugin.privilege.title')}
                 >

From 881a151d30ea118b0da3f358e6f27bda325d4b8f Mon Sep 17 00:00:00 2001
From: Jason Young <44939412+farion1231@users.noreply.github.com>
Date: Thu, 10 Jul 2025 10:01:15 +0800
Subject: [PATCH 04/39] test: add comprehensive unit tests for encrypter module
 (#22102)

---
 .../unit_tests/core/helper/test_encrypter.py  | 280 ++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 api/tests/unit_tests/core/helper/test_encrypter.py

diff --git a/api/tests/unit_tests/core/helper/test_encrypter.py b/api/tests/unit_tests/core/helper/test_encrypter.py
new file mode 100644
index 0000000000..61cf8f255d
--- /dev/null
+++ b/api/tests/unit_tests/core/helper/test_encrypter.py
@@ -0,0 +1,280 @@
+import base64
+import binascii
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from core.helper.encrypter import (
+    batch_decrypt_token,
+    decrypt_token,
+    encrypt_token,
+    get_decrypt_decoding,
+    obfuscated_token,
+)
+from libs.rsa import PrivkeyNotFoundError
+
+
+class TestObfuscatedToken:
+    @pytest.mark.parametrize(
+        ("token", "expected"),
+        [
+            ("", ""),  # Empty token
+            ("1234567", "*" * 20),  # Short token (<8 chars)
+            ("12345678", "*" * 20),  # Boundary case (8 chars)
+            ("123456789abcdef", "123456" + "*" * 12 + "ef"),  # Long token
+            ("abc!@#$%^&*()def", "abc!@#" + "*" * 12 + "ef"),  # Special chars
+        ],
+    )
+    def test_obfuscation_logic(self, token, expected):
+        """Test core obfuscation logic for various token lengths"""
+        assert obfuscated_token(token) == expected
+
+    def test_sensitive_data_protection(self):
+        """Ensure obfuscation never reveals full sensitive data"""
+        token = "api_key_secret_12345"
+        obfuscated = obfuscated_token(token)
+        assert token not in obfuscated
+        assert "*" * 12 in obfuscated
+
+
+class TestEncryptToken:
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    def test_successful_encryption(self, mock_encrypt, mock_query):
+        """Test successful token encryption"""
+        mock_tenant = MagicMock()
+        mock_tenant.encrypt_public_key = "mock_public_key"
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_encrypt.return_value = b"encrypted_data"
+
+        result = encrypt_token("tenant-123", "test_token")
+
+        assert result == base64.b64encode(b"encrypted_data").decode()
+        mock_encrypt.assert_called_with("test_token", "mock_public_key")
+
+    @patch("models.engine.db.session.query")
+    def test_tenant_not_found(self, mock_query):
+        """Test error when tenant doesn't exist"""
+        mock_query.return_value.filter.return_value.first.return_value = None
+
+        with pytest.raises(ValueError) as exc_info:
+            encrypt_token("invalid-tenant", "test_token")
+
+        assert "Tenant with id invalid-tenant not found" in str(exc_info.value)
+
+
+class TestDecryptToken:
+    @patch("libs.rsa.decrypt")
+    def test_successful_decryption(self, mock_decrypt):
+        """Test successful token decryption"""
+        mock_decrypt.return_value = "decrypted_token"
+        encrypted_data = base64.b64encode(b"encrypted_data").decode()
+
+        result = decrypt_token("tenant-123", encrypted_data)
+
+        assert result == "decrypted_token"
+        mock_decrypt.assert_called_once_with(b"encrypted_data", "tenant-123")
+
+    def test_invalid_base64(self):
+        """Test handling of invalid base64 input"""
+        with pytest.raises(binascii.Error):
+            decrypt_token("tenant-123", "invalid_base64!!!")
+
+
+class TestBatchDecryptToken:
+    @patch("libs.rsa.get_decrypt_decoding")
+    @patch("libs.rsa.decrypt_token_with_decoding")
+    def test_batch_decryption(self, mock_decrypt_with_decoding, mock_get_decoding):
+        """Test batch decryption functionality"""
+        mock_rsa_key = MagicMock()
+        mock_cipher_rsa = MagicMock()
+        mock_get_decoding.return_value = (mock_rsa_key, mock_cipher_rsa)
+
+        # Test multiple tokens
+        mock_decrypt_with_decoding.side_effect = ["token1", "token2", "token3"]
+        tokens = [
+            base64.b64encode(b"encrypted1").decode(),
+            base64.b64encode(b"encrypted2").decode(),
+            base64.b64encode(b"encrypted3").decode(),
+        ]
+        result = batch_decrypt_token("tenant-123", tokens)
+
+        assert result == ["token1", "token2", "token3"]
+        # Key should only be loaded once
+        mock_get_decoding.assert_called_once_with("tenant-123")
+
+
+class TestGetDecryptDecoding:
+    @patch("extensions.ext_redis.redis_client.get")
+    @patch("extensions.ext_storage.storage.load")
+    def test_private_key_not_found(self, mock_storage_load, mock_redis_get):
+        """Test error when private key file doesn't exist"""
+        mock_redis_get.return_value = None
+        mock_storage_load.side_effect = FileNotFoundError()
+
+        with pytest.raises(PrivkeyNotFoundError) as exc_info:
+            get_decrypt_decoding("tenant-123")
+
+        assert "Private key not found, tenant_id: tenant-123" in str(exc_info.value)
+
+
+class TestEncryptDecryptIntegration:
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    @patch("libs.rsa.decrypt")
+    def test_should_encrypt_and_decrypt_consistently(self, mock_decrypt, mock_encrypt, mock_query):
+        """Test that encryption and decryption are consistent"""
+        # Setup mock tenant
+        mock_tenant = MagicMock()
+        mock_tenant.encrypt_public_key = "mock_public_key"
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+
+        # Setup mock encryption/decryption
+        original_token = "test_token_123"
+        mock_encrypt.return_value = b"encrypted_data"
+        mock_decrypt.return_value = original_token
+
+        # Test encryption
+        encrypted = encrypt_token("tenant-123", original_token)
+
+        # Test decryption
+        decrypted = decrypt_token("tenant-123", encrypted)
+
+        assert decrypted == original_token
+
+
+class TestSecurity:
+    """Critical security tests for encryption system"""
+
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    def test_cross_tenant_isolation(self, mock_encrypt, mock_query):
+        """Ensure tokens encrypted for one tenant cannot be used by another"""
+        # Setup mock tenant
+        mock_tenant = MagicMock()
+        mock_tenant.encrypt_public_key = "tenant1_public_key"
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_encrypt.return_value = b"encrypted_for_tenant1"
+
+        # Encrypt token for tenant1
+        encrypted = encrypt_token("tenant-123", "sensitive_data")
+
+        # Attempt to decrypt with different tenant should fail
+        with patch("libs.rsa.decrypt") as mock_decrypt:
+            mock_decrypt.side_effect = Exception("Invalid tenant key")
+
+            with pytest.raises(Exception, match="Invalid tenant key"):
+                decrypt_token("different-tenant", encrypted)
+
+    @patch("libs.rsa.decrypt")
+    def test_tampered_ciphertext_rejection(self, mock_decrypt):
+        """Detect and reject tampered ciphertext"""
+        valid_encrypted = base64.b64encode(b"valid_data").decode()
+
+        # Tamper with ciphertext
+        tampered_bytes = bytearray(base64.b64decode(valid_encrypted))
+        tampered_bytes[0] ^= 0xFF
+        tampered = base64.b64encode(bytes(tampered_bytes)).decode()
+
+        mock_decrypt.side_effect = Exception("Decryption error")
+
+        with pytest.raises(Exception, match="Decryption error"):
+            decrypt_token("tenant-123", tampered)
+
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    def test_encryption_randomness(self, mock_encrypt, mock_query):
+        """Ensure same plaintext produces different ciphertext"""
+        mock_tenant = MagicMock(encrypt_public_key="key")
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+
+        # Different outputs for same input
+        mock_encrypt.side_effect = [b"enc1", b"enc2", b"enc3"]
+
+        results = [encrypt_token("tenant-123", "token") for _ in range(3)]
+
+        # All results should be different
+        assert len(set(results)) == 3
+
+
+class TestEdgeCases:
+    """Additional security-focused edge case tests"""
+
+    def test_should_handle_empty_string_in_obfuscation(self):
+        """Test handling of empty string in obfuscation"""
+        # Test empty string (which is a valid str type)
+        assert obfuscated_token("") == ""
+
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    def test_should_handle_empty_token_encryption(self, mock_encrypt, mock_query):
+        """Test encryption of empty token"""
+        mock_tenant = MagicMock()
+        mock_tenant.encrypt_public_key = "mock_public_key"
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_encrypt.return_value = b"encrypted_empty"
+
+        result = encrypt_token("tenant-123", "")
+
+        assert result == base64.b64encode(b"encrypted_empty").decode()
+        mock_encrypt.assert_called_with("", "mock_public_key")
+
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    def test_should_handle_special_characters_in_token(self, mock_encrypt, mock_query):
+        """Test tokens containing special/unicode characters"""
+        mock_tenant = MagicMock()
+        mock_tenant.encrypt_public_key = "mock_public_key"
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+        mock_encrypt.return_value = b"encrypted_special"
+
+        # Test various special characters
+        special_tokens = [
+            "token\x00with\x00null",  # Null bytes
+            "token_with_emoji_😀🎉",  # Unicode emoji
+            "token\nwith\nnewlines",  # Newlines
+            "token\twith\ttabs",  # Tabs
+            "token_with_中文字符",  # Chinese characters
+        ]
+
+        for token in special_tokens:
+            result = encrypt_token("tenant-123", token)
+            assert result == base64.b64encode(b"encrypted_special").decode()
+            mock_encrypt.assert_called_with(token, "mock_public_key")
+
+    @patch("models.engine.db.session.query")
+    @patch("libs.rsa.encrypt")
+    def test_should_handle_rsa_size_limits(self, mock_encrypt, mock_query):
+        """Test behavior when token exceeds RSA encryption limits"""
+        mock_tenant = MagicMock()
+        mock_tenant.encrypt_public_key = "mock_public_key"
+        mock_query.return_value.filter.return_value.first.return_value = mock_tenant
+
+        # RSA 2048-bit can only encrypt ~245 bytes
+        # The actual limit depends on padding scheme
+        mock_encrypt.side_effect = ValueError("Message too long for RSA key size")
+
+        # Create a token that would exceed RSA limits
+        long_token = "x" * 300
+
+        with pytest.raises(ValueError, match="Message too long for RSA key size"):
+            encrypt_token("tenant-123", long_token)
+
+    @patch("libs.rsa.get_decrypt_decoding")
+    @patch("libs.rsa.decrypt_token_with_decoding")
+    def test_batch_decrypt_loads_key_only_once(self, mock_decrypt_with_decoding, mock_get_decoding):
+        """Verify batch decryption optimization - loads key only once"""
+        mock_rsa_key = MagicMock()
+        mock_cipher_rsa = MagicMock()
+        mock_get_decoding.return_value = (mock_rsa_key, mock_cipher_rsa)
+
+        # Test with multiple tokens
+        mock_decrypt_with_decoding.side_effect = ["token1", "token2", "token3", "token4", "token5"]
+        tokens = [base64.b64encode(f"encrypted{i}".encode()).decode() for i in range(5)]
+
+        result = batch_decrypt_token("tenant-123", tokens)
+
+        assert result == ["token1", "token2", "token3", "token4", "token5"]
+        # Key should only be loaded once regardless of token count
+        mock_get_decoding.assert_called_once_with("tenant-123")
+        assert mock_decrypt_with_decoding.call_count == 5

From a9cc19f530591846b9c0c00014fa957c2388cf86 Mon Sep 17 00:00:00 2001
From: Minamiyama <minamiyama@qq.com>
Date: Thu, 10 Jul 2025 10:03:11 +0800
Subject: [PATCH 05/39] feat(question-classifier): add drag-and-drop sorting
 for topics list (#22066)

Co-authored-by: crazywoola <427733928@qq.com>
---
 .../components/class-item.tsx                 |  6 ++
 .../components/class-list.tsx                 | 55 +++++++++++++++----
 .../nodes/question-classifier/panel.tsx       |  2 +
 .../nodes/question-classifier/use-config.ts   | 16 +++++-
 4 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx b/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx
index be4a6cb901..478ac925d6 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx
@@ -11,6 +11,8 @@ import { uniqueId } from 'lodash-es'
 const i18nPrefix = 'workflow.nodes.questionClassifiers'
 
 type Props = {
+  className?: string
+  headerClassName?: string
   nodeId: string
   payload: Topic
   onChange: (payload: Topic) => void
@@ -21,6 +23,8 @@ type Props = {
 }
 
 const ClassItem: FC<Props> = ({
+  className,
+  headerClassName,
   nodeId,
   payload,
   onChange,
@@ -49,6 +53,8 @@ const ClassItem: FC<Props> = ({
 
   return (
     <Editor
+      className={className}
+      headerClassName={headerClassName}
       title={`${t(`${i18nPrefix}.class`)} ${index}`}
       placeholder={t(`${i18nPrefix}.topicPlaceholder`)!}
       value={payload.name}
diff --git a/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx b/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
index f152917ed4..d0297cfd74 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
@@ -8,6 +8,9 @@ import AddButton from '../../_base/components/add-button'
 import Item from './class-item'
 import type { Topic } from '@/app/components/workflow/nodes/question-classifier/types'
 import type { ValueSelector, Var } from '@/app/components/workflow/types'
+import { ReactSortable } from 'react-sortablejs'
+import { noop } from 'lodash-es'
+import cn from '@/utils/classnames'
 
 const i18nPrefix = 'workflow.nodes.questionClassifiers'
 
@@ -17,6 +20,7 @@ type Props = {
   onChange: (list: Topic[]) => void
   readonly?: boolean
   filterVar: (payload: Var, valueSelector: ValueSelector) => boolean
+  handleSortTopic?: (newTopics: (Topic & { id: string })[]) => void
 }
 
 const ClassList: FC<Props> = ({
@@ -25,6 +29,7 @@ const ClassList: FC<Props> = ({
   onChange,
   readonly,
   filterVar,
+  handleSortTopic = noop,
 }) => {
   const { t } = useTranslation()
   const { handleEdgeDeleteByDeleteBranch } = useEdgesInteractions()
@@ -55,22 +60,48 @@ const ClassList: FC<Props> = ({
     }
   }, [list, onChange, handleEdgeDeleteByDeleteBranch, nodeId])
 
+  const topicCount = list.length
+  const handleSideWidth = 3
   // Todo Remove; edit topic name
   return (
-    <div className='space-y-2'>
+    <ReactSortable
+      list={list.map(item => ({ ...item }))}
+      setList={handleSortTopic}
+      handle='.handle'
+      ghostClass='bg-components-panel-bg'
+      animation={150}
+      disabled={readonly}
+      className='space-y-2'
+    >
       {
         list.map((item, index) => {
+          const canDrag = (() => {
+            if (readonly)
+              return false
+
+            return topicCount >= 2
+          })()
           return (
-            <Item
-              nodeId={nodeId}
-              key={list[index].id}
-              payload={item}
-              onChange={handleClassChange(index)}
-              onRemove={handleRemoveClass(index)}
-              index={index + 1}
-              readonly={readonly}
-              filterVar={filterVar}
-            />
+            <div key={item.id}
+                className={cn(
+                  'group relative rounded-[10px] bg-components-panel-bg',
+                  `-ml-${handleSideWidth} min-h-[40px] px-0 py-0`,
+            )}>
+              <div >
+                <Item
+                  className={cn(canDrag && 'handle')}
+                  headerClassName={cn(canDrag && 'cursor-grab')}
+                  nodeId={nodeId}
+                  key={list[index].id}
+                  payload={item}
+                  onChange={handleClassChange(index)}
+                  onRemove={handleRemoveClass(index)}
+                  index={index + 1}
+                  readonly={readonly}
+                  filterVar={filterVar}
+                />
+              </div>
+            </div>
           )
         })
       }
@@ -81,7 +112,7 @@ const ClassList: FC<Props> = ({
         />
       )}
 
-    </div>
+    </ReactSortable>
   )
 }
 export default React.memo(ClassList)
diff --git a/web/app/components/workflow/nodes/question-classifier/panel.tsx b/web/app/components/workflow/nodes/question-classifier/panel.tsx
index 8cf9ec5f7c..8e27f5dceb 100644
--- a/web/app/components/workflow/nodes/question-classifier/panel.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/panel.tsx
@@ -40,6 +40,7 @@ const Panel: FC<NodePanelProps<QuestionClassifierNodeType>> = ({
     handleVisionResolutionChange,
     handleVisionResolutionEnabledChange,
     filterVar,
+    handleSortTopic,
   } = useConfig(id, data)
 
   const model = inputs.model
@@ -99,6 +100,7 @@ const Panel: FC<NodePanelProps<QuestionClassifierNodeType>> = ({
             onChange={handleTopicsChange}
             readonly={readOnly}
             filterVar={filterVar}
+            handleSortTopic={handleSortTopic}
           />
         </Field>
         <Split />
diff --git a/web/app/components/workflow/nodes/question-classifier/use-config.ts b/web/app/components/workflow/nodes/question-classifier/use-config.ts
index 8eacf5b43f..a4acf5b7f6 100644
--- a/web/app/components/workflow/nodes/question-classifier/use-config.ts
+++ b/web/app/components/workflow/nodes/question-classifier/use-config.ts
@@ -9,13 +9,15 @@ import {
 import { useStore } from '../../store'
 import useAvailableVarList from '../_base/hooks/use-available-var-list'
 import useConfigVision from '../../hooks/use-config-vision'
-import type { QuestionClassifierNodeType } from './types'
+import type { QuestionClassifierNodeType, Topic } from './types'
 import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
 import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { checkHasQueryBlock } from '@/app/components/base/prompt-editor/constants'
+import { useUpdateNodeInternals } from 'reactflow'
 
 const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
+  const updateNodeInternals = useUpdateNodeInternals()
   const { nodesReadOnly: readOnly } = useNodesReadOnly()
   const isChatMode = useIsChatMode()
   const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
@@ -166,6 +168,17 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
     return varPayload.type === VarType.string
   }, [])
 
+  const handleSortTopic = useCallback((newTopics: (Topic & { id: string })[]) => {
+    const newInputs = produce(inputs, (draft) => {
+      draft.classes = newTopics.filter(Boolean).map(item => ({
+        id: item.id,
+        name: item.name,
+      }))
+    })
+    setInputs(newInputs)
+    updateNodeInternals(id)
+  }, [id, inputs, setInputs, updateNodeInternals])
+
   return {
     readOnly,
     inputs,
@@ -185,6 +198,7 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
     isVisionModel,
     handleVisionResolutionEnabledChange,
     handleVisionResolutionChange,
+    handleSortTopic,
   }
 }
 

From a316766ad7eb0438c26194d466e9bcdc7e7c87e2 Mon Sep 17 00:00:00 2001
From: Wu Tianwei <30284043+WTW0313@users.noreply.github.com>
Date: Thu, 10 Jul 2025 10:11:31 +0800
Subject: [PATCH 06/39] chore: Update theme vars (#22113)

---
 web/themes/dark.css                     | 633 ++++++++++++------------
 web/themes/light.css                    | 391 ++++++++-------
 web/themes/tailwind-theme-var-define.ts |  19 +-
 3 files changed, 541 insertions(+), 502 deletions(-)

diff --git a/web/themes/dark.css b/web/themes/dark.css
index b7adb61315..d204838e5e 100644
--- a/web/themes/dark.css
+++ b/web/themes/dark.css
@@ -1,274 +1,278 @@
 /* Attention: Generate by code. Don't update by hand!!! */
 html[data-theme="dark"] {
-  --color-components-input-bg-normal: #ffffff14;
-  --color-components-input-text-placeholder: #c8ceda4d;
-  --color-components-input-bg-hover: #ffffff08;
-  --color-components-input-bg-active: #ffffff0d;
+  --color-components-input-bg-normal: rgb(255 255 255 / 0.08);
+  --color-components-input-text-placeholder: rgb(200 206 218 / 0.3);
+  --color-components-input-bg-hover: rgb(255 255 255 / 0.03);
+  --color-components-input-bg-active: rgb(255 255 255 / 0.05);
   --color-components-input-border-active: #747481;
   --color-components-input-border-destructive: #f97066;
   --color-components-input-text-filled: #f4f4f5;
-  --color-components-input-bg-destructive: #ffffff03;
-  --color-components-input-bg-disabled: #ffffff08;
-  --color-components-input-text-disabled: #c8ceda4d;
-  --color-components-input-text-filled-disabled: #c8ceda99;
+  --color-components-input-bg-destructive: rgb(255 255 255 / 0.01);
+  --color-components-input-bg-disabled: rgb(255 255 255 / 0.03);
+  --color-components-input-text-disabled: rgb(200 206 218 / 0.3);
+  --color-components-input-text-filled-disabled: rgb(200 206 218 / 0.6);
   --color-components-input-border-hover: #3a3a40;
   --color-components-input-border-active-prompt-1: #36bffa;
   --color-components-input-border-active-prompt-2: #296dff;
 
-  --color-components-kbd-bg-gray: #ffffff08;
-  --color-components-kbd-bg-white: #ffffff1f;
+  --color-components-kbd-bg-gray: rgb(255 255 255 / 0.03);
+  --color-components-kbd-bg-white: rgb(255 255 255 / 0.12);
 
-  --color-components-tooltip-bg: #18181bf2;
+  --color-components-tooltip-bg: rgb(24 24 27 / 0.95);
 
-  --color-components-button-primary-text: #fffffff2;
+  --color-components-button-primary-text: rgb(255 255 255 / 0.95);
   --color-components-button-primary-bg: #155aef;
-  --color-components-button-primary-border: #ffffff1f;
+  --color-components-button-primary-border: rgb(255 255 255 / 0.12);
   --color-components-button-primary-bg-hover: #296dff;
-  --color-components-button-primary-border-hover: #ffffff33;
-  --color-components-button-primary-bg-disabled: #ffffff08;
-  --color-components-button-primary-border-disabled: #ffffff14;
-  --color-components-button-primary-text-disabled: #ffffff33;
-
-  --color-components-button-secondary-text: #ffffffcc;
-  --color-components-button-secondary-text-disabled: #ffffff33;
-  --color-components-button-secondary-bg: #ffffff1f;
-  --color-components-button-secondary-bg-hover: #ffffff33;
-  --color-components-button-secondary-bg-disabled: #ffffff08;
-  --color-components-button-secondary-border: #ffffff14;
-  --color-components-button-secondary-border-hover: #ffffff1f;
-  --color-components-button-secondary-border-disabled: #ffffff0d;
+  --color-components-button-primary-border-hover: rgb(255 255 255 / 0.2);
+  --color-components-button-primary-bg-disabled: rgb(255 255 255 / 0.03);
+  --color-components-button-primary-border-disabled: rgb(255 255 255 / 0.08);
+  --color-components-button-primary-text-disabled: rgb(255 255 255 / 0.2);
+
+  --color-components-button-secondary-text: rgb(255 255 255 / 0.8);
+  --color-components-button-secondary-text-disabled: rgb(255 255 255 / 0.2);
+  --color-components-button-secondary-bg: rgb(255 255 255 / 0.12);
+  --color-components-button-secondary-bg-hover: rgb(255 255 255 / 0.2);
+  --color-components-button-secondary-bg-disabled: rgb(255 255 255 / 0.03);
+  --color-components-button-secondary-border: rgb(255 255 255 / 0.08);
+  --color-components-button-secondary-border-hover: rgb(255 255 255 / 0.12);
+  --color-components-button-secondary-border-disabled: rgb(255 255 255 / 0.05);
 
   --color-components-button-tertiary-text: #d9d9de;
-  --color-components-button-tertiary-text-disabled: #ffffff33;
-  --color-components-button-tertiary-bg: #ffffff14;
-  --color-components-button-tertiary-bg-hover: #ffffff1f;
-  --color-components-button-tertiary-bg-disabled: #ffffff08;
+  --color-components-button-tertiary-text-disabled: rgb(255 255 255 / 0.2);
+  --color-components-button-tertiary-bg: rgb(255 255 255 / 0.08);
+  --color-components-button-tertiary-bg-hover: rgb(255 255 255 / 0.12);
+  --color-components-button-tertiary-bg-disabled: rgb(255 255 255 / 0.03);
 
   --color-components-button-ghost-text: #d9d9de;
-  --color-components-button-ghost-text-disabled: #ffffff33;
-  --color-components-button-ghost-bg-hover: #c8ceda14;
+  --color-components-button-ghost-text-disabled: rgb(255 255 255 / 0.2);
+  --color-components-button-ghost-bg-hover: rgb(200 206 218 / 0.08);
 
-  --color-components-button-destructive-primary-text: #fffffff2;
-  --color-components-button-destructive-primary-text-disabled: #ffffff33;
+  --color-components-button-destructive-primary-text: rgb(255 255 255 / 0.95);
+  --color-components-button-destructive-primary-text-disabled: rgb(255 255 255 / 0.2);
   --color-components-button-destructive-primary-bg: #d92d20;
   --color-components-button-destructive-primary-bg-hover: #f04438;
-  --color-components-button-destructive-primary-bg-disabled: #f0443824;
-  --color-components-button-destructive-primary-border: #ffffff1f;
-  --color-components-button-destructive-primary-border-hover: #ffffff33;
-  --color-components-button-destructive-primary-border-disabled: #ffffff14;
+  --color-components-button-destructive-primary-bg-disabled: rgb(240 68 56 / 0.14);
+  --color-components-button-destructive-primary-border: rgb(255 255 255 / 0.12);
+  --color-components-button-destructive-primary-border-hover: rgb(255 255 255 / 0.2);
+  --color-components-button-destructive-primary-border-disabled: rgb(255 255 255 / 0.08);
 
   --color-components-button-destructive-secondary-text: #f97066;
-  --color-components-button-destructive-secondary-text-disabled: #f0443833;
-  --color-components-button-destructive-secondary-bg: #ffffff1f;
-  --color-components-button-destructive-secondary-bg-hover: #f0443824;
-  --color-components-button-destructive-secondary-bg-disabled: #f0443814;
-  --color-components-button-destructive-secondary-border: #ffffff14;
-  --color-components-button-destructive-secondary-border-hover: #ffffff1f;
-  --color-components-button-destructive-secondary-border-disabled: #f0443814;
+  --color-components-button-destructive-secondary-text-disabled: rgb(240 68 56 / 0.2);
+  --color-components-button-destructive-secondary-bg: rgb(255 255 255 / 0.12);
+  --color-components-button-destructive-secondary-bg-hover: rgb(240 68 56 / 0.14);
+  --color-components-button-destructive-secondary-bg-disabled: rgb(240 68 56 / 0.08);
+  --color-components-button-destructive-secondary-border: rgb(255 255 255 / 0.08);
+  --color-components-button-destructive-secondary-border-hover: rgb(255 255 255 / 0.12);
+  --color-components-button-destructive-secondary-border-disabled: rgb(240 68 56 / 0.08);
 
   --color-components-button-destructive-tertiary-text: #f97066;
-  --color-components-button-destructive-tertiary-text-disabled: #f0443833;
-  --color-components-button-destructive-tertiary-bg: #f0443824;
-  --color-components-button-destructive-tertiary-bg-hover: #f0443840;
-  --color-components-button-destructive-tertiary-bg-disabled: #f0443814;
+  --color-components-button-destructive-tertiary-text-disabled: rgb(240 68 56 / 0.2);
+  --color-components-button-destructive-tertiary-bg: rgb(240 68 56 / 0.14);
+  --color-components-button-destructive-tertiary-bg-hover: rgb(240 68 56 / 0.25);
+  --color-components-button-destructive-tertiary-bg-disabled: rgb(240 68 56 / 0.08);
 
   --color-components-button-destructive-ghost-text: #f97066;
-  --color-components-button-destructive-ghost-text-disabled: #f0443833;
-  --color-components-button-destructive-ghost-bg-hover: #f0443824;
-
-  --color-components-button-secondary-accent-text: #ffffffcc;
-  --color-components-button-secondary-accent-text-disabled: #ffffff33;
-  --color-components-button-secondary-accent-bg: #ffffff0d;
-  --color-components-button-secondary-accent-bg-hover: #ffffff14;
-  --color-components-button-secondary-accent-bg-disabled: #ffffff08;
-  --color-components-button-secondary-accent-border: #ffffff14;
-  --color-components-button-secondary-accent-border-hover: #ffffff1f;
-  --color-components-button-secondary-accent-border-disabled: #ffffff0d;
+  --color-components-button-destructive-ghost-text-disabled: rgb(240 68 56 / 0.2);
+  --color-components-button-destructive-ghost-bg-hover: rgb(240 68 56 / 0.14);
+
+  --color-components-button-secondary-accent-text: rgb(255 255 255 / 0.8);
+  --color-components-button-secondary-accent-text-disabled: rgb(255 255 255 / 0.2);
+  --color-components-button-secondary-accent-bg: rgb(255 255 255 / 0.05);
+  --color-components-button-secondary-accent-bg-hover: rgb(255 255 255 / 0.08);
+  --color-components-button-secondary-accent-bg-disabled: rgb(255 255 255 / 0.03);
+  --color-components-button-secondary-accent-border: rgb(255 255 255 / 0.08);
+  --color-components-button-secondary-accent-border-hover: rgb(255 255 255 / 0.12);
+  --color-components-button-secondary-accent-border-disabled: rgb(255 255 255 / 0.05);
 
   --color-components-button-indigo-bg: #444ce7;
   --color-components-button-indigo-bg-hover: #6172f3;
-  --color-components-button-indigo-bg-disabled: #ffffff08;
+  --color-components-button-indigo-bg-disabled: rgb(255 255 255 / 0.03);
 
-  --color-components-checkbox-icon: #fffffff2;
-  --color-components-checkbox-icon-disabled: #ffffff33;
+  --color-components-checkbox-icon: rgb(255 255 255 / 0.95);
+  --color-components-checkbox-icon-disabled: rgb(255 255 255 / 0.2);
   --color-components-checkbox-bg: #296dff;
   --color-components-checkbox-bg-hover: #5289ff;
-  --color-components-checkbox-bg-disabled: #ffffff08;
-  --color-components-checkbox-border: #ffffff66;
-  --color-components-checkbox-border-hover: #ffffff99;
-  --color-components-checkbox-border-disabled: #ffffff03;
-  --color-components-checkbox-bg-unchecked: #ffffff08;
-  --color-components-checkbox-bg-unchecked-hover: #ffffff0d;
-  --color-components-checkbox-bg-disabled-checked: #155aef33;
+  --color-components-checkbox-bg-disabled: rgb(255 255 255 / 0.03);
+  --color-components-checkbox-border: rgb(255 255 255 / 0.4);
+  --color-components-checkbox-border-hover: rgb(255 255 255 / 0.6);
+  --color-components-checkbox-border-disabled: rgb(255 255 255 / 0.01);
+  --color-components-checkbox-bg-unchecked: rgb(255 255 255 / 0.03);
+  --color-components-checkbox-bg-unchecked-hover: rgb(255 255 255 / 0.05);
+  --color-components-checkbox-bg-disabled-checked: rgb(21 90 239 / 0.2);
 
   --color-components-radio-border-checked: #296dff;
   --color-components-radio-border-checked-hover: #5289ff;
-  --color-components-radio-border-checked-disabled: #155aef33;
-  --color-components-radio-bg-disabled: #ffffff08;
-  --color-components-radio-border: #ffffff66;
-  --color-components-radio-border-hover: #ffffff99;
-  --color-components-radio-border-disabled: #ffffff03;
-  --color-components-radio-bg: #ffffff00;
-  --color-components-radio-bg-hover: #ffffff0d;
+  --color-components-radio-border-checked-disabled: rgb(21 90 239 / 0.2);
+  --color-components-radio-bg-disabled: rgb(255 255 255 / 0.03);
+  --color-components-radio-border: rgb(255 255 255 / 0.4);
+  --color-components-radio-border-hover: rgb(255 255 255 / 0.6);
+  --color-components-radio-border-disabled: rgb(255 255 255 / 0.01);
+  --color-components-radio-bg: rgb(255 255 255 / 0);
+  --color-components-radio-bg-hover: rgb(255 255 255 / 0.05);
 
   --color-components-toggle-knob: #f4f4f5;
-  --color-components-toggle-knob-disabled: #ffffff33;
+  --color-components-toggle-knob-disabled: rgb(255 255 255 / 0.2);
   --color-components-toggle-bg: #296dff;
   --color-components-toggle-bg-hover: #5289ff;
-  --color-components-toggle-bg-disabled: #ffffff14;
-  --color-components-toggle-bg-unchecked: #ffffff33;
-  --color-components-toggle-bg-unchecked-hover: #ffffff4d;
-  --color-components-toggle-bg-unchecked-disabled: #ffffff14;
+  --color-components-toggle-bg-disabled: rgb(255 255 255 / 0.08);
+  --color-components-toggle-bg-unchecked: rgb(255 255 255 / 0.2);
+  --color-components-toggle-bg-unchecked-hover: rgb(255 255 255 / 0.3);
+  --color-components-toggle-bg-unchecked-disabled: rgb(255 255 255 / 0.08);
   --color-components-toggle-knob-hover: #fefefe;
 
   --color-components-card-bg: #222225;
-  --color-components-card-border: #ffffff08;
+  --color-components-card-border: rgb(255 255 255 / 0.03);
   --color-components-card-bg-alt: #27272b;
+  --color-components-card-bg-transparent: rgb(34 34 37 / 0);
+  --color-components-card-bg-alt-transparent: rgb(39 39 43 / 0);
 
-  --color-components-menu-item-text: #c8ceda99;
-  --color-components-menu-item-text-active: #fffffff2;
-  --color-components-menu-item-text-hover: #c8cedacc;
-  --color-components-menu-item-text-active-accent: #fffffff2;
+  --color-components-menu-item-text: rgb(200 206 218 / 0.6);
+  --color-components-menu-item-text-active: rgb(255 255 255 / 0.95);
+  --color-components-menu-item-text-hover: rgb(200 206 218 / 0.8);
+  --color-components-menu-item-text-active-accent: rgb(255 255 255 / 0.95);
+  --color-components-menu-item-bg-active: rgb(200 206 218 / 0.14);
+  --color-components-menu-item-bg-hover: rgb(200 206 218 / 0.08);
 
   --color-components-panel-bg: #222225;
-  --color-components-panel-bg-blur: #2c2c30f2;
-  --color-components-panel-border: #c8ceda24;
-  --color-components-panel-border-subtle: #c8ceda14;
+  --color-components-panel-bg-blur: rgb(44 44 48 / 0.95);
+  --color-components-panel-border: rgb(200 206 218 / 0.14);
+  --color-components-panel-border-subtle: rgb(200 206 218 / 0.08);
   --color-components-panel-gradient-2: #222225;
   --color-components-panel-gradient-1: #27272b;
   --color-components-panel-bg-alt: #222225;
   --color-components-panel-on-panel-item-bg: #27272b;
   --color-components-panel-on-panel-item-bg-hover: #3a3a40;
   --color-components-panel-on-panel-item-bg-alt: #3a3a40;
-  --color-components-panel-on-panel-item-bg-transparent: #2c2c30f2;
-  --color-components-panel-on-panel-item-bg-hover-transparent: #3a3a4000;
-  --color-components-panel-on-panel-item-bg-destructive-hover-transparent: #fffbfa00;
+  --color-components-panel-on-panel-item-bg-transparent: rgb(44 44 48 / 0.95);
+  --color-components-panel-on-panel-item-bg-hover-transparent: rgb(58 58 64 / 0);
+  --color-components-panel-on-panel-item-bg-destructive-hover-transparent: rgb(255 251 250 / 0);
 
-  --color-components-panel-bg-transparent: #22222500;
+  --color-components-panel-bg-transparent: rgb(34 34 37 / 0);
 
-  --color-components-main-nav-nav-button-text: #c8ceda99;
+  --color-components-main-nav-nav-button-text: rgb(200 206 218 / 0.6);
   --color-components-main-nav-nav-button-text-active: #f4f4f5;
-  --color-components-main-nav-nav-button-bg: #ffffff00;
-  --color-components-main-nav-nav-button-bg-active: #c8ceda24;
-  --color-components-main-nav-nav-button-border: #ffffff14;
-  --color-components-main-nav-nav-button-bg-hover: #c8ceda0a;
+  --color-components-main-nav-nav-button-bg: rgb(255 255 255 / 0);
+  --color-components-main-nav-nav-button-bg-active: rgb(200 206 218 / 0.14);
+  --color-components-main-nav-nav-button-border: rgb(255 255 255 / 0.08);
+  --color-components-main-nav-nav-button-bg-hover: rgb(200 206 218 / 0.04);
 
-  --color-components-main-nav-nav-user-border: #ffffff0d;
+  --color-components-main-nav-nav-user-border: rgb(255 255 255 / 0.05);
 
   --color-components-slider-knob: #f4f4f5;
   --color-components-slider-knob-hover: #fefefe;
-  --color-components-slider-knob-disabled: #ffffff33;
+  --color-components-slider-knob-disabled: rgb(255 255 255 / 0.2);
   --color-components-slider-range: #296dff;
-  --color-components-slider-track: #ffffff33;
-  --color-components-slider-knob-border-hover: #1018284d;
-  --color-components-slider-knob-border: #10182833;
-
-  --color-components-segmented-control-item-active-bg: #ffffff14;
-  --color-components-segmented-control-item-active-border: #c8ceda14;
-  --color-components-segmented-control-bg-normal: #18181bb3;
-  --color-components-segmented-control-item-active-accent-bg: #155aef33;
-  --color-components-segmented-control-item-active-accent-border: #155aef4d;
-
-  --color-components-option-card-option-bg: #c8ceda0a;
-  --color-components-option-card-option-selected-bg: #ffffff0d;
+  --color-components-slider-track: rgb(255 255 255 / 0.2);
+  --color-components-slider-knob-border-hover: rgb(16 24 40 / 0.3);
+  --color-components-slider-knob-border: rgb(16 24 40 / 0.2);
+
+  --color-components-segmented-control-item-active-bg: rgb(255 255 255 / 0.08);
+  --color-components-segmented-control-item-active-border: rgb(200 206 218 / 0.08);
+  --color-components-segmented-control-bg-normal: rgb(24 24 27 / 0.7);
+  --color-components-segmented-control-item-active-accent-bg: rgb(21 90 239 / 0.2);
+  --color-components-segmented-control-item-active-accent-border: rgb(21 90 239 / 0.3);
+
+  --color-components-option-card-option-bg: rgb(200 206 218 / 0.04);
+  --color-components-option-card-option-selected-bg: rgb(255 255 255 / 0.05);
   --color-components-option-card-option-selected-border: #5289ff;
-  --color-components-option-card-option-border: #c8ceda33;
-  --color-components-option-card-option-bg-hover: #c8ceda24;
-  --color-components-option-card-option-border-hover: #c8ceda4d;
+  --color-components-option-card-option-border: rgb(200 206 218 / 0.2);
+  --color-components-option-card-option-bg-hover: rgb(200 206 218 / 0.14);
+  --color-components-option-card-option-border-hover: rgb(200 206 218 / 0.3);
 
   --color-components-tab-active: #296dff;
 
-  --color-components-badge-white-to-dark: #18181bcc;
+  --color-components-badge-white-to-dark: rgb(24 24 27 / 0.8);
   --color-components-badge-status-light-success-bg: #17b26a;
   --color-components-badge-status-light-success-border-inner: #47cd89;
-  --color-components-badge-status-light-success-halo: #17b26a4d;
+  --color-components-badge-status-light-success-halo: rgb(23 178 106 / 0.3);
 
   --color-components-badge-status-light-border-outer: #222225;
-  --color-components-badge-status-light-high-light: #ffffff4d;
+  --color-components-badge-status-light-high-light: rgb(255 255 255 / 0.3);
   --color-components-badge-status-light-warning-bg: #f79009;
   --color-components-badge-status-light-warning-border-inner: #fdb022;
-  --color-components-badge-status-light-warning-halo: #f790094d;
+  --color-components-badge-status-light-warning-halo: rgb(247 144 9 / 0.3);
 
   --color-components-badge-status-light-error-bg: #f04438;
   --color-components-badge-status-light-error-border-inner: #f97066;
-  --color-components-badge-status-light-error-halo: #f044384d;
+  --color-components-badge-status-light-error-halo: rgb(240 68 56 / 0.3);
 
   --color-components-badge-status-light-normal-bg: #0ba5ec;
   --color-components-badge-status-light-normal-border-inner: #36bffa;
-  --color-components-badge-status-light-normal-halo: #0ba5ec4d;
+  --color-components-badge-status-light-normal-halo: rgb(11 165 236 / 0.3);
 
   --color-components-badge-status-light-disabled-bg: #676f83;
   --color-components-badge-status-light-disabled-border-inner: #98a2b2;
-  --color-components-badge-status-light-disabled-halo: #c8ceda14;
+  --color-components-badge-status-light-disabled-halo: rgb(200 206 218 / 0.08);
 
-  --color-components-badge-bg-green-soft: #17b26a24;
-  --color-components-badge-bg-orange-soft: #f7900924;
-  --color-components-badge-bg-red-soft: #f0443824;
-  --color-components-badge-bg-blue-light-soft: #0ba5ec24;
-  --color-components-badge-bg-gray-soft: #c8ceda14;
-  --color-components-badge-bg-dimm: #ffffff08;
+  --color-components-badge-bg-green-soft: rgb(23 178 106 / 0.14);
+  --color-components-badge-bg-orange-soft: rgb(247 144 9 / 0.14);
+  --color-components-badge-bg-red-soft: rgb(240 68 56 / 0.14);
+  --color-components-badge-bg-blue-light-soft: rgb(11 165 236 / 0.14);
+  --color-components-badge-bg-gray-soft: rgb(200 206 218 / 0.08);
+  --color-components-badge-bg-dimm: rgb(255 255 255 / 0.03);
 
   --color-components-chart-line: #5289ff;
-  --color-components-chart-area-1: #155aef33;
-  --color-components-chart-area-2: #155aef0a;
+  --color-components-chart-area-1: rgb(21 90 239 / 0.2);
+  --color-components-chart-area-2: rgb(21 90 239 / 0.04);
   --color-components-chart-current-1: #5289ff;
-  --color-components-chart-current-2: #155aef4d;
-  --color-components-chart-bg: #18181bf2;
+  --color-components-chart-current-2: rgb(21 90 239 / 0.3);
+  --color-components-chart-bg: rgb(24 24 27 / 0.95);
 
   --color-components-actionbar-bg: #222225;
-  --color-components-actionbar-border: #c8ceda14;
+  --color-components-actionbar-border: rgb(200 206 218 / 0.08);
   --color-components-actionbar-bg-accent: #27272b;
   --color-components-actionbar-border-accent: #5289ff;
 
-  --color-components-dropzone-bg-alt: #18181bcc;
-  --color-components-dropzone-bg: #18181b66;
-  --color-components-dropzone-bg-accent: #155aef33;
-  --color-components-dropzone-border: #c8ceda24;
-  --color-components-dropzone-border-alt: #c8ceda33;
+  --color-components-dropzone-bg-alt: rgb(24 24 27 / 0.8);
+  --color-components-dropzone-bg: rgb(24 24 27 / 0.4);
+  --color-components-dropzone-bg-accent: rgb(21 90 239 / 0.2);
+  --color-components-dropzone-border: rgb(200 206 218 / 0.14);
+  --color-components-dropzone-border-alt: rgb(200 206 218 / 0.2);
   --color-components-dropzone-border-accent: #84abff;
 
   --color-components-progress-brand-progress: #5289ff;
   --color-components-progress-brand-border: #5289ff;
-  --color-components-progress-brand-bg: #155aef0a;
+  --color-components-progress-brand-bg: rgb(21 90 239 / 0.04);
 
   --color-components-progress-white-progress: #ffffff;
-  --color-components-progress-white-border: #fffffff2;
-  --color-components-progress-white-bg: #ffffff03;
+  --color-components-progress-white-border: rgb(255 255 255 / 0.95);
+  --color-components-progress-white-bg: rgb(255 255 255 / 0.01);
 
   --color-components-progress-gray-progress: #98a2b2;
   --color-components-progress-gray-border: #98a2b2;
-  --color-components-progress-gray-bg: #c8ceda05;
+  --color-components-progress-gray-bg: rgb(200 206 218 / 0.02);
 
   --color-components-progress-warning-progress: #fdb022;
   --color-components-progress-warning-border: #fdb022;
-  --color-components-progress-warning-bg: #f790090a;
+  --color-components-progress-warning-bg: rgb(247 144 9 / 0.04);
 
   --color-components-progress-error-progress: #f97066;
   --color-components-progress-error-border: #f97066;
-  --color-components-progress-error-bg: #f044380a;
+  --color-components-progress-error-bg: rgb(240 68 56 / 0.04);
 
-  --color-components-chat-input-audio-bg: #155aef33;
-  --color-components-chat-input-audio-wave-default: #c8ceda24;
-  --color-components-chat-input-bg-mask-1: #18181b0a;
-  --color-components-chat-input-bg-mask-2: #18181b99;
-  --color-components-chat-input-border: #c8ceda33;
+  --color-components-chat-input-audio-bg: rgb(21 90 239 / 0.2);
+  --color-components-chat-input-audio-wave-default: rgb(200 206 218 / 0.14);
+  --color-components-chat-input-bg-mask-1: rgb(24 24 27 / 0.04);
+  --color-components-chat-input-bg-mask-2: rgb(24 24 27 / 0.6);
+  --color-components-chat-input-border: rgb(200 206 218 / 0.2);
   --color-components-chat-input-audio-wave-active: #84abff;
-  --color-components-chat-input-audio-bg-alt: #18181be6;
+  --color-components-chat-input-audio-bg-alt: rgb(24 24 27 / 0.9);
 
-  --color-components-avatar-shape-fill-stop-0: #fffffff2;
-  --color-components-avatar-shape-fill-stop-100: #ffffffcc;
+  --color-components-avatar-shape-fill-stop-0: rgb(255 255 255 / 0.95);
+  --color-components-avatar-shape-fill-stop-100: rgb(255 255 255 / 0.8);
 
-  --color-components-avatar-bg-mask-stop-0: #ffffff33;
-  --color-components-avatar-bg-mask-stop-100: #ffffff08;
+  --color-components-avatar-bg-mask-stop-0: rgb(255 255 255 / 0.2);
+  --color-components-avatar-bg-mask-stop-100: rgb(255 255 255 / 0.03);
 
   --color-components-avatar-default-avatar-bg: #222225;
-  --color-components-avatar-mask-darkmode-dimmed: #0000001f;
+  --color-components-avatar-mask-darkmode-dimmed: rgb(0 0 0 / 0.12);
 
-  --color-components-label-gray: #c8ceda24;
+  --color-components-label-gray: rgb(200 206 218 / 0.14);
 
   --color-components-premium-badge-blue-bg-stop-0: #5289ff;
   --color-components-premium-badge-blue-bg-stop-100: #296dff;
-  --color-components-premium-badge-blue-stroke-stop-0: #ffffff33;
+  --color-components-premium-badge-blue-stroke-stop-0: rgb(255 255 255 / 0.2);
   --color-components-premium-badge-blue-stroke-stop-100: #296dff;
   --color-components-premium-badge-blue-text-stop-0: #eff4ff;
   --color-components-premium-badge-blue-text-stop-100: #b2caff;
@@ -276,14 +280,14 @@ html[data-theme="dark"] {
   --color-components-premium-badge-blue-bg-stop-0-hover: #84abff;
   --color-components-premium-badge-blue-bg-stop-100-hover: #004aeb;
   --color-components-premium-badge-blue-glow-hover: #d1e0ff;
-  --color-components-premium-badge-blue-stroke-stop-0-hover: #ffffff80;
+  --color-components-premium-badge-blue-stroke-stop-0-hover: rgb(255 255 255 / 0.5);
   --color-components-premium-badge-blue-stroke-stop-100-hover: #296dff;
 
-  --color-components-premium-badge-highlight-stop-0: #ffffff1f;
-  --color-components-premium-badge-highlight-stop-100: #ffffff33;
+  --color-components-premium-badge-highlight-stop-0: rgb(255 255 255 / 0.12);
+  --color-components-premium-badge-highlight-stop-100: rgb(255 255 255 / 0.2);
   --color-components-premium-badge-indigo-bg-stop-0: #6172f3;
   --color-components-premium-badge-indigo-bg-stop-100: #3538cd;
-  --color-components-premium-badge-indigo-stroke-stop-0: #ffffff33;
+  --color-components-premium-badge-indigo-stroke-stop-0: rgb(255 255 255 / 0.2);
   --color-components-premium-badge-indigo-stroke-stop-100: #444ce7;
   --color-components-premium-badge-indigo-text-stop-0: #eef4ff;
   --color-components-premium-badge-indigo-text-stop-100: #c7d7fe;
@@ -291,12 +295,12 @@ html[data-theme="dark"] {
   --color-components-premium-badge-indigo-glow-hover: #e0eaff;
   --color-components-premium-badge-indigo-bg-stop-0-hover: #a4bcfd;
   --color-components-premium-badge-indigo-bg-stop-100-hover: #3538cd;
-  --color-components-premium-badge-indigo-stroke-stop-0-hover: #ffffff80;
+  --color-components-premium-badge-indigo-stroke-stop-0-hover: rgb(255 255 255 / 0.5);
   --color-components-premium-badge-indigo-stroke-stop-100-hover: #444ce7;
 
   --color-components-premium-badge-grey-bg-stop-0: #676f83;
   --color-components-premium-badge-grey-bg-stop-100: #495464;
-  --color-components-premium-badge-grey-stroke-stop-0: #ffffff1f;
+  --color-components-premium-badge-grey-stroke-stop-0: rgb(255 255 255 / 0.12);
   --color-components-premium-badge-grey-stroke-stop-100: #495464;
   --color-components-premium-badge-grey-text-stop-0: #f9fafb;
   --color-components-premium-badge-grey-text-stop-100: #e9ebf0;
@@ -304,12 +308,12 @@ html[data-theme="dark"] {
   --color-components-premium-badge-grey-glow-hover: #f2f4f7;
   --color-components-premium-badge-grey-bg-stop-0-hover: #98a2b2;
   --color-components-premium-badge-grey-bg-stop-100-hover: #354052;
-  --color-components-premium-badge-grey-stroke-stop-0-hover: #ffffff80;
+  --color-components-premium-badge-grey-stroke-stop-0-hover: rgb(255 255 255 / 0.5);
   --color-components-premium-badge-grey-stroke-stop-100-hover: #676f83;
 
   --color-components-premium-badge-orange-bg-stop-0: #ff692e;
   --color-components-premium-badge-orange-bg-stop-100: #e04f16;
-  --color-components-premium-badge-orange-stroke-stop-0: #ffffff33;
+  --color-components-premium-badge-orange-stroke-stop-0: rgb(255 255 255 / 0.2);
   --color-components-premium-badge-orange-stroke-stop-100: #ff4405;
   --color-components-premium-badge-orange-text-stop-0: #fef6ee;
   --color-components-premium-badge-orange-text-stop-100: #f9dbaf;
@@ -317,14 +321,14 @@ html[data-theme="dark"] {
   --color-components-premium-badge-orange-glow-hover: #fdead7;
   --color-components-premium-badge-orange-bg-stop-0-hover: #ff692e;
   --color-components-premium-badge-orange-bg-stop-100-hover: #b93815;
-  --color-components-premium-badge-orange-stroke-stop-0-hover: #ffffff80;
+  --color-components-premium-badge-orange-stroke-stop-0-hover: rgb(255 255 255 / 0.5);
   --color-components-premium-badge-orange-stroke-stop-100-hover: #ff4405;
 
-  --color-components-progress-bar-bg: #c8ceda14;
-  --color-components-progress-bar-progress: #c8ceda24;
-  --color-components-progress-bar-border: #ffffff08;
-  --color-components-progress-bar-progress-solid: #fffffff2;
-  --color-components-progress-bar-progress-highlight: #c8ceda33;
+  --color-components-progress-bar-bg: rgb(200 206 218 / 0.08);
+  --color-components-progress-bar-progress: rgb(200 206 218 / 0.14);
+  --color-components-progress-bar-border: rgb(255 255 255 / 0.03);
+  --color-components-progress-bar-progress-solid: rgb(255 255 255 / 0.95);
+  --color-components-progress-bar-progress-highlight: rgb(200 206 218 / 0.2);
 
   --color-components-icon-bg-red-solid: #d92d20;
   --color-components-icon-bg-rose-solid: #e31b54;
@@ -338,25 +342,25 @@ html[data-theme="dark"] {
   --color-components-icon-bg-indigo-solid: #444ce7;
   --color-components-icon-bg-violet-solid: #7839ee;
   --color-components-icon-bg-midnight-solid: #5d698d;
-  --color-components-icon-bg-rose-soft: #f63d6833;
-  --color-components-icon-bg-pink-soft: #ee46bc33;
-  --color-components-icon-bg-orange-dark-soft: #ff440533;
-  --color-components-icon-bg-yellow-soft: #eaaa0833;
-  --color-components-icon-bg-green-soft: #66c61c33;
-  --color-components-icon-bg-teal-soft: #15b79e33;
-  --color-components-icon-bg-blue-light-soft: #0ba5ec33;
-  --color-components-icon-bg-blue-soft: #155aef33;
-  --color-components-icon-bg-indigo-soft: #6172f333;
-  --color-components-icon-bg-violet-soft: #875bf733;
-  --color-components-icon-bg-midnight-soft: #828dad33;
-  --color-components-icon-bg-red-soft: #f0443833;
+  --color-components-icon-bg-rose-soft: rgb(246 61 104 / 0.2);
+  --color-components-icon-bg-pink-soft: rgb(238 70 188 / 0.2);
+  --color-components-icon-bg-orange-dark-soft: rgb(255 68 5 / 0.2);
+  --color-components-icon-bg-yellow-soft: rgb(234 170 8 / 0.2);
+  --color-components-icon-bg-green-soft: rgb(102 198 28 / 0.2);
+  --color-components-icon-bg-teal-soft: rgb(21 183 158 / 0.2);
+  --color-components-icon-bg-blue-light-soft: rgb(11 165 236 / 0.2);
+  --color-components-icon-bg-blue-soft: rgb(21 90 239 / 0.2);
+  --color-components-icon-bg-indigo-soft: rgb(97 114 243 / 0.2);
+  --color-components-icon-bg-violet-soft: rgb(135 91 247 / 0.2);
+  --color-components-icon-bg-midnight-soft: rgb(130 141 173 / 0.2);
+  --color-components-icon-bg-red-soft: rgb(240 68 56 / 0.2);
   --color-components-icon-bg-orange-solid: #f79009;
-  --color-components-icon-bg-orange-soft: #f7900933;
+  --color-components-icon-bg-orange-soft: rgb(247 144 9 / 0.2);
 
   --color-text-primary: #fbfbfc;
   --color-text-secondary: #d9d9de;
-  --color-text-tertiary: #c8ceda99;
-  --color-text-quaternary: #c8ceda66;
+  --color-text-tertiary: rgb(200 206 218 / 0.6);
+  --color-text-quaternary: rgb(200 206 218 / 0.4);
   --color-text-destructive: #f97066;
   --color-text-success: #17b26a;
   --color-text-warning: #f79009;
@@ -364,80 +368,85 @@ html[data-theme="dark"] {
   --color-text-success-secondary: #47cd89;
   --color-text-warning-secondary: #fdb022;
   --color-text-accent: #5289ff;
-  --color-text-primary-on-surface: #fffffff2;
-  --color-text-placeholder: #c8ceda4d;
-  --color-text-disabled: #c8ceda4d;
+  --color-text-primary-on-surface: rgb(255 255 255 / 0.95);
+  --color-text-placeholder: rgb(200 206 218 / 0.3);
+  --color-text-disabled: rgb(200 206 218 / 0.3);
   --color-text-accent-secondary: #84abff;
   --color-text-accent-light-mode-only: #d9d9de;
-  --color-text-text-selected: #155aef4d;
-  --color-text-secondary-on-surface: #ffffffe6;
+  --color-text-text-selected: rgb(21 90 239 / 0.3);
+  --color-text-secondary-on-surface: rgb(255 255 255 / 0.9);
   --color-text-logo-text: #e9e9ec;
-  --color-text-empty-state-icon: #c8ceda4d;
+  --color-text-empty-state-icon: rgb(200 206 218 / 0.3);
   --color-text-inverted: #ffffff;
-  --color-text-inverted-dimmed: #ffffffcc;
+  --color-text-inverted-dimmed: rgb(255 255 255 / 0.8);
 
   --color-background-body: #1d1d20;
   --color-background-default-subtle: #222225;
   --color-background-neutral-subtle: #1d1d20;
-  --color-background-sidenav-bg: #27272aeb;
+  --color-background-sidenav-bg: rgb(39 39 42 / 0.92);
   --color-background-default: #222225;
-  --color-background-soft: #18181b40;
+  --color-background-soft: rgb(24 24 27 / 0.25);
   --color-background-gradient-bg-fill-chat-bg-1: #222225;
   --color-background-gradient-bg-fill-chat-bg-2: #1d1d20;
-  --color-background-gradient-bg-fill-chat-bubble-bg-1: #c8ceda14;
-  --color-background-gradient-bg-fill-chat-bubble-bg-2: #c8ceda05;
-  --color-background-gradient-bg-fill-chat-bubble-bg-3: #27314d;
-  --color-background-gradient-bg-fill-debug-bg-1: #c8ceda14;
-  --color-background-gradient-bg-fill-debug-bg-2: #18181b0a;
-
-  --color-background-gradient-mask-gray: #18181b14;
-  --color-background-gradient-mask-transparent: #00000000;
-  --color-background-gradient-mask-input-clear-2: #393a3e00;
+  --color-background-gradient-bg-fill-chat-bubble-bg-1: rgb(200 206 218 / 0.08);
+  --color-background-gradient-bg-fill-chat-bubble-bg-2: rgb(200 206 218 / 0.02);
+  --color-background-gradient-bg-fill-debug-bg-1: rgb(200 206 218 / 0.08);
+  --color-background-gradient-bg-fill-debug-bg-2: rgb(24 24 27 / 0.04);
+
+  --color-background-gradient-mask-gray: rgb(24 24 27 / 0.08);
+  --color-background-gradient-mask-transparent: rgb(0 0 0 / 0);
+  --color-background-gradient-mask-input-clear-2: rgb(57 58 62 / 0);
   --color-background-gradient-mask-input-clear-1: #393a3e;
-  --color-background-gradient-mask-transparent-dark: #00000000;
-  --color-background-gradient-mask-side-panel-2: #18181be6;
-  --color-background-gradient-mask-side-panel-1: #18181b0a;
+  --color-background-gradient-mask-transparent-dark: rgb(0 0 0 / 0);
+  --color-background-gradient-mask-side-panel-2: rgb(24 24 27 / 0.9);
+  --color-background-gradient-mask-side-panel-1: rgb(24 24 27 / 0.04);
 
   --color-background-default-burn: #1d1d20;
-  --color-background-overlay-fullscreen: #27272af7;
-  --color-background-default-lighter: #c8ceda0a;
-  --color-background-section: #18181b66;
-  --color-background-interaction-from-bg-1: #18181b66;
-  --color-background-interaction-from-bg-2: #18181b24;
-  --color-background-section-burn: #18181b99;
+  --color-background-overlay-fullscreen: rgb(39 39 42 / 0.97);
+  --color-background-default-lighter: rgb(200 206 218 / 0.04);
+  --color-background-section: rgb(24 24 27 / 0.4);
+  --color-background-interaction-from-bg-1: rgb(24 24 27 / 0.4);
+  --color-background-interaction-from-bg-2: rgb(24 24 27 / 0.14);
+  --color-background-section-burn: rgb(24 24 27 / 0.6);
   --color-background-default-dodge: #3a3a40;
-  --color-background-overlay: #18181bcc;
+  --color-background-overlay: rgb(24 24 27 / 0.8);
   --color-background-default-dimmed: #27272b;
   --color-background-default-hover: #27272b;
-  --color-background-overlay-alt: #18181b66;
-  --color-background-surface-white: #ffffffe6;
-  --color-background-overlay-destructive: #f044384d;
-  --color-background-overlay-backdrop: #18181bf2;
-
-  --color-shadow-shadow-1: #0000000d;
-  --color-shadow-shadow-3: #0000001a;
-  --color-shadow-shadow-4: #0000001f;
-  --color-shadow-shadow-5: #00000029;
-  --color-shadow-shadow-6: #00000033;
-  --color-shadow-shadow-7: #0000003d;
-  --color-shadow-shadow-8: #00000047;
-  --color-shadow-shadow-9: #0000005c;
-  --color-shadow-shadow-2: #00000014;
-  --color-shadow-shadow-10: #00000066;
-
-  --color-workflow-block-border: #ffffff14;
-  --color-workflow-block-parma-bg: #ffffff0d;
+  --color-background-overlay-alt: rgb(24 24 27 / 0.4);
+  --color-background-surface-white: rgb(255 255 255 / 0.9);
+  --color-background-overlay-destructive: rgb(240 68 56 / 0.3);
+  --color-background-overlay-backdrop: rgb(24 24 27 / 0.95);
+  --color-background-body-transparent: rgb(29 29 32 / 0);
+
+  --color-shadow-shadow-1: rgb(0 0 0 / 0.05);
+  --color-shadow-shadow-3: rgb(0 0 0 / 0.1);
+  --color-shadow-shadow-4: rgb(0 0 0 / 0.12);
+  --color-shadow-shadow-5: rgb(0 0 0 / 0.16);
+  --color-shadow-shadow-6: rgb(0 0 0 / 0.2);
+  --color-shadow-shadow-7: rgb(0 0 0 / 0.24);
+  --color-shadow-shadow-8: rgb(0 0 0 / 0.28);
+  --color-shadow-shadow-9: rgb(0 0 0 / 0.36);
+  --color-shadow-shadow-2: rgb(0 0 0 / 0.08);
+  --color-shadow-shadow-10: rgb(0 0 0 / 0.4);
+
+  --color-workflow-block-border: rgb(255 255 255 / 0.08);
+  --color-workflow-block-parma-bg: rgb(255 255 255 / 0.05);
   --color-workflow-block-bg: #27272b;
-  --color-workflow-block-bg-transparent: #27272bf5;
-  --color-workflow-block-border-highlight: #c8ceda33;
+  --color-workflow-block-bg-transparent: rgb(39 39 43 / 0.96);
+  --color-workflow-block-border-highlight: rgb(200 206 218 / 0.2);
+  --color-workflow-block-wrapper-bg-1: #27272b;
+  --color-workflow-block-wrapper-bg-2: rgb(39 39 43 / 0.2);
 
-  --color-workflow-canvas-workflow-dot-color: #8585ad1c;
+  --color-workflow-canvas-workflow-dot-color: rgb(133 133 173 / 0.11);
   --color-workflow-canvas-workflow-bg: #1d1d20;
+  --color-workflow-canvas-workflow-top-bar-1: #1d1d20;
+  --color-workflow-canvas-workflow-top-bar-2: rgb(29 29 32 / 0.08);
+  --color-workflow-canvas-canvas-overlay: rgb(29 29 32 / 0.8);
 
   --color-workflow-link-line-active: #5289ff;
   --color-workflow-link-line-normal: #676f83;
   --color-workflow-link-line-handle: #5289ff;
-  --color-workflow-link-line-normal-transparent: #676f8333;
+  --color-workflow-link-line-normal-transparent: rgb(103 111 131 / 0.2);
   --color-workflow-link-line-failure-active: #fdb022;
   --color-workflow-link-line-failure-handle: #fdb022;
   --color-workflow-link-line-failure-button-bg: #f79009;
@@ -450,87 +459,90 @@ html[data-theme="dark"] {
   --color-workflow-link-line-error-handle: #f97066;
 
   --color-workflow-minimap-bg: #27272b;
-  --color-workflow-minimap-block: #c8ceda14;
-
-  --color-workflow-display-success-bg: #17b26a33;
-  --color-workflow-display-success-border-1: #17b26ae6;
-  --color-workflow-display-success-border-2: #17b26acc;
-  --color-workflow-display-success-vignette-color: #17b26a40;
-  --color-workflow-display-success-bg-line-pattern: #18181bcc;
-
-  --color-workflow-display-glass-1: #ffffff08;
-  --color-workflow-display-glass-2: #ffffff0d;
-  --color-workflow-display-vignette-dark: #00000066;
-  --color-workflow-display-highlight: #ffffff1f;
-  --color-workflow-display-outline: #18181bf2;
-  --color-workflow-display-error-bg: #f0443833;
-  --color-workflow-display-error-bg-line-pattern: #18181bcc;
-  --color-workflow-display-error-border-1: #f04438e6;
-  --color-workflow-display-error-border-2: #f04438cc;
-  --color-workflow-display-error-vignette-color: #f0443840;
-
-  --color-workflow-display-warning-bg: #f7900933;
-  --color-workflow-display-warning-bg-line-pattern: #18181bcc;
-  --color-workflow-display-warning-border-1: #f79009e6;
-  --color-workflow-display-warning-border-2: #f79009cc;
-  --color-workflow-display-warning-vignette-color: #f7900940;
-
-  --color-workflow-display-normal-bg: #0ba5ec33;
-  --color-workflow-display-normal-bg-line-pattern: #18181bcc;
-  --color-workflow-display-normal-border-1: #0ba5ece6;
-  --color-workflow-display-normal-border-2: #0ba5eccc;
-  --color-workflow-display-normal-vignette-color: #0ba5ec40;
-
-  --color-workflow-display-disabled-bg: #c8ceda33;
-  --color-workflow-display-disabled-bg-line-pattern: #18181bcc;
-  --color-workflow-display-disabled-border-1: #c8ceda99;
-  --color-workflow-display-disabled-border-2: #c8ceda40;
-  --color-workflow-display-disabled-vignette-color: #c8ceda40;
-  --color-workflow-display-disabled-outline: #18181bf2;
-
-  --color-workflow-workflow-progress-bg-1: #18181b40;
-  --color-workflow-workflow-progress-bg-2: #18181b0a;
-
-  --color-divider-subtle: #c8ceda14;
-  --color-divider-regular: #c8ceda24;
-  --color-divider-deep: #c8ceda33;
-  --color-divider-burn: #18181bf2;
-  --color-divider-intense: #c8ceda66;
+  --color-workflow-minimap-block: rgb(200 206 218 / 0.08);
+
+  --color-workflow-display-success-bg: rgb(23 178 106 / 0.2);
+  --color-workflow-display-success-border-1: rgb(23 178 106 / 0.9);
+  --color-workflow-display-success-border-2: rgb(23 178 106 / 0.8);
+  --color-workflow-display-success-vignette-color: rgb(23 178 106 / 0.25);
+  --color-workflow-display-success-bg-line-pattern: rgb(24 24 27 / 0.8);
+
+  --color-workflow-display-glass-1: rgb(255 255 255 / 0.03);
+  --color-workflow-display-glass-2: rgb(255 255 255 / 0.05);
+  --color-workflow-display-vignette-dark: rgb(0 0 0 / 0.4);
+  --color-workflow-display-highlight: rgb(255 255 255 / 0.12);
+  --color-workflow-display-outline: rgb(24 24 27 / 0.95);
+  --color-workflow-display-error-bg: rgb(240 68 56 / 0.2);
+  --color-workflow-display-error-bg-line-pattern: rgb(24 24 27 / 0.8);
+  --color-workflow-display-error-border-1: rgb(240 68 56 / 0.9);
+  --color-workflow-display-error-border-2: rgb(240 68 56 / 0.8);
+  --color-workflow-display-error-vignette-color: rgb(240 68 56 / 0.25);
+
+  --color-workflow-display-warning-bg: rgb(247 144 9 / 0.2);
+  --color-workflow-display-warning-bg-line-pattern: rgb(24 24 27 / 0.8);
+  --color-workflow-display-warning-border-1: rgb(247 144 9 / 0.9);
+  --color-workflow-display-warning-border-2: rgb(247 144 9 / 0.8);
+  --color-workflow-display-warning-vignette-color: rgb(247 144 9 / 0.25);
+
+  --color-workflow-display-normal-bg: rgb(11 165 236 / 0.2);
+  --color-workflow-display-normal-bg-line-pattern: rgb(24 24 27 / 0.8);
+  --color-workflow-display-normal-border-1: rgb(11 165 236 / 0.9);
+  --color-workflow-display-normal-border-2: rgb(11 165 236 / 0.8);
+  --color-workflow-display-normal-vignette-color: rgb(11 165 236 / 0.25);
+
+  --color-workflow-display-disabled-bg: rgb(200 206 218 / 0.2);
+  --color-workflow-display-disabled-bg-line-pattern: rgb(24 24 27 / 0.8);
+  --color-workflow-display-disabled-border-1: rgb(200 206 218 / 0.6);
+  --color-workflow-display-disabled-border-2: rgb(200 206 218 / 0.25);
+  --color-workflow-display-disabled-vignette-color: rgb(200 206 218 / 0.25);
+  --color-workflow-display-disabled-outline: rgb(24 24 27 / 0.95);
+
+  --color-workflow-workflow-progress-bg-1: rgb(24 24 27 / 0.25);
+  --color-workflow-workflow-progress-bg-2: rgb(24 24 27 / 0.04);
+
+  --color-divider-subtle: rgb(200 206 218 / 0.08);
+  --color-divider-regular: rgb(200 206 218 / 0.14);
+  --color-divider-deep: rgb(200 206 218 / 0.2);
+  --color-divider-burn: rgb(24 24 27 / 0.95);
+  --color-divider-intense: rgb(200 206 218 / 0.4);
   --color-divider-solid: #3a3a40;
   --color-divider-solid-alt: #747481;
 
-  --color-state-base-hover: #c8ceda14;
-  --color-state-base-active: #c8ceda33;
-  --color-state-base-hover-alt: #c8ceda24;
-  --color-state-base-handle: #c8ceda4d;
-  --color-state-base-handle-hover: #c8ceda80;
-  --color-state-base-hover-subtle: #c8ceda0a;
+  --color-state-base-hover: rgb(200 206 218 / 0.08);
+  --color-state-base-active: rgb(200 206 218 / 0.2);
+  --color-state-base-hover-alt: rgb(200 206 218 / 0.14);
+  --color-state-base-handle: rgb(200 206 218 / 0.3);
+  --color-state-base-handle-hover: rgb(200 206 218 / 0.5);
+  --color-state-base-hover-subtle: rgb(200 206 218 / 0.04);
 
-  --color-state-accent-hover: #155aef24;
-  --color-state-accent-active: #155aef24;
-  --color-state-accent-hover-alt: #155aef40;
+  --color-state-accent-hover: rgb(21 90 239 / 0.14);
+  --color-state-accent-active: rgb(21 90 239 / 0.14);
+  --color-state-accent-hover-alt: rgb(21 90 239 / 0.25);
   --color-state-accent-solid: #5289ff;
-  --color-state-accent-active-alt: #155aef33;
+  --color-state-accent-active-alt: rgb(21 90 239 / 0.2);
 
-  --color-state-destructive-hover: #f0443824;
-  --color-state-destructive-hover-alt: #f0443840;
-  --color-state-destructive-active: #f044384d;
+  --color-state-destructive-hover: rgb(240 68 56 / 0.14);
+  --color-state-destructive-hover-alt: rgb(240 68 56 / 0.25);
+  --color-state-destructive-active: rgb(240 68 56 / 0.3);
   --color-state-destructive-solid: #f97066;
   --color-state-destructive-border: #f97066;
+  --color-state-destructive-hover-transparent: rgb(240 68 56 / 0);
 
-  --color-state-success-hover: #17b26a24;
-  --color-state-success-hover-alt: #17b26a40;
-  --color-state-success-active: #17b26a4d;
+  --color-state-success-hover: rgb(23 178 106 / 0.14);
+  --color-state-success-hover-alt: rgb(23 178 106 / 0.25);
+  --color-state-success-active: rgb(23 178 106 / 0.3);
   --color-state-success-solid: #47cd89;
 
-  --color-state-warning-hover: #f7900924;
-  --color-state-warning-hover-alt: #f7900940;
-  --color-state-warning-active: #f790094d;
+  --color-state-warning-hover: rgb(247 144 9 / 0.14);
+  --color-state-warning-hover-alt: rgb(247 144 9 / 0.25);
+  --color-state-warning-active: rgb(247 144 9 / 0.3);
   --color-state-warning-solid: #f79009;
+  --color-state-warning-hover-transparent: rgb(247 144 9 / 0);
 
-  --color-effects-highlight: #c8ceda14;
-  --color-effects-highlight-lightmode-off: #c8ceda14;
+  --color-effects-highlight: rgb(200 206 218 / 0.08);
+  --color-effects-highlight-lightmode-off: rgb(200 206 218 / 0.08);
   --color-effects-image-frame: #ffffff;
+  --color-effects-icon-border: rgb(255 255 255 / 0.15);
 
   --color-util-colors-orange-dark-orange-dark-50: #57130a;
   --color-util-colors-orange-dark-orange-dark-100: #771a0d;
@@ -549,7 +561,7 @@ html[data-theme="dark"] {
   --color-util-colors-orange-orange-500: #ef6820;
   --color-util-colors-orange-orange-600: #f38744;
   --color-util-colors-orange-orange-700: #f7b27a;
-  --color-util-colors-orange-orange-100-transparent: #77291700;
+  --color-util-colors-orange-orange-100-transparent: rgb(119 41 23 / 0);
 
   --color-util-colors-pink-pink-50: #4e0d30;
   --color-util-colors-pink-pink-100: #851651;
@@ -722,21 +734,22 @@ html[data-theme="dark"] {
   --color-util-colors-midnight-midnight-600: #a7aec5;
   --color-util-colors-midnight-midnight-700: #c6cbd9;
 
-  --color-third-party-Arize: #ffffff;
-  --color-third-party-Phoenix: #ffffff;
   --color-third-party-LangChain: #ffffff;
   --color-third-party-Langfuse: #ffffff;
   --color-third-party-Github: #ffffff;
-  --color-third-party-Github-tertiary: #c8ceda99;
+  --color-third-party-Github-tertiary: rgb(200 206 218 / 0.6);
   --color-third-party-Github-secondary: #d9d9de;
   --color-third-party-model-bg-openai: #121212;
   --color-third-party-model-bg-anthropic: #1d1917;
-  --color-third-party-model-bg-default: #0b0b0e;
+  --color-third-party-model-bg-default: #1d1d20;
 
   --color-third-party-aws: #141f2e;
   --color-third-party-aws-alt: #192639;
 
   --color-saas-background: #0b0b0e;
-  --color-saas-pricing-grid-bg: #c8ceda33;
+  --color-saas-pricing-grid-bg: rgb(200 206 218 / 0.2);
+
+  --color-dify-logo-dify-logo-blue: #e8e8e8;
+  --color-dify-logo-dify-logo-black: #e8e8e8;
 
 }
diff --git a/web/themes/light.css b/web/themes/light.css
index 97b3b3b4ae..9a0a958bfd 100644
--- a/web/themes/light.css
+++ b/web/themes/light.css
@@ -1,79 +1,79 @@
 /* Attention: Generate by code. Don't update by hand!!! */
 html[data-theme="light"] {
-  --color-components-input-bg-normal: #c8ceda40;
+  --color-components-input-bg-normal: rgb(200 206 218 / 0.25);
   --color-components-input-text-placeholder: #98a2b2;
-  --color-components-input-bg-hover: #c8ceda24;
+  --color-components-input-bg-hover: rgb(200 206 218 / 0.14);
   --color-components-input-bg-active: #f9fafb;
   --color-components-input-border-active: #d0d5dc;
   --color-components-input-border-destructive: #fda29b;
   --color-components-input-text-filled: #101828;
   --color-components-input-bg-destructive: #ffffff;
-  --color-components-input-bg-disabled: #c8ceda24;
+  --color-components-input-bg-disabled: rgb(200 206 218 / 0.14);
   --color-components-input-text-disabled: #d0d5dc;
   --color-components-input-text-filled-disabled: #676f83;
   --color-components-input-border-hover: #d0d5dc;
   --color-components-input-border-active-prompt-1: #0ba5ec;
   --color-components-input-border-active-prompt-2: #155aef;
 
-  --color-components-kbd-bg-gray: #1018280a;
-  --color-components-kbd-bg-white: #ffffff1f;
+  --color-components-kbd-bg-gray: rgb(16 24 40 / 0.04);
+  --color-components-kbd-bg-white: rgb(255 255 255 / 0.12);
 
-  --color-components-tooltip-bg: #fffffff2;
+  --color-components-tooltip-bg: rgb(255 255 255 / 0.95);
 
   --color-components-button-primary-text: #ffffff;
   --color-components-button-primary-bg: #155aef;
-  --color-components-button-primary-border: #1018280a;
+  --color-components-button-primary-border: rgb(16 24 40 / 0.04);
   --color-components-button-primary-bg-hover: #004aeb;
-  --color-components-button-primary-border-hover: #10182814;
-  --color-components-button-primary-bg-disabled: #155aef24;
-  --color-components-button-primary-border-disabled: #ffffff00;
-  --color-components-button-primary-text-disabled: #ffffff99;
+  --color-components-button-primary-border-hover: rgb(16 24 40 / 0.08);
+  --color-components-button-primary-bg-disabled: rgb(21 90 239 / 0.14);
+  --color-components-button-primary-border-disabled: rgb(255 255 255 / 0);
+  --color-components-button-primary-text-disabled: rgb(255 255 255 / 0.6);
 
   --color-components-button-secondary-text: #354052;
-  --color-components-button-secondary-text-disabled: #10182840;
+  --color-components-button-secondary-text-disabled: rgb(16 24 40 / 0.25);
   --color-components-button-secondary-bg: #ffffff;
   --color-components-button-secondary-bg-hover: #f9fafb;
   --color-components-button-secondary-bg-disabled: #f9fafb;
-  --color-components-button-secondary-border: #10182824;
-  --color-components-button-secondary-border-hover: #10182833;
-  --color-components-button-secondary-border-disabled: #1018280a;
+  --color-components-button-secondary-border: rgb(16 24 40 / 0.14);
+  --color-components-button-secondary-border-hover: rgb(16 24 40 / 0.2);
+  --color-components-button-secondary-border-disabled: rgb(16 24 40 / 0.04);
 
   --color-components-button-tertiary-text: #354052;
-  --color-components-button-tertiary-text-disabled: #10182840;
+  --color-components-button-tertiary-text-disabled: rgb(16 24 40 / 0.25);
   --color-components-button-tertiary-bg: #f2f4f7;
   --color-components-button-tertiary-bg-hover: #e9ebf0;
   --color-components-button-tertiary-bg-disabled: #f9fafb;
 
   --color-components-button-ghost-text: #354052;
-  --color-components-button-ghost-text-disabled: #10182840;
-  --color-components-button-ghost-bg-hover: #c8ceda33;
+  --color-components-button-ghost-text-disabled: rgb(16 24 40 / 0.25);
+  --color-components-button-ghost-bg-hover: rgb(200 206 218 / 0.2);
 
   --color-components-button-destructive-primary-text: #ffffff;
-  --color-components-button-destructive-primary-text-disabled: #ffffff99;
+  --color-components-button-destructive-primary-text-disabled: rgb(255 255 255 / 0.6);
   --color-components-button-destructive-primary-bg: #d92d20;
   --color-components-button-destructive-primary-bg-hover: #b42318;
   --color-components-button-destructive-primary-bg-disabled: #fee4e2;
-  --color-components-button-destructive-primary-border: #18181b0a;
-  --color-components-button-destructive-primary-border-hover: #18181b14;
-  --color-components-button-destructive-primary-border-disabled: #ffffff00;
+  --color-components-button-destructive-primary-border: rgb(24 24 27 / 0.04);
+  --color-components-button-destructive-primary-border-hover: rgb(24 24 27 / 0.08);
+  --color-components-button-destructive-primary-border-disabled: rgb(255 255 255 / 0);
 
   --color-components-button-destructive-secondary-text: #d92d20;
-  --color-components-button-destructive-secondary-text-disabled: #f0443833;
+  --color-components-button-destructive-secondary-text-disabled: rgb(240 68 56 / 0.2);
   --color-components-button-destructive-secondary-bg: #ffffff;
   --color-components-button-destructive-secondary-bg-hover: #fef3f2;
   --color-components-button-destructive-secondary-bg-disabled: #fef3f2;
-  --color-components-button-destructive-secondary-border: #18181b14;
-  --color-components-button-destructive-secondary-border-hover: #f0443840;
-  --color-components-button-destructive-secondary-border-disabled: #f044380a;
+  --color-components-button-destructive-secondary-border: rgb(24 24 27 / 0.08);
+  --color-components-button-destructive-secondary-border-hover: rgb(240 68 56 / 0.25);
+  --color-components-button-destructive-secondary-border-disabled: rgb(240 68 56 / 0.04);
 
   --color-components-button-destructive-tertiary-text: #d92d20;
-  --color-components-button-destructive-tertiary-text-disabled: #f0443833;
+  --color-components-button-destructive-tertiary-text-disabled: rgb(240 68 56 / 0.2);
   --color-components-button-destructive-tertiary-bg: #fee4e2;
   --color-components-button-destructive-tertiary-bg-hover: #fecdca;
-  --color-components-button-destructive-tertiary-bg-disabled: #f044380a;
+  --color-components-button-destructive-tertiary-bg-disabled: rgb(240 68 56 / 0.04);
 
   --color-components-button-destructive-ghost-text: #d92d20;
-  --color-components-button-destructive-ghost-text-disabled: #f0443833;
+  --color-components-button-destructive-ghost-text-disabled: rgb(240 68 56 / 0.2);
   --color-components-button-destructive-ghost-bg-hover: #fee4e2;
 
   --color-components-button-secondary-accent-text: #155aef;
@@ -81,22 +81,22 @@ html[data-theme="light"] {
   --color-components-button-secondary-accent-bg: #ffffff;
   --color-components-button-secondary-accent-bg-hover: #f2f4f7;
   --color-components-button-secondary-accent-bg-disabled: #f9fafb;
-  --color-components-button-secondary-accent-border: #10182824;
-  --color-components-button-secondary-accent-border-hover: #10182824;
-  --color-components-button-secondary-accent-border-disabled: #1018280a;
+  --color-components-button-secondary-accent-border: rgb(16 24 40 / 0.14);
+  --color-components-button-secondary-accent-border-hover: rgb(16 24 40 / 0.14);
+  --color-components-button-secondary-accent-border-disabled: rgb(16 24 40 / 0.04);
 
   --color-components-button-indigo-bg: #444ce7;
   --color-components-button-indigo-bg-hover: #3538cd;
-  --color-components-button-indigo-bg-disabled: #6172f324;
+  --color-components-button-indigo-bg-disabled: rgb(97 114 243 / 0.14);
 
   --color-components-checkbox-icon: #ffffff;
-  --color-components-checkbox-icon-disabled: #ffffff80;
+  --color-components-checkbox-icon-disabled: rgb(255 255 255 / 0.5);
   --color-components-checkbox-bg: #155aef;
   --color-components-checkbox-bg-hover: #004aeb;
   --color-components-checkbox-bg-disabled: #f2f4f7;
   --color-components-checkbox-border: #d0d5dc;
   --color-components-checkbox-border-hover: #98a2b2;
-  --color-components-checkbox-border-disabled: #18181b0a;
+  --color-components-checkbox-border-disabled: rgb(24 24 27 / 0.04);
   --color-components-checkbox-bg-unchecked: #ffffff;
   --color-components-checkbox-bg-unchecked-hover: #ffffff;
   --color-components-checkbox-bg-disabled-checked: #b2caff;
@@ -104,15 +104,15 @@ html[data-theme="light"] {
   --color-components-radio-border-checked: #155aef;
   --color-components-radio-border-checked-hover: #004aeb;
   --color-components-radio-border-checked-disabled: #b2caff;
-  --color-components-radio-bg-disabled: #ffffff00;
+  --color-components-radio-bg-disabled: rgb(255 255 255 / 0);
   --color-components-radio-border: #d0d5dc;
   --color-components-radio-border-hover: #98a2b2;
-  --color-components-radio-border-disabled: #18181b0a;
-  --color-components-radio-bg: #ffffff00;
-  --color-components-radio-bg-hover: #ffffff00;
+  --color-components-radio-border-disabled: rgb(24 24 27 / 0.04);
+  --color-components-radio-bg: rgb(255 255 255 / 0);
+  --color-components-radio-bg-hover: rgb(255 255 255 / 0);
 
   --color-components-toggle-knob: #ffffff;
-  --color-components-toggle-knob-disabled: #fffffff2;
+  --color-components-toggle-knob-disabled: rgb(255 255 255 / 0.95);
   --color-components-toggle-bg: #155aef;
   --color-components-toggle-bg-hover: #004aeb;
   --color-components-toggle-bg-disabled: #d1e0ff;
@@ -124,48 +124,52 @@ html[data-theme="light"] {
   --color-components-card-bg: #fcfcfd;
   --color-components-card-border: #ffffff;
   --color-components-card-bg-alt: #ffffff;
+  --color-components-card-bg-transparent: rgb(252 252 253 / 0);
+  --color-components-card-bg-alt-transparent: rgb(255 255 255 / 0);
 
   --color-components-menu-item-text: #495464;
   --color-components-menu-item-text-active: #18222f;
   --color-components-menu-item-text-hover: #354052;
   --color-components-menu-item-text-active-accent: #18222f;
+  --color-components-menu-item-bg-active: rgb(21 90 239 / 0.08);
+  --color-components-menu-item-bg-hover: rgb(200 206 218 / 0.2);
 
   --color-components-panel-bg: #ffffff;
-  --color-components-panel-bg-blur: #fffffff2;
-  --color-components-panel-border: #10182814;
-  --color-components-panel-border-subtle: #10182814;
+  --color-components-panel-bg-blur: rgb(255 255 255 / 0.95);
+  --color-components-panel-border: rgb(16 24 40 / 0.08);
+  --color-components-panel-border-subtle: rgb(16 24 40 / 0.08);
   --color-components-panel-gradient-2: #f9fafb;
   --color-components-panel-gradient-1: #ffffff;
   --color-components-panel-bg-alt: #f9fafb;
   --color-components-panel-on-panel-item-bg: #ffffff;
   --color-components-panel-on-panel-item-bg-hover: #f9fafb;
   --color-components-panel-on-panel-item-bg-alt: #f9fafb;
-  --color-components-panel-on-panel-item-bg-transparent: #fffffff2;
-  --color-components-panel-on-panel-item-bg-hover-transparent: #f9fafb00;
-  --color-components-panel-on-panel-item-bg-destructive-hover-transparent: #fef3f200;
+  --color-components-panel-on-panel-item-bg-transparent: rgb(255 255 255 / 0.95);
+  --color-components-panel-on-panel-item-bg-hover-transparent: rgb(249 250 251 / 0);
+  --color-components-panel-on-panel-item-bg-destructive-hover-transparent: rgb(254 243 242 / 0);
 
-  --color-components-panel-bg-transparent: #ffffff00;
+  --color-components-panel-bg-transparent: rgb(255 255 255 / 0);
 
   --color-components-main-nav-nav-button-text: #495464;
   --color-components-main-nav-nav-button-text-active: #155aef;
-  --color-components-main-nav-nav-button-bg: #ffffff00;
+  --color-components-main-nav-nav-button-bg: rgb(255 255 255 / 0);
   --color-components-main-nav-nav-button-bg-active: #fcfcfd;
-  --color-components-main-nav-nav-button-border: #fffffff2;
-  --color-components-main-nav-nav-button-bg-hover: #1018280a;
+  --color-components-main-nav-nav-button-border: rgb(255 255 255 / 0.95);
+  --color-components-main-nav-nav-button-bg-hover: rgb(16 24 40 / 0.04);
 
   --color-components-main-nav-nav-user-border: #ffffff;
 
   --color-components-slider-knob: #ffffff;
   --color-components-slider-knob-hover: #ffffff;
-  --color-components-slider-knob-disabled: #fffffff2;
+  --color-components-slider-knob-disabled: rgb(255 255 255 / 0.95);
   --color-components-slider-range: #296dff;
   --color-components-slider-track: #e9ebf0;
-  --color-components-slider-knob-border-hover: #10182833;
-  --color-components-slider-knob-border: #10182824;
+  --color-components-slider-knob-border-hover: rgb(16 24 40 / 0.2);
+  --color-components-slider-knob-border: rgb(16 24 40 / 0.14);
 
   --color-components-segmented-control-item-active-bg: #ffffff;
   --color-components-segmented-control-item-active-border: #ffffff;
-  --color-components-segmented-control-bg-normal: #c8ceda33;
+  --color-components-segmented-control-bg-normal: rgb(200 206 218 / 0.2);
   --color-components-segmented-control-item-active-accent-bg: #ffffff;
   --color-components-segmented-control-item-active-accent-border: #ffffff;
 
@@ -181,94 +185,94 @@ html[data-theme="light"] {
   --color-components-badge-white-to-dark: #ffffff;
   --color-components-badge-status-light-success-bg: #47cd89;
   --color-components-badge-status-light-success-border-inner: #17b26a;
-  --color-components-badge-status-light-success-halo: #17b26a40;
+  --color-components-badge-status-light-success-halo: rgb(23 178 106 / 0.25);
 
   --color-components-badge-status-light-border-outer: #ffffff;
-  --color-components-badge-status-light-high-light: #ffffff4d;
+  --color-components-badge-status-light-high-light: rgb(255 255 255 / 0.3);
   --color-components-badge-status-light-warning-bg: #fdb022;
   --color-components-badge-status-light-warning-border-inner: #f79009;
-  --color-components-badge-status-light-warning-halo: #f7900940;
+  --color-components-badge-status-light-warning-halo: rgb(247 144 9 / 0.25);
 
   --color-components-badge-status-light-error-bg: #f97066;
   --color-components-badge-status-light-error-border-inner: #f04438;
-  --color-components-badge-status-light-error-halo: #f0443840;
+  --color-components-badge-status-light-error-halo: rgb(240 68 56 / 0.25);
 
   --color-components-badge-status-light-normal-bg: #36bffa;
   --color-components-badge-status-light-normal-border-inner: #0ba5ec;
-  --color-components-badge-status-light-normal-halo: #0ba5ec40;
+  --color-components-badge-status-light-normal-halo: rgb(11 165 236 / 0.25);
 
   --color-components-badge-status-light-disabled-bg: #98a2b2;
   --color-components-badge-status-light-disabled-border-inner: #676f83;
-  --color-components-badge-status-light-disabled-halo: #1018280a;
+  --color-components-badge-status-light-disabled-halo: rgb(16 24 40 / 0.04);
 
-  --color-components-badge-bg-green-soft: #17b26a14;
-  --color-components-badge-bg-orange-soft: #f7900914;
-  --color-components-badge-bg-red-soft: #f0443814;
-  --color-components-badge-bg-blue-light-soft: #0ba5ec14;
-  --color-components-badge-bg-gray-soft: #1018280a;
-  --color-components-badge-bg-dimm: #ffffff0d;
+  --color-components-badge-bg-green-soft: rgb(23 178 106 / 0.08);
+  --color-components-badge-bg-orange-soft: rgb(247 144 9 / 0.08);
+  --color-components-badge-bg-red-soft: rgb(240 68 56 / 0.08);
+  --color-components-badge-bg-blue-light-soft: rgb(11 165 236 / 0.08);
+  --color-components-badge-bg-gray-soft: rgb(16 24 40 / 0.04);
+  --color-components-badge-bg-dimm: rgb(255 255 255 / 0.05);
 
   --color-components-chart-line: #296dff;
-  --color-components-chart-area-1: #155aef24;
-  --color-components-chart-area-2: #155aef0a;
+  --color-components-chart-area-1: rgb(21 90 239 / 0.14);
+  --color-components-chart-area-2: rgb(21 90 239 / 0.04);
   --color-components-chart-current-1: #155aef;
   --color-components-chart-current-2: #d1e0ff;
   --color-components-chart-bg: #ffffff;
 
-  --color-components-actionbar-bg: #fffffff2;
-  --color-components-actionbar-border: #1018280a;
+  --color-components-actionbar-bg: rgb(255 255 255 / 0.95);
+  --color-components-actionbar-border: rgb(16 24 40 / 0.04);
   --color-components-actionbar-bg-accent: #f5f7ff;
   --color-components-actionbar-border-accent: #b2caff;
 
   --color-components-dropzone-bg-alt: #f2f4f7;
   --color-components-dropzone-bg: #f9fafb;
-  --color-components-dropzone-bg-accent: #155aef24;
-  --color-components-dropzone-border: #10182814;
-  --color-components-dropzone-border-alt: #10182833;
+  --color-components-dropzone-bg-accent: rgb(21 90 239 / 0.14);
+  --color-components-dropzone-border: rgb(16 24 40 / 0.08);
+  --color-components-dropzone-border-alt: rgb(16 24 40 / 0.2);
   --color-components-dropzone-border-accent: #84abff;
 
   --color-components-progress-brand-progress: #296dff;
   --color-components-progress-brand-border: #296dff;
-  --color-components-progress-brand-bg: #155aef0a;
+  --color-components-progress-brand-bg: rgb(21 90 239 / 0.04);
 
   --color-components-progress-white-progress: #ffffff;
-  --color-components-progress-white-border: #fffffff2;
-  --color-components-progress-white-bg: #ffffff03;
+  --color-components-progress-white-border: rgb(255 255 255 / 0.95);
+  --color-components-progress-white-bg: rgb(255 255 255 / 0.01);
 
   --color-components-progress-gray-progress: #98a2b2;
   --color-components-progress-gray-border: #98a2b2;
-  --color-components-progress-gray-bg: #c8ceda05;
+  --color-components-progress-gray-bg: rgb(200 206 218 / 0.02);
 
   --color-components-progress-warning-progress: #f79009;
   --color-components-progress-warning-border: #f79009;
-  --color-components-progress-warning-bg: #f790090a;
+  --color-components-progress-warning-bg: rgb(247 144 9 / 0.04);
 
   --color-components-progress-error-progress: #f04438;
   --color-components-progress-error-border: #f04438;
-  --color-components-progress-error-bg: #f044380a;
+  --color-components-progress-error-bg: rgb(240 68 56 / 0.04);
 
   --color-components-chat-input-audio-bg: #eff4ff;
-  --color-components-chat-input-audio-wave-default: #155aef33;
-  --color-components-chat-input-bg-mask-1: #ffffff03;
+  --color-components-chat-input-audio-wave-default: rgb(21 90 239 / 0.2);
+  --color-components-chat-input-bg-mask-1: rgb(255 255 255 / 0.01);
   --color-components-chat-input-bg-mask-2: #f2f4f7;
   --color-components-chat-input-border: #ffffff;
   --color-components-chat-input-audio-wave-active: #296dff;
   --color-components-chat-input-audio-bg-alt: #fcfcfd;
 
   --color-components-avatar-shape-fill-stop-0: #ffffff;
-  --color-components-avatar-shape-fill-stop-100: #ffffffe6;
+  --color-components-avatar-shape-fill-stop-100: rgb(255 255 255 / 0.9);
 
-  --color-components-avatar-bg-mask-stop-0: #ffffff1f;
-  --color-components-avatar-bg-mask-stop-100: #ffffff14;
+  --color-components-avatar-bg-mask-stop-0: rgb(255 255 255 / 0.12);
+  --color-components-avatar-bg-mask-stop-100: rgb(255 255 255 / 0.08);
 
   --color-components-avatar-default-avatar-bg: #d0d5dc;
-  --color-components-avatar-mask-darkmode-dimmed: #ffffff00;
+  --color-components-avatar-mask-darkmode-dimmed: rgb(255 255 255 / 0);
 
   --color-components-label-gray: #f2f4f7;
 
   --color-components-premium-badge-blue-bg-stop-0: #5289ff;
   --color-components-premium-badge-blue-bg-stop-100: #155aef;
-  --color-components-premium-badge-blue-stroke-stop-0: #fffffff2;
+  --color-components-premium-badge-blue-stroke-stop-0: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-blue-stroke-stop-100: #155aef;
   --color-components-premium-badge-blue-text-stop-0: #f5f7ff;
   --color-components-premium-badge-blue-text-stop-100: #d1e0ff;
@@ -276,14 +280,14 @@ html[data-theme="light"] {
   --color-components-premium-badge-blue-bg-stop-0-hover: #296dff;
   --color-components-premium-badge-blue-bg-stop-100-hover: #004aeb;
   --color-components-premium-badge-blue-glow-hover: #84abff;
-  --color-components-premium-badge-blue-stroke-stop-0-hover: #fffffff2;
+  --color-components-premium-badge-blue-stroke-stop-0-hover: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-blue-stroke-stop-100-hover: #00329e;
 
-  --color-components-premium-badge-highlight-stop-0: #ffffff1f;
-  --color-components-premium-badge-highlight-stop-100: #ffffff4d;
+  --color-components-premium-badge-highlight-stop-0: rgb(255 255 255 / 0.12);
+  --color-components-premium-badge-highlight-stop-100: rgb(255 255 255 / 0.3);
   --color-components-premium-badge-indigo-bg-stop-0: #8098f9;
   --color-components-premium-badge-indigo-bg-stop-100: #444ce7;
-  --color-components-premium-badge-indigo-stroke-stop-0: #fffffff2;
+  --color-components-premium-badge-indigo-stroke-stop-0: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-indigo-stroke-stop-100: #6172f3;
   --color-components-premium-badge-indigo-text-stop-0: #f5f8ff;
   --color-components-premium-badge-indigo-text-stop-100: #e0eaff;
@@ -291,12 +295,12 @@ html[data-theme="light"] {
   --color-components-premium-badge-indigo-glow-hover: #a4bcfd;
   --color-components-premium-badge-indigo-bg-stop-0-hover: #6172f3;
   --color-components-premium-badge-indigo-bg-stop-100-hover: #2d31a6;
-  --color-components-premium-badge-indigo-stroke-stop-0-hover: #fffffff2;
+  --color-components-premium-badge-indigo-stroke-stop-0-hover: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-indigo-stroke-stop-100-hover: #2d31a6;
 
   --color-components-premium-badge-grey-bg-stop-0: #98a2b2;
   --color-components-premium-badge-grey-bg-stop-100: #676f83;
-  --color-components-premium-badge-grey-stroke-stop-0: #fffffff2;
+  --color-components-premium-badge-grey-stroke-stop-0: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-grey-stroke-stop-100: #676f83;
   --color-components-premium-badge-grey-text-stop-0: #fcfcfd;
   --color-components-premium-badge-grey-text-stop-100: #f2f4f7;
@@ -304,12 +308,12 @@ html[data-theme="light"] {
   --color-components-premium-badge-grey-glow-hover: #d0d5dc;
   --color-components-premium-badge-grey-bg-stop-0-hover: #676f83;
   --color-components-premium-badge-grey-bg-stop-100-hover: #354052;
-  --color-components-premium-badge-grey-stroke-stop-0-hover: #fffffff2;
+  --color-components-premium-badge-grey-stroke-stop-0-hover: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-grey-stroke-stop-100-hover: #354052;
 
   --color-components-premium-badge-orange-bg-stop-0: #ff692e;
   --color-components-premium-badge-orange-bg-stop-100: #e04f16;
-  --color-components-premium-badge-orange-stroke-stop-0: #fffffff2;
+  --color-components-premium-badge-orange-stroke-stop-0: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-orange-stroke-stop-100: #e62e05;
   --color-components-premium-badge-orange-text-stop-0: #fefaf5;
   --color-components-premium-badge-orange-text-stop-100: #fdead7;
@@ -317,14 +321,14 @@ html[data-theme="light"] {
   --color-components-premium-badge-orange-glow-hover: #f7b27a;
   --color-components-premium-badge-orange-bg-stop-0-hover: #ff4405;
   --color-components-premium-badge-orange-bg-stop-100-hover: #b93815;
-  --color-components-premium-badge-orange-stroke-stop-0-hover: #fffffff2;
+  --color-components-premium-badge-orange-stroke-stop-0-hover: rgb(255 255 255 / 0.95);
   --color-components-premium-badge-orange-stroke-stop-100-hover: #bc1b06;
 
-  --color-components-progress-bar-bg: #155aef0a;
-  --color-components-progress-bar-progress: #155aef24;
-  --color-components-progress-bar-border: #1018280a;
+  --color-components-progress-bar-bg: rgb(21 90 239 / 0.04);
+  --color-components-progress-bar-progress: rgb(21 90 239 / 0.14);
+  --color-components-progress-bar-border: rgb(16 24 40 / 0.04);
   --color-components-progress-bar-progress-solid: #296dff;
-  --color-components-progress-bar-progress-highlight: #155aef33;
+  --color-components-progress-bar-progress-highlight: rgb(21 90 239 / 0.2);
 
   --color-components-icon-bg-red-solid: #d92d20;
   --color-components-icon-bg-rose-solid: #e31b54;
@@ -356,7 +360,7 @@ html[data-theme="light"] {
   --color-text-primary: #101828;
   --color-text-secondary: #354052;
   --color-text-tertiary: #676f83;
-  --color-text-quaternary: #1018284d;
+  --color-text-quaternary: rgb(16 24 40 / 0.3);
   --color-text-destructive: #d92d20;
   --color-text-success: #079455;
   --color-text-warning: #dc6803;
@@ -369,75 +373,80 @@ html[data-theme="light"] {
   --color-text-disabled: #d0d5dc;
   --color-text-accent-secondary: #296dff;
   --color-text-accent-light-mode-only: #155aef;
-  --color-text-text-selected: #155aef24;
-  --color-text-secondary-on-surface: #ffffffe6;
+  --color-text-text-selected: rgb(21 90 239 / 0.14);
+  --color-text-secondary-on-surface: rgb(255 255 255 / 0.9);
   --color-text-logo-text: #18222f;
   --color-text-empty-state-icon: #d0d5dc;
   --color-text-inverted: #000000;
-  --color-text-inverted-dimmed: #000000f2;
+  --color-text-inverted-dimmed: rgb(0 0 0 / 0.95);
 
   --color-background-body: #f2f4f7;
   --color-background-default-subtle: #fcfcfd;
   --color-background-neutral-subtle: #f9fafb;
-  --color-background-sidenav-bg: #ffffffcc;
+  --color-background-sidenav-bg: rgb(255 255 255 / 0.8);
   --color-background-default: #ffffff;
   --color-background-soft: #f9fafb;
   --color-background-gradient-bg-fill-chat-bg-1: #f9fafb;
   --color-background-gradient-bg-fill-chat-bg-2: #f2f4f7;
   --color-background-gradient-bg-fill-chat-bubble-bg-1: #ffffff;
-  --color-background-gradient-bg-fill-chat-bubble-bg-2: #ffffff99;
-  --color-background-gradient-bg-fill-chat-bubble-bg-3: #e1effe;
-  --color-background-gradient-bg-fill-debug-bg-1: #ffffff00;
-  --color-background-gradient-bg-fill-debug-bg-2: #c8ceda24;
-
-  --color-background-gradient-mask-gray: #c8ceda33;
-  --color-background-gradient-mask-transparent: #ffffff00;
-  --color-background-gradient-mask-input-clear-2: #e9ebf000;
+  --color-background-gradient-bg-fill-chat-bubble-bg-2: rgb(255 255 255 / 0.6);
+  --color-background-gradient-bg-fill-debug-bg-1: rgb(255 255 255 / 0);
+  --color-background-gradient-bg-fill-debug-bg-2: rgb(200 206 218 / 0.14);
+
+  --color-background-gradient-mask-gray: rgb(200 206 218 / 0.2);
+  --color-background-gradient-mask-transparent: rgb(255 255 255 / 0);
+  --color-background-gradient-mask-input-clear-2: rgb(233 235 240 / 0);
   --color-background-gradient-mask-input-clear-1: #e9ebf0;
-  --color-background-gradient-mask-transparent-dark: #00000000;
-  --color-background-gradient-mask-side-panel-2: #1018284d;
-  --color-background-gradient-mask-side-panel-1: #10182805;
+  --color-background-gradient-mask-transparent-dark: rgb(0 0 0 / 0);
+  --color-background-gradient-mask-side-panel-2: rgb(16 24 40 / 0.3);
+  --color-background-gradient-mask-side-panel-1: rgb(16 24 40 / 0.02);
 
   --color-background-default-burn: #e9ebf0;
-  --color-background-overlay-fullscreen: #f9fafbf2;
-  --color-background-default-lighter: #ffffff80;
+  --color-background-overlay-fullscreen: rgb(249 250 251 / 0.95);
+  --color-background-default-lighter: rgb(255 255 255 / 0.5);
   --color-background-section: #f9fafb;
-  --color-background-interaction-from-bg-1: #c8ceda33;
-  --color-background-interaction-from-bg-2: #c8ceda24;
+  --color-background-interaction-from-bg-1: rgb(200 206 218 / 0.2);
+  --color-background-interaction-from-bg-2: rgb(200 206 218 / 0.14);
   --color-background-section-burn: #f2f4f7;
   --color-background-default-dodge: #ffffff;
-  --color-background-overlay: #10182899;
+  --color-background-overlay: rgb(16 24 40 / 0.6);
   --color-background-default-dimmed: #e9ebf0;
   --color-background-default-hover: #f9fafb;
-  --color-background-overlay-alt: #10182866;
-  --color-background-surface-white: #fffffff2;
-  --color-background-overlay-destructive: #f044384d;
-  --color-background-overlay-backdrop: #f2f4f7f2;
-
-  --color-shadow-shadow-1: #09090b08;
-  --color-shadow-shadow-3: #09090b0d;
-  --color-shadow-shadow-4: #09090b0f;
-  --color-shadow-shadow-5: #09090b14;
-  --color-shadow-shadow-6: #09090b1a;
-  --color-shadow-shadow-7: #09090b1f;
-  --color-shadow-shadow-8: #09090b24;
-  --color-shadow-shadow-9: #09090b2e;
-  --color-shadow-shadow-2: #09090b0a;
-  --color-shadow-shadow-10: #09090b0d;
+  --color-background-overlay-alt: rgb(16 24 40 / 0.4);
+  --color-background-surface-white: rgb(255 255 255 / 0.95);
+  --color-background-overlay-destructive: rgb(240 68 56 / 0.3);
+  --color-background-overlay-backdrop: rgb(242 244 247 / 0.95);
+  --color-background-body-transparent: rgb(242 244 247 / 0);
+
+  --color-shadow-shadow-1: rgb(9 9 11 / 0.03);
+  --color-shadow-shadow-3: rgb(9 9 11 / 0.05);
+  --color-shadow-shadow-4: rgb(9 9 11 / 0.06);
+  --color-shadow-shadow-5: rgb(9 9 11 / 0.08);
+  --color-shadow-shadow-6: rgb(9 9 11 / 0.1);
+  --color-shadow-shadow-7: rgb(9 9 11 / 0.12);
+  --color-shadow-shadow-8: rgb(9 9 11 / 0.14);
+  --color-shadow-shadow-9: rgb(9 9 11 / 0.18);
+  --color-shadow-shadow-2: rgb(9 9 11 / 0.04);
+  --color-shadow-shadow-10: rgb(9 9 11 / 0.05);
 
   --color-workflow-block-border: #ffffff;
   --color-workflow-block-parma-bg: #f2f4f7;
   --color-workflow-block-bg: #fcfcfd;
-  --color-workflow-block-bg-transparent: #fcfcfde6;
-  --color-workflow-block-border-highlight: #155aef24;
+  --color-workflow-block-bg-transparent: rgb(252 252 253 / 0.9);
+  --color-workflow-block-border-highlight: rgb(21 90 239 / 0.14);
+  --color-workflow-block-wrapper-bg-1: #e9ebf0;
+  --color-workflow-block-wrapper-bg-2: rgb(233 235 240 / 0.2);
 
-  --color-workflow-canvas-workflow-dot-color: #8585ad26;
+  --color-workflow-canvas-workflow-dot-color: rgb(133 133 173 / 0.15);
   --color-workflow-canvas-workflow-bg: #f2f4f7;
+  --color-workflow-canvas-workflow-top-bar-1: #f2f4f7;
+  --color-workflow-canvas-workflow-top-bar-2: rgb(242 244 247 / 0.24);
+  --color-workflow-canvas-canvas-overlay: rgb(242 244 247 / 0.8);
 
   --color-workflow-link-line-active: #296dff;
   --color-workflow-link-line-normal: #d0d5dc;
   --color-workflow-link-line-handle: #296dff;
-  --color-workflow-link-line-normal-transparent: #d0d5dc33;
+  --color-workflow-link-line-normal-transparent: rgb(208 213 220 / 0.2);
   --color-workflow-link-line-failure-active: #f79009;
   --color-workflow-link-line-failure-handle: #f79009;
   --color-workflow-link-line-failure-button-bg: #dc6803;
@@ -450,73 +459,74 @@ html[data-theme="light"] {
   --color-workflow-link-line-error-handle: #f04438;
 
   --color-workflow-minimap-bg: #e9ebf0;
-  --color-workflow-minimap-block: #c8ceda4d;
+  --color-workflow-minimap-block: rgb(200 206 218 / 0.3);
 
   --color-workflow-display-success-bg: #ecfdf3;
-  --color-workflow-display-success-border-1: #17b26acc;
-  --color-workflow-display-success-border-2: #17b26a80;
-  --color-workflow-display-success-vignette-color: #17b26a33;
-  --color-workflow-display-success-bg-line-pattern: #17b26a4d;
-
-  --color-workflow-display-glass-1: #ffffff1f;
-  --color-workflow-display-glass-2: #ffffff80;
-  --color-workflow-display-vignette-dark: #0000001f;
-  --color-workflow-display-highlight: #ffffff80;
-  --color-workflow-display-outline: #0000000d;
+  --color-workflow-display-success-border-1: rgb(23 178 106 / 0.8);
+  --color-workflow-display-success-border-2: rgb(23 178 106 / 0.5);
+  --color-workflow-display-success-vignette-color: rgb(23 178 106 / 0.2);
+  --color-workflow-display-success-bg-line-pattern: rgb(23 178 106 / 0.3);
+
+  --color-workflow-display-glass-1: rgb(255 255 255 / 0.12);
+  --color-workflow-display-glass-2: rgb(255 255 255 / 0.5);
+  --color-workflow-display-vignette-dark: rgb(0 0 0 / 0.12);
+  --color-workflow-display-highlight: rgb(255 255 255 / 0.5);
+  --color-workflow-display-outline: rgb(0 0 0 / 0.05);
   --color-workflow-display-error-bg: #fef3f2;
-  --color-workflow-display-error-bg-line-pattern: #f044384d;
-  --color-workflow-display-error-border-1: #f04438cc;
-  --color-workflow-display-error-border-2: #f0443880;
-  --color-workflow-display-error-vignette-color: #f0443833;
+  --color-workflow-display-error-bg-line-pattern: rgb(240 68 56 / 0.3);
+  --color-workflow-display-error-border-1: rgb(240 68 56 / 0.8);
+  --color-workflow-display-error-border-2: rgb(240 68 56 / 0.5);
+  --color-workflow-display-error-vignette-color: rgb(240 68 56 / 0.2);
 
   --color-workflow-display-warning-bg: #fffaeb;
-  --color-workflow-display-warning-bg-line-pattern: #f790094d;
-  --color-workflow-display-warning-border-1: #f79009cc;
-  --color-workflow-display-warning-border-2: #f7900980;
-  --color-workflow-display-warning-vignette-color: #f7900933;
+  --color-workflow-display-warning-bg-line-pattern: rgb(247 144 9 / 0.3);
+  --color-workflow-display-warning-border-1: rgb(247 144 9 / 0.8);
+  --color-workflow-display-warning-border-2: rgb(247 144 9 / 0.5);
+  --color-workflow-display-warning-vignette-color: rgb(247 144 9 / 0.2);
 
   --color-workflow-display-normal-bg: #f0f9ff;
-  --color-workflow-display-normal-bg-line-pattern: #0ba5ec4d;
-  --color-workflow-display-normal-border-1: #0ba5eccc;
-  --color-workflow-display-normal-border-2: #0ba5ec80;
-  --color-workflow-display-normal-vignette-color: #0ba5ec33;
+  --color-workflow-display-normal-bg-line-pattern: rgb(11 165 236 / 0.3);
+  --color-workflow-display-normal-border-1: rgb(11 165 236 / 0.8);
+  --color-workflow-display-normal-border-2: rgb(11 165 236 / 0.5);
+  --color-workflow-display-normal-vignette-color: rgb(11 165 236 / 0.2);
 
   --color-workflow-display-disabled-bg: #f9fafb;
-  --color-workflow-display-disabled-bg-line-pattern: #c8ceda4d;
-  --color-workflow-display-disabled-border-1: #c8ceda99;
-  --color-workflow-display-disabled-border-2: #c8ceda66;
-  --color-workflow-display-disabled-vignette-color: #c8ceda66;
-  --color-workflow-display-disabled-outline: #00000000;
-
-  --color-workflow-workflow-progress-bg-1: #c8ceda33;
-  --color-workflow-workflow-progress-bg-2: #c8ceda0a;
-
-  --color-divider-subtle: #1018280a;
-  --color-divider-regular: #10182814;
-  --color-divider-deep: #10182824;
-  --color-divider-burn: #1018280a;
-  --color-divider-intense: #1018284d;
+  --color-workflow-display-disabled-bg-line-pattern: rgb(200 206 218 / 0.3);
+  --color-workflow-display-disabled-border-1: rgb(200 206 218 / 0.6);
+  --color-workflow-display-disabled-border-2: rgb(200 206 218 / 0.4);
+  --color-workflow-display-disabled-vignette-color: rgb(200 206 218 / 0.4);
+  --color-workflow-display-disabled-outline: rgb(0 0 0 / 0);
+
+  --color-workflow-workflow-progress-bg-1: rgb(200 206 218 / 0.2);
+  --color-workflow-workflow-progress-bg-2: rgb(200 206 218 / 0.04);
+
+  --color-divider-subtle: rgb(16 24 40 / 0.04);
+  --color-divider-regular: rgb(16 24 40 / 0.08);
+  --color-divider-deep: rgb(16 24 40 / 0.14);
+  --color-divider-burn: rgb(16 24 40 / 0.04);
+  --color-divider-intense: rgb(16 24 40 / 0.3);
   --color-divider-solid: #d0d5dc;
   --color-divider-solid-alt: #98a2b2;
 
-  --color-state-base-hover: #c8ceda33;
-  --color-state-base-active: #c8ceda66;
-  --color-state-base-hover-alt: #c8ceda66;
-  --color-state-base-handle: #10182833;
-  --color-state-base-handle-hover: #1018284d;
-  --color-state-base-hover-subtle: #c8ceda14;
+  --color-state-base-hover: rgb(200 206 218 / 0.2);
+  --color-state-base-active: rgb(200 206 218 / 0.4);
+  --color-state-base-hover-alt: rgb(200 206 218 / 0.4);
+  --color-state-base-handle: rgb(16 24 40 / 0.2);
+  --color-state-base-handle-hover: rgb(16 24 40 / 0.3);
+  --color-state-base-hover-subtle: rgb(200 206 218 / 0.08);
 
   --color-state-accent-hover: #eff4ff;
-  --color-state-accent-active: #155aef14;
+  --color-state-accent-active: rgb(21 90 239 / 0.08);
   --color-state-accent-hover-alt: #d1e0ff;
   --color-state-accent-solid: #296dff;
-  --color-state-accent-active-alt: #155aef24;
+  --color-state-accent-active-alt: rgb(21 90 239 / 0.14);
 
   --color-state-destructive-hover: #fef3f2;
   --color-state-destructive-hover-alt: #fee4e2;
   --color-state-destructive-active: #fecdca;
   --color-state-destructive-solid: #f04438;
   --color-state-destructive-border: #fda29b;
+  --color-state-destructive-hover-transparent: rgb(254 243 242 / 0);
 
   --color-state-success-hover: #ecfdf3;
   --color-state-success-hover-alt: #dcfae6;
@@ -527,10 +537,12 @@ html[data-theme="light"] {
   --color-state-warning-hover-alt: #fef0c7;
   --color-state-warning-active: #fedf89;
   --color-state-warning-solid: #f79009;
+  --color-state-warning-hover-transparent: rgb(255 250 235 / 0);
 
   --color-effects-highlight: #ffffff;
-  --color-effects-highlight-lightmode-off: #ffffff00;
+  --color-effects-highlight-lightmode-off: rgb(255 255 255 / 0);
   --color-effects-image-frame: #ffffff;
+  --color-effects-icon-border: rgb(16 24 40 / 0.08);
 
   --color-util-colors-orange-dark-orange-dark-50: #fff4ed;
   --color-util-colors-orange-dark-orange-dark-100: #ffe6d5;
@@ -549,7 +561,7 @@ html[data-theme="light"] {
   --color-util-colors-orange-orange-500: #ef6820;
   --color-util-colors-orange-orange-600: #e04f16;
   --color-util-colors-orange-orange-700: #b93815;
-  --color-util-colors-orange-orange-100-transparent: #fdead700;
+  --color-util-colors-orange-orange-100-transparent: rgb(253 234 215 / 0);
 
   --color-util-colors-pink-pink-50: #fdf2fa;
   --color-util-colors-pink-pink-100: #fce7f6;
@@ -722,8 +734,6 @@ html[data-theme="light"] {
   --color-util-colors-midnight-midnight-600: #5d698d;
   --color-util-colors-midnight-midnight-700: #3e465e;
 
-  --color-third-party-Arize: #000000;
-  --color-third-party-Phoenix: #000000;
   --color-third-party-LangChain: #1c3c3c;
   --color-third-party-Langfuse: #000000;
   --color-third-party-Github: #1b1f24;
@@ -737,6 +747,9 @@ html[data-theme="light"] {
   --color-third-party-aws-alt: #0f1824;
 
   --color-saas-background: #fcfcfd;
-  --color-saas-pricing-grid-bg: #c8ceda80;
+  --color-saas-pricing-grid-bg: rgb(200 206 218 / 0.5);
+
+  --color-dify-logo-dify-logo-blue: #0033ff;
+  --color-dify-logo-dify-logo-black: #000000;
 
 }
diff --git a/web/themes/tailwind-theme-var-define.ts b/web/themes/tailwind-theme-var-define.ts
index 935228199d..66a34b06ca 100644
--- a/web/themes/tailwind-theme-var-define.ts
+++ b/web/themes/tailwind-theme-var-define.ts
@@ -124,11 +124,15 @@ const vars = {
   'components-card-bg': 'var(--color-components-card-bg)',
   'components-card-border': 'var(--color-components-card-border)',
   'components-card-bg-alt': 'var(--color-components-card-bg-alt)',
+  'components-card-bg-transparent': 'var(--color-components-card-bg-transparent)',
+  'components-card-bg-alt-transparent': 'var(--color-components-card-bg-alt-transparent)',
 
   'components-menu-item-text': 'var(--color-components-menu-item-text)',
   'components-menu-item-text-active': 'var(--color-components-menu-item-text-active)',
   'components-menu-item-text-hover': 'var(--color-components-menu-item-text-hover)',
   'components-menu-item-text-active-accent': 'var(--color-components-menu-item-text-active-accent)',
+  'components-menu-item-bg-active': 'var(--color-components-menu-item-bg-active)',
+  'components-menu-item-bg-hover': 'var(--color-components-menu-item-bg-hover)',
 
   'components-panel-bg': 'var(--color-components-panel-bg)',
   'components-panel-bg-blur': 'var(--color-components-panel-bg-blur)',
@@ -386,7 +390,6 @@ const vars = {
   'background-gradient-bg-fill-chat-bg-2': 'var(--color-background-gradient-bg-fill-chat-bg-2)',
   'background-gradient-bg-fill-chat-bubble-bg-1': 'var(--color-background-gradient-bg-fill-chat-bubble-bg-1)',
   'background-gradient-bg-fill-chat-bubble-bg-2': 'var(--color-background-gradient-bg-fill-chat-bubble-bg-2)',
-  'background-gradient-bg-fill-chat-bubble-bg-3': 'var(--color-background-gradient-bg-fill-chat-bubble-bg-3)',
   'background-gradient-bg-fill-debug-bg-1': 'var(--color-background-gradient-bg-fill-debug-bg-1)',
   'background-gradient-bg-fill-debug-bg-2': 'var(--color-background-gradient-bg-fill-debug-bg-2)',
 
@@ -413,6 +416,7 @@ const vars = {
   'background-surface-white': 'var(--color-background-surface-white)',
   'background-overlay-destructive': 'var(--color-background-overlay-destructive)',
   'background-overlay-backdrop': 'var(--color-background-overlay-backdrop)',
+  'background-body-transparent': 'var(--color-background-body-transparent)',
 
   'shadow-shadow-1': 'var(--color-shadow-shadow-1)',
   'shadow-shadow-3': 'var(--color-shadow-shadow-3)',
@@ -430,9 +434,14 @@ const vars = {
   'workflow-block-bg': 'var(--color-workflow-block-bg)',
   'workflow-block-bg-transparent': 'var(--color-workflow-block-bg-transparent)',
   'workflow-block-border-highlight': 'var(--color-workflow-block-border-highlight)',
+  'workflow-block-wrapper-bg-1': 'var(--color-workflow-block-wrapper-bg-1)',
+  'workflow-block-wrapper-bg-2': 'var(--color-workflow-block-wrapper-bg-2)',
 
   'workflow-canvas-workflow-dot-color': 'var(--color-workflow-canvas-workflow-dot-color)',
   'workflow-canvas-workflow-bg': 'var(--color-workflow-canvas-workflow-bg)',
+  'workflow-canvas-workflow-top-bar-1': 'var(--color-workflow-canvas-workflow-top-bar-1)',
+  'workflow-canvas-workflow-top-bar-2': 'var(--color-workflow-canvas-workflow-top-bar-2)',
+  'workflow-canvas-canvas-overlay': 'var(--color-workflow-canvas-canvas-overlay)',
 
   'workflow-link-line-active': 'var(--color-workflow-link-line-active)',
   'workflow-link-line-normal': 'var(--color-workflow-link-line-normal)',
@@ -517,6 +526,7 @@ const vars = {
   'state-destructive-active': 'var(--color-state-destructive-active)',
   'state-destructive-solid': 'var(--color-state-destructive-solid)',
   'state-destructive-border': 'var(--color-state-destructive-border)',
+  'state-destructive-hover-transparent': 'var(--color-state-destructive-hover-transparent)',
 
   'state-success-hover': 'var(--color-state-success-hover)',
   'state-success-hover-alt': 'var(--color-state-success-hover-alt)',
@@ -527,10 +537,12 @@ const vars = {
   'state-warning-hover-alt': 'var(--color-state-warning-hover-alt)',
   'state-warning-active': 'var(--color-state-warning-active)',
   'state-warning-solid': 'var(--color-state-warning-solid)',
+  'state-warning-hover-transparent': 'var(--color-state-warning-hover-transparent)',
 
   'effects-highlight': 'var(--color-effects-highlight)',
   'effects-highlight-lightmode-off': 'var(--color-effects-highlight-lightmode-off)',
   'effects-image-frame': 'var(--color-effects-image-frame)',
+  'effects-icon-border': 'var(--color-effects-icon-border)',
 
   'util-colors-orange-dark-orange-dark-50': 'var(--color-util-colors-orange-dark-orange-dark-50)',
   'util-colors-orange-dark-orange-dark-100': 'var(--color-util-colors-orange-dark-orange-dark-100)',
@@ -722,8 +734,6 @@ const vars = {
   'util-colors-midnight-midnight-600': 'var(--color-util-colors-midnight-midnight-600)',
   'util-colors-midnight-midnight-700': 'var(--color-util-colors-midnight-midnight-700)',
 
-  'third-party-Arize': 'var(--color-third-party-Arize)',
-  'third-party-Phoenix': 'var(--color-third-party-Phoenix)',
   'third-party-LangChain': 'var(--color-third-party-LangChain)',
   'third-party-Langfuse': 'var(--color-third-party-Langfuse)',
   'third-party-Github': 'var(--color-third-party-Github)',
@@ -739,5 +749,8 @@ const vars = {
   'saas-background': 'var(--color-saas-background)',
   'saas-pricing-grid-bg': 'var(--color-saas-pricing-grid-bg)',
 
+  'dify-logo-dify-logo-blue': 'var(--color-dify-logo-dify-logo-blue)',
+  'dify-logo-dify-logo-black': 'var(--color-dify-logo-dify-logo-black)',
+
 }
 export default vars

From a371390d6ceaed9c20aed187e126ee9687c65fa3 Mon Sep 17 00:00:00 2001
From: luckylhb90 <luckylhb90@gmail.com>
Date: Thu, 10 Jul 2025 10:16:59 +0800
Subject: [PATCH 07/39] optimize: batch embedding and qdrant
 write_consistency_factor parameter (#21776)

Co-authored-by: hobo.l <hobo.l@binance.com>
---
 .../datasource/vdb/qdrant/qdrant_vector.py    |  2 ++
 api/core/rag/datasource/vdb/vector_factory.py | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py b/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py
index 8ce194c683..05fa73011a 100644
--- a/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py
+++ b/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py
@@ -47,6 +47,7 @@ class QdrantConfig(BaseModel):
     grpc_port: int = 6334
     prefer_grpc: bool = False
     replication_factor: int = 1
+    write_consistency_factor: int = 1
 
     def to_qdrant_params(self):
         if self.endpoint and self.endpoint.startswith("path:"):
@@ -127,6 +128,7 @@ class QdrantVector(BaseVector):
                     hnsw_config=hnsw_config,
                     timeout=int(self._client_config.timeout),
                     replication_factor=self._client_config.replication_factor,
+                    write_consistency_factor=self._client_config.write_consistency_factor,
                 )
 
                 # create group_id payload index
diff --git a/api/core/rag/datasource/vdb/vector_factory.py b/api/core/rag/datasource/vdb/vector_factory.py
index 67a4a515b1..00080b0fae 100644
--- a/api/core/rag/datasource/vdb/vector_factory.py
+++ b/api/core/rag/datasource/vdb/vector_factory.py
@@ -1,3 +1,5 @@
+import logging
+import time
 from abc import ABC, abstractmethod
 from typing import Any, Optional
 
@@ -13,6 +15,8 @@ from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from models.dataset import Dataset, Whitelist
 
+logger = logging.getLogger(__name__)
+
 
 class AbstractVectorFactory(ABC):
     @abstractmethod
@@ -173,8 +177,20 @@ class Vector:
 
     def create(self, texts: Optional[list] = None, **kwargs):
         if texts:
-            embeddings = self._embeddings.embed_documents([document.page_content for document in texts])
-            self._vector_processor.create(texts=texts, embeddings=embeddings, **kwargs)
+            start = time.time()
+            logger.info(f"start embedding {len(texts)} texts {start}")
+            batch_size = 1000
+            total_batches = len(texts) + batch_size - 1
+            for i in range(0, len(texts), batch_size):
+                batch = texts[i : i + batch_size]
+                batch_start = time.time()
+                logger.info(f"Processing batch {i // batch_size + 1}/{total_batches} ({len(batch)} texts)")
+                batch_embeddings = self._embeddings.embed_documents([document.page_content for document in batch])
+                logger.info(
+                    f"Embedding batch {i // batch_size + 1}/{total_batches} took {time.time() - batch_start:.3f}s"
+                )
+                self._vector_processor.create(texts=batch, embeddings=batch_embeddings, **kwargs)
+            logger.info(f"Embedding {len(texts)} texts took {time.time() - start:.3f}s")
 
     def add_texts(self, documents: list[Document], **kwargs):
         if kwargs.get("duplicate_check", False):

From 6f8c7a66c801ecd1239258a95dde035afba47f91 Mon Sep 17 00:00:00 2001
From: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com>
Date: Thu, 10 Jul 2025 10:19:58 +0800
Subject: [PATCH 08/39] feat: add redis fallback mechanism #21043 (#21044)

Co-authored-by: tech <cto@sb>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 api/extensions/ext_redis.py                   | 28 ++++++++++
 api/services/account_service.py               |  9 +++-
 api/tests/unit_tests/extensions/test_redis.py | 53 +++++++++++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 api/tests/unit_tests/extensions/test_redis.py

diff --git a/api/extensions/ext_redis.py b/api/extensions/ext_redis.py
index c283b1b7ca..be2f6115f7 100644
--- a/api/extensions/ext_redis.py
+++ b/api/extensions/ext_redis.py
@@ -1,6 +1,10 @@
+import functools
+import logging
+from collections.abc import Callable
 from typing import Any, Union
 
 import redis
+from redis import RedisError
 from redis.cache import CacheConfig
 from redis.cluster import ClusterNode, RedisCluster
 from redis.connection import Connection, SSLConnection
@@ -9,6 +13,8 @@ from redis.sentinel import Sentinel
 from configs import dify_config
 from dify_app import DifyApp
 
+logger = logging.getLogger(__name__)
+
 
 class RedisClientWrapper:
     """
@@ -115,3 +121,25 @@ def init_app(app: DifyApp):
         redis_client.initialize(redis.Redis(connection_pool=pool))
 
     app.extensions["redis"] = redis_client
+
+
+def redis_fallback(default_return: Any = None):
+    """
+    decorator to handle Redis operation exceptions and return a default value when Redis is unavailable.
+
+    Args:
+        default_return: The value to return when a Redis operation fails. Defaults to None.
+    """
+
+    def decorator(func: Callable):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except RedisError as e:
+                logger.warning(f"Redis operation failed in {func.__name__}: {str(e)}", exc_info=True)
+                return default_return
+
+        return wrapper
+
+    return decorator
diff --git a/api/services/account_service.py b/api/services/account_service.py
index 3fdbda48a6..2ba6f4345b 100644
--- a/api/services/account_service.py
+++ b/api/services/account_service.py
@@ -16,7 +16,7 @@ from configs import dify_config
 from constants.languages import language_timezone_mapping, languages
 from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
-from extensions.ext_redis import redis_client
+from extensions.ext_redis import redis_client, redis_fallback
 from libs.helper import RateLimiter, TokenManager
 from libs.passport import PassportService
 from libs.password import compare_password, hash_password, valid_password
@@ -495,6 +495,7 @@ class AccountService:
         return account
 
     @staticmethod
+    @redis_fallback(default_return=None)
     def add_login_error_rate_limit(email: str) -> None:
         key = f"login_error_rate_limit:{email}"
         count = redis_client.get(key)
@@ -504,6 +505,7 @@ class AccountService:
         redis_client.setex(key, dify_config.LOGIN_LOCKOUT_DURATION, count)
 
     @staticmethod
+    @redis_fallback(default_return=False)
     def is_login_error_rate_limit(email: str) -> bool:
         key = f"login_error_rate_limit:{email}"
         count = redis_client.get(key)
@@ -516,11 +518,13 @@ class AccountService:
         return False
 
     @staticmethod
+    @redis_fallback(default_return=None)
     def reset_login_error_rate_limit(email: str):
         key = f"login_error_rate_limit:{email}"
         redis_client.delete(key)
 
     @staticmethod
+    @redis_fallback(default_return=None)
     def add_forgot_password_error_rate_limit(email: str) -> None:
         key = f"forgot_password_error_rate_limit:{email}"
         count = redis_client.get(key)
@@ -530,6 +534,7 @@ class AccountService:
         redis_client.setex(key, dify_config.FORGOT_PASSWORD_LOCKOUT_DURATION, count)
 
     @staticmethod
+    @redis_fallback(default_return=False)
     def is_forgot_password_error_rate_limit(email: str) -> bool:
         key = f"forgot_password_error_rate_limit:{email}"
         count = redis_client.get(key)
@@ -542,11 +547,13 @@ class AccountService:
         return False
 
     @staticmethod
+    @redis_fallback(default_return=None)
     def reset_forgot_password_error_rate_limit(email: str):
         key = f"forgot_password_error_rate_limit:{email}"
         redis_client.delete(key)
 
     @staticmethod
+    @redis_fallback(default_return=False)
     def is_email_send_ip_limit(ip_address: str):
         minute_key = f"email_send_ip_limit_minute:{ip_address}"
         freeze_key = f"email_send_ip_limit_freeze:{ip_address}"
diff --git a/api/tests/unit_tests/extensions/test_redis.py b/api/tests/unit_tests/extensions/test_redis.py
new file mode 100644
index 0000000000..933fa32894
--- /dev/null
+++ b/api/tests/unit_tests/extensions/test_redis.py
@@ -0,0 +1,53 @@
+from redis import RedisError
+
+from extensions.ext_redis import redis_fallback
+
+
+def test_redis_fallback_success():
+    @redis_fallback(default_return=None)
+    def test_func():
+        return "success"
+
+    assert test_func() == "success"
+
+
+def test_redis_fallback_error():
+    @redis_fallback(default_return="fallback")
+    def test_func():
+        raise RedisError("Redis error")
+
+    assert test_func() == "fallback"
+
+
+def test_redis_fallback_none_default():
+    @redis_fallback()
+    def test_func():
+        raise RedisError("Redis error")
+
+    assert test_func() is None
+
+
+def test_redis_fallback_with_args():
+    @redis_fallback(default_return=0)
+    def test_func(x, y):
+        raise RedisError("Redis error")
+
+    assert test_func(1, 2) == 0
+
+
+def test_redis_fallback_with_kwargs():
+    @redis_fallback(default_return={})
+    def test_func(x=None, y=None):
+        raise RedisError("Redis error")
+
+    assert test_func(x=1, y=2) == {}
+
+
+def test_redis_fallback_preserves_function_metadata():
+    @redis_fallback(default_return=None)
+    def test_func():
+        """Test function docstring"""
+        pass
+
+    assert test_func.__name__ == "test_func"
+    assert test_func.__doc__ == "Test function docstring"

From 10858ea1dc33ba7951841e4a31f220a98869159f Mon Sep 17 00:00:00 2001
From: Yongtao Huang <yongtaoh2022@gmail.com>
Date: Thu, 10 Jul 2025 11:47:43 +0800
Subject: [PATCH 09/39] Chore: rm useless import and vars (#22108)

---
 api/tests/integration_tests/vdb/couchbase/test_couchbase.py   | 1 -
 api/tests/integration_tests/vdb/matrixone/test_matrixone.py   | 1 -
 api/tests/integration_tests/vdb/opengauss/test_opengauss.py   | 1 -
 .../integration_tests/vdb/pyvastbase/test_vastbase_vector.py  | 1 -
 api/tests/integration_tests/workflow/nodes/test_llm.py        | 3 ---
 api/tests/unit_tests/factories/test_variable_factory.py       | 4 ----
 .../services/test_dataset_service_update_dataset.py           | 1 -
 7 files changed, 12 deletions(-)

diff --git a/api/tests/integration_tests/vdb/couchbase/test_couchbase.py b/api/tests/integration_tests/vdb/couchbase/test_couchbase.py
index d76c34ba0e..eef1ee4e75 100644
--- a/api/tests/integration_tests/vdb/couchbase/test_couchbase.py
+++ b/api/tests/integration_tests/vdb/couchbase/test_couchbase.py
@@ -4,7 +4,6 @@ import time
 from core.rag.datasource.vdb.couchbase.couchbase_vector import CouchbaseConfig, CouchbaseVector
 from tests.integration_tests.vdb.test_vector_store import (
     AbstractVectorTest,
-    get_example_text,
     setup_mock_redis,
 )
 
diff --git a/api/tests/integration_tests/vdb/matrixone/test_matrixone.py b/api/tests/integration_tests/vdb/matrixone/test_matrixone.py
index c8b19ef3ad..c4056db63e 100644
--- a/api/tests/integration_tests/vdb/matrixone/test_matrixone.py
+++ b/api/tests/integration_tests/vdb/matrixone/test_matrixone.py
@@ -1,7 +1,6 @@
 from core.rag.datasource.vdb.matrixone.matrixone_vector import MatrixoneConfig, MatrixoneVector
 from tests.integration_tests.vdb.test_vector_store import (
     AbstractVectorTest,
-    get_example_text,
     setup_mock_redis,
 )
 
diff --git a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py
index f2013848bf..2a1129493c 100644
--- a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py
+++ b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py
@@ -5,7 +5,6 @@ import psycopg2  # type: ignore
 from core.rag.datasource.vdb.opengauss.opengauss import OpenGauss, OpenGaussConfig
 from tests.integration_tests.vdb.test_vector_store import (
     AbstractVectorTest,
-    get_example_text,
     setup_mock_redis,
 )
 
diff --git a/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py b/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py
index 3d7873442b..02931fef5a 100644
--- a/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py
+++ b/api/tests/integration_tests/vdb/pyvastbase/test_vastbase_vector.py
@@ -1,7 +1,6 @@
 from core.rag.datasource.vdb.pyvastbase.vastbase_vector import VastbaseVector, VastbaseVectorConfig
 from tests.integration_tests.vdb.test_vector_store import (
     AbstractVectorTest,
-    get_example_text,
     setup_mock_redis,
 )
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index 389d1071f3..638323f850 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -1,5 +1,4 @@
 import json
-import os
 import time
 import uuid
 from collections.abc import Generator
@@ -113,8 +112,6 @@ def test_execute_llm(flask_req_ctx):
         },
     )
 
-    credentials = {"openai_api_key": os.environ.get("OPENAI_API_KEY")}
-
     # Create a proper LLM result with real entities
     mock_usage = LLMUsage(
         prompt_tokens=30,
diff --git a/api/tests/unit_tests/factories/test_variable_factory.py b/api/tests/unit_tests/factories/test_variable_factory.py
index 481fbdc91a..edd4c5e93e 100644
--- a/api/tests/unit_tests/factories/test_variable_factory.py
+++ b/api/tests/unit_tests/factories/test_variable_factory.py
@@ -14,9 +14,7 @@ from core.variables import (
     ArrayStringVariable,
     FloatVariable,
     IntegerVariable,
-    ObjectSegment,
     SecretVariable,
-    SegmentType,
     StringVariable,
 )
 from core.variables.exc import VariableError
@@ -418,8 +416,6 @@ def test_build_segment_file_array_with_different_file_types():
 
 @st.composite
 def _generate_file(draw) -> File:
-    file_id = draw(st.text(min_size=1, max_size=10))
-    tenant_id = draw(st.text(min_size=1, max_size=10))
     file_type, mime_type, extension = draw(
         st.sampled_from(
             [
diff --git a/api/tests/unit_tests/services/test_dataset_service_update_dataset.py b/api/tests/unit_tests/services/test_dataset_service_update_dataset.py
index cdbb439c85..87b46f213b 100644
--- a/api/tests/unit_tests/services/test_dataset_service_update_dataset.py
+++ b/api/tests/unit_tests/services/test_dataset_service_update_dataset.py
@@ -10,7 +10,6 @@ from core.model_runtime.entities.model_entities import ModelType
 from models.dataset import Dataset, ExternalKnowledgeBindings
 from services.dataset_service import DatasetService
 from services.errors.account import NoPermissionError
-from tests.unit_tests.conftest import redis_mock
 
 
 class DatasetUpdateTestDataFactory:

From 18b58424ece2117fd52384804690bfb978353a11 Mon Sep 17 00:00:00 2001
From: baonudesifeizhai <85092850+baonudesifeizhai@users.noreply.github.com>
Date: Thu, 10 Jul 2025 01:34:06 -0400
Subject: [PATCH 10/39] Fix: Resolve issue with json_output (#22053)

---
 api/core/workflow/nodes/tool/tool_node.py | 47 ++++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/api/core/workflow/nodes/tool/tool_node.py b/api/core/workflow/nodes/tool/tool_node.py
index 59b3b1e2ae..472ca673b0 100644
--- a/api/core/workflow/nodes/tool/tool_node.py
+++ b/api/core/workflow/nodes/tool/tool_node.py
@@ -285,7 +285,8 @@ class ToolNode(BaseNode[ToolNodeData]):
                         for key, value in msg_metadata.items()
                         if key in WorkflowNodeExecutionMetadataKey.__members__.values()
                     }
-                json.append(message.message.json_object)
+                if message.message.json_object is not None:
+                    json.append(message.message.json_object)
             elif message.type == ToolInvokeMessage.MessageType.LINK:
                 assert isinstance(message.message, ToolInvokeMessage.TextMessage)
                 stream_text = f"Link: {message.message.text}\n"
@@ -369,31 +370,31 @@ class ToolNode(BaseNode[ToolNodeData]):
                     agent_logs.append(agent_log)
 
                 yield agent_log
+
         # Add agent_logs to outputs['json'] to ensure frontend can access thinking process
-        json_output: dict[str, Any] = {}
-        if json:
-            if isinstance(json, list) and len(json) == 1:
-                # If json is a list with only one element, convert it to a dictionary
-                json_output = json[0] if isinstance(json[0], dict) else {"data": json[0]}
-            elif isinstance(json, list):
-                # If json is a list with multiple elements, create a dictionary containing all data
-                json_output = {"data": json}
+        json_output: list[dict[str, Any]] = []
 
+        # Step 1: append each agent log as its own dict.
         if agent_logs:
-            # Add agent_logs to json output
-            json_output["agent_logs"] = [
-                {
-                    "id": log.id,
-                    "parent_id": log.parent_id,
-                    "error": log.error,
-                    "status": log.status,
-                    "data": log.data,
-                    "label": log.label,
-                    "metadata": log.metadata,
-                    "node_id": log.node_id,
-                }
-                for log in agent_logs
-            ]
+            for log in agent_logs:
+                json_output.append(
+                    {
+                        "id": log.id,
+                        "parent_id": log.parent_id,
+                        "error": log.error,
+                        "status": log.status,
+                        "data": log.data,
+                        "label": log.label,
+                        "metadata": log.metadata,
+                        "node_id": log.node_id,
+                    }
+                )
+        # Step 2: normalize JSON into {"data": [...]}.change json to list[dict]
+        if json:
+            json_output.extend(json)
+        else:
+            json_output.append({"data": []})
+
         yield RunCompletedEvent(
             run_result=NodeRunResult(
                 status=WorkflowNodeExecutionStatus.SUCCEEDED,

From 535fff62f3d928d73c371126b36e2e6ab83ee23c Mon Sep 17 00:00:00 2001
From: Novice <novice12185727@gmail.com>
Date: Thu, 10 Jul 2025 14:01:34 +0800
Subject: [PATCH 11/39] feat: add MCP support (#20716)

Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
---
 api/controllers/console/__init__.py           |    1 +
 api/controllers/console/app/mcp_server.py     |  102 ++
 .../console/workspace/tool_providers.py       |  191 ++-
 api/controllers/mcp/__init__.py               |    8 +
 api/controllers/mcp/mcp.py                    |  104 ++
 api/core/agent/base_agent_runner.py           |   24 +-
 api/core/agent/plugin_entities.py             |    2 +-
 api/core/agent/strategy/plugin.py             |    4 +-
 api/core/entities/parameter_entities.py       |    3 +
 api/core/mcp/__init__.py                      |    0
 api/core/mcp/auth/auth_flow.py                |  342 +++++
 api/core/mcp/auth/auth_provider.py            |   81 ++
 api/core/mcp/client/sse_client.py             |  361 +++++
 api/core/mcp/client/streamable_client.py      |  476 +++++++
 api/core/mcp/entities.py                      |   19 +
 api/core/mcp/error.py                         |   10 +
 api/core/mcp/mcp_client.py                    |  150 ++
 api/core/mcp/server/streamable_http.py        |  224 +++
 api/core/mcp/session/base_session.py          |  397 ++++++
 api/core/mcp/session/client_session.py        |  365 +++++
 api/core/mcp/types.py                         | 1217 +++++++++++++++++
 api/core/mcp/utils.py                         |  114 ++
 api/core/plugin/entities/parameters.py        |   41 +
 api/core/plugin/entities/plugin.py            |    1 +
 api/core/plugin/entities/plugin_daemon.py     |    1 +
 api/core/plugin/entities/request.py           |    2 +-
 api/core/tools/entities/api_entities.py       |   21 +-
 api/core/tools/entities/tool_entities.py      |    8 +
 api/core/tools/mcp_tool/provider.py           |  130 ++
 api/core/tools/mcp_tool/tool.py               |   92 ++
 api/core/tools/tool_manager.py                |  149 +-
 api/core/tools/utils/configuration.py         |   23 +-
 api/core/tools/workflow_as_tool/tool.py       |    7 +-
 api/core/workflow/nodes/agent/agent_node.py   |   24 +-
 api/core/workflow/nodes/node_mapping.py       |    2 +
 api/core/workflow/nodes/tool/entities.py      |   23 +
 api/core/workflow/nodes/tool/tool_node.py     |    4 +-
 api/extensions/ext_blueprints.py              |    2 +
 api/extensions/ext_login.py                   |   17 +-
 api/factories/agent_factory.py                |    2 +-
 api/fields/app_fields.py                      |   24 +
 ...93fe_add_mcp_server_tool_and_app_server.py |   64 +
 api/models/__init__.py                        |    2 +
 api/models/model.py                           |   33 +
 api/models/tools.py                           |  106 ++
 api/pyproject.toml                            |    2 +
 api/services/tools/mcp_tools_mange_service.py |  232 ++++
 api/services/tools/tools_transform_service.py |   93 +-
 api/tasks/remove_app_and_related_data_task.py |   14 +
 .../core/mcp/client/test_session.py           |  471 +++++++
 .../unit_tests/core/mcp/client/test_sse.py    |  349 +++++
 .../core/mcp/client/test_streamable_http.py   |  450 ++++++
 api/uv.lock                                   |  201 +--
 docker/nginx/conf.d/default.conf.template     |    5 +-
 54 files changed, 6635 insertions(+), 155 deletions(-)
 create mode 100644 api/controllers/console/app/mcp_server.py
 create mode 100644 api/controllers/mcp/__init__.py
 create mode 100644 api/controllers/mcp/mcp.py
 create mode 100644 api/core/mcp/__init__.py
 create mode 100644 api/core/mcp/auth/auth_flow.py
 create mode 100644 api/core/mcp/auth/auth_provider.py
 create mode 100644 api/core/mcp/client/sse_client.py
 create mode 100644 api/core/mcp/client/streamable_client.py
 create mode 100644 api/core/mcp/entities.py
 create mode 100644 api/core/mcp/error.py
 create mode 100644 api/core/mcp/mcp_client.py
 create mode 100644 api/core/mcp/server/streamable_http.py
 create mode 100644 api/core/mcp/session/base_session.py
 create mode 100644 api/core/mcp/session/client_session.py
 create mode 100644 api/core/mcp/types.py
 create mode 100644 api/core/mcp/utils.py
 create mode 100644 api/core/tools/mcp_tool/provider.py
 create mode 100644 api/core/tools/mcp_tool/tool.py
 create mode 100644 api/migrations/versions/2025_06_25_0936-58eb7bdb93fe_add_mcp_server_tool_and_app_server.py
 create mode 100644 api/services/tools/mcp_tools_mange_service.py
 create mode 100644 api/tests/unit_tests/core/mcp/client/test_session.py
 create mode 100644 api/tests/unit_tests/core/mcp/client/test_sse.py
 create mode 100644 api/tests/unit_tests/core/mcp/client/test_streamable_http.py

diff --git a/api/controllers/console/__init__.py b/api/controllers/console/__init__.py
index dbdcdc46ce..e25f92399c 100644
--- a/api/controllers/console/__init__.py
+++ b/api/controllers/console/__init__.py
@@ -56,6 +56,7 @@ from .app import (
     conversation,
     conversation_variables,
     generator,
+    mcp_server,
     message,
     model_config,
     ops_trace,
diff --git a/api/controllers/console/app/mcp_server.py b/api/controllers/console/app/mcp_server.py
new file mode 100644
index 0000000000..4f9e75c0d3
--- /dev/null
+++ b/api/controllers/console/app/mcp_server.py
@@ -0,0 +1,102 @@
+import json
+from enum import StrEnum
+
+from flask_login import current_user
+from flask_restful import Resource, marshal_with, reqparse
+from werkzeug.exceptions import NotFound
+
+from controllers.console import api
+from controllers.console.app.wraps import get_app_model
+from controllers.console.wraps import account_initialization_required, setup_required
+from extensions.ext_database import db
+from fields.app_fields import app_server_fields
+from libs.login import login_required
+from models.model import AppMCPServer
+
+
+class AppMCPServerStatus(StrEnum):
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+
+
+class AppMCPServerController(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    @get_app_model
+    @marshal_with(app_server_fields)
+    def get(self, app_model):
+        server = db.session.query(AppMCPServer).filter(AppMCPServer.app_id == app_model.id).first()
+        return server
+
+    @setup_required
+    @login_required
+    @account_initialization_required
+    @get_app_model
+    @marshal_with(app_server_fields)
+    def post(self, app_model):
+        # The role of the current user in the ta table must be editor, admin, or owner
+        if not current_user.is_editor:
+            raise NotFound()
+        parser = reqparse.RequestParser()
+        parser.add_argument("description", type=str, required=True, location="json")
+        parser.add_argument("parameters", type=dict, required=True, location="json")
+        args = parser.parse_args()
+        server = AppMCPServer(
+            name=app_model.name,
+            description=args["description"],
+            parameters=json.dumps(args["parameters"], ensure_ascii=False),
+            status=AppMCPServerStatus.ACTIVE,
+            app_id=app_model.id,
+            tenant_id=current_user.current_tenant_id,
+            server_code=AppMCPServer.generate_server_code(16),
+        )
+        db.session.add(server)
+        db.session.commit()
+        return server
+
+    @setup_required
+    @login_required
+    @account_initialization_required
+    @get_app_model
+    @marshal_with(app_server_fields)
+    def put(self, app_model):
+        if not current_user.is_editor:
+            raise NotFound()
+        parser = reqparse.RequestParser()
+        parser.add_argument("id", type=str, required=True, location="json")
+        parser.add_argument("description", type=str, required=True, location="json")
+        parser.add_argument("parameters", type=dict, required=True, location="json")
+        parser.add_argument("status", type=str, required=False, location="json")
+        args = parser.parse_args()
+        server = db.session.query(AppMCPServer).filter(AppMCPServer.id == args["id"]).first()
+        if not server:
+            raise NotFound()
+        server.description = args["description"]
+        server.parameters = json.dumps(args["parameters"], ensure_ascii=False)
+        if args["status"]:
+            if args["status"] not in [status.value for status in AppMCPServerStatus]:
+                raise ValueError("Invalid status")
+            server.status = args["status"]
+        db.session.commit()
+        return server
+
+
+class AppMCPServerRefreshController(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    @marshal_with(app_server_fields)
+    def get(self, server_id):
+        if not current_user.is_editor:
+            raise NotFound()
+        server = db.session.query(AppMCPServer).filter(AppMCPServer.id == server_id).first()
+        if not server:
+            raise NotFound()
+        server.server_code = AppMCPServer.generate_server_code(16)
+        db.session.commit()
+        return server
+
+
+api.add_resource(AppMCPServerController, "/apps/<uuid:app_id>/server")
+api.add_resource(AppMCPServerRefreshController, "/apps/<uuid:server_id>/server/refresh")
diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py
index 2b1379bfb2..df50871a38 100644
--- a/api/controllers/console/workspace/tool_providers.py
+++ b/api/controllers/console/workspace/tool_providers.py
@@ -1,6 +1,7 @@
 import io
+from urllib.parse import urlparse
 
-from flask import send_file
+from flask import redirect, send_file
 from flask_login import current_user
 from flask_restful import Resource, reqparse
 from sqlalchemy.orm import Session
@@ -9,17 +10,34 @@ from werkzeug.exceptions import Forbidden
 from configs import dify_config
 from controllers.console import api
 from controllers.console.wraps import account_initialization_required, enterprise_license_required, setup_required
+from core.mcp.auth.auth_flow import auth, handle_callback
+from core.mcp.auth.auth_provider import OAuthClientProvider
+from core.mcp.error import MCPAuthError, MCPError
+from core.mcp.mcp_client import MCPClient
 from core.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from libs.helper import alphanumeric, uuid_value
 from libs.login import login_required
 from services.tools.api_tools_manage_service import ApiToolManageService
 from services.tools.builtin_tools_manage_service import BuiltinToolManageService
+from services.tools.mcp_tools_mange_service import MCPToolManageService
 from services.tools.tool_labels_service import ToolLabelsService
 from services.tools.tools_manage_service import ToolCommonService
+from services.tools.tools_transform_service import ToolTransformService
 from services.tools.workflow_tools_manage_service import WorkflowToolManageService
 
 
+def is_valid_url(url: str) -> bool:
+    if not url:
+        return False
+
+    try:
+        parsed = urlparse(url)
+        return all([parsed.scheme, parsed.netloc]) and parsed.scheme in ["http", "https"]
+    except Exception:
+        return False
+
+
 class ToolProviderListApi(Resource):
     @setup_required
     @login_required
@@ -34,7 +52,7 @@ class ToolProviderListApi(Resource):
         req.add_argument(
             "type",
             type=str,
-            choices=["builtin", "model", "api", "workflow"],
+            choices=["builtin", "model", "api", "workflow", "mcp"],
             required=False,
             nullable=True,
             location="args",
@@ -613,6 +631,166 @@ class ToolLabelsApi(Resource):
         return jsonable_encoder(ToolLabelsService.list_tool_labels())
 
 
+class ToolProviderMCPApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def post(self):
+        parser = reqparse.RequestParser()
+        parser.add_argument("server_url", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("name", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("icon", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("icon_type", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("icon_background", type=str, required=False, nullable=True, location="json", default="")
+        parser.add_argument("server_identifier", type=str, required=True, nullable=False, location="json")
+        args = parser.parse_args()
+        user = current_user
+        if not is_valid_url(args["server_url"]):
+            raise ValueError("Server URL is not valid.")
+        return jsonable_encoder(
+            MCPToolManageService.create_mcp_provider(
+                tenant_id=user.current_tenant_id,
+                server_url=args["server_url"],
+                name=args["name"],
+                icon=args["icon"],
+                icon_type=args["icon_type"],
+                icon_background=args["icon_background"],
+                user_id=user.id,
+                server_identifier=args["server_identifier"],
+            )
+        )
+
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def put(self):
+        parser = reqparse.RequestParser()
+        parser.add_argument("server_url", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("name", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("icon", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("icon_type", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("icon_background", type=str, required=False, nullable=True, location="json")
+        parser.add_argument("provider_id", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("server_identifier", type=str, required=True, nullable=False, location="json")
+        args = parser.parse_args()
+        if not is_valid_url(args["server_url"]):
+            if "[__HIDDEN__]" in args["server_url"]:
+                pass
+            else:
+                raise ValueError("Server URL is not valid.")
+        MCPToolManageService.update_mcp_provider(
+            tenant_id=current_user.current_tenant_id,
+            provider_id=args["provider_id"],
+            server_url=args["server_url"],
+            name=args["name"],
+            icon=args["icon"],
+            icon_type=args["icon_type"],
+            icon_background=args["icon_background"],
+            server_identifier=args["server_identifier"],
+        )
+        return {"result": "success"}
+
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def delete(self):
+        parser = reqparse.RequestParser()
+        parser.add_argument("provider_id", type=str, required=True, nullable=False, location="json")
+        args = parser.parse_args()
+        MCPToolManageService.delete_mcp_tool(tenant_id=current_user.current_tenant_id, provider_id=args["provider_id"])
+        return {"result": "success"}
+
+
+class ToolMCPAuthApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def post(self):
+        parser = reqparse.RequestParser()
+        parser.add_argument("provider_id", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("authorization_code", type=str, required=False, nullable=True, location="json")
+        args = parser.parse_args()
+        provider_id = args["provider_id"]
+        tenant_id = current_user.current_tenant_id
+        provider = MCPToolManageService.get_mcp_provider_by_provider_id(provider_id, tenant_id)
+        if not provider:
+            raise ValueError("provider not found")
+        try:
+            with MCPClient(
+                provider.decrypted_server_url,
+                provider_id,
+                tenant_id,
+                authed=False,
+                authorization_code=args["authorization_code"],
+                for_list=True,
+            ):
+                MCPToolManageService.update_mcp_provider_credentials(
+                    mcp_provider=provider,
+                    credentials=provider.decrypted_credentials,
+                    authed=True,
+                )
+                return {"result": "success"}
+
+        except MCPAuthError:
+            auth_provider = OAuthClientProvider(provider_id, tenant_id, for_list=True)
+            return auth(auth_provider, provider.decrypted_server_url, args["authorization_code"])
+        except MCPError as e:
+            MCPToolManageService.update_mcp_provider_credentials(
+                mcp_provider=provider,
+                credentials={},
+                authed=False,
+            )
+            raise ValueError(f"Failed to connect to MCP server: {e}") from e
+
+
+class ToolMCPDetailApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def get(self, provider_id):
+        user = current_user
+        provider = MCPToolManageService.get_mcp_provider_by_provider_id(provider_id, user.current_tenant_id)
+        return jsonable_encoder(ToolTransformService.mcp_provider_to_user_provider(provider, for_list=True))
+
+
+class ToolMCPListAllApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def get(self):
+        user = current_user
+        tenant_id = user.current_tenant_id
+
+        tools = MCPToolManageService.retrieve_mcp_tools(tenant_id=tenant_id)
+
+        return [tool.to_dict() for tool in tools]
+
+
+class ToolMCPUpdateApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def get(self, provider_id):
+        tenant_id = current_user.current_tenant_id
+        tools = MCPToolManageService.list_mcp_tool_from_remote_server(
+            tenant_id=tenant_id,
+            provider_id=provider_id,
+        )
+        return jsonable_encoder(tools)
+
+
+class ToolMCPCallbackApi(Resource):
+    def get(self):
+        parser = reqparse.RequestParser()
+        parser.add_argument("code", type=str, required=True, nullable=False, location="args")
+        parser.add_argument("state", type=str, required=True, nullable=False, location="args")
+        args = parser.parse_args()
+        state_key = args["state"]
+        authorization_code = args["code"]
+        handle_callback(state_key, authorization_code)
+        return redirect(f"{dify_config.CONSOLE_WEB_URL}/oauth-callback")
+
+
 # tool provider
 api.add_resource(ToolProviderListApi, "/workspaces/current/tool-providers")
 
@@ -647,8 +825,15 @@ api.add_resource(ToolWorkflowProviderDeleteApi, "/workspaces/current/tool-provid
 api.add_resource(ToolWorkflowProviderGetApi, "/workspaces/current/tool-provider/workflow/get")
 api.add_resource(ToolWorkflowProviderListToolApi, "/workspaces/current/tool-provider/workflow/tools")
 
+# mcp tool provider
+api.add_resource(ToolMCPDetailApi, "/workspaces/current/tool-provider/mcp/tools/<path:provider_id>")
+api.add_resource(ToolProviderMCPApi, "/workspaces/current/tool-provider/mcp")
+api.add_resource(ToolMCPUpdateApi, "/workspaces/current/tool-provider/mcp/update/<path:provider_id>")
+api.add_resource(ToolMCPAuthApi, "/workspaces/current/tool-provider/mcp/auth")
+api.add_resource(ToolMCPCallbackApi, "/mcp/oauth/callback")
+
 api.add_resource(ToolBuiltinListApi, "/workspaces/current/tools/builtin")
 api.add_resource(ToolApiListApi, "/workspaces/current/tools/api")
+api.add_resource(ToolMCPListAllApi, "/workspaces/current/tools/mcp")
 api.add_resource(ToolWorkflowListApi, "/workspaces/current/tools/workflow")
-
 api.add_resource(ToolLabelsApi, "/workspaces/current/tool-labels")
diff --git a/api/controllers/mcp/__init__.py b/api/controllers/mcp/__init__.py
new file mode 100644
index 0000000000..1b3e0a5621
--- /dev/null
+++ b/api/controllers/mcp/__init__.py
@@ -0,0 +1,8 @@
+from flask import Blueprint
+
+from libs.external_api import ExternalApi
+
+bp = Blueprint("mcp", __name__, url_prefix="/mcp")
+api = ExternalApi(bp)
+
+from . import mcp
diff --git a/api/controllers/mcp/mcp.py b/api/controllers/mcp/mcp.py
new file mode 100644
index 0000000000..ead728bfb0
--- /dev/null
+++ b/api/controllers/mcp/mcp.py
@@ -0,0 +1,104 @@
+from flask_restful import Resource, reqparse
+from pydantic import ValidationError
+
+from controllers.console.app.mcp_server import AppMCPServerStatus
+from controllers.mcp import api
+from core.app.app_config.entities import VariableEntity
+from core.mcp import types
+from core.mcp.server.streamable_http import MCPServerStreamableHTTPRequestHandler
+from core.mcp.types import ClientNotification, ClientRequest
+from core.mcp.utils import create_mcp_error_response
+from extensions.ext_database import db
+from libs import helper
+from models.model import App, AppMCPServer, AppMode
+
+
+class MCPAppApi(Resource):
+    def post(self, server_code):
+        def int_or_str(value):
+            if isinstance(value, (int, str)):
+                return value
+            else:
+                return None
+
+        parser = reqparse.RequestParser()
+        parser.add_argument("jsonrpc", type=str, required=True, location="json")
+        parser.add_argument("method", type=str, required=True, location="json")
+        parser.add_argument("params", type=dict, required=False, location="json")
+        parser.add_argument("id", type=int_or_str, required=False, location="json")
+        args = parser.parse_args()
+
+        request_id = args.get("id")
+
+        server = db.session.query(AppMCPServer).filter(AppMCPServer.server_code == server_code).first()
+        if not server:
+            return helper.compact_generate_response(
+                create_mcp_error_response(request_id, types.INVALID_REQUEST, "Server Not Found")
+            )
+
+        if server.status != AppMCPServerStatus.ACTIVE:
+            return helper.compact_generate_response(
+                create_mcp_error_response(request_id, types.INVALID_REQUEST, "Server is not active")
+            )
+
+        app = db.session.query(App).filter(App.id == server.app_id).first()
+        if not app:
+            return helper.compact_generate_response(
+                create_mcp_error_response(request_id, types.INVALID_REQUEST, "App Not Found")
+            )
+
+        if app.mode in {AppMode.ADVANCED_CHAT.value, AppMode.WORKFLOW.value}:
+            workflow = app.workflow
+            if workflow is None:
+                return helper.compact_generate_response(
+                    create_mcp_error_response(request_id, types.INVALID_REQUEST, "App is unavailable")
+                )
+
+            user_input_form = workflow.user_input_form(to_old_structure=True)
+        else:
+            app_model_config = app.app_model_config
+            if app_model_config is None:
+                return helper.compact_generate_response(
+                    create_mcp_error_response(request_id, types.INVALID_REQUEST, "App is unavailable")
+                )
+
+            features_dict = app_model_config.to_dict()
+            user_input_form = features_dict.get("user_input_form", [])
+        converted_user_input_form: list[VariableEntity] = []
+        try:
+            for item in user_input_form:
+                variable_type = item.get("type", "") or list(item.keys())[0]
+                variable = item[variable_type]
+                converted_user_input_form.append(
+                    VariableEntity(
+                        type=variable_type,
+                        variable=variable.get("variable"),
+                        description=variable.get("description") or "",
+                        label=variable.get("label"),
+                        required=variable.get("required", False),
+                        max_length=variable.get("max_length"),
+                        options=variable.get("options") or [],
+                    )
+                )
+        except ValidationError as e:
+            return helper.compact_generate_response(
+                create_mcp_error_response(request_id, types.INVALID_PARAMS, f"Invalid user_input_form: {str(e)}")
+            )
+
+        try:
+            request: ClientRequest | ClientNotification = ClientRequest.model_validate(args)
+        except ValidationError as e:
+            try:
+                notification = ClientNotification.model_validate(args)
+                request = notification
+            except ValidationError as e:
+                return helper.compact_generate_response(
+                    create_mcp_error_response(request_id, types.INVALID_PARAMS, f"Invalid MCP request: {str(e)}")
+                )
+
+        mcp_server_handler = MCPServerStreamableHTTPRequestHandler(app, request, converted_user_input_form)
+        response = mcp_server_handler.handle()
+        return helper.compact_generate_response(response)
+
+
+api.add_resource(MCPAppApi, "/server/<string:server_code>/mcp")
diff --git a/api/core/agent/base_agent_runner.py b/api/core/agent/base_agent_runner.py
index 6998e4d29a..0d304de97a 100644
--- a/api/core/agent/base_agent_runner.py
+++ b/api/core/agent/base_agent_runner.py
@@ -161,10 +161,14 @@ class BaseAgentRunner(AppRunner):
             if parameter.type == ToolParameter.ToolParameterType.SELECT:
                 enum = [option.value for option in parameter.options] if parameter.options else []
 
-            message_tool.parameters["properties"][parameter.name] = {
-                "type": parameter_type,
-                "description": parameter.llm_description or "",
-            }
+            message_tool.parameters["properties"][parameter.name] = (
+                {
+                    "type": parameter_type,
+                    "description": parameter.llm_description or "",
+                }
+                if parameter.input_schema is None
+                else parameter.input_schema
+            )
 
             if len(enum) > 0:
                 message_tool.parameters["properties"][parameter.name]["enum"] = enum
@@ -254,10 +258,14 @@ class BaseAgentRunner(AppRunner):
             if parameter.type == ToolParameter.ToolParameterType.SELECT:
                 enum = [option.value for option in parameter.options] if parameter.options else []
 
-            prompt_tool.parameters["properties"][parameter.name] = {
-                "type": parameter_type,
-                "description": parameter.llm_description or "",
-            }
+            prompt_tool.parameters["properties"][parameter.name] = (
+                {
+                    "type": parameter_type,
+                    "description": parameter.llm_description or "",
+                }
+                if parameter.input_schema is None
+                else parameter.input_schema
+            )
 
             if len(enum) > 0:
                 prompt_tool.parameters["properties"][parameter.name]["enum"] = enum
diff --git a/api/core/agent/plugin_entities.py b/api/core/agent/plugin_entities.py
index 9c722baa23..3b48288710 100644
--- a/api/core/agent/plugin_entities.py
+++ b/api/core/agent/plugin_entities.py
@@ -85,7 +85,7 @@ class AgentStrategyEntity(BaseModel):
     description: I18nObject = Field(..., description="The description of the agent strategy")
     output_schema: Optional[dict] = None
     features: Optional[list[AgentFeature]] = None
-
+    meta_version: Optional[str] = None
     # pydantic configs
     model_config = ConfigDict(protected_namespaces=())
 
diff --git a/api/core/agent/strategy/plugin.py b/api/core/agent/strategy/plugin.py
index 79b074cf95..4cfcfbf86a 100644
--- a/api/core/agent/strategy/plugin.py
+++ b/api/core/agent/strategy/plugin.py
@@ -15,10 +15,12 @@ class PluginAgentStrategy(BaseAgentStrategy):
 
     tenant_id: str
     declaration: AgentStrategyEntity
+    meta_version: str | None = None
 
-    def __init__(self, tenant_id: str, declaration: AgentStrategyEntity):
+    def __init__(self, tenant_id: str, declaration: AgentStrategyEntity, meta_version: str | None):
         self.tenant_id = tenant_id
         self.declaration = declaration
+        self.meta_version = meta_version
 
     def get_parameters(self) -> Sequence[AgentStrategyParameter]:
         return self.declaration.parameters
diff --git a/api/core/entities/parameter_entities.py b/api/core/entities/parameter_entities.py
index b071bfa5b1..2fa347c204 100644
--- a/api/core/entities/parameter_entities.py
+++ b/api/core/entities/parameter_entities.py
@@ -21,6 +21,9 @@ class CommonParameterType(StrEnum):
     DYNAMIC_SELECT = "dynamic-select"
 
     # TOOL_SELECTOR = "tool-selector"
+    # MCP object and array type parameters
+    ARRAY = "array"
+    OBJECT = "object"
 
 
 class AppSelectorScope(StrEnum):
diff --git a/api/core/mcp/__init__.py b/api/core/mcp/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/core/mcp/auth/auth_flow.py b/api/core/mcp/auth/auth_flow.py
new file mode 100644
index 0000000000..b63478e822
--- /dev/null
+++ b/api/core/mcp/auth/auth_flow.py
@@ -0,0 +1,342 @@
+import base64
+import hashlib
+import json
+import os
+import secrets
+import urllib.parse
+from typing import Optional
+from urllib.parse import urljoin
+
+import requests
+from pydantic import BaseModel, ValidationError
+
+from core.mcp.auth.auth_provider import OAuthClientProvider
+from core.mcp.types import (
+    OAuthClientInformation,
+    OAuthClientInformationFull,
+    OAuthClientMetadata,
+    OAuthMetadata,
+    OAuthTokens,
+)
+from extensions.ext_redis import redis_client
+
+LATEST_PROTOCOL_VERSION = "1.0"
+OAUTH_STATE_EXPIRY_SECONDS = 5 * 60  # 5 minutes expiry
+OAUTH_STATE_REDIS_KEY_PREFIX = "oauth_state:"
+
+
+class OAuthCallbackState(BaseModel):
+    provider_id: str
+    tenant_id: str
+    server_url: str
+    metadata: OAuthMetadata | None = None
+    client_information: OAuthClientInformation
+    code_verifier: str
+    redirect_uri: str
+
+
+def generate_pkce_challenge() -> tuple[str, str]:
+    """Generate PKCE challenge and verifier."""
+    code_verifier = base64.urlsafe_b64encode(os.urandom(40)).decode("utf-8")
+    code_verifier = code_verifier.replace("=", "").replace("+", "-").replace("/", "_")
+
+    code_challenge_hash = hashlib.sha256(code_verifier.encode("utf-8")).digest()
+    code_challenge = base64.urlsafe_b64encode(code_challenge_hash).decode("utf-8")
+    code_challenge = code_challenge.replace("=", "").replace("+", "-").replace("/", "_")
+
+    return code_verifier, code_challenge
+
+
+def _create_secure_redis_state(state_data: OAuthCallbackState) -> str:
+    """Create a secure state parameter by storing state data in Redis and returning a random state key."""
+    # Generate a secure random state key
+    state_key = secrets.token_urlsafe(32)
+
+    # Store the state data in Redis with expiration
+    redis_key = f"{OAUTH_STATE_REDIS_KEY_PREFIX}{state_key}"
+    redis_client.setex(redis_key, OAUTH_STATE_EXPIRY_SECONDS, state_data.model_dump_json())
+
+    return state_key
+
+
+def _retrieve_redis_state(state_key: str) -> OAuthCallbackState:
+    """Retrieve and decode OAuth state data from Redis using the state key, then delete it."""
+    redis_key = f"{OAUTH_STATE_REDIS_KEY_PREFIX}{state_key}"
+
+    # Get state data from Redis
+    state_data = redis_client.get(redis_key)
+
+    if not state_data:
+        raise ValueError("State parameter has expired or does not exist")
+
+    # Delete the state data from Redis immediately after retrieval to prevent reuse
+    redis_client.delete(redis_key)
+
+    try:
+        # Parse and validate the state data
+        oauth_state = OAuthCallbackState.model_validate_json(state_data)
+
+        return oauth_state
+    except ValidationError as e:
+        raise ValueError(f"Invalid state parameter: {str(e)}")
+
+
+def handle_callback(state_key: str, authorization_code: str) -> OAuthCallbackState:
+    """Handle the callback from the OAuth provider."""
+    # Retrieve state data from Redis (state is automatically deleted after retrieval)
+    full_state_data = _retrieve_redis_state(state_key)
+
+    tokens = exchange_authorization(
+        full_state_data.server_url,
+        full_state_data.metadata,
+        full_state_data.client_information,
+        authorization_code,
+        full_state_data.code_verifier,
+        full_state_data.redirect_uri,
+    )
+    provider = OAuthClientProvider(full_state_data.provider_id, full_state_data.tenant_id, for_list=True)
+    provider.save_tokens(tokens)
+    return full_state_data
+
+
+def discover_oauth_metadata(server_url: str, protocol_version: Optional[str] = None) -> Optional[OAuthMetadata]:
+    """Looks up RFC 8414 OAuth 2.0 Authorization Server Metadata."""
+    url = urljoin(server_url, "/.well-known/oauth-authorization-server")
+
+    try:
+        headers = {"MCP-Protocol-Version": protocol_version or LATEST_PROTOCOL_VERSION}
+        response = requests.get(url, headers=headers)
+        if response.status_code == 404:
+            return None
+        if not response.ok:
+            raise ValueError(f"HTTP {response.status_code} trying to load well-known OAuth metadata")
+        return OAuthMetadata.model_validate(response.json())
+    except requests.RequestException as e:
+        if isinstance(e, requests.ConnectionError):
+            response = requests.get(url)
+            if response.status_code == 404:
+                return None
+            if not response.ok:
+                raise ValueError(f"HTTP {response.status_code} trying to load well-known OAuth metadata")
+            return OAuthMetadata.model_validate(response.json())
+        raise
+
+
+def start_authorization(
+    server_url: str,
+    metadata: Optional[OAuthMetadata],
+    client_information: OAuthClientInformation,
+    redirect_url: str,
+    provider_id: str,
+    tenant_id: str,
+) -> tuple[str, str]:
+    """Begins the authorization flow with secure Redis state storage."""
+    response_type = "code"
+    code_challenge_method = "S256"
+
+    if metadata:
+        authorization_url = metadata.authorization_endpoint
+        if response_type not in metadata.response_types_supported:
+            raise ValueError(f"Incompatible auth server: does not support response type {response_type}")
+        if (
+            not metadata.code_challenge_methods_supported
+            or code_challenge_method not in metadata.code_challenge_methods_supported
+        ):
+            raise ValueError(
+                f"Incompatible auth server: does not support code challenge method {code_challenge_method}"
+            )
+    else:
+        authorization_url = urljoin(server_url, "/authorize")
+
+    code_verifier, code_challenge = generate_pkce_challenge()
+
+    # Prepare state data with all necessary information
+    state_data = OAuthCallbackState(
+        provider_id=provider_id,
+        tenant_id=tenant_id,
+        server_url=server_url,
+        metadata=metadata,
+        client_information=client_information,
+        code_verifier=code_verifier,
+        redirect_uri=redirect_url,
+    )
+
+    # Store state data in Redis and generate secure state key
+    state_key = _create_secure_redis_state(state_data)
+
+    params = {
+        "response_type": response_type,
+        "client_id": client_information.client_id,
+        "code_challenge": code_challenge,
+        "code_challenge_method": code_challenge_method,
+        "redirect_uri": redirect_url,
+        "state": state_key,
+    }
+
+    authorization_url = f"{authorization_url}?{urllib.parse.urlencode(params)}"
+    return authorization_url, code_verifier
+
+
+def exchange_authorization(
+    server_url: str,
+    metadata: Optional[OAuthMetadata],
+    client_information: OAuthClientInformation,
+    authorization_code: str,
+    code_verifier: str,
+    redirect_uri: str,
+) -> OAuthTokens:
+    """Exchanges an authorization code for an access token."""
+    grant_type = "authorization_code"
+
+    if metadata:
+        token_url = metadata.token_endpoint
+        if metadata.grant_types_supported and grant_type not in metadata.grant_types_supported:
+            raise ValueError(f"Incompatible auth server: does not support grant type {grant_type}")
+    else:
+        token_url = urljoin(server_url, "/token")
+
+    params = {
+        "grant_type": grant_type,
+        "client_id": client_information.client_id,
+        "code": authorization_code,
+        "code_verifier": code_verifier,
+        "redirect_uri": redirect_uri,
+    }
+
+    if client_information.client_secret:
+        params["client_secret"] = client_information.client_secret
+
+    response = requests.post(token_url, data=params)
+    if not response.ok:
+        raise ValueError(f"Token exchange failed: HTTP {response.status_code}")
+    return OAuthTokens.model_validate(response.json())
+
+
+def refresh_authorization(
+    server_url: str,
+    metadata: Optional[OAuthMetadata],
+    client_information: OAuthClientInformation,
+    refresh_token: str,
+) -> OAuthTokens:
+    """Exchange a refresh token for an updated access token."""
+    grant_type = "refresh_token"
+
+    if metadata:
+        token_url = metadata.token_endpoint
+        if metadata.grant_types_supported and grant_type not in metadata.grant_types_supported:
+            raise ValueError(f"Incompatible auth server: does not support grant type {grant_type}")
+    else:
+        token_url = urljoin(server_url, "/token")
+
+    params = {
+        "grant_type": grant_type,
+        "client_id": client_information.client_id,
+        "refresh_token": refresh_token,
+    }
+
+    if client_information.client_secret:
+        params["client_secret"] = client_information.client_secret
+
+    response = requests.post(token_url, data=params)
+    if not response.ok:
+        raise ValueError(f"Token refresh failed: HTTP {response.status_code}")
+    return OAuthTokens.parse_obj(response.json())
+
+
+def register_client(
+    server_url: str,
+    metadata: Optional[OAuthMetadata],
+    client_metadata: OAuthClientMetadata,
+) -> OAuthClientInformationFull:
+    """Performs OAuth 2.0 Dynamic Client Registration."""
+    if metadata:
+        if not metadata.registration_endpoint:
+            raise ValueError("Incompatible auth server: does not support dynamic client registration")
+        registration_url = metadata.registration_endpoint
+    else:
+        registration_url = urljoin(server_url, "/register")
+
+    response = requests.post(
+        registration_url,
+        json=client_metadata.model_dump(),
+        headers={"Content-Type": "application/json"},
+    )
+    if not response.ok:
+        response.raise_for_status()
+    return OAuthClientInformationFull.model_validate(response.json())
+
+
+def auth(
+    provider: OAuthClientProvider,
+    server_url: str,
+    authorization_code: Optional[str] = None,
+    state_param: Optional[str] = None,
+    for_list: bool = False,
+) -> dict[str, str]:
+    """Orchestrates the full auth flow with a server using secure Redis state storage."""
+    metadata = discover_oauth_metadata(server_url)
+
+    # Handle client registration if needed
+    client_information = provider.client_information()
+    if not client_information:
+        if authorization_code is not None:
+            raise ValueError("Existing OAuth client information is required when exchanging an authorization code")
+        try:
+            full_information = register_client(server_url, metadata, provider.client_metadata)
+        except requests.RequestException as e:
+            raise ValueError(f"Could not register OAuth client: {e}")
+        provider.save_client_information(full_information)
+        client_information = full_information
+
+    # Exchange authorization code for tokens
+    if authorization_code is not None:
+        if not state_param:
+            raise ValueError("State parameter is required when exchanging authorization code")
+
+        try:
+            # Retrieve state data from Redis using state key
+            full_state_data = _retrieve_redis_state(state_param)
+
+            code_verifier = full_state_data.code_verifier
+            redirect_uri = full_state_data.redirect_uri
+
+            if not code_verifier or not redirect_uri:
+                raise ValueError("Missing code_verifier or redirect_uri in state data")
+
+        except (json.JSONDecodeError, ValueError) as e:
+            raise ValueError(f"Invalid state parameter: {e}")
+
+        tokens = exchange_authorization(
+            server_url,
+            metadata,
+            client_information,
+            authorization_code,
+            code_verifier,
+            redirect_uri,
+        )
+        provider.save_tokens(tokens)
+        return {"result": "success"}
+
+    provider_tokens = provider.tokens()
+
+    # Handle token refresh or new authorization
+    if provider_tokens and provider_tokens.refresh_token:
+        try:
+            new_tokens = refresh_authorization(server_url, metadata, client_information, provider_tokens.refresh_token)
+            provider.save_tokens(new_tokens)
+            return {"result": "success"}
+        except Exception as e:
+            raise ValueError(f"Could not refresh OAuth tokens: {e}")
+
+    # Start new authorization flow
+    authorization_url, code_verifier = start_authorization(
+        server_url,
+        metadata,
+        client_information,
+        provider.redirect_url,
+        provider.mcp_provider.id,
+        provider.mcp_provider.tenant_id,
+    )
+
+    provider.save_code_verifier(code_verifier)
+    return {"authorization_url": authorization_url}
diff --git a/api/core/mcp/auth/auth_provider.py b/api/core/mcp/auth/auth_provider.py
new file mode 100644
index 0000000000..cd55dbf64f
--- /dev/null
+++ b/api/core/mcp/auth/auth_provider.py
@@ -0,0 +1,81 @@
+from typing import Optional
+
+from configs import dify_config
+from core.mcp.types import (
+    OAuthClientInformation,
+    OAuthClientInformationFull,
+    OAuthClientMetadata,
+    OAuthTokens,
+)
+from models.tools import MCPToolProvider
+from services.tools.mcp_tools_mange_service import MCPToolManageService
+
+LATEST_PROTOCOL_VERSION = "1.0"
+
+
+class OAuthClientProvider:
+    mcp_provider: MCPToolProvider
+
+    def __init__(self, provider_id: str, tenant_id: str, for_list: bool = False):
+        if for_list:
+            self.mcp_provider = MCPToolManageService.get_mcp_provider_by_provider_id(provider_id, tenant_id)
+        else:
+            self.mcp_provider = MCPToolManageService.get_mcp_provider_by_server_identifier(provider_id, tenant_id)
+
+    @property
+    def redirect_url(self) -> str:
+        """The URL to redirect the user agent to after authorization."""
+        return dify_config.CONSOLE_API_URL + "/console/api/mcp/oauth/callback"
+
+    @property
+    def client_metadata(self) -> OAuthClientMetadata:
+        """Metadata about this OAuth client."""
+        return OAuthClientMetadata(
+            redirect_uris=[self.redirect_url],
+            token_endpoint_auth_method="none",
+            grant_types=["authorization_code", "refresh_token"],
+            response_types=["code"],
+            client_name="Dify",
+            client_uri="https://github.com/langgenius/dify",
+        )
+
+    def client_information(self) -> Optional[OAuthClientInformation]:
+        """Loads information about this OAuth client."""
+        client_information = self.mcp_provider.decrypted_credentials.get("client_information", {})
+        if not client_information:
+            return None
+        return OAuthClientInformation.model_validate(client_information)
+
+    def save_client_information(self, client_information: OAuthClientInformationFull) -> None:
+        """Saves client information after dynamic registration."""
+        MCPToolManageService.update_mcp_provider_credentials(
+            self.mcp_provider,
+            {"client_information": client_information.model_dump()},
+        )
+
+    def tokens(self) -> Optional[OAuthTokens]:
+        """Loads any existing OAuth tokens for the current session."""
+        credentials = self.mcp_provider.decrypted_credentials
+        if not credentials:
+            return None
+        return OAuthTokens(
+            access_token=credentials.get("access_token", ""),
+            token_type=credentials.get("token_type", "Bearer"),
+            expires_in=int(credentials.get("expires_in", "3600") or 3600),
+            refresh_token=credentials.get("refresh_token", ""),
+        )
+
+    def save_tokens(self, tokens: OAuthTokens) -> None:
+        """Stores new OAuth tokens for the current session."""
+        # update mcp provider credentials
+        token_dict = tokens.model_dump()
+        MCPToolManageService.update_mcp_provider_credentials(self.mcp_provider, token_dict, authed=True)
+
+    def save_code_verifier(self, code_verifier: str) -> None:
+        """Saves a PKCE code verifier for the current session."""
+        MCPToolManageService.update_mcp_provider_credentials(self.mcp_provider, {"code_verifier": code_verifier})
+
+    def code_verifier(self) -> str:
+        """Loads the PKCE code verifier for the current session."""
+        # get code verifier from mcp provider credentials
+        return str(self.mcp_provider.decrypted_credentials.get("code_verifier", ""))
diff --git a/api/core/mcp/client/sse_client.py b/api/core/mcp/client/sse_client.py
new file mode 100644
index 0000000000..91debcc8f9
--- /dev/null
+++ b/api/core/mcp/client/sse_client.py
@@ -0,0 +1,361 @@
+import logging
+import queue
+from collections.abc import Generator
+from concurrent.futures import ThreadPoolExecutor
+from contextlib import contextmanager
+from typing import Any, TypeAlias, final
+from urllib.parse import urljoin, urlparse
+
+import httpx
+from sseclient import SSEClient
+
+from core.mcp import types
+from core.mcp.error import MCPAuthError, MCPConnectionError
+from core.mcp.types import SessionMessage
+from core.mcp.utils import create_ssrf_proxy_mcp_http_client, ssrf_proxy_sse_connect
+
+logger = logging.getLogger(__name__)
+
+DEFAULT_QUEUE_READ_TIMEOUT = 3
+
+
+@final
+class _StatusReady:
+    def __init__(self, endpoint_url: str):
+        self._endpoint_url = endpoint_url
+
+
+@final
+class _StatusError:
+    def __init__(self, exc: Exception):
+        self._exc = exc
+
+
+# Type aliases for better readability
+ReadQueue: TypeAlias = queue.Queue[SessionMessage | Exception | None]
+WriteQueue: TypeAlias = queue.Queue[SessionMessage | Exception | None]
+StatusQueue: TypeAlias = queue.Queue[_StatusReady | _StatusError]
+
+
+def remove_request_params(url: str) -> str:
+    """Remove request parameters from URL, keeping only the path."""
+    return urljoin(url, urlparse(url).path)
+
+
+class SSETransport:
+    """SSE client transport implementation."""
+
+    def __init__(
+        self,
+        url: str,
+        headers: dict[str, Any] | None = None,
+        timeout: float = 5.0,
+        sse_read_timeout: float = 5 * 60,
+    ) -> None:
+        """Initialize the SSE transport.
+
+        Args:
+            url: The SSE endpoint URL.
+            headers: Optional headers to include in requests.
+            timeout: HTTP timeout for regular operations.
+            sse_read_timeout: Timeout for SSE read operations.
+        """
+        self.url = url
+        self.headers = headers or {}
+        self.timeout = timeout
+        self.sse_read_timeout = sse_read_timeout
+        self.endpoint_url: str | None = None
+
+    def _validate_endpoint_url(self, endpoint_url: str) -> bool:
+        """Validate that the endpoint URL matches the connection origin.
+
+        Args:
+            endpoint_url: The endpoint URL to validate.
+
+        Returns:
+            True if valid, False otherwise.
+        """
+        url_parsed = urlparse(self.url)
+        endpoint_parsed = urlparse(endpoint_url)
+
+        return url_parsed.netloc == endpoint_parsed.netloc and url_parsed.scheme == endpoint_parsed.scheme
+
+    def _handle_endpoint_event(self, sse_data: str, status_queue: StatusQueue) -> None:
+        """Handle an 'endpoint' SSE event.
+
+        Args:
+            sse_data: The SSE event data.
+            status_queue: Queue to put status updates.
+        """
+        endpoint_url = urljoin(self.url, sse_data)
+        logger.info(f"Received endpoint URL: {endpoint_url}")
+
+        if not self._validate_endpoint_url(endpoint_url):
+            error_msg = f"Endpoint origin does not match connection origin: {endpoint_url}"
+            logger.error(error_msg)
+            status_queue.put(_StatusError(ValueError(error_msg)))
+            return
+
+        status_queue.put(_StatusReady(endpoint_url))
+
+    def _handle_message_event(self, sse_data: str, read_queue: ReadQueue) -> None:
+        """Handle a 'message' SSE event.
+
+        Args:
+            sse_data: The SSE event data.
+            read_queue: Queue to put parsed messages.
+        """
+        try:
+            message = types.JSONRPCMessage.model_validate_json(sse_data)
+            logger.debug(f"Received server message: {message}")
+            session_message = SessionMessage(message)
+            read_queue.put(session_message)
+        except Exception as exc:
+            logger.exception("Error parsing server message")
+            read_queue.put(exc)
+
+    def _handle_sse_event(self, sse, read_queue: ReadQueue, status_queue: StatusQueue) -> None:
+        """Handle a single SSE event.
+
+        Args:
+            sse: The SSE event object.
+            read_queue: Queue for message events.
+            status_queue: Queue for status events.
+        """
+        match sse.event:
+            case "endpoint":
+                self._handle_endpoint_event(sse.data, status_queue)
+            case "message":
+                self._handle_message_event(sse.data, read_queue)
+            case _:
+                logger.warning(f"Unknown SSE event: {sse.event}")
+
+    def sse_reader(self, event_source, read_queue: ReadQueue, status_queue: StatusQueue) -> None:
+        """Read and process SSE events.
+
+        Args:
+            event_source: The SSE event source.
+            read_queue: Queue to put received messages.
+            status_queue: Queue to put status updates.
+        """
+        try:
+            for sse in event_source.iter_sse():
+                self._handle_sse_event(sse, read_queue, status_queue)
+        except httpx.ReadError as exc:
+            logger.debug(f"SSE reader shutting down normally: {exc}")
+        except Exception as exc:
+            read_queue.put(exc)
+        finally:
+            read_queue.put(None)
+
+    def _send_message(self, client: httpx.Client, endpoint_url: str, message: SessionMessage) -> None:
+        """Send a single message to the server.
+
+        Args:
+            client: HTTP client to use.
+            endpoint_url: The endpoint URL to send to.
+            message: The message to send.
+        """
+        response = client.post(
+            endpoint_url,
+            json=message.message.model_dump(
+                by_alias=True,
+                mode="json",
+                exclude_none=True,
+            ),
+        )
+        response.raise_for_status()
+        logger.debug(f"Client message sent successfully: {response.status_code}")
+
+    def post_writer(self, client: httpx.Client, endpoint_url: str, write_queue: WriteQueue) -> None:
+        """Handle writing messages to the server.
+
+        Args:
+            client: HTTP client to use.
+            endpoint_url: The endpoint URL to send messages to.
+            write_queue: Queue to read messages from.
+        """
+        try:
+            while True:
+                try:
+                    message = write_queue.get(timeout=DEFAULT_QUEUE_READ_TIMEOUT)
+                    if message is None:
+                        break
+                    if isinstance(message, Exception):
+                        write_queue.put(message)
+                        continue
+
+                    self._send_message(client, endpoint_url, message)
+
+                except queue.Empty:
+                    continue
+        except httpx.ReadError as exc:
+            logger.debug(f"Post writer shutting down normally: {exc}")
+        except Exception as exc:
+            logger.exception("Error writing messages")
+            write_queue.put(exc)
+        finally:
+            write_queue.put(None)
+
+    def _wait_for_endpoint(self, status_queue: StatusQueue) -> str:
+        """Wait for the endpoint URL from the status queue.
+
+        Args:
+            status_queue: Queue to read status from.
+
+        Returns:
+            The endpoint URL.
+
+        Raises:
+            ValueError: If endpoint URL is not received or there's an error.
+        """
+        try:
+            status = status_queue.get(timeout=1)
+        except queue.Empty:
+            raise ValueError("failed to get endpoint URL")
+
+        if isinstance(status, _StatusReady):
+            return status._endpoint_url
+        elif isinstance(status, _StatusError):
+            raise status._exc
+        else:
+            raise ValueError("failed to get endpoint URL")
+
+    def connect(
+        self,
+        executor: ThreadPoolExecutor,
+        client: httpx.Client,
+        event_source,
+    ) -> tuple[ReadQueue, WriteQueue]:
+        """Establish connection and start worker threads.
+
+        Args:
+            executor: Thread pool executor.
+            client: HTTP client.
+            event_source: SSE event source.
+
+        Returns:
+            Tuple of (read_queue, write_queue).
+        """
+        read_queue: ReadQueue = queue.Queue()
+        write_queue: WriteQueue = queue.Queue()
+        status_queue: StatusQueue = queue.Queue()
+
+        # Start SSE reader thread
+        executor.submit(self.sse_reader, event_source, read_queue, status_queue)
+
+        # Wait for endpoint URL
+        endpoint_url = self._wait_for_endpoint(status_queue)
+        self.endpoint_url = endpoint_url
+
+        # Start post writer thread
+        executor.submit(self.post_writer, client, endpoint_url, write_queue)
+
+        return read_queue, write_queue
+
+
+@contextmanager
+def sse_client(
+    url: str,
+    headers: dict[str, Any] | None = None,
+    timeout: float = 5.0,
+    sse_read_timeout: float = 5 * 60,
+) -> Generator[tuple[ReadQueue, WriteQueue], None, None]:
+    """
+    Client transport for SSE.
+    `sse_read_timeout` determines how long (in seconds) the client will wait for a new
+    event before disconnecting. All other HTTP operations are controlled by `timeout`.
+
+    Args:
+        url: The SSE endpoint URL.
+        headers: Optional headers to include in requests.
+        timeout: HTTP timeout for regular operations.
+        sse_read_timeout: Timeout for SSE read operations.
+
+    Yields:
+        Tuple of (read_queue, write_queue) for message communication.
+    """
+    transport = SSETransport(url, headers, timeout, sse_read_timeout)
+
+    read_queue: ReadQueue | None = None
+    write_queue: WriteQueue | None = None
+
+    with ThreadPoolExecutor() as executor:
+        try:
+            with create_ssrf_proxy_mcp_http_client(headers=transport.headers) as client:
+                with ssrf_proxy_sse_connect(
+                    url, timeout=httpx.Timeout(timeout, read=sse_read_timeout), client=client
+                ) as event_source:
+                    event_source.response.raise_for_status()
+
+                    read_queue, write_queue = transport.connect(executor, client, event_source)
+
+                    yield read_queue, write_queue
+
+        except httpx.HTTPStatusError as exc:
+            if exc.response.status_code == 401:
+                raise MCPAuthError()
+            raise MCPConnectionError()
+        except Exception:
+            logger.exception("Error connecting to SSE endpoint")
+            raise
+        finally:
+            # Clean up queues
+            if read_queue:
+                read_queue.put(None)
+            if write_queue:
+                write_queue.put(None)
+
+
+def send_message(http_client: httpx.Client, endpoint_url: str, session_message: SessionMessage) -> None:
+    """
+    Send a message to the server using the provided HTTP client.
+
+    Args:
+        http_client: The HTTP client to use for sending
+        endpoint_url: The endpoint URL to send the message to
+        session_message: The message to send
+    """
+    try:
+        response = http_client.post(
+            endpoint_url,
+            json=session_message.message.model_dump(
+                by_alias=True,
+                mode="json",
+                exclude_none=True,
+            ),
+        )
+        response.raise_for_status()
+        logger.debug(f"Client message sent successfully: {response.status_code}")
+    except Exception as exc:
+        logger.exception("Error sending message")
+        raise
+
+
+def read_messages(
+    sse_client: SSEClient,
+) -> Generator[SessionMessage | Exception, None, None]:
+    """
+    Read messages from the SSE client.
+
+    Args:
+        sse_client: The SSE client to read from
+
+    Yields:
+        SessionMessage or Exception for each event received
+    """
+    try:
+        for sse in sse_client.events():
+            if sse.event == "message":
+                try:
+                    message = types.JSONRPCMessage.model_validate_json(sse.data)
+                    logger.debug(f"Received server message: {message}")
+                    yield SessionMessage(message)
+                except Exception as exc:
+                    logger.exception("Error parsing server message")
+                    yield exc
+            else:
+                logger.warning(f"Unknown SSE event: {sse.event}")
+    except Exception as exc:
+        logger.exception("Error reading SSE messages")
+        yield exc
diff --git a/api/core/mcp/client/streamable_client.py b/api/core/mcp/client/streamable_client.py
new file mode 100644
index 0000000000..fbd8d05f9e
--- /dev/null
+++ b/api/core/mcp/client/streamable_client.py
@@ -0,0 +1,476 @@
+"""
+StreamableHTTP Client Transport Module
+
+This module implements the StreamableHTTP transport for MCP clients,
+providing support for HTTP POST requests with optional SSE streaming responses
+and session management.
+"""
+
+import logging
+import queue
+from collections.abc import Callable, Generator
+from concurrent.futures import ThreadPoolExecutor
+from contextlib import contextmanager
+from dataclasses import dataclass
+from datetime import timedelta
+from typing import Any, cast
+
+import httpx
+from httpx_sse import EventSource, ServerSentEvent
+
+from core.mcp.types import (
+    ClientMessageMetadata,
+    ErrorData,
+    JSONRPCError,
+    JSONRPCMessage,
+    JSONRPCNotification,
+    JSONRPCRequest,
+    JSONRPCResponse,
+    RequestId,
+    SessionMessage,
+)
+from core.mcp.utils import create_ssrf_proxy_mcp_http_client, ssrf_proxy_sse_connect
+
+logger = logging.getLogger(__name__)
+
+
+SessionMessageOrError = SessionMessage | Exception | None
+# Queue types with clearer names for their roles
+ServerToClientQueue = queue.Queue[SessionMessageOrError]  # Server to client messages
+ClientToServerQueue = queue.Queue[SessionMessage | None]  # Client to server messages
+GetSessionIdCallback = Callable[[], str | None]
+
+MCP_SESSION_ID = "mcp-session-id"
+LAST_EVENT_ID = "last-event-id"
+CONTENT_TYPE = "content-type"
+ACCEPT = "Accept"
+
+
+JSON = "application/json"
+SSE = "text/event-stream"
+
+DEFAULT_QUEUE_READ_TIMEOUT = 3
+
+
+class StreamableHTTPError(Exception):
+    """Base exception for StreamableHTTP transport errors."""
+
+    pass
+
+
+class ResumptionError(StreamableHTTPError):
+    """Raised when resumption request is invalid."""
+
+    pass
+
+
+@dataclass
+class RequestContext:
+    """Context for a request operation."""
+
+    client: httpx.Client
+    headers: dict[str, str]
+    session_id: str | None
+    session_message: SessionMessage
+    metadata: ClientMessageMetadata | None
+    server_to_client_queue: ServerToClientQueue  # Renamed for clarity
+    sse_read_timeout: timedelta
+
+
+class StreamableHTTPTransport:
+    """StreamableHTTP client transport implementation."""
+
+    def __init__(
+        self,
+        url: str,
+        headers: dict[str, Any] | None = None,
+        timeout: timedelta = timedelta(seconds=30),
+        sse_read_timeout: timedelta = timedelta(seconds=60 * 5),
+    ) -> None:
+        """Initialize the StreamableHTTP transport.
+
+        Args:
+            url: The endpoint URL.
+            headers: Optional headers to include in requests.
+            timeout: HTTP timeout for regular operations.
+            sse_read_timeout: Timeout for SSE read operations.
+        """
+        self.url = url
+        self.headers = headers or {}
+        self.timeout = timeout
+        self.sse_read_timeout = sse_read_timeout
+        self.session_id: str | None = None
+        self.request_headers = {
+            ACCEPT: f"{JSON}, {SSE}",
+            CONTENT_TYPE: JSON,
+            **self.headers,
+        }
+
+    def _update_headers_with_session(self, base_headers: dict[str, str]) -> dict[str, str]:
+        """Update headers with session ID if available."""
+        headers = base_headers.copy()
+        if self.session_id:
+            headers[MCP_SESSION_ID] = self.session_id
+        return headers
+
+    def _is_initialization_request(self, message: JSONRPCMessage) -> bool:
+        """Check if the message is an initialization request."""
+        return isinstance(message.root, JSONRPCRequest) and message.root.method == "initialize"
+
+    def _is_initialized_notification(self, message: JSONRPCMessage) -> bool:
+        """Check if the message is an initialized notification."""
+        return isinstance(message.root, JSONRPCNotification) and message.root.method == "notifications/initialized"
+
+    def _maybe_extract_session_id_from_response(
+        self,
+        response: httpx.Response,
+    ) -> None:
+        """Extract and store session ID from response headers."""
+        new_session_id = response.headers.get(MCP_SESSION_ID)
+        if new_session_id:
+            self.session_id = new_session_id
+            logger.info(f"Received session ID: {self.session_id}")
+
+    def _handle_sse_event(
+        self,
+        sse: ServerSentEvent,
+        server_to_client_queue: ServerToClientQueue,
+        original_request_id: RequestId | None = None,
+        resumption_callback: Callable[[str], None] | None = None,
+    ) -> bool:
+        """Handle an SSE event, returning True if the response is complete."""
+        if sse.event == "message":
+            try:
+                message = JSONRPCMessage.model_validate_json(sse.data)
+                logger.debug(f"SSE message: {message}")
+
+                # If this is a response and we have original_request_id, replace it
+                if original_request_id is not None and isinstance(message.root, JSONRPCResponse | JSONRPCError):
+                    message.root.id = original_request_id
+
+                session_message = SessionMessage(message)
+                # Put message in queue that goes to client
+                server_to_client_queue.put(session_message)
+
+                # Call resumption token callback if we have an ID
+                if sse.id and resumption_callback:
+                    resumption_callback(sse.id)
+
+                # If this is a response or error return True indicating completion
+                # Otherwise, return False to continue listening
+                return isinstance(message.root, JSONRPCResponse | JSONRPCError)
+
+            except Exception as exc:
+                # Put exception in queue that goes to client
+                server_to_client_queue.put(exc)
+                return False
+        elif sse.event == "ping":
+            logger.debug("Received ping event")
+            return False
+        else:
+            logger.warning(f"Unknown SSE event: {sse.event}")
+            return False
+
+    def handle_get_stream(
+        self,
+        client: httpx.Client,
+        server_to_client_queue: ServerToClientQueue,
+    ) -> None:
+        """Handle GET stream for server-initiated messages."""
+        try:
+            if not self.session_id:
+                return
+
+            headers = self._update_headers_with_session(self.request_headers)
+
+            with ssrf_proxy_sse_connect(
+                self.url,
+                headers=headers,
+                timeout=httpx.Timeout(self.timeout.seconds, read=self.sse_read_timeout.seconds),
+                client=client,
+                method="GET",
+            ) as event_source:
+                event_source.response.raise_for_status()
+                logger.debug("GET SSE connection established")
+
+                for sse in event_source.iter_sse():
+                    self._handle_sse_event(sse, server_to_client_queue)
+
+        except Exception as exc:
+            logger.debug(f"GET stream error (non-fatal): {exc}")
+
+    def _handle_resumption_request(self, ctx: RequestContext) -> None:
+        """Handle a resumption request using GET with SSE."""
+        headers = self._update_headers_with_session(ctx.headers)
+        if ctx.metadata and ctx.metadata.resumption_token:
+            headers[LAST_EVENT_ID] = ctx.metadata.resumption_token
+        else:
+            raise ResumptionError("Resumption request requires a resumption token")
+
+        # Extract original request ID to map responses
+        original_request_id = None
+        if isinstance(ctx.session_message.message.root, JSONRPCRequest):
+            original_request_id = ctx.session_message.message.root.id
+
+        with ssrf_proxy_sse_connect(
+            self.url,
+            headers=headers,
+            timeout=httpx.Timeout(self.timeout.seconds, read=ctx.sse_read_timeout.seconds),
+            client=ctx.client,
+            method="GET",
+        ) as event_source:
+            event_source.response.raise_for_status()
+            logger.debug("Resumption GET SSE connection established")
+
+            for sse in event_source.iter_sse():
+                is_complete = self._handle_sse_event(
+                    sse,
+                    ctx.server_to_client_queue,
+                    original_request_id,
+                    ctx.metadata.on_resumption_token_update if ctx.metadata else None,
+                )
+                if is_complete:
+                    break
+
+    def _handle_post_request(self, ctx: RequestContext) -> None:
+        """Handle a POST request with response processing."""
+        headers = self._update_headers_with_session(ctx.headers)
+        message = ctx.session_message.message
+        is_initialization = self._is_initialization_request(message)
+
+        with ctx.client.stream(
+            "POST",
+            self.url,
+            json=message.model_dump(by_alias=True, mode="json", exclude_none=True),
+            headers=headers,
+        ) as response:
+            if response.status_code == 202:
+                logger.debug("Received 202 Accepted")
+                return
+
+            if response.status_code == 404:
+                if isinstance(message.root, JSONRPCRequest):
+                    self._send_session_terminated_error(
+                        ctx.server_to_client_queue,
+                        message.root.id,
+                    )
+                return
+
+            response.raise_for_status()
+            if is_initialization:
+                self._maybe_extract_session_id_from_response(response)
+
+            content_type = cast(str, response.headers.get(CONTENT_TYPE, "").lower())
+
+            if content_type.startswith(JSON):
+                self._handle_json_response(response, ctx.server_to_client_queue)
+            elif content_type.startswith(SSE):
+                self._handle_sse_response(response, ctx)
+            else:
+                self._handle_unexpected_content_type(
+                    content_type,
+                    ctx.server_to_client_queue,
+                )
+
+    def _handle_json_response(
+        self,
+        response: httpx.Response,
+        server_to_client_queue: ServerToClientQueue,
+    ) -> None:
+        """Handle JSON response from the server."""
+        try:
+            content = response.read()
+            message = JSONRPCMessage.model_validate_json(content)
+            session_message = SessionMessage(message)
+            server_to_client_queue.put(session_message)
+        except Exception as exc:
+            server_to_client_queue.put(exc)
+
+    def _handle_sse_response(self, response: httpx.Response, ctx: RequestContext) -> None:
+        """Handle SSE response from the server."""
+        try:
+            event_source = EventSource(response)
+            for sse in event_source.iter_sse():
+                is_complete = self._handle_sse_event(
+                    sse,
+                    ctx.server_to_client_queue,
+                    resumption_callback=(ctx.metadata.on_resumption_token_update if ctx.metadata else None),
+                )
+                if is_complete:
+                    break
+        except Exception as e:
+            ctx.server_to_client_queue.put(e)
+
+    def _handle_unexpected_content_type(
+        self,
+        content_type: str,
+        server_to_client_queue: ServerToClientQueue,
+    ) -> None:
+        """Handle unexpected content type in response."""
+        error_msg = f"Unexpected content type: {content_type}"
+        logger.error(error_msg)
+        server_to_client_queue.put(ValueError(error_msg))
+
+    def _send_session_terminated_error(
+        self,
+        server_to_client_queue: ServerToClientQueue,
+        request_id: RequestId,
+    ) -> None:
+        """Send a session terminated error response."""
+        jsonrpc_error = JSONRPCError(
+            jsonrpc="2.0",
+            id=request_id,
+            error=ErrorData(code=32600, message="Session terminated by server"),
+        )
+        session_message = SessionMessage(JSONRPCMessage(jsonrpc_error))
+        server_to_client_queue.put(session_message)
+
+    def post_writer(
+        self,
+        client: httpx.Client,
+        client_to_server_queue: ClientToServerQueue,
+        server_to_client_queue: ServerToClientQueue,
+        start_get_stream: Callable[[], None],
+    ) -> None:
+        """Handle writing requests to the server.
+
+        This method processes messages from the client_to_server_queue and sends them to the server.
+        Responses are written to the server_to_client_queue.
+        """
+        while True:
+            try:
+                # Read message from client queue with timeout to check stop_event periodically
+                session_message = client_to_server_queue.get(timeout=DEFAULT_QUEUE_READ_TIMEOUT)
+                if session_message is None:
+                    break
+
+                message = session_message.message
+                metadata = (
+                    session_message.metadata if isinstance(session_message.metadata, ClientMessageMetadata) else None
+                )
+
+                # Check if this is a resumption request
+                is_resumption = bool(metadata and metadata.resumption_token)
+
+                logger.debug(f"Sending client message: {message}")
+
+                # Handle initialized notification
+                if self._is_initialized_notification(message):
+                    start_get_stream()
+
+                ctx = RequestContext(
+                    client=client,
+                    headers=self.request_headers,
+                    session_id=self.session_id,
+                    session_message=session_message,
+                    metadata=metadata,
+                    server_to_client_queue=server_to_client_queue,  # Queue to write responses to client
+                    sse_read_timeout=self.sse_read_timeout,
+                )
+
+                if is_resumption:
+                    self._handle_resumption_request(ctx)
+                else:
+                    self._handle_post_request(ctx)
+            except queue.Empty:
+                continue
+            except Exception as exc:
+                server_to_client_queue.put(exc)
+
+    def terminate_session(self, client: httpx.Client) -> None:
+        """Terminate the session by sending a DELETE request."""
+        if not self.session_id:
+            return
+
+        try:
+            headers = self._update_headers_with_session(self.request_headers)
+            response = client.delete(self.url, headers=headers)
+
+            if response.status_code == 405:
+                logger.debug("Server does not allow session termination")
+            elif response.status_code != 200:
+                logger.warning(f"Session termination failed: {response.status_code}")
+        except Exception as exc:
+            logger.warning(f"Session termination failed: {exc}")
+
+    def get_session_id(self) -> str | None:
+        """Get the current session ID."""
+        return self.session_id
+
+
+@contextmanager
+def streamablehttp_client(
+    url: str,
+    headers: dict[str, Any] | None = None,
+    timeout: timedelta = timedelta(seconds=30),
+    sse_read_timeout: timedelta = timedelta(seconds=60 * 5),
+    terminate_on_close: bool = True,
+) -> Generator[
+    tuple[
+        ServerToClientQueue,  # Queue for receiving messages FROM server
+        ClientToServerQueue,  # Queue for sending messages TO server
+        GetSessionIdCallback,
+    ],
+    None,
+    None,
+]:
+    """
+    Client transport for StreamableHTTP.
+
+    `sse_read_timeout` determines how long (in seconds) the client will wait for a new
+    event before disconnecting. All other HTTP operations are controlled by `timeout`.
+
+    Yields:
+        Tuple containing:
+            - server_to_client_queue: Queue for reading messages FROM the server
+            - client_to_server_queue: Queue for sending messages TO the server
+            - get_session_id_callback: Function to retrieve the current session ID
+    """
+    transport = StreamableHTTPTransport(url, headers, timeout, sse_read_timeout)
+
+    # Create queues with clear directional meaning
+    server_to_client_queue: ServerToClientQueue = queue.Queue()  # For messages FROM server TO client
+    client_to_server_queue: ClientToServerQueue = queue.Queue()  # For messages FROM client TO server
+
+    with ThreadPoolExecutor(max_workers=2) as executor:
+        try:
+            with create_ssrf_proxy_mcp_http_client(
+                headers=transport.request_headers,
+                timeout=httpx.Timeout(transport.timeout.seconds, read=transport.sse_read_timeout.seconds),
+            ) as client:
+                # Define callbacks that need access to thread pool
+                def start_get_stream() -> None:
+                    """Start a worker thread to handle server-initiated messages."""
+                    executor.submit(transport.handle_get_stream, client, server_to_client_queue)
+
+                # Start the post_writer worker thread
+                executor.submit(
+                    transport.post_writer,
+                    client,
+                    client_to_server_queue,  # Queue for messages FROM client TO server
+                    server_to_client_queue,  # Queue for messages FROM server TO client
+                    start_get_stream,
+                )
+
+                try:
+                    yield (
+                        server_to_client_queue,  # Queue for receiving messages FROM server
+                        client_to_server_queue,  # Queue for sending messages TO server
+                        transport.get_session_id,
+                    )
+                finally:
+                    if transport.session_id and terminate_on_close:
+                        transport.terminate_session(client)
+
+                    # Signal threads to stop
+                    client_to_server_queue.put(None)
+        finally:
+            # Clear any remaining items and add None sentinel to unblock any waiting threads
+            try:
+                while not client_to_server_queue.empty():
+                    client_to_server_queue.get_nowait()
+            except queue.Empty:
+                pass
+
+            client_to_server_queue.put(None)
+            server_to_client_queue.put(None)
diff --git a/api/core/mcp/entities.py b/api/core/mcp/entities.py
new file mode 100644
index 0000000000..7553c10a2e
--- /dev/null
+++ b/api/core/mcp/entities.py
@@ -0,0 +1,19 @@
+from dataclasses import dataclass
+from typing import Any, Generic, TypeVar
+
+from core.mcp.session.base_session import BaseSession
+from core.mcp.types import LATEST_PROTOCOL_VERSION, RequestId, RequestParams
+
+SUPPORTED_PROTOCOL_VERSIONS: list[str] = ["2024-11-05", LATEST_PROTOCOL_VERSION]
+
+
+SessionT = TypeVar("SessionT", bound=BaseSession[Any, Any, Any, Any, Any])
+LifespanContextT = TypeVar("LifespanContextT")
+
+
+@dataclass
+class RequestContext(Generic[SessionT, LifespanContextT]):
+    request_id: RequestId
+    meta: RequestParams.Meta | None
+    session: SessionT
+    lifespan_context: LifespanContextT
diff --git a/api/core/mcp/error.py b/api/core/mcp/error.py
new file mode 100644
index 0000000000..92ea7bde09
--- /dev/null
+++ b/api/core/mcp/error.py
@@ -0,0 +1,10 @@
+class MCPError(Exception):
+    pass
+
+
+class MCPConnectionError(MCPError):
+    pass
+
+
+class MCPAuthError(MCPConnectionError):
+    pass
diff --git a/api/core/mcp/mcp_client.py b/api/core/mcp/mcp_client.py
new file mode 100644
index 0000000000..e9036de8c6
--- /dev/null
+++ b/api/core/mcp/mcp_client.py
@@ -0,0 +1,150 @@
+import logging
+from collections.abc import Callable
+from contextlib import AbstractContextManager, ExitStack
+from types import TracebackType
+from typing import Any, Optional, cast
+from urllib.parse import urlparse
+
+from core.mcp.client.sse_client import sse_client
+from core.mcp.client.streamable_client import streamablehttp_client
+from core.mcp.error import MCPAuthError, MCPConnectionError
+from core.mcp.session.client_session import ClientSession
+from core.mcp.types import Tool
+
+logger = logging.getLogger(__name__)
+
+
+class MCPClient:
+    def __init__(
+        self,
+        server_url: str,
+        provider_id: str,
+        tenant_id: str,
+        authed: bool = True,
+        authorization_code: Optional[str] = None,
+        for_list: bool = False,
+    ):
+        # Initialize info
+        self.provider_id = provider_id
+        self.tenant_id = tenant_id
+        self.client_type = "streamable"
+        self.server_url = server_url
+
+        # Authentication info
+        self.authed = authed
+        self.authorization_code = authorization_code
+        if authed:
+            from core.mcp.auth.auth_provider import OAuthClientProvider
+
+            self.provider = OAuthClientProvider(self.provider_id, self.tenant_id, for_list=for_list)
+            self.token = self.provider.tokens()
+
+        # Initialize session and client objects
+        self._session: Optional[ClientSession] = None
+        self._streams_context: Optional[AbstractContextManager[Any]] = None
+        self._session_context: Optional[ClientSession] = None
+        self.exit_stack = ExitStack()
+
+        # Whether the client has been initialized
+        self._initialized = False
+
+    def __enter__(self):
+        self._initialize()
+        self._initialized = True
+        return self
+
+    def __exit__(
+        self, exc_type: Optional[type], exc_value: Optional[BaseException], traceback: Optional[TracebackType]
+    ):
+        self.cleanup()
+
+    def _initialize(
+        self,
+    ):
+        """Initialize the client with fallback to SSE if streamable connection fails"""
+        connection_methods: dict[str, Callable[..., AbstractContextManager[Any]]] = {
+            "mcp": streamablehttp_client,
+            "sse": sse_client,
+        }
+
+        parsed_url = urlparse(self.server_url)
+        path = parsed_url.path
+        method_name = path.rstrip("/").split("/")[-1] if path else ""
+        try:
+            client_factory = connection_methods[method_name]
+            self.connect_server(client_factory, method_name)
+        except KeyError:
+            try:
+                self.connect_server(sse_client, "sse")
+            except MCPConnectionError:
+                self.connect_server(streamablehttp_client, "mcp")
+
+    def connect_server(
+        self, client_factory: Callable[..., AbstractContextManager[Any]], method_name: str, first_try: bool = True
+    ):
+        from core.mcp.auth.auth_flow import auth
+
+        try:
+            headers = (
+                {"Authorization": f"{self.token.token_type.capitalize()} {self.token.access_token}"}
+                if self.authed and self.token
+                else {}
+            )
+            self._streams_context = client_factory(url=self.server_url, headers=headers)
+            if self._streams_context is None:
+                raise MCPConnectionError("Failed to create connection context")
+
+            # Use exit_stack to manage context managers properly
+            if method_name == "mcp":
+                read_stream, write_stream, _ = self.exit_stack.enter_context(self._streams_context)
+                streams = (read_stream, write_stream)
+            else:  # sse_client
+                streams = self.exit_stack.enter_context(self._streams_context)
+
+            self._session_context = ClientSession(*streams)
+            self._session = self.exit_stack.enter_context(self._session_context)
+            session = cast(ClientSession, self._session)
+            session.initialize()
+            return
+
+        except MCPAuthError:
+            if not self.authed:
+                raise
+            try:
+                auth(self.provider, self.server_url, self.authorization_code)
+            except Exception as e:
+                raise ValueError(f"Failed to authenticate: {e}")
+            self.token = self.provider.tokens()
+            if first_try:
+                return self.connect_server(client_factory, method_name, first_try=False)
+
+        except MCPConnectionError:
+            raise
+
+    def list_tools(self) -> list[Tool]:
+        """Connect to an MCP server running with SSE transport"""
+        # List available tools to verify connection
+        if not self._initialized or not self._session:
+            raise ValueError("Session not initialized.")
+        response = self._session.list_tools()
+        tools = response.tools
+        return tools
+
+    def invoke_tool(self, tool_name: str, tool_args: dict):
+        """Call a tool"""
+        if not self._initialized or not self._session:
+            raise ValueError("Session not initialized.")
+        return self._session.call_tool(tool_name, tool_args)
+
+    def cleanup(self):
+        """Clean up resources"""
+        try:
+            # ExitStack will handle proper cleanup of all managed context managers
+            self.exit_stack.close()
+            self._session = None
+            self._session_context = None
+            self._streams_context = None
+            self._initialized = False
+        except Exception as e:
+            logging.exception("Error during cleanup")
+            raise ValueError(f"Error during cleanup: {e}")
diff --git a/api/core/mcp/server/streamable_http.py b/api/core/mcp/server/streamable_http.py
new file mode 100644
index 0000000000..6b422ae4ae
--- /dev/null
+++ b/api/core/mcp/server/streamable_http.py
@@ -0,0 +1,224 @@
+import json
+import logging
+from collections.abc import Mapping
+from typing import Any, cast
+
+from configs import dify_config
+from controllers.web.passport import generate_session_id
+from core.app.app_config.entities import VariableEntity, VariableEntityType
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
+from core.mcp import types
+from core.mcp.types import INTERNAL_ERROR, INVALID_PARAMS, METHOD_NOT_FOUND
+from core.mcp.utils import create_mcp_error_response
+from core.model_runtime.utils.encoders import jsonable_encoder
+from extensions.ext_database import db
+from models.model import App, AppMCPServer, AppMode, EndUser
+from services.app_generate_service import AppGenerateService
+
+"""
+Apply to MCP HTTP streamable server with stateless http
+"""
+logger = logging.getLogger(__name__)
+
+
+class MCPServerStreamableHTTPRequestHandler:
+    def __init__(
+        self, app: App, request: types.ClientRequest | types.ClientNotification, user_input_form: list[VariableEntity]
+    ):
+        self.app = app
+        self.request = request
+        mcp_server = db.session.query(AppMCPServer).filter(AppMCPServer.app_id == self.app.id).first()
+        if not mcp_server:
+            raise ValueError("MCP server not found")
+        self.mcp_server: AppMCPServer = mcp_server
+        self.end_user = self.retrieve_end_user()
+        self.user_input_form = user_input_form
+
+    @property
+    def request_type(self):
+        return type(self.request.root)
+
+    @property
+    def parameter_schema(self):
+        parameters, required = self._convert_input_form_to_parameters(self.user_input_form)
+        if self.app.mode in {AppMode.COMPLETION.value, AppMode.WORKFLOW.value}:
+            return {
+                "type": "object",
+                "properties": parameters,
+                "required": required,
+            }
+        return {
+            "type": "object",
+            "properties": {
+                "query": {"type": "string", "description": "User Input/Question content"},
+                **parameters,
+            },
+            "required": ["query", *required],
+        }
+
+    @property
+    def capabilities(self):
+        return types.ServerCapabilities(
+            tools=types.ToolsCapability(listChanged=False),
+        )
+
+    def response(self, response: types.Result | str):
+        if isinstance(response, str):
+            sse_content = f"event: ping\ndata: {response}\n\n".encode()
+            yield sse_content
+            return
+        json_response = types.JSONRPCResponse(
+            jsonrpc="2.0",
+            id=(self.request.root.model_extra or {}).get("id", 1),
+            result=response.model_dump(by_alias=True, mode="json", exclude_none=True),
+        )
+        json_data = json.dumps(jsonable_encoder(json_response))
+
+        sse_content = f"event: message\ndata: {json_data}\n\n".encode()
+
+        yield sse_content
+
+    def error_response(self, code: int, message: str, data=None):
+        request_id = (self.request.root.model_extra or {}).get("id", 1) or 1
+        return create_mcp_error_response(request_id, code, message, data)
+
+    def handle(self):
+        handle_map = {
+            types.InitializeRequest: self.initialize,
+            types.ListToolsRequest: self.list_tools,
+            types.CallToolRequest: self.invoke_tool,
+            types.InitializedNotification: self.handle_notification,
+        }
+        try:
+            if self.request_type in handle_map:
+                return self.response(handle_map[self.request_type]())
+            else:
+                return self.error_response(METHOD_NOT_FOUND, f"Method not found: {self.request_type}")
+        except ValueError as e:
+            logger.exception("Invalid params")
+            return self.error_response(INVALID_PARAMS, str(e))
+        except Exception as e:
+            logger.exception("Internal server error")
+            return self.error_response(INTERNAL_ERROR, f"Internal server error: {str(e)}")
+
+    def handle_notification(self):
+        return "ping"
+
+    def initialize(self):
+        request = cast(types.InitializeRequest, self.request.root)
+        client_info = request.params.clientInfo
+        clinet_name = f"{client_info.name}@{client_info.version}"
+        if not self.end_user:
+            end_user = EndUser(
+                tenant_id=self.app.tenant_id,
+                app_id=self.app.id,
+                type="mcp",
+                name=clinet_name,
+                session_id=generate_session_id(),
+                external_user_id=self.mcp_server.id,
+            )
+            db.session.add(end_user)
+            db.session.commit()
+        return types.InitializeResult(
+            protocolVersion=types.SERVER_LATEST_PROTOCOL_VERSION,
+            capabilities=self.capabilities,
+            serverInfo=types.Implementation(name="Dify", version=dify_config.project.version),
+            instructions=self.mcp_server.description,
+        )
+
+    def list_tools(self):
+        if not self.end_user:
+            raise ValueError("User not found")
+        return types.ListToolsResult(
+            tools=[
+                types.Tool(
+                    name=self.app.name,
+                    description=self.mcp_server.description,
+                    inputSchema=self.parameter_schema,
+                )
+            ],
+        )
+
+    def invoke_tool(self):
+        if not self.end_user:
+            raise ValueError("User not found")
+        request = cast(types.CallToolRequest, self.request.root)
+        args = request.params.arguments
+        if not args:
+            raise ValueError("No arguments provided")
+        if self.app.mode in {AppMode.WORKFLOW.value}:
+            args = {"inputs": args}
+        elif self.app.mode in {AppMode.COMPLETION.value}:
+            args = {"query": "", "inputs": args}
+        else:
+            args = {"query": args["query"], "inputs": {k: v for k, v in args.items() if k != "query"}}
+        response = AppGenerateService.generate(
+            self.app,
+            self.end_user,
+            args,
+            InvokeFrom.SERVICE_API,
+            streaming=self.app.mode == AppMode.AGENT_CHAT.value,
+        )
+        answer = ""
+        if isinstance(response, RateLimitGenerator):
+            for item in response.generator:
+                data = item
+                if isinstance(data, str) and data.startswith("data: "):
+                    try:
+                        json_str = data[6:].strip()
+                        parsed_data = json.loads(json_str)
+                        if parsed_data.get("event") == "agent_thought":
+                            answer += parsed_data.get("thought", "")
+                    except json.JSONDecodeError:
+                        continue
+        if isinstance(response, Mapping):
+            if self.app.mode in {
+                AppMode.ADVANCED_CHAT.value,
+                AppMode.COMPLETION.value,
+                AppMode.CHAT.value,
+                AppMode.AGENT_CHAT.value,
+            }:
+                answer = response["answer"]
+            elif self.app.mode in {AppMode.WORKFLOW.value}:
+                answer = json.dumps(response["data"]["outputs"], ensure_ascii=False)
+            else:
+                raise ValueError("Invalid app mode")
+            # Not support image yet
+        return types.CallToolResult(content=[types.TextContent(text=answer, type="text")])
+
+    def retrieve_end_user(self):
+        return (
+            db.session.query(EndUser)
+            .filter(EndUser.external_user_id == self.mcp_server.id, EndUser.type == "mcp")
+            .first()
+        )
+
+    def _convert_input_form_to_parameters(self, user_input_form: list[VariableEntity]):
+        parameters: dict[str, dict[str, Any]] = {}
+        required = []
+        for item in user_input_form:
+            parameters[item.variable] = {}
+            if item.type in (
+                VariableEntityType.FILE,
+                VariableEntityType.FILE_LIST,
+                VariableEntityType.EXTERNAL_DATA_TOOL,
+            ):
+                continue
+            if item.required:
+                required.append(item.variable)
+            # if the workflow republished, the parameters not changed
+            # we should not raise error here
+            try:
+                description = self.mcp_server.parameters_dict[item.variable]
+            except KeyError:
+                description = ""
+            parameters[item.variable]["description"] = description
+            if item.type in (VariableEntityType.TEXT_INPUT, VariableEntityType.PARAGRAPH):
+                parameters[item.variable]["type"] = "string"
+            elif item.type == VariableEntityType.SELECT:
+                parameters[item.variable]["type"] = "string"
+                parameters[item.variable]["enum"] = item.options
+            elif item.type == VariableEntityType.NUMBER:
+                parameters[item.variable]["type"] = "float"
+        return parameters, required
diff --git a/api/core/mcp/session/base_session.py b/api/core/mcp/session/base_session.py
new file mode 100644
index 0000000000..1c0f582501
--- /dev/null
+++ b/api/core/mcp/session/base_session.py
@@ -0,0 +1,397 @@
+import logging
+import queue
+from collections.abc import Callable
+from concurrent.futures import ThreadPoolExecutor
+from contextlib import ExitStack
+from datetime import timedelta
+from types import TracebackType
+from typing import Any, Generic, Self, TypeVar
+
+from httpx import HTTPStatusError
+from pydantic import BaseModel
+
+from core.mcp.error import MCPAuthError, MCPConnectionError
+from core.mcp.types import (
+    CancelledNotification,
+    ClientNotification,
+    ClientRequest,
+    ClientResult,
+    ErrorData,
+    JSONRPCError,
+    JSONRPCMessage,
+    JSONRPCNotification,
+    JSONRPCRequest,
+    JSONRPCResponse,
+    MessageMetadata,
+    RequestId,
+    RequestParams,
+    ServerMessageMetadata,
+    ServerNotification,
+    ServerRequest,
+    ServerResult,
+    SessionMessage,
+)
+
+SendRequestT = TypeVar("SendRequestT", ClientRequest, ServerRequest)
+SendResultT = TypeVar("SendResultT", ClientResult, ServerResult)
+SendNotificationT = TypeVar("SendNotificationT", ClientNotification, ServerNotification)
+ReceiveRequestT = TypeVar("ReceiveRequestT", ClientRequest, ServerRequest)
+ReceiveResultT = TypeVar("ReceiveResultT", bound=BaseModel)
+ReceiveNotificationT = TypeVar("ReceiveNotificationT", ClientNotification, ServerNotification)
+DEFAULT_RESPONSE_READ_TIMEOUT = 1.0
+
+
+class RequestResponder(Generic[ReceiveRequestT, SendResultT]):
+    """Handles responding to MCP requests and manages request lifecycle.
+
+    This class MUST be used as a context manager to ensure proper cleanup and
+    cancellation handling:
+
+    Example:
+        with request_responder as resp:
+            resp.respond(result)
+
+    The context manager ensures:
+    1. Proper cancellation scope setup and cleanup
+    2. Request completion tracking
+    3. Cleanup of in-flight requests
+    """
+
+    request: ReceiveRequestT
+    _session: Any
+    _on_complete: Callable[["RequestResponder[ReceiveRequestT, SendResultT]"], Any]
+
+    def __init__(
+        self,
+        request_id: RequestId,
+        request_meta: RequestParams.Meta | None,
+        request: ReceiveRequestT,
+        session: """BaseSession[
+            SendRequestT,
+            SendNotificationT,
+            SendResultT,
+            ReceiveRequestT,
+            ReceiveNotificationT
+        ]""",
+        on_complete: Callable[["RequestResponder[ReceiveRequestT, SendResultT]"], Any],
+    ) -> None:
+        self.request_id = request_id
+        self.request_meta = request_meta
+        self.request = request
+        self._session = session
+        self._completed = False
+        self._on_complete = on_complete
+        self._entered = False  # Track if we're in a context manager
+
+    def __enter__(self) -> "RequestResponder[ReceiveRequestT, SendResultT]":
+        """Enter the context manager, enabling request cancellation tracking."""
+        self._entered = True
+        return self
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> None:
+        """Exit the context manager, performing cleanup and notifying completion."""
+        try:
+            if self._completed:
+                self._on_complete(self)
+        finally:
+            self._entered = False
+
+    def respond(self, response: SendResultT | ErrorData) -> None:
+        """Send a response for this request.
+
+        Must be called within a context manager block.
+        Raises:
+            RuntimeError: If not used within a context manager
+            AssertionError: If request was already responded to
+        """
+        if not self._entered:
+            raise RuntimeError("RequestResponder must be used as a context manager")
+        assert not self._completed, "Request already responded to"
+
+        self._completed = True
+
+        self._session._send_response(request_id=self.request_id, response=response)
+
+    def cancel(self) -> None:
+        """Cancel this request and mark it as completed."""
+        if not self._entered:
+            raise RuntimeError("RequestResponder must be used as a context manager")
+
+        self._completed = True  # Mark as completed so it's removed from in_flight
+        # Send an error response to indicate cancellation
+        self._session._send_response(
+            request_id=self.request_id,
+            response=ErrorData(code=0, message="Request cancelled", data=None),
+        )
+
+
+class BaseSession(
+    Generic[
+        SendRequestT,
+        SendNotificationT,
+        SendResultT,
+        ReceiveRequestT,
+        ReceiveNotificationT,
+    ],
+):
+    """
+    Implements an MCP "session" on top of read/write streams, including features
+    like request/response linking, notifications, and progress.
+
+    This class is a context manager that automatically starts processing
+    messages when entered.
+    """
+
+    _response_streams: dict[RequestId, queue.Queue[JSONRPCResponse | JSONRPCError]]
+    _request_id: int
+    _in_flight: dict[RequestId, RequestResponder[ReceiveRequestT, SendResultT]]
+    _receive_request_type: type[ReceiveRequestT]
+    _receive_notification_type: type[ReceiveNotificationT]
+
+    def __init__(
+        self,
+        read_stream: queue.Queue,
+        write_stream: queue.Queue,
+        receive_request_type: type[ReceiveRequestT],
+        receive_notification_type: type[ReceiveNotificationT],
+        # If none, reading will never time out
+        read_timeout_seconds: timedelta | None = None,
+    ) -> None:
+        self._read_stream = read_stream
+        self._write_stream = write_stream
+        self._response_streams = {}
+        self._request_id = 0
+        self._receive_request_type = receive_request_type
+        self._receive_notification_type = receive_notification_type
+        self._session_read_timeout_seconds = read_timeout_seconds
+        self._in_flight = {}
+        self._exit_stack = ExitStack()
+
+    def __enter__(self) -> Self:
+        self._executor = ThreadPoolExecutor()
+        self._receiver_future = self._executor.submit(self._receive_loop)
+        return self
+
+    def check_receiver_status(self) -> None:
+        if self._receiver_future.done():
+            self._receiver_future.result()
+
+    def __exit__(
+        self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
+    ) -> None:
+        self._exit_stack.close()
+        self._read_stream.put(None)
+        self._write_stream.put(None)
+
+    def send_request(
+        self,
+        request: SendRequestT,
+        result_type: type[ReceiveResultT],
+        request_read_timeout_seconds: timedelta | None = None,
+        metadata: MessageMetadata = None,
+    ) -> ReceiveResultT:
+        """
+        Sends a request and wait for a response. Raises an McpError if the
+        response contains an error. If a request read timeout is provided, it
+        will take precedence over the session read timeout.
+
+        Do not use this method to emit notifications! Use send_notification()
+        instead.
+        """
+        self.check_receiver_status()
+
+        request_id = self._request_id
+        self._request_id = request_id + 1
+
+        response_queue: queue.Queue[JSONRPCResponse | JSONRPCError] = queue.Queue()
+        self._response_streams[request_id] = response_queue
+
+        try:
+            jsonrpc_request = JSONRPCRequest(
+                jsonrpc="2.0",
+                id=request_id,
+                **request.model_dump(by_alias=True, mode="json", exclude_none=True),
+            )
+
+            self._write_stream.put(SessionMessage(message=JSONRPCMessage(jsonrpc_request), metadata=metadata))
+            timeout = DEFAULT_RESPONSE_READ_TIMEOUT
+            if request_read_timeout_seconds is not None:
+                timeout = float(request_read_timeout_seconds.total_seconds())
+            elif self._session_read_timeout_seconds is not None:
+                timeout = float(self._session_read_timeout_seconds.total_seconds())
+            while True:
+                try:
+                    response_or_error = response_queue.get(timeout=timeout)
+                    break
+                except queue.Empty:
+                    self.check_receiver_status()
+                    continue
+
+            if response_or_error is None:
+                raise MCPConnectionError(
+                    ErrorData(
+                        code=500,
+                        message="No response received",
+                    )
+                )
+            elif isinstance(response_or_error, JSONRPCError):
+                if response_or_error.error.code == 401:
+                    raise MCPAuthError(
+                        ErrorData(code=response_or_error.error.code, message=response_or_error.error.message)
+                    )
+                else:
+                    raise MCPConnectionError(
+                        ErrorData(code=response_or_error.error.code, message=response_or_error.error.message)
+                    )
+            else:
+                return result_type.model_validate(response_or_error.result)
+
+        finally:
+            self._response_streams.pop(request_id, None)
+
+    def send_notification(
+        self,
+        notification: SendNotificationT,
+        related_request_id: RequestId | None = None,
+    ) -> None:
+        """
+        Emits a notification, which is a one-way message that does not expect
+        a response.
+        """
+        self.check_receiver_status()
+
+        # Some transport implementations may need to set the related_request_id
+        # to attribute to the notifications to the request that triggered them.
+        jsonrpc_notification = JSONRPCNotification(
+            jsonrpc="2.0",
+            **notification.model_dump(by_alias=True, mode="json", exclude_none=True),
+        )
+        session_message = SessionMessage(
+            message=JSONRPCMessage(jsonrpc_notification),
+            metadata=ServerMessageMetadata(related_request_id=related_request_id) if related_request_id else None,
+        )
+        self._write_stream.put(session_message)
+
+    def _send_response(self, request_id: RequestId, response: SendResultT | ErrorData) -> None:
+        if isinstance(response, ErrorData):
+            jsonrpc_error = JSONRPCError(jsonrpc="2.0", id=request_id, error=response)
+            session_message = SessionMessage(message=JSONRPCMessage(jsonrpc_error))
+            self._write_stream.put(session_message)
+        else:
+            jsonrpc_response = JSONRPCResponse(
+                jsonrpc="2.0",
+                id=request_id,
+                result=response.model_dump(by_alias=True, mode="json", exclude_none=True),
+            )
+            session_message = SessionMessage(message=JSONRPCMessage(jsonrpc_response))
+            self._write_stream.put(session_message)
+
+    def _receive_loop(self) -> None:
+        """
+        Main message processing loop.
+        In a real synchronous implementation, this would likely run in a separate thread.
+        """
+        while True:
+            try:
+                # Attempt to receive a message (this would be blocking in a synchronous context)
+                message = self._read_stream.get(timeout=DEFAULT_RESPONSE_READ_TIMEOUT)
+                if message is None:
+                    break
+                if isinstance(message, HTTPStatusError):
+                    response_queue = self._response_streams.get(self._request_id - 1)
+                    if response_queue is not None:
+                        response_queue.put(
+                            JSONRPCError(
+                                jsonrpc="2.0",
+                                id=self._request_id - 1,
+                                error=ErrorData(code=message.response.status_code, message=message.args[0]),
+                            )
+                        )
+                    else:
+                        self._handle_incoming(RuntimeError(f"Received response with an unknown request ID: {message}"))
+                elif isinstance(message, Exception):
+                    self._handle_incoming(message)
+                elif isinstance(message.message.root, JSONRPCRequest):
+                    validated_request = self._receive_request_type.model_validate(
+                        message.message.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+                    )
+
+                    responder = RequestResponder(
+                        request_id=message.message.root.id,
+                        request_meta=validated_request.root.params.meta if validated_request.root.params else None,
+                        request=validated_request,
+                        session=self,
+                        on_complete=lambda r: self._in_flight.pop(r.request_id, None),
+                    )
+
+                    self._in_flight[responder.request_id] = responder
+                    self._received_request(responder)
+
+                    if not responder._completed:
+                        self._handle_incoming(responder)
+
+                elif isinstance(message.message.root, JSONRPCNotification):
+                    try:
+                        notification = self._receive_notification_type.model_validate(
+                            message.message.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+                        )
+                        # Handle cancellation notifications
+                        if isinstance(notification.root, CancelledNotification):
+                            cancelled_id = notification.root.params.requestId
+                            if cancelled_id in self._in_flight:
+                                self._in_flight[cancelled_id].cancel()
+                        else:
+                            self._received_notification(notification)
+                            self._handle_incoming(notification)
+                    except Exception as e:
+                        # For other validation errors, log and continue
+                        logging.warning(f"Failed to validate notification: {e}. Message was: {message.message.root}")
+                else:  # Response or error
+                    response_queue = self._response_streams.get(message.message.root.id)
+                    if response_queue is not None:
+                        response_queue.put(message.message.root)
+                    else:
+                        self._handle_incoming(RuntimeError(f"Server Error: {message}"))
+            except queue.Empty:
+                continue
+            except Exception as e:
+                logging.exception("Error in message processing loop")
+                raise
+
+    def _received_request(self, responder: RequestResponder[ReceiveRequestT, SendResultT]) -> None:
+        """
+        Can be overridden by subclasses to handle a request without needing to
+        listen on the message stream.
+
+        If the request is responded to within this method, it will not be
+        forwarded on to the message stream.
+        """
+        pass
+
+    def _received_notification(self, notification: ReceiveNotificationT) -> None:
+        """
+        Can be overridden by subclasses to handle a notification without needing
+        to listen on the message stream.
+        """
+        pass
+
+    def send_progress_notification(
+        self, progress_token: str | int, progress: float, total: float | None = None
+    ) -> None:
+        """
+        Sends a progress notification for a request that is currently being
+        processed.
+        """
+        pass
+
+    def _handle_incoming(
+        self,
+        req: RequestResponder[ReceiveRequestT, SendResultT] | ReceiveNotificationT | Exception,
+    ) -> None:
+        """A generic handler for incoming messages. Overwritten by subclasses."""
+        pass
diff --git a/api/core/mcp/session/client_session.py b/api/core/mcp/session/client_session.py
new file mode 100644
index 0000000000..ed2ad508ab
--- /dev/null
+++ b/api/core/mcp/session/client_session.py
@@ -0,0 +1,365 @@
+from datetime import timedelta
+from typing import Any, Protocol
+
+from pydantic import AnyUrl, TypeAdapter
+
+from configs import dify_config
+from core.mcp import types
+from core.mcp.entities import SUPPORTED_PROTOCOL_VERSIONS, RequestContext
+from core.mcp.session.base_session import BaseSession, RequestResponder
+
+DEFAULT_CLIENT_INFO = types.Implementation(name="Dify", version=dify_config.project.version)
+
+
+class SamplingFnT(Protocol):
+    def __call__(
+        self,
+        context: RequestContext["ClientSession", Any],
+        params: types.CreateMessageRequestParams,
+    ) -> types.CreateMessageResult | types.ErrorData: ...
+
+
+class ListRootsFnT(Protocol):
+    def __call__(self, context: RequestContext["ClientSession", Any]) -> types.ListRootsResult | types.ErrorData: ...
+
+
+class LoggingFnT(Protocol):
+    def __call__(
+        self,
+        params: types.LoggingMessageNotificationParams,
+    ) -> None: ...
+
+
+class MessageHandlerFnT(Protocol):
+    def __call__(
+        self,
+        message: RequestResponder[types.ServerRequest, types.ClientResult] | types.ServerNotification | Exception,
+    ) -> None: ...
+
+
+def _default_message_handler(
+    message: RequestResponder[types.ServerRequest, types.ClientResult] | types.ServerNotification | Exception,
+) -> None:
+    if isinstance(message, Exception):
+        raise ValueError(str(message))
+    elif isinstance(message, (types.ServerNotification | RequestResponder)):
+        pass
+
+
+def _default_sampling_callback(
+    context: RequestContext["ClientSession", Any],
+    params: types.CreateMessageRequestParams,
+) -> types.CreateMessageResult | types.ErrorData:
+    return types.ErrorData(
+        code=types.INVALID_REQUEST,
+        message="Sampling not supported",
+    )
+
+
+def _default_list_roots_callback(
+    context: RequestContext["ClientSession", Any],
+) -> types.ListRootsResult | types.ErrorData:
+    return types.ErrorData(
+        code=types.INVALID_REQUEST,
+        message="List roots not supported",
+    )
+
+
+def _default_logging_callback(
+    params: types.LoggingMessageNotificationParams,
+) -> None:
+    pass
+
+
+ClientResponse: TypeAdapter[types.ClientResult | types.ErrorData] = TypeAdapter(types.ClientResult | types.ErrorData)
+
+
+class ClientSession(
+    BaseSession[
+        types.ClientRequest,
+        types.ClientNotification,
+        types.ClientResult,
+        types.ServerRequest,
+        types.ServerNotification,
+    ]
+):
+    def __init__(
+        self,
+        read_stream,
+        write_stream,
+        read_timeout_seconds: timedelta | None = None,
+        sampling_callback: SamplingFnT | None = None,
+        list_roots_callback: ListRootsFnT | None = None,
+        logging_callback: LoggingFnT | None = None,
+        message_handler: MessageHandlerFnT | None = None,
+        client_info: types.Implementation | None = None,
+    ) -> None:
+        super().__init__(
+            read_stream,
+            write_stream,
+            types.ServerRequest,
+            types.ServerNotification,
+            read_timeout_seconds=read_timeout_seconds,
+        )
+        self._client_info = client_info or DEFAULT_CLIENT_INFO
+        self._sampling_callback = sampling_callback or _default_sampling_callback
+        self._list_roots_callback = list_roots_callback or _default_list_roots_callback
+        self._logging_callback = logging_callback or _default_logging_callback
+        self._message_handler = message_handler or _default_message_handler
+
+    def initialize(self) -> types.InitializeResult:
+        sampling = types.SamplingCapability()
+        roots = types.RootsCapability(
+            # TODO: Should this be based on whether we
+            # _will_ send notifications, or only whether
+            # they're supported?
+            listChanged=True,
+        )
+
+        result = self.send_request(
+            types.ClientRequest(
+                types.InitializeRequest(
+                    method="initialize",
+                    params=types.InitializeRequestParams(
+                        protocolVersion=types.LATEST_PROTOCOL_VERSION,
+                        capabilities=types.ClientCapabilities(
+                            sampling=sampling,
+                            experimental=None,
+                            roots=roots,
+                        ),
+                        clientInfo=self._client_info,
+                    ),
+                )
+            ),
+            types.InitializeResult,
+        )
+
+        if result.protocolVersion not in SUPPORTED_PROTOCOL_VERSIONS:
+            raise RuntimeError(f"Unsupported protocol version from the server: {result.protocolVersion}")
+
+        self.send_notification(
+            types.ClientNotification(types.InitializedNotification(method="notifications/initialized"))
+        )
+
+        return result
+
+    def send_ping(self) -> types.EmptyResult:
+        """Send a ping request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.PingRequest(
+                    method="ping",
+                )
+            ),
+            types.EmptyResult,
+        )
+
+    def send_progress_notification(
+        self, progress_token: str | int, progress: float, total: float | None = None
+    ) -> None:
+        """Send a progress notification."""
+        self.send_notification(
+            types.ClientNotification(
+                types.ProgressNotification(
+                    method="notifications/progress",
+                    params=types.ProgressNotificationParams(
+                        progressToken=progress_token,
+                        progress=progress,
+                        total=total,
+                    ),
+                ),
+            )
+        )
+
+    def set_logging_level(self, level: types.LoggingLevel) -> types.EmptyResult:
+        """Send a logging/setLevel request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.SetLevelRequest(
+                    method="logging/setLevel",
+                    params=types.SetLevelRequestParams(level=level),
+                )
+            ),
+            types.EmptyResult,
+        )
+
+    def list_resources(self) -> types.ListResourcesResult:
+        """Send a resources/list request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.ListResourcesRequest(
+                    method="resources/list",
+                )
+            ),
+            types.ListResourcesResult,
+        )
+
+    def list_resource_templates(self) -> types.ListResourceTemplatesResult:
+        """Send a resources/templates/list request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.ListResourceTemplatesRequest(
+                    method="resources/templates/list",
+                )
+            ),
+            types.ListResourceTemplatesResult,
+        )
+
+    def read_resource(self, uri: AnyUrl) -> types.ReadResourceResult:
+        """Send a resources/read request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.ReadResourceRequest(
+                    method="resources/read",
+                    params=types.ReadResourceRequestParams(uri=uri),
+                )
+            ),
+            types.ReadResourceResult,
+        )
+
+    def subscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
+        """Send a resources/subscribe request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.SubscribeRequest(
+                    method="resources/subscribe",
+                    params=types.SubscribeRequestParams(uri=uri),
+                )
+            ),
+            types.EmptyResult,
+        )
+
+    def unsubscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
+        """Send a resources/unsubscribe request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.UnsubscribeRequest(
+                    method="resources/unsubscribe",
+                    params=types.UnsubscribeRequestParams(uri=uri),
+                )
+            ),
+            types.EmptyResult,
+        )
+
+    def call_tool(
+        self,
+        name: str,
+        arguments: dict[str, Any] | None = None,
+        read_timeout_seconds: timedelta | None = None,
+    ) -> types.CallToolResult:
+        """Send a tools/call request."""
+
+        return self.send_request(
+            types.ClientRequest(
+                types.CallToolRequest(
+                    method="tools/call",
+                    params=types.CallToolRequestParams(name=name, arguments=arguments),
+                )
+            ),
+            types.CallToolResult,
+            request_read_timeout_seconds=read_timeout_seconds,
+        )
+
+    def list_prompts(self) -> types.ListPromptsResult:
+        """Send a prompts/list request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.ListPromptsRequest(
+                    method="prompts/list",
+                )
+            ),
+            types.ListPromptsResult,
+        )
+
+    def get_prompt(self, name: str, arguments: dict[str, str] | None = None) -> types.GetPromptResult:
+        """Send a prompts/get request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.GetPromptRequest(
+                    method="prompts/get",
+                    params=types.GetPromptRequestParams(name=name, arguments=arguments),
+                )
+            ),
+            types.GetPromptResult,
+        )
+
+    def complete(
+        self,
+        ref: types.ResourceReference | types.PromptReference,
+        argument: dict[str, str],
+    ) -> types.CompleteResult:
+        """Send a completion/complete request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.CompleteRequest(
+                    method="completion/complete",
+                    params=types.CompleteRequestParams(
+                        ref=ref,
+                        argument=types.CompletionArgument(**argument),
+                    ),
+                )
+            ),
+            types.CompleteResult,
+        )
+
+    def list_tools(self) -> types.ListToolsResult:
+        """Send a tools/list request."""
+        return self.send_request(
+            types.ClientRequest(
+                types.ListToolsRequest(
+                    method="tools/list",
+                )
+            ),
+            types.ListToolsResult,
+        )
+
+    def send_roots_list_changed(self) -> None:
+        """Send a roots/list_changed notification."""
+        self.send_notification(
+            types.ClientNotification(
+                types.RootsListChangedNotification(
+                    method="notifications/roots/list_changed",
+                )
+            )
+        )
+
+    def _received_request(self, responder: RequestResponder[types.ServerRequest, types.ClientResult]) -> None:
+        ctx = RequestContext[ClientSession, Any](
+            request_id=responder.request_id,
+            meta=responder.request_meta,
+            session=self,
+            lifespan_context=None,
+        )
+
+        match responder.request.root:
+            case types.CreateMessageRequest(params=params):
+                with responder:
+                    response = self._sampling_callback(ctx, params)
+                    client_response = ClientResponse.validate_python(response)
+                    responder.respond(client_response)
+
+            case types.ListRootsRequest():
+                with responder:
+                    list_roots_response = self._list_roots_callback(ctx)
+                    client_response = ClientResponse.validate_python(list_roots_response)
+                    responder.respond(client_response)
+
+            case types.PingRequest():
+                with responder:
+                    return responder.respond(types.ClientResult(root=types.EmptyResult()))
+
+    def _handle_incoming(
+        self,
+        req: RequestResponder[types.ServerRequest, types.ClientResult] | types.ServerNotification | Exception,
+    ) -> None:
+        """Handle incoming messages by forwarding to the message handler."""
+        self._message_handler(req)
+
+    def _received_notification(self, notification: types.ServerNotification) -> None:
+        """Handle notifications from the server."""
+        # Process specific notification types
+        match notification.root:
+            case types.LoggingMessageNotification(params=params):
+                self._logging_callback(params)
+            case _:
+                pass
diff --git a/api/core/mcp/types.py b/api/core/mcp/types.py
new file mode 100644
index 0000000000..99d985a781
--- /dev/null
+++ b/api/core/mcp/types.py
@@ -0,0 +1,1217 @@
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import (
+    Annotated,
+    Any,
+    Generic,
+    Literal,
+    Optional,
+    TypeAlias,
+    TypeVar,
+)
+
+from pydantic import BaseModel, ConfigDict, Field, FileUrl, RootModel
+from pydantic.networks import AnyUrl, UrlConstraints
+
+"""
+Model Context Protocol bindings for Python
+
+These bindings were generated from https://github.com/modelcontextprotocol/specification,
+using Claude, with a prompt something like the following:
+
+Generate idiomatic Python bindings for this schema for MCP, or the "Model Context
+Protocol." The schema is defined in TypeScript, but there's also a JSON Schema version
+for reference.
+
+* For the bindings, let's use Pydantic V2 models.
+* Each model should allow extra fields everywhere, by specifying `model_config =
+  ConfigDict(extra='allow')`. Do this in every case, instead of a custom base class.
+* Union types should be represented with a Pydantic `RootModel`.
+* Define additional model classes instead of using dictionaries. Do this even if they're
+  not separate types in the schema.
+"""
+# Client support both version, not support 2025-06-18 yet.
+LATEST_PROTOCOL_VERSION = "2025-03-26"
+# Server support 2024-11-05 to allow claude to use.
+SERVER_LATEST_PROTOCOL_VERSION = "2024-11-05"
+ProgressToken = str | int
+Cursor = str
+Role = Literal["user", "assistant"]
+RequestId = Annotated[int | str, Field(union_mode="left_to_right")]
+AnyFunction: TypeAlias = Callable[..., Any]
+
+
+class RequestParams(BaseModel):
+    class Meta(BaseModel):
+        progressToken: ProgressToken | None = None
+        """
+        If specified, the caller requests out-of-band progress notifications for
+        this request (as represented by notifications/progress). The value of this
+        parameter is an opaque token that will be attached to any subsequent
+        notifications. The receiver is not obligated to provide these notifications.
+        """
+
+        model_config = ConfigDict(extra="allow")
+
+    meta: Meta | None = Field(alias="_meta", default=None)
+
+
+class NotificationParams(BaseModel):
+    class Meta(BaseModel):
+        model_config = ConfigDict(extra="allow")
+
+    meta: Meta | None = Field(alias="_meta", default=None)
+    """
+    This parameter name is reserved by MCP to allow clients and servers to attach
+    additional metadata to their notifications.
+    """
+
+
+RequestParamsT = TypeVar("RequestParamsT", bound=RequestParams | dict[str, Any] | None)
+NotificationParamsT = TypeVar("NotificationParamsT", bound=NotificationParams | dict[str, Any] | None)
+MethodT = TypeVar("MethodT", bound=str)
+
+
+class Request(BaseModel, Generic[RequestParamsT, MethodT]):
+    """Base class for JSON-RPC requests."""
+
+    method: MethodT
+    params: RequestParamsT
+    model_config = ConfigDict(extra="allow")
+
+
+class PaginatedRequest(Request[RequestParamsT, MethodT]):
+    cursor: Cursor | None = None
+    """
+    An opaque token representing the current pagination position.
+    If provided, the server should return results starting after this cursor.
+    """
+
+
+class Notification(BaseModel, Generic[NotificationParamsT, MethodT]):
+    """Base class for JSON-RPC notifications."""
+
+    method: MethodT
+    params: NotificationParamsT
+    model_config = ConfigDict(extra="allow")
+
+
+class Result(BaseModel):
+    """Base class for JSON-RPC results."""
+
+    model_config = ConfigDict(extra="allow")
+
+    meta: dict[str, Any] | None = Field(alias="_meta", default=None)
+    """
+    This result property is reserved by the protocol to allow clients and servers to
+    attach additional metadata to their responses.
+    """
+
+
+class PaginatedResult(Result):
+    nextCursor: Cursor | None = None
+    """
+    An opaque token representing the pagination position after the last returned result.
+    If present, there may be more results available.
+    """
+
+
+class JSONRPCRequest(Request[dict[str, Any] | None, str]):
+    """A request that expects a response."""
+
+    jsonrpc: Literal["2.0"]
+    id: RequestId
+    method: str
+    params: dict[str, Any] | None = None
+
+
+class JSONRPCNotification(Notification[dict[str, Any] | None, str]):
+    """A notification which does not expect a response."""
+
+    jsonrpc: Literal["2.0"]
+    params: dict[str, Any] | None = None
+
+
+class JSONRPCResponse(BaseModel):
+    """A successful (non-error) response to a request."""
+
+    jsonrpc: Literal["2.0"]
+    id: RequestId
+    result: dict[str, Any]
+    model_config = ConfigDict(extra="allow")
+
+
+# Standard JSON-RPC error codes
+PARSE_ERROR = -32700
+INVALID_REQUEST = -32600
+METHOD_NOT_FOUND = -32601
+INVALID_PARAMS = -32602
+INTERNAL_ERROR = -32603
+
+
+class ErrorData(BaseModel):
+    """Error information for JSON-RPC error responses."""
+
+    code: int
+    """The error type that occurred."""
+
+    message: str
+    """
+    A short description of the error. The message SHOULD be limited to a concise single
+    sentence.
+    """
+
+    data: Any | None = None
+    """
+    Additional information about the error. The value of this member is defined by the
+    sender (e.g. detailed error information, nested errors etc.).
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+
+class JSONRPCError(BaseModel):
+    """A response to a request that indicates an error occurred."""
+
+    jsonrpc: Literal["2.0"]
+    id: str | int
+    error: ErrorData
+    model_config = ConfigDict(extra="allow")
+
+
+class JSONRPCMessage(RootModel[JSONRPCRequest | JSONRPCNotification | JSONRPCResponse | JSONRPCError]):
+    pass
+
+
+class EmptyResult(Result):
+    """A response that indicates success but carries no data."""
+
+
+class Implementation(BaseModel):
+    """Describes the name and version of an MCP implementation."""
+
+    name: str
+    version: str
+    model_config = ConfigDict(extra="allow")
+
+
+class RootsCapability(BaseModel):
+    """Capability for root operations."""
+
+    listChanged: bool | None = None
+    """Whether the client supports notifications for changes to the roots list."""
+    model_config = ConfigDict(extra="allow")
+
+
+class SamplingCapability(BaseModel):
+    """Capability for logging operations."""
+
+    model_config = ConfigDict(extra="allow")
+
+
+class ClientCapabilities(BaseModel):
+    """Capabilities a client may support."""
+
+    experimental: dict[str, dict[str, Any]] | None = None
+    """Experimental, non-standard capabilities that the client supports."""
+    sampling: SamplingCapability | None = None
+    """Present if the client supports sampling from an LLM."""
+    roots: RootsCapability | None = None
+    """Present if the client supports listing roots."""
+    model_config = ConfigDict(extra="allow")
+
+
+class PromptsCapability(BaseModel):
+    """Capability for prompts operations."""
+
+    listChanged: bool | None = None
+    """Whether this server supports notifications for changes to the prompt list."""
+    model_config = ConfigDict(extra="allow")
+
+
+class ResourcesCapability(BaseModel):
+    """Capability for resources operations."""
+
+    subscribe: bool | None = None
+    """Whether this server supports subscribing to resource updates."""
+    listChanged: bool | None = None
+    """Whether this server supports notifications for changes to the resource list."""
+    model_config = ConfigDict(extra="allow")
+
+
+class ToolsCapability(BaseModel):
+    """Capability for tools operations."""
+
+    listChanged: bool | None = None
+    """Whether this server supports notifications for changes to the tool list."""
+    model_config = ConfigDict(extra="allow")
+
+
+class LoggingCapability(BaseModel):
+    """Capability for logging operations."""
+
+    model_config = ConfigDict(extra="allow")
+
+
+class ServerCapabilities(BaseModel):
+    """Capabilities that a server may support."""
+
+    experimental: dict[str, dict[str, Any]] | None = None
+    """Experimental, non-standard capabilities that the server supports."""
+    logging: LoggingCapability | None = None
+    """Present if the server supports sending log messages to the client."""
+    prompts: PromptsCapability | None = None
+    """Present if the server offers any prompt templates."""
+    resources: ResourcesCapability | None = None
+    """Present if the server offers any resources to read."""
+    tools: ToolsCapability | None = None
+    """Present if the server offers any tools to call."""
+    model_config = ConfigDict(extra="allow")
+
+
+class InitializeRequestParams(RequestParams):
+    """Parameters for the initialize request."""
+
+    protocolVersion: str | int
+    """The latest version of the Model Context Protocol that the client supports."""
+    capabilities: ClientCapabilities
+    clientInfo: Implementation
+    model_config = ConfigDict(extra="allow")
+
+
+class InitializeRequest(Request[InitializeRequestParams, Literal["initialize"]]):
+    """
+    This request is sent from the client to the server when it first connects, asking it
+    to begin initialization.
+    """
+
+    method: Literal["initialize"]
+    params: InitializeRequestParams
+
+
+class InitializeResult(Result):
+    """After receiving an initialize request from the client, the server sends this."""
+
+    protocolVersion: str | int
+    """The version of the Model Context Protocol that the server wants to use."""
+    capabilities: ServerCapabilities
+    serverInfo: Implementation
+    instructions: str | None = None
+    """Instructions describing how to use the server and its features."""
+
+
+class InitializedNotification(Notification[NotificationParams | None, Literal["notifications/initialized"]]):
+    """
+    This notification is sent from the client to the server after initialization has
+    finished.
+    """
+
+    method: Literal["notifications/initialized"]
+    params: NotificationParams | None = None
+
+
+class PingRequest(Request[RequestParams | None, Literal["ping"]]):
+    """
+    A ping, issued by either the server or the client, to check that the other party is
+    still alive.
+    """
+
+    method: Literal["ping"]
+    params: RequestParams | None = None
+
+
+class ProgressNotificationParams(NotificationParams):
+    """Parameters for progress notifications."""
+
+    progressToken: ProgressToken
+    """
+    The progress token which was given in the initial request, used to associate this
+    notification with the request that is proceeding.
+    """
+    progress: float
+    """
+    The progress thus far. This should increase every time progress is made, even if the
+    total is unknown.
+    """
+    total: float | None = None
+    """Total number of items to process (or total progress required), if known."""
+    model_config = ConfigDict(extra="allow")
+
+
+class ProgressNotification(Notification[ProgressNotificationParams, Literal["notifications/progress"]]):
+    """
+    An out-of-band notification used to inform the receiver of a progress update for a
+    long-running request.
+    """
+
+    method: Literal["notifications/progress"]
+    params: ProgressNotificationParams
+
+
+class ListResourcesRequest(PaginatedRequest[RequestParams | None, Literal["resources/list"]]):
+    """Sent from the client to request a list of resources the server has."""
+
+    method: Literal["resources/list"]
+    params: RequestParams | None = None
+
+
+class Annotations(BaseModel):
+    audience: list[Role] | None = None
+    priority: Annotated[float, Field(ge=0.0, le=1.0)] | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class Resource(BaseModel):
+    """A known resource that the server is capable of reading."""
+
+    uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    """The URI of this resource."""
+    name: str
+    """A human-readable name for this resource."""
+    description: str | None = None
+    """A description of what this resource represents."""
+    mimeType: str | None = None
+    """The MIME type of this resource, if known."""
+    size: int | None = None
+    """
+    The size of the raw resource content, in bytes (i.e., before base64 encoding
+    or any tokenization), if known.
+
+    This can be used by Hosts to display file sizes and estimate context window usage.
+    """
+    annotations: Annotations | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class ResourceTemplate(BaseModel):
+    """A template description for resources available on the server."""
+
+    uriTemplate: str
+    """
+    A URI template (according to RFC 6570) that can be used to construct resource
+    URIs.
+    """
+    name: str
+    """A human-readable name for the type of resource this template refers to."""
+    description: str | None = None
+    """A human-readable description of what this template is for."""
+    mimeType: str | None = None
+    """
+    The MIME type for all resources that match this template. This should only be
+    included if all resources matching this template have the same type.
+    """
+    annotations: Annotations | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class ListResourcesResult(PaginatedResult):
+    """The server's response to a resources/list request from the client."""
+
+    resources: list[Resource]
+
+
+class ListResourceTemplatesRequest(PaginatedRequest[RequestParams | None, Literal["resources/templates/list"]]):
+    """Sent from the client to request a list of resource templates the server has."""
+
+    method: Literal["resources/templates/list"]
+    params: RequestParams | None = None
+
+
+class ListResourceTemplatesResult(PaginatedResult):
+    """The server's response to a resources/templates/list request from the client."""
+
+    resourceTemplates: list[ResourceTemplate]
+
+
+class ReadResourceRequestParams(RequestParams):
+    """Parameters for reading a resource."""
+
+    uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    """
+    The URI of the resource to read. The URI can use any protocol; it is up to the
+    server how to interpret it.
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class ReadResourceRequest(Request[ReadResourceRequestParams, Literal["resources/read"]]):
+    """Sent from the client to the server, to read a specific resource URI."""
+
+    method: Literal["resources/read"]
+    params: ReadResourceRequestParams
+
+
+class ResourceContents(BaseModel):
+    """The contents of a specific resource or sub-resource."""
+
+    uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    """The URI of this resource."""
+    mimeType: str | None = None
+    """The MIME type of this resource, if known."""
+    model_config = ConfigDict(extra="allow")
+
+
+class TextResourceContents(ResourceContents):
+    """Text contents of a resource."""
+
+    text: str
+    """
+    The text of the item. This must only be set if the item can actually be represented
+    as text (not binary data).
+    """
+
+
+class BlobResourceContents(ResourceContents):
+    """Binary contents of a resource."""
+
+    blob: str
+    """A base64-encoded string representing the binary data of the item."""
+
+
+class ReadResourceResult(Result):
+    """The server's response to a resources/read request from the client."""
+
+    contents: list[TextResourceContents | BlobResourceContents]
+
+
+class ResourceListChangedNotification(
+    Notification[NotificationParams | None, Literal["notifications/resources/list_changed"]]
+):
+    """
+    An optional notification from the server to the client, informing it that the list
+    of resources it can read from has changed.
+    """
+
+    method: Literal["notifications/resources/list_changed"]
+    params: NotificationParams | None = None
+
+
+class SubscribeRequestParams(RequestParams):
+    """Parameters for subscribing to a resource."""
+
+    uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    """
+    The URI of the resource to subscribe to. The URI can use any protocol; it is up to
+    the server how to interpret it.
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class SubscribeRequest(Request[SubscribeRequestParams, Literal["resources/subscribe"]]):
+    """
+    Sent from the client to request resources/updated notifications from the server
+    whenever a particular resource changes.
+    """
+
+    method: Literal["resources/subscribe"]
+    params: SubscribeRequestParams
+
+
+class UnsubscribeRequestParams(RequestParams):
+    """Parameters for unsubscribing from a resource."""
+
+    uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    """The URI of the resource to unsubscribe from."""
+    model_config = ConfigDict(extra="allow")
+
+
+class UnsubscribeRequest(Request[UnsubscribeRequestParams, Literal["resources/unsubscribe"]]):
+    """
+    Sent from the client to request cancellation of resources/updated notifications from
+    the server.
+    """
+
+    method: Literal["resources/unsubscribe"]
+    params: UnsubscribeRequestParams
+
+
+class ResourceUpdatedNotificationParams(NotificationParams):
+    """Parameters for resource update notifications."""
+
+    uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    """
+    The URI of the resource that has been updated. This might be a sub-resource of the
+    one that the client actually subscribed to.
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class ResourceUpdatedNotification(
+    Notification[ResourceUpdatedNotificationParams, Literal["notifications/resources/updated"]]
+):
+    """
+    A notification from the server to the client, informing it that a resource has
+    changed and may need to be read again.
+    """
+
+    method: Literal["notifications/resources/updated"]
+    params: ResourceUpdatedNotificationParams
+
+
+class ListPromptsRequest(PaginatedRequest[RequestParams | None, Literal["prompts/list"]]):
+    """Sent from the client to request a list of prompts and prompt templates."""
+
+    method: Literal["prompts/list"]
+    params: RequestParams | None = None
+
+
+class PromptArgument(BaseModel):
+    """An argument for a prompt template."""
+
+    name: str
+    """The name of the argument."""
+    description: str | None = None
+    """A human-readable description of the argument."""
+    required: bool | None = None
+    """Whether this argument must be provided."""
+    model_config = ConfigDict(extra="allow")
+
+
+class Prompt(BaseModel):
+    """A prompt or prompt template that the server offers."""
+
+    name: str
+    """The name of the prompt or prompt template."""
+    description: str | None = None
+    """An optional description of what this prompt provides."""
+    arguments: list[PromptArgument] | None = None
+    """A list of arguments to use for templating the prompt."""
+    model_config = ConfigDict(extra="allow")
+
+
+class ListPromptsResult(PaginatedResult):
+    """The server's response to a prompts/list request from the client."""
+
+    prompts: list[Prompt]
+
+
+class GetPromptRequestParams(RequestParams):
+    """Parameters for getting a prompt."""
+
+    name: str
+    """The name of the prompt or prompt template."""
+    arguments: dict[str, str] | None = None
+    """Arguments to use for templating the prompt."""
+    model_config = ConfigDict(extra="allow")
+
+
+class GetPromptRequest(Request[GetPromptRequestParams, Literal["prompts/get"]]):
+    """Used by the client to get a prompt provided by the server."""
+
+    method: Literal["prompts/get"]
+    params: GetPromptRequestParams
+
+
+class TextContent(BaseModel):
+    """Text content for a message."""
+
+    type: Literal["text"]
+    text: str
+    """The text content of the message."""
+    annotations: Annotations | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class ImageContent(BaseModel):
+    """Image content for a message."""
+
+    type: Literal["image"]
+    data: str
+    """The base64-encoded image data."""
+    mimeType: str
+    """
+    The MIME type of the image. Different providers may support different
+    image types.
+    """
+    annotations: Annotations | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class SamplingMessage(BaseModel):
+    """Describes a message issued to or received from an LLM API."""
+
+    role: Role
+    content: TextContent | ImageContent
+    model_config = ConfigDict(extra="allow")
+
+
+class EmbeddedResource(BaseModel):
+    """
+    The contents of a resource, embedded into a prompt or tool call result.
+
+    It is up to the client how best to render embedded resources for the benefit
+    of the LLM and/or the user.
+    """
+
+    type: Literal["resource"]
+    resource: TextResourceContents | BlobResourceContents
+    annotations: Annotations | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class PromptMessage(BaseModel):
+    """Describes a message returned as part of a prompt."""
+
+    role: Role
+    content: TextContent | ImageContent | EmbeddedResource
+    model_config = ConfigDict(extra="allow")
+
+
+class GetPromptResult(Result):
+    """The server's response to a prompts/get request from the client."""
+
+    description: str | None = None
+    """An optional description for the prompt."""
+    messages: list[PromptMessage]
+
+
+class PromptListChangedNotification(
+    Notification[NotificationParams | None, Literal["notifications/prompts/list_changed"]]
+):
+    """
+    An optional notification from the server to the client, informing it that the list
+    of prompts it offers has changed.
+    """
+
+    method: Literal["notifications/prompts/list_changed"]
+    params: NotificationParams | None = None
+
+
+class ListToolsRequest(PaginatedRequest[RequestParams | None, Literal["tools/list"]]):
+    """Sent from the client to request a list of tools the server has."""
+
+    method: Literal["tools/list"]
+    params: RequestParams | None = None
+
+
+class ToolAnnotations(BaseModel):
+    """
+    Additional properties describing a Tool to clients.
+
+    NOTE: all properties in ToolAnnotations are **hints**.
+    They are not guaranteed to provide a faithful description of
+    tool behavior (including descriptive properties like `title`).
+
+    Clients should never make tool use decisions based on ToolAnnotations
+    received from untrusted servers.
+    """
+
+    title: str | None = None
+    """A human-readable title for the tool."""
+
+    readOnlyHint: bool | None = None
+    """
+    If true, the tool does not modify its environment.
+    Default: false
+    """
+
+    destructiveHint: bool | None = None
+    """
+    If true, the tool may perform destructive updates to its environment.
+    If false, the tool performs only additive updates.
+    (This property is meaningful only when `readOnlyHint == false`)
+    Default: true
+    """
+
+    idempotentHint: bool | None = None
+    """
+    If true, calling the tool repeatedly with the same arguments
+    will have no additional effect on the its environment.
+    (This property is meaningful only when `readOnlyHint == false`)
+    Default: false
+    """
+
+    openWorldHint: bool | None = None
+    """
+    If true, this tool may interact with an "open world" of external
+    entities. If false, the tool's domain of interaction is closed.
+    For example, the world of a web search tool is open, whereas that
+    of a memory tool is not.
+    Default: true
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class Tool(BaseModel):
+    """Definition for a tool the client can call."""
+
+    name: str
+    """The name of the tool."""
+    description: str | None = None
+    """A human-readable description of the tool."""
+    inputSchema: dict[str, Any]
+    """A JSON Schema object defining the expected parameters for the tool."""
+    annotations: ToolAnnotations | None = None
+    """Optional additional tool information."""
+    model_config = ConfigDict(extra="allow")
+
+
+class ListToolsResult(PaginatedResult):
+    """The server's response to a tools/list request from the client."""
+
+    tools: list[Tool]
+
+
+class CallToolRequestParams(RequestParams):
+    """Parameters for calling a tool."""
+
+    name: str
+    arguments: dict[str, Any] | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class CallToolRequest(Request[CallToolRequestParams, Literal["tools/call"]]):
+    """Used by the client to invoke a tool provided by the server."""
+
+    method: Literal["tools/call"]
+    params: CallToolRequestParams
+
+
+class CallToolResult(Result):
+    """The server's response to a tool call."""
+
+    content: list[TextContent | ImageContent | EmbeddedResource]
+    isError: bool = False
+
+
+class ToolListChangedNotification(Notification[NotificationParams | None, Literal["notifications/tools/list_changed"]]):
+    """
+    An optional notification from the server to the client, informing it that the list
+    of tools it offers has changed.
+    """
+
+    method: Literal["notifications/tools/list_changed"]
+    params: NotificationParams | None = None
+
+
+LoggingLevel = Literal["debug", "info", "notice", "warning", "error", "critical", "alert", "emergency"]
+
+
+class SetLevelRequestParams(RequestParams):
+    """Parameters for setting the logging level."""
+
+    level: LoggingLevel
+    """The level of logging that the client wants to receive from the server."""
+    model_config = ConfigDict(extra="allow")
+
+
+class SetLevelRequest(Request[SetLevelRequestParams, Literal["logging/setLevel"]]):
+    """A request from the client to the server, to enable or adjust logging."""
+
+    method: Literal["logging/setLevel"]
+    params: SetLevelRequestParams
+
+
+class LoggingMessageNotificationParams(NotificationParams):
+    """Parameters for logging message notifications."""
+
+    level: LoggingLevel
+    """The severity of this log message."""
+    logger: str | None = None
+    """An optional name of the logger issuing this message."""
+    data: Any
+    """
+    The data to be logged, such as a string message or an object. Any JSON serializable
+    type is allowed here.
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class LoggingMessageNotification(Notification[LoggingMessageNotificationParams, Literal["notifications/message"]]):
+    """Notification of a log message passed from server to client."""
+
+    method: Literal["notifications/message"]
+    params: LoggingMessageNotificationParams
+
+
+IncludeContext = Literal["none", "thisServer", "allServers"]
+
+
+class ModelHint(BaseModel):
+    """Hints to use for model selection."""
+
+    name: str | None = None
+    """A hint for a model name."""
+
+    model_config = ConfigDict(extra="allow")
+
+
+class ModelPreferences(BaseModel):
+    """
+    The server's preferences for model selection, requested by the client during
+    sampling.
+
+    Because LLMs can vary along multiple dimensions, choosing the "best" model is
+    rarely straightforward.  Different models excel in different areas—some are
+    faster but less capable, others are more capable but more expensive, and so
+    on. This interface allows servers to express their priorities across multiple
+    dimensions to help clients make an appropriate selection for their use case.
+
+    These preferences are always advisory. The client MAY ignore them. It is also
+    up to the client to decide how to interpret these preferences and how to
+    balance them against other considerations.
+    """
+
+    hints: list[ModelHint] | None = None
+    """
+    Optional hints to use for model selection.
+
+    If multiple hints are specified, the client MUST evaluate them in order
+    (such that the first match is taken).
+
+    The client SHOULD prioritize these hints over the numeric priorities, but
+    MAY still use the priorities to select from ambiguous matches.
+    """
+
+    costPriority: float | None = None
+    """
+    How much to prioritize cost when selecting a model. A value of 0 means cost
+    is not important, while a value of 1 means cost is the most important
+    factor.
+    """
+
+    speedPriority: float | None = None
+    """
+    How much to prioritize sampling speed (latency) when selecting a model. A
+    value of 0 means speed is not important, while a value of 1 means speed is
+    the most important factor.
+    """
+
+    intelligencePriority: float | None = None
+    """
+    How much to prioritize intelligence and capabilities when selecting a
+    model. A value of 0 means intelligence is not important, while a value of 1
+    means intelligence is the most important factor.
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+
+class CreateMessageRequestParams(RequestParams):
+    """Parameters for creating a message."""
+
+    messages: list[SamplingMessage]
+    modelPreferences: ModelPreferences | None = None
+    """
+    The server's preferences for which model to select. The client MAY ignore
+    these preferences.
+    """
+    systemPrompt: str | None = None
+    """An optional system prompt the server wants to use for sampling."""
+    includeContext: IncludeContext | None = None
+    """
+    A request to include context from one or more MCP servers (including the caller), to
+    be attached to the prompt.
+    """
+    temperature: float | None = None
+    maxTokens: int
+    """The maximum number of tokens to sample, as requested by the server."""
+    stopSequences: list[str] | None = None
+    metadata: dict[str, Any] | None = None
+    """Optional metadata to pass through to the LLM provider."""
+    model_config = ConfigDict(extra="allow")
+
+
+class CreateMessageRequest(Request[CreateMessageRequestParams, Literal["sampling/createMessage"]]):
+    """A request from the server to sample an LLM via the client."""
+
+    method: Literal["sampling/createMessage"]
+    params: CreateMessageRequestParams
+
+
+StopReason = Literal["endTurn", "stopSequence", "maxTokens"] | str
+
+
+class CreateMessageResult(Result):
+    """The client's response to a sampling/create_message request from the server."""
+
+    role: Role
+    content: TextContent | ImageContent
+    model: str
+    """The name of the model that generated the message."""
+    stopReason: StopReason | None = None
+    """The reason why sampling stopped, if known."""
+
+
+class ResourceReference(BaseModel):
+    """A reference to a resource or resource template definition."""
+
+    type: Literal["ref/resource"]
+    uri: str
+    """The URI or URI template of the resource."""
+    model_config = ConfigDict(extra="allow")
+
+
+class PromptReference(BaseModel):
+    """Identifies a prompt."""
+
+    type: Literal["ref/prompt"]
+    name: str
+    """The name of the prompt or prompt template"""
+    model_config = ConfigDict(extra="allow")
+
+
+class CompletionArgument(BaseModel):
+    """The argument's information for completion requests."""
+
+    name: str
+    """The name of the argument"""
+    value: str
+    """The value of the argument to use for completion matching."""
+    model_config = ConfigDict(extra="allow")
+
+
+class CompleteRequestParams(RequestParams):
+    """Parameters for completion requests."""
+
+    ref: ResourceReference | PromptReference
+    argument: CompletionArgument
+    model_config = ConfigDict(extra="allow")
+
+
+class CompleteRequest(Request[CompleteRequestParams, Literal["completion/complete"]]):
+    """A request from the client to the server, to ask for completion options."""
+
+    method: Literal["completion/complete"]
+    params: CompleteRequestParams
+
+
+class Completion(BaseModel):
+    """Completion information."""
+
+    values: list[str]
+    """An array of completion values. Must not exceed 100 items."""
+    total: int | None = None
+    """
+    The total number of completion options available. This can exceed the number of
+    values actually sent in the response.
+    """
+    hasMore: bool | None = None
+    """
+    Indicates whether there are additional completion options beyond those provided in
+    the current response, even if the exact total is unknown.
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class CompleteResult(Result):
+    """The server's response to a completion/complete request"""
+
+    completion: Completion
+
+
+class ListRootsRequest(Request[RequestParams | None, Literal["roots/list"]]):
+    """
+    Sent from the server to request a list of root URIs from the client. Roots allow
+    servers to ask for specific directories or files to operate on. A common example
+    for roots is providing a set of repositories or directories a server should operate
+    on.
+
+    This request is typically used when the server needs to understand the file system
+    structure or access specific locations that the client has permission to read from.
+    """
+
+    method: Literal["roots/list"]
+    params: RequestParams | None = None
+
+
+class Root(BaseModel):
+    """Represents a root directory or file that the server can operate on."""
+
+    uri: FileUrl
+    """
+    The URI identifying the root. This *must* start with file:// for now.
+    This restriction may be relaxed in future versions of the protocol to allow
+    other URI schemes.
+    """
+    name: str | None = None
+    """
+    An optional name for the root. This can be used to provide a human-readable
+    identifier for the root, which may be useful for display purposes or for
+    referencing the root in other parts of the application.
+    """
+    model_config = ConfigDict(extra="allow")
+
+
+class ListRootsResult(Result):
+    """
+    The client's response to a roots/list request from the server.
+    This result contains an array of Root objects, each representing a root directory
+    or file that the server can operate on.
+    """
+
+    roots: list[Root]
+
+
+class RootsListChangedNotification(
+    Notification[NotificationParams | None, Literal["notifications/roots/list_changed"]]
+):
+    """
+    A notification from the client to the server, informing it that the list of
+    roots has changed.
+
+    This notification should be sent whenever the client adds, removes, or
+    modifies any root. The server should then request an updated list of roots
+    using the ListRootsRequest.
+    """
+
+    method: Literal["notifications/roots/list_changed"]
+    params: NotificationParams | None = None
+
+
+class CancelledNotificationParams(NotificationParams):
+    """Parameters for cancellation notifications."""
+
+    requestId: RequestId
+    """The ID of the request to cancel."""
+    reason: str | None = None
+    """An optional string describing the reason for the cancellation."""
+    model_config = ConfigDict(extra="allow")
+
+
+class CancelledNotification(Notification[CancelledNotificationParams, Literal["notifications/cancelled"]]):
+    """
+    This notification can be sent by either side to indicate that it is canceling a
+    previously-issued request.
+    """
+
+    method: Literal["notifications/cancelled"]
+    params: CancelledNotificationParams
+
+
+class ClientRequest(
+    RootModel[
+        PingRequest
+        | InitializeRequest
+        | CompleteRequest
+        | SetLevelRequest
+        | GetPromptRequest
+        | ListPromptsRequest
+        | ListResourcesRequest
+        | ListResourceTemplatesRequest
+        | ReadResourceRequest
+        | SubscribeRequest
+        | UnsubscribeRequest
+        | CallToolRequest
+        | ListToolsRequest
+    ]
+):
+    pass
+
+
+class ClientNotification(
+    RootModel[CancelledNotification | ProgressNotification | InitializedNotification | RootsListChangedNotification]
+):
+    pass
+
+
+class ClientResult(RootModel[EmptyResult | CreateMessageResult | ListRootsResult]):
+    pass
+
+
+class ServerRequest(RootModel[PingRequest | CreateMessageRequest | ListRootsRequest]):
+    pass
+
+
+class ServerNotification(
+    RootModel[
+        CancelledNotification
+        | ProgressNotification
+        | LoggingMessageNotification
+        | ResourceUpdatedNotification
+        | ResourceListChangedNotification
+        | ToolListChangedNotification
+        | PromptListChangedNotification
+    ]
+):
+    pass
+
+
+class ServerResult(
+    RootModel[
+        EmptyResult
+        | InitializeResult
+        | CompleteResult
+        | GetPromptResult
+        | ListPromptsResult
+        | ListResourcesResult
+        | ListResourceTemplatesResult
+        | ReadResourceResult
+        | CallToolResult
+        | ListToolsResult
+    ]
+):
+    pass
+
+
+ResumptionToken = str
+
+ResumptionTokenUpdateCallback = Callable[[ResumptionToken], None]
+
+
+@dataclass
+class ClientMessageMetadata:
+    """Metadata specific to client messages."""
+
+    resumption_token: ResumptionToken | None = None
+    on_resumption_token_update: Callable[[ResumptionToken], None] | None = None
+
+
+@dataclass
+class ServerMessageMetadata:
+    """Metadata specific to server messages."""
+
+    related_request_id: RequestId | None = None
+    request_context: object | None = None
+
+
+MessageMetadata = ClientMessageMetadata | ServerMessageMetadata | None
+
+
+@dataclass
+class SessionMessage:
+    """A message with specific metadata for transport-specific features."""
+
+    message: JSONRPCMessage
+    metadata: MessageMetadata = None
+
+
+class OAuthClientMetadata(BaseModel):
+    client_name: str
+    redirect_uris: list[str]
+    grant_types: Optional[list[str]] = None
+    response_types: Optional[list[str]] = None
+    token_endpoint_auth_method: Optional[str] = None
+    client_uri: Optional[str] = None
+    scope: Optional[str] = None
+
+
+class OAuthClientInformation(BaseModel):
+    client_id: str
+    client_secret: Optional[str] = None
+
+
+class OAuthClientInformationFull(OAuthClientInformation):
+    client_name: str | None = None
+    redirect_uris: list[str]
+    scope: Optional[str] = None
+    grant_types: Optional[list[str]] = None
+    response_types: Optional[list[str]] = None
+    token_endpoint_auth_method: Optional[str] = None
+
+
+class OAuthTokens(BaseModel):
+    access_token: str
+    token_type: str
+    expires_in: Optional[int] = None
+    refresh_token: Optional[str] = None
+    scope: Optional[str] = None
+
+
+class OAuthMetadata(BaseModel):
+    authorization_endpoint: str
+    token_endpoint: str
+    registration_endpoint: Optional[str] = None
+    response_types_supported: list[str]
+    grant_types_supported: Optional[list[str]] = None
+    code_challenge_methods_supported: Optional[list[str]] = None
diff --git a/api/core/mcp/utils.py b/api/core/mcp/utils.py
new file mode 100644
index 0000000000..a54badcd4c
--- /dev/null
+++ b/api/core/mcp/utils.py
@@ -0,0 +1,114 @@
+import json
+
+import httpx
+
+from configs import dify_config
+from core.mcp.types import ErrorData, JSONRPCError
+from core.model_runtime.utils.encoders import jsonable_encoder
+
+HTTP_REQUEST_NODE_SSL_VERIFY = dify_config.HTTP_REQUEST_NODE_SSL_VERIFY
+
+STATUS_FORCELIST = [429, 500, 502, 503, 504]
+
+
+def create_ssrf_proxy_mcp_http_client(
+    headers: dict[str, str] | None = None,
+    timeout: httpx.Timeout | None = None,
+) -> httpx.Client:
+    """Create an HTTPX client with SSRF proxy configuration for MCP connections.
+
+    Args:
+        headers: Optional headers to include in the client
+        timeout: Optional timeout configuration
+
+    Returns:
+        Configured httpx.Client with proxy settings
+    """
+    if dify_config.SSRF_PROXY_ALL_URL:
+        return httpx.Client(
+            verify=HTTP_REQUEST_NODE_SSL_VERIFY,
+            headers=headers or {},
+            timeout=timeout,
+            follow_redirects=True,
+            proxy=dify_config.SSRF_PROXY_ALL_URL,
+        )
+    elif dify_config.SSRF_PROXY_HTTP_URL and dify_config.SSRF_PROXY_HTTPS_URL:
+        proxy_mounts = {
+            "http://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTP_URL, verify=HTTP_REQUEST_NODE_SSL_VERIFY),
+            "https://": httpx.HTTPTransport(
+                proxy=dify_config.SSRF_PROXY_HTTPS_URL, verify=HTTP_REQUEST_NODE_SSL_VERIFY
+            ),
+        }
+        return httpx.Client(
+            verify=HTTP_REQUEST_NODE_SSL_VERIFY,
+            headers=headers or {},
+            timeout=timeout,
+            follow_redirects=True,
+            mounts=proxy_mounts,
+        )
+    else:
+        return httpx.Client(
+            verify=HTTP_REQUEST_NODE_SSL_VERIFY,
+            headers=headers or {},
+            timeout=timeout,
+            follow_redirects=True,
+        )
+
+
+def ssrf_proxy_sse_connect(url, **kwargs):
+    """Connect to SSE endpoint with SSRF proxy protection.
+
+    This function creates an SSE connection using the configured proxy settings
+    to prevent SSRF attacks when connecting to external endpoints.
+
+    Args:
+        url: The SSE endpoint URL
+        **kwargs: Additional arguments passed to the SSE connection
+
+    Returns:
+        EventSource object for SSE streaming
+    """
+    from httpx_sse import connect_sse
+
+    # Extract client if provided, otherwise create one
+    client = kwargs.pop("client", None)
+    if client is None:
+        # Create client with SSRF proxy configuration
+        timeout = kwargs.pop(
+            "timeout",
+            httpx.Timeout(
+                timeout=dify_config.SSRF_DEFAULT_TIME_OUT,
+                connect=dify_config.SSRF_DEFAULT_CONNECT_TIME_OUT,
+                read=dify_config.SSRF_DEFAULT_READ_TIME_OUT,
+                write=dify_config.SSRF_DEFAULT_WRITE_TIME_OUT,
+            ),
+        )
+        headers = kwargs.pop("headers", {})
+        client = create_ssrf_proxy_mcp_http_client(headers=headers, timeout=timeout)
+        client_provided = False
+    else:
+        client_provided = True
+
+    # Extract method if provided, default to GET
+    method = kwargs.pop("method", "GET")
+
+    try:
+        return connect_sse(client, method, url, **kwargs)
+    except Exception:
+        # If we created the client, we need to clean it up on error
+        if not client_provided:
+            client.close()
+        raise
+
+
+def create_mcp_error_response(request_id: int | str | None, code: int, message: str, data=None):
+    """Create MCP error response"""
+    error_data = ErrorData(code=code, message=message, data=data)
+    json_response = JSONRPCError(
+        jsonrpc="2.0",
+        id=request_id or 1,
+        error=error_data,
+    )
+    json_data = json.dumps(jsonable_encoder(json_response))
+    sse_content = f"event: message\ndata: {json_data}\n\n".encode()
+    yield sse_content
diff --git a/api/core/plugin/entities/parameters.py b/api/core/plugin/entities/parameters.py
index 2b438a3c33..2be65d67a0 100644
--- a/api/core/plugin/entities/parameters.py
+++ b/api/core/plugin/entities/parameters.py
@@ -43,6 +43,19 @@ class PluginParameterType(enum.StrEnum):
     # deprecated, should not use.
     SYSTEM_FILES = CommonParameterType.SYSTEM_FILES.value
 
+    # MCP object and array type parameters
+    ARRAY = CommonParameterType.ARRAY.value
+    OBJECT = CommonParameterType.OBJECT.value
+
+
+class MCPServerParameterType(enum.StrEnum):
+    """
+    MCP server got complex parameter types
+    """
+
+    ARRAY = "array"
+    OBJECT = "object"
+
 
 class PluginParameterAutoGenerate(BaseModel):
     class Type(enum.StrEnum):
@@ -138,6 +151,34 @@ def cast_parameter_value(typ: enum.StrEnum, value: Any, /):
                 if value and not isinstance(value, list):
                     raise ValueError("The tools selector must be a list.")
                 return value
+            case PluginParameterType.ARRAY:
+                if not isinstance(value, list):
+                    # Try to parse JSON string for arrays
+                    if isinstance(value, str):
+                        try:
+                            import json
+
+                            parsed_value = json.loads(value)
+                            if isinstance(parsed_value, list):
+                                return parsed_value
+                        except (json.JSONDecodeError, ValueError):
+                            pass
+                    return [value]
+                return value
+            case PluginParameterType.OBJECT:
+                if not isinstance(value, dict):
+                    # Try to parse JSON string for objects
+                    if isinstance(value, str):
+                        try:
+                            import json
+
+                            parsed_value = json.loads(value)
+                            if isinstance(parsed_value, dict):
+                                return parsed_value
+                        except (json.JSONDecodeError, ValueError):
+                            pass
+                    return {}
+                return value
             case _:
                 return str(value)
     except ValueError:
diff --git a/api/core/plugin/entities/plugin.py b/api/core/plugin/entities/plugin.py
index bdf7d5ce1f..d6bbf05097 100644
--- a/api/core/plugin/entities/plugin.py
+++ b/api/core/plugin/entities/plugin.py
@@ -72,6 +72,7 @@ class PluginDeclaration(BaseModel):
 
     class Meta(BaseModel):
         minimum_dify_version: Optional[str] = Field(default=None, pattern=r"^\d{1,4}(\.\d{1,4}){1,3}(-\w{1,16})?$")
+        version: Optional[str] = Field(default=None)
 
     version: str = Field(..., pattern=r"^\d{1,4}(\.\d{1,4}){1,3}(-\w{1,16})?$")
     author: Optional[str] = Field(..., pattern=r"^[a-zA-Z0-9_-]{1,64}$")
diff --git a/api/core/plugin/entities/plugin_daemon.py b/api/core/plugin/entities/plugin_daemon.py
index 592b42c0da..00253b8a11 100644
--- a/api/core/plugin/entities/plugin_daemon.py
+++ b/api/core/plugin/entities/plugin_daemon.py
@@ -53,6 +53,7 @@ class PluginAgentProviderEntity(BaseModel):
     plugin_unique_identifier: str
     plugin_id: str
     declaration: AgentProviderEntityWithPlugin
+    meta: PluginDeclaration.Meta
 
 
 class PluginBasicBooleanResponse(BaseModel):
diff --git a/api/core/plugin/entities/request.py b/api/core/plugin/entities/request.py
index f9c81ed4d5..89f595ec46 100644
--- a/api/core/plugin/entities/request.py
+++ b/api/core/plugin/entities/request.py
@@ -32,7 +32,7 @@ class RequestInvokeTool(BaseModel):
     Request to invoke a tool
     """
 
-    tool_type: Literal["builtin", "workflow", "api"]
+    tool_type: Literal["builtin", "workflow", "api", "mcp"]
     provider: str
     tool: str
     tool_parameters: dict
diff --git a/api/core/tools/entities/api_entities.py b/api/core/tools/entities/api_entities.py
index b96c994cff..b94d6bba21 100644
--- a/api/core/tools/entities/api_entities.py
+++ b/api/core/tools/entities/api_entities.py
@@ -1,4 +1,5 @@
-from typing import Literal, Optional
+from datetime import datetime
+from typing import Any, Literal, Optional
 
 from pydantic import BaseModel, Field, field_validator
 
@@ -18,7 +19,7 @@ class ToolApiEntity(BaseModel):
     output_schema: Optional[dict] = None
 
 
-ToolProviderTypeApiLiteral = Optional[Literal["builtin", "api", "workflow"]]
+ToolProviderTypeApiLiteral = Optional[Literal["builtin", "api", "workflow", "mcp"]]
 
 
 class ToolProviderApiEntity(BaseModel):
@@ -37,6 +38,10 @@ class ToolProviderApiEntity(BaseModel):
     plugin_unique_identifier: Optional[str] = Field(default="", description="The unique identifier of the tool")
     tools: list[ToolApiEntity] = Field(default_factory=list)
     labels: list[str] = Field(default_factory=list)
+    # MCP
+    server_url: Optional[str] = Field(default="", description="The server url of the tool")
+    updated_at: int = Field(default_factory=lambda: int(datetime.now().timestamp()))
+    server_identifier: Optional[str] = Field(default="", description="The server identifier of the MCP tool")
 
     @field_validator("tools", mode="before")
     @classmethod
@@ -52,8 +57,13 @@ class ToolProviderApiEntity(BaseModel):
                 for parameter in tool.get("parameters"):
                     if parameter.get("type") == ToolParameter.ToolParameterType.SYSTEM_FILES.value:
                         parameter["type"] = "files"
+                    if parameter.get("input_schema") is None:
+                        parameter.pop("input_schema", None)
         # -------------
-
+        optional_fields = self.optional_field("server_url", self.server_url)
+        if self.type == ToolProviderType.MCP.value:
+            optional_fields.update(self.optional_field("updated_at", self.updated_at))
+            optional_fields.update(self.optional_field("server_identifier", self.server_identifier))
         return {
             "id": self.id,
             "author": self.author,
@@ -69,4 +79,9 @@ class ToolProviderApiEntity(BaseModel):
             "allow_delete": self.allow_delete,
             "tools": tools,
             "labels": self.labels,
+            **optional_fields,
         }
+
+    def optional_field(self, key: str, value: Any) -> dict:
+        """Return dict with key-value if value is truthy, empty dict otherwise."""
+        return {key: value} if value else {}
diff --git a/api/core/tools/entities/tool_entities.py b/api/core/tools/entities/tool_entities.py
index d2c28076ae..ba5fa5e156 100644
--- a/api/core/tools/entities/tool_entities.py
+++ b/api/core/tools/entities/tool_entities.py
@@ -8,6 +8,7 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_seriali
 
 from core.entities.provider_entities import ProviderConfig
 from core.plugin.entities.parameters import (
+    MCPServerParameterType,
     PluginParameter,
     PluginParameterOption,
     PluginParameterType,
@@ -49,6 +50,7 @@ class ToolProviderType(enum.StrEnum):
     API = "api"
     APP = "app"
     DATASET_RETRIEVAL = "dataset-retrieval"
+    MCP = "mcp"
 
     @classmethod
     def value_of(cls, value: str) -> "ToolProviderType":
@@ -242,6 +244,10 @@ class ToolParameter(PluginParameter):
         MODEL_SELECTOR = PluginParameterType.MODEL_SELECTOR.value
         DYNAMIC_SELECT = PluginParameterType.DYNAMIC_SELECT.value
 
+        # MCP object and array type parameters
+        ARRAY = MCPServerParameterType.ARRAY.value
+        OBJECT = MCPServerParameterType.OBJECT.value
+
         # deprecated, should not use.
         SYSTEM_FILES = PluginParameterType.SYSTEM_FILES.value
 
@@ -260,6 +266,8 @@ class ToolParameter(PluginParameter):
     human_description: Optional[I18nObject] = Field(default=None, description="The description presented to the user")
     form: ToolParameterForm = Field(..., description="The form of the parameter, schema/form/llm")
     llm_description: Optional[str] = None
+    # MCP object and array type parameters use this field to store the schema
+    input_schema: Optional[dict] = None
 
     @classmethod
     def get_simple_instance(
diff --git a/api/core/tools/mcp_tool/provider.py b/api/core/tools/mcp_tool/provider.py
new file mode 100644
index 0000000000..93f003effe
--- /dev/null
+++ b/api/core/tools/mcp_tool/provider.py
@@ -0,0 +1,130 @@
+import json
+from typing import Any
+
+from core.mcp.types import Tool as RemoteMCPTool
+from core.tools.__base.tool_provider import ToolProviderController
+from core.tools.__base.tool_runtime import ToolRuntime
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import (
+    ToolDescription,
+    ToolEntity,
+    ToolIdentity,
+    ToolProviderEntityWithPlugin,
+    ToolProviderIdentity,
+    ToolProviderType,
+)
+from core.tools.mcp_tool.tool import MCPTool
+from models.tools import MCPToolProvider
+from services.tools.tools_transform_service import ToolTransformService
+
+
+class MCPToolProviderController(ToolProviderController):
+    provider_id: str
+    entity: ToolProviderEntityWithPlugin
+
+    def __init__(self, entity: ToolProviderEntityWithPlugin, provider_id: str, tenant_id: str, server_url: str) -> None:
+        super().__init__(entity)
+        self.entity = entity
+        self.tenant_id = tenant_id
+        self.provider_id = provider_id
+        self.server_url = server_url
+
+    @property
+    def provider_type(self) -> ToolProviderType:
+        """
+        returns the type of the provider
+
+        :return: type of the provider
+        """
+        return ToolProviderType.MCP
+
+    @classmethod
+    def _from_db(cls, db_provider: MCPToolProvider) -> "MCPToolProviderController":
+        """
+        from db provider
+        """
+        tools = []
+        tools_data = json.loads(db_provider.tools)
+        remote_mcp_tools = [RemoteMCPTool(**tool) for tool in tools_data]
+        user = db_provider.load_user()
+        tools = [
+            ToolEntity(
+                identity=ToolIdentity(
+                    author=user.name if user else "Anonymous",
+                    name=remote_mcp_tool.name,
+                    label=I18nObject(en_US=remote_mcp_tool.name, zh_Hans=remote_mcp_tool.name),
+                    provider=db_provider.server_identifier,
+                    icon=db_provider.icon,
+                ),
+                parameters=ToolTransformService.convert_mcp_schema_to_parameter(remote_mcp_tool.inputSchema),
+                description=ToolDescription(
+                    human=I18nObject(
+                        en_US=remote_mcp_tool.description or "", zh_Hans=remote_mcp_tool.description or ""
+                    ),
+                    llm=remote_mcp_tool.description or "",
+                ),
+                output_schema=None,
+                has_runtime_parameters=len(remote_mcp_tool.inputSchema) > 0,
+            )
+            for remote_mcp_tool in remote_mcp_tools
+        ]
+
+        return cls(
+            entity=ToolProviderEntityWithPlugin(
+                identity=ToolProviderIdentity(
+                    author=user.name if user else "Anonymous",
+                    name=db_provider.name,
+                    label=I18nObject(en_US=db_provider.name, zh_Hans=db_provider.name),
+                    description=I18nObject(en_US="", zh_Hans=""),
+                    icon=db_provider.icon,
+                ),
+                plugin_id=None,
+                credentials_schema=[],
+                tools=tools,
+            ),
+            provider_id=db_provider.server_identifier or "",
+            tenant_id=db_provider.tenant_id or "",
+            server_url=db_provider.decrypted_server_url,
+        )
+
+    def _validate_credentials(self, user_id: str, credentials: dict[str, Any]) -> None:
+        """
+        validate the credentials of the provider
+        """
+        pass
+
+    def get_tool(self, tool_name: str) -> MCPTool:  # type: ignore
+        """
+        return tool with given name
+        """
+        tool_entity = next(
+            (tool_entity for tool_entity in self.entity.tools if tool_entity.identity.name == tool_name), None
+        )
+
+        if not tool_entity:
+            raise ValueError(f"Tool with name {tool_name} not found")
+
+        return MCPTool(
+            entity=tool_entity,
+            runtime=ToolRuntime(tenant_id=self.tenant_id),
+            tenant_id=self.tenant_id,
+            icon=self.entity.identity.icon,
+            server_url=self.server_url,
+            provider_id=self.provider_id,
+        )
+
+    def get_tools(self) -> list[MCPTool]:  # type: ignore
+        """
+        get all tools
+        """
+        return [
+            MCPTool(
+                entity=tool_entity,
+                runtime=ToolRuntime(tenant_id=self.tenant_id),
+                tenant_id=self.tenant_id,
+                icon=self.entity.identity.icon,
+                server_url=self.server_url,
+                provider_id=self.provider_id,
+            )
+            for tool_entity in self.entity.tools
+        ]
diff --git a/api/core/tools/mcp_tool/tool.py b/api/core/tools/mcp_tool/tool.py
new file mode 100644
index 0000000000..d1bacbc735
--- /dev/null
+++ b/api/core/tools/mcp_tool/tool.py
@@ -0,0 +1,92 @@
+import base64
+import json
+from collections.abc import Generator
+from typing import Any, Optional
+
+from core.mcp.error import MCPAuthError, MCPConnectionError
+from core.mcp.mcp_client import MCPClient
+from core.mcp.types import ImageContent, TextContent
+from core.tools.__base.tool import Tool
+from core.tools.__base.tool_runtime import ToolRuntime
+from core.tools.entities.tool_entities import ToolEntity, ToolInvokeMessage, ToolParameter, ToolProviderType
+
+
+class MCPTool(Tool):
+    tenant_id: str
+    icon: str
+    runtime_parameters: Optional[list[ToolParameter]]
+    server_url: str
+    provider_id: str
+
+    def __init__(
+        self, entity: ToolEntity, runtime: ToolRuntime, tenant_id: str, icon: str, server_url: str, provider_id: str
+    ) -> None:
+        super().__init__(entity, runtime)
+        self.tenant_id = tenant_id
+        self.icon = icon
+        self.runtime_parameters = None
+        self.server_url = server_url
+        self.provider_id = provider_id
+
+    def tool_provider_type(self) -> ToolProviderType:
+        return ToolProviderType.MCP
+
+    def _invoke(
+        self,
+        user_id: str,
+        tool_parameters: dict[str, Any],
+        conversation_id: Optional[str] = None,
+        app_id: Optional[str] = None,
+        message_id: Optional[str] = None,
+    ) -> Generator[ToolInvokeMessage, None, None]:
+        from core.tools.errors import ToolInvokeError
+
+        try:
+            with MCPClient(self.server_url, self.provider_id, self.tenant_id, authed=True) as mcp_client:
+                tool_parameters = self._handle_none_parameter(tool_parameters)
+                result = mcp_client.invoke_tool(tool_name=self.entity.identity.name, tool_args=tool_parameters)
+        except MCPAuthError as e:
+            raise ToolInvokeError("Please auth the tool first") from e
+        except MCPConnectionError as e:
+            raise ToolInvokeError(f"Failed to connect to MCP server: {e}") from e
+        except Exception as e:
+            raise ToolInvokeError(f"Failed to invoke tool: {e}") from e
+
+        for content in result.content:
+            if isinstance(content, TextContent):
+                try:
+                    content_json = json.loads(content.text)
+                    if isinstance(content_json, dict):
+                        yield self.create_json_message(content_json)
+                    elif isinstance(content_json, list):
+                        for item in content_json:
+                            yield self.create_json_message(item)
+                    else:
+                        yield self.create_text_message(content.text)
+                except json.JSONDecodeError:
+                    yield self.create_text_message(content.text)
+
+            elif isinstance(content, ImageContent):
+                yield self.create_blob_message(
+                    blob=base64.b64decode(content.data), meta={"mime_type": content.mimeType}
+                )
+
+    def fork_tool_runtime(self, runtime: ToolRuntime) -> "MCPTool":
+        return MCPTool(
+            entity=self.entity,
+            runtime=runtime,
+            tenant_id=self.tenant_id,
+            icon=self.icon,
+            server_url=self.server_url,
+            provider_id=self.provider_id,
+        )
+
+    def _handle_none_parameter(self, parameter: dict[str, Any]) -> dict[str, Any]:
+        """
+        in mcp tool invoke, if the parameter is empty, it will be set to None
+        """
+        return {
+            key: value
+            for key, value in parameter.items()
+            if value is not None and not (isinstance(value, str) and value.strip() == "")
+        }
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index 0bfe6329b1..adae56cd27 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -4,7 +4,7 @@ import mimetypes
 from collections.abc import Generator
 from os import listdir, path
 from threading import Lock
-from typing import TYPE_CHECKING, Any, Union, cast
+from typing import TYPE_CHECKING, Any, Literal, Optional, Union, cast
 
 from yarl import URL
 
@@ -13,9 +13,13 @@ from core.plugin.entities.plugin import ToolProviderID
 from core.plugin.impl.tool import PluginToolManager
 from core.tools.__base.tool_provider import ToolProviderController
 from core.tools.__base.tool_runtime import ToolRuntime
+from core.tools.mcp_tool.provider import MCPToolProviderController
+from core.tools.mcp_tool.tool import MCPTool
 from core.tools.plugin_tool.provider import PluginToolProviderController
 from core.tools.plugin_tool.tool import PluginTool
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
+from core.workflow.entities.variable_pool import VariablePool
+from services.tools.mcp_tools_mange_service import MCPToolManageService
 
 if TYPE_CHECKING:
     from core.workflow.nodes.tool.entities import ToolEntity
@@ -49,7 +53,7 @@ from core.tools.utils.configuration import (
 )
 from core.tools.workflow_as_tool.tool import WorkflowTool
 from extensions.ext_database import db
-from models.tools import ApiToolProvider, BuiltinToolProvider, WorkflowToolProvider
+from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider, WorkflowToolProvider
 from services.tools.tools_transform_service import ToolTransformService
 
 logger = logging.getLogger(__name__)
@@ -156,7 +160,7 @@ class ToolManager:
         tenant_id: str,
         invoke_from: InvokeFrom = InvokeFrom.DEBUGGER,
         tool_invoke_from: ToolInvokeFrom = ToolInvokeFrom.AGENT,
-    ) -> Union[BuiltinTool, PluginTool, ApiTool, WorkflowTool]:
+    ) -> Union[BuiltinTool, PluginTool, ApiTool, WorkflowTool, MCPTool]:
         """
         get the tool runtime
 
@@ -292,6 +296,8 @@ class ToolManager:
             raise NotImplementedError("app provider not implemented")
         elif provider_type == ToolProviderType.PLUGIN:
             return cls.get_plugin_provider(provider_id, tenant_id).get_tool(tool_name)
+        elif provider_type == ToolProviderType.MCP:
+            return cls.get_mcp_provider_controller(tenant_id, provider_id).get_tool(tool_name)
         else:
             raise ToolProviderNotFoundError(f"provider type {provider_type.value} not found")
 
@@ -302,6 +308,7 @@ class ToolManager:
         app_id: str,
         agent_tool: AgentToolEntity,
         invoke_from: InvokeFrom = InvokeFrom.DEBUGGER,
+        variable_pool: Optional[VariablePool] = None,
     ) -> Tool:
         """
         get the agent tool runtime
@@ -316,24 +323,9 @@ class ToolManager:
         )
         runtime_parameters = {}
         parameters = tool_entity.get_merged_runtime_parameters()
-        for parameter in parameters:
-            # check file types
-            if (
-                parameter.type
-                in {
-                    ToolParameter.ToolParameterType.SYSTEM_FILES,
-                    ToolParameter.ToolParameterType.FILE,
-                    ToolParameter.ToolParameterType.FILES,
-                }
-                and parameter.required
-            ):
-                raise ValueError(f"file type parameter {parameter.name} not supported in agent")
-
-            if parameter.form == ToolParameter.ToolParameterForm.FORM:
-                # save tool parameter to tool entity memory
-                value = parameter.init_frontend_parameter(agent_tool.tool_parameters.get(parameter.name))
-                runtime_parameters[parameter.name] = value
-
+        runtime_parameters = cls._convert_tool_parameters_type(
+            parameters, variable_pool, agent_tool.tool_parameters, typ="agent"
+        )
         # decrypt runtime parameters
         encryption_manager = ToolParameterConfigurationManager(
             tenant_id=tenant_id,
@@ -357,10 +349,12 @@ class ToolManager:
         node_id: str,
         workflow_tool: "ToolEntity",
         invoke_from: InvokeFrom = InvokeFrom.DEBUGGER,
+        variable_pool: Optional[VariablePool] = None,
     ) -> Tool:
         """
         get the workflow tool runtime
         """
+
         tool_runtime = cls.get_tool_runtime(
             provider_type=workflow_tool.provider_type,
             provider_id=workflow_tool.provider_id,
@@ -369,15 +363,11 @@ class ToolManager:
             invoke_from=invoke_from,
             tool_invoke_from=ToolInvokeFrom.WORKFLOW,
         )
-        runtime_parameters = {}
-        parameters = tool_runtime.get_merged_runtime_parameters()
-
-        for parameter in parameters:
-            # save tool parameter to tool entity memory
-            if parameter.form == ToolParameter.ToolParameterForm.FORM:
-                value = parameter.init_frontend_parameter(workflow_tool.tool_configurations.get(parameter.name))
-                runtime_parameters[parameter.name] = value
 
+        parameters = tool_runtime.get_merged_runtime_parameters()
+        runtime_parameters = cls._convert_tool_parameters_type(
+            parameters, variable_pool, workflow_tool.tool_configurations, typ="workflow"
+        )
         # decrypt runtime parameters
         encryption_manager = ToolParameterConfigurationManager(
             tenant_id=tenant_id,
@@ -569,7 +559,7 @@ class ToolManager:
 
         filters = []
         if not typ:
-            filters.extend(["builtin", "api", "workflow"])
+            filters.extend(["builtin", "api", "workflow", "mcp"])
         else:
             filters.append(typ)
 
@@ -663,6 +653,10 @@ class ToolManager:
                         labels=labels.get(provider_controller.provider_id, []),
                     )
                     result_providers[f"workflow_provider.{user_provider.name}"] = user_provider
+            if "mcp" in filters:
+                mcp_providers = MCPToolManageService.retrieve_mcp_tools(tenant_id, for_list=True)
+                for mcp_provider in mcp_providers:
+                    result_providers[f"mcp_provider.{mcp_provider.name}"] = mcp_provider
 
         return BuiltinToolProviderSort.sort(list(result_providers.values()))
 
@@ -698,6 +692,32 @@ class ToolManager:
 
         return controller, provider.credentials
 
+    @classmethod
+    def get_mcp_provider_controller(cls, tenant_id: str, provider_id: str) -> MCPToolProviderController:
+        """
+        get the api provider
+
+        :param tenant_id: the id of the tenant
+        :param provider_id: the id of the provider
+
+        :return: the provider controller, the credentials
+        """
+        provider: MCPToolProvider | None = (
+            db.session.query(MCPToolProvider)
+            .filter(
+                MCPToolProvider.server_identifier == provider_id,
+                MCPToolProvider.tenant_id == tenant_id,
+            )
+            .first()
+        )
+
+        if provider is None:
+            raise ToolProviderNotFoundError(f"mcp provider {provider_id} not found")
+
+        controller = MCPToolProviderController._from_db(provider)
+
+        return controller
+
     @classmethod
     def user_get_api_provider(cls, provider: str, tenant_id: str) -> dict:
         """
@@ -826,6 +846,22 @@ class ToolManager:
         except Exception:
             return {"background": "#252525", "content": "\ud83d\ude01"}
 
+    @classmethod
+    def generate_mcp_tool_icon_url(cls, tenant_id: str, provider_id: str) -> dict[str, str] | str:
+        try:
+            mcp_provider: MCPToolProvider | None = (
+                db.session.query(MCPToolProvider)
+                .filter(MCPToolProvider.tenant_id == tenant_id, MCPToolProvider.server_identifier == provider_id)
+                .first()
+            )
+
+            if mcp_provider is None:
+                raise ToolProviderNotFoundError(f"mcp provider {provider_id} not found")
+
+            return mcp_provider.provider_icon
+        except Exception:
+            return {"background": "#252525", "content": "\ud83d\ude01"}
+
     @classmethod
     def get_tool_icon(
         cls,
@@ -863,8 +899,61 @@ class ToolManager:
                 except Exception:
                     return {"background": "#252525", "content": "\ud83d\ude01"}
             raise ValueError(f"plugin provider {provider_id} not found")
+        elif provider_type == ToolProviderType.MCP:
+            return cls.generate_mcp_tool_icon_url(tenant_id, provider_id)
         else:
             raise ValueError(f"provider type {provider_type} not found")
 
+    @classmethod
+    def _convert_tool_parameters_type(
+        cls,
+        parameters: list[ToolParameter],
+        variable_pool: Optional[VariablePool],
+        tool_configurations: dict[str, Any],
+        typ: Literal["agent", "workflow", "tool"] = "workflow",
+    ) -> dict[str, Any]:
+        """
+        Convert tool parameters type
+        """
+        from core.workflow.nodes.tool.entities import ToolNodeData
+        from core.workflow.nodes.tool.exc import ToolParameterError
+
+        runtime_parameters = {}
+        for parameter in parameters:
+            if (
+                parameter.type
+                in {
+                    ToolParameter.ToolParameterType.SYSTEM_FILES,
+                    ToolParameter.ToolParameterType.FILE,
+                    ToolParameter.ToolParameterType.FILES,
+                }
+                and parameter.required
+                and typ == "agent"
+            ):
+                raise ValueError(f"file type parameter {parameter.name} not supported in agent")
+            # save tool parameter to tool entity memory
+            if parameter.form == ToolParameter.ToolParameterForm.FORM:
+                if variable_pool:
+                    config = tool_configurations.get(parameter.name, {})
+                    if not (config and isinstance(config, dict) and config.get("value") is not None):
+                        continue
+                    tool_input = ToolNodeData.ToolInput(**tool_configurations.get(parameter.name, {}))
+                    if tool_input.type == "variable":
+                        variable = variable_pool.get(tool_input.value)
+                        if variable is None:
+                            raise ToolParameterError(f"Variable {tool_input.value} does not exist")
+                        parameter_value = variable.value
+                    elif tool_input.type in {"mixed", "constant"}:
+                        segment_group = variable_pool.convert_template(str(tool_input.value))
+                        parameter_value = segment_group.text
+                    else:
+                        raise ToolParameterError(f"Unknown tool input type '{tool_input.type}'")
+                    runtime_parameters[parameter.name] = parameter_value
+
+                else:
+                    value = parameter.init_frontend_parameter(tool_configurations.get(parameter.name))
+                    runtime_parameters[parameter.name] = value
+        return runtime_parameters
+
 
 ToolManager.load_hardcoded_providers_cache()
diff --git a/api/core/tools/utils/configuration.py b/api/core/tools/utils/configuration.py
index 1f23e90351..251fedf56e 100644
--- a/api/core/tools/utils/configuration.py
+++ b/api/core/tools/utils/configuration.py
@@ -72,21 +72,21 @@ class ProviderConfigEncrypter(BaseModel):
 
         return data
 
-    def decrypt(self, data: dict[str, str]) -> dict[str, str]:
+    def decrypt(self, data: dict[str, str], use_cache: bool = True) -> dict[str, str]:
         """
         decrypt tool credentials with tenant id
 
         return a deep copy of credentials with decrypted values
         """
-        cache = ToolProviderCredentialsCache(
-            tenant_id=self.tenant_id,
-            identity_id=f"{self.provider_type}.{self.provider_identity}",
-            cache_type=ToolProviderCredentialsCacheType.PROVIDER,
-        )
-        cached_credentials = cache.get()
-        if cached_credentials:
-            return cached_credentials
-
+        if use_cache:
+            cache = ToolProviderCredentialsCache(
+                tenant_id=self.tenant_id,
+                identity_id=f"{self.provider_type}.{self.provider_identity}",
+                cache_type=ToolProviderCredentialsCacheType.PROVIDER,
+            )
+            cached_credentials = cache.get()
+            if cached_credentials:
+                return cached_credentials
         data = self._deep_copy(data)
         # get fields need to be decrypted
         fields = dict[str, BasicProviderConfig]()
@@ -105,7 +105,8 @@ class ProviderConfigEncrypter(BaseModel):
                     except Exception:
                         pass
 
-        cache.set(data)
+        if use_cache:
+            cache.set(data)
         return data
 
     def delete_tool_credentials_cache(self):
diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index 57c93d1d45..10bf8ca640 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -8,7 +8,12 @@ from flask_login import current_user
 from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
 from core.tools.__base.tool import Tool
 from core.tools.__base.tool_runtime import ToolRuntime
-from core.tools.entities.tool_entities import ToolEntity, ToolInvokeMessage, ToolParameter, ToolProviderType
+from core.tools.entities.tool_entities import (
+    ToolEntity,
+    ToolInvokeMessage,
+    ToolParameter,
+    ToolProviderType,
+)
 from core.tools.errors import ToolInvokeError
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping
diff --git a/api/core/workflow/nodes/agent/agent_node.py b/api/core/workflow/nodes/agent/agent_node.py
index 766cdb604f..678b99d546 100644
--- a/api/core/workflow/nodes/agent/agent_node.py
+++ b/api/core/workflow/nodes/agent/agent_node.py
@@ -3,11 +3,13 @@ import uuid
 from collections.abc import Generator, Mapping, Sequence
 from typing import Any, Optional, cast
 
+from packaging.version import Version
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.agent.entities import AgentToolEntity
 from core.agent.plugin_entities import AgentStrategyParameter
+from core.agent.strategy.plugin import PluginAgentStrategy
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance, ModelManager
 from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
@@ -73,12 +75,14 @@ class AgentNode(ToolNode):
             agent_parameters=agent_parameters,
             variable_pool=self.graph_runtime_state.variable_pool,
             node_data=node_data,
+            strategy=strategy,
         )
         parameters_for_log = self._generate_agent_parameters(
             agent_parameters=agent_parameters,
             variable_pool=self.graph_runtime_state.variable_pool,
             node_data=node_data,
             for_log=True,
+            strategy=strategy,
         )
 
         # get conversation id
@@ -155,6 +159,7 @@ class AgentNode(ToolNode):
         variable_pool: VariablePool,
         node_data: AgentNodeData,
         for_log: bool = False,
+        strategy: PluginAgentStrategy,
     ) -> dict[str, Any]:
         """
         Generate parameters based on the given tool parameters, variable pool, and node data.
@@ -207,7 +212,7 @@ class AgentNode(ToolNode):
             if parameter.type == "array[tools]":
                 value = cast(list[dict[str, Any]], value)
                 value = [tool for tool in value if tool.get("enabled", False)]
-
+                value = self._filter_mcp_type_tool(strategy, value)
                 for tool in value:
                     if "schemas" in tool:
                         tool.pop("schemas")
@@ -244,9 +249,9 @@ class AgentNode(ToolNode):
                         )
 
                         extra = tool.get("extra", {})
-
+                        runtime_variable_pool = variable_pool if self.node_data.version != "1" else None
                         tool_runtime = ToolManager.get_agent_tool_runtime(
-                            self.tenant_id, self.app_id, entity, self.invoke_from
+                            self.tenant_id, self.app_id, entity, self.invoke_from, runtime_variable_pool
                         )
                         if tool_runtime.entity.description:
                             tool_runtime.entity.description.llm = (
@@ -398,3 +403,16 @@ class AgentNode(ToolNode):
                 except ValueError:
                     model_schema.features.remove(feature)
         return model_schema
+
+    def _filter_mcp_type_tool(self, strategy: PluginAgentStrategy, tools: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        """
+        Filter MCP type tool
+        :param strategy: plugin agent strategy
+        :param tool: tool
+        :return: filtered tool dict
+        """
+        meta_version = strategy.meta_version
+        if meta_version and Version(meta_version) > Version("0.0.1"):
+            return tools
+        else:
+            return [tool for tool in tools if tool.get("type") != ToolProviderType.MCP.value]
diff --git a/api/core/workflow/nodes/node_mapping.py b/api/core/workflow/nodes/node_mapping.py
index 67cc884f20..ccfaec4a8c 100644
--- a/api/core/workflow/nodes/node_mapping.py
+++ b/api/core/workflow/nodes/node_mapping.py
@@ -73,6 +73,7 @@ NODE_TYPE_CLASSES_MAPPING: Mapping[NodeType, Mapping[str, type[BaseNode]]] = {
     },
     NodeType.TOOL: {
         LATEST_VERSION: ToolNode,
+        "2": ToolNode,
         "1": ToolNode,
     },
     NodeType.VARIABLE_AGGREGATOR: {
@@ -122,6 +123,7 @@ NODE_TYPE_CLASSES_MAPPING: Mapping[NodeType, Mapping[str, type[BaseNode]]] = {
     },
     NodeType.AGENT: {
         LATEST_VERSION: AgentNode,
+        "2": AgentNode,
         "1": AgentNode,
     },
 }
diff --git a/api/core/workflow/nodes/tool/entities.py b/api/core/workflow/nodes/tool/entities.py
index 21023d4ab7..691f6e0196 100644
--- a/api/core/workflow/nodes/tool/entities.py
+++ b/api/core/workflow/nodes/tool/entities.py
@@ -41,6 +41,10 @@ class ToolNodeData(BaseNodeData, ToolEntity):
         def check_type(cls, value, validation_info: ValidationInfo):
             typ = value
             value = validation_info.data.get("value")
+
+            if value is None:
+                return typ
+
             if typ == "mixed" and not isinstance(value, str):
                 raise ValueError("value must be a string")
             elif typ == "variable":
@@ -54,3 +58,22 @@ class ToolNodeData(BaseNodeData, ToolEntity):
             return typ
 
     tool_parameters: dict[str, ToolInput]
+
+    @field_validator("tool_parameters", mode="before")
+    @classmethod
+    def filter_none_tool_inputs(cls, value):
+        if not isinstance(value, dict):
+            return value
+
+        return {
+            key: tool_input
+            for key, tool_input in value.items()
+            if tool_input is not None and cls._has_valid_value(tool_input)
+        }
+
+    @staticmethod
+    def _has_valid_value(tool_input):
+        """Check if the value is valid"""
+        if isinstance(tool_input, dict):
+            return tool_input.get("value") is not None
+        return getattr(tool_input, "value", None) is not None
diff --git a/api/core/workflow/nodes/tool/tool_node.py b/api/core/workflow/nodes/tool/tool_node.py
index 472ca673b0..f5898dd605 100644
--- a/api/core/workflow/nodes/tool/tool_node.py
+++ b/api/core/workflow/nodes/tool/tool_node.py
@@ -67,8 +67,9 @@ 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
             tool_runtime = ToolManager.get_workflow_tool_runtime(
-                self.tenant_id, self.app_id, self.node_id, self.node_data, self.invoke_from
+                self.tenant_id, self.app_id, self.node_id, self.node_data, self.invoke_from, variable_pool
             )
         except ToolNodeError as e:
             yield RunCompletedEvent(
@@ -95,7 +96,6 @@ class ToolNode(BaseNode[ToolNodeData]):
             node_data=self.node_data,
             for_log=True,
         )
-
         # get conversation id
         conversation_id = self.graph_runtime_state.variable_pool.get(["sys", SystemVariableKey.CONVERSATION_ID])
 
diff --git a/api/extensions/ext_blueprints.py b/api/extensions/ext_blueprints.py
index 316be12f5c..a4d013ffc0 100644
--- a/api/extensions/ext_blueprints.py
+++ b/api/extensions/ext_blueprints.py
@@ -10,6 +10,7 @@ def init_app(app: DifyApp):
     from controllers.console import bp as console_app_bp
     from controllers.files import bp as files_bp
     from controllers.inner_api import bp as inner_api_bp
+    from controllers.mcp import bp as mcp_bp
     from controllers.service_api import bp as service_api_bp
     from controllers.web import bp as web_bp
 
@@ -46,3 +47,4 @@ def init_app(app: DifyApp):
     app.register_blueprint(files_bp)
 
     app.register_blueprint(inner_api_bp)
+    app.register_blueprint(mcp_bp)
diff --git a/api/extensions/ext_login.py b/api/extensions/ext_login.py
index 3b4d787d01..11d1856ac4 100644
--- a/api/extensions/ext_login.py
+++ b/api/extensions/ext_login.py
@@ -10,7 +10,7 @@ from dify_app import DifyApp
 from extensions.ext_database import db
 from libs.passport import PassportService
 from models.account import Account, Tenant, TenantAccountJoin
-from models.model import EndUser
+from models.model import AppMCPServer, EndUser
 from services.account_service import AccountService
 
 login_manager = flask_login.LoginManager()
@@ -74,6 +74,21 @@ def load_user_from_request(request_from_flask_login):
         if not end_user:
             raise NotFound("End user not found.")
         return end_user
+    elif request.blueprint == "mcp":
+        server_code = request.view_args.get("server_code") if request.view_args else None
+        if not server_code:
+            raise Unauthorized("Invalid Authorization token.")
+        app_mcp_server = db.session.query(AppMCPServer).filter(AppMCPServer.server_code == server_code).first()
+        if not app_mcp_server:
+            raise NotFound("App MCP server not found.")
+        end_user = (
+            db.session.query(EndUser)
+            .filter(EndUser.external_user_id == app_mcp_server.id, EndUser.type == "mcp")
+            .first()
+        )
+        if not end_user:
+            raise NotFound("End user not found.")
+        return end_user
 
 
 @user_logged_in.connect
diff --git a/api/factories/agent_factory.py b/api/factories/agent_factory.py
index 4b12afb528..2570bc22f1 100644
--- a/api/factories/agent_factory.py
+++ b/api/factories/agent_factory.py
@@ -10,6 +10,6 @@ def get_plugin_agent_strategy(
     agent_provider = manager.fetch_agent_strategy_provider(tenant_id, agent_strategy_provider_name)
     for agent_strategy in agent_provider.declaration.strategies:
         if agent_strategy.identity.name == agent_strategy_name:
-            return PluginAgentStrategy(tenant_id, agent_strategy)
+            return PluginAgentStrategy(tenant_id, agent_strategy, agent_provider.meta.version)
 
     raise ValueError(f"Agent strategy {agent_strategy_name} not found")
diff --git a/api/fields/app_fields.py b/api/fields/app_fields.py
index 500ca47c7e..73c224542a 100644
--- a/api/fields/app_fields.py
+++ b/api/fields/app_fields.py
@@ -1,8 +1,21 @@
+import json
+
 from flask_restful import fields
 
 from fields.workflow_fields import workflow_partial_fields
 from libs.helper import AppIconUrlField, TimestampField
 
+
+class JsonStringField(fields.Raw):
+    def format(self, value):
+        if isinstance(value, str):
+            try:
+                return json.loads(value)
+            except (json.JSONDecodeError, TypeError):
+                return value
+        return value
+
+
 app_detail_kernel_fields = {
     "id": fields.String,
     "name": fields.String,
@@ -218,3 +231,14 @@ app_import_fields = {
 app_import_check_dependencies_fields = {
     "leaked_dependencies": fields.List(fields.Nested(leaked_dependency_fields)),
 }
+
+app_server_fields = {
+    "id": fields.String,
+    "name": fields.String,
+    "server_code": fields.String,
+    "description": fields.String,
+    "status": fields.String,
+    "parameters": JsonStringField,
+    "created_at": TimestampField,
+    "updated_at": TimestampField,
+}
diff --git a/api/migrations/versions/2025_06_25_0936-58eb7bdb93fe_add_mcp_server_tool_and_app_server.py b/api/migrations/versions/2025_06_25_0936-58eb7bdb93fe_add_mcp_server_tool_and_app_server.py
new file mode 100644
index 0000000000..0548bf05ef
--- /dev/null
+++ b/api/migrations/versions/2025_06_25_0936-58eb7bdb93fe_add_mcp_server_tool_and_app_server.py
@@ -0,0 +1,64 @@
+"""add mcp server tool and app server
+
+Revision ID: 58eb7bdb93fe
+Revises: 0ab65e1cc7fa
+Create Date: 2025-06-25 09:36:07.510570
+
+"""
+from alembic import op
+import models as models
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '58eb7bdb93fe'
+down_revision = '0ab65e1cc7fa'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('app_mcp_servers',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('app_id', models.types.StringUUID(), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.Column('description', sa.String(length=255), nullable=False),
+    sa.Column('server_code', sa.String(length=255), nullable=False),
+    sa.Column('status', sa.String(length=255), server_default=sa.text("'normal'::character varying"), nullable=False),
+    sa.Column('parameters', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='app_mcp_server_pkey'),
+    sa.UniqueConstraint('tenant_id', 'app_id', name='unique_app_mcp_server_tenant_app_id'),
+    sa.UniqueConstraint('server_code', name='unique_app_mcp_server_server_code')
+    )
+    op.create_table('tool_mcp_providers',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('name', sa.String(length=40), nullable=False),
+    sa.Column('server_identifier', sa.String(length=24), nullable=False),
+    sa.Column('server_url', sa.Text(), nullable=False),
+    sa.Column('server_url_hash', sa.String(length=64), nullable=False),
+    sa.Column('icon', sa.String(length=255), nullable=True),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('user_id', models.types.StringUUID(), nullable=False),
+    sa.Column('encrypted_credentials', sa.Text(), nullable=True),
+    sa.Column('authed', sa.Boolean(), nullable=False),
+    sa.Column('tools', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tool_mcp_provider_pkey'),
+    sa.UniqueConstraint('tenant_id', 'name', name='unique_mcp_provider_name'),
+    sa.UniqueConstraint('tenant_id', 'server_identifier', name='unique_mcp_provider_server_identifier'),
+    sa.UniqueConstraint('tenant_id', 'server_url_hash', name='unique_mcp_provider_server_url')
+    )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('tool_mcp_providers')
+    op.drop_table('app_mcp_servers')
+    # ### end Alembic commands ###
diff --git a/api/models/__init__.py b/api/models/__init__.py
index 83b50eb099..1b4bdd32e4 100644
--- a/api/models/__init__.py
+++ b/api/models/__init__.py
@@ -34,6 +34,7 @@ from .model import (
     App,
     AppAnnotationHitHistory,
     AppAnnotationSetting,
+    AppMCPServer,
     AppMode,
     AppModelConfig,
     Conversation,
@@ -103,6 +104,7 @@ __all__ = [
     "AppAnnotationHitHistory",
     "AppAnnotationSetting",
     "AppDatasetJoin",
+    "AppMCPServer",  # Added
     "AppMode",
     "AppModelConfig",
     "BuiltinToolProvider",
diff --git a/api/models/model.py b/api/models/model.py
index 93737043d5..b1007c4a79 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -1456,6 +1456,39 @@ class EndUser(Base, UserMixin):
     updated_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
 
+class AppMCPServer(Base):
+    __tablename__ = "app_mcp_servers"
+    __table_args__ = (
+        db.PrimaryKeyConstraint("id", name="app_mcp_server_pkey"),
+        db.UniqueConstraint("tenant_id", "app_id", name="unique_app_mcp_server_tenant_app_id"),
+        db.UniqueConstraint("server_code", name="unique_app_mcp_server_server_code"),
+    )
+    id = db.Column(StringUUID, server_default=db.text("uuid_generate_v4()"))
+    tenant_id = db.Column(StringUUID, nullable=False)
+    app_id = db.Column(StringUUID, nullable=False)
+    name = db.Column(db.String(255), nullable=False)
+    description = db.Column(db.String(255), nullable=False)
+    server_code = db.Column(db.String(255), nullable=False)
+    status = db.Column(db.String(255), nullable=False, server_default=db.text("'normal'::character varying"))
+    parameters = db.Column(db.Text, nullable=False)
+
+    created_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
+    updated_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
+
+    @staticmethod
+    def generate_server_code(n):
+        while True:
+            result = generate_string(n)
+            while db.session.query(AppMCPServer).filter(AppMCPServer.server_code == result).count() > 0:
+                result = generate_string(n)
+
+            return result
+
+    @property
+    def parameters_dict(self) -> dict[str, Any]:
+        return cast(dict[str, Any], json.loads(self.parameters))
+
+
 class Site(Base):
     __tablename__ = "sites"
     __table_args__ = (
diff --git a/api/models/tools.py b/api/models/tools.py
index 03fbc3acb1..9d2c3baea5 100644
--- a/api/models/tools.py
+++ b/api/models/tools.py
@@ -1,12 +1,16 @@
 import json
 from datetime import datetime
 from typing import Any, cast
+from urllib.parse import urlparse
 
 import sqlalchemy as sa
 from deprecated import deprecated
 from sqlalchemy import ForeignKey, func
 from sqlalchemy.orm import Mapped, mapped_column
 
+from core.file import helpers as file_helpers
+from core.helper import encrypter
+from core.mcp.types import Tool
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_bundle import ApiToolBundle
 from core.tools.entities.tool_entities import ApiProviderSchemaType, WorkflowToolParameterConfiguration
@@ -189,6 +193,108 @@ class WorkflowToolProvider(Base):
         return db.session.query(App).filter(App.id == self.app_id).first()
 
 
+class MCPToolProvider(Base):
+    """
+    The table stores the mcp providers.
+    """
+
+    __tablename__ = "tool_mcp_providers"
+    __table_args__ = (
+        db.PrimaryKeyConstraint("id", name="tool_mcp_provider_pkey"),
+        db.UniqueConstraint("tenant_id", "server_url_hash", name="unique_mcp_provider_server_url"),
+        db.UniqueConstraint("tenant_id", "name", name="unique_mcp_provider_name"),
+        db.UniqueConstraint("tenant_id", "server_identifier", name="unique_mcp_provider_server_identifier"),
+    )
+
+    id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
+    # name of the mcp provider
+    name: Mapped[str] = mapped_column(db.String(40), nullable=False)
+    # server identifier of the mcp provider
+    server_identifier: Mapped[str] = mapped_column(db.String(24), nullable=False)
+    # encrypted url of the mcp provider
+    server_url: Mapped[str] = mapped_column(db.Text, nullable=False)
+    # hash of server_url for uniqueness check
+    server_url_hash: Mapped[str] = mapped_column(db.String(64), nullable=False)
+    # icon of the mcp provider
+    icon: Mapped[str] = mapped_column(db.String(255), nullable=True)
+    # tenant id
+    tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    # who created this tool
+    user_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    # encrypted credentials
+    encrypted_credentials: Mapped[str] = mapped_column(db.Text, nullable=True)
+    # authed
+    authed: Mapped[bool] = mapped_column(db.Boolean, nullable=False, default=False)
+    # tools
+    tools: Mapped[str] = mapped_column(db.Text, nullable=False, default="[]")
+    created_at: Mapped[datetime] = mapped_column(
+        db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)")
+    )
+    updated_at: Mapped[datetime] = mapped_column(
+        db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)")
+    )
+
+    def load_user(self) -> Account | None:
+        return db.session.query(Account).filter(Account.id == self.user_id).first()
+
+    @property
+    def tenant(self) -> Tenant | None:
+        return db.session.query(Tenant).filter(Tenant.id == self.tenant_id).first()
+
+    @property
+    def credentials(self) -> dict:
+        try:
+            return cast(dict, json.loads(self.encrypted_credentials)) or {}
+        except Exception:
+            return {}
+
+    @property
+    def mcp_tools(self) -> list[Tool]:
+        return [Tool(**tool) for tool in json.loads(self.tools)]
+
+    @property
+    def provider_icon(self) -> dict[str, str] | str:
+        try:
+            return cast(dict[str, str], json.loads(self.icon))
+        except json.JSONDecodeError:
+            return file_helpers.get_signed_file_url(self.icon)
+
+    @property
+    def decrypted_server_url(self) -> str:
+        return cast(str, encrypter.decrypt_token(self.tenant_id, self.server_url))
+
+    @property
+    def masked_server_url(self) -> str:
+        def mask_url(url: str, mask_char: str = "*") -> str:
+            """
+            mask the url to a simple string
+            """
+            parsed = urlparse(url)
+            base_url = f"{parsed.scheme}://{parsed.netloc}"
+
+            if parsed.path and parsed.path != "/":
+                return f"{base_url}/{mask_char * 6}"
+            else:
+                return base_url
+
+        return mask_url(self.decrypted_server_url)
+
+    @property
+    def decrypted_credentials(self) -> dict:
+        from core.tools.mcp_tool.provider import MCPToolProviderController
+        from core.tools.utils.configuration import ProviderConfigEncrypter
+
+        provider_controller = MCPToolProviderController._from_db(self)
+
+        tool_configuration = ProviderConfigEncrypter(
+            tenant_id=self.tenant_id,
+            config=list(provider_controller.get_credentials_schema()),
+            provider_type=provider_controller.provider_type.value,
+            provider_identity=provider_controller.provider_id,
+        )
+        return tool_configuration.decrypt(self.credentials, use_cache=False)
+
+
 class ToolModelInvoke(Base):
     """
     store the invoke logs from tool invoke
diff --git a/api/pyproject.toml b/api/pyproject.toml
index d33806d0ae..9f2e3ed331 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -82,6 +82,8 @@ dependencies = [
     "weave~=0.51.0",
     "yarl~=1.18.3",
     "webvtt-py~=0.5.1",
+    "sseclient-py>=1.8.0",
+    "httpx-sse>=0.4.0",
     "sendgrid~=6.12.3",
 ]
 # Before adding new dependency, consider place it in
diff --git a/api/services/tools/mcp_tools_mange_service.py b/api/services/tools/mcp_tools_mange_service.py
new file mode 100644
index 0000000000..3b1592230a
--- /dev/null
+++ b/api/services/tools/mcp_tools_mange_service.py
@@ -0,0 +1,232 @@
+import hashlib
+import json
+from datetime import datetime
+from typing import Any
+
+from sqlalchemy import or_
+from sqlalchemy.exc import IntegrityError
+
+from core.helper import encrypter
+from core.mcp.error import MCPAuthError, MCPError
+from core.mcp.mcp_client import MCPClient
+from core.tools.entities.api_entities import ToolProviderApiEntity
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolProviderType
+from core.tools.mcp_tool.provider import MCPToolProviderController
+from core.tools.utils.configuration import ProviderConfigEncrypter
+from extensions.ext_database import db
+from models.tools import MCPToolProvider
+from services.tools.tools_transform_service import ToolTransformService
+
+UNCHANGED_SERVER_URL_PLACEHOLDER = "[__HIDDEN__]"
+
+
+class MCPToolManageService:
+    """
+    Service class for managing mcp tools.
+    """
+
+    @staticmethod
+    def get_mcp_provider_by_provider_id(provider_id: str, tenant_id: str) -> MCPToolProvider:
+        res = (
+            db.session.query(MCPToolProvider)
+            .filter(MCPToolProvider.tenant_id == tenant_id, MCPToolProvider.id == provider_id)
+            .first()
+        )
+        if not res:
+            raise ValueError("MCP tool not found")
+        return res
+
+    @staticmethod
+    def get_mcp_provider_by_server_identifier(server_identifier: str, tenant_id: str) -> MCPToolProvider:
+        res = (
+            db.session.query(MCPToolProvider)
+            .filter(MCPToolProvider.tenant_id == tenant_id, MCPToolProvider.server_identifier == server_identifier)
+            .first()
+        )
+        if not res:
+            raise ValueError("MCP tool not found")
+        return res
+
+    @staticmethod
+    def create_mcp_provider(
+        tenant_id: str,
+        name: str,
+        server_url: str,
+        user_id: str,
+        icon: str,
+        icon_type: str,
+        icon_background: str,
+        server_identifier: str,
+    ) -> ToolProviderApiEntity:
+        server_url_hash = hashlib.sha256(server_url.encode()).hexdigest()
+        existing_provider = (
+            db.session.query(MCPToolProvider)
+            .filter(
+                MCPToolProvider.tenant_id == tenant_id,
+                or_(
+                    MCPToolProvider.name == name,
+                    MCPToolProvider.server_url_hash == server_url_hash,
+                    MCPToolProvider.server_identifier == server_identifier,
+                ),
+                MCPToolProvider.tenant_id == tenant_id,
+            )
+            .first()
+        )
+        if existing_provider:
+            if existing_provider.name == name:
+                raise ValueError(f"MCP tool {name} already exists")
+            elif existing_provider.server_url_hash == server_url_hash:
+                raise ValueError(f"MCP tool {server_url} already exists")
+            elif existing_provider.server_identifier == server_identifier:
+                raise ValueError(f"MCP tool {server_identifier} already exists")
+        encrypted_server_url = encrypter.encrypt_token(tenant_id, server_url)
+        mcp_tool = MCPToolProvider(
+            tenant_id=tenant_id,
+            name=name,
+            server_url=encrypted_server_url,
+            server_url_hash=server_url_hash,
+            user_id=user_id,
+            authed=False,
+            tools="[]",
+            icon=json.dumps({"content": icon, "background": icon_background}) if icon_type == "emoji" else icon,
+            server_identifier=server_identifier,
+        )
+        db.session.add(mcp_tool)
+        db.session.commit()
+        return ToolTransformService.mcp_provider_to_user_provider(mcp_tool, for_list=True)
+
+    @staticmethod
+    def retrieve_mcp_tools(tenant_id: str, for_list: bool = False) -> list[ToolProviderApiEntity]:
+        mcp_providers = (
+            db.session.query(MCPToolProvider)
+            .filter(MCPToolProvider.tenant_id == tenant_id)
+            .order_by(MCPToolProvider.name)
+            .all()
+        )
+        return [
+            ToolTransformService.mcp_provider_to_user_provider(mcp_provider, for_list=for_list)
+            for mcp_provider in mcp_providers
+        ]
+
+    @classmethod
+    def list_mcp_tool_from_remote_server(cls, tenant_id: str, provider_id: str):
+        mcp_provider = cls.get_mcp_provider_by_provider_id(provider_id, tenant_id)
+
+        try:
+            with MCPClient(
+                mcp_provider.decrypted_server_url, provider_id, tenant_id, authed=mcp_provider.authed, for_list=True
+            ) as mcp_client:
+                tools = mcp_client.list_tools()
+        except MCPAuthError as e:
+            raise ValueError("Please auth the tool first")
+        except MCPError as e:
+            raise ValueError(f"Failed to connect to MCP server: {e}")
+        mcp_provider.tools = json.dumps([tool.model_dump() for tool in tools])
+        mcp_provider.authed = True
+        mcp_provider.updated_at = datetime.now()
+        db.session.commit()
+        user = mcp_provider.load_user()
+        return ToolProviderApiEntity(
+            id=mcp_provider.id,
+            name=mcp_provider.name,
+            tools=ToolTransformService.mcp_tool_to_user_tool(mcp_provider, tools),
+            type=ToolProviderType.MCP,
+            icon=mcp_provider.icon,
+            author=user.name if user else "Anonymous",
+            server_url=mcp_provider.masked_server_url,
+            updated_at=int(mcp_provider.updated_at.timestamp()),
+            description=I18nObject(en_US="", zh_Hans=""),
+            label=I18nObject(en_US=mcp_provider.name, zh_Hans=mcp_provider.name),
+            plugin_unique_identifier=mcp_provider.server_identifier,
+        )
+
+    @classmethod
+    def delete_mcp_tool(cls, tenant_id: str, provider_id: str):
+        mcp_tool = cls.get_mcp_provider_by_provider_id(provider_id, tenant_id)
+
+        db.session.delete(mcp_tool)
+        db.session.commit()
+
+    @classmethod
+    def update_mcp_provider(
+        cls,
+        tenant_id: str,
+        provider_id: str,
+        name: str,
+        server_url: str,
+        icon: str,
+        icon_type: str,
+        icon_background: str,
+        server_identifier: str,
+    ):
+        mcp_provider = cls.get_mcp_provider_by_provider_id(provider_id, tenant_id)
+        mcp_provider.updated_at = datetime.now()
+        mcp_provider.name = name
+        mcp_provider.icon = (
+            json.dumps({"content": icon, "background": icon_background}) if icon_type == "emoji" else icon
+        )
+        mcp_provider.server_identifier = server_identifier
+
+        if UNCHANGED_SERVER_URL_PLACEHOLDER not in server_url:
+            encrypted_server_url = encrypter.encrypt_token(tenant_id, server_url)
+            mcp_provider.server_url = encrypted_server_url
+            server_url_hash = hashlib.sha256(server_url.encode()).hexdigest()
+
+            if server_url_hash != mcp_provider.server_url_hash:
+                cls._re_connect_mcp_provider(mcp_provider, provider_id, tenant_id)
+                mcp_provider.server_url_hash = server_url_hash
+        try:
+            db.session.commit()
+        except IntegrityError as e:
+            db.session.rollback()
+            error_msg = str(e.orig)
+            if "unique_mcp_provider_name" in error_msg:
+                raise ValueError(f"MCP tool {name} already exists")
+            elif "unique_mcp_provider_server_url" in error_msg:
+                raise ValueError(f"MCP tool {server_url} already exists")
+            elif "unique_mcp_provider_server_identifier" in error_msg:
+                raise ValueError(f"MCP tool {server_identifier} already exists")
+            else:
+                raise
+
+    @classmethod
+    def update_mcp_provider_credentials(
+        cls, mcp_provider: MCPToolProvider, credentials: dict[str, Any], authed: bool = False
+    ):
+        provider_controller = MCPToolProviderController._from_db(mcp_provider)
+        tool_configuration = ProviderConfigEncrypter(
+            tenant_id=mcp_provider.tenant_id,
+            config=list(provider_controller.get_credentials_schema()),
+            provider_type=provider_controller.provider_type.value,
+            provider_identity=provider_controller.provider_id,
+        )
+        credentials = tool_configuration.encrypt(credentials)
+        mcp_provider.updated_at = datetime.now()
+        mcp_provider.encrypted_credentials = json.dumps({**mcp_provider.credentials, **credentials})
+        mcp_provider.authed = authed
+        if not authed:
+            mcp_provider.tools = "[]"
+        db.session.commit()
+
+    @classmethod
+    def _re_connect_mcp_provider(cls, mcp_provider: MCPToolProvider, provider_id: str, tenant_id: str):
+        """re-connect mcp provider"""
+        try:
+            with MCPClient(
+                mcp_provider.decrypted_server_url,
+                provider_id,
+                tenant_id,
+                authed=False,
+                for_list=True,
+            ) as mcp_client:
+                tools = mcp_client.list_tools()
+                mcp_provider.authed = True
+                mcp_provider.tools = json.dumps([tool.model_dump() for tool in tools])
+        except MCPAuthError:
+            mcp_provider.authed = False
+            mcp_provider.tools = "[]"
+        except MCPError as e:
+            raise ValueError(f"Failed to re-connect MCP server: {e}") from e
+        # reset credentials
+        mcp_provider.encrypted_credentials = "{}"
diff --git a/api/services/tools/tools_transform_service.py b/api/services/tools/tools_transform_service.py
index 367121125b..8009c384b7 100644
--- a/api/services/tools/tools_transform_service.py
+++ b/api/services/tools/tools_transform_service.py
@@ -1,10 +1,11 @@
 import json
 import logging
-from typing import Optional, Union, cast
+from typing import Any, Optional, Union, cast
 
 from yarl import URL
 
 from configs import dify_config
+from core.mcp.types import Tool as MCPTool
 from core.tools.__base.tool import Tool
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.builtin_tool.provider import BuiltinToolProviderController
@@ -21,7 +22,7 @@ from core.tools.plugin_tool.provider import PluginToolProviderController
 from core.tools.utils.configuration import ProviderConfigEncrypter
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
 from core.tools.workflow_as_tool.tool import WorkflowTool
-from models.tools import ApiToolProvider, BuiltinToolProvider, WorkflowToolProvider
+from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider, WorkflowToolProvider
 
 logger = logging.getLogger(__name__)
 
@@ -52,7 +53,8 @@ class ToolTransformService:
                 return icon
             except Exception:
                 return {"background": "#252525", "content": "\ud83d\ude01"}
-
+        elif provider_type == ToolProviderType.MCP.value:
+            return icon
         return ""
 
     @staticmethod
@@ -187,6 +189,41 @@ class ToolTransformService:
             labels=labels or [],
         )
 
+    @staticmethod
+    def mcp_provider_to_user_provider(db_provider: MCPToolProvider, for_list: bool = False) -> ToolProviderApiEntity:
+        user = db_provider.load_user()
+        return ToolProviderApiEntity(
+            id=db_provider.server_identifier if not for_list else db_provider.id,
+            author=user.name if user else "Anonymous",
+            name=db_provider.name,
+            icon=db_provider.provider_icon,
+            type=ToolProviderType.MCP,
+            is_team_authorization=db_provider.authed,
+            server_url=db_provider.masked_server_url,
+            tools=ToolTransformService.mcp_tool_to_user_tool(
+                db_provider, [MCPTool(**tool) for tool in json.loads(db_provider.tools)]
+            ),
+            updated_at=int(db_provider.updated_at.timestamp()),
+            label=I18nObject(en_US=db_provider.name, zh_Hans=db_provider.name),
+            description=I18nObject(en_US="", zh_Hans=""),
+            server_identifier=db_provider.server_identifier,
+        )
+
+    @staticmethod
+    def mcp_tool_to_user_tool(mcp_provider: MCPToolProvider, tools: list[MCPTool]) -> list[ToolApiEntity]:
+        user = mcp_provider.load_user()
+        return [
+            ToolApiEntity(
+                author=user.name if user else "Anonymous",
+                name=tool.name,
+                label=I18nObject(en_US=tool.name, zh_Hans=tool.name),
+                description=I18nObject(en_US=tool.description, zh_Hans=tool.description),
+                parameters=ToolTransformService.convert_mcp_schema_to_parameter(tool.inputSchema),
+                labels=[],
+            )
+            for tool in tools
+        ]
+
     @classmethod
     def api_provider_to_user_provider(
         cls,
@@ -304,3 +341,53 @@ class ToolTransformService:
                 parameters=tool.parameters,
                 labels=labels or [],
             )
+
+    @staticmethod
+    def convert_mcp_schema_to_parameter(schema: dict) -> list["ToolParameter"]:
+        """
+        Convert MCP JSON schema to tool parameters
+
+        :param schema: JSON schema dictionary
+        :return: list of ToolParameter instances
+        """
+
+        def create_parameter(
+            name: str, description: str, param_type: str, required: bool, input_schema: dict | None = None
+        ) -> ToolParameter:
+            """Create a ToolParameter instance with given attributes"""
+            input_schema_dict: dict[str, Any] = {"input_schema": input_schema} if input_schema else {}
+            return ToolParameter(
+                name=name,
+                llm_description=description,
+                label=I18nObject(en_US=name),
+                form=ToolParameter.ToolParameterForm.LLM,
+                required=required,
+                type=ToolParameter.ToolParameterType(param_type),
+                human_description=I18nObject(en_US=description),
+                **input_schema_dict,
+            )
+
+        def process_properties(props: dict, required: list, prefix: str = "") -> list[ToolParameter]:
+            """Process properties recursively"""
+            TYPE_MAPPING = {"integer": "number", "float": "number"}
+            COMPLEX_TYPES = ["array", "object"]
+
+            parameters = []
+            for name, prop in props.items():
+                current_description = prop.get("description", "")
+                prop_type = prop.get("type", "string")
+
+                if isinstance(prop_type, list):
+                    prop_type = prop_type[0]
+                if prop_type in TYPE_MAPPING:
+                    prop_type = TYPE_MAPPING[prop_type]
+                input_schema = prop if prop_type in COMPLEX_TYPES else None
+                parameters.append(
+                    create_parameter(name, current_description, prop_type, name in required, input_schema)
+                )
+
+            return parameters
+
+        if schema.get("type") == "object" and "properties" in schema:
+            return process_properties(schema["properties"], schema.get("required", []))
+        return []
diff --git a/api/tasks/remove_app_and_related_data_task.py b/api/tasks/remove_app_and_related_data_task.py
index d366efd6f2..4a62cb74b4 100644
--- a/api/tasks/remove_app_and_related_data_task.py
+++ b/api/tasks/remove_app_and_related_data_task.py
@@ -13,6 +13,7 @@ from models import (
     AppAnnotationHitHistory,
     AppAnnotationSetting,
     AppDatasetJoin,
+    AppMCPServer,
     AppModelConfig,
     Conversation,
     EndUser,
@@ -41,6 +42,7 @@ def remove_app_and_related_data_task(self, tenant_id: str, app_id: str):
         # Delete related data
         _delete_app_model_configs(tenant_id, app_id)
         _delete_app_site(tenant_id, app_id)
+        _delete_app_mcp_servers(tenant_id, app_id)
         _delete_app_api_tokens(tenant_id, app_id)
         _delete_installed_apps(tenant_id, app_id)
         _delete_recommended_apps(tenant_id, app_id)
@@ -89,6 +91,18 @@ def _delete_app_site(tenant_id: str, app_id: str):
     _delete_records("""select id from sites where app_id=:app_id limit 1000""", {"app_id": app_id}, del_site, "site")
 
 
+def _delete_app_mcp_servers(tenant_id: str, app_id: str):
+    def del_mcp_server(mcp_server_id: str):
+        db.session.query(AppMCPServer).filter(AppMCPServer.id == mcp_server_id).delete(synchronize_session=False)
+
+    _delete_records(
+        """select id from app_mcp_servers where app_id=:app_id limit 1000""",
+        {"app_id": app_id},
+        del_mcp_server,
+        "app mcp server",
+    )
+
+
 def _delete_app_api_tokens(tenant_id: str, app_id: str):
     def del_api_token(api_token_id: str):
         db.session.query(ApiToken).filter(ApiToken.id == api_token_id).delete(synchronize_session=False)
diff --git a/api/tests/unit_tests/core/mcp/client/test_session.py b/api/tests/unit_tests/core/mcp/client/test_session.py
new file mode 100644
index 0000000000..c84169bf15
--- /dev/null
+++ b/api/tests/unit_tests/core/mcp/client/test_session.py
@@ -0,0 +1,471 @@
+import queue
+import threading
+from typing import Any
+
+from core.mcp import types
+from core.mcp.entities import RequestContext
+from core.mcp.session.base_session import RequestResponder
+from core.mcp.session.client_session import DEFAULT_CLIENT_INFO, ClientSession
+from core.mcp.types import (
+    LATEST_PROTOCOL_VERSION,
+    ClientNotification,
+    ClientRequest,
+    Implementation,
+    InitializedNotification,
+    InitializeRequest,
+    InitializeResult,
+    JSONRPCMessage,
+    JSONRPCNotification,
+    JSONRPCRequest,
+    JSONRPCResponse,
+    ServerCapabilities,
+    ServerResult,
+    SessionMessage,
+)
+
+
+def test_client_session_initialize():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    initialized_notification = None
+
+    def mock_server():
+        nonlocal initialized_notification
+
+        # Receive initialization request
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+
+        # Create response
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion=LATEST_PROTOCOL_VERSION,
+                capabilities=ServerCapabilities(
+                    logging=None,
+                    resources=None,
+                    tools=None,
+                    experimental=None,
+                    prompts=None,
+                ),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+                instructions="The server instructions.",
+            )
+        )
+
+        # Send response
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+
+        # Receive initialized notification
+        session_notification = client_to_server.get(timeout=5.0)
+        jsonrpc_notification = session_notification.message
+        assert isinstance(jsonrpc_notification.root, JSONRPCNotification)
+        initialized_notification = ClientNotification.model_validate(
+            jsonrpc_notification.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+
+    # Create message handler
+    def message_handler(
+        message: RequestResponder[types.ServerRequest, types.ClientResult] | types.ServerNotification | Exception,
+    ) -> None:
+        if isinstance(message, Exception):
+            raise message
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    # Create and use client session
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+        message_handler=message_handler,
+    ) as session:
+        result = session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+    # Assert results
+    assert isinstance(result, InitializeResult)
+    assert result.protocolVersion == LATEST_PROTOCOL_VERSION
+    assert isinstance(result.capabilities, ServerCapabilities)
+    assert result.serverInfo == Implementation(name="mock-server", version="0.1.0")
+    assert result.instructions == "The server instructions."
+
+    # Check that client sent initialized notification
+    assert initialized_notification
+    assert isinstance(initialized_notification.root, InitializedNotification)
+
+
+def test_client_session_custom_client_info():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    custom_client_info = Implementation(name="test-client", version="1.2.3")
+    received_client_info = None
+
+    def mock_server():
+        nonlocal received_client_info
+
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+        received_client_info = request.root.params.clientInfo
+
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion=LATEST_PROTOCOL_VERSION,
+                capabilities=ServerCapabilities(),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+            )
+        )
+
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+        # Receive initialized notification
+        client_to_server.get(timeout=5.0)
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+        client_info=custom_client_info,
+    ) as session:
+        session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+    # Assert that custom client info was sent
+    assert received_client_info == custom_client_info
+
+
+def test_client_session_default_client_info():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    received_client_info = None
+
+    def mock_server():
+        nonlocal received_client_info
+
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+        received_client_info = request.root.params.clientInfo
+
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion=LATEST_PROTOCOL_VERSION,
+                capabilities=ServerCapabilities(),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+            )
+        )
+
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+        # Receive initialized notification
+        client_to_server.get(timeout=5.0)
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+    ) as session:
+        session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+    # Assert that default client info was used
+    assert received_client_info == DEFAULT_CLIENT_INFO
+
+
+def test_client_session_version_negotiation_success():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    def mock_server():
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+
+        # Send supported protocol version
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion=LATEST_PROTOCOL_VERSION,
+                capabilities=ServerCapabilities(),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+            )
+        )
+
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+        # Receive initialized notification
+        client_to_server.get(timeout=5.0)
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+    ) as session:
+        result = session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+    # Should successfully initialize
+    assert isinstance(result, InitializeResult)
+    assert result.protocolVersion == LATEST_PROTOCOL_VERSION
+
+
+def test_client_session_version_negotiation_failure():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    def mock_server():
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+
+        # Send unsupported protocol version
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion="99.99.99",  # Unsupported version
+                capabilities=ServerCapabilities(),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+            )
+        )
+
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+    ) as session:
+        import pytest
+
+        with pytest.raises(RuntimeError, match="Unsupported protocol version"):
+            session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+
+def test_client_capabilities_default():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    received_capabilities = None
+
+    def mock_server():
+        nonlocal received_capabilities
+
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+        received_capabilities = request.root.params.capabilities
+
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion=LATEST_PROTOCOL_VERSION,
+                capabilities=ServerCapabilities(),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+            )
+        )
+
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+        # Receive initialized notification
+        client_to_server.get(timeout=5.0)
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+    ) as session:
+        session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+    # Assert default capabilities
+    assert received_capabilities is not None
+    assert received_capabilities.sampling is not None
+    assert received_capabilities.roots is not None
+    assert received_capabilities.roots.listChanged is True
+
+
+def test_client_capabilities_with_custom_callbacks():
+    # Create synchronous queues to replace async streams
+    client_to_server: queue.Queue[SessionMessage] = queue.Queue()
+    server_to_client: queue.Queue[SessionMessage] = queue.Queue()
+
+    def custom_sampling_callback(
+        context: RequestContext["ClientSession", Any],
+        params: types.CreateMessageRequestParams,
+    ) -> types.CreateMessageResult | types.ErrorData:
+        return types.CreateMessageResult(
+            model="test-model",
+            role="assistant",
+            content=types.TextContent(type="text", text="Custom response"),
+        )
+
+    def custom_list_roots_callback(
+        context: RequestContext["ClientSession", Any],
+    ) -> types.ListRootsResult | types.ErrorData:
+        return types.ListRootsResult(roots=[])
+
+    def mock_server():
+        session_message = client_to_server.get(timeout=5.0)
+        jsonrpc_request = session_message.message
+        assert isinstance(jsonrpc_request.root, JSONRPCRequest)
+        request = ClientRequest.model_validate(
+            jsonrpc_request.root.model_dump(by_alias=True, mode="json", exclude_none=True)
+        )
+        assert isinstance(request.root, InitializeRequest)
+
+        result = ServerResult(
+            InitializeResult(
+                protocolVersion=LATEST_PROTOCOL_VERSION,
+                capabilities=ServerCapabilities(),
+                serverInfo=Implementation(name="mock-server", version="0.1.0"),
+            )
+        )
+
+        server_to_client.put(
+            SessionMessage(
+                message=JSONRPCMessage(
+                    JSONRPCResponse(
+                        jsonrpc="2.0",
+                        id=jsonrpc_request.root.id,
+                        result=result.model_dump(by_alias=True, mode="json", exclude_none=True),
+                    )
+                )
+            )
+        )
+        # Receive initialized notification
+        client_to_server.get(timeout=5.0)
+
+    # Start mock server thread
+    server_thread = threading.Thread(target=mock_server, daemon=True)
+    server_thread.start()
+
+    with ClientSession(
+        server_to_client,
+        client_to_server,
+        sampling_callback=custom_sampling_callback,
+        list_roots_callback=custom_list_roots_callback,
+    ) as session:
+        result = session.initialize()
+
+    # Wait for server thread to complete
+    server_thread.join(timeout=10.0)
+
+    # Verify initialization succeeded
+    assert isinstance(result, InitializeResult)
+    assert result.protocolVersion == LATEST_PROTOCOL_VERSION
diff --git a/api/tests/unit_tests/core/mcp/client/test_sse.py b/api/tests/unit_tests/core/mcp/client/test_sse.py
new file mode 100644
index 0000000000..8122cd08eb
--- /dev/null
+++ b/api/tests/unit_tests/core/mcp/client/test_sse.py
@@ -0,0 +1,349 @@
+import json
+import queue
+import threading
+import time
+from typing import Any
+from unittest.mock import Mock, patch
+
+import httpx
+import pytest
+
+from core.mcp import types
+from core.mcp.client.sse_client import sse_client
+from core.mcp.error import MCPAuthError, MCPConnectionError
+
+SERVER_NAME = "test_server_for_SSE"
+
+
+def test_sse_message_id_coercion():
+    """Test that string message IDs that look like integers are parsed as integers.
+
+    See <https://github.com/modelcontextprotocol/python-sdk/pull/851> for more details.
+    """
+    json_message = '{"jsonrpc": "2.0", "id": "123", "method": "ping", "params": null}'
+    msg = types.JSONRPCMessage.model_validate_json(json_message)
+    expected = types.JSONRPCMessage(root=types.JSONRPCRequest(method="ping", jsonrpc="2.0", id=123))
+
+    # Check if both are JSONRPCRequest instances
+    assert isinstance(msg.root, types.JSONRPCRequest)
+    assert isinstance(expected.root, types.JSONRPCRequest)
+
+    assert msg.root.id == expected.root.id
+    assert msg.root.method == expected.root.method
+    assert msg.root.jsonrpc == expected.root.jsonrpc
+
+
+class MockSSEClient:
+    """Mock SSE client for testing."""
+
+    def __init__(self, url: str, headers: dict[str, Any] | None = None):
+        self.url = url
+        self.headers = headers or {}
+        self.connected = False
+        self.read_queue: queue.Queue = queue.Queue()
+        self.write_queue: queue.Queue = queue.Queue()
+
+    def connect(self):
+        """Simulate connection establishment."""
+        self.connected = True
+
+        # Send endpoint event
+        endpoint_data = "/messages/?session_id=test-session-123"
+        self.read_queue.put(("endpoint", endpoint_data))
+
+        return self.read_queue, self.write_queue
+
+    def send_initialize_response(self):
+        """Send a mock initialize response."""
+        response = {
+            "jsonrpc": "2.0",
+            "id": 1,
+            "result": {
+                "protocolVersion": types.LATEST_PROTOCOL_VERSION,
+                "capabilities": {
+                    "logging": None,
+                    "resources": None,
+                    "tools": None,
+                    "experimental": None,
+                    "prompts": None,
+                },
+                "serverInfo": {"name": SERVER_NAME, "version": "0.1.0"},
+                "instructions": "Test server instructions.",
+            },
+        }
+        self.read_queue.put(("message", json.dumps(response)))
+
+
+def test_sse_client_message_id_handling():
+    """Test SSE client properly handles message ID coercion."""
+    mock_client = MockSSEClient("http://test.example/sse")
+    read_queue, write_queue = mock_client.connect()
+
+    # Send a message with string ID that should be coerced to int
+    message_data = {
+        "jsonrpc": "2.0",
+        "id": "456",  # String ID
+        "result": {"test": "data"},
+    }
+    read_queue.put(("message", json.dumps(message_data)))
+    read_queue.get(timeout=1.0)
+    # Get the message from queue
+    event_type, data = read_queue.get(timeout=1.0)
+    assert event_type == "message"
+
+    # Parse the message
+    parsed_message = types.JSONRPCMessage.model_validate_json(data)
+    # Check that it's a JSONRPCResponse and verify the ID
+    assert isinstance(parsed_message.root, types.JSONRPCResponse)
+    assert parsed_message.root.id == 456  # Should be converted to int
+
+
+def test_sse_client_connection_validation():
+    """Test SSE client validates endpoint URLs properly."""
+    test_url = "http://test.example/sse"
+
+    with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+            # Mock the HTTP client
+            mock_client = Mock()
+            mock_client_factory.return_value.__enter__.return_value = mock_client
+
+            # Mock the SSE connection
+            mock_event_source = Mock()
+            mock_event_source.response.raise_for_status.return_value = None
+            mock_sse_connect.return_value.__enter__.return_value = mock_event_source
+
+            # Mock SSE events
+            class MockSSEEvent:
+                def __init__(self, event_type: str, data: str):
+                    self.event = event_type
+                    self.data = data
+
+            # Simulate endpoint event
+            endpoint_event = MockSSEEvent("endpoint", "/messages/?session_id=test-123")
+            mock_event_source.iter_sse.return_value = [endpoint_event]
+
+            # Test connection
+            try:
+                with sse_client(test_url) as (read_queue, write_queue):
+                    assert read_queue is not None
+                    assert write_queue is not None
+            except Exception as e:
+                # Connection might fail due to mocking, but we're testing the validation logic
+                pass
+
+
+def test_sse_client_error_handling():
+    """Test SSE client properly handles various error conditions."""
+    test_url = "http://test.example/sse"
+
+    # Test 401 error handling
+    with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+            # Mock 401 HTTP error
+            mock_error = httpx.HTTPStatusError("Unauthorized", request=Mock(), response=Mock(status_code=401))
+            mock_sse_connect.side_effect = mock_error
+
+            with pytest.raises(MCPAuthError):
+                with sse_client(test_url):
+                    pass
+
+    # Test other HTTP errors
+    with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+            # Mock other HTTP error
+            mock_error = httpx.HTTPStatusError("Server Error", request=Mock(), response=Mock(status_code=500))
+            mock_sse_connect.side_effect = mock_error
+
+            with pytest.raises(MCPConnectionError):
+                with sse_client(test_url):
+                    pass
+
+
+def test_sse_client_timeout_configuration():
+    """Test SSE client timeout configuration."""
+    test_url = "http://test.example/sse"
+    custom_timeout = 10.0
+    custom_sse_timeout = 300.0
+    custom_headers = {"Authorization": "Bearer test-token"}
+
+    with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+            # Mock successful connection
+            mock_client = Mock()
+            mock_client_factory.return_value.__enter__.return_value = mock_client
+
+            mock_event_source = Mock()
+            mock_event_source.response.raise_for_status.return_value = None
+            mock_event_source.iter_sse.return_value = []
+            mock_sse_connect.return_value.__enter__.return_value = mock_event_source
+
+            try:
+                with sse_client(
+                    test_url, headers=custom_headers, timeout=custom_timeout, sse_read_timeout=custom_sse_timeout
+                ) as (read_queue, write_queue):
+                    # Verify the configuration was passed correctly
+                    mock_client_factory.assert_called_with(headers=custom_headers)
+
+                    # Check that timeout was configured
+                    call_args = mock_sse_connect.call_args
+                    assert call_args is not None
+                    timeout_arg = call_args[1]["timeout"]
+                    assert timeout_arg.read == custom_sse_timeout
+            except Exception:
+                # Connection might fail due to mocking, but we tested the configuration
+                pass
+
+
+def test_sse_transport_endpoint_validation():
+    """Test SSE transport validates endpoint URLs correctly."""
+    from core.mcp.client.sse_client import SSETransport
+
+    transport = SSETransport("http://example.com/sse")
+
+    # Valid endpoint (same origin)
+    valid_endpoint = "http://example.com/messages/session123"
+    assert transport._validate_endpoint_url(valid_endpoint) == True
+
+    # Invalid endpoint (different origin)
+    invalid_endpoint = "http://malicious.com/messages/session123"
+    assert transport._validate_endpoint_url(invalid_endpoint) == False
+
+    # Invalid endpoint (different scheme)
+    invalid_scheme = "https://example.com/messages/session123"
+    assert transport._validate_endpoint_url(invalid_scheme) == False
+
+
+def test_sse_transport_message_parsing():
+    """Test SSE transport properly parses different message types."""
+    from core.mcp.client.sse_client import SSETransport
+
+    transport = SSETransport("http://example.com/sse")
+    read_queue: queue.Queue = queue.Queue()
+
+    # Test valid JSON-RPC message
+    valid_message = '{"jsonrpc": "2.0", "id": 1, "method": "ping"}'
+    transport._handle_message_event(valid_message, read_queue)
+
+    # Should have a SessionMessage in the queue
+    message = read_queue.get(timeout=1.0)
+    assert message is not None
+    assert hasattr(message, "message")
+
+    # Test invalid JSON
+    invalid_json = '{"invalid": json}'
+    transport._handle_message_event(invalid_json, read_queue)
+
+    # Should have an exception in the queue
+    error = read_queue.get(timeout=1.0)
+    assert isinstance(error, Exception)
+
+
+def test_sse_client_queue_cleanup():
+    """Test that SSE client properly cleans up queues on exit."""
+    test_url = "http://test.example/sse"
+
+    read_queue = None
+    write_queue = None
+
+    with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+            # Mock connection that raises an exception
+            mock_sse_connect.side_effect = Exception("Connection failed")
+
+            try:
+                with sse_client(test_url) as (rq, wq):
+                    read_queue = rq
+                    write_queue = wq
+            except Exception:
+                pass  # Expected to fail
+
+            # Queues should be cleaned up even on exception
+            # Note: In real implementation, cleanup should put None to signal shutdown
+
+
+def test_sse_client_url_processing():
+    """Test SSE client URL processing functions."""
+    from core.mcp.client.sse_client import remove_request_params
+
+    # Test URL with parameters
+    url_with_params = "http://example.com/sse?param1=value1&param2=value2"
+    cleaned_url = remove_request_params(url_with_params)
+    assert cleaned_url == "http://example.com/sse"
+
+    # Test URL without parameters
+    url_without_params = "http://example.com/sse"
+    cleaned_url = remove_request_params(url_without_params)
+    assert cleaned_url == "http://example.com/sse"
+
+    # Test URL with path and parameters
+    complex_url = "http://example.com/path/to/sse?session=123&token=abc"
+    cleaned_url = remove_request_params(complex_url)
+    assert cleaned_url == "http://example.com/path/to/sse"
+
+
+def test_sse_client_headers_propagation():
+    """Test that custom headers are properly propagated in SSE client."""
+    test_url = "http://test.example/sse"
+    custom_headers = {
+        "Authorization": "Bearer test-token",
+        "X-Custom-Header": "test-value",
+        "User-Agent": "test-client/1.0",
+    }
+
+    with patch("core.mcp.client.sse_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        with patch("core.mcp.client.sse_client.ssrf_proxy_sse_connect") as mock_sse_connect:
+            # Mock the client factory to capture headers
+            mock_client = Mock()
+            mock_client_factory.return_value.__enter__.return_value = mock_client
+
+            # Mock the SSE connection
+            mock_event_source = Mock()
+            mock_event_source.response.raise_for_status.return_value = None
+            mock_event_source.iter_sse.return_value = []
+            mock_sse_connect.return_value.__enter__.return_value = mock_event_source
+
+            try:
+                with sse_client(test_url, headers=custom_headers):
+                    pass
+            except Exception:
+                pass  # Expected due to mocking
+
+            # Verify headers were passed to client factory
+            mock_client_factory.assert_called_with(headers=custom_headers)
+
+
+def test_sse_client_concurrent_access():
+    """Test SSE client behavior with concurrent queue access."""
+    test_read_queue: queue.Queue = queue.Queue()
+
+    # Simulate concurrent producers and consumers
+    def producer():
+        for i in range(10):
+            test_read_queue.put(f"message_{i}")
+            time.sleep(0.01)  # Small delay to simulate real conditions
+
+    def consumer():
+        received = []
+        for _ in range(10):
+            try:
+                msg = test_read_queue.get(timeout=2.0)
+                received.append(msg)
+            except queue.Empty:
+                break
+        return received
+
+    # Start producer in separate thread
+    producer_thread = threading.Thread(target=producer, daemon=True)
+    producer_thread.start()
+
+    # Consume messages
+    received_messages = consumer()
+
+    # Wait for producer to finish
+    producer_thread.join(timeout=5.0)
+
+    # Verify all messages were received
+    assert len(received_messages) == 10
+    for i in range(10):
+        assert f"message_{i}" in received_messages
diff --git a/api/tests/unit_tests/core/mcp/client/test_streamable_http.py b/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
new file mode 100644
index 0000000000..9a30a35a49
--- /dev/null
+++ b/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
@@ -0,0 +1,450 @@
+"""
+Tests for the StreamableHTTP client transport.
+
+Contains tests for only the client side of the StreamableHTTP transport.
+"""
+
+import queue
+import threading
+import time
+from typing import Any
+from unittest.mock import Mock, patch
+
+from core.mcp import types
+from core.mcp.client.streamable_client import streamablehttp_client
+
+# Test constants
+SERVER_NAME = "test_streamable_http_server"
+TEST_SESSION_ID = "test-session-id-12345"
+INIT_REQUEST = {
+    "jsonrpc": "2.0",
+    "method": "initialize",
+    "params": {
+        "clientInfo": {"name": "test-client", "version": "1.0"},
+        "protocolVersion": "2025-03-26",
+        "capabilities": {},
+    },
+    "id": "init-1",
+}
+
+
+class MockStreamableHTTPClient:
+    """Mock StreamableHTTP client for testing."""
+
+    def __init__(self, url: str, headers: dict[str, Any] | None = None):
+        self.url = url
+        self.headers = headers or {}
+        self.connected = False
+        self.read_queue: queue.Queue = queue.Queue()
+        self.write_queue: queue.Queue = queue.Queue()
+        self.session_id = TEST_SESSION_ID
+
+    def connect(self):
+        """Simulate connection establishment."""
+        self.connected = True
+        return self.read_queue, self.write_queue, lambda: self.session_id
+
+    def send_initialize_response(self):
+        """Send a mock initialize response."""
+        session_message = types.SessionMessage(
+            message=types.JSONRPCMessage(
+                root=types.JSONRPCResponse(
+                    jsonrpc="2.0",
+                    id="init-1",
+                    result={
+                        "protocolVersion": types.LATEST_PROTOCOL_VERSION,
+                        "capabilities": {
+                            "logging": None,
+                            "resources": None,
+                            "tools": None,
+                            "experimental": None,
+                            "prompts": None,
+                        },
+                        "serverInfo": {"name": SERVER_NAME, "version": "0.1.0"},
+                        "instructions": "Test server instructions.",
+                    },
+                )
+            )
+        )
+        self.read_queue.put(session_message)
+
+    def send_tools_response(self):
+        """Send a mock tools list response."""
+        session_message = types.SessionMessage(
+            message=types.JSONRPCMessage(
+                root=types.JSONRPCResponse(
+                    jsonrpc="2.0",
+                    id="tools-1",
+                    result={
+                        "tools": [
+                            {
+                                "name": "test_tool",
+                                "description": "A test tool",
+                                "inputSchema": {"type": "object", "properties": {}},
+                            }
+                        ],
+                    },
+                )
+            )
+        )
+        self.read_queue.put(session_message)
+
+
+def test_streamablehttp_client_message_id_handling():
+    """Test StreamableHTTP client properly handles message ID coercion."""
+    mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+    read_queue, write_queue, get_session_id = mock_client.connect()
+
+    # Send a message with string ID that should be coerced to int
+    response_message = types.SessionMessage(
+        message=types.JSONRPCMessage(root=types.JSONRPCResponse(jsonrpc="2.0", id="789", result={"test": "data"}))
+    )
+    read_queue.put(response_message)
+
+    # Get the message from queue
+    message = read_queue.get(timeout=1.0)
+    assert message is not None
+    assert isinstance(message, types.SessionMessage)
+
+    # Check that the ID was properly handled
+    assert isinstance(message.message.root, types.JSONRPCResponse)
+    assert message.message.root.id == 789  # ID should be coerced to int due to union_mode="left_to_right"
+
+
+def test_streamablehttp_client_connection_validation():
+    """Test StreamableHTTP client validates connections properly."""
+    test_url = "http://test.example/mcp"
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        # Mock the HTTP client
+        mock_client = Mock()
+        mock_client_factory.return_value.__enter__.return_value = mock_client
+
+        # Mock successful response
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "application/json"}
+        mock_response.raise_for_status.return_value = None
+        mock_client.post.return_value = mock_response
+
+        # Test connection
+        try:
+            with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+                assert read_queue is not None
+                assert write_queue is not None
+                assert get_session_id is not None
+        except Exception:
+            # Connection might fail due to mocking, but we're testing the validation logic
+            pass
+
+
+def test_streamablehttp_client_timeout_configuration():
+    """Test StreamableHTTP client timeout configuration."""
+    test_url = "http://test.example/mcp"
+    custom_headers = {"Authorization": "Bearer test-token"}
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        # Mock successful connection
+        mock_client = Mock()
+        mock_client_factory.return_value.__enter__.return_value = mock_client
+
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "application/json"}
+        mock_response.raise_for_status.return_value = None
+        mock_client.post.return_value = mock_response
+
+        try:
+            with streamablehttp_client(test_url, headers=custom_headers) as (read_queue, write_queue, get_session_id):
+                # Verify the configuration was passed correctly
+                mock_client_factory.assert_called_with(headers=custom_headers)
+        except Exception:
+            # Connection might fail due to mocking, but we tested the configuration
+            pass
+
+
+def test_streamablehttp_client_session_id_handling():
+    """Test StreamableHTTP client properly handles session IDs."""
+    mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+    read_queue, write_queue, get_session_id = mock_client.connect()
+
+    # Test that session ID is available
+    session_id = get_session_id()
+    assert session_id == TEST_SESSION_ID
+
+    # Test that we can use the session ID in subsequent requests
+    assert session_id is not None
+    assert len(session_id) > 0
+
+
+def test_streamablehttp_client_message_parsing():
+    """Test StreamableHTTP client properly parses different message types."""
+    mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+    read_queue, write_queue, get_session_id = mock_client.connect()
+
+    # Test valid initialization response
+    mock_client.send_initialize_response()
+
+    # Should have a SessionMessage in the queue
+    message = read_queue.get(timeout=1.0)
+    assert message is not None
+    assert isinstance(message, types.SessionMessage)
+    assert isinstance(message.message.root, types.JSONRPCResponse)
+
+    # Test tools response
+    mock_client.send_tools_response()
+
+    tools_message = read_queue.get(timeout=1.0)
+    assert tools_message is not None
+    assert isinstance(tools_message, types.SessionMessage)
+
+
+def test_streamablehttp_client_queue_cleanup():
+    """Test that StreamableHTTP client properly cleans up queues on exit."""
+    test_url = "http://test.example/mcp"
+
+    read_queue = None
+    write_queue = None
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        # Mock connection that raises an exception
+        mock_client_factory.side_effect = Exception("Connection failed")
+
+        try:
+            with streamablehttp_client(test_url) as (rq, wq, get_session_id):
+                read_queue = rq
+                write_queue = wq
+        except Exception:
+            pass  # Expected to fail
+
+        # Queues should be cleaned up even on exception
+        # Note: In real implementation, cleanup should put None to signal shutdown
+
+
+def test_streamablehttp_client_headers_propagation():
+    """Test that custom headers are properly propagated in StreamableHTTP client."""
+    test_url = "http://test.example/mcp"
+    custom_headers = {
+        "Authorization": "Bearer test-token",
+        "X-Custom-Header": "test-value",
+        "User-Agent": "test-client/1.0",
+    }
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        # Mock the client factory to capture headers
+        mock_client = Mock()
+        mock_client_factory.return_value.__enter__.return_value = mock_client
+
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "application/json"}
+        mock_response.raise_for_status.return_value = None
+        mock_client.post.return_value = mock_response
+
+        try:
+            with streamablehttp_client(test_url, headers=custom_headers):
+                pass
+        except Exception:
+            pass  # Expected due to mocking
+
+        # Verify headers were passed to client factory
+        # Check that the call was made with headers that include our custom headers
+        mock_client_factory.assert_called_once()
+        call_args = mock_client_factory.call_args
+        assert "headers" in call_args.kwargs
+        passed_headers = call_args.kwargs["headers"]
+
+        # Verify all custom headers are present
+        for key, value in custom_headers.items():
+            assert key in passed_headers
+            assert passed_headers[key] == value
+
+
+def test_streamablehttp_client_concurrent_access():
+    """Test StreamableHTTP client behavior with concurrent queue access."""
+    test_read_queue: queue.Queue = queue.Queue()
+    test_write_queue: queue.Queue = queue.Queue()
+
+    # Simulate concurrent producers and consumers
+    def producer():
+        for i in range(10):
+            test_read_queue.put(f"message_{i}")
+            time.sleep(0.01)  # Small delay to simulate real conditions
+
+    def consumer():
+        received = []
+        for _ in range(10):
+            try:
+                msg = test_read_queue.get(timeout=2.0)
+                received.append(msg)
+            except queue.Empty:
+                break
+        return received
+
+    # Start producer in separate thread
+    producer_thread = threading.Thread(target=producer, daemon=True)
+    producer_thread.start()
+
+    # Consume messages
+    received_messages = consumer()
+
+    # Wait for producer to finish
+    producer_thread.join(timeout=5.0)
+
+    # Verify all messages were received
+    assert len(received_messages) == 10
+    for i in range(10):
+        assert f"message_{i}" in received_messages
+
+
+def test_streamablehttp_client_json_vs_sse_mode():
+    """Test StreamableHTTP client handling of JSON vs SSE response modes."""
+    test_url = "http://test.example/mcp"
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        mock_client = Mock()
+        mock_client_factory.return_value.__enter__.return_value = mock_client
+
+        # Mock JSON response
+        mock_json_response = Mock()
+        mock_json_response.status_code = 200
+        mock_json_response.headers = {"content-type": "application/json"}
+        mock_json_response.json.return_value = {"result": "json_mode"}
+        mock_json_response.raise_for_status.return_value = None
+
+        # Mock SSE response
+        mock_sse_response = Mock()
+        mock_sse_response.status_code = 200
+        mock_sse_response.headers = {"content-type": "text/event-stream"}
+        mock_sse_response.raise_for_status.return_value = None
+
+        # Test JSON mode
+        mock_client.post.return_value = mock_json_response
+
+        try:
+            with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+                # Should handle JSON responses
+                assert read_queue is not None
+                assert write_queue is not None
+        except Exception:
+            pass  # Expected due to mocking
+
+        # Test SSE mode
+        mock_client.post.return_value = mock_sse_response
+
+        try:
+            with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+                # Should handle SSE responses
+                assert read_queue is not None
+                assert write_queue is not None
+        except Exception:
+            pass  # Expected due to mocking
+
+
+def test_streamablehttp_client_terminate_on_close():
+    """Test StreamableHTTP client terminate_on_close parameter."""
+    test_url = "http://test.example/mcp"
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        mock_client = Mock()
+        mock_client_factory.return_value.__enter__.return_value = mock_client
+
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "application/json"}
+        mock_response.raise_for_status.return_value = None
+        mock_client.post.return_value = mock_response
+        mock_client.delete.return_value = mock_response
+
+        # Test with terminate_on_close=True (default)
+        try:
+            with streamablehttp_client(test_url, terminate_on_close=True) as (read_queue, write_queue, get_session_id):
+                pass
+        except Exception:
+            pass  # Expected due to mocking
+
+        # Test with terminate_on_close=False
+        try:
+            with streamablehttp_client(test_url, terminate_on_close=False) as (read_queue, write_queue, get_session_id):
+                pass
+        except Exception:
+            pass  # Expected due to mocking
+
+
+def test_streamablehttp_client_protocol_version_handling():
+    """Test StreamableHTTP client protocol version handling."""
+    mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+    read_queue, write_queue, get_session_id = mock_client.connect()
+
+    # Send initialize response with specific protocol version
+
+    session_message = types.SessionMessage(
+        message=types.JSONRPCMessage(
+            root=types.JSONRPCResponse(
+                jsonrpc="2.0",
+                id="init-1",
+                result={
+                    "protocolVersion": "2024-11-05",
+                    "capabilities": {},
+                    "serverInfo": {"name": SERVER_NAME, "version": "0.1.0"},
+                },
+            )
+        )
+    )
+    read_queue.put(session_message)
+
+    # Get the message and verify protocol version
+    message = read_queue.get(timeout=1.0)
+    assert message is not None
+    assert isinstance(message.message.root, types.JSONRPCResponse)
+    result = message.message.root.result
+    assert result["protocolVersion"] == "2024-11-05"
+
+
+def test_streamablehttp_client_error_response_handling():
+    """Test StreamableHTTP client handling of error responses."""
+    mock_client = MockStreamableHTTPClient("http://test.example/mcp")
+    read_queue, write_queue, get_session_id = mock_client.connect()
+
+    # Send an error response
+    session_message = types.SessionMessage(
+        message=types.JSONRPCMessage(
+            root=types.JSONRPCError(
+                jsonrpc="2.0",
+                id="test-1",
+                error=types.ErrorData(code=-32601, message="Method not found", data=None),
+            )
+        )
+    )
+    read_queue.put(session_message)
+
+    # Get the error message
+    message = read_queue.get(timeout=1.0)
+    assert message is not None
+    assert isinstance(message.message.root, types.JSONRPCError)
+    assert message.message.root.error.code == -32601
+    assert message.message.root.error.message == "Method not found"
+
+
+def test_streamablehttp_client_resumption_token_handling():
+    """Test StreamableHTTP client resumption token functionality."""
+    test_url = "http://test.example/mcp"
+    test_resumption_token = "resume-token-123"
+
+    with patch("core.mcp.client.streamable_client.create_ssrf_proxy_mcp_http_client") as mock_client_factory:
+        mock_client = Mock()
+        mock_client_factory.return_value.__enter__.return_value = mock_client
+
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "application/json", "last-event-id": test_resumption_token}
+        mock_response.raise_for_status.return_value = None
+        mock_client.post.return_value = mock_response
+
+        try:
+            with streamablehttp_client(test_url) as (read_queue, write_queue, get_session_id):
+                # Test that resumption token can be captured from headers
+                assert read_queue is not None
+                assert write_queue is not None
+        except Exception:
+            pass  # Expected due to mocking
diff --git a/api/uv.lock b/api/uv.lock
index d379f28e52..45831e24a1 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -99,28 +99,29 @@ wheels = [
 
 [[package]]
 name = "aiosignal"
-version = "1.3.2"
+version = "1.4.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "frozenlist" },
+    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ba/b5/6d55e80f6d8a08ce22b982eafa278d823b541c925f11ee774b0b9c43473d/aiosignal-1.3.2.tar.gz", hash = "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54", size = 19424, upload-time = "2024-12-13T17:10:40.86Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/61/62/06741b579156360248d1ec624842ad0edf697050bbaf7c3e46394e106ad1/aiosignal-1.4.0.tar.gz", hash = "sha256:f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7", size = 25007, upload-time = "2025-07-03T22:54:43.528Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ec/6a/bc7e17a3e87a2985d3e8f4da4cd0f481060eb78fb08596c42be62c90a4d9/aiosignal-1.3.2-py2.py3-none-any.whl", hash = "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5", size = 7597, upload-time = "2024-12-13T17:10:38.469Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/76/641ae371508676492379f16e2fa48f4e2c11741bd63c48be4b12a6b09cba/aiosignal-1.4.0-py3-none-any.whl", hash = "sha256:053243f8b92b990551949e63930a839ff0cf0b0ebbe0597b0f3fb19e1a0fe82e", size = 7490, upload-time = "2025-07-03T22:54:42.156Z" },
 ]
 
 [[package]]
 name = "alembic"
-version = "1.16.2"
+version = "1.16.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "mako" },
     { name = "sqlalchemy" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9c/35/116797ff14635e496bbda0c168987f5326a6555b09312e9b817e360d1f56/alembic-1.16.2.tar.gz", hash = "sha256:e53c38ff88dadb92eb22f8b150708367db731d58ad7e9d417c9168ab516cbed8", size = 1963563, upload-time = "2025-06-16T18:05:08.566Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b9/40/28683414cc8711035a65256ca689e159471aa9ef08e8741ad1605bc01066/alembic-1.16.3.tar.gz", hash = "sha256:18ad13c1f40a5796deee4b2346d1a9c382f44b8af98053897484fa6cf88025e4", size = 1967462, upload-time = "2025-07-08T18:57:50.991Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/dd/e2/88e425adac5ad887a087c38d04fe2030010572a3e0e627f8a6e8c33eeda8/alembic-1.16.2-py3-none-any.whl", hash = "sha256:5f42e9bd0afdbd1d5e3ad856c01754530367debdebf21ed6894e34af52b3bb03", size = 242717, upload-time = "2025-06-16T18:05:10.27Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/68/1dea77887af7304528ea944c355d769a7ccc4599d3a23bd39182486deb42/alembic-1.16.3-py3-none-any.whl", hash = "sha256:70a7c7829b792de52d08ca0e3aefaf060687cb8ed6bebfa557e597a1a5e5a481", size = 246933, upload-time = "2025-07-08T18:57:52.793Z" },
 ]
 
 [[package]]
@@ -243,7 +244,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/22/8a/ef8ddf5ee0350984c
 
 [[package]]
 name = "alibabacloud-tea-openapi"
-version = "0.3.15"
+version = "0.3.16"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "alibabacloud-credentials" },
@@ -252,7 +253,7 @@ dependencies = [
     { name = "alibabacloud-tea-util" },
     { name = "alibabacloud-tea-xml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/be/cb/f1b10b1da37e4c0de2aa9ca1e7153a6960a7f2dc496664e85fdc8b621f84/alibabacloud_tea_openapi-0.3.15.tar.gz", hash = "sha256:56a0aa6d51d8cf18c0cf3d219d861f4697f59d3e17fa6726b1101826d93988a2", size = 13021, upload-time = "2025-05-06T12:56:29.402Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/09/be/f594e79625e5ccfcfe7f12d7d70709a3c59e920878469c998886211c850d/alibabacloud_tea_openapi-0.3.16.tar.gz", hash = "sha256:6bffed8278597592e67860156f424bde4173a6599d7b6039fb640a3612bae292", size = 13087, upload-time = "2025-07-04T09:30:10.689Z" }
 
 [[package]]
 name = "alibabacloud-tea-util"
@@ -370,11 +371,11 @@ wheels = [
 
 [[package]]
 name = "asgiref"
-version = "3.8.1"
+version = "3.9.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/29/38/b3395cc9ad1b56d2ddac9970bc8f4141312dbaec28bc7c218b0dfafd0f42/asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590", size = 35186, upload-time = "2024-03-22T14:39:36.863Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/90/61/0aa957eec22ff70b830b22ff91f825e70e1ef732c06666a805730f28b36b/asgiref-3.9.1.tar.gz", hash = "sha256:a5ab6582236218e5ef1648f242fd9f10626cfd4de8dc377db215d5d5098e3142", size = 36870, upload-time = "2025-07-08T09:07:43.344Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/39/e3/893e8757be2612e6c266d9bb58ad2e3651524b5b40cf56761e985a28b13e/asgiref-3.8.1-py3-none-any.whl", hash = "sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47", size = 23828, upload-time = "2024-03-22T14:39:34.521Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/3c/0464dcada90d5da0e71018c04a140ad6349558afb30b3051b4264cc5b965/asgiref-3.9.1-py3-none-any.whl", hash = "sha256:f3bba7092a48005b5f5bacd747d36ee4a5a61f4a269a6df590b43144355ebd2c", size = 23790, upload-time = "2025-07-08T09:07:41.548Z" },
 ]
 
 [[package]]
@@ -559,16 +560,16 @@ wheels = [
 
 [[package]]
 name = "boto3-stubs"
-version = "1.39.2"
+version = "1.39.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore-stubs" },
     { name = "types-s3transfer" },
     { name = "typing-extensions", marker = "python_full_version < '3.12'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/06/09/206a17938bfc7ec6e7c0b13ed58ad78146e46c29436d324ed55ceb5136ed/boto3_stubs-1.39.2.tar.gz", hash = "sha256:b1f1baef1658bd575a29ca85cc0877dbb3adeb376ffa8cbf242b876719ae0f95", size = 99939, upload-time = "2025-07-02T19:28:20.423Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f0/ea/85b9940d6eedc04d0c6febf24d27311b6ee54f85ccc37192eb4db0dff5d6/boto3_stubs-1.39.3.tar.gz", hash = "sha256:9aad443b1d690951fd9ccb6fa20ad387bd0b1054c704566ff65dd0043a63fc26", size = 99947, upload-time = "2025-07-03T19:28:15.602Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/39/be/9c65f2bfc6df27ec5f16d28c454e2e3cb9a7af3ef8588440658334325a85/boto3_stubs-1.39.2-py3-none-any.whl", hash = "sha256:ce98d96fe1a7177b05067be3cd933277c88f745de836752f9ef8b4286dbfa53b", size = 69196, upload-time = "2025-07-02T19:28:07.025Z" },
+    { url = "https://files.pythonhosted.org/packages/be/b8/0c56297e5f290de17e838c7e4ff338f5b94351c6566aed70ee197a671dc5/boto3_stubs-1.39.3-py3-none-any.whl", hash = "sha256:4daddb19374efa6d1bef7aded9cede0075f380722a9e60ab129ebba14ae66b69", size = 69196, upload-time = "2025-07-03T19:28:09.4Z" },
 ]
 
 [package.optional-dependencies]
@@ -1245,6 +1246,7 @@ dependencies = [
     { name = "googleapis-common-protos" },
     { name = "gunicorn" },
     { name = "httpx", extra = ["socks"] },
+    { name = "httpx-sse" },
     { name = "jieba" },
     { name = "json-repair" },
     { name = "langfuse" },
@@ -1289,6 +1291,7 @@ dependencies = [
     { name = "sendgrid" },
     { name = "sentry-sdk", extra = ["flask"] },
     { name = "sqlalchemy" },
+    { name = "sseclient-py" },
     { name = "starlette" },
     { name = "tiktoken" },
     { name = "transformers" },
@@ -1425,6 +1428,7 @@ requires-dist = [
     { name = "googleapis-common-protos", specifier = "==1.63.0" },
     { name = "gunicorn", specifier = "~=23.0.0" },
     { name = "httpx", extras = ["socks"], specifier = "~=0.27.0" },
+    { name = "httpx-sse", specifier = ">=0.4.0" },
     { name = "jieba", specifier = "==0.42.1" },
     { name = "json-repair", specifier = ">=0.41.1" },
     { name = "langfuse", specifier = "~=2.51.3" },
@@ -1469,6 +1473,7 @@ requires-dist = [
     { name = "sendgrid", specifier = "~=6.12.3" },
     { name = "sentry-sdk", extras = ["flask"], specifier = "~=2.28.0" },
     { name = "sqlalchemy", specifier = "~=2.0.29" },
+    { name = "sseclient-py", specifier = ">=1.8.0" },
     { name = "starlette", specifier = "==0.41.0" },
     { name = "tiktoken", specifier = "~=0.9.0" },
     { name = "transformers", specifier = "~=4.51.0" },
@@ -1708,16 +1713,16 @@ wheels = [
 
 [[package]]
 name = "fastapi"
-version = "0.115.14"
+version = "0.116.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "starlette" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ca/53/8c38a874844a8b0fa10dd8adf3836ac154082cf88d3f22b544e9ceea0a15/fastapi-0.115.14.tar.gz", hash = "sha256:b1de15cdc1c499a4da47914db35d0e4ef8f1ce62b624e94e0e5824421df99739", size = 296263, upload-time = "2025-06-26T15:29:08.21Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/38/e1da78736143fd885c36213a3ccc493c384ae8fea6a0f0bc272ef42ebea8/fastapi-0.116.0.tar.gz", hash = "sha256:80dc0794627af0390353a6d1171618276616310d37d24faba6648398e57d687a", size = 296518, upload-time = "2025-07-07T15:09:27.82Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/53/50/b1222562c6d270fea83e9c9075b8e8600b8479150a18e4516a6138b980d1/fastapi-0.115.14-py3-none-any.whl", hash = "sha256:6c0c8bf9420bd58f565e585036d971872472b4f7d3f6c73b698e10cffdefb3ca", size = 95514, upload-time = "2025-06-26T15:29:06.49Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/68/d80347fe2360445b5f58cf290e588a4729746e7501080947e6cdae114b1f/fastapi-0.116.0-py3-none-any.whl", hash = "sha256:fdcc9ed272eaef038952923bef2b735c02372402d1203ee1210af4eea7a78d2b", size = 95625, upload-time = "2025-07-07T15:09:26.348Z" },
 ]
 
 [[package]]
@@ -2532,6 +2537,15 @@ socks = [
     { name = "socksio" },
 ]
 
+[[package]]
+name = "httpx-sse"
+version = "0.4.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/6e/fa/66bd985dd0b7c109a3bcb89272ee0bfb7e2b4d06309ad7b38ff866734b2a/httpx_sse-0.4.1.tar.gz", hash = "sha256:8f44d34414bc7b21bf3602713005c5df4917884f76072479b21f68befa4ea26e", size = 12998, upload-time = "2025-06-24T13:21:05.71Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/25/0a/6269e3473b09aed2dab8aa1a600c70f31f00ae1349bee30658f7e358a159/httpx_sse-0.4.1-py3-none-any.whl", hash = "sha256:cba42174344c3a5b06f255ce65b350880f962d99ead85e776f23c6618a377a37", size = 8054, upload-time = "2025-06-24T13:21:04.772Z" },
+]
+
 [[package]]
 name = "huggingface-hub"
 version = "0.33.2"
@@ -2574,15 +2588,15 @@ wheels = [
 
 [[package]]
 name = "hypothesis"
-version = "6.135.24"
+version = "6.135.26"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "attrs" },
     { name = "sortedcontainers" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/cf/ae/f846b67ce9fc80cf51cece6b7adaa3fe2de4251242d142e241ce5d4aa26f/hypothesis-6.135.24.tar.gz", hash = "sha256:e301aeb2691ec0a1f62bfc405eaa966055d603e328cd854c1ed59e1728e35ab6", size = 454011, upload-time = "2025-07-03T02:46:51.776Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/da/83/15c4e30561a0d8c8d076c88cb159187823d877118f34c851ada3b9b02a7b/hypothesis-6.135.26.tar.gz", hash = "sha256:73af0e46cd5039c6806f514fed6a3c185d91ef88b5a1577477099ddbd1a2e300", size = 454523, upload-time = "2025-07-05T04:59:45.443Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ed/cb/c38acf27826a96712302229622f32dd356b9c4fbe52a3e9f615706027af8/hypothesis-6.135.24-py3-none-any.whl", hash = "sha256:88ed21fbfa481ca9851a9080841b3caca14cd4ed51a165dfae8006325775ee72", size = 520920, upload-time = "2025-07-03T02:46:48.286Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/78/db4fdc464219455f8dde90074660c3faf8429101b2d1299cac7d219e3176/hypothesis-6.135.26-py3-none-any.whl", hash = "sha256:fa237cbe2ae2c31d65f7230dcb866139ace635dcfec6c30dddf25974dd8ff4b9", size = 521517, upload-time = "2025-07-05T04:59:42.061Z" },
 ]
 
 [[package]]
@@ -2892,10 +2906,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/9a/55/2cb24ea48aa30c99f805921c1c7860c1f45c0e811e44ee4e6a155668de06/lxml-6.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:219e0431ea8006e15005767f0351e3f7f9143e793e58519dc97fe9e07fae5563", size = 4952289, upload-time = "2025-06-28T18:47:25.602Z" },
     { url = "https://files.pythonhosted.org/packages/31/c0/b25d9528df296b9a3306ba21ff982fc5b698c45ab78b94d18c2d6ae71fd9/lxml-6.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bd5913b4972681ffc9718bc2d4c53cde39ef81415e1671ff93e9aa30b46595e7", size = 5111310, upload-time = "2025-06-28T18:47:28.136Z" },
     { url = "https://files.pythonhosted.org/packages/e9/af/681a8b3e4f668bea6e6514cbcb297beb6de2b641e70f09d3d78655f4f44c/lxml-6.0.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:390240baeb9f415a82eefc2e13285016f9c8b5ad71ec80574ae8fa9605093cd7", size = 5025457, upload-time = "2025-06-26T16:26:15.068Z" },
+    { url = "https://files.pythonhosted.org/packages/99/b6/3a7971aa05b7be7dfebc7ab57262ec527775c2c3c5b2f43675cac0458cad/lxml-6.0.0-cp312-cp312-manylinux_2_27_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d6e200909a119626744dd81bae409fc44134389e03fbf1d68ed2a55a2fb10991", size = 5657016, upload-time = "2025-07-03T19:19:06.008Z" },
     { url = "https://files.pythonhosted.org/packages/69/f8/693b1a10a891197143c0673fcce5b75fc69132afa81a36e4568c12c8faba/lxml-6.0.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ca50bd612438258a91b5b3788c6621c1f05c8c478e7951899f492be42defc0da", size = 5257565, upload-time = "2025-06-26T16:26:17.906Z" },
     { url = "https://files.pythonhosted.org/packages/a8/96/e08ff98f2c6426c98c8964513c5dab8d6eb81dadcd0af6f0c538ada78d33/lxml-6.0.0-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:c24b8efd9c0f62bad0439283c2c795ef916c5a6b75f03c17799775c7ae3c0c9e", size = 4713390, upload-time = "2025-06-26T16:26:20.292Z" },
     { url = "https://files.pythonhosted.org/packages/a8/83/6184aba6cc94d7413959f6f8f54807dc318fdcd4985c347fe3ea6937f772/lxml-6.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:afd27d8629ae94c5d863e32ab0e1d5590371d296b87dae0a751fb22bf3685741", size = 5066103, upload-time = "2025-06-26T16:26:22.765Z" },
     { url = "https://files.pythonhosted.org/packages/ee/01/8bf1f4035852d0ff2e36a4d9aacdbcc57e93a6cd35a54e05fa984cdf73ab/lxml-6.0.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:54c4855eabd9fc29707d30141be99e5cd1102e7d2258d2892314cf4c110726c3", size = 4791428, upload-time = "2025-06-26T16:26:26.461Z" },
+    { url = "https://files.pythonhosted.org/packages/29/31/c0267d03b16954a85ed6b065116b621d37f559553d9339c7dcc4943a76f1/lxml-6.0.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:c907516d49f77f6cd8ead1322198bdfd902003c3c330c77a1c5f3cc32a0e4d16", size = 5678523, upload-time = "2025-07-03T19:19:09.837Z" },
     { url = "https://files.pythonhosted.org/packages/5c/f7/5495829a864bc5f8b0798d2b52a807c89966523140f3d6fa3a58ab6720ea/lxml-6.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:36531f81c8214e293097cd2b7873f178997dae33d3667caaae8bdfb9666b76c0", size = 5281290, upload-time = "2025-06-26T16:26:29.406Z" },
     { url = "https://files.pythonhosted.org/packages/79/56/6b8edb79d9ed294ccc4e881f4db1023af56ba451909b9ce79f2a2cd7c532/lxml-6.0.0-cp312-cp312-win32.whl", hash = "sha256:690b20e3388a7ec98e899fd54c924e50ba6693874aa65ef9cb53de7f7de9d64a", size = 3613495, upload-time = "2025-06-26T16:26:31.588Z" },
     { url = "https://files.pythonhosted.org/packages/0b/1e/cc32034b40ad6af80b6fd9b66301fc0f180f300002e5c3eb5a6110a93317/lxml-6.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:310b719b695b3dd442cdfbbe64936b2f2e231bb91d998e99e6f0daf991a3eba3", size = 4014711, upload-time = "2025-06-26T16:26:33.723Z" },
@@ -3732,7 +3748,7 @@ wheels = [
 
 [[package]]
 name = "opik"
-version = "1.7.41"
+version = "1.7.43"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "boto3-stubs", extra = ["bedrock-runtime"] },
@@ -3751,9 +3767,9 @@ dependencies = [
     { name = "tqdm" },
     { name = "uuid6" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/82/81/6cddb705b3f416cfe4f0507916f51d0886087695f9dab49cfc6b00eb0266/opik-1.7.41.tar.gz", hash = "sha256:6ce2f72c7d23a62e2c13d419ce50754f6e17234825dcf26506e7def34dd38e26", size = 323333, upload-time = "2025-07-02T12:35:31.76Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ba/52/cea0317bc3207bc967b48932781995d9cdb2c490e7e05caa00ff660f7205/opik-1.7.43.tar.gz", hash = "sha256:0b02522b0b74d0a67b141939deda01f8bb69690eda6b04a7cecb1c7f0649ccd0", size = 326886, upload-time = "2025-07-07T10:30:07.715Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e9/46/ee27d06cc2049619806c992bdaa10e25b93d19ecedbc5c0fa772d8ac9a6d/opik-1.7.41-py3-none-any.whl", hash = "sha256:99df9c7b7b504777a51300b27a72bc646903201629611082b9b1f3c3adfbb3bf", size = 614890, upload-time = "2025-07-02T12:35:29.562Z" },
+    { url = "https://files.pythonhosted.org/packages/76/ae/f3566bdc3c49a1a8f795b1b6e726ef211c87e31f92d870ca6d63999c9bbf/opik-1.7.43-py3-none-any.whl", hash = "sha256:a66395c8b5ea7c24846f72dafc70c74d5b8f24ffbc4c8a1b3a7f9456e550568d", size = 625356, upload-time = "2025-07-07T10:30:06.389Z" },
 ]
 
 [[package]]
@@ -3975,6 +3991,8 @@ sdist = { url = "https://files.pythonhosted.org/packages/f3/0d/d0d6dea55cd152ce3
 wheels = [
     { url = "https://files.pythonhosted.org/packages/db/26/77f8ed17ca4ffd60e1dcd220a6ec6d71210ba398cfa33a13a1cd614c5613/pillow-11.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:1cd110edf822773368b396281a2293aeb91c90a2db00d78ea43e7e861631b722", size = 5316531, upload-time = "2025-07-01T09:13:59.203Z" },
     { url = "https://files.pythonhosted.org/packages/cb/39/ee475903197ce709322a17a866892efb560f57900d9af2e55f86db51b0a5/pillow-11.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9c412fddd1b77a75aa904615ebaa6001f169b26fd467b4be93aded278266b288", size = 4686560, upload-time = "2025-07-01T09:14:01.101Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/90/442068a160fd179938ba55ec8c97050a612426fae5ec0a764e345839f76d/pillow-11.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7d1aa4de119a0ecac0a34a9c8bde33f34022e2e8f99104e47a3ca392fd60e37d", size = 5870978, upload-time = "2025-07-03T13:09:55.638Z" },
+    { url = "https://files.pythonhosted.org/packages/13/92/dcdd147ab02daf405387f0218dcf792dc6dd5b14d2573d40b4caeef01059/pillow-11.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:91da1d88226663594e3f6b4b8c3c8d85bd504117d043740a8e0ec449087cc494", size = 7641168, upload-time = "2025-07-03T13:10:00.37Z" },
     { url = "https://files.pythonhosted.org/packages/6e/db/839d6ba7fd38b51af641aa904e2960e7a5644d60ec754c046b7d2aee00e5/pillow-11.3.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:643f189248837533073c405ec2f0bb250ba54598cf80e8c1e043381a60632f58", size = 5973053, upload-time = "2025-07-01T09:14:04.491Z" },
     { url = "https://files.pythonhosted.org/packages/f2/2f/d7675ecae6c43e9f12aa8d58b6012683b20b6edfbdac7abcb4e6af7a3784/pillow-11.3.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:106064daa23a745510dabce1d84f29137a37224831d88eb4ce94bb187b1d7e5f", size = 6640273, upload-time = "2025-07-01T09:14:06.235Z" },
     { url = "https://files.pythonhosted.org/packages/45/ad/931694675ede172e15b2ff03c8144a0ddaea1d87adb72bb07655eaffb654/pillow-11.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cd8ff254faf15591e724dc7c4ddb6bf4793efcbe13802a4ae3e863cd300b493e", size = 6082043, upload-time = "2025-07-01T09:14:07.978Z" },
@@ -3984,6 +4002,8 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c6/df/90bd886fabd544c25addd63e5ca6932c86f2b701d5da6c7839387a076b4a/pillow-11.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:30807c931ff7c095620fe04448e2c2fc673fcbb1ffe2a7da3fb39613489b1ddd", size = 2423079, upload-time = "2025-07-01T09:14:15.268Z" },
     { url = "https://files.pythonhosted.org/packages/40/fe/1bc9b3ee13f68487a99ac9529968035cca2f0a51ec36892060edcc51d06a/pillow-11.3.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fdae223722da47b024b867c1ea0be64e0df702c5e0a60e27daad39bf960dd1e4", size = 5278800, upload-time = "2025-07-01T09:14:17.648Z" },
     { url = "https://files.pythonhosted.org/packages/2c/32/7e2ac19b5713657384cec55f89065fb306b06af008cfd87e572035b27119/pillow-11.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:921bd305b10e82b4d1f5e802b6850677f965d8394203d182f078873851dada69", size = 4686296, upload-time = "2025-07-01T09:14:19.828Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/1e/b9e12bbe6e4c2220effebc09ea0923a07a6da1e1f1bfbc8d7d29a01ce32b/pillow-11.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:eb76541cba2f958032d79d143b98a3a6b3ea87f0959bbe256c0b5e416599fd5d", size = 5871726, upload-time = "2025-07-03T13:10:04.448Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/33/e9200d2bd7ba00dc3ddb78df1198a6e80d7669cce6c2bdbeb2530a74ec58/pillow-11.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67172f2944ebba3d4a7b54f2e95c786a3a50c21b88456329314caaa28cda70f6", size = 7644652, upload-time = "2025-07-03T13:10:10.391Z" },
     { url = "https://files.pythonhosted.org/packages/41/f1/6f2427a26fc683e00d985bc391bdd76d8dd4e92fac33d841127eb8fb2313/pillow-11.3.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97f07ed9f56a3b9b5f49d3661dc9607484e85c67e27f3e8be2c7d28ca032fec7", size = 5977787, upload-time = "2025-07-01T09:14:21.63Z" },
     { url = "https://files.pythonhosted.org/packages/e4/c9/06dd4a38974e24f932ff5f98ea3c546ce3f8c995d3f0985f8e5ba48bba19/pillow-11.3.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:676b2815362456b5b3216b4fd5bd89d362100dc6f4945154ff172e206a22c024", size = 6645236, upload-time = "2025-07-01T09:14:23.321Z" },
     { url = "https://files.pythonhosted.org/packages/40/e7/848f69fb79843b3d91241bad658e9c14f39a32f71a301bcd1d139416d1be/pillow-11.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3e184b2f26ff146363dd07bde8b711833d7b0202e27d13540bfe2e35a323a809", size = 6086950, upload-time = "2025-07-01T09:14:25.237Z" },
@@ -3993,6 +4013,8 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/16/8f/b13447d1bf0b1f7467ce7d86f6e6edf66c0ad7cf44cf5c87a37f9bed9936/pillow-11.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:2aceea54f957dd4448264f9bf40875da0415c83eb85f55069d89c0ed436e3542", size = 2423067, upload-time = "2025-07-01T09:14:33.709Z" },
     { url = "https://files.pythonhosted.org/packages/9e/e3/6fa84033758276fb31da12e5fb66ad747ae83b93c67af17f8c6ff4cc8f34/pillow-11.3.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7c8ec7a017ad1bd562f93dbd8505763e688d388cde6e4a010ae1486916e713e6", size = 5270566, upload-time = "2025-07-01T09:16:19.801Z" },
     { url = "https://files.pythonhosted.org/packages/5b/ee/e8d2e1ab4892970b561e1ba96cbd59c0d28cf66737fc44abb2aec3795a4e/pillow-11.3.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:9ab6ae226de48019caa8074894544af5b53a117ccb9d3b3dcb2871464c829438", size = 4654618, upload-time = "2025-07-01T09:16:21.818Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/6d/17f80f4e1f0761f02160fc433abd4109fa1548dcfdca46cfdadaf9efa565/pillow-11.3.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fe27fb049cdcca11f11a7bfda64043c37b30e6b91f10cb5bab275806c32f6ab3", size = 4874248, upload-time = "2025-07-03T13:11:20.738Z" },
+    { url = "https://files.pythonhosted.org/packages/de/5f/c22340acd61cef960130585bbe2120e2fd8434c214802f07e8c03596b17e/pillow-11.3.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:465b9e8844e3c3519a983d58b80be3f668e2a7a5db97f2784e7079fbc9f9822c", size = 6583963, upload-time = "2025-07-03T13:11:26.283Z" },
     { url = "https://files.pythonhosted.org/packages/31/5e/03966aedfbfcbb4d5f8aa042452d3361f325b963ebbadddac05b122e47dd/pillow-11.3.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5418b53c0d59b3824d05e029669efa023bbef0f3e92e75ec8428f3799487f361", size = 4957170, upload-time = "2025-07-01T09:16:23.762Z" },
     { url = "https://files.pythonhosted.org/packages/cc/2d/e082982aacc927fc2cab48e1e731bdb1643a1406acace8bed0900a61464e/pillow-11.3.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:504b6f59505f08ae014f724b6207ff6222662aab5cc9542577fb084ed0676ac7", size = 5581505, upload-time = "2025-07-01T09:16:25.593Z" },
     { url = "https://files.pythonhosted.org/packages/34/e7/ae39f538fd6844e982063c3a5e4598b8ced43b9633baa3a85ef33af8c05c/pillow-11.3.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:c84d689db21a1c397d001aa08241044aa2069e7587b398c8cc63020390b1c1b8", size = 6984598, upload-time = "2025-07-01T09:16:27.732Z" },
@@ -4065,7 +4087,7 @@ wheels = [
 
 [[package]]
 name = "posthog"
-version = "6.0.2"
+version = "6.0.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "backoff" },
@@ -4075,9 +4097,9 @@ dependencies = [
     { name = "six" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d9/10/37ea988b3ae73cbfd1f2d5e523cca31cecfcc40cbd0de6511f40462fdb78/posthog-6.0.2.tar.gz", hash = "sha256:94a28e65d7a2d1b2952e53a1b97fa4d6504b8d7e4c197c57f653621e55b549eb", size = 88141, upload-time = "2025-07-02T19:21:50.306Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/39/a2/1b68562124b0d0e615fa8431cc88c84b3db6526275c2c19a419579a49277/posthog-6.0.3.tar.gz", hash = "sha256:9005abb341af8fedd9d82ca0359b3d35a9537555cdc9881bfb469f7c0b4b0ec5", size = 91861, upload-time = "2025-07-07T07:14:08.21Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/85/2c/0c5dbbf9bc30401ae2a1b6b52b8abc19e4060cf28c3288ae9d962e65e3ad/posthog-6.0.2-py3-none-any.whl", hash = "sha256:756cc9adad9e42961454f8ac391b92a2f70ebb6607d29b0c568de08e5d8f1b18", size = 104946, upload-time = "2025-07-02T19:21:48.77Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/f1/a8d86245d41c8686f7d828a4959bdf483e8ac331b249b48b8c61fc884a1c/posthog-6.0.3-py3-none-any.whl", hash = "sha256:4b808c907f3623216a9362d91fdafce8e2f57a8387fb3020475c62ec809be56d", size = 108978, upload-time = "2025-07-07T07:14:06.451Z" },
 ]
 
 [[package]]
@@ -4585,39 +4607,39 @@ wheels = [
 
 [[package]]
 name = "python-calamine"
-version = "0.3.2"
+version = "0.4.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "packaging" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/6b/21/387b92059909e741af7837194d84250335d2a057f614752b6364aaaa2f56/python_calamine-0.3.2.tar.gz", hash = "sha256:5cf12f2086373047cdea681711857b672cba77a34a66dd3755d60686fc974e06", size = 117336, upload-time = "2025-04-02T10:06:23.14Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ef/b7/d59863ebe319150739d0c352c6dea2710a2f90254ed32304d52e8349edce/python_calamine-0.3.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:5251746816069c38eafdd1e4eb7b83870e1fe0ff6191ce9a809b187ffba8ce93", size = 830854, upload-time = "2025-04-02T10:04:14.673Z" },
-    { url = "https://files.pythonhosted.org/packages/d3/01/b48c6f2c2e530a1a031199c5c5bf35f7c2cf7f16f3989263e616e3bc86ce/python_calamine-0.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9775dbc93bc635d48f45433f8869a546cca28c2a86512581a05333f97a18337b", size = 809411, upload-time = "2025-04-02T10:04:16.067Z" },
-    { url = "https://files.pythonhosted.org/packages/fe/6d/69c53ffb11b3ee1bf5bd945cc2514848adea492c879a50f38e2ed4424727/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ff4318b72ba78e8a04fb4c45342cfa23eab6f81ecdb85548cdab9f2db8ac9c7", size = 872905, upload-time = "2025-04-02T10:04:17.487Z" },
-    { url = "https://files.pythonhosted.org/packages/be/ec/b02c4bc04c426d153af1f5ff07e797dd81ada6f47c170e0207d07c90b53a/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0cd8eb1ef8644da71788a33d3de602d1c08ff1c4136942d87e25f09580b512ef", size = 876464, upload-time = "2025-04-02T10:04:19.53Z" },
-    { url = "https://files.pythonhosted.org/packages/46/ef/8403ee595207de5bd277279b56384b31390987df8a61c280b4176802481a/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dcfd560d8f88f39d23b829f666ebae4bd8daeec7ed57adfb9313543f3c5fa35", size = 942289, upload-time = "2025-04-02T10:04:20.902Z" },
-    { url = "https://files.pythonhosted.org/packages/89/97/b4e5b77c70b36613c10f2dbeece75b5d43727335a33bf5176792ec83c3fc/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5e79b9eae4b30c82d045f9952314137c7089c88274e1802947f9e3adb778a59", size = 978699, upload-time = "2025-04-02T10:04:22.263Z" },
-    { url = "https://files.pythonhosted.org/packages/5f/e9/03bbafd6b11cdf70c004f2e856978fc252ec5ea7e77529f14f969134c7a8/python_calamine-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce5e8cc518c8e3e5988c5c658f9dcd8229f5541ca63353175bb15b6ad8c456d0", size = 886008, upload-time = "2025-04-02T10:04:23.754Z" },
-    { url = "https://files.pythonhosted.org/packages/7b/20/e18f534e49b403ba0b979a4dfead146001d867f5be846b91f81ed5377972/python_calamine-0.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2a0e596b1346c28b2de15c9f86186cceefa4accb8882992aa0b7499c593446ed", size = 925104, upload-time = "2025-04-02T10:04:25.255Z" },
-    { url = "https://files.pythonhosted.org/packages/54/4c/58933e69a0a7871487d10b958c1f83384bc430d53efbbfbf1dea141a0d85/python_calamine-0.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f521de16a9f3e951ec2e5e35d76752fe004088dbac4cdbf4dd62d0ad2bbf650f", size = 1050448, upload-time = "2025-04-02T10:04:26.649Z" },
-    { url = "https://files.pythonhosted.org/packages/83/95/5c96d093eaaa2d15c63b43bcf8c87708eaab8428c72b6ebdcafc2604aa47/python_calamine-0.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:417d6825a36bba526ae17bed1b6ca576fbb54e23dc60c97eeb536c622e77c62f", size = 1056840, upload-time = "2025-04-02T10:04:28.18Z" },
-    { url = "https://files.pythonhosted.org/packages/23/e0/b03cc3ad4f40fd3be0ebac0b71d273864ddf2bf0e611ec309328fdedded9/python_calamine-0.3.2-cp311-cp311-win32.whl", hash = "sha256:cd3ea1ca768139753633f9f0b16997648db5919894579f363d71f914f85f7ade", size = 663268, upload-time = "2025-04-02T10:04:29.659Z" },
-    { url = "https://files.pythonhosted.org/packages/6b/bd/550da64770257fc70a185482f6353c0654a11f381227e146bb0170db040f/python_calamine-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:4560100412d8727c49048cca102eadeb004f91cfb9c99ae63cd7d4dc0a61333a", size = 692393, upload-time = "2025-04-02T10:04:31.534Z" },
-    { url = "https://files.pythonhosted.org/packages/be/2e/0b4b7a146c3bb41116fe8e59a2f616340786db12aed51c7a9e75817cfa03/python_calamine-0.3.2-cp311-cp311-win_arm64.whl", hash = "sha256:a2526e6ba79087b1634f49064800339edb7316780dd7e1e86d10a0ca9de4e90f", size = 667312, upload-time = "2025-04-02T10:04:32.911Z" },
-    { url = "https://files.pythonhosted.org/packages/f2/0f/c2e3e3bae774dae47cba6ffa640ff95525bd6a10a13d3cd998f33aeafc7f/python_calamine-0.3.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:7c063b1f783352d6c6792305b2b0123784882e2436b638a9b9a1e97f6d74fa51", size = 825179, upload-time = "2025-04-02T10:04:34.377Z" },
-    { url = "https://files.pythonhosted.org/packages/c7/81/a05285f06d71ea38ab99b09f3119f93f575487c9d24d7a1bab65657b258b/python_calamine-0.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:85016728937e8f5d1810ff3c9603ffd2458d66e34d495202d7759fa8219871cd", size = 804036, upload-time = "2025-04-02T10:04:35.938Z" },
-    { url = "https://files.pythonhosted.org/packages/24/b5/320f366ffd91ee5d5f0f77817d4fb684f62a5a68e438dcdb90e4f5f35137/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81f243323bf712bb0b2baf0b938a2e6d6c9fa3b9902a44c0654474d04f999fac", size = 871527, upload-time = "2025-04-02T10:04:38.272Z" },
-    { url = "https://files.pythonhosted.org/packages/13/19/063afced19620b829697b90329c62ad73274cc38faaa91d9ee41047f5f8c/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0b719dd2b10237b0cfb2062e3eaf199f220918a5623197e8449f37c8de845a7c", size = 875411, upload-time = "2025-04-02T10:04:39.647Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/6a/c93c52414ec62cc51c4820aff434f03c4a1c69ced15cec3e4b93885e4012/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d5158310b9140e8ee8665c9541a11030901e7275eb036988150c93f01c5133bf", size = 943525, upload-time = "2025-04-02T10:04:41.025Z" },
-    { url = "https://files.pythonhosted.org/packages/0a/0a/5bdecee03d235e8d111b1e8ee3ea0c0ed4ae43a402f75cebbe719930cf04/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2c1b248e8bf10194c449cb57e6ccb3f2fe3dc86975a6d746908cf2d37b048cc", size = 976332, upload-time = "2025-04-02T10:04:42.454Z" },
-    { url = "https://files.pythonhosted.org/packages/05/ad/43ff92366856ee34f958e9cf4f5b98e63b0dc219e06ccba4ad6f63463756/python_calamine-0.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3a13ad8e5b6843a73933b8d1710bc4df39a9152cb57c11227ad51f47b5838a4", size = 885549, upload-time = "2025-04-02T10:04:43.869Z" },
-    { url = "https://files.pythonhosted.org/packages/ff/b9/76afb867e2bb4bfc296446b741cee01ae4ce6a094b43f4ed4eaed5189de4/python_calamine-0.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe950975a5758423c982ce1e2fdcb5c9c664d1a20b41ea21e619e5003bb4f96b", size = 926005, upload-time = "2025-04-02T10:04:45.884Z" },
-    { url = "https://files.pythonhosted.org/packages/23/cf/5252b237b0e70c263f86741aea02e8e57aedb2bce9898468be1d9d55b9da/python_calamine-0.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8707622ba816d6c26e36f1506ecda66a6a6cf43e55a43a8ef4c3bf8a805d3cfb", size = 1049380, upload-time = "2025-04-02T10:04:49.202Z" },
-    { url = "https://files.pythonhosted.org/packages/1a/4d/f151e8923e53457ca49ceeaa3a34cb23afee7d7b46e6546ab2a29adc9125/python_calamine-0.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e6eac46475c26e162a037f6711b663767f61f8fca3daffeb35aa3fc7ee6267cc", size = 1056720, upload-time = "2025-04-02T10:04:51.002Z" },
-    { url = "https://files.pythonhosted.org/packages/f5/cb/1b5db3e4a8bbaaaa7706b270570d4a65133618fa0ca7efafe5ce680f6cee/python_calamine-0.3.2-cp312-cp312-win32.whl", hash = "sha256:0dee82aedef3db27368a388d6741d69334c1d4d7a8087ddd33f1912166e17e37", size = 663502, upload-time = "2025-04-02T10:04:52.402Z" },
-    { url = "https://files.pythonhosted.org/packages/5a/53/920fa8e7b570647c08da0f1158d781db2e318918b06cb28fe0363c3398ac/python_calamine-0.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:ae09b779718809d31ca5d722464be2776b7d79278b1da56e159bbbe11880eecf", size = 692660, upload-time = "2025-04-02T10:04:53.721Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/ea/5d0ecf5c345c4d78964a5f97e61848bc912965b276a54fb8ae698a9419a8/python_calamine-0.3.2-cp312-cp312-win_arm64.whl", hash = "sha256:435546e401a5821fa70048b6c03a70db3b27d00037e2c4999c2126d8c40b51df", size = 666205, upload-time = "2025-04-02T10:04:56.377Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/cc/03/269f96535705b2f18c8977fa58e76763b4e4727a9b3ae277a9468c8ffe05/python_calamine-0.4.0.tar.gz", hash = "sha256:94afcbae3fec36d2d7475095a59d4dc6fae45829968c743cb799ebae269d7bbf", size = 127737, upload-time = "2025-07-04T06:05:28.626Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d4/a5/bcd82326d0ff1ab5889e7a5e13c868b483fc56398e143aae8e93149ba43b/python_calamine-0.4.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d1687f8c4d7852920c7b4e398072f183f88dd273baf5153391edc88b7454b8c0", size = 833019, upload-time = "2025-07-04T06:03:32.214Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/1a/a681f1d2f28164552e91ef47bcde6708098aa64a5f5fe3952f22362d340a/python_calamine-0.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:258d04230bebbbafa370a15838049d912d6a0a2c4da128943d8160ca4b6db58e", size = 812268, upload-time = "2025-07-04T06:03:33.855Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/92/2fc911431733739d4e7a633cefa903fa49a6b7a61e8765bad29a4a7c47b1/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c686e491634934f059553d55f77ac67ca4c235452d5b444f98fe79b3579f1ea5", size = 875733, upload-time = "2025-07-04T06:03:35.154Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/f0/48bfae6802eb360028ca6c15e9edf42243aadd0006b6ac3e9edb41a57119/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4480af7babcc2f919c638a554b06b7b145d9ab3da47fd696d68c2fc6f67f9541", size = 878325, upload-time = "2025-07-04T06:03:36.638Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/dc/f8c956e15bac9d5d1e05cd1b907ae780e40522d2fd103c8c6e2f21dff4ed/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e405b87a8cd1e90a994e570705898634f105442029f25bab7da658ee9cbaa771", size = 1015038, upload-time = "2025-07-04T06:03:37.971Z" },
+    { url = "https://files.pythonhosted.org/packages/54/3f/e69ab97c7734fb850fba2f506b775912fd59f04e17488582c8fbf52dbc72/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a831345ee42615f0dfcb0ed60a3b1601d2f946d4166edae64fd9a6f9bbd57fc1", size = 924969, upload-time = "2025-07-04T06:03:39.253Z" },
+    { url = "https://files.pythonhosted.org/packages/79/03/b4c056b468908d87a3de94389166e0f4dba725a70bc39e03bc039ba96f6b/python_calamine-0.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9951b8e4cafb3e1623bb5dfc31a18d38ef43589275f9657e99dfcbe4c8c4b33e", size = 888020, upload-time = "2025-07-04T06:03:41.099Z" },
+    { url = "https://files.pythonhosted.org/packages/86/4f/b9092f7c970894054083656953184e44cb2dadff8852425e950d4ca419af/python_calamine-0.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a6619fe3b5c9633ed8b178684605f8076c9d8d85b29ade15f7a7713fcfdee2d0", size = 930337, upload-time = "2025-07-04T06:03:42.89Z" },
+    { url = "https://files.pythonhosted.org/packages/64/da/137239027bf253aabe7063450950085ec9abd827d0cbc5170f585f38f464/python_calamine-0.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:2cc45b8e76ee331f6ea88ca23677be0b7a05b502cd4423ba2c2bc8dad53af1be", size = 1054568, upload-time = "2025-07-04T06:03:44.153Z" },
+    { url = "https://files.pythonhosted.org/packages/80/96/74c38bcf6b6825d5180c0e147b85be8c52dbfba11848b1e98ba358e32a64/python_calamine-0.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1b2cfb7ced1a7c80befa0cfddfe4aae65663eb4d63c4ae484b9b7a80ebe1b528", size = 1058317, upload-time = "2025-07-04T06:03:45.873Z" },
+    { url = "https://files.pythonhosted.org/packages/33/95/9d7b8fe8b32d99a6c79534df3132cfe40e9df4a0f5204048bf5e66ddbd93/python_calamine-0.4.0-cp311-cp311-win32.whl", hash = "sha256:04f4e32ee16814fc1fafc49300be8eeb280d94878461634768b51497e1444bd6", size = 663934, upload-time = "2025-07-04T06:03:47.407Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/e3/1c6cd9fd499083bea6ff1c30033ee8215b9f64e862babf5be170cacae190/python_calamine-0.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:a8543f69afac2213c0257bb56215b03dadd11763064a9d6b19786f27d1bef586", size = 692535, upload-time = "2025-07-04T06:03:48.699Z" },
+    { url = "https://files.pythonhosted.org/packages/94/1c/3105d19fbab6b66874ce8831652caedd73b23b72e88ce18addf8ceca8c12/python_calamine-0.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:54622e35ec7c3b6f07d119da49aa821731c185e951918f152c2dbf3bec1e15d6", size = 671751, upload-time = "2025-07-04T06:03:49.979Z" },
+    { url = "https://files.pythonhosted.org/packages/63/60/f951513aaaa470b3a38a87d65eca45e0a02bc329b47864f5a17db563f746/python_calamine-0.4.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:74bca5d44a73acf3dcfa5370820797fcfd225c8c71abcddea987c5b4f5077e98", size = 826603, upload-time = "2025-07-04T06:03:51.245Z" },
+    { url = "https://files.pythonhosted.org/packages/76/3f/789955bbc77831c639890758f945eb2b25d6358065edf00da6751226cf31/python_calamine-0.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cf80178f5d1b0ee2ccfffb8549c50855f6249e930664adc5807f4d0d6c2b269c", size = 805826, upload-time = "2025-07-04T06:03:52.482Z" },
+    { url = "https://files.pythonhosted.org/packages/00/4c/f87d17d996f647030a40bfd124fe45fe893c002bee35ae6aca9910a923ae/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65cfef345386ae86f7720f1be93495a40fd7e7feabb8caa1df5025d7fbc58a1f", size = 874989, upload-time = "2025-07-04T06:03:53.794Z" },
+    { url = "https://files.pythonhosted.org/packages/47/d2/3269367303f6c0488cf1bfebded3f9fe968d118a988222e04c9b2636bf2e/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f23e6214dbf9b29065a5dcfd6a6c674dd0e251407298c9138611c907d53423ff", size = 877504, upload-time = "2025-07-04T06:03:55.095Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/6d/c7ac35f5c7125e8bd07eb36773f300fda20dd2da635eae78a8cebb0b6ab7/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d792d304ee232ab01598e1d3ab22e074a32c2511476b5fb4f16f4222d9c2a265", size = 1014171, upload-time = "2025-07-04T06:03:56.777Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/81/5ea8792a2e9ab5e2a05872db3a4d3ed3538ad5af1861282c789e2f13a8cf/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bf813425918fd68f3e991ef7c4b5015be0a1a95fc4a8ab7e73c016ef1b881bb4", size = 926737, upload-time = "2025-07-04T06:03:58.024Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/6e/989e56e6f073fc0981a74ba7a393881eb351bb143e5486aa629b5e5d6a8b/python_calamine-0.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbe2a0ccb4d003635888eea83a995ff56b0748c8c76fc71923544f5a4a7d4cd7", size = 887032, upload-time = "2025-07-04T06:03:59.298Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/92/2c9bd64277c6fe4be695d7d5a803b38d953ec8565037486be7506642c27c/python_calamine-0.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a7b3bb5f0d910b9b03c240987560f843256626fd443279759df4e91b717826d2", size = 929700, upload-time = "2025-07-04T06:04:01.388Z" },
+    { url = "https://files.pythonhosted.org/packages/64/fa/fc758ca37701d354a6bc7d63118699f1c73788a1f2e1b44d720824992764/python_calamine-0.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bd2c0fc2b5eabd08ceac8a2935bffa88dbc6116db971aa8c3f244bad3fd0f644", size = 1053971, upload-time = "2025-07-04T06:04:02.704Z" },
+    { url = "https://files.pythonhosted.org/packages/65/52/40d7e08ae0ddba331cdc9f7fb3e92972f8f38d7afbd00228158ff6d1fceb/python_calamine-0.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:85b547cb1c5b692a0c2406678d666dbc1cec65a714046104683fe4f504a1721d", size = 1057057, upload-time = "2025-07-04T06:04:04.014Z" },
+    { url = "https://files.pythonhosted.org/packages/16/de/e8a071c0adfda73285d891898a24f6e99338328c404f497ff5b0e6bc3d45/python_calamine-0.4.0-cp312-cp312-win32.whl", hash = "sha256:4c2a1e3a0db4d6de4587999a21cc35845648c84fba81c03dd6f3072c690888e4", size = 665540, upload-time = "2025-07-04T06:04:05.679Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/f2/7fdfada13f80db12356853cf08697ff4e38800a1809c2bdd26ee60962e7a/python_calamine-0.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:b193c89ffcc146019475cd121c552b23348411e19c04dedf5c766a20db64399a", size = 695366, upload-time = "2025-07-04T06:04:06.977Z" },
+    { url = "https://files.pythonhosted.org/packages/20/66/d37412ad854480ce32f50d9f74f2a2f88b1b8a6fbc32f70aabf3211ae89e/python_calamine-0.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:43a0f15e0b60c75a71b21a012b911d5d6f5fa052afad2a8edbc728af43af0fcf", size = 670740, upload-time = "2025-07-04T06:04:08.656Z" },
 ]
 
 [[package]]
@@ -5297,6 +5319,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/1c/fc/9ba22f01b5cdacc8f5ed0d22304718d2c758fce3fd49a5372b886a86f37c/sqlalchemy-2.0.41-py3-none-any.whl", hash = "sha256:57df5dc6fdb5ed1a88a1ed2195fd31927e705cad62dedd86b46972752a80f576", size = 1911224, upload-time = "2025-05-14T17:39:42.154Z" },
 ]
 
+[[package]]
+name = "sseclient-py"
+version = "1.8.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/ed/3df5ab8bb0c12f86c28d0cadb11ed1de44a92ed35ce7ff4fd5518a809325/sseclient-py-1.8.0.tar.gz", hash = "sha256:c547c5c1a7633230a38dc599a21a2dc638f9b5c297286b48b46b935c71fac3e8", size = 7791, upload-time = "2023-09-01T19:39:20.45Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/49/58/97655efdfeb5b4eeab85b1fc5d3fa1023661246c2ab2a26ea8e47402d4f2/sseclient_py-1.8.0-py2.py3-none-any.whl", hash = "sha256:4ecca6dc0b9f963f8384e9d7fd529bf93dd7d708144c4fb5da0e0a1a926fee83", size = 8828, upload-time = "2023-09-01T19:39:17.627Z" },
+]
+
 [[package]]
 name = "starlette"
 version = "0.41.0"
@@ -5599,11 +5630,11 @@ wheels = [
 
 [[package]]
 name = "types-aiofiles"
-version = "24.1.0.20250606"
+version = "24.1.0.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/64/6e/fac4ffc896cb3faf2ac5d23747b65dd8bae1d9ee23305d1a3b12111c3989/types_aiofiles-24.1.0.20250606.tar.gz", hash = "sha256:48f9e26d2738a21e0b0f19381f713dcdb852a36727da8414b1ada145d40a18fe", size = 14364, upload-time = "2025-06-06T03:09:26.515Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4a/d6/5c44761bc11cb5c7505013a39f397a9016bfb3a5c932032b2db16c38b87b/types_aiofiles-24.1.0.20250708.tar.gz", hash = "sha256:c8207ed7385491ce5ba94da02658164ebd66b69a44e892288c9f20cbbf5284ff", size = 14322, upload-time = "2025-07-08T03:14:44.814Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/71/de/f2fa2ab8a5943898e93d8036941e05bfd1e1f377a675ee52c7c307dccb75/types_aiofiles-24.1.0.20250606-py3-none-any.whl", hash = "sha256:e568c53fb9017c80897a9aa15c74bf43b7ee90e412286ec1e0912b6e79301aee", size = 14276, upload-time = "2025-06-06T03:09:25.662Z" },
+    { url = "https://files.pythonhosted.org/packages/44/e9/4e0cc79c630040aae0634ac9393341dc2aff1a5be454be9741cc6cc8989f/types_aiofiles-24.1.0.20250708-py3-none-any.whl", hash = "sha256:07f8f06465fd415d9293467d1c66cd074b2c3b62b679e26e353e560a8cf63720", size = 14320, upload-time = "2025-07-08T03:14:44.009Z" },
 ]
 
 [[package]]
@@ -5659,11 +5690,11 @@ wheels = [
 
 [[package]]
 name = "types-defusedxml"
-version = "0.7.0.20250516"
+version = "0.7.0.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/55/9d/3ba8b80536402f1a125bc5a44d82ab686aafa55a85f56160e076b2ac30de/types_defusedxml-0.7.0.20250516.tar.gz", hash = "sha256:164c2945077fa450f24ed09633f8b3a80694687fefbbc1cba5f24e4ba570666b", size = 10298, upload-time = "2025-05-16T03:08:18.951Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b9/4b/79d046a7211e110afd885be04bb9423546df2a662ed28251512d60e51fb6/types_defusedxml-0.7.0.20250708.tar.gz", hash = "sha256:7b785780cc11c18a1af086308bf94bf53a0907943a1d145dbe00189bef323cb8", size = 10541, upload-time = "2025-07-08T03:14:33.325Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2e/7b/567b0978150edccf7fa3aa8f2566ea9c3ffc9481ce7d64428166934d6d7f/types_defusedxml-0.7.0.20250516-py3-none-any.whl", hash = "sha256:00e793e5c385c3e142d7c2acc3b4ccea2fe0828cee11e35501f0ba40386630a0", size = 12576, upload-time = "2025-05-16T03:08:17.892Z" },
+    { url = "https://files.pythonhosted.org/packages/24/f8/870de7fbd5fee5643f05061db948df6bd574a05a42aee91e37ad47c999ef/types_defusedxml-0.7.0.20250708-py3-none-any.whl", hash = "sha256:cc426cbc31c61a0f1b1c2ad9b9ef9ef846645f28fd708cd7727a6353b5c52e54", size = 13478, upload-time = "2025-07-08T03:14:32.633Z" },
 ]
 
 [[package]]
@@ -5677,11 +5708,11 @@ wheels = [
 
 [[package]]
 name = "types-docutils"
-version = "0.21.0.20250604"
+version = "0.21.0.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ef/d0/d28035370d669f14d4e23bd63d093207331f361afa24d2686d2c3fe6be8d/types_docutils-0.21.0.20250604.tar.gz", hash = "sha256:5a9cc7f5a4c5ef694aa0abc61111e0b1376a53dee90d65757f77f31acfcca8f2", size = 40953, upload-time = "2025-06-04T03:10:27.439Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/39/86/24394a71a04f416ca03df51863a3d3e2cd0542fdc40989188dca30ffb5bf/types_docutils-0.21.0.20250708.tar.gz", hash = "sha256:5625a82a9a2f26d8384545607c157e023a48ed60d940dfc738db125282864172", size = 42011, upload-time = "2025-07-08T03:14:24.214Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/89/91/887e9591c1ee50dfbf7c2fa2f3f51bc6db683013b6d2b0cd3983adf3d502/types_docutils-0.21.0.20250604-py3-none-any.whl", hash = "sha256:bfa8628176c06a80cdd1d6f3fb32e972e042db53538596488dfe0e9c5962b222", size = 65915, upload-time = "2025-06-04T03:10:26.067Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/17/8c1153fc1576a0dcffdd157c69a12863c3f9485054256f6791ea17d95aed/types_docutils-0.21.0.20250708-py3-none-any.whl", hash = "sha256:166630d1aec18b9ca02547873210e04bf7674ba8f8da9cd9e6a5e77dc99372c2", size = 67953, upload-time = "2025-07-08T03:14:23.057Z" },
 ]
 
 [[package]]
@@ -5733,11 +5764,11 @@ wheels = [
 
 [[package]]
 name = "types-html5lib"
-version = "1.1.11.20250516"
+version = "1.1.11.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d0/ed/9f092ff479e2b5598941855f314a22953bb04b5fb38bcba3f880feb833ba/types_html5lib-1.1.11.20250516.tar.gz", hash = "sha256:65043a6718c97f7d52567cc0cdf41efbfc33b1f92c6c0c5e19f60a7ec69ae720", size = 16136, upload-time = "2025-05-16T03:07:12.231Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d4/3b/1f5ba4358cfc1421cced5cdb9d2b08b4b99e4f9a41da88ce079f6d1a7bf1/types_html5lib-1.1.11.20250708.tar.gz", hash = "sha256:24321720fdbac71cee50d5a4bec9b7448495b7217974cffe3fcf1ede4eef7afe", size = 16799, upload-time = "2025-07-08T03:13:53.14Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cc/3b/cb5b23c7b51bf48b8c9f175abb9dce2f1ecd2d2c25f92ea9f4e3720e9398/types_html5lib-1.1.11.20250516-py3-none-any.whl", hash = "sha256:5e407b14b1bd2b9b1107cbd1e2e19d4a0c46d60febd231c7ab7313d7405663c1", size = 21770, upload-time = "2025-05-16T03:07:11.102Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/50/5fc23cf647eee23acdd337c8150861d39980cf11f33dd87f78e87d2a4bad/types_html5lib-1.1.11.20250708-py3-none-any.whl", hash = "sha256:bb898066b155de7081cb182179e2ded31b9e0e234605e2cb46536894e68a6954", size = 22913, upload-time = "2025-07-08T03:13:52.098Z" },
 ]
 
 [[package]]
@@ -5856,11 +5887,11 @@ wheels = [
 
 [[package]]
 name = "types-pymysql"
-version = "1.1.0.20250516"
+version = "1.1.0.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/db/11/cdaa90b82cb25c5e04e75f0b0616872aa5775b001096779375084f8dbbcf/types_pymysql-1.1.0.20250516.tar.gz", hash = "sha256:fea4a9776101cf893dfc868f42ce10d2e46dcc498c792cc7c9c0fe00cb744234", size = 19640, upload-time = "2025-05-16T03:06:54.568Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/65/a3/db349a06c64b8c041c165fc470b81d37404ec342014625c7a6b7f7a4f680/types_pymysql-1.1.0.20250708.tar.gz", hash = "sha256:2cbd7cfcf9313eda784910578c4f1d06f8cc03a15cd30ce588aa92dd6255011d", size = 21715, upload-time = "2025-07-08T03:13:56.463Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ab/64/129656e04ddda35d69faae914ce67cf60d83407ddd7afdef1e7c50bbb74a/types_pymysql-1.1.0.20250516-py3-none-any.whl", hash = "sha256:41c87a832e3ff503d5120cc6cebd64f6dcb3c407d9580a98b2cb3e3bcd109aa6", size = 20328, upload-time = "2025-05-16T03:06:53.681Z" },
+    { url = "https://files.pythonhosted.org/packages/88/e5/7f72c520f527175b6455e955426fd4f971128b4fa2f8ab2f505f254a1ddc/types_pymysql-1.1.0.20250708-py3-none-any.whl", hash = "sha256:9252966d2795945b2a7a53d5cdc49fe8e4e2f3dde4c104ed7fc782a83114e365", size = 22860, upload-time = "2025-07-08T03:13:55.367Z" },
 ]
 
 [[package]]
@@ -5878,20 +5909,20 @@ wheels = [
 
 [[package]]
 name = "types-python-dateutil"
-version = "2.9.0.20250516"
+version = "2.9.0.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ef/88/d65ed807393285204ab6e2801e5d11fbbea811adcaa979a2ed3b67a5ef41/types_python_dateutil-2.9.0.20250516.tar.gz", hash = "sha256:13e80d6c9c47df23ad773d54b2826bd52dbbb41be87c3f339381c1700ad21ee5", size = 13943, upload-time = "2025-05-16T03:06:58.385Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/95/6bdde7607da2e1e99ec1c1672a759d42f26644bbacf939916e086db34870/types_python_dateutil-2.9.0.20250708.tar.gz", hash = "sha256:ccdbd75dab2d6c9696c350579f34cffe2c281e4c5f27a585b2a2438dd1d5c8ab", size = 15834, upload-time = "2025-07-08T03:14:03.382Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c5/3f/b0e8db149896005adc938a1e7f371d6d7e9eca4053a29b108978ed15e0c2/types_python_dateutil-2.9.0.20250516-py3-none-any.whl", hash = "sha256:2b2b3f57f9c6a61fba26a9c0ffb9ea5681c9b83e69cd897c6b5f668d9c0cab93", size = 14356, upload-time = "2025-05-16T03:06:57.249Z" },
+    { url = "https://files.pythonhosted.org/packages/72/52/43e70a8e57fefb172c22a21000b03ebcc15e47e97f5cb8495b9c2832efb4/types_python_dateutil-2.9.0.20250708-py3-none-any.whl", hash = "sha256:4d6d0cc1cc4d24a2dc3816024e502564094497b713f7befda4d5bc7a8e3fd21f", size = 17724, upload-time = "2025-07-08T03:14:02.593Z" },
 ]
 
 [[package]]
 name = "types-python-http-client"
-version = "3.3.7.20240910"
+version = "3.3.7.20250708"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e1/d7/bb2754c2d1b20c1890593ec89799c99e8875b04f474197c41354f41e9d31/types-python-http-client-3.3.7.20240910.tar.gz", hash = "sha256:8a6ebd30ad4b90a329ace69c240291a6176388624693bc971a5ecaa7e9b05074", size = 2804, upload-time = "2024-09-10T02:38:31.608Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/55/a0/0ad93698a3ebc6846ca23aca20ff6f6f8ebe7b4f0c1de7f19e87c03dbe8f/types_python_http_client-3.3.7.20250708.tar.gz", hash = "sha256:5f85b32dc64671a4e5e016142169aa187c5abed0b196680944e4efd3d5ce3322", size = 7707, upload-time = "2025-07-08T03:14:36.197Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/64/95/8f492d37d99630e096acbb4071788483282a34a73ae89dd1a5727f4189cc/types_python_http_client-3.3.7.20240910-py3-none-any.whl", hash = "sha256:58941bd986fb8bb0f4f782ef376be145ece8023f391364fbcd22bd26b13a140e", size = 3917, upload-time = "2024-09-10T02:38:30.261Z" },
+    { url = "https://files.pythonhosted.org/packages/85/4f/b88274658cf489e35175be8571c970e9a1219713bafd8fc9e166d7351ecb/types_python_http_client-3.3.7.20250708-py3-none-any.whl", hash = "sha256:e2fc253859decab36713d82fc7f205868c3ddeaee79dbb55956ad9ca77abe12b", size = 8890, upload-time = "2025-07-08T03:14:35.506Z" },
 ]
 
 [[package]]
@@ -6040,11 +6071,11 @@ wheels = [
 
 [[package]]
 name = "typing-extensions"
-version = "4.14.0"
+version = "4.14.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d1/bc/51647cd02527e87d05cb083ccc402f93e441606ff1f01739a62c8ad09ba5/typing_extensions-4.14.0.tar.gz", hash = "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4", size = 107423, upload-time = "2025-06-02T14:52:11.399Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/98/5a/da40306b885cc8c09109dc2e1abd358d5684b1425678151cdaed4731c822/typing_extensions-4.14.1.tar.gz", hash = "sha256:38b39f4aeeab64884ce9f74c94263ef78f3c22467c8724005483154c26648d36", size = 107673, upload-time = "2025-07-04T13:28:34.16Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/69/e0/552843e0d356fbb5256d21449fa957fa4eff3bbc135a74a691ee70c7c5da/typing_extensions-4.14.0-py3-none-any.whl", hash = "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af", size = 43839, upload-time = "2025-06-02T14:52:10.026Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/00/d631e67a838026495268c2f6884f3711a15a9a2a96cd244fdaea53b823fb/typing_extensions-4.14.1-py3-none-any.whl", hash = "sha256:d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76", size = 43906, upload-time = "2025-07-04T13:28:32.743Z" },
 ]
 
 [[package]]
@@ -6172,7 +6203,7 @@ pptx = [
 
 [[package]]
 name = "unstructured-client"
-version = "0.37.4"
+version = "0.38.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiofiles" },
@@ -6183,9 +6214,9 @@ dependencies = [
     { name = "pypdf" },
     { name = "requests-toolbelt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/6c/6f/8dd20dab879f25074d6abfbb98f77bb8efeea0ae1bdf9a414b3e73c152b6/unstructured_client-0.37.4.tar.gz", hash = "sha256:5a4029563c2f79de098374fd8a99090719df325b4bdcfa3a87820908f2c83e6c", size = 90481, upload-time = "2025-07-01T16:40:09.877Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/85/60/412092671bfc4952640739f2c0c9b2f4c8af26a3c921738fd12621b4ddd8/unstructured_client-0.38.1.tar.gz", hash = "sha256:43ab0670dd8ff53d71e74f9b6dfe490a84a5303dab80a4873e118a840c6d46ca", size = 91781, upload-time = "2025-07-03T15:46:35.054Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/93/09/4399b0c32564b1a19fef943b5acea5a16fa0c6aa7a320065ce726b8245c1/unstructured_client-0.37.4-py3-none-any.whl", hash = "sha256:31975c0ea4408e369e6aad11c9e746d1f3f14013ac5c89f9f8dbada3a21dcec0", size = 211242, upload-time = "2025-07-01T16:40:08.642Z" },
+    { url = "https://files.pythonhosted.org/packages/26/e0/8c249f00ba85fb4aba5c541463312befbfbf491105ff5c06e508089467be/unstructured_client-0.38.1-py3-none-any.whl", hash = "sha256:71e5467870d0a0119c788c29ec8baf5c0f7123f424affc9d6682eeeb7b8d45fa", size = 212626, upload-time = "2025-07-03T15:46:33.929Z" },
 ]
 
 [[package]]
@@ -6220,11 +6251,11 @@ wheels = [
 
 [[package]]
 name = "uuid6"
-version = "2025.0.0"
+version = "2025.0.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/3f/49/06a089c184580f510e20226d9a081e4323d13db2fbc92d566697b5395c1e/uuid6-2025.0.0.tar.gz", hash = "sha256:bb78aa300e29db89b00410371d0c1f1824e59e29995a9daa3dedc8033d1d84ec", size = 13941, upload-time = "2025-06-11T20:02:05.324Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/b7/4c0f736ca824b3a25b15e8213d1bcfc15f8ac2ae48d1b445b310892dc4da/uuid6-2025.0.1.tar.gz", hash = "sha256:cd0af94fa428675a44e32c5319ec5a3485225ba2179eefcf4c3f205ae30a81bd", size = 13932, upload-time = "2025-07-04T18:30:35.186Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0a/50/4da47101af45b6cfa291559577993b52ee4399b3cd54ba307574a11e4f3a/uuid6-2025.0.0-py3-none-any.whl", hash = "sha256:2c73405ff5333c7181443958c6865e0d1b9b816bb160549e8d80ba186263cb3a", size = 7001, upload-time = "2025-06-11T20:02:04.521Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/b2/93faaab7962e2aa8d6e174afb6f76be2ca0ce89fde14d3af835acebcaa59/uuid6-2025.0.1-py3-none-any.whl", hash = "sha256:80530ce4d02a93cdf82e7122ca0da3ebbbc269790ec1cb902481fa3e9cc9ff99", size = 6979, upload-time = "2025-07-04T18:30:34.001Z" },
 ]
 
 [[package]]
diff --git a/docker/nginx/conf.d/default.conf.template b/docker/nginx/conf.d/default.conf.template
index a458412d1e..48d7da8cf5 100644
--- a/docker/nginx/conf.d/default.conf.template
+++ b/docker/nginx/conf.d/default.conf.template
@@ -39,7 +39,10 @@ server {
       proxy_pass http://web:3000;
       include proxy.conf;
     }
-
+    location /mcp {
+      proxy_pass http://api:5001;
+      include proxy.conf;
+    }
     # placeholder for acme challenge location
     ${ACME_CHALLENGE_LOCATION}
 

From 5375d9bb27c19fc6dd6dfc4f63cfef33fbf6f7e4 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Thu, 10 Jul 2025 14:14:02 +0800
Subject: [PATCH 12/39] feat: the frontend part of mcp (#22131)

Co-authored-by: jZonG <jzongcode@gmail.com>
Co-authored-by: Novice <novice12185727@gmail.com>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: Hanqing Zhao <sherry9277@gmail.com>
---
 .../[appId]/overview/cardView.tsx             |   8 +
 web/app/components/app-sidebar/basic.tsx      |  33 +-
 .../config/agent/agent-tools/index.tsx        |  68 +++-
 .../agent-tools/setting-built-in-tool.tsx     |  12 +-
 web/app/components/app/overview/appCard.tsx   |   1 +
 web/app/components/base/app-icon/index.tsx    |   3 +
 .../assets/vender/line/others/search-menu.svg |   7 +
 .../base/icons/assets/vender/other/mcp.svg    |   4 +
 .../vender/other/no-tool-placeholder.svg      |  36 ++
 .../assets/vender/workflow/window-cursor.svg  |   7 +
 .../src/vender/line/others/SearchMenu.json    |  77 +++++
 .../src/vender/line/others/SearchMenu.tsx     |  20 ++
 .../icons/src/vender/line/others/index.ts     |   1 +
 .../base/icons/src/vender/other/Mcp.json      |  35 ++
 .../base/icons/src/vender/other/Mcp.tsx       |  20 ++
 .../src/vender/other/NoToolPlaceholder.json   | 279 ++++++++++++++++
 .../src/vender/other/NoToolPlaceholder.tsx    |  20 ++
 .../base/icons/src/vender/other/index.ts      |   2 +
 .../src/vender/workflow/WindowCursor.json     |  62 ++++
 .../src/vender/workflow/WindowCursor.tsx      |  20 ++
 .../base/icons/src/vender/workflow/index.ts   |   1 +
 .../components/base/prompt-editor/index.tsx   |  25 +-
 .../plugins/custom-text/node.tsx              |   1 -
 .../prompt-editor/plugins/placeholder.tsx     |   2 +-
 .../model-provider-page/declarations.ts       |   6 +
 .../model-provider-page/model-modal/Form.tsx  |   3 +
 .../plugins/marketplace/search-box/index.tsx  |  90 +++--
 .../marketplace/search-box/tags-filter.tsx    |  50 +--
 .../multiple-tool-selector/index.tsx          |  28 +-
 .../tool-selector/index.tsx                   |  62 ++--
 .../tool-selector/reasoning-config-form.tsx   | 306 +++++++++++------
 .../tool-selector/schema-modal.tsx            |  59 ++++
 .../tool-selector/tool-item.tsx               |  22 +-
 web/app/components/plugins/types.ts           |   5 +
 .../components/tools/add-tool-modal/empty.tsx |  49 ++-
 .../edit-custom-collection-modal/modal.tsx    |   1 +
 web/app/components/tools/mcp/create-card.tsx  |  75 +++++
 .../components/tools/mcp/detail/content.tsx   | 308 ++++++++++++++++++
 .../tools/mcp/detail/list-loading.tsx         |  37 +++
 .../tools/mcp/detail/operation-dropdown.tsx   |  88 +++++
 .../tools/mcp/detail/provider-detail.tsx      |  56 ++++
 .../components/tools/mcp/detail/tool-item.tsx |  41 +++
 web/app/components/tools/mcp/hooks.ts         |  12 +
 web/app/components/tools/mcp/index.tsx        |  98 ++++++
 .../components/tools/mcp/mcp-server-modal.tsx | 134 ++++++++
 .../tools/mcp/mcp-server-param-item.tsx       |  37 +++
 .../components/tools/mcp/mcp-service-card.tsx | 244 ++++++++++++++
 web/app/components/tools/mcp/mock.ts          | 154 +++++++++
 web/app/components/tools/mcp/modal.tsx        | 221 +++++++++++++
 .../components/tools/mcp/provider-card.tsx    | 152 +++++++++
 web/app/components/tools/provider-list.tsx    |  54 ++-
 .../tools/provider/custom-create-card.tsx     |  24 +-
 .../components/tools/provider/tool-item.tsx   |   2 +-
 web/app/components/tools/types.ts             |  13 +
 .../components/tools/utils/to-form-schema.ts  | 108 +++++-
 .../workflow-header/features-trigger.tsx      |   6 +-
 .../workflow/block-selector/all-tools.tsx     |  50 ++-
 .../workflow/block-selector/hooks.ts          |  13 +-
 .../workflow/block-selector/index-bar.tsx     |   4 +-
 .../workflow/block-selector/index.tsx         |  50 +--
 .../market-place-plugin/list.tsx              |  28 +-
 .../workflow/block-selector/tabs.tsx          |  28 +-
 .../workflow/block-selector/tool-picker.tsx   |  26 +-
 .../block-selector/tool/action-item.tsx       |  20 +-
 .../tool/tool-list-flat-view/list.tsx         |  53 +--
 .../tool/tool-list-tree-view/item.tsx         |   9 +
 .../tool/tool-list-tree-view/list.tsx         |   9 +
 .../workflow/block-selector/tool/tool.tsx     | 154 +++++++--
 .../workflow/block-selector/tools.tsx         |  33 +-
 .../workflow/block-selector/types.ts          |   5 +
 .../use-check-vertical-scrollbar.ts           |  31 ++
 .../components/workflow/hooks/use-workflow.ts |  14 +-
 web/app/components/workflow/index.tsx         |   1 +
 .../components/agent-strategy-selector.tsx    |  22 +-
 .../nodes/_base/components/agent-strategy.tsx |  13 +-
 .../nodes/_base/components/editor/base.tsx    |   2 +-
 .../components/editor/code-editor/index.tsx   |   2 +-
 .../_base/components/form-input-boolean.tsx   |  35 ++
 .../_base/components/form-input-item.tsx      | 279 ++++++++++++++++
 .../components/form-input-type-switch.tsx     |  47 +++
 .../mcp-tool-not-support-tooltip.tsx          |  22 ++
 .../nodes/_base/components/setting-item.tsx   |   2 +-
 .../variable/var-reference-picker.tsx         |   1 +
 .../variable/var-reference-popup.tsx          |   3 +
 .../variable/var-reference-vars.tsx           |   7 +-
 .../components/workflow/nodes/_base/node.tsx  |   6 +
 .../nodes/agent/components/tool-icon.tsx      |  54 +--
 .../workflow/nodes/agent/default.ts           |  18 +-
 .../components/workflow/nodes/agent/node.tsx  |   2 +-
 .../components/workflow/nodes/agent/panel.tsx |   5 +-
 .../components/workflow/nodes/agent/types.ts  |   3 +
 .../workflow/nodes/agent/use-config.ts        |  45 ++-
 .../visual-editor/hooks.ts                    |   4 +-
 .../visual-editor/index.tsx                   |  13 +-
 .../visual-editor/schema-node.tsx             |   6 +-
 .../nodes/tool/components/copy-id.tsx         |  51 +++
 .../mixed-variable-text-input/index.tsx       |  62 ++++
 .../mixed-variable-text-input/placeholder.tsx |  51 +++
 .../nodes/tool/components/tool-form/index.tsx |  51 +++
 .../nodes/tool/components/tool-form/item.tsx  | 105 ++++++
 .../components/workflow/nodes/tool/default.ts |   3 +
 .../components/workflow/nodes/tool/node.tsx   |  13 +-
 .../components/workflow/nodes/tool/panel.tsx  |  52 +--
 .../components/workflow/nodes/tool/types.ts   |   1 +
 .../workflow/nodes/tool/use-config.ts         |  67 ++--
 .../nodes/tool/use-single-run-form-params.ts  |  12 +-
 .../workflow/store/workflow/tool-slice.ts     |   4 +
 web/app/components/workflow/types.ts          |   2 +
 .../workflow/utils/workflow-init.ts           |  20 ++
 web/app/oauth-callback/page.tsx               |  10 +
 web/hooks/use-oauth.ts                        |  36 ++
 web/i18n/de-DE/plugin.ts                      |   2 +-
 web/i18n/de-DE/tools.ts                       |  90 ++++-
 web/i18n/en-US/plugin.ts                      |   5 +-
 web/i18n/en-US/tools.ts                       |  84 ++++-
 web/i18n/en-US/workflow.ts                    |  11 +
 web/i18n/es-ES/plugin.ts                      |   4 +-
 web/i18n/es-ES/tools.ts                       |  84 ++++-
 web/i18n/fa-IR/tools.ts                       |  84 ++++-
 web/i18n/fr-FR/plugin.ts                      |   4 +-
 web/i18n/fr-FR/tools.ts                       |  84 ++++-
 web/i18n/hi-IN/tools.ts                       |  84 ++++-
 web/i18n/it-IT/tools.ts                       |  84 ++++-
 web/i18n/ja-JP/tools.ts                       |  85 ++++-
 web/i18n/ko-KR/tools.ts                       |  84 ++++-
 web/i18n/pl-PL/plugin.ts                      |   4 +-
 web/i18n/pl-PL/tools.ts                       |  84 ++++-
 web/i18n/pt-BR/plugin.ts                      |   4 +-
 web/i18n/pt-BR/tools.ts                       |  84 ++++-
 web/i18n/ro-RO/plugin.ts                      |   4 +-
 web/i18n/ro-RO/tools.ts                       |  84 ++++-
 web/i18n/ru-RU/tools.ts                       |  84 ++++-
 web/i18n/sl-SI/tools.ts                       |  84 ++++-
 web/i18n/th-TH/tools.ts                       |  84 ++++-
 web/i18n/tr-TR/tools.ts                       |  84 ++++-
 web/i18n/uk-UA/tools.ts                       |  84 ++++-
 web/i18n/vi-VN/tools.ts                       |  84 ++++-
 web/i18n/zh-Hans/plugin.ts                    |   1 +
 web/i18n/zh-Hans/tools.ts                     |  84 ++++-
 web/i18n/zh-Hans/workflow.ts                  |  11 +
 web/i18n/zh-Hant/tools.ts                     |  84 ++++-
 web/package.json                              |   1 +
 web/pnpm-lock.yaml                            |  16 +
 web/service/common.ts                         |   4 +-
 web/service/tools.ts                          |   4 +
 web/service/use-tools.ts                      | 189 ++++++++++-
 web/service/use-workflow.ts                   |  12 +-
 web/tailwind-common-config.ts                 |   1 +
 web/utils/plugin-version-feature.spec.ts      |  26 ++
 web/utils/plugin-version-feature.ts           |  10 +
 web/utils/semver.spec.ts                      |  75 +++++
 web/utils/semver.ts                           |   4 +
 152 files changed, 6336 insertions(+), 691 deletions(-)
 create mode 100644 web/app/components/base/icons/assets/vender/line/others/search-menu.svg
 create mode 100644 web/app/components/base/icons/assets/vender/other/mcp.svg
 create mode 100644 web/app/components/base/icons/assets/vender/other/no-tool-placeholder.svg
 create mode 100644 web/app/components/base/icons/assets/vender/workflow/window-cursor.svg
 create mode 100644 web/app/components/base/icons/src/vender/line/others/SearchMenu.json
 create mode 100644 web/app/components/base/icons/src/vender/line/others/SearchMenu.tsx
 create mode 100644 web/app/components/base/icons/src/vender/other/Mcp.json
 create mode 100644 web/app/components/base/icons/src/vender/other/Mcp.tsx
 create mode 100644 web/app/components/base/icons/src/vender/other/NoToolPlaceholder.json
 create mode 100644 web/app/components/base/icons/src/vender/other/NoToolPlaceholder.tsx
 create mode 100644 web/app/components/base/icons/src/vender/workflow/WindowCursor.json
 create mode 100644 web/app/components/base/icons/src/vender/workflow/WindowCursor.tsx
 create mode 100644 web/app/components/plugins/plugin-detail-panel/tool-selector/schema-modal.tsx
 create mode 100644 web/app/components/tools/mcp/create-card.tsx
 create mode 100644 web/app/components/tools/mcp/detail/content.tsx
 create mode 100644 web/app/components/tools/mcp/detail/list-loading.tsx
 create mode 100644 web/app/components/tools/mcp/detail/operation-dropdown.tsx
 create mode 100644 web/app/components/tools/mcp/detail/provider-detail.tsx
 create mode 100644 web/app/components/tools/mcp/detail/tool-item.tsx
 create mode 100644 web/app/components/tools/mcp/hooks.ts
 create mode 100644 web/app/components/tools/mcp/index.tsx
 create mode 100644 web/app/components/tools/mcp/mcp-server-modal.tsx
 create mode 100644 web/app/components/tools/mcp/mcp-server-param-item.tsx
 create mode 100644 web/app/components/tools/mcp/mcp-service-card.tsx
 create mode 100644 web/app/components/tools/mcp/mock.ts
 create mode 100644 web/app/components/tools/mcp/modal.tsx
 create mode 100644 web/app/components/tools/mcp/provider-card.tsx
 create mode 100644 web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts
 create mode 100644 web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx
 create mode 100644 web/app/components/workflow/nodes/_base/components/form-input-item.tsx
 create mode 100644 web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx
 create mode 100644 web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx
 create mode 100644 web/app/components/workflow/nodes/tool/components/copy-id.tsx
 create mode 100644 web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx
 create mode 100644 web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/placeholder.tsx
 create mode 100644 web/app/components/workflow/nodes/tool/components/tool-form/index.tsx
 create mode 100644 web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
 create mode 100644 web/app/oauth-callback/page.tsx
 create mode 100644 web/hooks/use-oauth.ts
 create mode 100644 web/utils/plugin-version-feature.spec.ts
 create mode 100644 web/utils/plugin-version-feature.ts
 create mode 100644 web/utils/semver.spec.ts

diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx
index 084adceef2..3d572b926a 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
 import AppCard from '@/app/components/app/overview/appCard'
 import Loading from '@/app/components/base/loading'
+import MCPServiceCard from '@/app/components/tools/mcp/mcp-service-card'
 import { ToastContext } from '@/app/components/base/toast'
 import {
   fetchAppDetail,
@@ -31,6 +32,8 @@ const CardView: FC<ICardViewProps> = ({ appId, isInPanel, className }) => {
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(state => state.setAppDetail)
 
+  const showMCPCard = isInPanel
+
   const updateAppDetail = async () => {
     try {
       const res = await fetchAppDetail({ url: '/apps', id: appId })
@@ -117,6 +120,11 @@ const CardView: FC<ICardViewProps> = ({ appId, isInPanel, className }) => {
         isInPanel={isInPanel}
         onChangeStatus={onChangeApiStatus}
       />
+      {showMCPCard && (
+        <MCPServiceCard
+          appInfo={appDetail}
+        />
+      )}
     </div>
   )
 }
diff --git a/web/app/components/app-sidebar/basic.tsx b/web/app/components/app-sidebar/basic.tsx
index 6a7d5a13c2..00357d6c27 100644
--- a/web/app/components/app-sidebar/basic.tsx
+++ b/web/app/components/app-sidebar/basic.tsx
@@ -2,6 +2,10 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '../base/app-icon'
 import Tooltip from '@/app/components/base/tooltip'
+import {
+  Code,
+  WindowCursor,
+} from '@/app/components/base/icons/src/vender/workflow'
 
 export type IAppBasicProps = {
   iconType?: 'app' | 'api' | 'dataset' | 'webapp' | 'notion'
@@ -14,25 +18,13 @@ export type IAppBasicProps = {
   textStyle?: { main?: string; extra?: string }
   isExtraInLine?: boolean
   mode?: string
+  hideType?: boolean
 }
 
-const ApiSvg = <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M8.5 3.5C8.5 4.60457 9.39543 5.5 10.5 5.5C11.6046 5.5 12.5 4.60457 12.5 3.5C12.5 2.39543 11.6046 1.5 10.5 1.5C9.39543 1.5 8.5 2.39543 8.5 3.5Z" stroke="#5850EC" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-  <path d="M12.5 9C12.5 10.1046 13.3954 11 14.5 11C15.6046 11 16.5 10.1046 16.5 9C16.5 7.89543 15.6046 7 14.5 7C13.3954 7 12.5 7.89543 12.5 9Z" stroke="#5850EC" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-  <path d="M8.5 3.5H5.5L3.5 6.5" stroke="#5850EC" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-  <path d="M8.5 14.5C8.5 15.6046 9.39543 16.5 10.5 16.5C11.6046 16.5 12.5 15.6046 12.5 14.5C12.5 13.3954 11.6046 12.5 10.5 12.5C9.39543 12.5 8.5 13.3954 8.5 14.5Z" stroke="#5850EC" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-  <path d="M8.5 14.5H5.5L3.5 11.5" stroke="#5850EC" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-  <path d="M12.5 9H1.5" stroke="#5850EC" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-</svg>
-
 const DatasetSvg = <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path fillRule="evenodd" clipRule="evenodd" d="M0.833497 5.13481C0.833483 4.69553 0.83347 4.31654 0.858973 4.0044C0.88589 3.67495 0.94532 3.34727 1.10598 3.03195C1.34567 2.56155 1.72812 2.17909 2.19852 1.93941C2.51384 1.77875 2.84152 1.71932 3.17097 1.6924C3.48312 1.6669 3.86209 1.66691 4.30137 1.66693L7.62238 1.66684C8.11701 1.66618 8.55199 1.66561 8.95195 1.80356C9.30227 1.92439 9.62134 2.12159 9.88607 2.38088C10.1883 2.67692 10.3823 3.06624 10.603 3.50894L11.3484 5.00008H14.3679C15.0387 5.00007 15.5924 5.00006 16.0434 5.03691C16.5118 5.07518 16.9424 5.15732 17.3468 5.36339C17.974 5.68297 18.4839 6.19291 18.8035 6.82011C19.0096 7.22456 19.0917 7.65515 19.13 8.12356C19.1668 8.57455 19.1668 9.12818 19.1668 9.79898V13.5345C19.1668 14.2053 19.1668 14.7589 19.13 15.2099C19.0917 15.6784 19.0096 16.1089 18.8035 16.5134C18.4839 17.1406 17.974 17.6505 17.3468 17.9701C16.9424 18.1762 16.5118 18.2583 16.0434 18.2966C15.5924 18.3334 15.0387 18.3334 14.3679 18.3334H5.63243C4.96163 18.3334 4.40797 18.3334 3.95698 18.2966C3.48856 18.2583 3.05798 18.1762 2.65353 17.9701C2.02632 17.6505 1.51639 17.1406 1.19681 16.5134C0.990734 16.1089 0.908597 15.6784 0.870326 15.2099C0.833478 14.7589 0.833487 14.2053 0.833497 13.5345V5.13481ZM7.51874 3.33359C8.17742 3.33359 8.30798 3.34447 8.4085 3.37914C8.52527 3.41942 8.63163 3.48515 8.71987 3.57158C8.79584 3.64598 8.86396 3.7579 9.15852 4.34704L9.48505 5.00008L2.50023 5.00008C2.50059 4.61259 2.50314 4.34771 2.5201 4.14012C2.5386 3.91374 2.57 3.82981 2.59099 3.7886C2.67089 3.6318 2.79837 3.50432 2.95517 3.42442C2.99638 3.40343 3.08031 3.37203 3.30669 3.35353C3.54281 3.33424 3.85304 3.33359 4.3335 3.33359H7.51874Z" fill="#444CE7" />
 </svg>
 
-const WebappSvg = <svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M14.375 5.45825L7.99998 8.99992M7.99998 8.99992L1.62498 5.45825M7.99998 8.99992L8 16.1249M14.75 12.0439V5.95603C14.75 5.69904 14.75 5.57055 14.7121 5.45595C14.6786 5.35457 14.6239 5.26151 14.5515 5.18299C14.4697 5.09424 14.3574 5.03184 14.1328 4.90704L8.58277 1.8237C8.37007 1.70553 8.26372 1.64645 8.15109 1.62329C8.05141 1.60278 7.9486 1.60278 7.84891 1.62329C7.73628 1.64645 7.62993 1.70553 7.41723 1.8237L1.86723 4.90704C1.64259 5.03184 1.53026 5.09424 1.44847 5.18299C1.37612 5.26151 1.32136 5.35457 1.28786 5.45595C1.25 5.57055 1.25 5.69904 1.25 5.95603V12.0439C1.25 12.3008 1.25 12.4293 1.28786 12.5439C1.32136 12.6453 1.37612 12.7384 1.44847 12.8169C1.53026 12.9056 1.64259 12.968 1.86723 13.0928L7.41723 16.1762C7.62993 16.2943 7.73628 16.3534 7.84891 16.3766C7.9486 16.3971 8.05141 16.3971 8.15109 16.3766C8.26372 16.3534 8.37007 16.2943 8.58277 16.1762L14.1328 13.0928C14.3574 12.968 14.4697 12.9056 14.5515 12.8169C14.6239 12.7384 14.6786 12.6453 14.7121 12.5439C14.75 12.4293 14.75 12.3008 14.75 12.0439Z" stroke="#155EEF" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
-</svg>
-
 const NotionSvg = <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
   <g clipPath="url(#clip0_6294_13848)">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M4.287 21.9133L1.70748 18.6999C1.08685 17.9267 0.75 16.976 0.75 15.9974V4.36124C0.75 2.89548 1.92269 1.67923 3.43553 1.57594L15.3991 0.759137C16.2682 0.699797 17.1321 0.930818 17.8461 1.41353L22.0494 4.25543C22.8018 4.76414 23.25 5.59574 23.25 6.48319V19.7124C23.25 21.1468 22.0969 22.3345 20.6157 22.4256L7.3375 23.243C6.1555 23.3158 5.01299 22.8178 4.287 21.9133Z" fill="white" />
@@ -48,13 +40,17 @@ const NotionSvg = <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xm
 
 const ICON_MAP = {
   app: <AppIcon className='border !border-[rgba(0,0,0,0.05)]' />,
-  api: <AppIcon innerIcon={ApiSvg} className='border !border-purple-200 !bg-purple-50' />,
+  api: <div className='rounded-lg border-[0.5px] border-divider-subtle bg-util-colors-violet-violet-500 p-1 shadow-md'>
+    <Code className='h-4 w-4 text-text-primary-on-surface' />
+  </div>,
   dataset: <AppIcon innerIcon={DatasetSvg} className='!border-[0.5px] !border-indigo-100 !bg-indigo-25' />,
-  webapp: <AppIcon innerIcon={WebappSvg} className='border !border-primary-200 !bg-primary-100' />,
+  webapp: <div className='rounded-lg border-[0.5px] border-divider-subtle bg-util-colors-blue-brand-blue-brand-500 p-1 shadow-md'>
+  <WindowCursor className='h-4 w-4 text-text-primary-on-surface' />
+</div>,
   notion: <AppIcon innerIcon={NotionSvg} className='!border-[0.5px] !border-indigo-100 !bg-white' />,
 }
 
-export default function AppBasic({ icon, icon_background, name, isExternal, type, hoverTip, textStyle, isExtraInLine, mode = 'expand', iconType = 'app' }: IAppBasicProps) {
+export default function AppBasic({ icon, icon_background, name, isExternal, type, hoverTip, textStyle, isExtraInLine, mode = 'expand', iconType = 'app', hideType }: IAppBasicProps) {
   const { t } = useTranslation()
 
   return (
@@ -88,9 +84,10 @@ export default function AppBasic({ icon, icon_background, name, isExternal, type
             />
           }
         </div>
-        {isExtraInLine ? (
+        {!hideType && isExtraInLine && (
           <div className="system-2xs-medium-uppercase flex text-text-tertiary">{type}</div>
-        ) : (
+        )}
+        {!hideType && !isExtraInLine && (
           <div className='system-2xs-medium-uppercase text-text-tertiary'>{isExternal ? t('dataset.externalTag') : type}</div>
         )}
       </div>}
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
index a3149447d4..66fe85a170 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
@@ -30,15 +30,31 @@ import ConfigCredential from '@/app/components/tools/setting/build-in/config-cre
 import { updateBuiltInToolCredential } from '@/service/tools'
 import cn from '@/utils/classnames'
 import ToolPicker from '@/app/components/workflow/block-selector/tool-picker'
-import type { ToolDefaultValue } from '@/app/components/workflow/block-selector/types'
+import type { ToolDefaultValue, ToolValue } from '@/app/components/workflow/block-selector/types'
 import { canFindTool } from '@/utils'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools } from '@/service/use-tools'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
 import { useMittContextSelector } from '@/context/mitt-context'
 
 type AgentToolWithMoreInfo = AgentTool & { icon: any; collection?: Collection } | null
 const AgentTools: FC = () => {
   const { t } = useTranslation()
   const [isShowChooseTool, setIsShowChooseTool] = useState(false)
-  const { modelConfig, setModelConfig, collectionList } = useContext(ConfigContext)
+  const { modelConfig, setModelConfig } = useContext(ConfigContext)
+  const { data: buildInTools } = useAllBuiltInTools()
+  const { data: customTools } = useAllCustomTools()
+  const { data: workflowTools } = useAllWorkflowTools()
+  const { data: mcpTools } = useAllMCPTools()
+  const collectionList = useMemo(() => {
+    const allTools = [
+      ...(buildInTools || []),
+      ...(customTools || []),
+      ...(workflowTools || []),
+      ...(mcpTools || []),
+    ]
+    return allTools
+  }, [buildInTools, customTools, workflowTools, mcpTools])
+
   const formattingChangedDispatcher = useFormattingChangedDispatcher()
   const [currentTool, setCurrentTool] = useState<AgentToolWithMoreInfo>(null)
   const currentCollection = useMemo(() => {
@@ -96,23 +112,38 @@ const AgentTools: FC = () => {
   }
 
   const [isDeleting, setIsDeleting] = useState<number>(-1)
-
+  const getToolValue = (tool: ToolDefaultValue) => {
+    return {
+      provider_id: tool.provider_id,
+      provider_type: tool.provider_type as CollectionType,
+      provider_name: tool.provider_name,
+      tool_name: tool.tool_name,
+      tool_label: tool.tool_label,
+      tool_parameters: tool.params,
+      notAuthor: !tool.is_team_authorization,
+      enabled: true,
+    }
+  }
   const handleSelectTool = (tool: ToolDefaultValue) => {
     const newModelConfig = produce(modelConfig, (draft) => {
-      draft.agentConfig.tools.push({
-        provider_id: tool.provider_id,
-        provider_type: tool.provider_type as CollectionType,
-        provider_name: tool.provider_name,
-        tool_name: tool.tool_name,
-        tool_label: tool.tool_label,
-        tool_parameters: tool.params,
-        notAuthor: !tool.is_team_authorization,
-        enabled: true,
-      })
+      draft.agentConfig.tools.push(getToolValue(tool))
     })
     setModelConfig(newModelConfig)
   }
 
+  const handleSelectMultipleTool = (tool: ToolDefaultValue[]) => {
+    const newModelConfig = produce(modelConfig, (draft) => {
+      draft.agentConfig.tools.push(...tool.map(getToolValue))
+    })
+    setModelConfig(newModelConfig)
+  }
+  const getProviderShowName = (item: AgentTool) => {
+    const type = item.provider_type
+    if(type === CollectionType.builtIn)
+      return item.provider_name.split('/').pop()
+    return item.provider_name
+  }
+
   return (
     <>
       <Panel
@@ -143,7 +174,9 @@ const AgentTools: FC = () => {
                   disabled={false}
                   supportAddCustomTool
                   onSelect={handleSelectTool}
-                  selectedTools={tools as any}
+                  onSelectMultiple={handleSelectMultipleTool}
+                  selectedTools={tools as unknown as ToolValue[]}
+                  canChooseMCPTool
                 />
               </>
             )}
@@ -161,7 +194,7 @@ const AgentTools: FC = () => {
               <div className='flex w-0 grow items-center'>
                 {item.isDeleted && <DefaultToolIcon className='h-5 w-5' />}
                 {!item.isDeleted && (
-                  <div className={cn((item.notAuthor || !item.enabled) && 'opacity-50')}>
+                  <div className={cn((item.notAuthor || !item.enabled) && 'shrink-0 opacity-50')}>
                     {typeof item.icon === 'string' && <div className='h-5 w-5 rounded-md bg-cover bg-center' style={{ backgroundImage: `url(${item.icon})` }} />}
                     {typeof item.icon !== 'string' && <AppIcon className='rounded-md' size='xs' icon={item.icon?.content} background={item.icon?.background} />}
                   </div>
@@ -172,7 +205,7 @@ const AgentTools: FC = () => {
                     (item.isDeleted || item.notAuthor || !item.enabled) ? 'opacity-50' : '',
                   )}
                 >
-                  <span className='system-xs-medium pr-1.5 text-text-secondary'>{item.provider_type === CollectionType.builtIn ? item.provider_name.split('/').pop() : item.tool_label}</span>
+                  <span className='system-xs-medium pr-1.5 text-text-secondary'>{getProviderShowName(item)}</span>
                   <span className='text-text-tertiary'>{item.tool_label}</span>
                   {!item.isDeleted && (
                     <Tooltip
@@ -285,8 +318,7 @@ const AgentTools: FC = () => {
         <SettingBuiltInTool
           toolName={currentTool?.tool_name as string}
           setting={currentTool?.tool_parameters}
-          collection={currentTool?.collection as Collection}
-          isBuiltIn={currentTool?.collection?.type === CollectionType.builtIn}
+          collection={currentTool?.collection as ToolWithProvider}
           isModel={currentTool?.collection?.type === CollectionType.model}
           onSave={handleToolSettingChange}
           onHide={() => setIsShowSettingTool(false)}
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
index 952ad66fc4..1ad814c6e9 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
@@ -24,10 +24,11 @@ import { fetchBuiltInToolList, fetchCustomToolList, fetchModelToolList, fetchWor
 import I18n from '@/context/i18n'
 import { getLanguage } from '@/i18n/language'
 import cn from '@/utils/classnames'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
 
 type Props = {
   showBackButton?: boolean
-  collection: Collection
+  collection: Collection | ToolWithProvider
   isBuiltIn?: boolean
   isModel?: boolean
   toolName: string
@@ -51,9 +52,10 @@ const SettingBuiltInTool: FC<Props> = ({
   const { locale } = useContext(I18n)
   const language = getLanguage(locale)
   const { t } = useTranslation()
-
-  const [isLoading, setIsLoading] = useState(true)
-  const [tools, setTools] = useState<Tool[]>([])
+  const passedTools = (collection as ToolWithProvider).tools
+  const hasPassedTools = passedTools?.length > 0
+  const [isLoading, setIsLoading] = useState(!hasPassedTools)
+  const [tools, setTools] = useState<Tool[]>(hasPassedTools ? passedTools : [])
   const currTool = tools.find(tool => tool.name === toolName)
   const formSchemas = currTool ? toolParametersToFormSchemas(currTool.parameters) : []
   const infoSchemas = formSchemas.filter(item => item.form === 'llm')
@@ -63,7 +65,7 @@ const SettingBuiltInTool: FC<Props> = ({
   const [currType, setCurrType] = useState('info')
   const isInfoActive = currType === 'info'
   useEffect(() => {
-    if (!collection)
+    if (!collection || hasPassedTools)
       return
 
     (async () => {
diff --git a/web/app/components/app/overview/appCard.tsx b/web/app/components/app/overview/appCard.tsx
index 9f3b3ac4a6..f11e111cb0 100644
--- a/web/app/components/app/overview/appCard.tsx
+++ b/web/app/components/app/overview/appCard.tsx
@@ -181,6 +181,7 @@ function AppCard({
               icon={appInfo.icon}
               icon_background={appInfo.icon_background}
               name={basicName}
+              hideType
               type={
                 isApp
                   ? t('appOverview.overview.appInfo.explanation')
diff --git a/web/app/components/base/app-icon/index.tsx b/web/app/components/base/app-icon/index.tsx
index ac17af1988..003d929c8c 100644
--- a/web/app/components/base/app-icon/index.tsx
+++ b/web/app/components/base/app-icon/index.tsx
@@ -18,6 +18,7 @@ export type AppIconProps = {
   imageUrl?: string | null
   className?: string
   innerIcon?: React.ReactNode
+  coverElement?: React.ReactNode
   onClick?: () => void
 }
 const appIconVariants = cva(
@@ -51,6 +52,7 @@ const AppIcon: FC<AppIconProps> = ({
   imageUrl,
   className,
   innerIcon,
+  coverElement,
   onClick,
 }) => {
   const isValidImageIcon = iconType === 'image' && imageUrl
@@ -65,6 +67,7 @@ const AppIcon: FC<AppIconProps> = ({
       ? <img src={imageUrl} className="h-full w-full" alt="app icon" />
       : (innerIcon || ((icon && icon !== '') ? <em-emoji id={icon} /> : <em-emoji id='🤖' />))
     }
+    {coverElement}
   </span>
 }
 
diff --git a/web/app/components/base/icons/assets/vender/line/others/search-menu.svg b/web/app/components/base/icons/assets/vender/line/others/search-menu.svg
new file mode 100644
index 0000000000..f61f69f4ba
--- /dev/null
+++ b/web/app/components/base/icons/assets/vender/line/others/search-menu.svg
@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.0049 16C28.0049 20.4183 24.4231 24 20.0049 24C15.5866 24 12.0049 20.4183 12.0049 16C12.0049 11.5817 15.5866 8 20.0049 8C24.4231 8 28.0049 11.5817 28.0049 16Z" stroke="#676F83" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.00488 16H6.67155" stroke="#676F83" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.00488 9.33334H8.00488" stroke="#676F83" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.00488 22.6667H8.00488" stroke="#676F83" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26 22L29.3333 25.3333" stroke="#676F83" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/web/app/components/base/icons/assets/vender/other/mcp.svg b/web/app/components/base/icons/assets/vender/other/mcp.svg
new file mode 100644
index 0000000000..7415c060dd
--- /dev/null
+++ b/web/app/components/base/icons/assets/vender/other/mcp.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.20626 1.68651C9.61828 1.68651 10.014 1.8473 10.3093 2.13466C10.4536 2.27516 10.5684 2.44313 10.6468 2.62868C10.7252 2.81422 10.7657 3.01358 10.7659 3.21501C10.7661 3.41645 10.7259 3.61588 10.6478 3.80156C10.5697 3.98723 10.4552 4.1554 10.3111 4.29614L5.86656 8.65516C5.81837 8.70203 5.78006 8.75808 5.7539 8.82001C5.72775 8.88194 5.71427 8.94848 5.71427 9.01571C5.71427 9.08294 5.72775 9.14948 5.7539 9.21141C5.78006 9.27334 5.81837 9.32939 5.86656 9.37626C5.96503 9.47212 6.09703 9.52576 6.23445 9.52576C6.37187 9.52576 6.50387 9.47212 6.60234 9.37626L6.66222 9.31698L6.66345 9.31576L11.0463 5.01725C11.3417 4.73067 11.7372 4.57056 12.1488 4.5709C12.5604 4.57124 12.9556 4.73202 13.2506 5.01908L13.2811 5.04902C13.4256 5.18967 13.5405 5.35786 13.6189 5.54363C13.6973 5.72941 13.7377 5.92903 13.7377 6.13068C13.7377 6.33233 13.6973 6.53195 13.6189 6.71773C13.5405 6.9035 13.4256 7.07169 13.2811 7.21234L7.96082 12.43C7.84828 12.5393 7.75882 12.6701 7.69773 12.8147C7.63664 12.9592 7.60517 13.1145 7.60517 13.2714C7.60517 13.4284 7.63664 13.5837 7.69773 13.7282C7.75882 13.8728 7.84828 14.0036 7.96082 14.1129L9.05348 15.1842C9.15192 15.2799 9.28378 15.3334 9.42106 15.3334C9.55834 15.3334 9.6902 15.2799 9.78864 15.1842C9.83683 15.1373 9.87514 15.0813 9.9013 15.0194C9.92746 14.9574 9.94094 14.8909 9.94094 14.8237C9.94094 14.7564 9.92746 14.6899 9.9013 14.628C9.87514 14.566 9.83683 14.51 9.78864 14.4631L8.69598 13.3912C8.67992 13.3756 8.66716 13.357 8.65844 13.3363C8.64973 13.3157 8.64523 13.2935 8.64523 13.2711C8.64523 13.2488 8.64973 13.2266 8.65844 13.206C8.66716 13.1853 8.67992 13.1667 8.69598 13.1511L14.0163 7.93405C14.2572 7.69971 14.4488 7.41943 14.5796 7.10979C14.7104 6.80014 14.7778 6.46742 14.7778 6.13129C14.7778 5.79516 14.7104 5.46244 14.5796 5.1528C14.4488 4.84315 14.2572 4.56288 14.0163 4.32853L13.9857 4.29797C13.6978 4.01697 13.3493 3.80582 12.9669 3.6808C12.5845 3.55578 12.1785 3.52022 11.7802 3.57687C11.8371 3.1838 11.8001 2.78285 11.6722 2.40684C11.5443 2.03083 11.3292 1.69045 11.0445 1.41356C10.5524 0.93469 9.89288 0.666748 9.20626 0.666748C8.51964 0.666748 7.86012 0.93469 7.36805 1.41356L1.48555 7.18239C1.43735 7.22926 1.39905 7.28532 1.37289 7.34725C1.34673 7.40917 1.33325 7.47572 1.33325 7.54294C1.33325 7.61017 1.34673 7.67672 1.37289 7.73864C1.39905 7.80057 1.43735 7.85663 1.48555 7.9035C1.58399 7.99918 1.71585 8.0527 1.85313 8.0527C1.9904 8.0527 2.12227 7.99918 2.22071 7.9035L8.10321 2.13466C8.39848 1.8473 8.79424 1.68651 9.20626 1.68651Z" fill="white"/>
+<path d="M9.68688 3.41201C9.66072 3.47394 9.62241 3.52999 9.57422 3.57686L5.22314 7.8436C5.07864 7.98425 4.96378 8.15243 4.88535 8.33821C4.80693 8.52399 4.76652 8.7236 4.76652 8.92526C4.76652 9.12691 4.80693 9.32652 4.88535 9.5123C4.96378 9.69808 5.07864 9.86626 5.22314 10.0069C5.51841 10.2943 5.91417 10.4551 6.32619 10.4551C6.73821 10.4551 7.13397 10.2943 7.42924 10.0069L11.7797 5.74017C11.8782 5.64431 12.0102 5.59067 12.1476 5.59067C12.285 5.59067 12.417 5.64431 12.5155 5.74017C12.5637 5.78704 12.602 5.8431 12.6281 5.90503C12.6543 5.96696 12.6678 6.0335 12.6678 6.10073C12.6678 6.16795 12.6543 6.2345 12.6281 6.29643C12.602 6.35835 12.5637 6.41441 12.5155 6.46128L8.1644 10.728C7.67225 11.2067 7.01276 11.4746 6.32619 11.4746C5.63962 11.4746 4.98013 11.2067 4.48798 10.728C4.24701 10.4937 4.05547 10.2134 3.92468 9.90375C3.79389 9.59411 3.7265 9.26139 3.7265 8.92526C3.7265 8.58912 3.79389 8.2564 3.92468 7.94676C4.05547 7.63712 4.24701 7.35684 4.48798 7.1225L8.83845 2.85576C8.93691 2.75989 9.06891 2.70625 9.20633 2.70625C9.34375 2.70625 9.47575 2.75989 9.57422 2.85576C9.62241 2.90263 9.66072 2.95868 9.68688 3.02061C9.71304 3.08254 9.72651 3.14908 9.72651 3.21631C9.72651 3.28353 9.71304 3.35008 9.68688 3.41201Z" fill="white"/>
+</svg>
diff --git a/web/app/components/base/icons/assets/vender/other/no-tool-placeholder.svg b/web/app/components/base/icons/assets/vender/other/no-tool-placeholder.svg
new file mode 100644
index 0000000000..8b8729412f
--- /dev/null
+++ b/web/app/components/base/icons/assets/vender/other/no-tool-placeholder.svg
@@ -0,0 +1,36 @@
+<svg width="204" height="36" viewBox="0 0 204 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.1">
+<path d="M3.33333 18.3333C3.33333 18.5423 3.64067 18.9056 4.35365 19.2621C5.27603 19.7233 6.58451 20 8 20C9.41547 20 10.7239 19.7233 11.6463 19.2621C12.3593 18.9056 12.6667 18.5423 12.6667 18.3333V16.8858C11.5667 17.5655 9.88487 18 8 18C6.11515 18 4.43331 17.5655 3.33333 16.8858V18.3333ZM12.6667 20.2191C11.5667 20.8988 9.88487 21.3333 8 21.3333C6.11515 21.3333 4.43331 20.8988 3.33333 20.2191V21.6667C3.33333 21.8756 3.64067 22.2389 4.35365 22.5954C5.27603 23.0566 6.58451 23.3333 8 23.3333C9.41547 23.3333 10.7239 23.0566 11.6463 22.5954C12.3593 22.2389 12.6667 21.8756 12.6667 21.6667V20.2191ZM2 21.6667V15C2 13.3431 4.68629 12 8 12C11.3137 12 14 13.3431 14 15V21.6667C14 23.3235 11.3137 24.6667 8 24.6667C4.68629 24.6667 2 23.3235 2 21.6667ZM8 16.6667C9.41547 16.6667 10.7239 16.3899 11.6463 15.9288C12.3593 15.5723 12.6667 15.2089 12.6667 15C12.6667 14.7911 12.3593 14.4277 11.6463 14.0712C10.7239 13.6101 9.41547 13.3333 8 13.3333C6.58451 13.3333 5.27603 13.6101 4.35365 14.0712C3.64067 14.4277 3.33333 14.7911 3.33333 15C3.33333 15.2089 3.64067 15.5723 4.35365 15.9288C5.27603 16.3899 6.58451 16.6667 8 16.6667Z" fill="#101828" fill-opacity="0.3"/>
+</g>
+<g opacity="0.3">
+<path d="M41.3337 11.3333C41.7019 11.3333 42.0003 11.6318 42.0003 12V15.3333C42.0003 15.7015 41.7019 16 41.3337 16H38.0003V24.6667C38.0003 25.0349 37.7019 25.3333 37.3337 25.3333H34.667C34.2988 25.3333 34.0003 25.0349 34.0003 24.6667V16H30.3337C29.9655 16 29.667 15.7015 29.667 15.3333V13.7454C29.667 13.4929 29.8097 13.262 30.0355 13.1491L33.667 11.3333H41.3337ZM38.0003 12.6667H33.9818L31.0003 14.1574V14.6667H35.3337V24H36.667V14.6667H38.0003V12.6667ZM40.667 12.6667H39.3337V14.6667H40.667V12.6667Z" fill="#101828" fill-opacity="0.3"/>
+</g>
+<g opacity="0.6">
+<path d="M60.6667 13.3333C60.6667 11.8606 61.8606 10.6667 63.3333 10.6667C64.8061 10.6667 66 11.8606 66 13.3333H69.3333C69.7015 13.3333 70 13.6318 70 14V16.7805C70 16.9969 69.8949 17.1998 69.7183 17.3248C69.5415 17.4497 69.3152 17.4811 69.1112 17.409C68.973 17.3602 68.8237 17.3333 68.6667 17.3333C67.9303 17.3333 67.3333 17.9303 67.3333 18.6667C67.3333 19.4031 67.9303 20 68.6667 20C68.8237 20 68.973 19.9731 69.1112 19.9243C69.3152 19.8522 69.5415 19.8836 69.7183 20.0085C69.8949 20.1335 70 20.3365 70 20.5529V23.3333C70 23.7015 69.7015 24 69.3333 24H58.6667C58.2985 24 58 23.7015 58 23.3333V14C58 13.6318 58.2985 13.3333 58.6667 13.3333H60.6667ZM63.3333 12C62.597 12 62 12.5969 62 13.3333C62 13.4903 62.0269 13.6397 62.0757 13.7778C62.1478 13.9819 62.1164 14.2082 61.9915 14.3849C61.8665 14.5616 61.6635 14.6667 61.4471 14.6667H59.3333V22.6667H68.6667V21.3333C67.1939 21.3333 66 20.1394 66 18.6667C66 17.1939 67.1939 16 68.6667 16V14.6667H65.2195C65.0031 14.6667 64.8002 14.5616 64.6752 14.3849C64.5503 14.2082 64.5189 13.9819 64.591 13.7778C64.6398 13.6397 64.6667 13.4904 64.6667 13.3333C64.6667 12.5969 64.0697 12 63.3333 12Z" fill="#101828" fill-opacity="0.3"/>
+</g>
+<rect x="84.5" y="0.5" width="35" height="35" rx="9.5" stroke="#101828" stroke-opacity="0.04"/>
+<path d="M96.167 16.3333H107.834V25.5H96.167V16.3333Z" stroke="#676F83" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M100.333 19.6667H103.666" stroke="#676F83" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M107.833 12.1667L105.583 15.9167" stroke="#676F83" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M97.4888 11.9517C97.5447 11.9238 97.5901 11.8784 97.6181 11.8224L97.9911 11.0765C98.0976 10.8634 98.4017 10.8634 98.5083 11.0765L98.8813 11.8224C98.9092 11.8784 98.9546 11.9238 99.0106 11.9517L99.7565 12.3247C99.9696 12.4313 99.9696 12.7354 99.7565 12.842L99.0106 13.2149C98.9546 13.2429 98.9092 13.2883 98.8813 13.3442L98.5083 14.0902C98.4017 14.3033 98.0976 14.3033 97.9911 14.0902L97.6181 13.3442C97.5901 13.2883 97.5447 13.2429 97.4888 13.2149L96.7429 12.842C96.5297 12.7354 96.5297 12.4313 96.7429 12.3247L97.4888 11.9517Z" fill="#676F83"/>
+<path d="M101.882 10.5438C101.952 10.5089 102.009 10.4521 102.044 10.3822L102.51 9.4498C102.643 9.1834 103.023 9.1834 103.157 9.4498L103.623 10.3822C103.658 10.4521 103.714 10.5089 103.784 10.5438L104.717 11.0101C104.983 11.1432 104.983 11.5234 104.717 11.6566L103.784 12.1228C103.714 12.1578 103.658 12.2145 103.623 12.2845L103.157 13.2169C103.023 13.4833 102.643 13.4833 102.51 13.2169L102.044 12.2845C102.009 12.2145 101.952 12.1578 101.882 12.1228L100.95 11.6566C100.683 11.5234 100.683 11.1432 100.95 11.0101L101.882 10.5438Z" fill="#676F83"/>
+<g opacity="0.6" clip-path="url(#clip0_9296_51042)">
+<path d="M145.809 14.7521L145.645 15.1292C145.525 15.4053 145.143 15.4053 145.022 15.1292L144.858 14.7521C144.565 14.0796 144.037 13.5443 143.379 13.2514L142.872 13.0261C142.599 12.9044 142.599 12.5059 142.872 12.3841L143.35 12.1714C144.026 11.871 144.563 11.3158 144.851 10.6206L145.02 10.213C145.138 9.92899 145.53 9.92899 145.647 10.213L145.816 10.6206C146.104 11.3158 146.641 11.871 147.317 12.1714L147.795 12.3841C148.069 12.5059 148.069 12.9044 147.795 13.0261L147.289 13.2514C146.63 13.5443 146.102 14.0796 145.809 14.7521ZM138 11.3333C140.712 11.3333 142.951 13.3571 143.289 15.9766L144.79 18.3358C144.889 18.4911 144.869 18.7231 144.64 18.8211L143.334 19.3807V21.3333C143.334 22.0697 142.737 22.6667 142 22.6667H140.668L140.667 24.6667H134.667L134.667 22.2041C134.667 21.4168 134.376 20.6725 133.837 20.0007C133.105 19.0875 132.667 17.9283 132.667 16.6667C132.667 13.7211 135.055 11.3333 138 11.3333ZM138 12.6667C135.791 12.6667 134 14.4575 134 16.6667C134 17.5899 134.312 18.4619 134.878 19.1666C135.607 20.076 136.001 21.1115 136 22.2042L136 23.3333H139.334L139.335 21.3333H142V18.5013L143.033 18.0587L142.005 16.4417L141.967 16.1475C141.711 14.1676 140.017 12.6667 138 12.6667ZM144.993 21.3286L146.103 22.0683C146.88 20.9041 147.334 19.5051 147.334 18.0001C147.334 17.5447 147.292 17.0991 147.213 16.6667L145.917 17C145.972 17.3252 146 17.6593 146 18.0001C146 19.2314 145.629 20.3761 144.993 21.3286Z" fill="#101828" fill-opacity="0.3"/>
+</g>
+<g opacity="0.3">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M167.149 16.3522L167.251 16.3822L174.224 19.0391L174.317 19.082C174.722 19.308 174.777 19.8792 174.424 20.179L174.341 20.2389L171.817 21.8171L170.239 24.3418C169.962 24.784 169.324 24.7511 169.082 24.3171L169.039 24.2246L166.382 17.2513C166.188 16.742 166.644 16.2421 167.149 16.3522ZM169.812 22.5085L170.767 20.9811L170.811 20.9186C170.858 20.859 170.916 20.8076 170.981 20.7669L172.508 19.8119L168.152 18.1524L169.812 22.5085Z" fill="#101828" fill-opacity="0.3"/>
+<path d="M165.212 20.3978L163.562 22.0475L162.619 21.1048L164.269 19.4551L165.212 20.3978Z" fill="#101828" fill-opacity="0.3"/>
+<path d="M163.666 18H161.333V16.6667H163.666V18Z" fill="#101828" fill-opacity="0.3"/>
+<path d="M165.212 14.2689L164.269 15.2116L162.619 13.5619L163.562 12.6192L165.212 14.2689Z" fill="#101828" fill-opacity="0.3"/>
+<path d="M172.047 13.5619L170.397 15.2116L169.455 14.2689L171.104 12.6192L172.047 13.5619Z" fill="#101828" fill-opacity="0.3"/>
+<path d="M168 13.6667H166.666V11.3333H168V13.6667Z" fill="#101828" fill-opacity="0.3"/>
+</g>
+<g opacity="0.1">
+<path d="M202.666 23.3333V14.6667L201.333 12H190.666L189.333 14.669V23.3333C189.333 23.7015 189.631 24 190 24H202C202.368 24 202.666 23.7015 202.666 23.3333ZM190.666 16H201.333V22.6667H190.666V16ZM191.49 13.3333H200.509L201.176 14.6667H190.824L191.49 13.3333ZM198 17.3333H194V18.6667H198V17.3333Z" fill="#101828" fill-opacity="0.3"/>
+</g>
+<defs>
+<clipPath id="clip0_9296_51042">
+<rect width="16" height="16" fill="white" transform="translate(132 10)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/web/app/components/base/icons/assets/vender/workflow/window-cursor.svg b/web/app/components/base/icons/assets/vender/workflow/window-cursor.svg
new file mode 100644
index 0000000000..af8a9bac94
--- /dev/null
+++ b/web/app/components/base/icons/assets/vender/workflow/window-cursor.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.33325 4.66663C1.33325 3.56206 2.22869 2.66663 3.33325 2.66663H12.6666C13.7712 2.66663 14.6666 3.56206 14.6666 4.66663V8.16663C14.6666 8.53483 14.3681 8.83329 13.9999 8.83329C13.6317 8.83329 13.3333 8.53483 13.3333 8.16663V4.66663C13.3333 4.29844 13.0348 3.99996 12.6666 3.99996H3.33325C2.96507 3.99996 2.66659 4.29844 2.66659 4.66663V12C2.66659 12.3682 2.96507 12.6666 3.33325 12.6666H7.99992C8.36812 12.6666 8.66658 12.9651 8.66658 13.3333C8.66658 13.7015 8.36812 14 7.99992 14H3.33325C2.22869 14 1.33325 13.1046 1.33325 12V4.66663Z" fill="white"/>
+<path d="M3.66659 5.83329C3.66659 6.29353 4.03968 6.66663 4.49992 6.66663C4.96016 6.66663 5.33325 6.29353 5.33325 5.83329C5.33325 5.37305 4.96016 4.99996 4.49992 4.99996C4.03968 4.99996 3.66659 5.37305 3.66659 5.83329Z" fill="white"/>
+<path d="M5.99992 5.83329C5.99992 6.29353 6.37301 6.66663 6.83325 6.66663C7.29352 6.66663 7.66658 6.29353 7.66658 5.83329C7.66658 5.37305 7.29352 4.99996 6.83325 4.99996C6.37301 4.99996 5.99992 5.37305 5.99992 5.83329Z" fill="white"/>
+<path d="M8.33325 5.83329C8.33325 6.29353 8.70632 6.66663 9.16658 6.66663C9.62685 6.66663 9.99992 6.29353 9.99992 5.83329C9.99992 5.37305 9.62685 4.99996 9.16658 4.99996C8.70632 4.99996 8.33325 5.37305 8.33325 5.83329Z" fill="white"/>
+<path d="M10.5293 9.69609C10.2933 9.62349 10.0365 9.68729 9.86185 9.86189C9.68725 10.0365 9.62345 10.2934 9.69605 10.5294L11.0294 14.8627C11.1095 15.1231 11.3401 15.3086 11.6116 15.331C11.8832 15.3535 12.1411 15.2085 12.2629 14.9648L13.1635 13.1636L14.9647 12.263C15.2085 12.1411 15.3535 11.8832 15.331 11.6116C15.3085 11.3401 15.1231 11.1096 14.8627 11.0294L10.5293 9.69609Z" fill="white"/>
+</svg>
diff --git a/web/app/components/base/icons/src/vender/line/others/SearchMenu.json b/web/app/components/base/icons/src/vender/line/others/SearchMenu.json
new file mode 100644
index 0000000000..5222574040
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/line/others/SearchMenu.json
@@ -0,0 +1,77 @@
+{
+	"icon": {
+		"type": "element",
+		"isRootNode": true,
+		"name": "svg",
+		"attributes": {
+			"width": "32",
+			"height": "32",
+			"viewBox": "0 0 32 32",
+			"fill": "none",
+			"xmlns": "http://www.w3.org/2000/svg"
+		},
+		"children": [
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M28.0049 16C28.0049 20.4183 24.4231 24 20.0049 24C15.5866 24 12.0049 20.4183 12.0049 16C12.0049 11.5817 15.5866 8 20.0049 8C24.4231 8 28.0049 11.5817 28.0049 16Z",
+					"stroke": "currentColor",
+					"stroke-width": "2",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M4.00488 16H6.67155",
+					"stroke": "currentColor",
+					"stroke-width": "2",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M4.00488 9.33334H8.00488",
+					"stroke": "currentColor",
+					"stroke-width": "2",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M4.00488 22.6667H8.00488",
+					"stroke": "currentColor",
+					"stroke-width": "2",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M26 22L29.3333 25.3333",
+					"stroke": "currentColor",
+					"stroke-width": "2",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			}
+		]
+	},
+	"name": "SearchMenu"
+}
\ No newline at end of file
diff --git a/web/app/components/base/icons/src/vender/line/others/SearchMenu.tsx b/web/app/components/base/icons/src/vender/line/others/SearchMenu.tsx
new file mode 100644
index 0000000000..4826abb20f
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/line/others/SearchMenu.tsx
@@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import * as React from 'react'
+import data from './SearchMenu.json'
+import IconBase from '@/app/components/base/icons/IconBase'
+import type { IconData } from '@/app/components/base/icons/IconBase'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'SearchMenu'
+
+export default Icon
diff --git a/web/app/components/base/icons/src/vender/line/others/index.ts b/web/app/components/base/icons/src/vender/line/others/index.ts
index 19d5f1ebb5..2322e9d9f1 100644
--- a/web/app/components/base/icons/src/vender/line/others/index.ts
+++ b/web/app/components/base/icons/src/vender/line/others/index.ts
@@ -9,4 +9,5 @@ export { default as GlobalVariable } from './GlobalVariable'
 export { default as Icon3Dots } from './Icon3Dots'
 export { default as LongArrowLeft } from './LongArrowLeft'
 export { default as LongArrowRight } from './LongArrowRight'
+export { default as SearchMenu } from './SearchMenu'
 export { default as Tools } from './Tools'
diff --git a/web/app/components/base/icons/src/vender/other/Mcp.json b/web/app/components/base/icons/src/vender/other/Mcp.json
new file mode 100644
index 0000000000..7caa70b16b
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/other/Mcp.json
@@ -0,0 +1,35 @@
+{
+	"icon": {
+		"type": "element",
+		"isRootNode": true,
+		"name": "svg",
+		"attributes": {
+			"width": "16",
+			"height": "16",
+			"viewBox": "0 0 16 16",
+			"fill": "none",
+			"xmlns": "http://www.w3.org/2000/svg"
+		},
+		"children": [
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M9.20626 1.68651C9.61828 1.68651 10.014 1.8473 10.3093 2.13466C10.4536 2.27516 10.5684 2.44313 10.6468 2.62868C10.7252 2.81422 10.7657 3.01358 10.7659 3.21501C10.7661 3.41645 10.7259 3.61588 10.6478 3.80156C10.5697 3.98723 10.4552 4.1554 10.3111 4.29614L5.86656 8.65516C5.81837 8.70203 5.78006 8.75808 5.7539 8.82001C5.72775 8.88194 5.71427 8.94848 5.71427 9.01571C5.71427 9.08294 5.72775 9.14948 5.7539 9.21141C5.78006 9.27334 5.81837 9.32939 5.86656 9.37626C5.96503 9.47212 6.09703 9.52576 6.23445 9.52576C6.37187 9.52576 6.50387 9.47212 6.60234 9.37626L6.66222 9.31698L6.66345 9.31576L11.0463 5.01725C11.3417 4.73067 11.7372 4.57056 12.1488 4.5709C12.5604 4.57124 12.9556 4.73202 13.2506 5.01908L13.2811 5.04902C13.4256 5.18967 13.5405 5.35786 13.6189 5.54363C13.6973 5.72941 13.7377 5.92903 13.7377 6.13068C13.7377 6.33233 13.6973 6.53195 13.6189 6.71773C13.5405 6.9035 13.4256 7.07169 13.2811 7.21234L7.96082 12.43C7.84828 12.5393 7.75882 12.6701 7.69773 12.8147C7.63664 12.9592 7.60517 13.1145 7.60517 13.2714C7.60517 13.4284 7.63664 13.5837 7.69773 13.7282C7.75882 13.8728 7.84828 14.0036 7.96082 14.1129L9.05348 15.1842C9.15192 15.2799 9.28378 15.3334 9.42106 15.3334C9.55834 15.3334 9.6902 15.2799 9.78864 15.1842C9.83683 15.1373 9.87514 15.0813 9.9013 15.0194C9.92746 14.9574 9.94094 14.8909 9.94094 14.8237C9.94094 14.7564 9.92746 14.6899 9.9013 14.628C9.87514 14.566 9.83683 14.51 9.78864 14.4631L8.69598 13.3912C8.67992 13.3756 8.66716 13.357 8.65844 13.3363C8.64973 13.3157 8.64523 13.2935 8.64523 13.2711C8.64523 13.2488 8.64973 13.2266 8.65844 13.206C8.66716 13.1853 8.67992 13.1667 8.69598 13.1511L14.0163 7.93405C14.2572 7.69971 14.4488 7.41943 14.5796 7.10979C14.7104 6.80014 14.7778 6.46742 14.7778 6.13129C14.7778 5.79516 14.7104 5.46244 14.5796 5.1528C14.4488 4.84315 14.2572 4.56288 14.0163 4.32853L13.9857 4.29797C13.6978 4.01697 13.3493 3.80582 12.9669 3.6808C12.5845 3.55578 12.1785 3.52022 11.7802 3.57687C11.8371 3.1838 11.8001 2.78285 11.6722 2.40684C11.5443 2.03083 11.3292 1.69045 11.0445 1.41356C10.5524 0.93469 9.89288 0.666748 9.20626 0.666748C8.51964 0.666748 7.86012 0.93469 7.36805 1.41356L1.48555 7.18239C1.43735 7.22926 1.39905 7.28532 1.37289 7.34725C1.34673 7.40917 1.33325 7.47572 1.33325 7.54294C1.33325 7.61017 1.34673 7.67672 1.37289 7.73864C1.39905 7.80057 1.43735 7.85663 1.48555 7.9035C1.58399 7.99918 1.71585 8.0527 1.85313 8.0527C1.9904 8.0527 2.12227 7.99918 2.22071 7.9035L8.10321 2.13466C8.39848 1.8473 8.79424 1.68651 9.20626 1.68651Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M9.68688 3.41201C9.66072 3.47394 9.62241 3.52999 9.57422 3.57686L5.22314 7.8436C5.07864 7.98425 4.96378 8.15243 4.88535 8.33821C4.80693 8.52399 4.76652 8.7236 4.76652 8.92526C4.76652 9.12691 4.80693 9.32652 4.88535 9.5123C4.96378 9.69808 5.07864 9.86626 5.22314 10.0069C5.51841 10.2943 5.91417 10.4551 6.32619 10.4551C6.73821 10.4551 7.13397 10.2943 7.42924 10.0069L11.7797 5.74017C11.8782 5.64431 12.0102 5.59067 12.1476 5.59067C12.285 5.59067 12.417 5.64431 12.5155 5.74017C12.5637 5.78704 12.602 5.8431 12.6281 5.90503C12.6543 5.96696 12.6678 6.0335 12.6678 6.10073C12.6678 6.16795 12.6543 6.2345 12.6281 6.29643C12.602 6.35835 12.5637 6.41441 12.5155 6.46128L8.1644 10.728C7.67225 11.2067 7.01276 11.4746 6.32619 11.4746C5.63962 11.4746 4.98013 11.2067 4.48798 10.728C4.24701 10.4937 4.05547 10.2134 3.92468 9.90375C3.79389 9.59411 3.7265 9.26139 3.7265 8.92526C3.7265 8.58912 3.79389 8.2564 3.92468 7.94676C4.05547 7.63712 4.24701 7.35684 4.48798 7.1225L8.83845 2.85576C8.93691 2.75989 9.06891 2.70625 9.20633 2.70625C9.34375 2.70625 9.47575 2.75989 9.57422 2.85576C9.62241 2.90263 9.66072 2.95868 9.68688 3.02061C9.71304 3.08254 9.72651 3.14908 9.72651 3.21631C9.72651 3.28353 9.71304 3.35008 9.68688 3.41201Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			}
+		]
+	},
+	"name": "Mcp"
+}
\ No newline at end of file
diff --git a/web/app/components/base/icons/src/vender/other/Mcp.tsx b/web/app/components/base/icons/src/vender/other/Mcp.tsx
new file mode 100644
index 0000000000..00ffa4a831
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/other/Mcp.tsx
@@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import * as React from 'react'
+import data from './Mcp.json'
+import IconBase from '@/app/components/base/icons/IconBase'
+import type { IconData } from '@/app/components/base/icons/IconBase'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'Mcp'
+
+export default Icon
diff --git a/web/app/components/base/icons/src/vender/other/NoToolPlaceholder.json b/web/app/components/base/icons/src/vender/other/NoToolPlaceholder.json
new file mode 100644
index 0000000000..d33d62d344
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/other/NoToolPlaceholder.json
@@ -0,0 +1,279 @@
+{
+	"icon": {
+		"type": "element",
+		"isRootNode": true,
+		"name": "svg",
+		"attributes": {
+			"width": "204",
+			"height": "36",
+			"viewBox": "0 0 204 36",
+			"fill": "none",
+			"xmlns": "http://www.w3.org/2000/svg"
+		},
+		"children": [
+			{
+				"type": "element",
+				"name": "g",
+				"attributes": {
+					"opacity": "0.1"
+				},
+				"children": [
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M3.33333 18.3333C3.33333 18.5423 3.64067 18.9056 4.35365 19.2621C5.27603 19.7233 6.58451 20 8 20C9.41547 20 10.7239 19.7233 11.6463 19.2621C12.3593 18.9056 12.6667 18.5423 12.6667 18.3333V16.8858C11.5667 17.5655 9.88487 18 8 18C6.11515 18 4.43331 17.5655 3.33333 16.8858V18.3333ZM12.6667 20.2191C11.5667 20.8988 9.88487 21.3333 8 21.3333C6.11515 21.3333 4.43331 20.8988 3.33333 20.2191V21.6667C3.33333 21.8756 3.64067 22.2389 4.35365 22.5954C5.27603 23.0566 6.58451 23.3333 8 23.3333C9.41547 23.3333 10.7239 23.0566 11.6463 22.5954C12.3593 22.2389 12.6667 21.8756 12.6667 21.6667V20.2191ZM2 21.6667V15C2 13.3431 4.68629 12 8 12C11.3137 12 14 13.3431 14 15V21.6667C14 23.3235 11.3137 24.6667 8 24.6667C4.68629 24.6667 2 23.3235 2 21.6667ZM8 16.6667C9.41547 16.6667 10.7239 16.3899 11.6463 15.9288C12.3593 15.5723 12.6667 15.2089 12.6667 15C12.6667 14.7911 12.3593 14.4277 11.6463 14.0712C10.7239 13.6101 9.41547 13.3333 8 13.3333C6.58451 13.3333 5.27603 13.6101 4.35365 14.0712C3.64067 14.4277 3.33333 14.7911 3.33333 15C3.33333 15.2089 3.64067 15.5723 4.35365 15.9288C5.27603 16.3899 6.58451 16.6667 8 16.6667Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					}
+				]
+			},
+			{
+				"type": "element",
+				"name": "g",
+				"attributes": {
+					"opacity": "0.3"
+				},
+				"children": [
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M41.3337 11.3333C41.7019 11.3333 42.0003 11.6318 42.0003 12V15.3333C42.0003 15.7015 41.7019 16 41.3337 16H38.0003V24.6667C38.0003 25.0349 37.7019 25.3333 37.3337 25.3333H34.667C34.2988 25.3333 34.0003 25.0349 34.0003 24.6667V16H30.3337C29.9655 16 29.667 15.7015 29.667 15.3333V13.7454C29.667 13.4929 29.8097 13.262 30.0355 13.1491L33.667 11.3333H41.3337ZM38.0003 12.6667H33.9818L31.0003 14.1574V14.6667H35.3337V24H36.667V14.6667H38.0003V12.6667ZM40.667 12.6667H39.3337V14.6667H40.667V12.6667Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					}
+				]
+			},
+			{
+				"type": "element",
+				"name": "g",
+				"attributes": {
+					"opacity": "0.6"
+				},
+				"children": [
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M60.6667 13.3333C60.6667 11.8606 61.8606 10.6667 63.3333 10.6667C64.8061 10.6667 66 11.8606 66 13.3333H69.3333C69.7015 13.3333 70 13.6318 70 14V16.7805C70 16.9969 69.8949 17.1998 69.7183 17.3248C69.5415 17.4497 69.3152 17.4811 69.1112 17.409C68.973 17.3602 68.8237 17.3333 68.6667 17.3333C67.9303 17.3333 67.3333 17.9303 67.3333 18.6667C67.3333 19.4031 67.9303 20 68.6667 20C68.8237 20 68.973 19.9731 69.1112 19.9243C69.3152 19.8522 69.5415 19.8836 69.7183 20.0085C69.8949 20.1335 70 20.3365 70 20.5529V23.3333C70 23.7015 69.7015 24 69.3333 24H58.6667C58.2985 24 58 23.7015 58 23.3333V14C58 13.6318 58.2985 13.3333 58.6667 13.3333H60.6667ZM63.3333 12C62.597 12 62 12.5969 62 13.3333C62 13.4903 62.0269 13.6397 62.0757 13.7778C62.1478 13.9819 62.1164 14.2082 61.9915 14.3849C61.8665 14.5616 61.6635 14.6667 61.4471 14.6667H59.3333V22.6667H68.6667V21.3333C67.1939 21.3333 66 20.1394 66 18.6667C66 17.1939 67.1939 16 68.6667 16V14.6667H65.2195C65.0031 14.6667 64.8002 14.5616 64.6752 14.3849C64.5503 14.2082 64.5189 13.9819 64.591 13.7778C64.6398 13.6397 64.6667 13.4904 64.6667 13.3333C64.6667 12.5969 64.0697 12 63.3333 12Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					}
+				]
+			},
+			{
+				"type": "element",
+				"name": "rect",
+				"attributes": {
+					"x": "84.5",
+					"y": "0.5",
+					"width": "35",
+					"height": "35",
+					"rx": "9.5",
+					"stroke": "#101828",
+					"stroke-opacity": "0.04"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M96.167 16.3333H107.834V25.5H96.167V16.3333Z",
+					"stroke": "currentColor",
+					"stroke-width": "1.5",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M100.333 19.6667H103.666",
+					"stroke": "currentColor",
+					"stroke-width": "1.5",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M107.833 12.1667L105.583 15.9167",
+					"stroke": "currentColor",
+					"stroke-width": "1.5",
+					"stroke-linecap": "round",
+					"stroke-linejoin": "round"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M97.4888 11.9517C97.5447 11.9238 97.5901 11.8784 97.6181 11.8224L97.9911 11.0765C98.0976 10.8634 98.4017 10.8634 98.5083 11.0765L98.8813 11.8224C98.9092 11.8784 98.9546 11.9238 99.0106 11.9517L99.7565 12.3247C99.9696 12.4313 99.9696 12.7354 99.7565 12.842L99.0106 13.2149C98.9546 13.2429 98.9092 13.2883 98.8813 13.3442L98.5083 14.0902C98.4017 14.3033 98.0976 14.3033 97.9911 14.0902L97.6181 13.3442C97.5901 13.2883 97.5447 13.2429 97.4888 13.2149L96.7429 12.842C96.5297 12.7354 96.5297 12.4313 96.7429 12.3247L97.4888 11.9517Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M101.882 10.5438C101.952 10.5089 102.009 10.4521 102.044 10.3822L102.51 9.4498C102.643 9.1834 103.023 9.1834 103.157 9.4498L103.623 10.3822C103.658 10.4521 103.714 10.5089 103.784 10.5438L104.717 11.0101C104.983 11.1432 104.983 11.5234 104.717 11.6566L103.784 12.1228C103.714 12.1578 103.658 12.2145 103.623 12.2845L103.157 13.2169C103.023 13.4833 102.643 13.4833 102.51 13.2169L102.044 12.2845C102.009 12.2145 101.952 12.1578 101.882 12.1228L100.95 11.6566C100.683 11.5234 100.683 11.1432 100.95 11.0101L101.882 10.5438Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "g",
+				"attributes": {
+					"opacity": "0.6",
+					"clip-path": "url(#clip0_9296_51042)"
+				},
+				"children": [
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M145.809 14.7521L145.645 15.1292C145.525 15.4053 145.143 15.4053 145.022 15.1292L144.858 14.7521C144.565 14.0796 144.037 13.5443 143.379 13.2514L142.872 13.0261C142.599 12.9044 142.599 12.5059 142.872 12.3841L143.35 12.1714C144.026 11.871 144.563 11.3158 144.851 10.6206L145.02 10.213C145.138 9.92899 145.53 9.92899 145.647 10.213L145.816 10.6206C146.104 11.3158 146.641 11.871 147.317 12.1714L147.795 12.3841C148.069 12.5059 148.069 12.9044 147.795 13.0261L147.289 13.2514C146.63 13.5443 146.102 14.0796 145.809 14.7521ZM138 11.3333C140.712 11.3333 142.951 13.3571 143.289 15.9766L144.79 18.3358C144.889 18.4911 144.869 18.7231 144.64 18.8211L143.334 19.3807V21.3333C143.334 22.0697 142.737 22.6667 142 22.6667H140.668L140.667 24.6667H134.667L134.667 22.2041C134.667 21.4168 134.376 20.6725 133.837 20.0007C133.105 19.0875 132.667 17.9283 132.667 16.6667C132.667 13.7211 135.055 11.3333 138 11.3333ZM138 12.6667C135.791 12.6667 134 14.4575 134 16.6667C134 17.5899 134.312 18.4619 134.878 19.1666C135.607 20.076 136.001 21.1115 136 22.2042L136 23.3333H139.334L139.335 21.3333H142V18.5013L143.033 18.0587L142.005 16.4417L141.967 16.1475C141.711 14.1676 140.017 12.6667 138 12.6667ZM144.993 21.3286L146.103 22.0683C146.88 20.9041 147.334 19.5051 147.334 18.0001C147.334 17.5447 147.292 17.0991 147.213 16.6667L145.917 17C145.972 17.3252 146 17.6593 146 18.0001C146 19.2314 145.629 20.3761 144.993 21.3286Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					}
+				]
+			},
+			{
+				"type": "element",
+				"name": "g",
+				"attributes": {
+					"opacity": "0.3"
+				},
+				"children": [
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"fill-rule": "evenodd",
+							"clip-rule": "evenodd",
+							"d": "M167.149 16.3522L167.251 16.3822L174.224 19.0391L174.317 19.082C174.722 19.308 174.777 19.8792 174.424 20.179L174.341 20.2389L171.817 21.8171L170.239 24.3418C169.962 24.784 169.324 24.7511 169.082 24.3171L169.039 24.2246L166.382 17.2513C166.188 16.742 166.644 16.2421 167.149 16.3522ZM169.812 22.5085L170.767 20.9811L170.811 20.9186C170.858 20.859 170.916 20.8076 170.981 20.7669L172.508 19.8119L168.152 18.1524L169.812 22.5085Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					},
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M165.212 20.3978L163.562 22.0475L162.619 21.1048L164.269 19.4551L165.212 20.3978Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					},
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M163.666 18H161.333V16.6667H163.666V18Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					},
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M165.212 14.2689L164.269 15.2116L162.619 13.5619L163.562 12.6192L165.212 14.2689Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					},
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M172.047 13.5619L170.397 15.2116L169.455 14.2689L171.104 12.6192L172.047 13.5619Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					},
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M168 13.6667H166.666V11.3333H168V13.6667Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					}
+				]
+			},
+			{
+				"type": "element",
+				"name": "g",
+				"attributes": {
+					"opacity": "0.1"
+				},
+				"children": [
+					{
+						"type": "element",
+						"name": "path",
+						"attributes": {
+							"d": "M202.666 23.3333V14.6667L201.333 12H190.666L189.333 14.669V23.3333C189.333 23.7015 189.631 24 190 24H202C202.368 24 202.666 23.7015 202.666 23.3333ZM190.666 16H201.333V22.6667H190.666V16ZM191.49 13.3333H200.509L201.176 14.6667H190.824L191.49 13.3333ZM198 17.3333H194V18.6667H198V17.3333Z",
+							"fill": "currentColor",
+							"fill-opacity": "0.3"
+						},
+						"children": []
+					}
+				]
+			},
+			{
+				"type": "element",
+				"name": "defs",
+				"attributes": {},
+				"children": [
+					{
+						"type": "element",
+						"name": "clipPath",
+						"attributes": {
+							"id": "clip0_9296_51042"
+						},
+						"children": [
+							{
+								"type": "element",
+								"name": "rect",
+								"attributes": {
+									"width": "16",
+									"height": "16",
+									"fill": "white",
+									"transform": "translate(132 10)"
+								},
+								"children": []
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"name": "NoToolPlaceholder"
+}
\ No newline at end of file
diff --git a/web/app/components/base/icons/src/vender/other/NoToolPlaceholder.tsx b/web/app/components/base/icons/src/vender/other/NoToolPlaceholder.tsx
new file mode 100644
index 0000000000..da8fddee22
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/other/NoToolPlaceholder.tsx
@@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import * as React from 'react'
+import data from './NoToolPlaceholder.json'
+import IconBase from '@/app/components/base/icons/IconBase'
+import type { IconData } from '@/app/components/base/icons/IconBase'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'NoToolPlaceholder'
+
+export default Icon
diff --git a/web/app/components/base/icons/src/vender/other/index.ts b/web/app/components/base/icons/src/vender/other/index.ts
index 8ddf5e7a86..8a7bb7ae28 100644
--- a/web/app/components/base/icons/src/vender/other/index.ts
+++ b/web/app/components/base/icons/src/vender/other/index.ts
@@ -1,5 +1,7 @@
 export { default as AnthropicText } from './AnthropicText'
 export { default as Generator } from './Generator'
 export { default as Group } from './Group'
+export { default as Mcp } from './Mcp'
+export { default as NoToolPlaceholder } from './NoToolPlaceholder'
 export { default as Openai } from './Openai'
 export { default as ReplayLine } from './ReplayLine'
diff --git a/web/app/components/base/icons/src/vender/workflow/WindowCursor.json b/web/app/components/base/icons/src/vender/workflow/WindowCursor.json
new file mode 100644
index 0000000000..b64ba912bb
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/workflow/WindowCursor.json
@@ -0,0 +1,62 @@
+{
+	"icon": {
+		"type": "element",
+		"isRootNode": true,
+		"name": "svg",
+		"attributes": {
+			"width": "16",
+			"height": "16",
+			"viewBox": "0 0 16 16",
+			"fill": "none",
+			"xmlns": "http://www.w3.org/2000/svg"
+		},
+		"children": [
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M1.33325 4.66663C1.33325 3.56206 2.22869 2.66663 3.33325 2.66663H12.6666C13.7712 2.66663 14.6666 3.56206 14.6666 4.66663V8.16663C14.6666 8.53483 14.3681 8.83329 13.9999 8.83329C13.6317 8.83329 13.3333 8.53483 13.3333 8.16663V4.66663C13.3333 4.29844 13.0348 3.99996 12.6666 3.99996H3.33325C2.96507 3.99996 2.66659 4.29844 2.66659 4.66663V12C2.66659 12.3682 2.96507 12.6666 3.33325 12.6666H7.99992C8.36812 12.6666 8.66658 12.9651 8.66658 13.3333C8.66658 13.7015 8.36812 14 7.99992 14H3.33325C2.22869 14 1.33325 13.1046 1.33325 12V4.66663Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M3.66659 5.83329C3.66659 6.29353 4.03968 6.66663 4.49992 6.66663C4.96016 6.66663 5.33325 6.29353 5.33325 5.83329C5.33325 5.37305 4.96016 4.99996 4.49992 4.99996C4.03968 4.99996 3.66659 5.37305 3.66659 5.83329Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M5.99992 5.83329C5.99992 6.29353 6.37301 6.66663 6.83325 6.66663C7.29352 6.66663 7.66658 6.29353 7.66658 5.83329C7.66658 5.37305 7.29352 4.99996 6.83325 4.99996C6.37301 4.99996 5.99992 5.37305 5.99992 5.83329Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M8.33325 5.83329C8.33325 6.29353 8.70632 6.66663 9.16658 6.66663C9.62685 6.66663 9.99992 6.29353 9.99992 5.83329C9.99992 5.37305 9.62685 4.99996 9.16658 4.99996C8.70632 4.99996 8.33325 5.37305 8.33325 5.83329Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			},
+			{
+				"type": "element",
+				"name": "path",
+				"attributes": {
+					"d": "M10.5293 9.69609C10.2933 9.62349 10.0365 9.68729 9.86185 9.86189C9.68725 10.0365 9.62345 10.2934 9.69605 10.5294L11.0294 14.8627C11.1095 15.1231 11.3401 15.3086 11.6116 15.331C11.8832 15.3535 12.1411 15.2085 12.2629 14.9648L13.1635 13.1636L14.9647 12.263C15.2085 12.1411 15.3535 11.8832 15.331 11.6116C15.3085 11.3401 15.1231 11.1096 14.8627 11.0294L10.5293 9.69609Z",
+					"fill": "currentColor"
+				},
+				"children": []
+			}
+		]
+	},
+	"name": "WindowCursor"
+}
\ No newline at end of file
diff --git a/web/app/components/base/icons/src/vender/workflow/WindowCursor.tsx b/web/app/components/base/icons/src/vender/workflow/WindowCursor.tsx
new file mode 100644
index 0000000000..8f48dc0b14
--- /dev/null
+++ b/web/app/components/base/icons/src/vender/workflow/WindowCursor.tsx
@@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import * as React from 'react'
+import data from './WindowCursor.json'
+import IconBase from '@/app/components/base/icons/IconBase'
+import type { IconData } from '@/app/components/base/icons/IconBase'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'WindowCursor'
+
+export default Icon
diff --git a/web/app/components/base/icons/src/vender/workflow/index.ts b/web/app/components/base/icons/src/vender/workflow/index.ts
index 7167b71b44..61fbd4b21c 100644
--- a/web/app/components/base/icons/src/vender/workflow/index.ts
+++ b/web/app/components/base/icons/src/vender/workflow/index.ts
@@ -19,3 +19,4 @@ export { default as ParameterExtractor } from './ParameterExtractor'
 export { default as QuestionClassifier } from './QuestionClassifier'
 export { default as TemplatingTransform } from './TemplatingTransform'
 export { default as VariableX } from './VariableX'
+export { default as WindowCursor } from './WindowCursor'
diff --git a/web/app/components/base/prompt-editor/index.tsx b/web/app/components/base/prompt-editor/index.tsx
index 94a65e4b62..a87a51cd50 100644
--- a/web/app/components/base/prompt-editor/index.tsx
+++ b/web/app/components/base/prompt-editor/index.tsx
@@ -64,8 +64,9 @@ import cn from '@/utils/classnames'
 export type PromptEditorProps = {
   instanceId?: string
   compact?: boolean
+  wrapperClassName?: string
   className?: string
-  placeholder?: string
+  placeholder?: string | JSX.Element
   placeholderClassName?: string
   style?: React.CSSProperties
   value?: string
@@ -85,6 +86,7 @@ export type PromptEditorProps = {
 const PromptEditor: FC<PromptEditorProps> = ({
   instanceId,
   compact,
+  wrapperClassName,
   className,
   placeholder,
   placeholderClassName,
@@ -147,10 +149,25 @@ const PromptEditor: FC<PromptEditorProps> = ({
 
   return (
     <LexicalComposer initialConfig={{ ...initialConfig, editable }}>
-      <div className='relative min-h-5'>
+      <div className={cn('relative', wrapperClassName)}>
         <RichTextPlugin
-          contentEditable={<ContentEditable className={`${className} outline-none ${compact ? 'text-[13px] leading-5' : 'text-sm leading-6'} text-text-secondary`} style={style || {}} />}
-          placeholder={<Placeholder value={placeholder} className={cn('truncate', placeholderClassName)} compact={compact} />}
+          contentEditable={
+            <ContentEditable
+              className={cn(
+                'text-text-secondary outline-none',
+                compact ? 'text-[13px] leading-5' : 'text-sm leading-6',
+                className,
+              )}
+              style={style || {}}
+            />
+          }
+          placeholder={
+            <Placeholder
+              value={placeholder}
+              className={cn('truncate', placeholderClassName)}
+              compact={compact}
+            />
+          }
           ErrorBoundary={LexicalErrorBoundary}
         />
         <ComponentPickerBlock
diff --git a/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx b/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx
index 49f4a056db..29c2d4ddb4 100644
--- a/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx
@@ -16,7 +16,6 @@ export class CustomTextNode extends TextNode {
 
   createDOM(config: EditorConfig) {
     const dom = super.createDOM(config)
-    dom.classList.add('align-middle')
     return dom
   }
 
diff --git a/web/app/components/base/prompt-editor/plugins/placeholder.tsx b/web/app/components/base/prompt-editor/plugins/placeholder.tsx
index 8b869139a9..5e2227dabb 100644
--- a/web/app/components/base/prompt-editor/plugins/placeholder.tsx
+++ b/web/app/components/base/prompt-editor/plugins/placeholder.tsx
@@ -8,7 +8,7 @@ const Placeholder = ({
   className,
 }: {
   compact?: boolean
-  value?: string
+  value?: string | JSX.Element
   className?: string
 }) => {
   const { t } = useTranslation()
diff --git a/web/app/components/header/account-setting/model-provider-page/declarations.ts b/web/app/components/header/account-setting/model-provider-page/declarations.ts
index 0ee7b26114..2ae0e74ccc 100644
--- a/web/app/components/header/account-setting/model-provider-page/declarations.ts
+++ b/web/app/components/header/account-setting/model-provider-page/declarations.ts
@@ -1,3 +1,5 @@
+import type { SchemaRoot } from '@/app/components/workflow/nodes/llm/types'
+
 export type FormValue = Record<string, any>
 
 export type TypeWithI18N<T = string> = {
@@ -19,6 +21,8 @@ export enum FormTypeEnum {
   toolSelector = 'tool-selector',
   multiToolSelector = 'array[tools]',
   appSelector = 'app-selector',
+  object = 'object',
+  array = 'array',
   dynamicSelect = 'dynamic-select',
 }
 
@@ -109,6 +113,7 @@ export type FormShowOnObject = {
 }
 
 export type CredentialFormSchemaBase = {
+  name: string
   variable: string
   label: TypeWithI18N
   type: FormTypeEnum
@@ -118,6 +123,7 @@ export type CredentialFormSchemaBase = {
   show_on: FormShowOnObject[]
   url?: string
   scope?: string
+  input_schema?: SchemaRoot
 }
 
 export type CredentialFormSchemaTextInput = CredentialFormSchemaBase & {
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/plugins/marketplace/search-box/index.tsx b/web/app/components/plugins/marketplace/search-box/index.tsx
index 217007846c..5f19afbba6 100644
--- a/web/app/components/plugins/marketplace/search-box/index.tsx
+++ b/web/app/components/plugins/marketplace/search-box/index.tsx
@@ -1,8 +1,9 @@
 'use client'
-import { RiCloseLine } from '@remixicon/react'
+import { RiCloseLine, RiSearchLine } from '@remixicon/react'
 import TagsFilter from './tags-filter'
 import ActionButton from '@/app/components/base/action-button'
 import cn from '@/utils/classnames'
+import { RiAddLine } from '@remixicon/react'
 
 type SearchBoxProps = {
   search: string
@@ -13,6 +14,9 @@ type SearchBoxProps = {
   size?: 'small' | 'large'
   placeholder?: string
   locale?: string
+  supportAddCustomTool?: boolean
+  onShowAddCustomCollectionModal?: () => void
+  onAddedCustomTool?: () => void
 }
 const SearchBox = ({
   search,
@@ -23,46 +27,62 @@ const SearchBox = ({
   size = 'small',
   placeholder = '',
   locale,
+  supportAddCustomTool,
+  onShowAddCustomCollectionModal,
 }: SearchBoxProps) => {
   return (
     <div
-      className={cn(
-        'z-[11] flex items-center',
-        size === 'large' && 'rounded-xl border border-components-chat-input-border bg-components-panel-bg-blur p-1.5 shadow-md',
-        size === 'small' && 'rounded-lg bg-components-input-bg-normal p-0.5',
-        inputClassName,
-      )}
+      className='z-[11] flex items-center'
     >
-      <TagsFilter
-        tags={tags}
-        onTagsChange={onTagsChange}
-        size={size}
-        locale={locale}
-      />
-      <div className='mx-1 h-3.5 w-[1px] bg-divider-regular'></div>
-      <div className='relative flex grow items-center p-1 pl-2'>
-        <div className='mr-2 flex w-full items-center'>
-          <input
-            className={cn(
-              'body-md-medium block grow appearance-none bg-transparent text-text-secondary outline-none',
-            )}
-            value={search}
-            onChange={(e) => {
-              onSearchChange(e.target.value)
-            }}
-            placeholder={placeholder}
-          />
-          {
-            search && (
-              <div className='absolute right-2 top-1/2 -translate-y-1/2'>
-                <ActionButton onClick={() => onSearchChange('')}>
-                  <RiCloseLine className='h-4 w-4' />
-                </ActionButton>
-              </div>
-            )
-          }
+      <div className={
+        cn('flex items-center',
+          size === 'large' && 'rounded-xl border border-components-chat-input-border bg-components-panel-bg-blur p-1.5 shadow-md',
+          size === 'small' && 'rounded-lg bg-components-input-bg-normal p-0.5',
+          inputClassName,
+        )
+      }>
+        <div className='relative flex grow items-center p-1 pl-2'>
+          <div className='mr-2 flex w-full items-center'>
+            <RiSearchLine className='mr-1.5 size-4 text-text-placeholder' />
+            <input
+              className={cn(
+                'body-md-medium block grow appearance-none bg-transparent text-text-secondary outline-none',
+              )}
+              value={search}
+              onChange={(e) => {
+                onSearchChange(e.target.value)
+              }}
+              placeholder={placeholder}
+            />
+            {
+              search && (
+                <div className='absolute right-2 top-1/2 -translate-y-1/2'>
+                  <ActionButton onClick={() => onSearchChange('')}>
+                    <RiCloseLine className='h-4 w-4' />
+                  </ActionButton>
+                </div>
+              )
+            }
+          </div>
         </div>
+        <div className='mx-1 h-3.5 w-[1px] bg-divider-regular'></div>
+        <TagsFilter
+          tags={tags}
+          onTagsChange={onTagsChange}
+          size={size}
+          locale={locale}
+        />
       </div>
+      {supportAddCustomTool && (
+        <div className='flex shrink-0 items-center'>
+          <ActionButton
+            className='ml-2 rounded-full bg-components-button-primary-bg text-components-button-primary-text hover:bg-components-button-primary-bg hover:text-components-button-primary-text'
+            onClick={onShowAddCustomCollectionModal}
+          >
+            <RiAddLine className='h-4 w-4' />
+          </ActionButton>
+        </div>
+      )}
     </div>
   )
 }
diff --git a/web/app/components/plugins/marketplace/search-box/tags-filter.tsx b/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
index edf50dc874..bae6491727 100644
--- a/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
+++ b/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
@@ -2,9 +2,7 @@
 
 import { useState } from 'react'
 import {
-  RiArrowDownSLine,
-  RiCloseCircleFill,
-  RiFilter3Line,
+  RiPriceTag3Line,
 } from '@remixicon/react'
 import {
   PortalToFollowElem,
@@ -57,47 +55,15 @@ const TagsFilter = ({
         onClick={() => setOpen(v => !v)}
       >
         <div className={cn(
-          'flex cursor-pointer items-center rounded-lg text-text-tertiary hover:bg-state-base-hover',
-          size === 'large' && 'h-8 px-2 py-1',
-          size === 'small' && 'h-7 py-0.5 pl-1 pr-1.5 ',
-          selectedTagsLength && 'text-text-secondary',
-          open && 'bg-state-base-hover',
+          'ml-0.5 mr-1.5 flex  items-center text-text-tertiary ',
+          size === 'large' && 'h-8 py-1',
+          size === 'small' && 'h-7 py-0.5 ',
+          // selectedTagsLength && 'text-text-secondary',
+          // open && 'bg-state-base-hover',
         )}>
-          <div className='p-0.5'>
-            <RiFilter3Line className='h-4 w-4' />
+          <div className='cursor-pointer rounded-md p-0.5 hover:bg-state-base-hover'>
+            <RiPriceTag3Line className='h-4 w-4 text-text-tertiary' />
           </div>
-          <div className={cn(
-            'system-sm-medium flex items-center p-1',
-            size === 'large' && 'p-1',
-            size === 'small' && 'px-0.5 py-1',
-          )}>
-            {
-              !selectedTagsLength && t('pluginTags.allTags')
-            }
-            {
-              !!selectedTagsLength && tags.map(tag => tagsMap[tag].label).slice(0, 2).join(',')
-            }
-            {
-              selectedTagsLength > 2 && (
-                <div className='system-xs-medium ml-1 text-text-tertiary'>
-                  +{selectedTagsLength - 2}
-                </div>
-              )
-            }
-          </div>
-          {
-            !!selectedTagsLength && (
-              <RiCloseCircleFill
-                className='h-4 w-4 cursor-pointer text-text-quaternary'
-                onClick={() => onTagsChange([])}
-              />
-            )
-          }
-          {
-            !selectedTagsLength && (
-              <RiArrowDownSLine className='h-4 w-4' />
-            )
-          }
         </div>
       </PortalToFollowElemTrigger>
       <PortalToFollowElemContent className='z-[1000]'>
diff --git a/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
index fef79644cd..2c700c6dc8 100644
--- a/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
@@ -13,6 +13,7 @@ import type { Node } from 'reactflow'
 import type { NodeOutPutVar } from '@/app/components/workflow/types'
 import cn from '@/utils/classnames'
 import { ArrowDownRoundFill } from '@/app/components/base/icons/src/vender/solid/general'
+import { useAllMCPTools } from '@/service/use-tools'
 
 type Props = {
   disabled?: boolean
@@ -26,6 +27,7 @@ type Props = {
   nodeOutputVars: NodeOutPutVar[],
   availableNodes: Node[],
   nodeId?: string
+  canChooseMCPTool?: boolean
 }
 
 const MultipleToolSelector = ({
@@ -40,9 +42,16 @@ const MultipleToolSelector = ({
   nodeOutputVars,
   availableNodes,
   nodeId,
+  canChooseMCPTool,
 }: Props) => {
   const { t } = useTranslation()
-  const enabledCount = value.filter(item => item.enabled).length
+    const { data: mcpTools } = useAllMCPTools()
+  const enabledCount = value.filter((item) => {
+    const isMCPTool = mcpTools?.find(tool => tool.id === item.provider_name)
+    if(isMCPTool)
+      return item.enabled && canChooseMCPTool
+    return item.enabled
+  }).length
   // collapse control
   const [collapse, setCollapse] = React.useState(false)
   const handleCollapse = () => {
@@ -66,6 +75,19 @@ const MultipleToolSelector = ({
     setOpen(false)
   }
 
+  const handleAddMultiple = (val: ToolValue[]) => {
+    const newValue = [...value, ...val]
+    // deduplication
+    const deduplication = newValue.reduce((acc, cur) => {
+      if (!acc.find(item => item.provider_name === cur.provider_name && item.tool_name === cur.tool_name))
+        acc.push(cur)
+      return acc
+    }, [] as ToolValue[])
+    // update value
+    onChange(deduplication)
+    setOpen(false)
+  }
+
   // delete tool
   const handleDelete = (index: number) => {
     const newValue = [...value]
@@ -140,8 +162,10 @@ const MultipleToolSelector = ({
                 value={item}
                 selectedTools={value}
                 onSelect={item => handleConfigure(item, index)}
+                onSelectMultiple={handleAddMultiple}
                 onDelete={() => handleDelete(index)}
                 supportEnableSwitch
+                canChooseMCPTool={canChooseMCPTool}
                 isEdit
               />
             </div>
@@ -164,6 +188,8 @@ const MultipleToolSelector = ({
         panelShowState={panelShowState}
         onPanelShowStateChange={setPanelShowState}
         isEdit={false}
+        canChooseMCPTool={canChooseMCPTool}
+        onSelectMultiple={handleAddMultiple}
       />
     </>
   )
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx
index 350fe50933..42467ce111 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx
@@ -5,7 +5,6 @@ import { useTranslation } from 'react-i18next'
 import Link from 'next/link'
 import {
   RiArrowLeftLine,
-  RiArrowRightUpLine,
 } from '@remixicon/react'
 import {
   PortalToFollowElem,
@@ -15,6 +14,7 @@ import {
 import ToolTrigger from '@/app/components/plugins/plugin-detail-panel/tool-selector/tool-trigger'
 import ToolItem from '@/app/components/plugins/plugin-detail-panel/tool-selector/tool-item'
 import ToolPicker from '@/app/components/workflow/block-selector/tool-picker'
+import ToolForm from '@/app/components/workflow/nodes/tool/components/tool-form'
 import Button from '@/app/components/base/button'
 import Indicator from '@/app/components/header/indicator'
 import ToolCredentialForm from '@/app/components/plugins/plugin-detail-panel/tool-selector/tool-credentials-form'
@@ -23,13 +23,13 @@ import Textarea from '@/app/components/base/textarea'
 import Divider from '@/app/components/base/divider'
 import TabSlider from '@/app/components/base/tab-slider-plain'
 import ReasoningConfigForm from '@/app/components/plugins/plugin-detail-panel/tool-selector/reasoning-config-form'
-import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
 import { generateFormValue, getPlainValue, getStructureValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
 
 import { useAppContext } from '@/context/app-context'
 import {
   useAllBuiltInTools,
   useAllCustomTools,
+  useAllMCPTools,
   useAllWorkflowTools,
   useInvalidateAllBuiltInTools,
   useUpdateProviderCredentials,
@@ -54,15 +54,9 @@ type Props = {
   scope?: string
   value?: ToolValue
   selectedTools?: ToolValue[]
+  onSelect: (tool: ToolValue) => void
+  onSelectMultiple: (tool: ToolValue[]) => void
   isEdit?: boolean
-  onSelect: (tool: {
-    provider_name: string
-    tool_name: string
-    tool_label: string
-    settings?: Record<string, any>
-    parameters?: Record<string, any>
-    extra?: Record<string, any>
-  }) => void
   onDelete?: () => void
   supportEnableSwitch?: boolean
   supportAddCustomTool?: boolean
@@ -74,6 +68,7 @@ type Props = {
   nodeOutputVars: NodeOutPutVar[],
   availableNodes: Node[],
   nodeId?: string,
+  canChooseMCPTool?: boolean,
 }
 const ToolSelector: FC<Props> = ({
   value,
@@ -83,6 +78,7 @@ const ToolSelector: FC<Props> = ({
   placement = 'left',
   offset = 4,
   onSelect,
+  onSelectMultiple,
   onDelete,
   scope,
   supportEnableSwitch,
@@ -94,6 +90,7 @@ const ToolSelector: FC<Props> = ({
   nodeOutputVars,
   availableNodes,
   nodeId = '',
+  canChooseMCPTool,
 }) => {
   const { t } = useTranslation()
   const [isShow, onShowChange] = useState(false)
@@ -105,6 +102,7 @@ const ToolSelector: FC<Props> = ({
   const { data: buildInTools } = useAllBuiltInTools()
   const { data: customTools } = useAllCustomTools()
   const { data: workflowTools } = useAllWorkflowTools()
+  const { data: mcpTools } = useAllMCPTools()
   const invalidateAllBuiltinTools = useInvalidateAllBuiltInTools()
   const invalidateInstalledPluginList = useInvalidateInstalledPluginList()
 
@@ -112,18 +110,19 @@ const ToolSelector: FC<Props> = ({
   const { inMarketPlace, manifest } = usePluginInstalledCheck(value?.provider_name)
 
   const currentProvider = useMemo(() => {
-    const mergedTools = [...(buildInTools || []), ...(customTools || []), ...(workflowTools || [])]
+    const mergedTools = [...(buildInTools || []), ...(customTools || []), ...(workflowTools || []), ...(mcpTools || [])]
     return mergedTools.find((toolWithProvider) => {
       return toolWithProvider.id === value?.provider_name
     })
-  }, [value, buildInTools, customTools, workflowTools])
+  }, [value, buildInTools, customTools, workflowTools, mcpTools])
 
   const [isShowChooseTool, setIsShowChooseTool] = useState(false)
-  const handleSelectTool = (tool: ToolDefaultValue) => {
+  const getToolValue = (tool: ToolDefaultValue) => {
     const settingValues = generateFormValue(tool.params, toolParametersToFormSchemas(tool.paramSchemas.filter(param => param.form !== 'llm') as any))
     const paramValues = generateFormValue(tool.params, toolParametersToFormSchemas(tool.paramSchemas.filter(param => param.form === 'llm') as any), true)
-    const toolValue = {
+    return {
       provider_name: tool.provider_id,
+      provider_show_name: tool.provider_name,
       type: tool.provider_type,
       tool_name: tool.tool_name,
       tool_label: tool.tool_label,
@@ -136,9 +135,16 @@ const ToolSelector: FC<Props> = ({
       },
       schemas: tool.paramSchemas,
     }
+  }
+  const handleSelectTool = (tool: ToolDefaultValue) => {
+    const toolValue = getToolValue(tool)
     onSelect(toolValue)
     // setIsShowChooseTool(false)
   }
+  const handleSelectMultipleTool = (tool: ToolDefaultValue[]) => {
+    const toolValues = tool.map(item => getToolValue(item))
+    onSelectMultiple(toolValues)
+  }
 
   const handleDescriptionChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
     onSelect({
@@ -169,7 +175,6 @@ const ToolSelector: FC<Props> = ({
 
   const handleSettingsFormChange = (v: Record<string, any>) => {
     const newValue = getStructureValue(v)
-
     const toolValue = {
       ...value,
       settings: newValue,
@@ -250,7 +255,9 @@ const ToolSelector: FC<Props> = ({
             <ToolItem
               open={isShow}
               icon={currentProvider?.icon || manifestIcon}
+              isMCPTool={currentProvider?.type === CollectionType.mcp}
               providerName={value.provider_name}
+              providerShowName={value.provider_show_name}
               toolLabel={value.tool_label || value.tool_name}
               showSwitch={supportEnableSwitch}
               switchValue={value.enabled}
@@ -272,6 +279,7 @@ const ToolSelector: FC<Props> = ({
                   </p>
                 </div>
               }
+              canChooseMCPTool={canChooseMCPTool}
             />
           )}
         </PortalToFollowElemTrigger>
@@ -285,7 +293,6 @@ const ToolSelector: FC<Props> = ({
                   <div className='flex flex-col gap-1'>
                     <div className='system-sm-semibold flex h-6 items-center text-text-secondary'>{t('plugin.detailPanel.toolSelector.toolLabel')}</div>
                     <ToolPicker
-                      panelClassName='w-[328px]'
                       placement='bottom'
                       offset={offset}
                       trigger={
@@ -300,8 +307,10 @@ const ToolSelector: FC<Props> = ({
                       disabled={false}
                       supportAddCustomTool
                       onSelect={handleSelectTool}
+                      onSelectMultiple={handleSelectMultipleTool}
                       scope={scope}
                       selectedTools={selectedTools}
+                      canChooseMCPTool={canChooseMCPTool}
                     />
                   </div>
                   <div className='flex flex-col gap-1'>
@@ -390,24 +399,13 @@ const ToolSelector: FC<Props> = ({
                     {/* user settings form */}
                     {(currType === 'settings' || userSettingsOnly) && (
                       <div className='px-4 py-2'>
-                        <Form
+                        <ToolForm
+                          inPanel
+                          readOnly={false}
+                          nodeId={nodeId}
+                          schema={settingsFormSchemas as any}
                           value={getPlainValue(value?.settings || {})}
                           onChange={handleSettingsFormChange}
-                          formSchemas={settingsFormSchemas as any}
-                          isEditMode={true}
-                          showOnVariableMap={{}}
-                          validating={false}
-                          inputClassName='bg-components-input-bg-normal hover:bg-components-input-bg-hover'
-                          fieldMoreInfo={item => item.url
-                            ? (<a
-                              href={item.url}
-                              target='_blank' rel='noopener noreferrer'
-                              className='inline-flex items-center text-xs text-text-accent'
-                            >
-                              {t('tools.howToGet')}
-                              <RiArrowRightUpLine className='ml-1 h-3 w-3' />
-                            </a>)
-                            : null}
                         />
                       </div>
                     )}
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/reasoning-config-form.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/reasoning-config-form.tsx
index 750a8cfff6..98ad490348 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/reasoning-config-form.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/reasoning-config-form.tsx
@@ -3,25 +3,34 @@ import { useTranslation } from 'react-i18next'
 import produce from 'immer'
 import {
   RiArrowRightUpLine,
+  RiBracesLine,
 } from '@remixicon/react'
 import Tooltip from '@/app/components/base/tooltip'
 import Switch from '@/app/components/base/switch'
-import Input from '@/app/components/workflow/nodes/_base/components/input-support-select-var'
+import MixedVariableTextInput from '@/app/components/workflow/nodes/tool/components/mixed-variable-text-input'
+import Input from '@/app/components/base/input'
+import FormInputTypeSwitch from '@/app/components/workflow/nodes/_base/components/form-input-type-switch'
+import FormInputBoolean from '@/app/components/workflow/nodes/_base/components/form-input-boolean'
+import { SimpleSelect } from '@/app/components/base/select'
+import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
 import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
+import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import type { Node } from 'reactflow'
 import type {
   NodeOutPutVar,
   ValueSelector,
-  Var,
 } from '@/app/components/workflow/types'
 import type { ToolVarInputs } from '@/app/components/workflow/nodes/tool/types'
 import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
 import { VarType } from '@/app/components/workflow/types'
 import cn from '@/utils/classnames'
+import { useBoolean } from 'ahooks'
+import SchemaModal from './schema-modal'
+import type { SchemaRoot } from '@/app/components/workflow/nodes/llm/types'
 
 type Props = {
   value: Record<string, any>
@@ -42,73 +51,46 @@ const ReasoningConfigForm: React.FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   const language = useLanguage()
-  const handleAutomatic = (key: string, val: any) => {
+  const getVarKindType = (type: FormTypeEnum) => {
+    if (type === FormTypeEnum.file || type === FormTypeEnum.files)
+      return VarKindType.variable
+    if (type === FormTypeEnum.select || type === FormTypeEnum.boolean || type === FormTypeEnum.textNumber || type === FormTypeEnum.array || type === FormTypeEnum.object)
+      return VarKindType.constant
+    if (type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput)
+      return VarKindType.mixed
+  }
+
+  const handleAutomatic = (key: string, val: any, type: FormTypeEnum) => {
     onChange({
       ...value,
       [key]: {
-        value: val ? null : value[key]?.value,
+        value: val ? null : { type: getVarKindType(type), value: null },
         auto: val ? 1 : 0,
       },
     })
   }
-
-  const [inputsIsFocus, setInputsIsFocus] = useState<Record<string, boolean>>({})
-  const handleInputFocus = useCallback((variable: string) => {
-    return (value: boolean) => {
-      setInputsIsFocus((prev) => {
-        return {
-          ...prev,
-          [variable]: value,
-        }
-      })
-    }
-  }, [])
-  const handleNotMixedTypeChange = useCallback((variable: string) => {
-    return (varValue: ValueSelector | string, varKindType: VarKindType) => {
-      const newValue = produce(value, (draft: ToolVarInputs) => {
-        const target = draft[variable].value
-        if (target) {
-          target.type = varKindType
-          target.value = varValue
-        }
-        else {
-          draft[variable].value = {
-            type: varKindType,
-            value: varValue,
-          }
-        }
-      })
-      onChange(newValue)
-    }
-  }, [value, onChange])
-  const handleMixedTypeChange = useCallback((variable: string) => {
-    return (itemValue: string) => {
-      const newValue = produce(value, (draft: ToolVarInputs) => {
-        const target = draft[variable].value
-        if (target) {
-          target.value = itemValue
-        }
-        else {
-          draft[variable].value = {
-            type: VarKindType.mixed,
-            value: itemValue,
-          }
+  const handleTypeChange = useCallback((variable: string, defaultValue: any) => {
+    return (newType: VarKindType) => {
+      const res = produce(value, (draft: ToolVarInputs) => {
+        draft[variable].value = {
+          type: newType,
+          value: newType === VarKindType.variable ? '' : defaultValue,
         }
       })
-      onChange(newValue)
+      onChange(res)
     }
-  }, [value, onChange])
-  const handleFileChange = useCallback((variable: string) => {
-    return (varValue: ValueSelector | string) => {
-      const newValue = produce(value, (draft: ToolVarInputs) => {
+  }, [onChange, value])
+  const handleValueChange = useCallback((variable: string, varType: FormTypeEnum) => {
+    return (newValue: any) => {
+      const res = produce(value, (draft: ToolVarInputs) => {
         draft[variable].value = {
-          type: VarKindType.variable,
-          value: varValue,
+          type: getVarKindType(varType),
+          value: newValue,
         }
       })
-      onChange(newValue)
+      onChange(res)
     }
-  }, [value, onChange])
+  }, [onChange, value])
   const handleAppChange = useCallback((variable: string) => {
     return (app: {
       app_id: string
@@ -132,9 +114,29 @@ const ReasoningConfigForm: React.FC<Props> = ({
       onChange(newValue)
     }
   }, [onChange, value])
+  const handleVariableSelectorChange = useCallback((variable: string) => {
+    return (newValue: ValueSelector | string) => {
+      const res = produce(value, (draft: ToolVarInputs) => {
+        draft[variable].value = {
+          type: VarKindType.variable,
+          value: newValue,
+        }
+      })
+      onChange(res)
+    }
+  }, [onChange, value])
 
-  const renderField = (schema: any) => {
+  const [isShowSchema, {
+    setTrue: showSchema,
+    setFalse: hideSchema,
+  }] = useBoolean(false)
+
+  const [schema, setSchema] = useState<SchemaRoot | null>(null)
+  const [schemaRootName, setSchemaRootName] = useState<string>('')
+
+  const renderField = (schema: any, showSchema: (schema: SchemaRoot, rootName: string) => void) => {
     const {
+      default: defaultValue,
       variable,
       label,
       required,
@@ -142,6 +144,9 @@ const ReasoningConfigForm: React.FC<Props> = ({
       type,
       scope,
       url,
+      input_schema,
+      placeholder,
+      options,
     } = schema
     const auto = value[variable]?.auto
     const tooltipContent = (tooltip && (
@@ -149,89 +154,150 @@ const ReasoningConfigForm: React.FC<Props> = ({
         popupContent={<div className='w-[200px]'>
           {tooltip[language] || tooltip.en_US}
         </div>}
-        triggerClassName='ml-1 w-4 h-4'
+        triggerClassName='ml-0.5 w-4 h-4'
         asChild={false} />
     ))
     const varInput = value[variable].value
+    const isString = type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput
     const isNumber = type === FormTypeEnum.textNumber
-    const isSelect = type === FormTypeEnum.select
+    const isObject = type === FormTypeEnum.object
+    const isArray = type === FormTypeEnum.array
+    const isShowJSONEditor = isObject || isArray
     const isFile = type === FormTypeEnum.file || type === FormTypeEnum.files
+    const isBoolean = type === FormTypeEnum.boolean
+    const isSelect = type === FormTypeEnum.select
     const isAppSelector = type === FormTypeEnum.appSelector
     const isModelSelector = type === FormTypeEnum.modelSelector
-    // const isToolSelector = type === FormTypeEnum.toolSelector
-    const isString = !isNumber && !isSelect && !isFile && !isAppSelector && !isModelSelector
+    const showTypeSwitch = isNumber || isObject || isArray
+    const isConstant = varInput?.type === VarKindType.constant || !varInput?.type
+    const showVariableSelector = isFile || varInput?.type === VarKindType.variable
+    const targetVarType = () => {
+      if (isString)
+        return VarType.string
+      else if (isNumber)
+        return VarType.number
+      else if (type === FormTypeEnum.files)
+        return VarType.arrayFile
+      else if (type === FormTypeEnum.file)
+        return VarType.file
+      else if (isBoolean)
+        return VarType.boolean
+      else if (isObject)
+        return VarType.object
+      else if (isArray)
+        return VarType.arrayObject
+      else
+        return VarType.string
+    }
+    const getFilterVar = () => {
+      if (isNumber)
+        return (varPayload: any) => varPayload.type === VarType.number
+      else if (isString)
+        return (varPayload: any) => [VarType.string, VarType.number, VarType.secret].includes(varPayload.type)
+      else if (isFile)
+        return (varPayload: any) => [VarType.file, VarType.arrayFile].includes(varPayload.type)
+      else if (isBoolean)
+        return (varPayload: any) => varPayload.type === VarType.boolean
+      else if (isObject)
+        return (varPayload: any) => varPayload.type === VarType.object
+      else if (isArray)
+        return (varPayload: any) => [VarType.array, VarType.arrayString, VarType.arrayNumber, VarType.arrayObject].includes(varPayload.type)
+      return undefined
+    }
+
     return (
-      <div key={variable} className='space-y-1'>
+      <div key={variable} className='space-y-0.5'>
         <div className='system-sm-semibold flex items-center justify-between py-2 text-text-secondary'>
-          <div className='flex items-center space-x-2'>
-            <span className={cn('code-sm-semibold text-text-secondary')}>{label[language] || label.en_US}</span>
+          <div className='flex items-center'>
+            <span className={cn('code-sm-semibold max-w-[140px] truncate text-text-secondary')} title={label[language] || label.en_US}>{label[language] || label.en_US}</span>
             {required && (
               <span className='ml-1 text-red-500'>*</span>
             )}
             {tooltipContent}
+            <span className='system-xs-regular mx-1 text-text-quaternary'>·</span>
+            <span className='system-xs-regular text-text-tertiary'>{targetVarType()}</span>
+            {isShowJSONEditor && (
+              <Tooltip
+                popupContent={<div className='system-xs-medium text-text-secondary'>
+                  {t('workflow.nodes.agent.clickToViewParameterSchema')}
+                </div>}
+                asChild={false}>
+                  <div
+                    className='ml-0.5 cursor-pointer rounded-[4px] p-px text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary'
+                    onClick={() => showSchema(input_schema as SchemaRoot, label[language] || label.en_US)}
+                  >
+                    <RiBracesLine className='size-3.5'/>
+                  </div>
+              </Tooltip>
+            )}
+
           </div>
-          <div className='flex cursor-pointer items-center gap-1 rounded-[6px] border border-divider-subtle bg-background-default-lighter px-2 py-1 hover:bg-state-base-hover' onClick={() => handleAutomatic(variable, !auto)}>
+          <div className='flex cursor-pointer items-center gap-1 rounded-[6px] border border-divider-subtle bg-background-default-lighter px-2 py-1 hover:bg-state-base-hover' onClick={() => handleAutomatic(variable, !auto, type)}>
             <span className='system-xs-medium text-text-secondary'>{t('plugin.detailPanel.toolSelector.auto')}</span>
             <Switch
               size='xs'
               defaultValue={!!auto}
-              onChange={val => handleAutomatic(variable, val)}
+              onChange={val => handleAutomatic(variable, val, type)}
             />
           </div>
         </div>
         {auto === 0 && (
-          <>
+          <div className={cn('gap-1', !(isShowJSONEditor && isConstant) && 'flex')}>
+            {showTypeSwitch && (
+              <FormInputTypeSwitch value={varInput?.type || VarKindType.constant} onChange={handleTypeChange(variable, defaultValue)}/>
+            )}
             {isString && (
-              <Input
-                className={cn(inputsIsFocus[variable] ? 'border-components-input-border-active bg-components-input-bg-active shadow-xs' : 'border-components-input-border-hover bg-components-input-bg-normal', 'rounded-lg border px-3 py-[6px]')}
+              <MixedVariableTextInput
                 value={varInput?.value as string || ''}
-                onChange={handleMixedTypeChange(variable)}
+                onChange={handleValueChange(variable, type)}
                 nodesOutputVars={nodeOutputVars}
                 availableNodes={availableNodes}
-                onFocusChange={handleInputFocus(variable)}
-                placeholder={t('workflow.nodes.http.insertVarPlaceholder')!}
-                placeholderClassName='!leading-[21px]'
               />
             )}
-            {/* {isString && (
-              <VarReferencePicker
-                zIndex={1001}
-                readonly={false}
-                isShowNodeName
-                nodeId={nodeId}
+            {isNumber && isConstant && (
+              <Input
+                className='h-8 grow'
+                type='number'
                 value={varInput?.value || ''}
-                onChange={handleNotMixedTypeChange(variable)}
-                defaultVarKindType={VarKindType.variable}
-                filterVar={(varPayload: Var) => varPayload.type === VarType.number || varPayload.type === VarType.secret || varPayload.type === VarType.string}
+                onChange={handleValueChange(variable, type)}
+                placeholder={placeholder?.[language] || placeholder?.en_US}
               />
-            )} */}
-            {(isNumber || isSelect) && (
-              <VarReferencePicker
-                zIndex={1001}
-                readonly={false}
-                isShowNodeName
-                nodeId={nodeId}
-                value={varInput?.type === VarKindType.constant ? (varInput?.value ?? '') : (varInput?.value ?? [])}
-                onChange={handleNotMixedTypeChange(variable)}
-                defaultVarKindType={varInput?.type || (isNumber ? VarKindType.constant : VarKindType.variable)}
-                isSupportConstantValue
-                filterVar={isNumber ? (varPayload: Var) => varPayload.type === schema._type : undefined}
-                availableVars={isSelect ? nodeOutputVars : undefined}
-                schema={schema}
+            )}
+            {isBoolean && (
+              <FormInputBoolean
+                value={varInput?.value as boolean}
+                onChange={handleValueChange(variable, type)}
               />
             )}
-            {isFile && (
-              <VarReferencePicker
-                zIndex={1001}
-                readonly={false}
-                isShowNodeName
-                nodeId={nodeId}
-                value={varInput?.value || []}
-                onChange={handleFileChange(variable)}
-                defaultVarKindType={VarKindType.variable}
-                filterVar={(varPayload: Var) => varPayload.type === VarType.file || varPayload.type === VarType.arrayFile}
+            {isSelect && (
+              <SimpleSelect
+                wrapperClassName='h-8 grow'
+                defaultValue={varInput?.value}
+                items={options.filter((option: { show_on: any[] }) => {
+                  if (option.show_on.length)
+                    return option.show_on.every(showOnItem => value[showOnItem.variable] === showOnItem.value)
+
+                  return true
+                }).map((option: { value: any; label: { [x: string]: any; en_US: any } }) => ({ value: option.value, name: option.label[language] || option.label.en_US }))}
+                onSelect={item => handleValueChange(variable, type)(item.value as string)}
+                placeholder={placeholder?.[language] || placeholder?.en_US}
               />
             )}
+            {isShowJSONEditor && isConstant && (
+              <div className='mt-1 w-full'>
+                <CodeEditor
+                  title='JSON'
+                  value={varInput?.value as any}
+                  isExpand
+                  isInNode
+                  height={100}
+                  language={CodeLanguage.json}
+                  onChange={handleValueChange(variable, type)}
+                  className='w-full'
+                  placeholder={<div className='whitespace-pre'>{placeholder?.[language] || placeholder?.en_US}</div>}
+                />
+              </div>
+            )}
             {isAppSelector && (
               <AppSelector
                 disabled={false}
@@ -250,7 +316,21 @@ const ReasoningConfigForm: React.FC<Props> = ({
                 scope={scope}
               />
             )}
-          </>
+            {showVariableSelector && (
+              <VarReferencePicker
+                zIndex={1001}
+                className='h-8 grow'
+                readonly={false}
+                isShowNodeName
+                nodeId={nodeId}
+                value={varInput?.value || []}
+                onChange={handleVariableSelectorChange(variable)}
+                filterVar={getFilterVar()}
+                schema={schema}
+                valueTypePlaceHolder={targetVarType()}
+              />
+            )}
+          </div>
         )}
         {url && (
           <a
@@ -267,7 +347,19 @@ const ReasoningConfigForm: React.FC<Props> = ({
   }
   return (
     <div className='space-y-3 px-4 py-2'>
-      {schemas.map(schema => renderField(schema))}
+      {!isShowSchema && schemas.map(schema => renderField(schema, (s: SchemaRoot, rootName: string) => {
+        setSchema(s)
+        setSchemaRootName(rootName)
+        showSchema()
+      }))}
+      {isShowSchema && (
+        <SchemaModal
+          isShow={isShowSchema}
+          schema={schema!}
+          rootName={schemaRootName}
+          onClose={hideSchema}
+        />
+      )}
     </div>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/schema-modal.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/schema-modal.tsx
new file mode 100644
index 0000000000..cd4cf71bac
--- /dev/null
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/schema-modal.tsx
@@ -0,0 +1,59 @@
+'use client'
+import type { FC } from 'react'
+import React from 'react'
+import Modal from '@/app/components/base/modal'
+import VisualEditor from '@/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor'
+import type { SchemaRoot } from '@/app/components/workflow/nodes/llm/types'
+import { MittProvider, VisualEditorContextProvider } from '@/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context'
+import { useTranslation } from 'react-i18next'
+import { RiCloseLine } from '@remixicon/react'
+
+type Props = {
+  isShow: boolean
+  schema: SchemaRoot
+  rootName: string
+  onClose: () => void
+}
+
+const SchemaModal: FC<Props> = ({
+  isShow,
+  schema,
+  rootName,
+  onClose,
+}) => {
+  const { t } = useTranslation()
+  return (
+    <Modal
+      isShow={isShow}
+      onClose={onClose}
+      className='max-w-[960px] p-0'
+      wrapperClassName='z-[9999]'
+    >
+      <div className='pb-6'>
+        {/* Header */}
+        <div className='relative flex p-6 pb-3 pr-14'>
+          <div className='title-2xl-semi-bold grow truncate text-text-primary'>
+            {t('workflow.nodes.agent.parameterSchema')}
+          </div>
+          <div className='absolute right-5 top-5 flex h-8 w-8 items-center justify-center p-1.5' onClick={onClose}>
+            <RiCloseLine className='h-[18px] w-[18px] text-text-tertiary' />
+          </div>
+        </div>
+        {/* Content */}
+        <div className='flex max-h-[700px] overflow-y-auto px-6 py-2'>
+          <MittProvider>
+            <VisualEditorContextProvider>
+              <VisualEditor
+                className='w-full'
+                schema={schema}
+                rootName={rootName}
+                readOnly
+              ></VisualEditor>
+            </VisualEditorContextProvider>
+          </MittProvider>
+        </div>
+      </div>
+    </Modal>
+  )
+}
+export default React.memo(SchemaModal)
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/tool-item.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/tool-item.tsx
index d74fccf968..5cc9b7a3a8 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/tool-item.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/tool-item.tsx
@@ -17,10 +17,13 @@ import { ToolTipContent } from '@/app/components/base/tooltip/content'
 import { InstallPluginButton } from '@/app/components/workflow/nodes/_base/components/install-plugin-button'
 import { SwitchPluginVersion } from '@/app/components/workflow/nodes/_base/components/switch-plugin-version'
 import cn from '@/utils/classnames'
+import McpToolNotSupportTooltip from '@/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip'
 
 type Props = {
   icon?: any
   providerName?: string
+  isMCPTool?: boolean
+  providerShowName?: string
   toolLabel?: string
   showSwitch?: boolean
   switchValue?: boolean
@@ -35,11 +38,14 @@ type Props = {
   onInstall?: () => void
   versionMismatch?: boolean
   open: boolean
+  canChooseMCPTool?: boolean,
 }
 
 const ToolItem = ({
   open,
   icon,
+  isMCPTool,
+  providerShowName,
   providerName,
   toolLabel,
   showSwitch,
@@ -54,11 +60,13 @@ const ToolItem = ({
   isError,
   errorTip,
   versionMismatch,
+  canChooseMCPTool,
 }: Props) => {
   const { t } = useTranslation()
-  const providerNameText = providerName?.split('/').pop()
+  const providerNameText = isMCPTool ? providerShowName : providerName?.split('/').pop()
   const isTransparent = uninstalled || versionMismatch || isError
   const [isDeleting, setIsDeleting] = useState(false)
+  const isShowCanNotChooseMCPTip = isMCPTool && !canChooseMCPTool
 
   return (
     <div className={cn(
@@ -67,7 +75,7 @@ const ToolItem = ({
       isDeleting && 'border-state-destructive-border shadow-xs hover:bg-state-destructive-hover',
     )}>
       {icon && (
-        <div className={cn('shrink-0', isTransparent && 'opacity-50')}>
+        <div className={cn('shrink-0', isTransparent && 'opacity-50', isShowCanNotChooseMCPTip && 'opacity-30')}>
           {typeof icon === 'string' && <div className='h-7 w-7 rounded-lg border-[0.5px] border-components-panel-border-subtle bg-background-default-dodge bg-cover bg-center' style={{ backgroundImage: `url(${icon})` }} />}
           {typeof icon !== 'string' && <AppIcon className='h-7 w-7 rounded-lg border-[0.5px] border-components-panel-border-subtle bg-background-default-dodge' size='xs' icon={icon?.content} background={icon?.background} />}
         </div>
@@ -75,18 +83,19 @@ const ToolItem = ({
       {!icon && (
         <div className={cn(
           'flex h-7 w-7 items-center justify-center rounded-md border-[0.5px] border-components-panel-border-subtle bg-background-default-subtle',
+          isTransparent && 'opacity-50', isShowCanNotChooseMCPTip && 'opacity-30',
         )}>
           <div className='flex h-5 w-5 items-center justify-center opacity-35'>
             <Group className='text-text-tertiary' />
           </div>
         </div>
       )}
-      <div className={cn('grow truncate pl-0.5', isTransparent && 'opacity-50')}>
+      <div className={cn('grow truncate pl-0.5', isTransparent && 'opacity-50', isShowCanNotChooseMCPTip && 'opacity-30')}>
         <div className='system-2xs-medium-uppercase text-text-tertiary'>{providerNameText}</div>
         <div className='system-xs-medium text-text-secondary'>{toolLabel}</div>
       </div>
       <div className='hidden items-center gap-1 group-hover:flex'>
-        {!noAuth && !isError && !uninstalled && !versionMismatch && (
+        {!noAuth && !isError && !uninstalled && !versionMismatch && !isShowCanNotChooseMCPTip && (
           <ActionButton>
             <RiEqualizer2Line className='h-4 w-4' />
           </ActionButton>
@@ -103,7 +112,7 @@ const ToolItem = ({
           <RiDeleteBinLine className='h-4 w-4' />
         </div>
       </div>
-      {!isError && !uninstalled && !noAuth && !versionMismatch && showSwitch && (
+      {!isError && !uninstalled && !noAuth && !versionMismatch && !isShowCanNotChooseMCPTip && showSwitch && (
         <div className='mr-1' onClick={e => e.stopPropagation()}>
           <Switch
             size='md'
@@ -112,6 +121,9 @@ const ToolItem = ({
           />
         </div>
       )}
+      {isShowCanNotChooseMCPTip && (
+        <McpToolNotSupportTooltip />
+      )}
       {!isError && !uninstalled && !versionMismatch && noAuth && (
         <Button variant='secondary' size='small' onClick={onAuth}>
           {t('tools.notAuthorized')}
diff --git a/web/app/components/plugins/types.ts b/web/app/components/plugins/types.ts
index ac62d77437..cd4d5e9ece 100644
--- a/web/app/components/plugins/types.ts
+++ b/web/app/components/plugins/types.ts
@@ -462,9 +462,14 @@ export type StrategyDeclaration = {
   strategies: StrategyDetail[]
 }
 
+export type PluginMeta = {
+  version: string // the version of dify sdk
+}
+
 export type StrategyPluginDetail = {
   provider: string
   plugin_unique_identifier: string
   plugin_id: string
   declaration: StrategyDeclaration
+  meta: PluginMeta
 }
diff --git a/web/app/components/tools/add-tool-modal/empty.tsx b/web/app/components/tools/add-tool-modal/empty.tsx
index 540d263e99..7390249dc1 100644
--- a/web/app/components/tools/add-tool-modal/empty.tsx
+++ b/web/app/components/tools/add-tool-modal/empty.tsx
@@ -1,19 +1,48 @@
 'use client'
-import { useSearchParams } from 'next/navigation'
 import { useTranslation } from 'react-i18next'
-const Empty = () => {
+import { ToolTypeEnum } from '../../workflow/block-selector/types'
+import { RiArrowRightUpLine } from '@remixicon/react'
+import Link from 'next/link'
+import cn from '@/utils/classnames'
+import { NoToolPlaceholder } from '../../base/icons/src/vender/other'
+type Props = {
+  type?: ToolTypeEnum
+  isAgent?: boolean
+}
+
+const getLink = (type?: ToolTypeEnum) => {
+  switch (type) {
+    case ToolTypeEnum.Custom:
+      return '/tools?category=api'
+    case ToolTypeEnum.MCP:
+      return '/tools?category=mcp'
+    default:
+      return '/tools?category=api'
+  }
+}
+const Empty = ({
+  type,
+  isAgent,
+}: Props) => {
   const { t } = useTranslation()
-  const searchParams = useSearchParams()
+
+  const hasLink = type && [ToolTypeEnum.Custom, ToolTypeEnum.MCP].includes(type)
+  const Comp = (hasLink ? Link : 'div') as any
+  const linkProps = hasLink ? { href: getLink(type), target: '_blank' } : {}
+  const renderType = isAgent ? 'agent' : type
+  const hasTitle = t(`tools.addToolModal.${renderType}.title`) !== `tools.addToolModal.${renderType}.title`
 
   return (
-    <div className='flex flex-col items-center'>
-      <div className="h-[149px] w-[163px] shrink-0 bg-[url('~@/app/components/tools/add-tool-modal/empty.png')] bg-cover bg-no-repeat"></div>
-      <div className='mb-1 text-[13px] font-medium leading-[18px] text-text-primary'>
-        {t(`tools.addToolModal.${searchParams.get('category') === 'workflow' ? 'emptyTitle' : 'emptyTitleCustom'}`)}
-      </div>
-      <div className='text-[13px] leading-[18px] text-text-tertiary'>
-        {t(`tools.addToolModal.${searchParams.get('category') === 'workflow' ? 'emptyTip' : 'emptyTipCustom'}`)}
+    <div className='flex h-[336px] flex-col items-center justify-center'>
+      <NoToolPlaceholder />
+      <div className='mb-1 mt-2 text-[13px] font-medium leading-[18px] text-text-primary'>
+        {hasTitle ? t(`tools.addToolModal.${renderType}.title`) : 'No tools available'}
       </div>
+      {(!isAgent && hasTitle) && (
+        <Comp className={cn('flex items-center text-[13px] leading-[18px] text-text-tertiary', hasLink && 'cursor-pointer hover:text-text-accent')} {...linkProps}>
+          {t(`tools.addToolModal.${renderType}.tip`)} {hasLink && <RiArrowRightUpLine className='ml-0.5 h-3 w-3' />}
+        </Comp>
+      )}
     </div>
   )
 }
diff --git a/web/app/components/tools/edit-custom-collection-modal/modal.tsx b/web/app/components/tools/edit-custom-collection-modal/modal.tsx
index 190c72790e..ce7ba8a735 100644
--- a/web/app/components/tools/edit-custom-collection-modal/modal.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/modal.tsx
@@ -184,6 +184,7 @@ const EditCustomCollectionModal: FC<Props> = ({
         onClose={onHide}
         closable
         className='!h-[calc(100vh-16px)] !max-w-[630px] !p-0'
+        wrapperClassName='z-[1000]'
       >
         <div className='flex h-full flex-col'>
           <div className='ml-6 mt-6 text-base font-semibold text-text-primary'>
diff --git a/web/app/components/tools/mcp/create-card.tsx b/web/app/components/tools/mcp/create-card.tsx
new file mode 100644
index 0000000000..7416f85a2f
--- /dev/null
+++ b/web/app/components/tools/mcp/create-card.tsx
@@ -0,0 +1,75 @@
+'use client'
+import { useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useContext } from 'use-context-selector'
+import {
+  RiAddCircleFill,
+  RiArrowRightUpLine,
+  RiBookOpenLine,
+} from '@remixicon/react'
+import MCPModal from './modal'
+import I18n from '@/context/i18n'
+import { getLanguage } from '@/i18n/language'
+import { useAppContext } from '@/context/app-context'
+import { useCreateMCP } from '@/service/use-tools'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+
+type Props = {
+  handleCreate: (provider: ToolWithProvider) => void
+}
+
+const NewMCPCard = ({ handleCreate }: Props) => {
+  const { t } = useTranslation()
+  const { locale } = useContext(I18n)
+  const language = getLanguage(locale)
+  const { isCurrentWorkspaceManager } = useAppContext()
+
+  const { mutateAsync: createMCP } = useCreateMCP()
+
+  const create = async (info: any) => {
+    const provider = await createMCP(info)
+    handleCreate(provider)
+  }
+
+  const linkUrl = useMemo(() => {
+    if (language.startsWith('zh_'))
+      return 'https://docs.dify.ai/zh-hans/guides/tools/mcp'
+    if (language.startsWith('ja_jp'))
+      return 'https://docs.dify.ai/ja_jp/guides/tools/mcp'
+    return 'https://docs.dify.ai/en/guides/tools/mcp'
+  }, [language])
+
+  const [showModal, setShowModal] = useState(false)
+
+  return (
+    <>
+      {isCurrentWorkspaceManager && (
+        <div className='col-span-1 flex min-h-[108px] cursor-pointer flex-col rounded-xl bg-background-default-dimmed transition-all duration-200 ease-in-out'>
+          <div className='group grow rounded-t-xl' onClick={() => setShowModal(true)}>
+            <div className='flex shrink-0 items-center p-4 pb-3'>
+              <div className='flex h-10 w-10 items-center justify-center rounded-lg border border-dashed border-divider-deep group-hover:border-solid group-hover:border-state-accent-hover-alt group-hover:bg-state-accent-hover'>
+                <RiAddCircleFill className='h-4 w-4 text-text-quaternary group-hover:text-text-accent'/>
+              </div>
+              <div className='system-md-semibold ml-3 text-text-secondary group-hover:text-text-accent'>{t('tools.mcp.create.cardTitle')}</div>
+            </div>
+          </div>
+          <div className='rounded-b-xl border-t-[0.5px] border-divider-subtle px-4 py-3 text-text-tertiary hover:text-text-accent'>
+            <a href={linkUrl} target='_blank' rel='noopener noreferrer' className='flex items-center space-x-1'>
+              <RiBookOpenLine className='h-3 w-3 shrink-0' />
+              <div className='system-xs-regular grow truncate' title={t('tools.mcp.create.cardLink') || ''}>{t('tools.mcp.create.cardLink')}</div>
+              <RiArrowRightUpLine className='h-3 w-3 shrink-0' />
+            </a>
+          </div>
+        </div>
+      )}
+      {showModal && (
+        <MCPModal
+          show={showModal}
+          onConfirm={create}
+          onHide={() => setShowModal(false)}
+        />
+      )}
+    </>
+  )
+}
+export default NewMCPCard
diff --git a/web/app/components/tools/mcp/detail/content.tsx b/web/app/components/tools/mcp/detail/content.tsx
new file mode 100644
index 0000000000..3f927b990d
--- /dev/null
+++ b/web/app/components/tools/mcp/detail/content.tsx
@@ -0,0 +1,308 @@
+'use client'
+import React, { useCallback, useEffect } from 'react'
+import type { FC } from 'react'
+import { useBoolean } from 'ahooks'
+import copy from 'copy-to-clipboard'
+import { useTranslation } from 'react-i18next'
+import { useAppContext } from '@/context/app-context'
+import {
+  RiCloseLine,
+  RiLoader2Line,
+  RiLoopLeftLine,
+} from '@remixicon/react'
+import type { ToolWithProvider } from '../../../workflow/types'
+import Icon from '@/app/components/plugins/card/base/card-icon'
+import ActionButton from '@/app/components/base/action-button'
+import Button from '@/app/components/base/button'
+import Confirm from '@/app/components/base/confirm'
+import Indicator from '@/app/components/header/indicator'
+import Tooltip from '@/app/components/base/tooltip'
+import MCPModal from '../modal'
+import OperationDropdown from './operation-dropdown'
+import ListLoading from './list-loading'
+import ToolItem from './tool-item'
+import {
+  useAuthorizeMCP,
+  useDeleteMCP,
+  useInvalidateMCPTools,
+  useMCPTools,
+  useUpdateMCP,
+  useUpdateMCPTools,
+} from '@/service/use-tools'
+import { openOAuthPopup } from '@/hooks/use-oauth'
+import cn from '@/utils/classnames'
+
+type Props = {
+  detail: ToolWithProvider
+  onUpdate: (isDelete?: boolean) => void
+  onHide: () => void
+  isTriggerAuthorize: boolean
+  onFirstCreate: () => void
+}
+
+const MCPDetailContent: FC<Props> = ({
+  detail,
+  onUpdate,
+  onHide,
+  isTriggerAuthorize,
+  onFirstCreate,
+}) => {
+  const { t } = useTranslation()
+  const { isCurrentWorkspaceManager } = useAppContext()
+
+  const { data, isFetching: isGettingTools } = useMCPTools(detail.is_team_authorization ? detail.id : '')
+  const invalidateMCPTools = useInvalidateMCPTools()
+  const { mutateAsync: updateTools, isPending: isUpdating } = useUpdateMCPTools()
+  const { mutateAsync: authorizeMcp, isPending: isAuthorizing } = useAuthorizeMCP()
+  const toolList = data?.tools || []
+
+  const [isShowUpdateConfirm, {
+    setTrue: showUpdateConfirm,
+    setFalse: hideUpdateConfirm,
+  }] = useBoolean(false)
+
+  const handleUpdateTools = useCallback(async () => {
+    hideUpdateConfirm()
+    if (!detail)
+      return
+    await updateTools(detail.id)
+    invalidateMCPTools(detail.id)
+    onUpdate()
+  }, [detail, hideUpdateConfirm, invalidateMCPTools, onUpdate, updateTools])
+
+  const { mutateAsync: updateMCP } = useUpdateMCP({})
+  const { mutateAsync: deleteMCP } = useDeleteMCP({})
+
+  const [isShowUpdateModal, {
+    setTrue: showUpdateModal,
+    setFalse: hideUpdateModal,
+  }] = useBoolean(false)
+
+  const [isShowDeleteConfirm, {
+    setTrue: showDeleteConfirm,
+    setFalse: hideDeleteConfirm,
+  }] = useBoolean(false)
+
+  const [deleting, {
+    setTrue: showDeleting,
+    setFalse: hideDeleting,
+  }] = useBoolean(false)
+
+  const handleOAuthCallback = useCallback(() => {
+    if (!isCurrentWorkspaceManager)
+      return
+    if (!detail.id)
+      return
+    handleUpdateTools()
+  }, [detail.id, handleUpdateTools, isCurrentWorkspaceManager])
+
+  const handleAuthorize = useCallback(async () => {
+    onFirstCreate()
+    if (!isCurrentWorkspaceManager)
+      return
+    if (!detail)
+      return
+    const res = await authorizeMcp({
+      provider_id: detail.id,
+    })
+    if (res.result === 'success')
+      handleUpdateTools()
+
+    else if (res.authorization_url)
+      openOAuthPopup(res.authorization_url, handleOAuthCallback)
+  }, [onFirstCreate, isCurrentWorkspaceManager, detail, authorizeMcp, handleUpdateTools, handleOAuthCallback])
+
+  const handleUpdate = useCallback(async (data: any) => {
+    if (!detail)
+      return
+    const res = await updateMCP({
+      ...data,
+      provider_id: detail.id,
+    })
+    if ((res as any)?.result === 'success') {
+      hideUpdateModal()
+      onUpdate()
+      handleAuthorize()
+    }
+  }, [detail, updateMCP, hideUpdateModal, onUpdate, handleAuthorize])
+
+  const handleDelete = useCallback(async () => {
+    if (!detail)
+      return
+    showDeleting()
+    const res = await deleteMCP(detail.id)
+    hideDeleting()
+    if ((res as any)?.result === 'success') {
+      hideDeleteConfirm()
+      onUpdate(true)
+    }
+  }, [detail, showDeleting, deleteMCP, hideDeleting, hideDeleteConfirm, onUpdate])
+
+  useEffect(() => {
+    if (isTriggerAuthorize)
+      handleAuthorize()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  if (!detail)
+    return null
+
+  return (
+    <>
+      <div className={cn('shrink-0 border-b border-divider-subtle bg-components-panel-bg p-4 pb-3')}>
+        <div className='flex'>
+          <div className='shrink-0 overflow-hidden rounded-xl border border-components-panel-border-subtle'>
+            <Icon src={detail.icon} />
+          </div>
+          <div className='ml-3 w-0 grow'>
+            <div className='flex h-5 items-center'>
+              <div className='system-md-semibold truncate text-text-primary' title={detail.name}>{detail.name}</div>
+            </div>
+            <div className='mt-0.5 flex items-center gap-1'>
+              <Tooltip popupContent={t('tools.mcp.identifier')}>
+                <div className='system-xs-regular shrink-0 cursor-pointer text-text-secondary' onClick={() => copy(detail.server_identifier || '')}>{detail.server_identifier}</div>
+              </Tooltip>
+              <div className='system-xs-regular shrink-0 text-text-quaternary'>·</div>
+              <Tooltip popupContent={t('tools.mcp.modal.serverUrl')}>
+                <div className='system-xs-regular truncate text-text-secondary'>{detail.server_url}</div>
+              </Tooltip>
+            </div>
+          </div>
+          <div className='flex gap-1'>
+            <OperationDropdown
+              onEdit={showUpdateModal}
+              onRemove={showDeleteConfirm}
+            />
+            <ActionButton onClick={onHide}>
+              <RiCloseLine className='h-4 w-4' />
+            </ActionButton>
+          </div>
+        </div>
+        <div className='mt-5'>
+          {!isAuthorizing && detail.is_team_authorization && (
+            <Button
+              variant='secondary'
+              className='w-full'
+              onClick={handleAuthorize}
+              disabled={!isCurrentWorkspaceManager}
+            >
+              <Indicator className='mr-2' color={'green'} />
+              {t('tools.auth.authorized')}
+            </Button>
+          )}
+          {!detail.is_team_authorization && !isAuthorizing && (
+            <Button
+              variant='primary'
+              className='w-full'
+              onClick={handleAuthorize}
+              disabled={!isCurrentWorkspaceManager}
+            >
+              {t('tools.mcp.authorize')}
+            </Button>
+          )}
+          {isAuthorizing && (
+            <Button
+              variant='primary'
+              className='w-full'
+              disabled
+            >
+              <RiLoader2Line className={cn('mr-1 h-4 w-4 animate-spin')} />
+              {t('tools.mcp.authorizing')}
+            </Button>
+          )}
+        </div>
+      </div>
+      <div className='flex grow flex-col'>
+        {((detail.is_team_authorization && isGettingTools) || isUpdating) && (
+          <>
+            <div className='flex shrink-0 justify-between gap-2 px-4 pb-1 pt-2'>
+              <div className='flex h-6 items-center'>
+                {!isUpdating && <div className='system-sm-semibold-uppercase text-text-secondary'>{t('tools.mcp.gettingTools')}</div>}
+                {isUpdating && <div className='system-sm-semibold-uppercase text-text-secondary'>{t('tools.mcp.updateTools')}</div>}
+              </div>
+              <div></div>
+            </div>
+            <div className='flex h-full w-full grow flex-col overflow-hidden px-4 pb-4'>
+              <ListLoading />
+            </div>
+          </>
+        )}
+        {!isUpdating && detail.is_team_authorization && !isGettingTools && !toolList.length && (
+          <div className='flex h-full w-full flex-col items-center justify-center'>
+            <div className='system-sm-regular mb-3 text-text-tertiary'>{t('tools.mcp.toolsEmpty')}</div>
+            <Button
+              variant='primary'
+              onClick={handleUpdateTools}
+            >{t('tools.mcp.getTools')}</Button>
+          </div>
+        )}
+        {!isUpdating && !isGettingTools && toolList.length > 0 && (
+          <>
+            <div className='flex shrink-0 justify-between gap-2 px-4 pb-1 pt-2'>
+              <div className='flex h-6 items-center'>
+                {toolList.length > 1 && <div className='system-sm-semibold-uppercase text-text-secondary'>{t('tools.mcp.toolsNum', { count: toolList.length })}</div>}
+                {toolList.length === 1 && <div className='system-sm-semibold-uppercase text-text-secondary'>{t('tools.mcp.onlyTool')}</div>}
+              </div>
+              <div>
+                <Button size='small' onClick={showUpdateConfirm}>
+                  <RiLoopLeftLine className='mr-1 h-3.5 w-3.5' />
+                  {t('tools.mcp.update')}
+                </Button>
+              </div>
+            </div>
+            <div className='flex h-0 w-full grow flex-col gap-2 overflow-y-auto px-4 pb-4'>
+              {toolList.map(tool => (
+                <ToolItem
+                  key={`${detail.id}${tool.name}`}
+                  tool={tool}
+                />
+              ))}
+            </div>
+          </>
+        )}
+
+        {!isUpdating && !detail.is_team_authorization && (
+          <div className='flex h-full w-full flex-col items-center justify-center'>
+            {!isAuthorizing && <div className='system-md-medium mb-1 text-text-secondary'>{t('tools.mcp.authorizingRequired')}</div>}
+            {isAuthorizing && <div className='system-md-medium mb-1 text-text-secondary'>{t('tools.mcp.authorizing')}</div>}
+            <div className='system-sm-regular text-text-tertiary'>{t('tools.mcp.authorizeTip')}</div>
+          </div>
+        )}
+      </div>
+      {isShowUpdateModal && (
+        <MCPModal
+          data={detail}
+          show={isShowUpdateModal}
+          onConfirm={handleUpdate}
+          onHide={hideUpdateModal}
+        />
+      )}
+      {isShowDeleteConfirm && (
+        <Confirm
+          isShow
+          title={t('tools.mcp.delete')}
+          content={
+            <div>
+              {t('tools.mcp.deleteConfirmTitle', { mcp: detail.name })}
+            </div>
+          }
+          onCancel={hideDeleteConfirm}
+          onConfirm={handleDelete}
+          isLoading={deleting}
+          isDisabled={deleting}
+        />
+      )}
+      {isShowUpdateConfirm && (
+        <Confirm
+          isShow
+          title={t('tools.mcp.toolUpdateConfirmTitle')}
+          content={t('tools.mcp.toolUpdateConfirmContent')}
+          onCancel={hideUpdateConfirm}
+          onConfirm={handleUpdateTools}
+        />
+      )}
+    </>
+  )
+}
+
+export default MCPDetailContent
diff --git a/web/app/components/tools/mcp/detail/list-loading.tsx b/web/app/components/tools/mcp/detail/list-loading.tsx
new file mode 100644
index 0000000000..babf050d8b
--- /dev/null
+++ b/web/app/components/tools/mcp/detail/list-loading.tsx
@@ -0,0 +1,37 @@
+'use client'
+import React from 'react'
+import cn from '@/utils/classnames'
+
+const ListLoading = () => {
+  return (
+    <div className={cn('space-y-2')}>
+      <div className='space-y-3 rounded-xl bg-components-panel-on-panel-item-bg-hover p-4'>
+        <div className='h-2 w-[180px] rounded-sm bg-text-quaternary opacity-20'></div>
+        <div className='h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+        <div className='mr-10 h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+      </div>
+      <div className='space-y-3 rounded-xl bg-components-panel-on-panel-item-bg-hover p-4'>
+        <div className='h-2 w-[148px] rounded-sm bg-text-quaternary opacity-20'></div>
+        <div className='h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+        <div className='mr-10 h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+      </div>
+      <div className='space-y-3 rounded-xl bg-components-panel-on-panel-item-bg-hover p-4'>
+        <div className='h-2 w-[196px] rounded-sm bg-text-quaternary opacity-20'></div>
+        <div className='h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+        <div className='mr-10 h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+      </div>
+      <div className='space-y-3 rounded-xl bg-components-panel-on-panel-item-bg-hover p-4'>
+        <div className='h-2 w-[148px] rounded-sm bg-text-quaternary opacity-20'></div>
+        <div className='h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+        <div className='mr-10 h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+      </div>
+      <div className='space-y-3 rounded-xl bg-components-panel-on-panel-item-bg-hover p-4'>
+        <div className='h-2 w-[180px] rounded-sm bg-text-quaternary opacity-20'></div>
+        <div className='h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+        <div className='mr-10 h-2 rounded-sm bg-text-quaternary opacity-10'></div>
+      </div>
+    </div>
+  )
+}
+
+export default ListLoading
diff --git a/web/app/components/tools/mcp/detail/operation-dropdown.tsx b/web/app/components/tools/mcp/detail/operation-dropdown.tsx
new file mode 100644
index 0000000000..d2cbc8825d
--- /dev/null
+++ b/web/app/components/tools/mcp/detail/operation-dropdown.tsx
@@ -0,0 +1,88 @@
+'use client'
+import type { FC } from 'react'
+import React, { useCallback, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  RiDeleteBinLine,
+  RiEditLine,
+  RiMoreFill,
+} from '@remixicon/react'
+import ActionButton from '@/app/components/base/action-button'
+import {
+  PortalToFollowElem,
+  PortalToFollowElemContent,
+  PortalToFollowElemTrigger,
+} from '@/app/components/base/portal-to-follow-elem'
+import cn from '@/utils/classnames'
+
+type Props = {
+  inCard?: boolean
+  onOpenChange?: (open: boolean) => void
+  onEdit: () => void
+  onRemove: () => void
+}
+
+const OperationDropdown: FC<Props> = ({
+  inCard,
+  onOpenChange,
+  onEdit,
+  onRemove,
+}) => {
+  const { t } = useTranslation()
+  const [open, doSetOpen] = useState(false)
+  const openRef = useRef(open)
+  const setOpen = useCallback((v: boolean) => {
+    doSetOpen(v)
+    openRef.current = v
+    onOpenChange?.(v)
+  }, [doSetOpen])
+
+  const handleTrigger = useCallback(() => {
+    setOpen(!openRef.current)
+  }, [setOpen])
+
+  return (
+    <PortalToFollowElem
+      open={open}
+      onOpenChange={setOpen}
+      placement='bottom-end'
+      offset={{
+        mainAxis: !inCard ? -12 : 0,
+        crossAxis: !inCard ? 36 : 0,
+      }}
+    >
+      <PortalToFollowElemTrigger onClick={handleTrigger}>
+        <div>
+          <ActionButton size={inCard ? 'l' : 'm'} className={cn(open && 'bg-state-base-hover')}>
+            <RiMoreFill className={cn('h-4 w-4', inCard && 'h-5 w-5')} />
+          </ActionButton>
+        </div>
+      </PortalToFollowElemTrigger>
+      <PortalToFollowElemContent className='z-50'>
+        <div className='w-[160px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg backdrop-blur-sm'>
+          <div
+            className='flex cursor-pointer items-center rounded-lg px-3 py-1.5 hover:bg-state-base-hover'
+            onClick={() => {
+              onEdit()
+              handleTrigger()
+            }}
+          >
+            <RiEditLine className='h-4 w-4 text-text-tertiary' />
+            <div className='system-md-regular ml-2 text-text-secondary'>{t('tools.mcp.operation.edit')}</div>
+          </div>
+          <div
+            className='group flex cursor-pointer items-center rounded-lg px-3 py-1.5 hover:bg-state-destructive-hover'
+            onClick={() => {
+              onRemove()
+              handleTrigger()
+            }}
+          >
+            <RiDeleteBinLine className='h-4 w-4 text-text-tertiary group-hover:text-text-destructive-secondary' />
+            <div className='system-md-regular ml-2 text-text-secondary group-hover:text-text-destructive'>{t('tools.mcp.operation.remove')}</div>
+          </div>
+        </div>
+      </PortalToFollowElemContent>
+    </PortalToFollowElem>
+  )
+}
+export default React.memo(OperationDropdown)
diff --git a/web/app/components/tools/mcp/detail/provider-detail.tsx b/web/app/components/tools/mcp/detail/provider-detail.tsx
new file mode 100644
index 0000000000..56f26f8582
--- /dev/null
+++ b/web/app/components/tools/mcp/detail/provider-detail.tsx
@@ -0,0 +1,56 @@
+'use client'
+import React from 'react'
+import type { FC } from 'react'
+import Drawer from '@/app/components/base/drawer'
+import MCPDetailContent from './content'
+import type { ToolWithProvider } from '../../../workflow/types'
+import cn from '@/utils/classnames'
+
+type Props = {
+  detail?: ToolWithProvider
+  onUpdate: () => void
+  onHide: () => void
+  isTriggerAuthorize: boolean
+  onFirstCreate: () => void
+}
+
+const MCPDetailPanel: FC<Props> = ({
+  detail,
+  onUpdate,
+  onHide,
+  isTriggerAuthorize,
+  onFirstCreate,
+}) => {
+  const handleUpdate = (isDelete = false) => {
+    if (isDelete)
+      onHide()
+    onUpdate()
+  }
+
+  if (!detail)
+    return null
+
+  return (
+    <Drawer
+      isOpen={!!detail}
+      clickOutsideNotOpen={false}
+      onClose={onHide}
+      footer={null}
+      mask={false}
+      positionCenter={false}
+      panelClassName={cn('mb-2 mr-2 mt-[64px] !w-[420px] !max-w-[420px] justify-start rounded-2xl border-[0.5px] border-components-panel-border !bg-components-panel-bg !p-0 shadow-xl')}
+    >
+      {detail && (
+        <MCPDetailContent
+          detail={detail}
+          onHide={onHide}
+          onUpdate={handleUpdate}
+          isTriggerAuthorize={isTriggerAuthorize}
+          onFirstCreate={onFirstCreate}
+        />
+      )}
+    </Drawer>
+  )
+}
+
+export default MCPDetailPanel
diff --git a/web/app/components/tools/mcp/detail/tool-item.tsx b/web/app/components/tools/mcp/detail/tool-item.tsx
new file mode 100644
index 0000000000..dec82edcca
--- /dev/null
+++ b/web/app/components/tools/mcp/detail/tool-item.tsx
@@ -0,0 +1,41 @@
+'use client'
+import React from 'react'
+import { useContext } from 'use-context-selector'
+import type { Tool } from '@/app/components/tools/types'
+import I18n from '@/context/i18n'
+import { getLanguage } from '@/i18n/language'
+import Tooltip from '@/app/components/base/tooltip'
+import cn from '@/utils/classnames'
+
+type Props = {
+  tool: Tool
+}
+
+const MCPToolItem = ({
+  tool,
+}: Props) => {
+  const { locale } = useContext(I18n)
+  const language = getLanguage(locale)
+
+  return (
+    <Tooltip
+      key={tool.name}
+      position='left'
+      popupClassName='!p-0 !px-4 !py-3.5 !w-[360px] !border-[0.5px] !border-components-panel-border !rounded-xl !shadow-lg'
+      popupContent={(
+        <div>
+          <div className='title-xs-semi-bold mb-1 text-text-primary'>{tool.label[language]}</div>
+          <div className='body-xs-regular text-text-secondary'>{tool.description[language]}</div>
+        </div>
+      )}
+    >
+      <div
+        className={cn('bg-components-panel-item-bg cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 shadow-xs hover:bg-components-panel-on-panel-item-bg-hover')}
+      >
+        <div className='system-md-semibold pb-0.5 text-text-secondary'>{tool.label[language]}</div>
+        <div className='system-xs-regular line-clamp-2 text-text-tertiary' title={tool.description[language]}>{tool.description[language]}</div>
+      </div>
+    </Tooltip>
+  )
+}
+export default MCPToolItem
diff --git a/web/app/components/tools/mcp/hooks.ts b/web/app/components/tools/mcp/hooks.ts
new file mode 100644
index 0000000000..b2b521557f
--- /dev/null
+++ b/web/app/components/tools/mcp/hooks.ts
@@ -0,0 +1,12 @@
+import dayjs from 'dayjs'
+import { useCallback } from 'react'
+import { useI18N } from '@/context/i18n'
+
+export const useFormatTimeFromNow = () => {
+  const { locale } = useI18N()
+  const formatTimeFromNow = useCallback((time: number) => {
+    return dayjs(time).locale(locale === 'zh-Hans' ? 'zh-cn' : locale).fromNow()
+  }, [locale])
+
+  return { formatTimeFromNow }
+}
diff --git a/web/app/components/tools/mcp/index.tsx b/web/app/components/tools/mcp/index.tsx
new file mode 100644
index 0000000000..5a1e5cf3bf
--- /dev/null
+++ b/web/app/components/tools/mcp/index.tsx
@@ -0,0 +1,98 @@
+'use client'
+import { useMemo, useState } from 'react'
+import NewMCPCard from './create-card'
+import MCPCard from './provider-card'
+import MCPDetailPanel from './detail/provider-detail'
+import {
+  useAllToolProviders,
+} from '@/service/use-tools'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+import cn from '@/utils/classnames'
+
+type Props = {
+  searchText: string
+}
+
+function renderDefaultCard() {
+  const defaultCards = Array.from({ length: 36 }, (_, index) => (
+    <div
+      key={index}
+      className={cn(
+        'inline-flex h-[111px] rounded-xl bg-background-default-lighter opacity-10',
+        index < 4 && 'opacity-60',
+        index >= 4 && index < 8 && 'opacity-50',
+        index >= 8 && index < 12 && 'opacity-40',
+        index >= 12 && index < 16 && 'opacity-30',
+        index >= 16 && index < 20 && 'opacity-25',
+        index >= 20 && index < 24 && 'opacity-20',
+      )}
+    ></div>
+  ))
+  return defaultCards
+}
+
+const MCPList = ({
+  searchText,
+}: Props) => {
+  const { data: list = [] as ToolWithProvider[], refetch } = useAllToolProviders()
+  const [isTriggerAuthorize, setIsTriggerAuthorize] = useState<boolean>(false)
+
+  const filteredList = useMemo(() => {
+    return list.filter((collection) => {
+      if (searchText)
+        return Object.values(collection.name).some(value => (value as string).toLowerCase().includes(searchText.toLowerCase()))
+      return collection.type === 'mcp'
+    }) as ToolWithProvider[]
+  }, [list, searchText])
+
+  const [currentProviderID, setCurrentProviderID] = useState<string>()
+
+  const currentProvider = useMemo(() => {
+    return list.find(provider => provider.id === currentProviderID)
+  }, [list, currentProviderID])
+
+  const handleCreate = async (provider: ToolWithProvider) => {
+    await refetch() // update list
+    setCurrentProviderID(provider.id)
+    setIsTriggerAuthorize(true)
+  }
+
+  const handleUpdate = async (providerID: string) => {
+    await refetch() // update list
+    setCurrentProviderID(providerID)
+    setIsTriggerAuthorize(true)
+  }
+  return (
+    <>
+      <div
+        className={cn(
+          'relative grid shrink-0 grid-cols-1 content-start gap-4 px-12 pb-4 pt-2 sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-4 2xl:grid-cols-5 2k:grid-cols-6',
+          !list.length && 'h-[calc(100vh_-_136px)] overflow-hidden',
+        )}
+      >
+        <NewMCPCard handleCreate={handleCreate} />
+        {filteredList.map(provider => (
+          <MCPCard
+            key={provider.id}
+            data={provider}
+            currentProvider={currentProvider as ToolWithProvider}
+            handleSelect={setCurrentProviderID}
+            onUpdate={handleUpdate}
+            onDeleted={refetch}
+          />
+        ))}
+        {!list.length && renderDefaultCard()}
+      </div>
+      {currentProvider && (
+        <MCPDetailPanel
+          detail={currentProvider as ToolWithProvider}
+          onHide={() => setCurrentProviderID(undefined)}
+          onUpdate={refetch}
+          isTriggerAuthorize={isTriggerAuthorize}
+          onFirstCreate={() => setIsTriggerAuthorize(false)}
+        />
+      )}
+    </>
+  )
+}
+export default MCPList
diff --git a/web/app/components/tools/mcp/mcp-server-modal.tsx b/web/app/components/tools/mcp/mcp-server-modal.tsx
new file mode 100644
index 0000000000..9eb33f21ec
--- /dev/null
+++ b/web/app/components/tools/mcp/mcp-server-modal.tsx
@@ -0,0 +1,134 @@
+'use client'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { RiCloseLine } from '@remixicon/react'
+import Modal from '@/app/components/base/modal'
+import Button from '@/app/components/base/button'
+import Textarea from '@/app/components/base/textarea'
+import Divider from '@/app/components/base/divider'
+import MCPServerParamItem from '@/app/components/tools/mcp/mcp-server-param-item'
+import type {
+  MCPServerDetail,
+} from '@/app/components/tools/types'
+import {
+  useCreateMCPServer,
+  useInvalidateMCPServerDetail,
+  useUpdateMCPServer,
+} from '@/service/use-tools'
+import cn from '@/utils/classnames'
+
+export type ModalProps = {
+  appID: string
+  latestParams?: any[]
+  data?: MCPServerDetail
+  show: boolean
+  onHide: () => void
+}
+
+const MCPServerModal = ({
+  appID,
+  latestParams = [],
+  data,
+  show,
+  onHide,
+}: ModalProps) => {
+  const { t } = useTranslation()
+  const { mutateAsync: createMCPServer, isPending: creating } = useCreateMCPServer()
+  const { mutateAsync: updateMCPServer, isPending: updating } = useUpdateMCPServer()
+  const invalidateMCPServerDetail = useInvalidateMCPServerDetail()
+
+  const [description, setDescription] = React.useState(data?.description || '')
+  const [params, setParams] = React.useState(data?.parameters || {})
+
+  const handleParamChange = (variable: string, value: string) => {
+    setParams(prev => ({
+      ...prev,
+      [variable]: value,
+    }))
+  }
+
+  const getParamValue = () => {
+    const res = {} as any
+    latestParams.map((param) => {
+      res[param.variable] = params[param.variable]
+      return param
+    })
+    return res
+  }
+
+  const submit = async () => {
+    if (!data) {
+      await createMCPServer({
+        appID,
+        description,
+        parameters: getParamValue(),
+      })
+      invalidateMCPServerDetail(appID)
+      onHide()
+    }
+    else {
+      await updateMCPServer({
+        appID,
+        id: data.id,
+        description,
+        parameters: getParamValue(),
+      })
+      invalidateMCPServerDetail(appID)
+      onHide()
+    }
+  }
+
+  return (
+    <Modal
+      isShow={show}
+      onClose={onHide}
+      className={cn('relative !max-w-[520px] !p-0')}
+    >
+      <div className='absolute right-5 top-5 z-10 cursor-pointer p-1.5' onClick={onHide}>
+        <RiCloseLine className='h-5 w-5 text-text-tertiary' />
+      </div>
+      <div className='title-2xl-semi-bold relative p-6 pb-3 text-xl text-text-primary'>
+        {!data ? t('tools.mcp.server.modal.addTitle') : t('tools.mcp.server.modal.editTitle')}
+      </div>
+      <div className='space-y-5 px-6 py-3'>
+        <div className='space-y-0.5'>
+          <div className='flex h-6 items-center gap-1'>
+            <div className='system-sm-medium text-text-secondary'>{t('tools.mcp.server.modal.description')}</div>
+            <div className='system-xs-regular text-text-destructive-secondary'>*</div>
+          </div>
+          <Textarea
+            className='h-[96px] resize-none'
+            value={description}
+            placeholder={t('tools.mcp.server.modal.descriptionPlaceholder')}
+            onChange={e => setDescription(e.target.value)}
+          ></Textarea>
+        </div>
+        {latestParams.length > 0 && (
+          <div>
+            <div className='mb-1 flex items-center gap-2'>
+              <div className='system-xs-medium-uppercase shrink-0 text-text-primary'>{t('tools.mcp.server.modal.parameters')}</div>
+              <Divider type='horizontal' className='!m-0 !h-px grow bg-divider-subtle' />
+            </div>
+            <div className='body-xs-regular mb-2 text-text-tertiary'>{t('tools.mcp.server.modal.parametersTip')}</div>
+            <div className='space-y-3'>
+              {latestParams.map(paramItem => (
+                <MCPServerParamItem
+                  key={paramItem.variable}
+                  data={paramItem}
+                  value={params[paramItem.variable] || ''}
+                  onChange={value => handleParamChange(paramItem.variable, value)}
+                />
+              ))}
+            </div>
+          </div>
+        )}
+      </div>
+      <div className='flex flex-row-reverse p-6 pt-5'>
+        <Button disabled={!description || creating || updating} className='ml-2' variant='primary' onClick={submit}>{data ? t('tools.mcp.modal.save') : t('tools.mcp.server.modal.confirm')}</Button>
+        <Button onClick={onHide}>{t('tools.mcp.modal.cancel')}</Button>
+      </div>
+    </Modal>
+  )
+}
+
+export default MCPServerModal
diff --git a/web/app/components/tools/mcp/mcp-server-param-item.tsx b/web/app/components/tools/mcp/mcp-server-param-item.tsx
new file mode 100644
index 0000000000..a48d1b92b0
--- /dev/null
+++ b/web/app/components/tools/mcp/mcp-server-param-item.tsx
@@ -0,0 +1,37 @@
+'use client'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import Textarea from '@/app/components/base/textarea'
+
+type Props = {
+  data?: any
+  value: string
+  onChange: (value: string) => void
+}
+
+const MCPServerParamItem = ({
+  data,
+  value,
+  onChange,
+}: Props) => {
+  const { t } = useTranslation()
+
+  return (
+    <div className='space-y-0.5'>
+      <div className='flex h-6 items-center gap-2'>
+        <div className='system-xs-medium text-text-secondary'>{data.label}</div>
+        <div className='system-xs-medium text-text-quaternary'>·</div>
+        <div className='system-xs-medium text-text-secondary'>{data.variable}</div>
+        <div className='system-xs-medium text-text-tertiary'>{data.type}</div>
+      </div>
+      <Textarea
+        className='h-8 resize-none'
+        value={value}
+        placeholder={t('tools.mcp.server.modal.parametersPlaceholder')}
+        onChange={e => onChange(e.target.value)}
+      ></Textarea>
+    </div>
+  )
+}
+
+export default MCPServerParamItem
diff --git a/web/app/components/tools/mcp/mcp-service-card.tsx b/web/app/components/tools/mcp/mcp-service-card.tsx
new file mode 100644
index 0000000000..443d7a1d1f
--- /dev/null
+++ b/web/app/components/tools/mcp/mcp-service-card.tsx
@@ -0,0 +1,244 @@
+'use client'
+import React, { useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  RiLoopLeftLine,
+} from '@remixicon/react'
+import {
+  Mcp,
+} from '@/app/components/base/icons/src/vender/other'
+import Button from '@/app/components/base/button'
+import Tooltip from '@/app/components/base/tooltip'
+import Switch from '@/app/components/base/switch'
+import Divider from '@/app/components/base/divider'
+import CopyFeedback from '@/app/components/base/copy-feedback'
+import Confirm from '@/app/components/base/confirm'
+import type { AppDetailResponse } from '@/models/app'
+import { useAppContext } from '@/context/app-context'
+import type { AppSSO } from '@/types/app'
+import Indicator from '@/app/components/header/indicator'
+import MCPServerModal from '@/app/components/tools/mcp/mcp-server-modal'
+import { useAppWorkflow } from '@/service/use-workflow'
+import {
+  useInvalidateMCPServerDetail,
+  useMCPServerDetail,
+  useRefreshMCPServerCode,
+  useUpdateMCPServer,
+} from '@/service/use-tools'
+import { BlockEnum } from '@/app/components/workflow/types'
+import cn from '@/utils/classnames'
+import { fetchAppDetail } from '@/service/apps'
+
+export type IAppCardProps = {
+  appInfo: AppDetailResponse & Partial<AppSSO>
+}
+
+function MCPServiceCard({
+  appInfo,
+}: IAppCardProps) {
+  const { t } = useTranslation()
+  const appId = appInfo.id
+  const { mutateAsync: updateMCPServer } = useUpdateMCPServer()
+  const { mutateAsync: refreshMCPServerCode, isPending: genLoading } = useRefreshMCPServerCode()
+  const invalidateMCPServerDetail = useInvalidateMCPServerDetail()
+  const { isCurrentWorkspaceManager, isCurrentWorkspaceEditor } = useAppContext()
+  const [showConfirmDelete, setShowConfirmDelete] = useState(false)
+  const [showMCPServerModal, setShowMCPServerModal] = useState(false)
+
+  const isAdvancedApp = appInfo?.mode === 'advanced-chat' || appInfo?.mode === 'workflow'
+  const isBasicApp = !isAdvancedApp
+  const { data: currentWorkflow } = useAppWorkflow(isAdvancedApp ? appId : '')
+  const [basicAppConfig, setBasicAppConfig] = useState<any>({})
+  const basicAppInputForm = useMemo(() => {
+    if(!isBasicApp || !basicAppConfig?.user_input_form)
+      return []
+    return basicAppConfig.user_input_form.map((item: any) => {
+      const type = Object.keys(item)[0]
+      return {
+        ...item[type],
+        type: type || 'text-input',
+      }
+    })
+  }, [basicAppConfig.user_input_form, isBasicApp])
+  useEffect(() => {
+    if(isBasicApp && appId) {
+      (async () => {
+        const res = await fetchAppDetail({ url: '/apps', id: appId })
+        setBasicAppConfig(res?.model_config || {})
+      })()
+    }
+  }, [appId, isBasicApp])
+  const { data: detail } = useMCPServerDetail(appId)
+  const { id, status, server_code } = detail ?? {}
+
+  const appUnpublished = isAdvancedApp ? !currentWorkflow?.graph : !basicAppConfig.updated_at
+  const serverPublished = !!id
+  const serverActivated = status === 'active'
+  const serverURL = serverPublished ? `${appInfo.api_base_url.replace('/v1', '')}/mcp/server/${server_code}/mcp` : '***********'
+  const toggleDisabled = !isCurrentWorkspaceEditor || appUnpublished
+
+  const [activated, setActivated] = useState(serverActivated)
+
+  const latestParams = useMemo(() => {
+    if(isAdvancedApp) {
+      if (!currentWorkflow?.graph)
+        return []
+      const startNode = currentWorkflow?.graph.nodes.find(node => node.data.type === BlockEnum.Start) as any
+      return startNode?.data.variables as any[] || []
+    }
+    return basicAppInputForm
+  }, [currentWorkflow, basicAppInputForm, isAdvancedApp])
+
+  const onGenCode = async () => {
+    await refreshMCPServerCode(detail?.id || '')
+    invalidateMCPServerDetail(appId)
+  }
+
+  const onChangeStatus = async (state: boolean) => {
+    setActivated(state)
+    if (state) {
+      if (!serverPublished) {
+        setShowMCPServerModal(true)
+        return
+      }
+
+      await updateMCPServer({
+        appID: appId,
+        id: id || '',
+        description: detail?.description || '',
+        parameters: detail?.parameters || {},
+        status: 'active',
+      })
+      invalidateMCPServerDetail(appId)
+    }
+    else {
+      await updateMCPServer({
+        appID: appId,
+        id: id || '',
+        description: detail?.description || '',
+        parameters: detail?.parameters || {},
+        status: 'inactive',
+      })
+      invalidateMCPServerDetail(appId)
+    }
+  }
+
+  const handleServerModalHide = () => {
+    setShowMCPServerModal(false)
+    if (!serverActivated)
+      setActivated(false)
+  }
+
+  useEffect(() => {
+    setActivated(serverActivated)
+  }, [serverActivated])
+
+  if (!currentWorkflow && isAdvancedApp)
+    return null
+
+  return (
+    <>
+      <div className={cn('w-full max-w-full rounded-xl border-l-[0.5px] border-t border-effects-highlight')}>
+        <div className='rounded-xl bg-background-default'>
+          <div className='flex w-full flex-col items-start justify-center gap-3 self-stretch border-b-[0.5px] border-divider-subtle p-3'>
+            <div className='flex w-full items-center gap-3 self-stretch'>
+              <div className='flex grow items-center'>
+                <div className='mr-3 shrink-0 rounded-lg border-[0.5px] border-divider-subtle bg-util-colors-indigo-indigo-500 p-1 shadow-md'>
+                  <Mcp className='h-4 w-4 text-text-primary-on-surface' />
+                </div>
+                <div className="group w-full">
+                  <div className="system-md-semibold min-w-0 overflow-hidden text-ellipsis break-normal text-text-secondary group-hover:text-text-primary">
+                    {t('tools.mcp.server.title')}
+                  </div>
+                </div>
+              </div>
+              <div className='flex items-center gap-1'>
+                <Indicator color={serverActivated ? 'green' : 'yellow'} />
+                <div className={`${serverActivated ? 'text-text-success' : 'text-text-warning'} system-xs-semibold-uppercase`}>
+                  {serverActivated
+                    ? t('appOverview.overview.status.running')
+                    : t('appOverview.overview.status.disable')}
+                </div>
+              </div>
+              <Tooltip
+                popupContent={appUnpublished ? t('tools.mcp.server.publishTip') : ''}
+              >
+                <div>
+                  <Switch defaultValue={activated} onChange={onChangeStatus} disabled={toggleDisabled} />
+                </div>
+              </Tooltip>
+            </div>
+            <div className='flex flex-col items-start justify-center self-stretch'>
+              <div className="system-xs-medium pb-1 text-text-tertiary">
+                {t('tools.mcp.server.url')}
+              </div>
+              <div className="inline-flex h-9 w-full items-center gap-0.5 rounded-lg bg-components-input-bg-normal p-1 pl-2">
+                <div className="flex h-4 min-w-0 flex-1 items-start justify-start gap-2 px-1">
+                  <div className="overflow-hidden text-ellipsis whitespace-nowrap text-xs font-medium text-text-secondary">
+                    {serverURL}
+                  </div>
+                </div>
+                {serverPublished && (
+                  <>
+                    <CopyFeedback
+                      content={serverURL}
+                      className={'!size-6'}
+                    />
+                    <Divider type="vertical" className="!mx-0.5 !h-3.5 shrink-0" />
+                    {isCurrentWorkspaceManager && (
+                      <Tooltip
+                        popupContent={t('appOverview.overview.appInfo.regenerate') || ''}
+                      >
+                        <div
+                          className="cursor-pointer rounded-md p-1 hover:bg-state-base-hover"
+                          onClick={() => setShowConfirmDelete(true)}
+                        >
+                          <RiLoopLeftLine className={cn('h-4 w-4 text-text-tertiary hover:text-text-secondary', genLoading && 'animate-spin')}/>
+                        </div>
+                      </Tooltip>
+                    )}
+                  </>
+                )}
+              </div>
+            </div>
+          </div>
+          <div className='flex items-center gap-1 self-stretch p-3'>
+            <Button
+              disabled={toggleDisabled}
+              size='small'
+              variant='ghost'
+              onClick={() => setShowMCPServerModal(true)}
+            >
+              {serverPublished ? t('tools.mcp.server.edit') : t('tools.mcp.server.addDescription')}
+            </Button>
+          </div>
+        </div>
+      </div>
+      {showMCPServerModal && (
+        <MCPServerModal
+          show={showMCPServerModal}
+          appID={appId}
+          data={serverPublished ? detail : undefined}
+          latestParams={latestParams}
+          onHide={handleServerModalHide}
+        />
+      )}
+      {/* button copy link/ button regenerate */}
+      {showConfirmDelete && (
+        <Confirm
+          type='warning'
+          title={t('appOverview.overview.appInfo.regenerate')}
+          content={t('tools.mcp.server.reGen')}
+          isShow={showConfirmDelete}
+          onConfirm={() => {
+            onGenCode()
+            setShowConfirmDelete(false)
+          }}
+          onCancel={() => setShowConfirmDelete(false)}
+        />
+      )}
+    </>
+  )
+}
+
+export default MCPServiceCard
diff --git a/web/app/components/tools/mcp/mock.ts b/web/app/components/tools/mcp/mock.ts
new file mode 100644
index 0000000000..f271f67ed3
--- /dev/null
+++ b/web/app/components/tools/mcp/mock.ts
@@ -0,0 +1,154 @@
+const tools = [
+  {
+    author: 'Novice',
+    name: 'NOTION_ADD_PAGE_CONTENT',
+    label: {
+      en_US: 'NOTION_ADD_PAGE_CONTENT',
+      zh_Hans: 'NOTION_ADD_PAGE_CONTENT',
+      pt_BR: 'NOTION_ADD_PAGE_CONTENT',
+      ja_JP: 'NOTION_ADD_PAGE_CONTENT',
+    },
+    description: {
+      en_US: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+      zh_Hans: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+      pt_BR: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+      ja_JP: 'Adds a single content block to a notion page. multiple calls needed for multiple blocks. note: only supports adding to notion pages. blocks that can contain children: - page (any block type) - toggle (any nested content) - to-do (nested to-dos/blocks) - bulleted list (nested lists/blocks) - numbered list (nested lists/blocks) - callout (child blocks) - quote (nested blocks)',
+    },
+    parameters: [
+      {
+        name: 'after',
+        label: {
+          en_US: 'after',
+          zh_Hans: 'after',
+          pt_BR: 'after',
+          ja_JP: 'after',
+        },
+        placeholder: null,
+        scope: null,
+        auto_generate: null,
+        template: null,
+        required: false,
+        default: null,
+        min: null,
+        max: null,
+        precision: null,
+        options: [],
+        type: 'string',
+        human_description: {
+          en_US: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+          zh_Hans: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+          pt_BR: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+          ja_JP: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+        },
+        form: 'llm',
+        llm_description: 'The ID of the existing block that the new block should be appended after. If not provided, content will be appended at the end of the page.',
+      },
+      {
+        name: 'content_block',
+        label: {
+          en_US: 'content_block',
+          zh_Hans: 'content_block',
+          pt_BR: 'content_block',
+          ja_JP: 'content_block',
+        },
+        placeholder: null,
+        scope: null,
+        auto_generate: null,
+        template: null,
+        required: false,
+        default: null,
+        min: null,
+        max: null,
+        precision: null,
+        options: [],
+        type: 'string',
+        human_description: {
+          en_US: 'Child content to append to a page.',
+          zh_Hans: 'Child content to append to a page.',
+          pt_BR: 'Child content to append to a page.',
+          ja_JP: 'Child content to append to a page.',
+        },
+        form: 'llm',
+        llm_description: 'Child content to append to a page.',
+      },
+      {
+        name: 'parent_block_id',
+        label: {
+          en_US: 'parent_block_id',
+          zh_Hans: 'parent_block_id',
+          pt_BR: 'parent_block_id',
+          ja_JP: 'parent_block_id',
+        },
+        placeholder: null,
+        scope: null,
+        auto_generate: null,
+        template: null,
+        required: false,
+        default: null,
+        min: null,
+        max: null,
+        precision: null,
+        options: [],
+        type: 'string',
+        human_description: {
+          en_US: 'The ID of the page which the children will be added.',
+          zh_Hans: 'The ID of the page which the children will be added.',
+          pt_BR: 'The ID of the page which the children will be added.',
+          ja_JP: 'The ID of the page which the children will be added.',
+        },
+        form: 'llm',
+        llm_description: 'The ID of the page which the children will be added.',
+      },
+    ],
+    labels: [],
+    output_schema: null,
+  },
+]
+
+export const listData = [
+  {
+    id: 'fdjklajfkljadslf111',
+    author: 'KVOJJJin',
+    name: 'GOGOGO',
+    icon: 'https://cloud.dify.dev/console/api/workspaces/694cc430-fa36-4458-86a0-4a98c09c4684/model-providers/langgenius/openai/openai/icon_small/en_US',
+    server_url: 'https://mcp.composio.dev/notion/****/abc',
+    type: 'mcp',
+    is_team_authorization: true,
+    tools,
+    update_elapsed_time: 1744793369,
+    label: {
+      en_US: 'GOGOGO',
+      zh_Hans: 'GOGOGO',
+    },
+  },
+  {
+    id: 'fdjklajfkljadslf222',
+    author: 'KVOJJJin',
+    name: 'GOGOGO2',
+    icon: 'https://cloud.dify.dev/console/api/workspaces/694cc430-fa36-4458-86a0-4a98c09c4684/model-providers/langgenius/openai/openai/icon_small/en_US',
+    server_url: 'https://mcp.composio.dev/notion/****/abc',
+    type: 'mcp',
+    is_team_authorization: false,
+    tools: [],
+    update_elapsed_time: 1744793369,
+    label: {
+      en_US: 'GOGOGO2',
+      zh_Hans: 'GOGOGO2',
+    },
+  },
+  {
+    id: 'fdjklajfkljadslf333',
+    author: 'KVOJJJin',
+    name: 'GOGOGO3',
+    icon: 'https://cloud.dify.dev/console/api/workspaces/694cc430-fa36-4458-86a0-4a98c09c4684/model-providers/langgenius/openai/openai/icon_small/en_US',
+    server_url: 'https://mcp.composio.dev/notion/****/abc',
+    type: 'mcp',
+    is_team_authorization: true,
+    tools,
+    update_elapsed_time: 1744793369,
+    label: {
+      en_US: 'GOGOGO3',
+      zh_Hans: 'GOGOGO3',
+    },
+  },
+]
diff --git a/web/app/components/tools/mcp/modal.tsx b/web/app/components/tools/mcp/modal.tsx
new file mode 100644
index 0000000000..0e57cb149b
--- /dev/null
+++ b/web/app/components/tools/mcp/modal.tsx
@@ -0,0 +1,221 @@
+'use client'
+import React, { useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { getDomain } from 'tldts'
+import { RiCloseLine, RiEditLine } from '@remixicon/react'
+import AppIconPicker from '@/app/components/base/app-icon-picker'
+import type { AppIconSelection } from '@/app/components/base/app-icon-picker'
+import AppIcon from '@/app/components/base/app-icon'
+import Modal from '@/app/components/base/modal'
+import Button from '@/app/components/base/button'
+import Input from '@/app/components/base/input'
+import type { AppIconType } from '@/types/app'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+import { noop } from 'lodash-es'
+import Toast from '@/app/components/base/toast'
+import { uploadRemoteFileInfo } from '@/service/common'
+import cn from '@/utils/classnames'
+import { useHover } from 'ahooks'
+
+export type DuplicateAppModalProps = {
+  data?: ToolWithProvider
+  show: boolean
+  onConfirm: (info: {
+    name: string
+    server_url: string
+    icon_type: AppIconType
+    icon: string
+    icon_background?: string | null
+    server_identifier: string
+  }) => void
+  onHide: () => void
+}
+
+const DEFAULT_ICON = { type: 'emoji', icon: '🧿', background: '#EFF1F5' }
+const extractFileId = (url: string) => {
+  const match = url.match(/files\/(.+?)\/file-preview/)
+  return match ? match[1] : null
+}
+const getIcon = (data?: ToolWithProvider) => {
+  if (!data)
+    return DEFAULT_ICON as AppIconSelection
+  if (typeof data.icon === 'string')
+    return { type: 'image', url: data.icon, fileId: extractFileId(data.icon) } as AppIconSelection
+  return {
+    ...data.icon,
+    icon: data.icon.content,
+    type: 'emoji',
+  } as unknown as AppIconSelection
+}
+
+const MCPModal = ({
+  data,
+  show,
+  onConfirm,
+  onHide,
+}: DuplicateAppModalProps) => {
+  const { t } = useTranslation()
+  const isCreate = !data
+
+  const originalServerUrl = data?.server_url
+  const originalServerID = data?.server_identifier
+  const [url, setUrl] = React.useState(data?.server_url || '')
+  const [name, setName] = React.useState(data?.name || '')
+  const [appIcon, setAppIcon] = useState<AppIconSelection>(getIcon(data))
+  const [showAppIconPicker, setShowAppIconPicker] = useState(false)
+  const [serverIdentifier, setServerIdentifier] = React.useState(data?.server_identifier || '')
+  const [isFetchingIcon, setIsFetchingIcon] = useState(false)
+  const appIconRef = useRef<HTMLDivElement>(null)
+  const isHovering = useHover(appIconRef)
+
+  const isValidUrl = (string: string) => {
+    try {
+      const urlPattern = /^(https?:\/\/)((([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|((\d{1,3}\.){3}\d{1,3}))(\:\d+)?(\/[-a-z\d%_.~+]*)*(\?[;&a-z\d%_.~+=-]*)?/i
+      return urlPattern.test(string)
+    }
+    catch (e) {
+      return false
+    }
+  }
+
+  const isValidServerID = (str: string) => {
+    return /^[a-z0-9_-]{1,24}$/.test(str)
+  }
+
+  const handleBlur = async (url: string) => {
+    if (data)
+      return
+    if (!isValidUrl(url))
+      return
+    const domain = getDomain(url)
+    const remoteIcon = `https://www.google.com/s2/favicons?domain=${domain}&sz=128`
+    setIsFetchingIcon(true)
+    try {
+      const res = await uploadRemoteFileInfo(remoteIcon, undefined, true)
+      setAppIcon({ type: 'image', url: res.url, fileId: extractFileId(res.url) || '' })
+    }
+    catch (e) {
+      console.error('Failed to fetch remote icon:', e)
+      Toast.notify({ type: 'warning', message: 'Failed to fetch remote icon' })
+    }
+    finally {
+      setIsFetchingIcon(false)
+    }
+  }
+
+  const submit = async () => {
+    if (!isValidUrl(url)) {
+      Toast.notify({ type: 'error', message: 'invalid server url' })
+      return
+    }
+    if (!isValidServerID(serverIdentifier.trim())) {
+      Toast.notify({ type: 'error', message: 'invalid server identifier' })
+      return
+    }
+    await onConfirm({
+      server_url: originalServerUrl === url ? '[__HIDDEN__]' : url.trim(),
+      name,
+      icon_type: appIcon.type,
+      icon: appIcon.type === 'emoji' ? appIcon.icon : appIcon.fileId,
+      icon_background: appIcon.type === 'emoji' ? appIcon.background : undefined,
+      server_identifier: serverIdentifier.trim(),
+    })
+    if(isCreate)
+      onHide()
+  }
+
+  return (
+    <>
+      <Modal
+        isShow={show}
+        onClose={noop}
+        className={cn('relative !max-w-[520px]', 'p-6')}
+      >
+        <div className='absolute right-5 top-5 z-10 cursor-pointer p-1.5' onClick={onHide}>
+          <RiCloseLine className='h-5 w-5 text-text-tertiary' />
+        </div>
+        <div className='title-2xl-semi-bold relative pb-3 text-xl text-text-primary'>{!isCreate ? t('tools.mcp.modal.editTitle') : t('tools.mcp.modal.title')}</div>
+        <div className='space-y-5 py-3'>
+          <div>
+            <div className='mb-1 flex h-6 items-center'>
+              <span className='system-sm-medium text-text-secondary'>{t('tools.mcp.modal.serverUrl')}</span>
+            </div>
+            <Input
+              value={url}
+              onChange={e => setUrl(e.target.value)}
+              onBlur={e => handleBlur(e.target.value.trim())}
+              placeholder={t('tools.mcp.modal.serverUrlPlaceholder')}
+            />
+            {originalServerUrl && originalServerUrl !== url && (
+              <div className='mt-1 flex h-5 items-center'>
+                <span className='body-xs-regular text-text-warning'>{t('tools.mcp.modal.serverUrlWarning')}</span>
+              </div>
+            )}
+          </div>
+          <div className='flex space-x-3'>
+            <div className='grow pb-1'>
+              <div className='mb-1 flex h-6 items-center'>
+                <span className='system-sm-medium text-text-secondary'>{t('tools.mcp.modal.name')}</span>
+              </div>
+              <Input
+                value={name}
+                onChange={e => setName(e.target.value)}
+                placeholder={t('tools.mcp.modal.namePlaceholder')}
+              />
+            </div>
+            <div className='pt-2' ref={appIconRef}>
+              <AppIcon
+                iconType={appIcon.type}
+                icon={appIcon.type === 'emoji' ? appIcon.icon : appIcon.fileId}
+                background={appIcon.type === 'emoji' ? appIcon.background : undefined}
+                imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
+                size='xxl'
+                className='relative cursor-pointer rounded-2xl'
+                coverElement={
+                  isHovering
+                    ? (<div className='absolute inset-0 flex items-center justify-center overflow-hidden rounded-2xl bg-background-overlay-alt'>
+                      <RiEditLine className='size-6 text-text-primary-on-surface' />
+                    </div>) : null
+                }
+                onClick={() => { setShowAppIconPicker(true) }}
+              />
+            </div>
+          </div>
+          <div>
+            <div className='flex h-6 items-center'>
+              <span className='system-sm-medium text-text-secondary'>{t('tools.mcp.modal.serverIdentifier')}</span>
+            </div>
+            <div className='body-xs-regular mb-1 text-text-tertiary'>{t('tools.mcp.modal.serverIdentifierTip')}</div>
+            <Input
+              value={serverIdentifier}
+              onChange={e => setServerIdentifier(e.target.value)}
+              placeholder={t('tools.mcp.modal.serverIdentifierPlaceholder')}
+            />
+            {originalServerID && originalServerID !== serverIdentifier && (
+              <div className='mt-1 flex h-5 items-center'>
+                <span className='body-xs-regular text-text-warning'>{t('tools.mcp.modal.serverIdentifierWarning')}</span>
+              </div>
+            )}
+          </div>
+        </div>
+        <div className='flex flex-row-reverse pt-5'>
+          <Button disabled={!name || !url || !serverIdentifier || isFetchingIcon} className='ml-2' variant='primary' onClick={submit}>{data ? t('tools.mcp.modal.save') : t('tools.mcp.modal.confirm')}</Button>
+          <Button onClick={onHide}>{t('tools.mcp.modal.cancel')}</Button>
+        </div>
+      </Modal>
+      {showAppIconPicker && <AppIconPicker
+        onSelect={(payload) => {
+          setAppIcon(payload)
+          setShowAppIconPicker(false)
+        }}
+        onClose={() => {
+          setAppIcon(getIcon(data))
+          setShowAppIconPicker(false)
+        }}
+      />}
+    </>
+
+  )
+}
+
+export default MCPModal
diff --git a/web/app/components/tools/mcp/provider-card.tsx b/web/app/components/tools/mcp/provider-card.tsx
new file mode 100644
index 0000000000..677e25c533
--- /dev/null
+++ b/web/app/components/tools/mcp/provider-card.tsx
@@ -0,0 +1,152 @@
+'use client'
+import { useCallback, useState } from 'react'
+import { useBoolean } from 'ahooks'
+import { useTranslation } from 'react-i18next'
+import { useAppContext } from '@/context/app-context'
+import { RiHammerFill } from '@remixicon/react'
+import Indicator from '@/app/components/header/indicator'
+import Icon from '@/app/components/plugins/card/base/card-icon'
+import { useFormatTimeFromNow } from './hooks'
+import type { ToolWithProvider } from '../../workflow/types'
+import Confirm from '@/app/components/base/confirm'
+import MCPModal from './modal'
+import OperationDropdown from './detail/operation-dropdown'
+import { useDeleteMCP, useUpdateMCP } from '@/service/use-tools'
+import cn from '@/utils/classnames'
+
+type Props = {
+  currentProvider?: ToolWithProvider
+  data: ToolWithProvider
+  handleSelect: (providerID: string) => void
+  onUpdate: (providerID: string) => void
+  onDeleted: () => void
+}
+
+const MCPCard = ({
+  currentProvider,
+  data,
+  onUpdate,
+  handleSelect,
+  onDeleted,
+}: Props) => {
+  const { t } = useTranslation()
+  const { formatTimeFromNow } = useFormatTimeFromNow()
+  const { isCurrentWorkspaceManager } = useAppContext()
+
+  const { mutateAsync: updateMCP } = useUpdateMCP({})
+  const { mutateAsync: deleteMCP } = useDeleteMCP({})
+
+  const [isOperationShow, setIsOperationShow] = useState(false)
+
+  const [isShowUpdateModal, {
+    setTrue: showUpdateModal,
+    setFalse: hideUpdateModal,
+  }] = useBoolean(false)
+
+  const [isShowDeleteConfirm, {
+    setTrue: showDeleteConfirm,
+    setFalse: hideDeleteConfirm,
+  }] = useBoolean(false)
+
+  const [deleting, {
+    setTrue: showDeleting,
+    setFalse: hideDeleting,
+  }] = useBoolean(false)
+
+  const handleUpdate = useCallback(async (form: any) => {
+    const res = await updateMCP({
+      ...form,
+      provider_id: data.id,
+    })
+    if ((res as any)?.result === 'success') {
+      hideUpdateModal()
+      onUpdate(data.id)
+    }
+  }, [data, updateMCP, hideUpdateModal, onUpdate])
+
+  const handleDelete = useCallback(async () => {
+    showDeleting()
+    const res = await deleteMCP(data.id)
+    hideDeleting()
+    if ((res as any)?.result === 'success') {
+      hideDeleteConfirm()
+      onDeleted()
+    }
+  }, [showDeleting, deleteMCP, data.id, hideDeleting, hideDeleteConfirm, onDeleted])
+
+  return (
+    <div
+      onClick={() => handleSelect(data.id)}
+      className={cn(
+        'group relative flex cursor-pointer flex-col rounded-xl border-[1.5px] border-transparent bg-components-card-bg shadow-xs hover:bg-components-card-bg-alt hover:shadow-md',
+        currentProvider?.id === data.id && 'border-components-option-card-option-selected-border bg-components-card-bg-alt',
+      )}
+    >
+      <div className='flex grow items-center gap-3 rounded-t-xl p-4'>
+        <div className='shrink-0 overflow-hidden rounded-xl border border-components-panel-border-subtle'>
+          <Icon src={data.icon} />
+        </div>
+        <div className='grow'>
+          <div className='system-md-semibold mb-1 truncate text-text-secondary' title={data.name}>{data.name}</div>
+          <div className='system-xs-regular text-text-tertiary'>{data.server_identifier}</div>
+        </div>
+      </div>
+      <div className='flex items-center gap-1 rounded-b-xl pb-2.5 pl-4 pr-2.5 pt-1.5'>
+        <div className='flex w-0 grow items-center gap-2'>
+          <div className='flex items-center gap-1'>
+            <RiHammerFill className='h-3 w-3 shrink-0 text-text-quaternary' />
+            {data.tools.length > 0 && (
+              <div className='system-xs-regular shrink-0 text-text-tertiary'>{t('tools.mcp.toolsCount', { count: data.tools.length })}</div>
+            )}
+            {!data.tools.length && (
+              <div className='system-xs-regular shrink-0 text-text-tertiary'>{t('tools.mcp.noTools')}</div>
+            )}
+          </div>
+          <div className={cn('system-xs-regular text-divider-deep', (!data.is_team_authorization || !data.tools.length) && 'sm:hidden')}>/</div>
+          <div className={cn('system-xs-regular truncate text-text-tertiary', (!data.is_team_authorization || !data.tools.length) && ' sm:hidden')} title={`${t('tools.mcp.updateTime')} ${formatTimeFromNow(data.updated_at! * 1000)}`}>{`${t('tools.mcp.updateTime')} ${formatTimeFromNow(data.updated_at! * 1000)}`}</div>
+        </div>
+        {data.is_team_authorization && data.tools.length > 0 && <Indicator color='green' className='shrink-0' />}
+        {(!data.is_team_authorization || !data.tools.length) && (
+          <div className='system-xs-medium flex shrink-0 items-center gap-1 rounded-md border border-util-colors-red-red-500 bg-components-badge-bg-red-soft px-1.5 py-0.5 text-util-colors-red-red-500'>
+            {t('tools.mcp.noConfigured')}
+            <Indicator color='red' />
+          </div>
+        )}
+      </div>
+      {isCurrentWorkspaceManager && (
+        <div className={cn('absolute right-2.5 top-2.5 hidden group-hover:block', isOperationShow && 'block')} onClick={e => e.stopPropagation()}>
+          <OperationDropdown
+            inCard
+            onOpenChange={setIsOperationShow}
+            onEdit={showUpdateModal}
+            onRemove={showDeleteConfirm}
+          />
+        </div>
+      )}
+      {isShowUpdateModal && (
+        <MCPModal
+          data={data}
+          show={isShowUpdateModal}
+          onConfirm={handleUpdate}
+          onHide={hideUpdateModal}
+        />
+      )}
+      {isShowDeleteConfirm && (
+        <Confirm
+          isShow
+          title={t('tools.mcp.delete')}
+          content={
+            <div>
+              {t('tools.mcp.deleteConfirmTitle', { mcp: data.name })}
+            </div>
+          }
+          onCancel={hideDeleteConfirm}
+          onConfirm={handleDelete}
+          isLoading={deleting}
+          isDisabled={deleting}
+        />
+      )}
+    </div>
+  )
+}
+export default MCPCard
diff --git a/web/app/components/tools/provider-list.tsx b/web/app/components/tools/provider-list.tsx
index b0b4f8a8bc..ecfa5f6ea2 100644
--- a/web/app/components/tools/provider-list.tsx
+++ b/web/app/components/tools/provider-list.tsx
@@ -15,11 +15,29 @@ import WorkflowToolEmpty from '@/app/components/tools/add-tool-modal/empty'
 import Card from '@/app/components/plugins/card'
 import CardMoreInfo from '@/app/components/plugins/card/card-more-info'
 import PluginDetailPanel from '@/app/components/plugins/plugin-detail-panel'
+import MCPList from './mcp'
 import { useAllToolProviders } from '@/service/use-tools'
 import { useInstalledPluginList, useInvalidateInstalledPluginList } from '@/service/use-plugins'
 import { useGlobalPublicStore } from '@/context/global-public-context'
+import { ToolTypeEnum } from '../workflow/block-selector/types'
 
+const getToolType = (type: string) => {
+  switch (type) {
+    case 'builtin':
+      return ToolTypeEnum.BuiltIn
+    case 'api':
+      return ToolTypeEnum.Custom
+    case 'workflow':
+      return ToolTypeEnum.Workflow
+    case 'mcp':
+      return ToolTypeEnum.MCP
+    default:
+      return ToolTypeEnum.BuiltIn
+  }
+}
 const ProviderList = () => {
+  // const searchParams = useSearchParams()
+    // searchParams.get('category') === 'workflow'
   const { t } = useTranslation()
   const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
   const containerRef = useRef<HTMLDivElement>(null)
@@ -31,6 +49,7 @@ const ProviderList = () => {
     { value: 'builtin', text: t('tools.type.builtIn') },
     { value: 'api', text: t('tools.type.custom') },
     { value: 'workflow', text: t('tools.type.workflow') },
+    { value: 'mcp', text: 'MCP' },
   ]
   const [tagFilterValue, setTagFilterValue] = useState<string[]>([])
   const handleTagsChange = (value: string[]) => {
@@ -85,7 +104,9 @@ const ProviderList = () => {
               options={options}
             />
             <div className='flex items-center gap-2'>
-              <LabelFilter value={tagFilterValue} onChange={handleTagsChange} />
+              {activeTab !== 'mcp' && (
+                <LabelFilter value={tagFilterValue} onChange={handleTagsChange} />
+              )}
               <Input
                 showLeftIcon
                 showClearIcon
@@ -96,7 +117,7 @@ const ProviderList = () => {
               />
             </div>
           </div>
-          {(filteredCollectionList.length > 0 || activeTab !== 'builtin') && (
+          {activeTab !== 'mcp' && (
             <div className={cn(
               'relative grid shrink-0 grid-cols-1 content-start gap-4 px-12 pb-4 pt-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4',
               !filteredCollectionList.length && activeTab === 'workflow' && 'grow',
@@ -127,25 +148,26 @@ const ProviderList = () => {
                   />
                 </div>
               ))}
-              {!filteredCollectionList.length && activeTab === 'workflow' && <div className='absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2'><WorkflowToolEmpty /></div>}
+              {!filteredCollectionList.length && activeTab === 'workflow' && <div className='absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2'><WorkflowToolEmpty type={getToolType(activeTab)} /></div>}
             </div>
           )}
           {!filteredCollectionList.length && activeTab === 'builtin' && (
             <Empty lightCard text={t('tools.noTools')} className='h-[224px] px-12' />
           )}
-          {
-            enable_marketplace && activeTab === 'builtin' && (
-              <Marketplace
-                onMarketplaceScroll={() => {
-                  containerRef.current?.scrollTo({ top: containerRef.current.scrollHeight, behavior: 'smooth' })
-                }}
-                searchPluginText={keywords}
-                filterPluginTags={tagFilterValue}
-              />
-            )
-          }
-        </div >
-      </div >
+          {enable_marketplace && activeTab === 'builtin' && (
+            <Marketplace
+              onMarketplaceScroll={() => {
+                containerRef.current?.scrollTo({ top: containerRef.current.scrollHeight, behavior: 'smooth' })
+              }}
+              searchPluginText={keywords}
+              filterPluginTags={tagFilterValue}
+            />
+          )}
+          {activeTab === 'mcp' && (
+            <MCPList searchText={keywords} />
+          )}
+        </div>
+      </div>
       {currentProvider && !currentProvider.plugin_id && (
         <ProviderDetail
           collection={currentProvider}
diff --git a/web/app/components/tools/provider/custom-create-card.tsx b/web/app/components/tools/provider/custom-create-card.tsx
index f64daba8cd..ab5b85e260 100644
--- a/web/app/components/tools/provider/custom-create-card.tsx
+++ b/web/app/components/tools/provider/custom-create-card.tsx
@@ -3,13 +3,13 @@ import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
 import {
-  RiAddLine,
+  RiAddCircleFill,
+  RiArrowRightUpLine,
+  RiBookOpenLine,
 } from '@remixicon/react'
 import type { CustomCollectionBackend } from '../types'
 import I18n from '@/context/i18n'
 import { getLanguage } from '@/i18n/language'
-import { BookOpen01 } from '@/app/components/base/icons/src/vender/line/education'
-import { ArrowUpRight } from '@/app/components/base/icons/src/vender/line/arrows'
 import EditCustomToolModal from '@/app/components/tools/edit-custom-collection-modal'
 import { createCustomCollection } from '@/service/tools'
 import Toast from '@/app/components/base/toast'
@@ -47,20 +47,20 @@ const Contribute = ({ onRefreshData }: Props) => {
   return (
     <>
       {isCurrentWorkspaceManager && (
-        <div className='col-span-1 flex min-h-[135px] cursor-pointer flex-col rounded-xl border-[0.5px] border-divider-subtle bg-components-panel-on-panel-item-bg transition-all duration-200 ease-in-out hover:bg-components-panel-on-panel-item-bg-hover hover:shadow-lg'>
-          <div className='group grow rounded-t-xl hover:bg-background-body' onClick={() => setIsShowEditCustomCollectionModal(true)}>
+        <div className='col-span-1 flex min-h-[135px] cursor-pointer flex-col rounded-xl bg-background-default-dimmed transition-all duration-200 ease-in-out'>
+          <div className='group grow rounded-t-xl' onClick={() => setIsShowEditCustomCollectionModal(true)}>
             <div className='flex shrink-0 items-center p-4 pb-3'>
-              <div className='flex h-10 w-10 items-center justify-center rounded-lg border border-components-option-card-option-border bg-components-option-card-option-bg group-hover:border-components-option-card-option-border-hover group-hover:bg-components-option-card-option-bg-hover'>
-                <RiAddLine className='h-4 w-4 text-text-tertiary group-hover:text-text-accent'/>
+              <div className='flex h-10 w-10 items-center justify-center rounded-lg border border-dashed border-divider-deep group-hover:border-solid group-hover:border-state-accent-hover-alt group-hover:bg-state-accent-hover'>
+                <RiAddCircleFill className='h-4 w-4 text-text-quaternary group-hover:text-text-accent'/>
               </div>
-              <div className='ml-3 text-sm font-semibold leading-5 text-text-primary group-hover:text-text-accent'>{t('tools.createCustomTool')}</div>
+              <div className='system-md-semibold ml-3 text-text-secondary group-hover:text-text-accent'>{t('tools.createCustomTool')}</div>
             </div>
           </div>
-          <div className='rounded-b-xl border-t-[0.5px] border-divider-regular px-4 py-3 text-text-tertiary hover:bg-background-body hover:text-text-accent'>
+          <div className='rounded-b-xl border-t-[0.5px] border-divider-subtle px-4 py-3 text-text-tertiary hover:text-text-accent'>
             <a href={linkUrl} target='_blank' rel='noopener noreferrer' className='flex items-center space-x-1'>
-              <BookOpen01 className='h-3 w-3 shrink-0' />
-              <div className='grow truncate text-xs font-normal leading-[18px]' title={t('tools.customToolTip') || ''}>{t('tools.customToolTip')}</div>
-              <ArrowUpRight className='h-3 w-3 shrink-0' />
+              <RiBookOpenLine className='h-3 w-3 shrink-0' />
+              <div className='system-xs-regular grow truncate' title={t('tools.customToolTip') || ''}>{t('tools.customToolTip')}</div>
+              <RiArrowRightUpLine className='h-3 w-3 shrink-0' />
             </a>
           </div>
         </div>
diff --git a/web/app/components/tools/provider/tool-item.tsx b/web/app/components/tools/provider/tool-item.tsx
index 161b62963b..d79d20cb9c 100644
--- a/web/app/components/tools/provider/tool-item.tsx
+++ b/web/app/components/tools/provider/tool-item.tsx
@@ -29,7 +29,7 @@ const ToolItem = ({
   return (
     <>
       <div
-        className={cn('bg-components-panel-item-bg mb-2 cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 shadow-xs hover:bg-components-panel-on-panel-item-bg-hover', disabled && '!cursor-not-allowed opacity-50')}
+        className={cn('bg-components-panel-item-bg cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 shadow-xs hover:bg-components-panel-on-panel-item-bg-hover', disabled && '!cursor-not-allowed opacity-50')}
         onClick={() => !disabled && setShowDetail(true)}
       >
         <div className='system-md-semibold pb-0.5 text-text-secondary'>{tool.label[language]}</div>
diff --git a/web/app/components/tools/types.ts b/web/app/components/tools/types.ts
index 32c468cde8..d444ee1f38 100644
--- a/web/app/components/tools/types.ts
+++ b/web/app/components/tools/types.ts
@@ -29,6 +29,7 @@ export enum CollectionType {
   custom = 'api',
   model = 'model',
   workflow = 'workflow',
+  mcp = 'mcp',
 }
 
 export type Emoji = {
@@ -50,6 +51,10 @@ export type Collection = {
   labels: string[]
   plugin_id?: string
   letter?: string
+  // MCP Server
+  server_url?: string
+  updated_at?: number
+  server_identifier?: string
 }
 
 export type ToolParameter = {
@@ -168,3 +173,11 @@ export type WorkflowToolProviderResponse = {
   }
   privacy_policy: string
 }
+
+export type MCPServerDetail = {
+  id: string
+  server_code: string
+  description: string
+  status: string
+  parameters?: Record<string, string>
+}
diff --git a/web/app/components/tools/utils/to-form-schema.ts b/web/app/components/tools/utils/to-form-schema.ts
index 179f59021e..ee7f3379ad 100644
--- a/web/app/components/tools/utils/to-form-schema.ts
+++ b/web/app/components/tools/utils/to-form-schema.ts
@@ -1,4 +1,7 @@
 import type { ToolCredential, ToolParameter } from '../types'
+import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
+
 export const toType = (type: string) => {
   switch (type) {
     case 'string':
@@ -54,7 +57,7 @@ export const toolCredentialToFormSchemas = (parameters: ToolCredential[]) => {
   return formSchemas
 }
 
-export const addDefaultValue = (value: Record<string, any>, formSchemas: { variable: string; default?: any }[]) => {
+export const addDefaultValue = (value: Record<string, any>, formSchemas: { variable: string; type: string; default?: any }[]) => {
   const newValues = { ...value }
   formSchemas.forEach((formSchema) => {
     const itemValue = value[formSchema.variable]
@@ -64,14 +67,47 @@ export const addDefaultValue = (value: Record<string, any>, formSchemas: { varia
   return newValues
 }
 
-export const generateFormValue = (value: Record<string, any>, formSchemas: { variable: string; default?: any }[], isReasoning = false) => {
+const correctInitialData = (type: string, target: any, defaultValue: any) => {
+  if (type === 'text-input' || type === 'secret-input')
+    target.type = 'mixed'
+
+  if (type === 'boolean') {
+    if (typeof defaultValue === 'string')
+      target.value = defaultValue === 'true' || defaultValue === '1'
+
+    if (typeof defaultValue === 'boolean')
+      target.value = defaultValue
+
+    if (typeof defaultValue === 'number')
+      target.value = defaultValue === 1
+  }
+
+  if (type === 'number-input') {
+    if (typeof defaultValue === 'string' && defaultValue !== '')
+      target.value = Number.parseFloat(defaultValue)
+  }
+
+  if (type === 'app-selector' || type === 'model-selector')
+    target.value = defaultValue
+
+  return target
+}
+
+export const generateFormValue = (value: Record<string, any>, formSchemas: { variable: string; default?: any; type: string }[], isReasoning = false) => {
   const newValues = {} as any
   formSchemas.forEach((formSchema) => {
     const itemValue = value[formSchema.variable]
     if ((formSchema.default !== undefined) && (value === undefined || itemValue === null || itemValue === '' || itemValue === undefined)) {
+      const value = formSchema.default
       newValues[formSchema.variable] = {
-        ...(isReasoning ? { value: null, auto: 1 } : { value: formSchema.default }),
+        value: {
+          type: 'constant',
+          value: formSchema.default,
+        },
+        ...(isReasoning ? { auto: 1, value: null } : {}),
       }
+      if (!isReasoning)
+        newValues[formSchema.variable].value = correctInitialData(formSchema.type, newValues[formSchema.variable].value, value)
     }
   })
   return newValues
@@ -80,7 +116,9 @@ export const generateFormValue = (value: Record<string, any>, formSchemas: { var
 export const getPlainValue = (value: Record<string, any>) => {
   const plainValue = { ...value }
   Object.keys(plainValue).forEach((key) => {
-    plainValue[key] = value[key].value
+    plainValue[key] = {
+      ...value[key].value,
+    }
   })
   return plainValue
 }
@@ -94,3 +132,65 @@ export const getStructureValue = (value: Record<string, any>) => {
   })
   return newValue
 }
+
+export const getConfiguredValue = (value: Record<string, any>, formSchemas: { variable: string; type: string; default?: any }[]) => {
+  const newValues = { ...value }
+  formSchemas.forEach((formSchema) => {
+    const itemValue = value[formSchema.variable]
+    if ((formSchema.default !== undefined) && (value === undefined || itemValue === null || itemValue === '' || itemValue === undefined)) {
+      const value = formSchema.default
+      newValues[formSchema.variable] = {
+        type: 'constant',
+        value: formSchema.default,
+      }
+      newValues[formSchema.variable] = correctInitialData(formSchema.type, newValues[formSchema.variable], value)
+    }
+  })
+  return newValues
+}
+
+const getVarKindType = (type: FormTypeEnum) => {
+    if (type === FormTypeEnum.file || type === FormTypeEnum.files)
+      return VarKindType.variable
+    if (type === FormTypeEnum.select || type === FormTypeEnum.boolean || type === FormTypeEnum.textNumber)
+      return VarKindType.constant
+    if (type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput)
+      return VarKindType.mixed
+  }
+
+export const generateAgentToolValue = (value: Record<string, any>, formSchemas: { variable: string; default?: any; type: string }[], isReasoning = false) => {
+  const newValues = {} as any
+  if (!isReasoning) {
+    formSchemas.forEach((formSchema) => {
+      const itemValue = value[formSchema.variable]
+      newValues[formSchema.variable] = {
+        value: {
+          type: 'constant',
+          value: itemValue.value,
+        },
+      }
+      newValues[formSchema.variable].value = correctInitialData(formSchema.type, newValues[formSchema.variable].value, itemValue.value)
+    })
+  }
+  else {
+    formSchemas.forEach((formSchema) => {
+      const itemValue = value[formSchema.variable]
+      if (itemValue.auto === 1) {
+        newValues[formSchema.variable] = {
+          auto: 1,
+          value: null,
+        }
+      }
+      else {
+        newValues[formSchema.variable] = {
+          auto: 0,
+          value: itemValue.value || {
+            type: getVarKindType(formSchema.type as FormTypeEnum),
+            value: null,
+          },
+        }
+      }
+    })
+  }
+  return newValues
+}
diff --git a/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx b/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
index 83f354d7d8..fd48935147 100644
--- a/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
+++ b/web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
@@ -23,7 +23,7 @@ import {
   InputVarType,
 } from '@/app/components/workflow/types'
 import { useToastContext } from '@/app/components/base/toast'
-import { usePublishWorkflow, useResetWorkflowVersionHistory } from '@/service/use-workflow'
+import { useInvalidateAppWorkflow, usePublishWorkflow, useResetWorkflowVersionHistory } from '@/service/use-workflow'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import { fetchAppDetail } from '@/service/apps'
 import { useStore as useAppStore } from '@/app/components/app/store'
@@ -89,6 +89,7 @@ const FeaturesTrigger = () => {
     }
   }, [appID, setAppDetail])
   const { mutateAsync: publishWorkflow } = usePublishWorkflow(appID!)
+  const updatePublishedWorkflow = useInvalidateAppWorkflow()
   const onPublish = useCallback(async (params?: PublishWorkflowParams) => {
     if (await handleCheckBeforePublish()) {
       const res = await publishWorkflow({
@@ -98,6 +99,7 @@ const FeaturesTrigger = () => {
 
       if (res) {
         notify({ type: 'success', message: t('common.api.actionSuccess') })
+        updatePublishedWorkflow(appID!)
         updateAppDetail()
         workflowStore.getState().setPublishedAt(res.created_at)
         resetWorkflowVersionHistory()
@@ -106,7 +108,7 @@ const FeaturesTrigger = () => {
     else {
       throw new Error('Checklist failed')
     }
-  }, [handleCheckBeforePublish, notify, t, workflowStore, publishWorkflow, resetWorkflowVersionHistory, updateAppDetail])
+  }, [handleCheckBeforePublish, publishWorkflow, notify, t, updatePublishedWorkflow, appID, updateAppDetail, workflowStore, resetWorkflowVersionHistory])
 
   const onPublisherToggle = useCallback((state: boolean) => {
     if (state)
diff --git a/web/app/components/workflow/block-selector/all-tools.tsx b/web/app/components/workflow/block-selector/all-tools.tsx
index e57a6bd3f7..870d791d4f 100644
--- a/web/app/components/workflow/block-selector/all-tools.tsx
+++ b/web/app/components/workflow/block-selector/all-tools.tsx
@@ -5,10 +5,11 @@ import {
   useState,
 } from 'react'
 import type {
+  BlockEnum,
   OnSelectBlock,
   ToolWithProvider,
 } from '../types'
-import type { ToolValue } from './types'
+import type { ToolDefaultValue, ToolValue } from './types'
 import { ToolTypeEnum } from './types'
 import Tools from './tools'
 import { useToolTabs } from './hooks'
@@ -17,8 +18,6 @@ import cn from '@/utils/classnames'
 import { useGetLanguage } from '@/context/i18n'
 import type { ListRef } from '@/app/components/workflow/block-selector/market-place-plugin/list'
 import PluginList, { type ListProps } from '@/app/components/workflow/block-selector/market-place-plugin/list'
-import ActionButton from '../../base/action-button'
-import { RiAddLine } from '@remixicon/react'
 import { PluginType } from '../../plugins/types'
 import { useMarketplacePlugins } from '../../plugins/marketplace/hooks'
 import { useGlobalPublicStore } from '@/context/global-public-context'
@@ -31,11 +30,12 @@ type AllToolsProps = {
   buildInTools: ToolWithProvider[]
   customTools: ToolWithProvider[]
   workflowTools: ToolWithProvider[]
+  mcpTools: ToolWithProvider[]
   onSelect: OnSelectBlock
-  supportAddCustomTool?: boolean
-  onAddedCustomTool?: () => void
-  onShowAddCustomCollectionModal?: () => void
+  canNotSelectMultiple?: boolean
+  onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 
 const DEFAULT_TAGS: AllToolsProps['tags'] = []
@@ -46,12 +46,14 @@ const AllTools = ({
   searchText,
   tags = DEFAULT_TAGS,
   onSelect,
+  canNotSelectMultiple,
+  onSelectMultiple,
   buildInTools,
   workflowTools,
   customTools,
-  supportAddCustomTool,
-  onShowAddCustomCollectionModal,
+  mcpTools = [],
   selectedTools,
+  canChooseMCPTool,
 }: AllToolsProps) => {
   const language = useGetLanguage()
   const tabs = useToolTabs()
@@ -64,13 +66,15 @@ const AllTools = ({
   const tools = useMemo(() => {
     let mergedTools: ToolWithProvider[] = []
     if (activeTab === ToolTypeEnum.All)
-      mergedTools = [...buildInTools, ...customTools, ...workflowTools]
+      mergedTools = [...buildInTools, ...customTools, ...workflowTools, ...mcpTools]
     if (activeTab === ToolTypeEnum.BuiltIn)
       mergedTools = buildInTools
     if (activeTab === ToolTypeEnum.Custom)
       mergedTools = customTools
     if (activeTab === ToolTypeEnum.Workflow)
       mergedTools = workflowTools
+    if (activeTab === ToolTypeEnum.MCP)
+      mergedTools = mcpTools
 
     if (!hasFilter)
       return mergedTools.filter(toolWithProvider => toolWithProvider.tools.length > 0)
@@ -80,7 +84,7 @@ const AllTools = ({
         return tool.label[language].toLowerCase().includes(searchText.toLowerCase()) || tool.name.toLowerCase().includes(searchText.toLowerCase())
       })
     })
-  }, [activeTab, buildInTools, customTools, workflowTools, searchText, language, hasFilter])
+  }, [activeTab, buildInTools, customTools, workflowTools, mcpTools, searchText, language, hasFilter])
 
   const {
     queryPluginsWithDebounced: fetchPlugins,
@@ -88,7 +92,6 @@ const AllTools = ({
   } = useMarketplacePlugins()
 
   const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
-
   useEffect(() => {
     if (!enable_marketplace) return
     if (searchText || tags.length > 0) {
@@ -103,10 +106,11 @@ const AllTools = ({
 
   const pluginRef = useRef<ListRef>(null)
   const wrapElemRef = useRef<HTMLDivElement>(null)
+  const isSupportGroupView = [ToolTypeEnum.All, ToolTypeEnum.BuiltIn].includes(activeTab)
 
   return (
-    <div className={cn(className)}>
-      <div className='flex items-center justify-between border-b-[0.5px] border-divider-subtle bg-background-default-hover px-3 shadow-xs'>
+    <div className={cn('min-w-[400px] max-w-[500px]', className)}>
+      <div className='flex items-center justify-between border-b border-divider-subtle px-3'>
         <div className='flex h-8 items-center space-x-1'>
           {
             tabs.map(tab => (
@@ -124,17 +128,8 @@ const AllTools = ({
             ))
           }
         </div>
-        <ViewTypeSelect viewType={activeView} onChange={setActiveView} />
-        {supportAddCustomTool && (
-          <div className='flex items-center'>
-            <div className='mr-1.5 h-3.5 w-px  bg-divider-regular'></div>
-            <ActionButton
-              className='bg-components-button-primary-bg text-components-button-primary-text hover:bg-components-button-primary-bg hover:text-components-button-primary-text'
-              onClick={onShowAddCustomCollectionModal}
-            >
-              <RiAddLine className='h-4 w-4' />
-            </ActionButton>
-          </div>
+        {isSupportGroupView && (
+          <ViewTypeSelect viewType={activeView} onChange={setActiveView} />
         )}
       </div>
       <div
@@ -144,12 +139,15 @@ const AllTools = ({
       >
         <Tools
           className={toolContentClassName}
-          showWorkflowEmpty={activeTab === ToolTypeEnum.Workflow}
           tools={tools}
           onSelect={onSelect}
-          viewType={activeView}
+          canNotSelectMultiple={canNotSelectMultiple}
+          onSelectMultiple={onSelectMultiple}
+          toolType={activeTab}
+          viewType={isSupportGroupView ? activeView : ViewType.flat}
           hasSearchText={!!searchText}
           selectedTools={selectedTools}
+          canChooseMCPTool={canChooseMCPTool}
         />
         {/* Plugins from marketplace */}
         {enable_marketplace && <PluginList
diff --git a/web/app/components/workflow/block-selector/hooks.ts b/web/app/components/workflow/block-selector/hooks.ts
index a8b1759506..d00815584d 100644
--- a/web/app/components/workflow/block-selector/hooks.ts
+++ b/web/app/components/workflow/block-selector/hooks.ts
@@ -31,10 +31,9 @@ export const useTabs = () => {
   ]
 }
 
-export const useToolTabs = () => {
+export const useToolTabs = (isHideMCPTools?: boolean) => {
   const { t } = useTranslation()
-
-  return [
+  const tabs = [
     {
       key: ToolTypeEnum.All,
       name: t('workflow.tabs.allTool'),
@@ -52,4 +51,12 @@ export const useToolTabs = () => {
       name: t('workflow.tabs.workflowTool'),
     },
   ]
+  if(!isHideMCPTools) {
+    tabs.push({
+      key: ToolTypeEnum.MCP,
+      name: 'MCP',
+    })
+  }
+
+  return tabs
 }
diff --git a/web/app/components/workflow/block-selector/index-bar.tsx b/web/app/components/workflow/block-selector/index-bar.tsx
index 4d8bedffbe..097a16eb94 100644
--- a/web/app/components/workflow/block-selector/index-bar.tsx
+++ b/web/app/components/workflow/block-selector/index-bar.tsx
@@ -83,8 +83,8 @@ const IndexBar: FC<IndexBarProps> = ({ letters, itemRefs, className }) => {
       element.scrollIntoView({ behavior: 'smooth' })
   }
   return (
-    <div className={classNames('index-bar absolute right-0 top-36 flex flex-col items-center w-6 justify-center text-xs font-medium text-text-quaternary', className)}>
-      <div className='absolute left-0 top-0 h-full w-px bg-[linear-gradient(270deg,rgba(255,255,255,0)_0%,rgba(16,24,40,0.08)_30%,rgba(16,24,40,0.08)_50%,rgba(16,24,40,0.08)_70.5%,rgba(255,255,255,0)_100%)]'></div>
+    <div className={classNames('index-bar sticky top-[20px] flex h-full w-6 flex-col items-center justify-center text-xs font-medium text-text-quaternary', className)}>
+      <div className={classNames('absolute left-0 top-0 h-full w-px bg-[linear-gradient(270deg,rgba(255,255,255,0)_0%,rgba(16,24,40,0.08)_30%,rgba(16,24,40,0.08)_50%,rgba(16,24,40,0.08)_70.5%,rgba(255,255,255,0)_100%)]')}></div>
       {letters.map(letter => (
         <div className="cursor-pointer hover:text-text-secondary" key={letter} onClick={() => handleIndexClick(letter)}>
           {letter}
diff --git a/web/app/components/workflow/block-selector/index.tsx b/web/app/components/workflow/block-selector/index.tsx
index 9e55a24d9e..0673ca0c0d 100644
--- a/web/app/components/workflow/block-selector/index.tsx
+++ b/web/app/components/workflow/block-selector/index.tsx
@@ -129,33 +129,35 @@ const NodeSelector: FC<NodeSelectorProps> = ({
       </PortalToFollowElemTrigger>
       <PortalToFollowElemContent className='z-[1000]'>
         <div className={`rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg ${popupClassName}`}>
-          <div className='px-2 pt-2' onClick={e => e.stopPropagation()}>
-            {activeTab === TabsEnum.Blocks && (
-              <Input
-                showLeftIcon
-                showClearIcon
-                autoFocus
-                value={searchText}
-                placeholder={searchPlaceholder}
-                onChange={e => setSearchText(e.target.value)}
-                onClear={() => setSearchText('')}
-              />
-            )}
-            {activeTab === TabsEnum.Tools && (
-              <SearchBox
-                search={searchText}
-                onSearchChange={setSearchText}
-                tags={tags}
-                onTagsChange={setTags}
-                size='small'
-                placeholder={t('plugin.searchTools')!}
-              />
-            )}
-
-          </div>
           <Tabs
             activeTab={activeTab}
             onActiveTabChange={handleActiveTabChange}
+            filterElem={
+              <div className='relative m-2' onClick={e => e.stopPropagation()}>
+                {activeTab === TabsEnum.Blocks && (
+                  <Input
+                    showLeftIcon
+                    showClearIcon
+                    autoFocus
+                    value={searchText}
+                    placeholder={searchPlaceholder}
+                    onChange={e => setSearchText(e.target.value)}
+                    onClear={() => setSearchText('')}
+                  />
+                )}
+                {activeTab === TabsEnum.Tools && (
+                  <SearchBox
+                    search={searchText}
+                    onSearchChange={setSearchText}
+                    tags={tags}
+                    onTagsChange={setTags}
+                    size='small'
+                    placeholder={t('plugin.searchTools')!}
+                    inputClassName='grow'
+                  />
+                )}
+              </div>
+            }
             onSelect={handleSelect}
             searchText={searchText}
             tags={tags}
diff --git a/web/app/components/workflow/block-selector/market-place-plugin/list.tsx b/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
index e2b4a7acc6..dce877ab91 100644
--- a/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
+++ b/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
@@ -80,7 +80,7 @@ const List = forwardRef<ListRef, ListProps>(({
     )
   }
 
-  const maxWidthClassName = toolContentClassName || 'max-w-[300px]'
+  const maxWidthClassName = toolContentClassName || 'max-w-[100%]'
 
   return (
     <>
@@ -109,18 +109,20 @@ const List = forwardRef<ListRef, ListProps>(({
             onAction={noop}
           />
         ))}
-        <div className='mb-3 mt-2 flex items-center justify-center space-x-2'>
-          <div className="h-[2px] w-[90px] bg-gradient-to-l from-[rgba(16,24,40,0.08)] to-[rgba(255,255,255,0.01)]"></div>
-          <Link
-            href={urlWithSearchText}
-            target='_blank'
-            className='system-sm-medium flex h-4 shrink-0 items-center text-text-accent-light-mode-only'
-          >
-            <RiSearchLine className='mr-0.5 h-3 w-3' />
-            <span>{t('plugin.searchInMarketplace')}</span>
-          </Link>
-          <div className="h-[2px] w-[90px] bg-gradient-to-l from-[rgba(255,255,255,0.01)] to-[rgba(16,24,40,0.08)]"></div>
-        </div>
+        {list.length > 0 && (
+          <div className='mb-3 mt-2 flex items-center justify-center space-x-2'>
+            <div className="h-[2px] w-[90px] bg-gradient-to-l from-[rgba(16,24,40,0.08)] to-[rgba(255,255,255,0.01)]"></div>
+            <Link
+              href={urlWithSearchText}
+              target='_blank'
+              className='system-sm-medium flex h-4 shrink-0 items-center text-text-accent-light-mode-only'
+            >
+              <RiSearchLine className='mr-0.5 h-3 w-3' />
+              <span>{t('plugin.searchInMarketplace')}</span>
+            </Link>
+            <div className="h-[2px] w-[90px] bg-gradient-to-l from-[rgba(255,255,255,0.01)] to-[rgba(16,24,40,0.08)]"></div>
+          </div>
+        )}
       </div>
     </>
   )
diff --git a/web/app/components/workflow/block-selector/tabs.tsx b/web/app/components/workflow/block-selector/tabs.tsx
index 67aaaba1a5..3f3fed2ca9 100644
--- a/web/app/components/workflow/block-selector/tabs.tsx
+++ b/web/app/components/workflow/block-selector/tabs.tsx
@@ -1,6 +1,6 @@
 import type { FC } from 'react'
 import { memo } from 'react'
-import { useAllBuiltInTools, useAllCustomTools, useAllWorkflowTools } from '@/service/use-tools'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools } from '@/service/use-tools'
 import type { BlockEnum } from '../types'
 import { useTabs } from './hooks'
 import type { ToolDefaultValue } from './types'
@@ -16,6 +16,7 @@ export type TabsProps = {
   tags: string[]
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
   availableBlocksTypes?: BlockEnum[]
+  filterElem: React.ReactNode
   noBlocks?: boolean
 }
 const Tabs: FC<TabsProps> = ({
@@ -25,26 +26,28 @@ const Tabs: FC<TabsProps> = ({
   searchText,
   onSelect,
   availableBlocksTypes,
+  filterElem,
   noBlocks,
 }) => {
   const tabs = useTabs()
   const { data: buildInTools } = useAllBuiltInTools()
   const { data: customTools } = useAllCustomTools()
   const { data: workflowTools } = useAllWorkflowTools()
+  const { data: mcpTools } = useAllMCPTools()
 
   return (
     <div onClick={e => e.stopPropagation()}>
       {
         !noBlocks && (
-          <div className='flex items-center border-b-[0.5px] border-divider-subtle px-3'>
+          <div className='relative flex bg-background-section-burn pl-1 pt-1'>
             {
               tabs.map(tab => (
                 <div
                   key={tab.key}
                   className={cn(
-                    'system-sm-medium relative mr-4 cursor-pointer pb-2 pt-1',
+                    'system-sm-medium relative mr-0.5 flex h-8 cursor-pointer  items-center rounded-t-lg px-3 ',
                     activeTab === tab.key
-                      ? 'text-text-primary after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-full after:bg-util-colors-blue-brand-blue-brand-600'
+                      ? 'sm-no-bottom cursor-default bg-components-panel-bg text-text-accent'
                       : 'text-text-tertiary',
                   )}
                   onClick={() => onActiveTabChange(tab.key)}
@@ -56,25 +59,30 @@ const Tabs: FC<TabsProps> = ({
           </div>
         )
       }
+      {filterElem}
       {
         activeTab === TabsEnum.Blocks && !noBlocks && (
-          <Blocks
-            searchText={searchText}
-            onSelect={onSelect}
-            availableBlocksTypes={availableBlocksTypes}
-          />
+          <div className='border-t border-divider-subtle'>
+            <Blocks
+              searchText={searchText}
+              onSelect={onSelect}
+              availableBlocksTypes={availableBlocksTypes}
+            />
+          </div>
         )
       }
       {
         activeTab === TabsEnum.Tools && (
           <AllTools
-            className='w-[315px]'
             searchText={searchText}
             onSelect={onSelect}
             tags={tags}
+            canNotSelectMultiple
             buildInTools={buildInTools || []}
             customTools={customTools || []}
             workflowTools={workflowTools || []}
+            mcpTools={mcpTools || []}
+            canChooseMCPTool
           />
         )
       }
diff --git a/web/app/components/workflow/block-selector/tool-picker.tsx b/web/app/components/workflow/block-selector/tool-picker.tsx
index dbb49fde75..d97a4f3a1b 100644
--- a/web/app/components/workflow/block-selector/tool-picker.tsx
+++ b/web/app/components/workflow/block-selector/tool-picker.tsx
@@ -23,7 +23,7 @@ import {
 } from '@/service/tools'
 import type { CustomCollectionBackend } from '@/app/components/tools/types'
 import Toast from '@/app/components/base/toast'
-import { useAllBuiltInTools, useAllCustomTools, useAllWorkflowTools, useInvalidateAllCustomTools } from '@/service/use-tools'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools, useInvalidateAllCustomTools } from '@/service/use-tools'
 import cn from '@/utils/classnames'
 
 type Props = {
@@ -35,9 +35,11 @@ type Props = {
   isShow: boolean
   onShowChange: (isShow: boolean) => void
   onSelect: (tool: ToolDefaultValue) => void
+  onSelectMultiple: (tools: ToolDefaultValue[]) => void
   supportAddCustomTool?: boolean
   scope?: string
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 
 const ToolPicker: FC<Props> = ({
@@ -48,10 +50,12 @@ const ToolPicker: FC<Props> = ({
   isShow,
   onShowChange,
   onSelect,
+  onSelectMultiple,
   supportAddCustomTool,
   scope = 'all',
   selectedTools,
   panelClassName,
+  canChooseMCPTool,
 }) => {
   const { t } = useTranslation()
   const [searchText, setSearchText] = useState('')
@@ -61,6 +65,7 @@ const ToolPicker: FC<Props> = ({
   const { data: customTools } = useAllCustomTools()
   const invalidateCustomTools = useInvalidateAllCustomTools()
   const { data: workflowTools } = useAllWorkflowTools()
+  const { data: mcpTools } = useAllMCPTools()
 
   const { builtinToolList, customToolList, workflowToolList } = useMemo(() => {
     if (scope === 'plugins') {
@@ -102,6 +107,10 @@ const ToolPicker: FC<Props> = ({
     onSelect(tool!)
   }
 
+  const handleSelectMultiple = (_type: BlockEnum, tools: ToolDefaultValue[]) => {
+    onSelectMultiple(tools)
+  }
+
   const [isShowEditCollectionToolModal, {
     setFalse: hideEditCustomCollectionModal,
     setTrue: showEditCustomCollectionModal,
@@ -142,7 +151,7 @@ const ToolPicker: FC<Props> = ({
       </PortalToFollowElemTrigger>
 
       <PortalToFollowElemContent className='z-[1000]'>
-        <div className={cn('relative min-h-20 w-[356px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-sm', panelClassName)}>
+        <div className={cn('relative min-h-20 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-sm', panelClassName)}>
           <div className='p-2 pb-1'>
             <SearchBox
               search={searchText}
@@ -151,21 +160,26 @@ const ToolPicker: FC<Props> = ({
               onTagsChange={setTags}
               size='small'
               placeholder={t('plugin.searchTools')!}
+              supportAddCustomTool={supportAddCustomTool}
+              onAddedCustomTool={handleAddedCustomTool}
+              onShowAddCustomCollectionModal={showEditCustomCollectionModal}
+              inputClassName='grow'
+
             />
           </div>
           <AllTools
             className='mt-1'
-            toolContentClassName='max-w-[360px]'
+            toolContentClassName='max-w-[100%]'
             tags={tags}
             searchText={searchText}
             onSelect={handleSelect}
+            onSelectMultiple={handleSelectMultiple}
             buildInTools={builtinToolList || []}
             customTools={customToolList || []}
             workflowTools={workflowToolList || []}
-            supportAddCustomTool={supportAddCustomTool}
-            onAddedCustomTool={handleAddedCustomTool}
-            onShowAddCustomCollectionModal={showEditCustomCollectionModal}
+            mcpTools={mcpTools || []}
             selectedTools={selectedTools}
+            canChooseMCPTool={canChooseMCPTool}
           />
         </div>
       </PortalToFollowElemContent>
diff --git a/web/app/components/workflow/block-selector/tool/action-item.tsx b/web/app/components/workflow/block-selector/tool/action-item.tsx
index dc9b9b9114..e5e33614b0 100644
--- a/web/app/components/workflow/block-selector/tool/action-item.tsx
+++ b/web/app/components/workflow/block-selector/tool/action-item.tsx
@@ -10,13 +10,12 @@ import { useGetLanguage } from '@/context/i18n'
 import BlockIcon from '../../block-icon'
 import cn from '@/utils/classnames'
 import { useTranslation } from 'react-i18next'
-import { RiCheckLine } from '@remixicon/react'
-import Badge from '@/app/components/base/badge'
 
 type Props = {
   provider: ToolWithProvider
   payload: Tool
   disabled?: boolean
+  isAdded?: boolean
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
 }
 
@@ -25,6 +24,7 @@ const ToolItem: FC<Props> = ({
   payload,
   onSelect,
   disabled,
+  isAdded,
 }) => {
   const { t } = useTranslation()
 
@@ -71,18 +71,16 @@ const ToolItem: FC<Props> = ({
             output_schema: payload.output_schema,
             paramSchemas: payload.parameters,
             params,
+            meta: provider.meta,
           })
         }}
       >
-        <div className={cn('system-sm-medium h-8 truncate border-l-2 border-divider-subtle pl-4 leading-8 text-text-secondary', disabled && 'opacity-30')}>{payload.label[language]}</div>
-        {disabled && <Badge
-          className='flex h-5 items-center space-x-0.5 text-text-tertiary'
-          uppercase
-        >
-          <RiCheckLine className='h-3 w-3 ' />
-          <div>{t('tools.addToolModal.added')}</div>
-        </Badge>
-        }
+        <div className={cn('system-sm-medium h-8 truncate border-l-2 border-divider-subtle pl-4 leading-8 text-text-secondary')}>
+          <span className={cn(disabled && 'opacity-30')}>{payload.label[language]}</span>
+        </div>
+        {isAdded && (
+          <div className='system-xs-regular mr-4 text-text-tertiary'>{t('tools.addToolModal.added')}</div>
+        )}
       </div>
     </Tooltip >
   )
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
index ef671ca1f8..ca462c082e 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
@@ -11,21 +11,29 @@ import { useMemo } from 'react'
 type Props = {
   payload: ToolWithProvider[]
   isShowLetterIndex: boolean
+  indexBar: React.ReactNode
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+  canNotSelectMultiple?: boolean
+  onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   letters: string[]
   toolRefs: any
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 
 const ToolViewFlatView: FC<Props> = ({
   letters,
   payload,
   isShowLetterIndex,
+  indexBar,
   hasSearchText,
   onSelect,
+  canNotSelectMultiple,
+  onSelectMultiple,
   toolRefs,
   selectedTools,
+  canChooseMCPTool,
 }) => {
   const firstLetterToolIds = useMemo(() => {
     const res: Record<string, string> = {}
@@ -37,26 +45,31 @@ const ToolViewFlatView: FC<Props> = ({
     return res
   }, [payload, letters])
   return (
-    <div>
-      {payload.map(tool => (
-        <div
-          key={tool.id}
-          ref={(el) => {
-            const letter = firstLetterToolIds[tool.id]
-            if (letter)
-              toolRefs.current[letter] = el
-          }}
-        >
-          <Tool
-            payload={tool}
-            viewType={ViewType.flat}
-            isShowLetterIndex={isShowLetterIndex}
-            hasSearchText={hasSearchText}
-            onSelect={onSelect}
-            selectedTools={selectedTools}
-          />
-        </div>
-      ))}
+    <div className='flex w-full'>
+      <div className='mr-1 grow'>
+        {payload.map(tool => (
+          <div
+            key={tool.id}
+            ref={(el) => {
+              const letter = firstLetterToolIds[tool.id]
+              if (letter)
+                toolRefs.current[letter] = el
+            }}
+          >
+            <Tool
+              payload={tool}
+              viewType={ViewType.flat}
+              hasSearchText={hasSearchText}
+              onSelect={onSelect}
+              canNotSelectMultiple={canNotSelectMultiple}
+              onSelectMultiple={onSelectMultiple}
+              selectedTools={selectedTools}
+              canChooseMCPTool={canChooseMCPTool}
+            />
+          </div>
+        ))}
+      </div>
+      {isShowLetterIndex && indexBar}
     </div>
   )
 }
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
index d6c567f8e2..b3f7aab4df 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
@@ -12,7 +12,10 @@ type Props = {
   toolList: ToolWithProvider[]
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+  canNotSelectMultiple?: boolean
+  onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 
 const Item: FC<Props> = ({
@@ -20,7 +23,10 @@ const Item: FC<Props> = ({
   toolList,
   hasSearchText,
   onSelect,
+  canNotSelectMultiple,
+  onSelectMultiple,
   selectedTools,
+  canChooseMCPTool,
 }) => {
   return (
     <div>
@@ -36,7 +42,10 @@ const Item: FC<Props> = ({
             isShowLetterIndex={false}
             hasSearchText={hasSearchText}
             onSelect={onSelect}
+            canNotSelectMultiple={canNotSelectMultiple}
+            onSelectMultiple={onSelectMultiple}
             selectedTools={selectedTools}
+            canChooseMCPTool={canChooseMCPTool}
           />
         ))}
       </div>
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
index f3f98279c8..d85d1ea682 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
@@ -12,14 +12,20 @@ type Props = {
   payload: Record<string, ToolWithProvider[]>
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+  canNotSelectMultiple?: boolean
+  onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 
 const ToolListTreeView: FC<Props> = ({
   payload,
   hasSearchText,
   onSelect,
+  canNotSelectMultiple,
+  onSelectMultiple,
   selectedTools,
+  canChooseMCPTool,
 }) => {
   const { t } = useTranslation()
   const getI18nGroupName = useCallback((name: string) => {
@@ -46,7 +52,10 @@ const ToolListTreeView: FC<Props> = ({
           toolList={payload[groupName]}
           hasSearchText={hasSearchText}
           onSelect={onSelect}
+          canNotSelectMultiple={canNotSelectMultiple}
+          onSelectMultiple={onSelectMultiple}
           selectedTools={selectedTools}
+          canChooseMCPTool={canChooseMCPTool}
         />
       ))}
     </div>
diff --git a/web/app/components/workflow/block-selector/tool/tool.tsx b/web/app/components/workflow/block-selector/tool/tool.tsx
index d48d0bfc90..83ae062737 100644
--- a/web/app/components/workflow/block-selector/tool/tool.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool.tsx
@@ -1,6 +1,6 @@
 'use client'
 import type { FC } from 'react'
-import React, { useEffect, useMemo } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef } from 'react'
 import cn from '@/utils/classnames'
 import { RiArrowDownSLine, RiArrowRightSLine } from '@remixicon/react'
 import { useGetLanguage } from '@/context/i18n'
@@ -13,36 +13,108 @@ import { ViewType } from '../view-type-select'
 import ActionItem from './action-item'
 import BlockIcon from '../../block-icon'
 import { useTranslation } from 'react-i18next'
+import { useHover } from 'ahooks'
+import McpToolNotSupportTooltip from '../../nodes/_base/components/mcp-tool-not-support-tooltip'
+import { Mcp } from '@/app/components/base/icons/src/vender/other'
 
 type Props = {
   className?: string
   payload: ToolWithProvider
   viewType: ViewType
-  isShowLetterIndex: boolean
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+  canNotSelectMultiple?: boolean
+  onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 
 const Tool: FC<Props> = ({
   className,
   payload,
   viewType,
-  isShowLetterIndex,
   hasSearchText,
   onSelect,
+  canNotSelectMultiple,
+  onSelectMultiple,
   selectedTools,
+  canChooseMCPTool,
 }) => {
   const { t } = useTranslation()
   const language = useGetLanguage()
   const isFlatView = viewType === ViewType.flat
+  const notShowProvider = payload.type === CollectionType.workflow
   const actions = payload.tools
-  const hasAction = true // Now always support actions
+  const hasAction = !notShowProvider
   const [isFold, setFold] = React.useState<boolean>(true)
-  const getIsDisabled = (tool: ToolType) => {
+  const ref = useRef(null)
+  const isHovering = useHover(ref)
+  const isMCPTool = payload.type === CollectionType.mcp
+  const isShowCanNotChooseMCPTip = !canChooseMCPTool && isMCPTool
+  const getIsDisabled = useCallback((tool: ToolType) => {
     if (!selectedTools || !selectedTools.length) return false
-    return selectedTools.some(selectedTool => selectedTool.provider_name === payload.name && selectedTool.tool_name === tool.name)
-  }
+    return selectedTools.some(selectedTool => (selectedTool.provider_name === payload.name || selectedTool.provider_name === payload.id) && selectedTool.tool_name === tool.name)
+  }, [payload.id, payload.name, selectedTools])
+
+  const totalToolsNum = actions.length
+  const selectedToolsNum = actions.filter(action => getIsDisabled(action)).length
+  const isAllSelected = selectedToolsNum === totalToolsNum
+
+  const notShowProviderSelectInfo = useMemo(() => {
+    if (isAllSelected) {
+      return (
+        <span className='system-xs-regular text-text-tertiary'>
+          {t('tools.addToolModal.added')}
+        </span>
+      )
+    }
+  }, [isAllSelected, t])
+  const selectedInfo = useMemo(() => {
+    if (isHovering && !isAllSelected) {
+      return (
+        <span className='system-xs-regular text-components-button-secondary-accent-text'
+          onClick={(e) => {
+            onSelectMultiple?.(BlockEnum.Tool, actions.filter(action => !getIsDisabled(action)).map((tool) => {
+              const params: Record<string, string> = {}
+              if (tool.parameters) {
+                tool.parameters.forEach((item) => {
+                  params[item.name] = ''
+                })
+              }
+              return {
+                provider_id: payload.id,
+                provider_type: payload.type,
+                provider_name: payload.name,
+                tool_name: tool.name,
+                tool_label: tool.label[language],
+                tool_description: tool.description[language],
+                title: tool.label[language],
+                is_team_authorization: payload.is_team_authorization,
+                output_schema: tool.output_schema,
+                paramSchemas: tool.parameters,
+                params,
+              }
+            }))
+          }}
+        >
+          {t('workflow.tabs.addAll')}
+        </span>
+      )
+    }
+
+    if (selectedToolsNum === 0)
+      return <></>
+
+    return (
+      <span className='system-xs-regular text-text-tertiary'>
+        {isAllSelected
+          ? t('workflow.tabs.allAdded')
+          : `${selectedToolsNum} / ${totalToolsNum}`
+        }
+      </span>
+    )
+  }, [actions, getIsDisabled, isAllSelected, isHovering, language, onSelectMultiple, payload.id, payload.is_team_authorization, payload.name, payload.type, selectedToolsNum, t, totalToolsNum])
+
   useEffect(() => {
     if (hasSearchText && isFold) {
       setFold(false)
@@ -71,59 +143,73 @@ const Tool: FC<Props> = ({
   return (
     <div
       key={payload.id}
-      className={cn('mb-1 last-of-type:mb-0', isShowLetterIndex && 'mr-6')}
+      className={cn('mb-1 last-of-type:mb-0')}
+      ref={ref}
     >
       <div className={cn(className)}>
         <div
-          className='flex w-full cursor-pointer select-none items-center justify-between rounded-lg pl-3 pr-1 hover:bg-state-base-hover'
+          className='group/item flex w-full cursor-pointer select-none items-center justify-between rounded-lg pl-3 pr-1 hover:bg-state-base-hover'
           onClick={() => {
-            if (hasAction)
+            if (hasAction) {
               setFold(!isFold)
+              return
+            }
 
-            // Now always support actions
-            // if (payload.parameters) {
-            //   payload.parameters.forEach((item) => {
-            //     params[item.name] = ''
-            //   })
-            // }
-            // onSelect(BlockEnum.Tool, {
-            //   provider_id: payload.id,
-            //   provider_type: payload.type,
-            //   provider_name: payload.name,
-            //   tool_name: payload.name,
-            //   tool_label: payload.label[language],
-            //   title: payload.label[language],
-            //   params: {},
-            // })
+            const tool = actions[0]
+            const params: Record<string, string> = {}
+            if (tool.parameters) {
+              tool.parameters.forEach((item) => {
+                params[item.name] = ''
+              })
+            }
+            onSelect(BlockEnum.Tool, {
+              provider_id: payload.id,
+              provider_type: payload.type,
+              provider_name: payload.name,
+              tool_name: tool.name,
+              tool_label: tool.label[language],
+              tool_description: tool.description[language],
+              title: tool.label[language],
+              is_team_authorization: payload.is_team_authorization,
+              output_schema: tool.output_schema,
+              paramSchemas: tool.parameters,
+              params,
+            })
           }}
         >
-          <div className='flex h-8 grow items-center'>
+          <div className={cn('flex h-8 grow items-center', isShowCanNotChooseMCPTip && 'opacity-30')}>
             <BlockIcon
               className='shrink-0'
               type={BlockEnum.Tool}
               toolIcon={payload.icon}
             />
-            <div className='ml-2 w-0 flex-1 grow truncate text-sm text-text-primary'>{payload.label[language]}</div>
+            <div className='ml-2 flex w-0 grow items-center text-sm text-text-primary'>
+              <span className='max-w-[250px] truncate'>{notShowProvider ? actions[0]?.label[language] : payload.label[language]}</span>
+              {isFlatView && groupName && (
+                <span className='system-xs-regular ml-2 shrink-0 text-text-quaternary'>{groupName}</span>
+              )}
+              {isMCPTool && <Mcp className='ml-2 size-3.5 shrink-0 text-text-quaternary' />}
+            </div>
           </div>
 
-          <div className='flex items-center'>
-            {isFlatView && (
-              <div className='system-xs-regular text-text-tertiary'>{groupName}</div>
-            )}
+          <div className='ml-2 flex items-center'>
+            {!isShowCanNotChooseMCPTip && !canNotSelectMultiple && (notShowProvider ? notShowProviderSelectInfo : selectedInfo)}
+            {isShowCanNotChooseMCPTip && <McpToolNotSupportTooltip />}
             {hasAction && (
-              <FoldIcon className={cn('h-4 w-4 shrink-0 text-text-quaternary', isFold && 'text-text-tertiary')} />
+              <FoldIcon className={cn('h-4 w-4 shrink-0 text-text-tertiary group-hover/item:text-text-tertiary', isFold && 'text-text-quaternary')} />
             )}
           </div>
         </div>
 
-        {hasAction && !isFold && (
+        {!notShowProvider && hasAction && !isFold && (
           actions.map(action => (
             <ActionItem
               key={action.name}
               provider={payload}
               payload={action}
               onSelect={onSelect}
-              disabled={getIsDisabled(action)}
+              disabled={getIsDisabled(action) || isShowCanNotChooseMCPTip}
+              isAdded={getIsDisabled(action)}
             />
           ))
         )}
diff --git a/web/app/components/workflow/block-selector/tools.tsx b/web/app/components/workflow/block-selector/tools.tsx
index 2562501524..da47432b04 100644
--- a/web/app/components/workflow/block-selector/tools.tsx
+++ b/web/app/components/workflow/block-selector/tools.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next'
 import type { BlockEnum, ToolWithProvider } from '../types'
 import IndexBar, { groupItems } from './index-bar'
 import type { ToolDefaultValue, ToolValue } from './types'
+import type { ToolTypeEnum } from './types'
 import { ViewType } from './view-type-select'
 import Empty from '@/app/components/tools/add-tool-modal/empty'
 import { useGetLanguage } from '@/context/i18n'
@@ -15,25 +16,34 @@ import ToolListFlatView from './tool/tool-list-flat-view/list'
 import classNames from '@/utils/classnames'
 
 type ToolsProps = {
-  showWorkflowEmpty: boolean
   onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
+  canNotSelectMultiple?: boolean
+  onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   tools: ToolWithProvider[]
   viewType: ViewType
   hasSearchText: boolean
+  toolType?: ToolTypeEnum
+  isAgent?: boolean
   className?: string
   indexBarClassName?: string
   selectedTools?: ToolValue[]
+  canChooseMCPTool?: boolean
 }
 const Blocks = ({
-  showWorkflowEmpty,
   onSelect,
+  canNotSelectMultiple,
+  onSelectMultiple,
   tools,
   viewType,
   hasSearchText,
+  toolType,
+  isAgent,
   className,
   indexBarClassName,
   selectedTools,
+  canChooseMCPTool,
 }: ToolsProps) => {
+  // const tools: any = []
   const { t } = useTranslation()
   const language = useGetLanguage()
   const isFlatView = viewType === ViewType.flat
@@ -87,15 +97,15 @@ const Blocks = ({
   const toolRefs = useRef({})
 
   return (
-    <div className={classNames('p-1 max-w-[320px]', className)}>
+    <div className={classNames('max-w-[100%] p-1', className)}>
       {
-        !tools.length && !showWorkflowEmpty && (
-          <div className='flex h-[22px] items-center px-3 text-xs font-medium text-text-tertiary'>{t('workflow.tabs.noResult')}</div>
+        !tools.length && hasSearchText && (
+          <div className='mt-2 flex h-[22px] items-center px-3 text-xs font-medium text-text-secondary'>{t('workflow.tabs.noResult')}</div>
         )
       }
-      {!tools.length && showWorkflowEmpty && (
+      {!tools.length && !hasSearchText && (
         <div className='py-10'>
-          <Empty />
+          <Empty type={toolType!} isAgent={isAgent}/>
         </div>
       )}
       {!!tools.length && (
@@ -107,19 +117,24 @@ const Blocks = ({
             isShowLetterIndex={isShowLetterIndex}
             hasSearchText={hasSearchText}
             onSelect={onSelect}
+            canNotSelectMultiple={canNotSelectMultiple}
+            onSelectMultiple={onSelectMultiple}
             selectedTools={selectedTools}
+            canChooseMCPTool={canChooseMCPTool}
+            indexBar={<IndexBar letters={letters} itemRefs={toolRefs} className={indexBarClassName} />}
           />
         ) : (
           <ToolListTreeView
             payload={treeViewToolsData}
             hasSearchText={hasSearchText}
             onSelect={onSelect}
+            canNotSelectMultiple={canNotSelectMultiple}
+            onSelectMultiple={onSelectMultiple}
             selectedTools={selectedTools}
+            canChooseMCPTool={canChooseMCPTool}
           />
         )
       )}
-
-      {isShowLetterIndex && <IndexBar letters={letters} itemRefs={toolRefs} className={indexBarClassName} />}
     </div>
   )
 }
diff --git a/web/app/components/workflow/block-selector/types.ts b/web/app/components/workflow/block-selector/types.ts
index f1bdbbfbd9..c96a60f674 100644
--- a/web/app/components/workflow/block-selector/types.ts
+++ b/web/app/components/workflow/block-selector/types.ts
@@ -1,3 +1,5 @@
+import type { PluginMeta } from '../../plugins/types'
+
 export enum TabsEnum {
   Blocks = 'blocks',
   Tools = 'tools',
@@ -8,6 +10,7 @@ export enum ToolTypeEnum {
   BuiltIn = 'built-in',
   Custom = 'custom',
   Workflow = 'workflow',
+  MCP = 'mcp',
 }
 
 export enum BlockClassificationEnum {
@@ -30,10 +33,12 @@ export type ToolDefaultValue = {
   params: Record<string, any>
   paramSchemas: Record<string, any>[]
   output_schema: Record<string, any>
+  meta?: PluginMeta
 }
 
 export type ToolValue = {
   provider_name: string
+  provider_show_name?: string
   tool_name: string
   tool_label: string
   tool_description?: string
diff --git a/web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts b/web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts
new file mode 100644
index 0000000000..98986cf3b6
--- /dev/null
+++ b/web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts
@@ -0,0 +1,31 @@
+import { useEffect, useState } from 'react'
+
+const useCheckVerticalScrollbar = (ref: React.RefObject<HTMLElement>) => {
+  const [hasVerticalScrollbar, setHasVerticalScrollbar] = useState(false)
+
+  useEffect(() => {
+    const elem = ref.current
+    if (!elem) return
+
+    const checkScrollbar = () => {
+      setHasVerticalScrollbar(elem.scrollHeight > elem.clientHeight)
+    }
+
+    checkScrollbar()
+
+    const resizeObserver = new ResizeObserver(checkScrollbar)
+    resizeObserver.observe(elem)
+
+    const mutationObserver = new MutationObserver(checkScrollbar)
+    mutationObserver.observe(elem, { childList: true, subtree: true, characterData: true })
+
+    return () => {
+      resizeObserver.disconnect()
+      mutationObserver.disconnect()
+    }
+  }, [ref])
+
+  return hasVerticalScrollbar
+}
+
+export default useCheckVerticalScrollbar
diff --git a/web/app/components/workflow/hooks/use-workflow.ts b/web/app/components/workflow/hooks/use-workflow.ts
index 1b98178152..8bc9d3436f 100644
--- a/web/app/components/workflow/hooks/use-workflow.ts
+++ b/web/app/components/workflow/hooks/use-workflow.ts
@@ -40,6 +40,7 @@ import { useStore as useAppStore } from '@/app/components/app/store'
 import {
   fetchAllBuiltInTools,
   fetchAllCustomTools,
+  fetchAllMCPTools,
   fetchAllWorkflowTools,
 } from '@/service/tools'
 import { CollectionType } from '@/app/components/tools/types'
@@ -445,6 +446,13 @@ export const useFetchToolsData = () => {
         workflowTools: workflowTools || [],
       })
     }
+    if(type === 'mcp') {
+      const mcpTools = await fetchAllMCPTools()
+
+      workflowStore.setState({
+        mcpTools: mcpTools || [],
+      })
+    }
   }, [workflowStore])
 
   return {
@@ -491,6 +499,8 @@ export const useToolIcon = (data: Node['data']) => {
   const buildInTools = useStore(s => s.buildInTools)
   const customTools = useStore(s => s.customTools)
   const workflowTools = useStore(s => s.workflowTools)
+  const mcpTools = useStore(s => s.mcpTools)
+
   const toolIcon = useMemo(() => {
     if(!data)
       return ''
@@ -500,11 +510,13 @@ export const useToolIcon = (data: Node['data']) => {
         targetTools = buildInTools
       else if (data.provider_type === CollectionType.custom)
         targetTools = customTools
+      else if (data.provider_type === CollectionType.mcp)
+        targetTools = mcpTools
       else
         targetTools = workflowTools
       return targetTools.find(toolWithProvider => canFindTool(toolWithProvider.id, data.provider_id))?.icon
     }
-  }, [data, buildInTools, customTools, workflowTools])
+  }, [data, buildInTools, customTools, mcpTools, workflowTools])
 
   return toolIcon
 }
diff --git a/web/app/components/workflow/index.tsx b/web/app/components/workflow/index.tsx
index 8631eb58e3..8ea861ebb4 100644
--- a/web/app/components/workflow/index.tsx
+++ b/web/app/components/workflow/index.tsx
@@ -234,6 +234,7 @@ export const Workflow: FC<WorkflowProps> = memo(({
     handleFetchAllTools('builtin')
     handleFetchAllTools('custom')
     handleFetchAllTools('workflow')
+    handleFetchAllTools('mcp')
   }, [handleFetchAllTools])
 
   const {
diff --git a/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx b/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
index f262ae7e34..ba5281870f 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
@@ -68,6 +68,7 @@ function formatStrategy(input: StrategyPluginDetail[], getIcon: (i: string) => s
       icon: getIcon(item.declaration.identity.icon),
       label: item.declaration.identity.label as any,
       type: CollectionType.all,
+      meta: item.meta,
       tools: item.declaration.strategies.map(strategy => ({
         name: strategy.identity.name,
         author: strategy.identity.author,
@@ -89,10 +90,13 @@ function formatStrategy(input: StrategyPluginDetail[], getIcon: (i: string) => s
 export type AgentStrategySelectorProps = {
   value?: Strategy,
   onChange: (value?: Strategy) => void,
+  canChooseMCPTool: boolean,
 }
 
 export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) => {
-  const { value, onChange } = props
+    const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
+
+  const { value, onChange, canChooseMCPTool } = props
   const [open, setOpen] = useState(false)
   const [viewType, setViewType] = useState<ViewType>(ViewType.flat)
   const [query, setQuery] = useState('')
@@ -132,8 +136,6 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
     plugins: notInstalledPlugins = [],
   } = useMarketplacePlugins()
 
-  const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
-
   useEffect(() => {
     if (!enable_marketplace) return
     if (query) {
@@ -214,21 +216,25 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
                 agent_strategy_label: tool!.tool_label,
                 agent_output_schema: tool!.output_schema,
                 plugin_unique_identifier: tool!.provider_id,
+                meta: tool!.meta,
               })
               setOpen(false)
             }}
             className='h-full max-h-full max-w-none overflow-y-auto'
-            indexBarClassName='top-0 xl:top-36' showWorkflowEmpty={false} hasSearchText={false} />
-          {enable_marketplace
-          && <PluginList
+            indexBarClassName='top-0 xl:top-36'
+            hasSearchText={false}
+            canNotSelectMultiple
+            canChooseMCPTool={canChooseMCPTool}
+            isAgent
+          />
+          {enable_marketplace && <PluginList
             ref={pluginRef}
             wrapElemRef={wrapElemRef}
             list={notInstalledPlugins}
             searchText={query}
             tags={DEFAULT_TAGS}
             disableMaxWidth
-          />
-          }
+          />}
         </main>
       </div>
     </PortalToFollowElemContent>
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 4ca8746137..31aa91cfdb 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
@@ -19,6 +19,8 @@ import { useWorkflowStore } from '../../../store'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
 import type { NodeOutPutVar } from '../../../types'
 import type { Node } from 'reactflow'
+import type { PluginMeta } from '@/app/components/plugins/types'
+import { noop } from 'lodash'
 import { useDocLink } from '@/context/i18n'
 
 export type Strategy = {
@@ -27,6 +29,7 @@ export type Strategy = {
   agent_strategy_label: string
   agent_output_schema: Record<string, any>
   plugin_unique_identifier: string
+  meta?: PluginMeta
 }
 
 export type AgentStrategyProps = {
@@ -38,6 +41,7 @@ export type AgentStrategyProps = {
   nodeOutputVars?: NodeOutPutVar[],
   availableNodes?: Node[],
   nodeId?: string
+  canChooseMCPTool: boolean
 }
 
 type CustomSchema<Type, Field = {}> = Omit<CredentialFormSchema, 'type'> & { type: Type } & Field
@@ -48,7 +52,7 @@ type MultipleToolSelectorSchema = CustomSchema<'array[tools]'>
 type CustomField = ToolSelectorSchema | MultipleToolSelectorSchema
 
 export const AgentStrategy = memo((props: AgentStrategyProps) => {
-  const { strategy, onStrategyChange, formSchema, formValue, onFormValueChange, nodeOutputVars, availableNodes, nodeId } = props
+  const { strategy, onStrategyChange, formSchema, formValue, onFormValueChange, nodeOutputVars, availableNodes, nodeId, canChooseMCPTool } = props
   const { t } = useTranslation()
   const docLink = useDocLink()
   const defaultModel = useDefaultModel(ModelTypeEnum.textGeneration)
@@ -57,6 +61,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
   const {
     setControlPromptEditorRerenderKey,
   } = workflowStore.getState()
+
   const override: ComponentProps<typeof Form<CustomField>>['override'] = [
     [FormTypeEnum.textNumber, FormTypeEnum.textInput],
     (schema, props) => {
@@ -168,6 +173,8 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
               value={value}
               onSelect={item => onChange(item)}
               onDelete={() => onChange(null)}
+              canChooseMCPTool={canChooseMCPTool}
+              onSelectMultiple={noop}
             />
           </Field>
         )
@@ -189,13 +196,14 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
             onChange={onChange}
             supportCollapse
             required={schema.required}
+            canChooseMCPTool={canChooseMCPTool}
           />
         )
       }
     }
   }
   return <div className='space-y-2'>
-    <AgentStrategySelector value={strategy} onChange={onStrategyChange} />
+    <AgentStrategySelector value={strategy} onChange={onStrategyChange} canChooseMCPTool={canChooseMCPTool} />
     {
       strategy
         ? <div>
@@ -215,6 +223,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/_base/components/editor/base.tsx b/web/app/components/workflow/nodes/_base/components/editor/base.tsx
index 65afb36835..284c6c77eb 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/base.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/base.tsx
@@ -76,7 +76,7 @@ const Base: FC<Props> = ({
 
   return (
     <Wrap className={cn(wrapClassName)} style={wrapStyle} isInNode={isInNode} isExpand={isExpand}>
-      <div ref={ref} className={cn(className, isExpand && 'h-full', 'rounded-lg border', isFocus ? 'border-transparent bg-components-input-bg-normal' : 'overflow-hidden border-components-input-border-hover bg-components-input-bg-hover')}>
+      <div ref={ref} className={cn(className, isExpand && 'h-full', 'rounded-lg border', !isFocus ? 'border-transparent bg-components-input-bg-normal' : 'overflow-hidden border-components-input-border-hover bg-components-input-bg-hover')}>
         <div className='flex h-7 items-center justify-between pl-3 pr-2 pt-1'>
           <div className='system-xs-semibold-uppercase text-text-secondary'>{title}</div>
           <div className='flex items-center' onClick={(e) => {
diff --git a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
index 3540c60a39..748698747c 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
@@ -23,7 +23,7 @@ export type Props = {
   value?: string | object
   placeholder?: React.JSX.Element | string
   onChange?: (value: string) => void
-  title?: React.JSX.Element
+  title?: string | React.JSX.Element
   language: CodeLanguage
   headerRight?: React.JSX.Element
   readOnly?: boolean
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx b/web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx
new file mode 100644
index 0000000000..07c3a087b9
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/form-input-boolean.tsx
@@ -0,0 +1,35 @@
+'use client'
+import type { FC } from 'react'
+import cn from '@/utils/classnames'
+
+type Props = {
+  value: boolean
+  onChange: (value: boolean) => void
+}
+
+const FormInputBoolean: FC<Props> = ({
+  value,
+  onChange,
+}) => {
+  return (
+    <div className='flex w-full space-x-1'>
+      <div
+        className={cn(
+          'system-sm-regular flex h-8 grow cursor-default items-center justify-center rounded-md border border-components-option-card-option-border bg-components-option-card-option-bg px-2 text-text-secondary',
+          !value && 'cursor-pointer hover:border-components-option-card-option-border-hover hover:bg-components-option-card-option-bg-hover hover:shadow-xs',
+          value && 'system-sm-medium border-[1.5px] border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg shadow-xs',
+        )}
+        onClick={() => onChange(true)}
+      >True</div>
+      <div
+        className={cn(
+          'system-sm-regular flex h-8 grow cursor-default items-center justify-center rounded-md border border-components-option-card-option-border bg-components-option-card-option-bg px-2 text-text-secondary',
+          value && 'cursor-pointer hover:border-components-option-card-option-border-hover hover:bg-components-option-card-option-bg-hover hover:shadow-xs',
+          !value && 'system-sm-medium border-[1.5px] border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg shadow-xs',
+        )}
+        onClick={() => onChange(false)}
+      >False</div>
+    </div>
+  )
+}
+export default FormInputBoolean
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
new file mode 100644
index 0000000000..6f8bd17a96
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
@@ -0,0 +1,279 @@
+'use client'
+import type { FC } from 'react'
+import type { ToolVarInputs } from '@/app/components/workflow/nodes/tool/types'
+import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
+import { VarType } from '@/app/components/workflow/types'
+
+import type { ToolWithProvider, ValueSelector, Var } from '@/app/components/workflow/types'
+import FormInputTypeSwitch from './form-input-type-switch'
+import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list'
+import Input from '@/app/components/base/input'
+import { SimpleSelect } from '@/app/components/base/select'
+import MixedVariableTextInput from '@/app/components/workflow/nodes/tool/components/mixed-variable-text-input'
+import FormInputBoolean from './form-input-boolean'
+import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
+import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
+import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
+import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
+import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
+import cn from '@/utils/classnames'
+import type { Tool } from '@/app/components/tools/types'
+
+type Props = {
+  readOnly: boolean
+  nodeId: string
+  schema: CredentialFormSchema
+  value: ToolVarInputs
+  onChange: (value: any) => void
+  inPanel?: boolean
+  currentTool?: Tool
+  currentProvider?: ToolWithProvider
+}
+
+const FormInputItem: FC<Props> = ({
+  readOnly,
+  nodeId,
+  schema,
+  value,
+  onChange,
+  inPanel,
+  currentTool,
+  currentProvider,
+}) => {
+  const language = useLanguage()
+
+  const {
+    placeholder,
+    variable,
+    type,
+    default: defaultValue,
+    options,
+    scope,
+  } = schema as any
+  const varInput = value[variable]
+  const isString = type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput
+  const isNumber = type === FormTypeEnum.textNumber
+  const isObject = type === FormTypeEnum.object
+  const isArray = type === FormTypeEnum.array
+  const isShowJSONEditor = isObject || isArray
+  const isFile = type === FormTypeEnum.file || type === FormTypeEnum.files
+  const isBoolean = type === FormTypeEnum.boolean
+  const isSelect = type === FormTypeEnum.select || type === FormTypeEnum.dynamicSelect
+  const isAppSelector = type === FormTypeEnum.appSelector
+  const isModelSelector = type === FormTypeEnum.modelSelector
+  const showTypeSwitch = isNumber || isObject || isArray
+  const isConstant = varInput?.type === VarKindType.constant || !varInput?.type
+  const showVariableSelector = isFile || varInput?.type === VarKindType.variable
+
+  const { availableVars, availableNodesWithParent } = useAvailableVarList(nodeId, {
+    onlyLeafNodeVar: false,
+    filterVar: (varPayload: Var) => {
+      return [VarType.string, VarType.number, VarType.secret].includes(varPayload.type)
+    },
+  })
+
+  const targetVarType = () => {
+    if (isString)
+      return VarType.string
+    else if (isNumber)
+      return VarType.number
+    else if (type === FormTypeEnum.files)
+      return VarType.arrayFile
+    else if (type === FormTypeEnum.file)
+      return VarType.file
+    // else if (isSelect)
+    //   return VarType.select
+    // else if (isAppSelector)
+    //   return VarType.appSelector
+    // else if (isModelSelector)
+    //   return VarType.modelSelector
+    // else if (isBoolean)
+    //   return VarType.boolean
+    else if (isObject)
+      return VarType.object
+    else if (isArray)
+      return VarType.arrayObject
+    else
+      return VarType.string
+  }
+
+  const getFilterVar = () => {
+    if (isNumber)
+      return (varPayload: any) => varPayload.type === VarType.number
+    else if (isString)
+      return (varPayload: any) => [VarType.string, VarType.number, VarType.secret].includes(varPayload.type)
+    else if (isFile)
+      return (varPayload: any) => [VarType.file, VarType.arrayFile].includes(varPayload.type)
+    else if (isBoolean)
+      return (varPayload: any) => varPayload.type === VarType.boolean
+    else if (isObject)
+      return (varPayload: any) => varPayload.type === VarType.object
+    else if (isArray)
+      return (varPayload: any) => [VarType.array, VarType.arrayString, VarType.arrayNumber, VarType.arrayObject].includes(varPayload.type)
+    return undefined
+  }
+
+  const getVarKindType = () => {
+    if (isFile)
+      return VarKindType.variable
+    if (isSelect || isBoolean || isNumber || isArray || isObject)
+      return VarKindType.constant
+    if (isString)
+      return VarKindType.mixed
+  }
+
+  const handleTypeChange = (newType: string) => {
+    if (newType === VarKindType.variable) {
+      onChange({
+        ...value,
+        [variable]: {
+          ...varInput,
+          type: VarKindType.variable,
+          value: '',
+        },
+      })
+    }
+    else {
+      onChange({
+        ...value,
+        [variable]: {
+          ...varInput,
+          type: VarKindType.constant,
+          value: defaultValue,
+        },
+      })
+    }
+  }
+
+  const handleValueChange = (newValue: any) => {
+    onChange({
+      ...value,
+      [variable]: {
+        ...varInput,
+        type: getVarKindType(),
+        value: isNumber ? Number.parseFloat(newValue) : newValue,
+      },
+    })
+  }
+
+  const handleAppOrModelSelect = (newValue: any) => {
+    onChange({
+      ...value,
+      [variable]: {
+        ...varInput,
+        ...newValue,
+      },
+    })
+  }
+
+  const handleVariableSelectorChange = (newValue: ValueSelector | string, variable: string) => {
+    onChange({
+      ...value,
+      [variable]: {
+        ...varInput,
+        type: VarKindType.variable,
+        value: newValue || '',
+      },
+    })
+  }
+
+  return (
+    <div className={cn('gap-1', !(isShowJSONEditor && isConstant) && 'flex')}>
+      {showTypeSwitch && (
+        <FormInputTypeSwitch value={varInput?.type || VarKindType.constant} onChange={handleTypeChange}/>
+      )}
+      {isString && (
+        <MixedVariableTextInput
+          readOnly={readOnly}
+          value={varInput?.value as string || ''}
+          onChange={handleValueChange}
+          nodesOutputVars={availableVars}
+          availableNodes={availableNodesWithParent}
+        />
+      )}
+      {isNumber && isConstant && (
+        <Input
+          className='h-8 grow'
+          type='number'
+          value={varInput?.value || ''}
+          onChange={e => handleValueChange(e.target.value)}
+          placeholder={placeholder?.[language] || placeholder?.en_US}
+        />
+      )}
+      {isBoolean && (
+        <FormInputBoolean
+          value={varInput?.value as boolean}
+          onChange={handleValueChange}
+        />
+      )}
+      {isSelect && (
+        <SimpleSelect
+          wrapperClassName='h-8 grow'
+          disabled={readOnly}
+          defaultValue={varInput?.value}
+          items={options.filter((option: { show_on: any[] }) => {
+            if (option.show_on.length)
+              return option.show_on.every(showOnItem => value[showOnItem.variable] === showOnItem.value)
+
+            return true
+          }).map((option: { value: any; label: { [x: string]: any; en_US: any } }) => ({ value: option.value, name: option.label[language] || option.label.en_US }))}
+          onSelect={item => handleValueChange(item.value as string)}
+          placeholder={placeholder?.[language] || placeholder?.en_US}
+        />
+      )}
+      {isShowJSONEditor && isConstant && (
+        <div className='mt-1 w-full'>
+          <CodeEditor
+            title='JSON'
+            value={varInput?.value as any}
+            isExpand
+            isInNode
+            language={CodeLanguage.json}
+            onChange={handleValueChange}
+            className='w-full'
+            placeholder={<div className='whitespace-pre'>{placeholder?.[language] || placeholder?.en_US}</div>}
+          />
+        </div>
+      )}
+      {isAppSelector && (
+        <AppSelector
+          disabled={readOnly}
+          scope={scope || 'all'}
+          value={varInput?.value as any}
+          onSelect={handleAppOrModelSelect}
+        />
+      )}
+      {isModelSelector && isConstant && (
+        <ModelParameterModal
+          popupClassName='!w-[387px]'
+          isAdvancedMode
+          isInWorkflow
+          value={varInput?.value as any}
+          setModel={handleAppOrModelSelect}
+          readonly={readOnly}
+          scope={scope}
+        />
+      )}
+      {showVariableSelector && (
+        <VarReferencePicker
+          zIndex={inPanel ? 1000 : undefined}
+          className='h-8 grow'
+          readonly={readOnly}
+          isShowNodeName
+          nodeId={nodeId}
+          value={varInput?.value || []}
+          onChange={value => handleVariableSelectorChange(value, variable)}
+          filterVar={getFilterVar()}
+          schema={schema}
+          valueTypePlaceHolder={targetVarType()}
+          currentTool={currentTool}
+          currentProvider={currentProvider}
+        />
+      )}
+    </div>
+  )
+}
+export default FormInputItem
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx b/web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx
new file mode 100644
index 0000000000..391e204844
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx
@@ -0,0 +1,47 @@
+'use client'
+import type { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  RiEditLine,
+} from '@remixicon/react'
+import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
+import Tooltip from '@/app/components/base/tooltip'
+import { VarType } from '@/app/components/workflow/nodes/tool/types'
+import cn from '@/utils/classnames'
+
+type Props = {
+  value: VarType
+  onChange: (value: VarType) => void
+}
+
+const FormInputTypeSwitch: FC<Props> = ({
+  value,
+  onChange,
+}) => {
+  const { t } = useTranslation()
+  return (
+    <div className='inline-flex h-8 shrink-0 gap-px rounded-[10px] bg-components-segmented-control-bg-normal p-0.5'>
+      <Tooltip
+        popupContent={value === VarType.variable ? '' : t('workflow.nodes.common.typeSwitch.variable')}
+      >
+        <div
+          className={cn('cursor-pointer rounded-lg px-2.5 py-1.5 text-text-tertiary hover:bg-state-base-hover', value === VarType.variable && 'bg-components-segmented-control-item-active-bg text-text-secondary shadow-xs hover:bg-components-segmented-control-item-active-bg')}
+          onClick={() => onChange(VarType.variable)}
+        >
+          <Variable02 className='h-4 w-4' />
+        </div>
+      </Tooltip>
+      <Tooltip
+        popupContent={value === VarType.constant ? '' : t('workflow.nodes.common.typeSwitch.input')}
+      >
+        <div
+          className={cn('cursor-pointer rounded-lg px-2.5 py-1.5 text-text-tertiary hover:bg-state-base-hover', value === VarType.constant && 'bg-components-segmented-control-item-active-bg text-text-secondary shadow-xs hover:bg-components-segmented-control-item-active-bg')}
+          onClick={() => onChange(VarType.constant)}
+        >
+          <RiEditLine className='h-4 w-4' />
+        </div>
+      </Tooltip>
+    </div>
+  )
+}
+export default FormInputTypeSwitch
diff --git a/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx b/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx
new file mode 100644
index 0000000000..8117f7502f
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx
@@ -0,0 +1,22 @@
+'use client'
+import Tooltip from '@/app/components/base/tooltip'
+import { RiAlertFill } from '@remixicon/react'
+import type { FC } from 'react'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+const McpToolNotSupportTooltip: FC = () => {
+  const { t } = useTranslation()
+  return (
+    <Tooltip
+      popupContent={
+        <div className='w-[256px]'>
+        {t('plugin.detailPanel.toolSelector.unsupportedMCPTool')}
+        </div>
+      }
+    >
+      <RiAlertFill className='size-4 text-text-warning-secondary' />
+    </Tooltip>
+  )
+}
+export default React.memo(McpToolNotSupportTooltip)
diff --git a/web/app/components/workflow/nodes/_base/components/setting-item.tsx b/web/app/components/workflow/nodes/_base/components/setting-item.tsx
index 134bf4a551..abbfaef490 100644
--- a/web/app/components/workflow/nodes/_base/components/setting-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/setting-item.tsx
@@ -13,7 +13,7 @@ export const SettingItem = memo(({ label, children, status, tooltip }: SettingIt
   const indicator: ComponentProps<typeof Indicator>['color'] = status === 'error' ? 'red' : status === 'warning' ? 'yellow' : undefined
   const needTooltip = ['error', 'warning'].includes(status as any)
   return <div className='relative flex items-center justify-between space-x-1 rounded-md bg-workflow-block-parma-bg px-1.5 py-1 text-xs font-normal'>
-    <div className={classNames('shrink-0 truncate text-text-tertiary system-xs-medium-uppercase', !!children && 'max-w-[100px]')}>
+    <div className={classNames('system-xs-medium-uppercase max-w-full shrink-0 truncate text-text-tertiary', !!children && 'max-w-[100px]')}>
       {label}
     </div>
     <Tooltip popupContent={tooltip} disabled={!needTooltip}>
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
index 23ccea2572..e6f3ce1fa1 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
@@ -528,6 +528,7 @@ const VarReferencePicker: FC<Props> = ({
               onChange={handleVarReferenceChange}
               itemWidth={isAddBtnTrigger ? 260 : (minWidth || triggerWidth)}
               isSupportFileVar={isSupportFileVar}
+              zIndex={zIndex}
             />
           )}
         </PortalToFollowElemContent>
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
index 9398ae7361..3746a85441 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
@@ -13,6 +13,7 @@ type Props = {
   onChange: (value: ValueSelector, varDetail: Var) => void
   itemWidth?: number
   isSupportFileVar?: boolean
+  zIndex?: number
 }
 const VarReferencePopup: FC<Props> = ({
   vars,
@@ -20,6 +21,7 @@ const VarReferencePopup: FC<Props> = ({
   onChange,
   itemWidth,
   isSupportFileVar = true,
+  zIndex,
 }) => {
   const { t } = useTranslation()
   const docLink = useDocLink()
@@ -60,6 +62,7 @@ const VarReferencePopup: FC<Props> = ({
           onChange={onChange}
           itemWidth={itemWidth}
           isSupportFileVar={isSupportFileVar}
+          zIndex={zIndex}
         />
       }
     </div >
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
index 27063a2ba3..303840d8e7 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
@@ -46,6 +46,7 @@ type ItemProps = {
   isSupportFileVar?: boolean
   isException?: boolean
   isLoopVar?: boolean
+  zIndex?: number
 }
 
 const objVarTypes = [VarType.object, VarType.file]
@@ -60,6 +61,7 @@ const Item: FC<ItemProps> = ({
   isSupportFileVar,
   isException,
   isLoopVar,
+  zIndex,
 }) => {
   const isStructureOutput = itemData.type === VarType.object && (itemData.children as StructuredOutput)?.schema?.properties
   const isFile = itemData.type === VarType.file && !isStructureOutput
@@ -171,7 +173,7 @@ const Item: FC<ItemProps> = ({
         </div >
       </PortalToFollowElemTrigger >
       <PortalToFollowElemContent style={{
-        zIndex: 100,
+        zIndex: zIndex || 100,
       }}>
         {(isStructureOutput || isObj) && (
           <PickerStructurePanel
@@ -260,6 +262,7 @@ type Props = {
   maxHeightClass?: string
   onClose?: () => void
   onBlur?: () => void
+  zIndex?: number
   autoFocus?: boolean
 }
 const VarReferenceVars: FC<Props> = ({
@@ -272,6 +275,7 @@ const VarReferenceVars: FC<Props> = ({
   maxHeightClass,
   onClose,
   onBlur,
+  zIndex,
   autoFocus = true,
 }) => {
   const { t } = useTranslation()
@@ -357,6 +361,7 @@ const VarReferenceVars: FC<Props> = ({
                     isSupportFileVar={isSupportFileVar}
                     isException={v.isException}
                     isLoopVar={item.isLoop}
+                    zIndex={zIndex}
                   />
                 ))}
               </div>))
diff --git a/web/app/components/workflow/nodes/_base/node.tsx b/web/app/components/workflow/nodes/_base/node.tsx
index 88771d098e..b969702dd7 100644
--- a/web/app/components/workflow/nodes/_base/node.tsx
+++ b/web/app/components/workflow/nodes/_base/node.tsx
@@ -32,6 +32,7 @@ import {
 import { useNodeIterationInteractions } from '../iteration/use-interactions'
 import { useNodeLoopInteractions } from '../loop/use-interactions'
 import type { IterationNodeType } from '../iteration/types'
+import CopyID from '../tool/components/copy-id'
 import {
   NodeSourceHandle,
   NodeTargetHandle,
@@ -321,6 +322,11 @@ const BaseNode: FC<BaseNodeProps> = ({
             </div>
           )
         }
+        {data.type === BlockEnum.Tool && (
+          <div className='px-3 pb-2'>
+            <CopyID content={data.provider_id || ''} />
+          </div>
+        )}
       </div>
     </div>
   )
diff --git a/web/app/components/workflow/nodes/agent/components/tool-icon.tsx b/web/app/components/workflow/nodes/agent/components/tool-icon.tsx
index b94258855a..8616f34200 100644
--- a/web/app/components/workflow/nodes/agent/components/tool-icon.tsx
+++ b/web/app/components/workflow/nodes/agent/components/tool-icon.tsx
@@ -2,10 +2,11 @@ import Tooltip from '@/app/components/base/tooltip'
 import Indicator from '@/app/components/header/indicator'
 import classNames from '@/utils/classnames'
 import { memo, useMemo, useRef, useState } from 'react'
-import { useAllBuiltInTools, useAllCustomTools, useAllWorkflowTools } from '@/service/use-tools'
+import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools } from '@/service/use-tools'
 import { getIconFromMarketPlace } from '@/utils/get-icon'
 import { useTranslation } from 'react-i18next'
 import { Group } from '@/app/components/base/icons/src/vender/other'
+import AppIcon from '@/app/components/base/app-icon'
 
 type Status = 'not-installed' | 'not-authorized' | undefined
 
@@ -19,19 +20,21 @@ export const ToolIcon = memo(({ providerName }: ToolIconProps) => {
   const { data: buildInTools } = useAllBuiltInTools()
   const { data: customTools } = useAllCustomTools()
   const { data: workflowTools } = useAllWorkflowTools()
-  const isDataReady = !!buildInTools && !!customTools && !!workflowTools
+  const { data: mcpTools } = useAllMCPTools()
+  const isDataReady = !!buildInTools && !!customTools && !!workflowTools && !!mcpTools
   const currentProvider = useMemo(() => {
-    const mergedTools = [...(buildInTools || []), ...(customTools || []), ...(workflowTools || [])]
+    const mergedTools = [...(buildInTools || []), ...(customTools || []), ...(workflowTools || []), ...(mcpTools || [])]
     return mergedTools.find((toolWithProvider) => {
-      return toolWithProvider.name === providerName
+      return toolWithProvider.name === providerName || toolWithProvider.id === providerName
     })
-  }, [buildInTools, customTools, providerName, workflowTools])
+  }, [buildInTools, customTools, providerName, workflowTools, mcpTools])
+
   const providerNameParts = providerName.split('/')
   const author = providerNameParts[0]
   const name = providerNameParts[1]
   const icon = useMemo(() => {
     if (!isDataReady) return ''
-    if (currentProvider) return currentProvider.icon as string
+    if (currentProvider) return currentProvider.icon
     const iconFromMarketPlace = getIconFromMarketPlace(`${author}/${name}`)
     return iconFromMarketPlace
   }, [author, currentProvider, name, isDataReady])
@@ -62,19 +65,32 @@ export const ToolIcon = memo(({ providerName }: ToolIconProps) => {
       )}
       ref={containerRef}
     >
-      {(!iconFetchError && isDataReady)
-
-        ? <img
-          src={icon}
-          alt='tool icon'
-          className={classNames(
-            'w-full h-full size-3.5 object-cover',
-            notSuccess && 'opacity-50',
-          )}
-          onError={() => setIconFetchError(true)}
-        />
-        : <Group className="h-3 w-3 opacity-35" />
-      }
+      {(() => {
+        if (iconFetchError || !icon)
+          return <Group className="h-3 w-3 opacity-35" />
+        if (typeof icon === 'string') {
+          return <img
+            src={icon}
+            alt='tool icon'
+            className={classNames(
+              'w-full h-full size-3.5 object-cover',
+              notSuccess && 'opacity-50',
+            )}
+            onError={() => setIconFetchError(true)}
+          />
+        }
+        if (typeof icon === 'object') {
+          return <AppIcon
+            className={classNames(
+              'w-full h-full size-3.5 object-cover',
+              notSuccess && 'opacity-50',
+            )}
+            icon={icon?.content}
+            background={icon?.background}
+          />
+        }
+        return <Group className="h-3 w-3 opacity-35" />
+      })()}
       {indicator && <Indicator color={indicator} className="absolute right-[-1px] top-[-1px]" />}
     </div>
   </Tooltip>
diff --git a/web/app/components/workflow/nodes/agent/default.ts b/web/app/components/workflow/nodes/agent/default.ts
index d80def7bd2..4f68cfe87c 100644
--- a/web/app/components/workflow/nodes/agent/default.ts
+++ b/web/app/components/workflow/nodes/agent/default.ts
@@ -7,6 +7,7 @@ import { renderI18nObject } from '@/i18n'
 
 const nodeDefault: NodeDefault<AgentNodeType> = {
   defaultValue: {
+    version: '2',
   },
   getAvailablePrevNodes(isChatMode) {
     return isChatMode
@@ -60,15 +61,28 @@ const nodeDefault: NodeDefault<AgentNodeType> = {
           const schemas = toolValue.schemas || []
           const userSettings = toolValue.settings
           const reasoningConfig = toolValue.parameters
+          const version = payload.version
           schemas.forEach((schema: any) => {
             if (schema?.required) {
-              if (schema.form === 'form' && !userSettings[schema.name]?.value) {
+              if (schema.form === 'form' && !version && !userSettings[schema.name]?.value) {
                 return {
                   isValid: false,
                   errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
                 }
               }
-              if (schema.form === 'llm' && reasoningConfig[schema.name].auto === 0 && !userSettings[schema.name]?.value) {
+              if (schema.form === 'form' && version && !userSettings[schema.name]?.value.value) {
+                return {
+                  isValid: false,
+                  errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
+                }
+              }
+              if (schema.form === 'llm' && !version && reasoningConfig[schema.name].auto === 0 && !reasoningConfig[schema.name]?.value) {
+                return {
+                  isValid: false,
+                  errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
+                }
+              }
+              if (schema.form === 'llm' && version && reasoningConfig[schema.name].auto === 0 && !reasoningConfig[schema.name]?.value.value) {
                 return {
                   isValid: false,
                   errorMessage: t('workflow.errorMsg.toolParameterRequired', { field: renderI18nObject(param.label, language), param: renderI18nObject(schema.label, language) }),
diff --git a/web/app/components/workflow/nodes/agent/node.tsx b/web/app/components/workflow/nodes/agent/node.tsx
index d2267fd00f..a2190317af 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 391383031f..6741453944 100644
--- a/web/app/components/workflow/nodes/agent/panel.tsx
+++ b/web/app/components/workflow/nodes/agent/panel.tsx
@@ -38,11 +38,11 @@ const AgentPanel: FC<NodePanelProps<AgentNodeType>> = (props) => {
     readOnly,
     outputSchema,
     handleMemoryChange,
+    canChooseMCPTool,
   } = useConfig(props.id, props.data)
   const { t } = useTranslation()
 
   const resetEditor = useStore(s => s.setControlPromptEditorRerenderKey)
-
   return <div className='my-2'>
     <Field
     required
@@ -56,6 +56,7 @@ const AgentPanel: FC<NodePanelProps<AgentNodeType>> = (props) => {
           agent_strategy_label: inputs.agent_strategy_label!,
           agent_output_schema: inputs.output_schema,
           plugin_unique_identifier: inputs.plugin_unique_identifier!,
+          meta: inputs.meta,
         } : undefined}
         onStrategyChange={(strategy) => {
           setInputs({
@@ -65,6 +66,7 @@ const AgentPanel: FC<NodePanelProps<AgentNodeType>> = (props) => {
             agent_strategy_label: strategy?.agent_strategy_label,
             output_schema: strategy!.agent_output_schema,
             plugin_unique_identifier: strategy!.plugin_unique_identifier,
+            meta: strategy?.meta,
           })
           resetEditor(Date.now())
         }}
@@ -74,6 +76,7 @@ const AgentPanel: FC<NodePanelProps<AgentNodeType>> = (props) => {
         nodeOutputVars={availableVars}
         availableNodes={availableNodesWithParent}
         nodeId={props.id}
+        canChooseMCPTool={canChooseMCPTool}
       />
     </Field>
     <div className='px-4 py-2'>
diff --git a/web/app/components/workflow/nodes/agent/types.ts b/web/app/components/workflow/nodes/agent/types.ts
index ca8bb5e71d..5a13a4a4f3 100644
--- a/web/app/components/workflow/nodes/agent/types.ts
+++ b/web/app/components/workflow/nodes/agent/types.ts
@@ -1,14 +1,17 @@
 import type { CommonNodeType, Memory } from '@/app/components/workflow/types'
 import type { ToolVarInputs } from '../tool/types'
+import type { PluginMeta } from '@/app/components/plugins/types'
 
 export type AgentNodeType = CommonNodeType & {
   agent_strategy_provider_name?: string
   agent_strategy_name?: string
   agent_strategy_label?: string
   agent_parameters?: ToolVarInputs
+  meta?: PluginMeta
   output_schema: Record<string, any>
   plugin_unique_identifier?: string
   memory?: Memory
+  version?: string
 }
 
 export enum AgentFeature {
diff --git a/web/app/components/workflow/nodes/agent/use-config.ts b/web/app/components/workflow/nodes/agent/use-config.ts
index c3e07e4e60..50faf03040 100644
--- a/web/app/components/workflow/nodes/agent/use-config.ts
+++ b/web/app/components/workflow/nodes/agent/use-config.ts
@@ -6,13 +6,16 @@ import {
   useIsChatMode,
   useNodesReadOnly,
 } from '@/app/components/workflow/hooks'
-import { useCallback, useMemo } from 'react'
+import { useCallback, useEffect, useMemo } from 'react'
 import { type ToolVarInputs, VarType } from '../tool/types'
 import { useCheckInstalled, useFetchPluginsInMarketPlaceByIds } from '@/service/use-plugins'
 import type { Memory, Var } from '../../types'
 import { VarType as VarKindType } from '../../types'
 import useAvailableVarList from '../_base/hooks/use-available-var-list'
 import produce from 'immer'
+import { isSupportMCP } from '@/utils/plugin-version-feature'
+import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { generateAgentToolValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
 
 export type StrategyStatus = {
   plugin: {
@@ -85,11 +88,12 @@ const useConfig = (id: string, payload: AgentNodeType) => {
   })
   const formData = useMemo(() => {
     const paramNameList = (currentStrategy?.parameters || []).map(item => item.name)
-    return Object.fromEntries(
+    const res = Object.fromEntries(
       Object.entries(inputs.agent_parameters || {}).filter(([name]) => paramNameList.includes(name)).map(([key, value]) => {
         return [key, value.value]
       }),
     )
+    return res
   }, [inputs.agent_parameters, currentStrategy?.parameters])
   const onFormChange = (value: Record<string, any>) => {
     const res: ToolVarInputs = {}
@@ -105,6 +109,42 @@ const useConfig = (id: string, payload: AgentNodeType) => {
     })
   }
 
+  const formattingToolData = (data: any) => {
+    const settingValues = generateAgentToolValue(data.settings, toolParametersToFormSchemas(data.schemas.filter((param: { form: string }) => param.form !== 'llm') as any))
+    const paramValues = generateAgentToolValue(data.parameters, toolParametersToFormSchemas(data.schemas.filter((param: { form: string }) => param.form === 'llm') as any), true)
+    const res = produce(data, (draft: any) => {
+      draft.settings = settingValues
+      draft.parameters = paramValues
+    })
+    return res
+  }
+
+  const formattingLegacyData = () => {
+    if (inputs.version)
+      return inputs
+    const newData = produce(inputs, (draft) => {
+      const schemas = currentStrategy?.parameters || []
+      Object.keys(draft.agent_parameters || {}).forEach((key) => {
+        const targetSchema = schemas.find(schema => schema.name === key)
+        if (targetSchema?.type === FormTypeEnum.toolSelector)
+          draft.agent_parameters![key].value = formattingToolData(draft.agent_parameters![key].value)
+        if (targetSchema?.type === FormTypeEnum.multiToolSelector)
+          draft.agent_parameters![key].value = draft.agent_parameters![key].value.map((tool: any) => formattingToolData(tool))
+      })
+      draft.version = '2'
+    })
+    return newData
+  }
+
+  // formatting legacy data
+  useEffect(() => {
+    if (!currentStrategy)
+      return
+    const newData = formattingLegacyData()
+    setInputs(newData)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentStrategy])
+
   // vars
 
   const filterMemoryPromptVar = useCallback((varPayload: Var) => {
@@ -172,6 +212,7 @@ const useConfig = (id: string, payload: AgentNodeType) => {
     outputSchema,
     handleMemoryChange,
     isChatMode,
+    canChooseMCPTool: isSupportMCP(inputs.meta?.version),
   }
 }
 
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
index 470a322b13..eb3dff83d8 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
@@ -6,6 +6,7 @@ import type { EditData } from './edit-card'
 import { ArrayType, type Field, Type } from '../../../types'
 import Toast from '@/app/components/base/toast'
 import { findPropertyWithPath } from '../../../utils'
+import _ from 'lodash'
 
 type ChangeEventParams = {
   path: string[],
@@ -19,7 +20,8 @@ type AddEventParams = {
 }
 
 export const useSchemaNodeOperations = (props: VisualEditorProps) => {
-  const { schema: jsonSchema, onChange } = props
+  const { schema: jsonSchema, onChange: doOnChange } = props
+  const onChange = doOnChange || _.noop
   const backupSchema = useVisualEditorStore(state => state.backupSchema)
   const setBackupSchema = useVisualEditorStore(state => state.setBackupSchema)
   const isAddingNewField = useVisualEditorStore(state => state.isAddingNewField)
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/index.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/index.tsx
index 1df42532a6..d96f856bbb 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/index.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/index.tsx
@@ -2,24 +2,29 @@ import type { FC } from 'react'
 import type { SchemaRoot } from '../../../types'
 import SchemaNode from './schema-node'
 import { useSchemaNodeOperations } from './hooks'
+import cn from '@/utils/classnames'
 
 export type VisualEditorProps = {
+  className?: string
   schema: SchemaRoot
-  onChange: (schema: SchemaRoot) => void
+  rootName?: string
+  readOnly?: boolean
+  onChange?: (schema: SchemaRoot) => void
 }
 
 const VisualEditor: FC<VisualEditorProps> = (props) => {
-  const { schema } = props
+  const { className, schema, readOnly } = props
   useSchemaNodeOperations(props)
 
   return (
-    <div className='h-full overflow-auto rounded-xl bg-background-section-burn p-1 pl-2'>
+    <div className={cn('h-full overflow-auto rounded-xl bg-background-section-burn p-1 pl-2', className)}>
       <SchemaNode
-        name='structured_output'
+        name={props.rootName || 'structured_output'}
         schema={schema}
         required={false}
         path={[]}
         depth={0}
+        readOnly={readOnly}
       />
     </div>
   )
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/schema-node.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/schema-node.tsx
index 70a6b861ad..96bbf999db 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/schema-node.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/schema-node.tsx
@@ -19,6 +19,7 @@ type SchemaNodeProps = {
   path: string[]
   parentPath?: string[]
   depth: number
+  readOnly?: boolean
 }
 
 // Support 10 levels of indentation
@@ -57,6 +58,7 @@ const SchemaNode: FC<SchemaNodeProps> = ({
   path,
   parentPath,
   depth,
+  readOnly,
 }) => {
   const [isExpanded, setIsExpanded] = useState(true)
   const hoveringProperty = useVisualEditorStore(state => state.hoveringProperty)
@@ -77,11 +79,13 @@ const SchemaNode: FC<SchemaNodeProps> = ({
   }
 
   const handleMouseEnter = () => {
+    if(!readOnly) return
     if (advancedEditing || isAddingNewField) return
     setHoveringPropertyDebounced(path.join('.'))
   }
 
   const handleMouseLeave = () => {
+    if(!readOnly) return
     if (advancedEditing || isAddingNewField) return
     setHoveringPropertyDebounced(null)
   }
@@ -183,7 +187,7 @@ const SchemaNode: FC<SchemaNodeProps> = ({
       )}
 
       {
-        depth === 0 && !isAddingNewField && (
+        !readOnly && depth === 0 && !isAddingNewField && (
           <AddField />
         )
       }
diff --git a/web/app/components/workflow/nodes/tool/components/copy-id.tsx b/web/app/components/workflow/nodes/tool/components/copy-id.tsx
new file mode 100644
index 0000000000..3a633e1d2e
--- /dev/null
+++ b/web/app/components/workflow/nodes/tool/components/copy-id.tsx
@@ -0,0 +1,51 @@
+'use client'
+import React, { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { RiFileCopyLine } from '@remixicon/react'
+import copy from 'copy-to-clipboard'
+import { debounce } from 'lodash-es'
+import Tooltip from '@/app/components/base/tooltip'
+
+type Props = {
+  content: string
+}
+
+const prefixEmbedded = 'appOverview.overview.appInfo.embedded'
+
+const CopyFeedbackNew = ({ content }: Props) => {
+  const { t } = useTranslation()
+  const [isCopied, setIsCopied] = useState<boolean>(false)
+
+  const onClickCopy = debounce(() => {
+    copy(content)
+    setIsCopied(true)
+  }, 100)
+
+  const onMouseLeave = debounce(() => {
+    setIsCopied(false)
+  }, 100)
+
+  return (
+    <div className='inline-flex pb-0.5' onClick={e => e.stopPropagation()} onMouseLeave={onMouseLeave}>
+      <Tooltip
+        popupContent={
+          (isCopied
+            ? t(`${prefixEmbedded}.copied`)
+            : t(`${prefixEmbedded}.copy`)) || ''
+        }
+      >
+        <div
+          className='group/copy flex items-center gap-0.5 '
+          onClick={onClickCopy}
+        >
+          <div
+            className='system-2xs-regular cursor-pointer text-text-quaternary group-hover:text-text-tertiary'
+          >{content}</div>
+          <RiFileCopyLine className='h-3 w-3 text-text-tertiary opacity-0 group-hover/copy:opacity-100' />
+        </div>
+      </Tooltip>
+    </div>
+  )
+}
+
+export default CopyFeedbackNew
diff --git a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx
new file mode 100644
index 0000000000..6680c8ebb6
--- /dev/null
+++ b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx
@@ -0,0 +1,62 @@
+import {
+  memo,
+} from 'react'
+import { useTranslation } from 'react-i18next'
+import PromptEditor from '@/app/components/base/prompt-editor'
+import Placeholder from './placeholder'
+import type {
+  Node,
+  NodeOutPutVar,
+} from '@/app/components/workflow/types'
+import { BlockEnum } from '@/app/components/workflow/types'
+import cn from '@/utils/classnames'
+
+type MixedVariableTextInputProps = {
+  readOnly?: boolean
+  nodesOutputVars?: NodeOutPutVar[]
+  availableNodes?: Node[]
+  value?: string
+  onChange?: (text: string) => void
+}
+const MixedVariableTextInput = ({
+  readOnly = false,
+  nodesOutputVars,
+  availableNodes = [],
+  value = '',
+  onChange,
+}: MixedVariableTextInputProps) => {
+  const { t } = useTranslation()
+  return (
+    <PromptEditor
+      wrapperClassName={cn(
+        'w-full rounded-lg border border-transparent bg-components-input-bg-normal px-2 py-1',
+        'hover:border-components-input-border-hover hover:bg-components-input-bg-hover',
+        'focus-within:border-components-input-border-active focus-within:bg-components-input-bg-active focus-within:shadow-xs',
+      )}
+      className='caret:text-text-accent'
+      editable={!readOnly}
+      value={value}
+      workflowVariableBlock={{
+        show: true,
+        variables: nodesOutputVars || [],
+        workflowNodesMap: availableNodes.reduce((acc, node) => {
+          acc[node.id] = {
+            title: node.data.title,
+            type: node.data.type,
+          }
+          if (node.data.type === BlockEnum.Start) {
+            acc.sys = {
+              title: t('workflow.blocks.start'),
+              type: BlockEnum.Start,
+            }
+          }
+          return acc
+        }, {} as any),
+      }}
+      placeholder={<Placeholder />}
+      onChange={onChange}
+    />
+  )
+}
+
+export default memo(MixedVariableTextInput)
diff --git a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/placeholder.tsx b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/placeholder.tsx
new file mode 100644
index 0000000000..3337d6ae66
--- /dev/null
+++ b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/placeholder.tsx
@@ -0,0 +1,51 @@
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
+import { FOCUS_COMMAND } from 'lexical'
+import { $insertNodes } from 'lexical'
+import { CustomTextNode } from '@/app/components/base/prompt-editor/plugins/custom-text/node'
+import Badge from '@/app/components/base/badge'
+
+const Placeholder = () => {
+  const { t } = useTranslation()
+  const [editor] = useLexicalComposerContext()
+
+  const handleInsert = useCallback((text: string) => {
+    editor.update(() => {
+      const textNode = new CustomTextNode(text)
+      $insertNodes([textNode])
+    })
+    editor.dispatchCommand(FOCUS_COMMAND, undefined as any)
+  }, [editor])
+
+  return (
+    <div
+      className='pointer-events-auto flex h-full w-full cursor-text items-center px-2'
+      onClick={(e) => {
+        e.stopPropagation()
+        handleInsert('')
+      }}
+    >
+      <div className='flex grow items-center'>
+        {t('workflow.nodes.tool.insertPlaceholder1')}
+        <div className='system-kbd mx-0.5 flex h-4 w-4 items-center justify-center rounded bg-components-kbd-bg-gray text-text-placeholder'>/</div>
+        <div
+          className='system-sm-regular cursor-pointer text-components-input-text-placeholder underline decoration-dotted decoration-auto underline-offset-auto hover:text-text-tertiary'
+          onClick={((e) => {
+            e.stopPropagation()
+            handleInsert('/')
+          })}
+        >
+          {t('workflow.nodes.tool.insertPlaceholder2')}
+        </div>
+      </div>
+      <Badge
+        className='shrink-0'
+        text='String'
+        uppercase={false}
+      />
+    </div>
+  )
+}
+
+export default Placeholder
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx
new file mode 100644
index 0000000000..a867797473
--- /dev/null
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx
@@ -0,0 +1,51 @@
+'use client'
+import type { FC } from 'react'
+import type { ToolVarInputs } from '../../types'
+import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import ToolFormItem from './item'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+import type { Tool } from '@/app/components/tools/types'
+
+type Props = {
+  readOnly: boolean
+  nodeId: string
+  schema: CredentialFormSchema[]
+  value: ToolVarInputs
+  onChange: (value: ToolVarInputs) => void
+  onOpen?: (index: number) => void
+  inPanel?: boolean
+  currentTool?: Tool
+  currentProvider?: ToolWithProvider
+}
+
+const ToolForm: FC<Props> = ({
+  readOnly,
+  nodeId,
+  schema,
+  value,
+  onChange,
+  inPanel,
+  currentTool,
+  currentProvider,
+}) => {
+  return (
+    <div className='space-y-1'>
+      {
+        schema.map((schema, index) => (
+          <ToolFormItem
+            key={index}
+            readOnly={readOnly}
+            nodeId={nodeId}
+            schema={schema}
+            value={value}
+            onChange={onChange}
+            inPanel={inPanel}
+            currentTool={currentTool}
+            currentProvider={currentProvider}
+          />
+        ))
+      }
+    </div>
+  )
+}
+export default ToolForm
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
new file mode 100644
index 0000000000..11de42fe56
--- /dev/null
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
@@ -0,0 +1,105 @@
+'use client'
+import type { FC } from 'react'
+import {
+  RiBracesLine,
+} from '@remixicon/react'
+import type { ToolVarInputs } from '../../types'
+import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import Button from '@/app/components/base/button'
+import Tooltip from '@/app/components/base/tooltip'
+import FormInputItem from '@/app/components/workflow/nodes/_base/components/form-input-item'
+import { useBoolean } from 'ahooks'
+import SchemaModal from '@/app/components/plugins/plugin-detail-panel/tool-selector/schema-modal'
+import type { ToolWithProvider } from '@/app/components/workflow/types'
+import type { Tool } from '@/app/components/tools/types'
+
+type Props = {
+  readOnly: boolean
+  nodeId: string
+  schema: CredentialFormSchema
+  value: ToolVarInputs
+  onChange: (value: ToolVarInputs) => void
+  inPanel?: boolean
+  currentTool?: Tool
+  currentProvider?: ToolWithProvider
+}
+
+const ToolFormItem: FC<Props> = ({
+  readOnly,
+  nodeId,
+  schema,
+  value,
+  onChange,
+  inPanel,
+  currentTool,
+  currentProvider,
+}) => {
+  const language = useLanguage()
+  const { name, label, type, required, tooltip, input_schema } = schema
+  const showSchemaButton = type === FormTypeEnum.object || type === FormTypeEnum.array
+  const showDescription = type === FormTypeEnum.textInput || type === FormTypeEnum.secretInput
+  const [isShowSchema, {
+    setTrue: showSchema,
+    setFalse: hideSchema,
+  }] = useBoolean(false)
+  return (
+    <div className='space-y-0.5 py-1'>
+      <div>
+        <div className='flex h-6 items-center'>
+          <div className='system-sm-medium text-text-secondary'>{label[language] || label.en_US}</div>
+          {required && (
+            <div className='system-xs-regular ml-1 text-text-destructive-secondary'>*</div>
+          )}
+          {!showDescription && tooltip && (
+            <Tooltip
+              popupContent={<div className='w-[200px]'>
+                {tooltip[language] || tooltip.en_US}
+              </div>}
+              triggerClassName='ml-1 w-4 h-4'
+              asChild={false}
+            />
+          )}
+          {showSchemaButton && (
+            <>
+              <div className='system-xs-regular ml-1 mr-0.5 text-text-quaternary'>·</div>
+              <Button
+                variant='ghost'
+                size='small'
+                onClick={showSchema}
+                className='system-xs-regular px-1 text-text-tertiary'
+              >
+                <RiBracesLine className='mr-1 size-3.5' />
+                <span>JSON Schema</span>
+              </Button>
+            </>
+          )}
+        </div>
+        {showDescription && tooltip && (
+          <div className='body-xs-regular pb-0.5 text-text-tertiary'>{tooltip[language] || tooltip.en_US}</div>
+        )}
+      </div>
+      <FormInputItem
+        readOnly={readOnly}
+        nodeId={nodeId}
+        schema={schema}
+        value={value}
+        onChange={onChange}
+        inPanel={inPanel}
+        currentTool={currentTool}
+        currentProvider={currentProvider}
+      />
+
+      {isShowSchema && (
+        <SchemaModal
+          isShow
+          onClose={hideSchema}
+          rootName={name}
+          schema={input_schema!}
+        />
+      )}
+    </div>
+  )
+}
+export default ToolFormItem
diff --git a/web/app/components/workflow/nodes/tool/default.ts b/web/app/components/workflow/nodes/tool/default.ts
index f245929684..1fdb9eed2d 100644
--- a/web/app/components/workflow/nodes/tool/default.ts
+++ b/web/app/components/workflow/nodes/tool/default.ts
@@ -10,6 +10,7 @@ const nodeDefault: NodeDefault<ToolNodeType> = {
   defaultValue: {
     tool_parameters: {},
     tool_configurations: {},
+    version: '2',
   },
   getAvailablePrevNodes(isChatMode: boolean) {
     const nodes = isChatMode
@@ -55,6 +56,8 @@ const nodeDefault: NodeDefault<ToolNodeType> = {
         const value = payload.tool_configurations[field.variable]
         if (!errorMessages && (value === undefined || value === null || value === ''))
           errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label[language] })
+        if (!errorMessages && typeof value === 'object' && !!value.type && (value.value === undefined || value.value === null || value.value === '' || (Array.isArray(value.value) && value.value.length === 0)))
+          errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label[language] })
       })
     }
 
diff --git a/web/app/components/workflow/nodes/tool/node.tsx b/web/app/components/workflow/nodes/tool/node.tsx
index f3cb4d9fae..e15ddcaaaa 100644
--- a/web/app/components/workflow/nodes/tool/node.tsx
+++ b/web/app/components/workflow/nodes/tool/node.tsx
@@ -21,14 +21,14 @@ const Node: FC<NodeProps<ToolNodeType>> = ({
             <div title={key} className='max-w-[100px] shrink-0 truncate text-xs font-medium uppercase text-text-tertiary'>
               {key}
             </div>
-            {typeof tool_configurations[key] === 'string' && (
+            {typeof tool_configurations[key].value === 'string' && (
               <div title={tool_configurations[key]} className='w-0 shrink-0 grow truncate text-right text-xs font-normal text-text-secondary'>
-                {paramSchemas?.find(i => i.name === key)?.type === FormTypeEnum.secretInput ? '********' : tool_configurations[key]}
+                {paramSchemas?.find(i => i.name === key)?.type === FormTypeEnum.secretInput ? '********' : tool_configurations[key].value}
               </div>
             )}
-            {typeof tool_configurations[key] === 'number' && (
+            {typeof tool_configurations[key].value === 'number' && (
               <div title={tool_configurations[key].toString()} className='w-0 shrink-0 grow truncate text-right text-xs font-normal text-text-secondary'>
-                {tool_configurations[key]}
+                {tool_configurations[key].value}
               </div>
             )}
             {typeof tool_configurations[key] !== 'string' && tool_configurations[key]?.type === FormTypeEnum.modelSelector && (
@@ -36,11 +36,6 @@ const Node: FC<NodeProps<ToolNodeType>> = ({
                 {tool_configurations[key].model}
               </div>
             )}
-            {/* {typeof tool_configurations[key] !== 'string' && tool_configurations[key]?.type === FormTypeEnum.appSelector && (
-              <div title={tool_configurations[key].app_id} className='grow w-0 shrink-0 truncate text-right text-xs font-normal text-gray-700'>
-                {tool_configurations[key].app_id}
-              </div>
-            )} */}
           </div>
 
         ))}
diff --git a/web/app/components/workflow/nodes/tool/panel.tsx b/web/app/components/workflow/nodes/tool/panel.tsx
index 038159870e..936f730a46 100644
--- a/web/app/components/workflow/nodes/tool/panel.tsx
+++ b/web/app/components/workflow/nodes/tool/panel.tsx
@@ -4,11 +4,10 @@ import { useTranslation } from 'react-i18next'
 import Split from '../_base/components/split'
 import type { ToolNodeType } from './types'
 import useConfig from './use-config'
-import InputVarList from './components/input-var-list'
+import ToolForm from './components/tool-form'
 import Button from '@/app/components/base/button'
 import Field from '@/app/components/workflow/nodes/_base/components/field'
 import type { NodePanelProps } from '@/app/components/workflow/types'
-import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
 import ConfigCredential from '@/app/components/tools/setting/build-in/config-credentials'
 import Loading from '@/app/components/base/loading'
 import OutputVars, { VarItem } from '@/app/components/workflow/nodes/_base/components/output-vars'
@@ -28,8 +27,6 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
     inputs,
     toolInputVarSchema,
     setInputVar,
-    handleOnVarOpen,
-    filterVar,
     toolSettingSchema,
     toolSettingValue,
     setToolSettingValue,
@@ -45,6 +42,8 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
     currTool,
   } = useConfig(id, data)
 
+  const [collapsed, setCollapsed] = React.useState(false)
+
   if (isLoading) {
     return <div className='flex h-[200px] items-center justify-center'>
       <Loading />
@@ -66,21 +65,19 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
           </div>
         </>
       )}
-      {!isShowAuthBtn && <>
-        <div className='space-y-4 px-4'>
+      {!isShowAuthBtn && (
+        <div className='relative'>
           {toolInputVarSchema.length > 0 && (
             <Field
+              className='px-4'
               title={t(`${i18nPrefix}.inputVars`)}
             >
-              <InputVarList
+              <ToolForm
                 readOnly={readOnly}
                 nodeId={id}
                 schema={toolInputVarSchema as any}
                 value={inputs.tool_parameters}
                 onChange={setInputVar}
-                filterVar={filterVar}
-                isSupportConstantValue
-                onOpen={handleOnVarOpen}
                 currentProvider={currCollection}
                 currentTool={currTool}
               />
@@ -88,24 +85,29 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
           )}
 
           {toolInputVarSchema.length > 0 && toolSettingSchema.length > 0 && (
-            <Split />
+            <Split className='mt-1' />
           )}
 
-          <Form
-            className='space-y-4'
-            itemClassName='!py-0'
-            fieldLabelClassName='!text-[13px] !font-semibold !text-text-secondary uppercase'
-            value={toolSettingValue}
-            onChange={setToolSettingValue}
-            formSchemas={toolSettingSchema as any}
-            isEditMode={false}
-            showOnVariableMap={{}}
-            validating={false}
-            // inputClassName='!bg-gray-50'
-            readonly={readOnly}
-          />
+          {toolSettingSchema.length > 0 && (
+            <>
+              <OutputVars
+                title={t(`${i18nPrefix}.settings`)}
+                collapsed={collapsed}
+                onCollapse={setCollapsed}
+              >
+                <ToolForm
+                  readOnly={readOnly}
+                  nodeId={id}
+                  schema={toolSettingSchema as any}
+                  value={toolSettingValue}
+                  onChange={setToolSettingValue}
+                />
+              </OutputVars>
+              <Split />
+            </>
+          )}
         </div>
-      </>}
+      )}
 
       {showSetAuth && (
         <ConfigCredential
diff --git a/web/app/components/workflow/nodes/tool/types.ts b/web/app/components/workflow/nodes/tool/types.ts
index 4b78c53ab2..4584645a1e 100644
--- a/web/app/components/workflow/nodes/tool/types.ts
+++ b/web/app/components/workflow/nodes/tool/types.ts
@@ -22,4 +22,5 @@ export type ToolNodeType = CommonNodeType & {
   tool_configurations: Record<string, any>
   output_schema: Record<string, any>
   paramSchemas?: Record<string, any>[]
+  version?: string
 }
diff --git a/web/app/components/workflow/nodes/tool/use-config.ts b/web/app/components/workflow/nodes/tool/use-config.ts
index b83ae8a07f..ea8d0e21ca 100644
--- a/web/app/components/workflow/nodes/tool/use-config.ts
+++ b/web/app/components/workflow/nodes/tool/use-config.ts
@@ -8,10 +8,12 @@ import { useLanguage } from '@/app/components/header/account-setting/model-provi
 import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
 import { CollectionType } from '@/app/components/tools/types'
 import { updateBuiltInToolCredential } from '@/service/tools'
-import { addDefaultValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
+import {
+  getConfiguredValue,
+  toolParametersToFormSchemas,
+} from '@/app/components/tools/utils/to-form-schema'
 import Toast from '@/app/components/base/toast'
-import { VarType as VarVarType } from '@/app/components/workflow/types'
-import type { InputVar, Var } from '@/app/components/workflow/types'
+import type { InputVar } from '@/app/components/workflow/types'
 import {
   useFetchToolsData,
   useNodesReadOnly,
@@ -26,17 +28,18 @@ const useConfig = (id: string, payload: ToolNodeType) => {
   const language = useLanguage()
   const { inputs, setInputs: doSetInputs } = useNodeCrud<ToolNodeType>(id, payload)
   /*
-  * tool_configurations: tool setting, not dynamic setting
-  * tool_parameters: tool dynamic setting(by user)
+  * tool_configurations: tool setting, not dynamic setting (form type = form)
+  * tool_parameters: tool dynamic setting(form type = llm)
   * output_schema: tool dynamic output
   */
-  const { provider_id, provider_type, tool_name, tool_configurations, output_schema } = inputs
+  const { provider_id, provider_type, tool_name, tool_configurations, output_schema, tool_parameters } = inputs
   const isBuiltIn = provider_type === CollectionType.builtIn
   const buildInTools = useStore(s => s.buildInTools)
   const customTools = useStore(s => s.customTools)
   const workflowTools = useStore(s => s.workflowTools)
+  const mcpTools = useStore(s => s.mcpTools)
 
-  const currentTools = (() => {
+  const currentTools = useMemo(() => {
     switch (provider_type) {
       case CollectionType.builtIn:
         return buildInTools
@@ -44,10 +47,12 @@ const useConfig = (id: string, payload: ToolNodeType) => {
         return customTools
       case CollectionType.workflow:
         return workflowTools
+      case CollectionType.mcp:
+        return mcpTools
       default:
         return []
     }
-  })()
+  }, [buildInTools, customTools, mcpTools, provider_type, workflowTools])
   const currCollection = currentTools.find(item => canFindTool(item.id, provider_id))
 
   // Auth
@@ -91,10 +96,10 @@ const useConfig = (id: string, payload: ToolNodeType) => {
         const value = newConfig[key]
         if (schema?.type === 'boolean') {
           if (typeof value === 'string')
-            newConfig[key] = Number.parseInt(value, 10)
+            newConfig[key] = value === 'true' || value === '1'
 
-          if (typeof value === 'boolean')
-            newConfig[key] = value ? 1 : 0
+          if (typeof value === 'number')
+            newConfig[key] = value === 1
         }
 
         if (schema?.type === 'number-input') {
@@ -107,12 +112,11 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     doSetInputs(newInputs)
   }, [doSetInputs, formSchemas, hasShouldTransferTypeSettingInput])
   const [notSetDefaultValue, setNotSetDefaultValue] = useState(false)
-  const toolSettingValue = (() => {
+  const toolSettingValue = useMemo(() => {
     if (notSetDefaultValue)
       return tool_configurations
-
-    return addDefaultValue(tool_configurations, toolSettingSchema)
-  })()
+    return getConfiguredValue(tool_configurations, toolSettingSchema)
+  }, [notSetDefaultValue, toolSettingSchema, tool_configurations])
   const setToolSettingValue = useCallback((value: Record<string, any>) => {
     setNotSetDefaultValue(true)
     setInputs({
@@ -121,16 +125,20 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     })
   }, [inputs, setInputs])
 
-  useEffect(() => {
-    if (!currTool)
-      return
+  const formattingParameters = () => {
     const inputsWithDefaultValue = produce(inputs, (draft) => {
       if (!draft.tool_configurations || Object.keys(draft.tool_configurations).length === 0)
-        draft.tool_configurations = addDefaultValue(tool_configurations, toolSettingSchema)
-
-      if (!draft.tool_parameters)
-        draft.tool_parameters = {}
+        draft.tool_configurations = getConfiguredValue(tool_configurations, toolSettingSchema)
+      if (!draft.tool_parameters || Object.keys(draft.tool_parameters).length === 0)
+        draft.tool_parameters = getConfiguredValue(tool_parameters, toolInputVarSchema)
     })
+    return inputsWithDefaultValue
+  }
+
+  useEffect(() => {
+    if (!currTool)
+      return
+    const inputsWithDefaultValue = formattingParameters()
     setInputs(inputsWithDefaultValue)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currTool])
@@ -143,19 +151,6 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     })
   }, [inputs, setInputs])
 
-  const [currVarIndex, setCurrVarIndex] = useState(-1)
-  const currVarType = toolInputVarSchema[currVarIndex]?._type
-  const handleOnVarOpen = useCallback((index: number) => {
-    setCurrVarIndex(index)
-  }, [])
-
-  const filterVar = useCallback((varPayload: Var) => {
-    if (currVarType)
-      return varPayload.type === currVarType
-
-    return varPayload.type !== VarVarType.arrayFile
-  }, [currVarType])
-
   const isLoading = currTool && (isBuiltIn ? !currCollection : false)
 
   const getMoreDataForCheckValid = () => {
@@ -220,8 +215,6 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     setToolSettingValue,
     toolInputVarSchema,
     setInputVar,
-    handleOnVarOpen,
-    filterVar,
     currCollection,
     isShowAuthBtn,
     showSetAuth,
diff --git a/web/app/components/workflow/nodes/tool/use-single-run-form-params.ts b/web/app/components/workflow/nodes/tool/use-single-run-form-params.ts
index 295cf02639..6fc79beebe 100644
--- a/web/app/components/workflow/nodes/tool/use-single-run-form-params.ts
+++ b/web/app/components/workflow/nodes/tool/use-single-run-form-params.ts
@@ -34,7 +34,12 @@ const useSingleRunFormParams = ({
   const hadVarParams = Object.keys(inputs.tool_parameters)
     .filter(key => inputs.tool_parameters[key].type !== VarType.constant)
     .map(k => inputs.tool_parameters[k])
-  const varInputs = getInputVars(hadVarParams.map((p) => {
+
+  const hadVarSettings = Object.keys(inputs.tool_configurations)
+    .filter(key => typeof inputs.tool_configurations[key] === 'object' && inputs.tool_configurations[key].type && inputs.tool_configurations[key].type !== VarType.constant)
+    .map(k => inputs.tool_configurations[k])
+
+  const varInputs = getInputVars([...hadVarParams, ...hadVarSettings].map((p) => {
     if (p.type === VarType.variable) {
       // handle the old wrong value not crash the page
       if (!(p.value as any).join)
@@ -55,8 +60,11 @@ const useSingleRunFormParams = ({
     const res = produce(inputVarValues, (draft) => {
       Object.keys(inputs.tool_parameters).forEach((key: string) => {
         const { type, value } = inputs.tool_parameters[key]
-        if (type === VarType.constant && (value === undefined || value === null))
+        if (type === VarType.constant && (value === undefined || value === null)) {
+            if(!draft.tool_parameters || !draft.tool_parameters[key])
+            return
           draft[key] = value
+        }
       })
     })
     return res
diff --git a/web/app/components/workflow/store/workflow/tool-slice.ts b/web/app/components/workflow/store/workflow/tool-slice.ts
index 2d54bbd925..d6d89abcf0 100644
--- a/web/app/components/workflow/store/workflow/tool-slice.ts
+++ b/web/app/components/workflow/store/workflow/tool-slice.ts
@@ -10,6 +10,8 @@ export type ToolSliceShape = {
   setCustomTools: (tools: ToolWithProvider[]) => void
   workflowTools: ToolWithProvider[]
   setWorkflowTools: (tools: ToolWithProvider[]) => void
+  mcpTools: ToolWithProvider[]
+  setMcpTools: (tools: ToolWithProvider[]) => void
   toolPublished: boolean
   setToolPublished: (toolPublished: boolean) => void
 }
@@ -21,6 +23,8 @@ export const createToolSlice: StateCreator<ToolSliceShape> = set => ({
   setCustomTools: customTools => set(() => ({ customTools })),
   workflowTools: [],
   setWorkflowTools: workflowTools => set(() => ({ workflowTools })),
+  mcpTools: [],
+  setMcpTools: mcpTools => set(() => ({ mcpTools })),
   toolPublished: false,
   setToolPublished: toolPublished => set(() => ({ toolPublished })),
 })
diff --git a/web/app/components/workflow/types.ts b/web/app/components/workflow/types.ts
index 3248ce798d..507d494c74 100644
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@@ -16,6 +16,7 @@ import type {
 } from '@/app/components/workflow/nodes/_base/components/error-handle/types'
 import type { WorkflowRetryConfig } from '@/app/components/workflow/nodes/_base/components/retry/types'
 import type { StructuredOutput } from '@/app/components/workflow/nodes/llm/types'
+import type { PluginMeta } from '../plugins/types'
 
 export enum BlockEnum {
   Start = 'start',
@@ -410,6 +411,7 @@ export type MoreInfo = {
 
 export type ToolWithProvider = Collection & {
   tools: Tool[]
+  meta: PluginMeta
 }
 
 export enum SupportUploadFileTypes {
diff --git a/web/app/components/workflow/utils/workflow-init.ts b/web/app/components/workflow/utils/workflow-init.ts
index 93a61230ba..dc22d61ca5 100644
--- a/web/app/components/workflow/utils/workflow-init.ts
+++ b/web/app/components/workflow/utils/workflow-init.ts
@@ -28,6 +28,7 @@ import type { IfElseNodeType } from '../nodes/if-else/types'
 import { branchNameCorrect } from '../nodes/if-else/utils'
 import type { IterationNodeType } from '../nodes/iteration/types'
 import type { LoopNodeType } from '../nodes/loop/types'
+import type { ToolNodeType } from '../nodes/tool/types'
 import {
   getIterationStartNode,
   getLoopStartNode,
@@ -276,6 +277,7 @@ export const initialNodes = (originNodes: Node[], originEdges: Edge[]) => {
 
     if (node.data.type === BlockEnum.ParameterExtractor)
       (node as any).data.model.provider = correctModelProvider((node as any).data.model.provider)
+
     if (node.data.type === BlockEnum.HttpRequest && !node.data.retry_config) {
       node.data.retry_config = {
         retry_enabled: true,
@@ -284,6 +286,24 @@ export const initialNodes = (originNodes: Node[], originEdges: Edge[]) => {
       }
     }
 
+    if (node.data.type === BlockEnum.Tool && !(node as Node<ToolNodeType>).data.version) {
+      (node as Node<ToolNodeType>).data.version = '2'
+
+      const toolConfigurations = (node as Node<ToolNodeType>).data.tool_configurations
+      if (toolConfigurations && Object.keys(toolConfigurations).length > 0) {
+        const newValues = { ...toolConfigurations }
+        Object.keys(toolConfigurations).forEach((key) => {
+          if (typeof toolConfigurations[key] !== 'object' || toolConfigurations[key] === null) {
+            newValues[key] = {
+              type: 'constant',
+              value: toolConfigurations[key],
+            }
+          }
+        });
+        (node as Node<ToolNodeType>).data.tool_configurations = newValues
+      }
+    }
+
     return node
   })
 }
diff --git a/web/app/oauth-callback/page.tsx b/web/app/oauth-callback/page.tsx
new file mode 100644
index 0000000000..38355f435e
--- /dev/null
+++ b/web/app/oauth-callback/page.tsx
@@ -0,0 +1,10 @@
+'use client'
+import { useOAuthCallback } from '@/hooks/use-oauth'
+
+const OAuthCallback = () => {
+  useOAuthCallback()
+
+  return <div />
+}
+
+export default OAuthCallback
diff --git a/web/hooks/use-oauth.ts b/web/hooks/use-oauth.ts
new file mode 100644
index 0000000000..ae9c1cda66
--- /dev/null
+++ b/web/hooks/use-oauth.ts
@@ -0,0 +1,36 @@
+'use client'
+import { useEffect } from 'react'
+
+export const useOAuthCallback = () => {
+  useEffect(() => {
+    if (window.opener) {
+      window.opener.postMessage({
+        type: 'oauth_callback',
+      }, '*')
+      window.close()
+    }
+  }, [])
+}
+
+export const openOAuthPopup = (url: string, callback: () => void) => {
+  const width = 600
+  const height = 600
+  const left = window.screenX + (window.outerWidth - width) / 2
+  const top = window.screenY + (window.outerHeight - height) / 2
+
+  const popup = window.open(
+    url,
+    'OAuth',
+    `width=${width},height=${height},left=${left},top=${top},scrollbars=yes`,
+  )
+
+  const handleMessage = (event: MessageEvent) => {
+    if (event.data?.type === 'oauth_callback') {
+      window.removeEventListener('message', handleMessage)
+      callback()
+    }
+  }
+
+  window.addEventListener('message', handleMessage)
+  return popup
+}
diff --git a/web/i18n/de-DE/plugin.ts b/web/i18n/de-DE/plugin.ts
index 05988dedf1..87f222be94 100644
--- a/web/i18n/de-DE/plugin.ts
+++ b/web/i18n/de-DE/plugin.ts
@@ -55,7 +55,7 @@ const translation = {
       unsupportedContent: 'Die installierte Plug-in-Version bietet diese Aktion nicht.',
       unsupportedTitle: 'Nicht unterstützte Aktion',
       descriptionPlaceholder: 'Kurze Beschreibung des Zwecks des Werkzeugs, z. B. um die Temperatur für einen bestimmten Ort zu ermitteln.',
-      auto: 'Automatisch',
+      auto: 'Auto',
       params: 'KONFIGURATION DER ARGUMENTATION',
       unsupportedContent2: 'Klicken Sie hier, um die Version zu wechseln.',
       placeholder: 'Wählen Sie ein Werkzeug aus...',
diff --git a/web/i18n/de-DE/tools.ts b/web/i18n/de-DE/tools.ts
index 2f3c24b9da..6e6eda85e0 100644
--- a/web/i18n/de-DE/tools.ts
+++ b/web/i18n/de-DE/tools.ts
@@ -137,21 +137,97 @@ const translation = {
   notAuthorized: 'Werkzeug nicht autorisiert',
   howToGet: 'Wie erhält man',
   addToolModal: {
+    type: 'Art',
+    category: 'Kategorie',
+    add: 'hinzufügen',
     added: 'zugefügt',
     manageInTools: 'Verwalten in Tools',
-    add: 'hinzufügen',
-    category: 'Kategorie',
-    emptyTitle: 'Kein Workflow-Tool verfügbar',
-    type: 'Art',
-    emptyTip: 'Gehen Sie zu "Workflow -> Als Tool veröffentlichen"',
-    emptyTitleCustom: 'Kein benutzerdefiniertes Tool verfügbar',
-    emptyTipCustom: 'Erstellen eines benutzerdefinierten Werkzeugs',
+    custom: {
+      title: 'Kein benutzerdefiniertes Werkzeug verfügbar',
+      tip: 'Benutzerdefiniertes Werkzeug erstellen',
+    },
+    workflow: {
+      title: 'Kein Workflow-Werkzeug verfügbar',
+      tip: 'Veröffentlichen Sie Workflows als Werkzeuge im Studio',
+    },
+    mcp: {
+      title: 'Kein MCP-Werkzeug verfügbar',
+      tip: 'Einen MCP-Server hinzufügen',
+    },
+    agent: {
+      title: 'Keine Agentenstrategie verfügbar',
+    },
   },
   toolNameUsageTip: 'Name des Tool-Aufrufs für die Argumentation und Aufforderung des Agenten',
   customToolTip: 'Erfahren Sie mehr über benutzerdefinierte Dify-Tools',
   openInStudio: 'In Studio öffnen',
   noTools: 'Keine Werkzeuge gefunden',
   copyToolName: 'Name kopieren',
+  mcp: {
+    create: {
+      cardTitle: 'MCP-Server hinzufügen (HTTP)',
+      cardLink: 'Mehr über MCP-Server-Integration erfahren',
+    },
+    noConfigured: 'Nicht konfigurierter Server',
+    updateTime: 'Aktualisiert',
+    toolsCount: '{{count}} Tools',
+    noTools: 'Keine Tools verfügbar',
+    modal: {
+      title: 'MCP-Server hinzufügen (HTTP)',
+      editTitle: 'MCP-Server bearbeiten (HTTP)',
+      name: 'Name & Symbol',
+      namePlaceholder: 'Benennen Sie Ihren MCP-Server',
+      serverUrl: 'Server-URL',
+      serverUrlPlaceholder: 'URL zum Server-Endpunkt',
+      serverUrlWarning: 'Das Ändern der Serveradresse kann Anwendungen unterbrechen, die von diesem Server abhängen',
+      serverIdentifier: 'Serverkennung',
+      serverIdentifierTip: 'Eindeutige Kennung für den MCP-Server im Arbeitsbereich. Nur Kleinbuchstaben, Zahlen, Unterstriche und Bindestriche. Maximal 24 Zeichen.',
+      serverIdentifierPlaceholder: 'Eindeutige Kennung, z.B. mein-mcp-server',
+      serverIdentifierWarning: 'Nach einer ID-Änderung wird der Server von vorhandenen Apps nicht erkannt',
+      cancel: 'Abbrechen',
+      save: 'Speichern',
+      confirm: 'Hinzufügen & Autorisieren',
+    },
+    delete: 'MCP-Server entfernen',
+    deleteConfirmTitle: 'Möchten Sie {{mcp}} entfernen?',
+    operation: {
+      edit: 'Bearbeiten',
+      remove: 'Entfernen',
+    },
+    authorize: 'Autorisieren',
+    authorizing: 'Wird autorisiert...',
+    authorizingRequired: 'Autorisierung erforderlich',
+    authorizeTip: 'Nach der Autorisierung werden Tools hier angezeigt.',
+    update: 'Aktualisieren',
+    updating: 'Wird aktualisiert',
+    gettingTools: 'Tools werden abgerufen...',
+    updateTools: 'Tools werden aktualisiert...',
+    toolsEmpty: 'Tools nicht geladen',
+    getTools: 'Tools abrufen',
+    toolUpdateConfirmTitle: 'Tool-Liste aktualisieren',
+    toolUpdateConfirmContent: 'Das Aktualisieren der Tool-Liste kann bestehende Apps beeinflussen. Fortfahren?',
+    toolsNum: '{{count}} Tools enthalten',
+    onlyTool: '1 Tool enthalten',
+    identifier: 'Serverkennung (Zum Kopieren klicken)',
+    server: {
+      title: 'MCP-Server',
+      url: 'Server-URL',
+      reGen: 'Server-URL neu generieren?',
+      addDescription: 'Beschreibung hinzufügen',
+      edit: 'Beschreibung bearbeiten',
+      modal: {
+        addTitle: 'Beschreibung hinzufügen, um MCP-Server zu aktivieren',
+        editTitle: 'Beschreibung bearbeiten',
+        description: 'Beschreibung',
+        descriptionPlaceholder: 'Erklären Sie, was dieses Tool tut und wie es vom LLM verwendet werden soll',
+        parameters: 'Parameter',
+        parametersTip: 'Fügen Sie Beschreibungen für jeden Parameter hinzu, um dem LLM Zweck und Einschränkungen zu verdeutlichen.',
+        parametersPlaceholder: 'Zweck und Einschränkungen des Parameters',
+        confirm: 'MCP-Server aktivieren',
+      },
+      publishTip: 'App nicht veröffentlicht. Bitte zuerst die App veröffentlichen.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/en-US/plugin.ts b/web/i18n/en-US/plugin.ts
index 9fba3a4714..cf9df89a6b 100644
--- a/web/i18n/en-US/plugin.ts
+++ b/web/i18n/en-US/plugin.ts
@@ -85,8 +85,8 @@ const translation = {
       settings: 'USER SETTINGS',
       params: 'REASONING CONFIG',
       paramsTip1: 'Controls LLM inference parameters.',
-      paramsTip2: 'When \'Automatic\' is off, the default value is used.',
-      auto: 'Automatic',
+      paramsTip2: 'When \'Auto\' is off, the default value is used.',
+      auto: 'Auto',
       empty: 'Click the \'+\' button to add tools. You can add multiple tools.',
       uninstalledTitle: 'Tool not installed',
       uninstalledContent: 'This plugin is installed from the local/GitHub repository. Please use after installation.',
@@ -94,6 +94,7 @@ const translation = {
       unsupportedTitle: 'Unsupported Action',
       unsupportedContent: 'The installed plugin version does not provide this action.',
       unsupportedContent2: 'Click to switch version.',
+      unsupportedMCPTool: 'Currently selected agent strategy plugin version does not support MCP tools.',
     },
     configureApp: 'Configure App',
     configureModel: 'Configure model',
diff --git a/web/i18n/en-US/tools.ts b/web/i18n/en-US/tools.ts
index 433e98720a..418d1cb076 100644
--- a/web/i18n/en-US/tools.ts
+++ b/web/i18n/en-US/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'add',
     added: 'added',
     manageInTools: 'Manage in Tools',
-    emptyTitle: 'No workflow tool available',
-    emptyTip: 'Go to "Workflow -> Publish as Tool"',
-    emptyTitleCustom: 'No custom tool available',
-    emptyTipCustom: 'Create a custom tool',
+    custom: {
+      title: 'No custom tool available',
+      tip: 'Create a custom tool',
+    },
+    workflow: {
+      title: 'No workflow tool available',
+      tip: 'Publish workflows as tools in Studio',
+    },
+    mcp: {
+      title: 'No MCP tool available',
+      tip: 'Add an MCP server',
+    },
+    agent: {
+      title: 'No agent strategy available',
+    },
   },
   createTool: {
     title: 'Create Custom Tool',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'Tool call name for agent reasoning and prompting',
   copyToolName: 'Copy Name',
   noTools: 'No tools found',
+  mcp: {
+    create: {
+      cardTitle: 'Add MCP Server (HTTP)',
+      cardLink: 'Learn more about MCP server integration',
+    },
+    noConfigured: 'Unconfigured',
+    updateTime: 'Updated',
+    toolsCount: '{{count}} tools',
+    noTools: 'No tools available',
+    modal: {
+      title: 'Add MCP Server (HTTP)',
+      editTitle: 'Edit MCP Server (HTTP)',
+      name: 'Name & Icon',
+      namePlaceholder: 'Name your MCP server',
+      serverUrl: 'Server URL',
+      serverUrlPlaceholder: 'URL to server endpoint',
+      serverUrlWarning: 'Updating the server address may disrupt applications that depend on this server',
+      serverIdentifier: 'Server Identifier',
+      serverIdentifierTip: 'Unique identifier for the MCP server within the workspace. Lowercase letters, numbers, underscores, and hyphens only. Up to 24 characters.',
+      serverIdentifierPlaceholder: 'Unique identifier, e.g., my-mcp-server',
+      serverIdentifierWarning: 'The server won’t be recognized by existing apps after an ID change',
+      cancel: 'Cancel',
+      save: 'Save',
+      confirm: 'Add & Authorize',
+    },
+    delete: 'Remove MCP Server',
+    deleteConfirmTitle: 'Would you like to remove {{mcp}}?',
+    operation: {
+      edit: 'Edit',
+      remove: 'Remove',
+    },
+    authorize: 'Authorize',
+    authorizing: 'Authorizing...',
+    authorizingRequired: 'Authorization is required',
+    authorizeTip: 'After authorization, tools will be displayed here.',
+    update: 'Update',
+    updating: 'Updating',
+    gettingTools: 'Getting Tools...',
+    updateTools: 'Updating Tools...',
+    toolsEmpty: 'Tools not loaded',
+    getTools: 'Get tools',
+    toolUpdateConfirmTitle: 'Update Tool List',
+    toolUpdateConfirmContent: 'Updating the tool list may affect existing apps. Do you wish to proceed?',
+    toolsNum: '{{count}} tools included',
+    onlyTool: '1 tool included',
+    identifier: 'Server Identifier (Click to Copy)',
+    server: {
+      title: 'MCP Server',
+      url: 'Server URL',
+      reGen: 'Do you want to regenerator server URL?',
+      addDescription: 'Add description',
+      edit: 'Edit description',
+      modal: {
+        addTitle: 'Add description to enable MCP server',
+        editTitle: 'Edit description',
+        description: 'Description',
+        descriptionPlaceholder: 'Explain what this tool does and how it should be used by the LLM',
+        parameters: 'Parameters',
+        parametersTip: 'Add descriptions for each parameter to help the LLM understand their purpose and constraints.',
+        parametersPlaceholder: 'Parameter purpose and constraints',
+        confirm: 'Enable MCP Server',
+      },
+      publishTip: 'App not published. Please publish the app first.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts
index 88873fb27e..c56b497ac2 100644
--- a/web/i18n/en-US/workflow.ts
+++ b/web/i18n/en-US/workflow.ts
@@ -231,6 +231,8 @@ const translation = {
     'utilities': 'Utilities',
     'noResult': 'No match found',
     'agent': 'Agent Strategy',
+    'allAdded': 'All added',
+    'addAll': 'Add all',
   },
   blocks: {
     'start': 'Start',
@@ -368,6 +370,10 @@ const translation = {
         ms: 'ms',
         retries: '{{num}} Retries',
       },
+      typeSwitch: {
+        input: 'Input value',
+        variable: 'Use variable',
+      },
     },
     start: {
       required: 'required',
@@ -662,6 +668,9 @@ const translation = {
     tool: {
       authorize: 'Authorize',
       inputVars: 'Input Variables',
+      settings: 'Settings',
+      insertPlaceholder1: 'Type or press',
+      insertPlaceholder2: 'insert variable',
       outputVars: {
         text: 'tool generated content',
         files: {
@@ -889,6 +898,8 @@ const translation = {
         install: 'Install',
         cancel: 'Cancel',
       },
+      clickToViewParameterSchema: 'Click to view parameter schema',
+      parameterSchema: 'Parameter Schema',
     },
   },
   tracing: {
diff --git a/web/i18n/es-ES/plugin.ts b/web/i18n/es-ES/plugin.ts
index d8250c6b41..84e317add6 100644
--- a/web/i18n/es-ES/plugin.ts
+++ b/web/i18n/es-ES/plugin.ts
@@ -51,11 +51,11 @@ const translation = {
       unsupportedContent2: 'Haga clic para cambiar de versión.',
       descriptionPlaceholder: 'Breve descripción del propósito de la herramienta, por ejemplo, obtener la temperatura para una ubicación específica.',
       empty: 'Haga clic en el botón \'+\' para agregar herramientas. Puede agregar varias herramientas.',
-      paramsTip2: 'Cuando \'Automático\' está desactivado, se utiliza el valor predeterminado.',
+      paramsTip2: 'Cuando \'Auto\' está desactivado, se utiliza el valor predeterminado.',
       uninstalledTitle: 'Herramienta no instalada',
       descriptionLabel: 'Descripción de la herramienta',
       unsupportedContent: 'La versión del plugin instalado no proporciona esta acción.',
-      auto: 'Automático',
+      auto: 'Auto',
       title: 'Agregar herramienta',
       placeholder: 'Seleccione una herramienta...',
       uninstalledContent: 'Este plugin se instala desde el repositorio local/GitHub. Úselo después de la instalación.',
diff --git a/web/i18n/es-ES/tools.ts b/web/i18n/es-ES/tools.ts
index fd37eef5b1..b503f9c41b 100644
--- a/web/i18n/es-ES/tools.ts
+++ b/web/i18n/es-ES/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'agregar',
     added: 'agregada',
     manageInTools: 'Administrar en Herramientas',
-    emptyTitle: 'No hay herramientas de flujo de trabajo disponibles',
-    emptyTip: 'Ir a "Flujo de Trabajo -> Publicar como Herramienta"',
-    emptyTitleCustom: 'No hay herramienta personalizada disponible',
-    emptyTipCustom: 'Crear una herramienta personalizada',
+    custom: {
+      title: 'No hay herramienta personalizada disponible',
+      tip: 'Crear una herramienta personalizada',
+    },
+    workflow: {
+      title: 'No hay herramienta de flujo de trabajo disponible',
+      tip: 'Publicar flujos de trabajo como herramientas en el Estudio',
+    },
+    mcp: {
+      title: 'No hay herramienta MCP disponible',
+      tip: 'Añadir un servidor MCP',
+    },
+    agent: {
+      title: 'No hay estrategia de agente disponible',
+    },
   },
   createTool: {
     title: 'Crear Herramienta Personalizada',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'Nombre de llamada de la herramienta para razonamiento y promoción de agentes',
   copyToolName: 'Nombre de la copia',
   noTools: 'No se han encontrado herramientas',
+  mcp: {
+    create: {
+      cardTitle: 'Añadir servidor MCP (HTTP)',
+      cardLink: 'Más información sobre integración de servidores MCP',
+    },
+    noConfigured: 'Servidor no configurado',
+    updateTime: 'Actualizado',
+    toolsCount: '{{count}} herramientas',
+    noTools: 'No hay herramientas disponibles',
+    modal: {
+      title: 'Añadir servidor MCP (HTTP)',
+      editTitle: 'Editar servidor MCP (HTTP)',
+      name: 'Nombre e Icono',
+      namePlaceholder: 'Nombre de su servidor MCP',
+      serverUrl: 'URL del servidor',
+      serverUrlPlaceholder: 'URL del endpoint del servidor',
+      serverUrlWarning: 'Actualizar la dirección del servidor puede interrumpir aplicaciones que dependan de él',
+      serverIdentifier: 'Identificador del servidor',
+      serverIdentifierTip: 'Identificador único del servidor MCP en el espacio de trabajo. Solo letras minúsculas, números, guiones bajos y guiones. Máximo 24 caracteres.',
+      serverIdentifierPlaceholder: 'Identificador único, ej. mi-servidor-mcp',
+      serverIdentifierWarning: 'El servidor no será reconocido por aplicaciones existentes tras cambiar la ID',
+      cancel: 'Cancelar',
+      save: 'Guardar',
+      confirm: 'Añadir y Autorizar',
+    },
+    delete: 'Eliminar servidor MCP',
+    deleteConfirmTitle: '¿Eliminar {{mcp}}?',
+    operation: {
+      edit: 'Editar',
+      remove: 'Eliminar',
+    },
+    authorize: 'Autorizar',
+    authorizing: 'Autorizando...',
+    authorizingRequired: 'Se requiere autorización',
+    authorizeTip: 'Tras la autorización, las herramientas se mostrarán aquí.',
+    update: 'Actualizar',
+    updating: 'Actualizando',
+    gettingTools: 'Obteniendo herramientas...',
+    updateTools: 'Actualizando herramientas...',
+    toolsEmpty: 'Herramientas no cargadas',
+    getTools: 'Obtener herramientas',
+    toolUpdateConfirmTitle: 'Actualizar lista de herramientas',
+    toolUpdateConfirmContent: 'Actualizar la lista puede afectar a aplicaciones existentes. ¿Continuar?',
+    toolsNum: '{{count}} herramientas incluidas',
+    onlyTool: '1 herramienta incluida',
+    identifier: 'Identificador del servidor (Haz clic para copiar)',
+    server: {
+      title: 'Servidor MCP',
+      url: 'URL del servidor',
+      reGen: '¿Regenerar URL del servidor?',
+      addDescription: 'Añadir descripción',
+      edit: 'Editar descripción',
+      modal: {
+        addTitle: 'Añade descripción para habilitar el servidor MCP',
+        editTitle: 'Editar descripción',
+        description: 'Descripción',
+        descriptionPlaceholder: 'Explica qué hace esta herramienta y cómo debe usarla el LLM',
+        parameters: 'Parámetros',
+        parametersTip: 'Añade descripciones de cada parámetro para ayudar al LLM a entender su propósito y restricciones.',
+        parametersPlaceholder: 'Propósito y restricciones del parámetro',
+        confirm: 'Habilitar servidor MCP',
+      },
+      publishTip: 'App no publicada. Publícala primero.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/fa-IR/tools.ts b/web/i18n/fa-IR/tools.ts
index fddfd2d826..942bde7932 100644
--- a/web/i18n/fa-IR/tools.ts
+++ b/web/i18n/fa-IR/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'افزودن',
     added: 'افزوده شد',
     manageInTools: 'مدیریت در ابزارها',
-    emptyTitle: 'هیچ ابزار جریان کاری در دسترس نیست',
-    emptyTip: 'به "جریان کاری -> انتشار به عنوان ابزار" بروید',
-    emptyTipCustom: 'ایجاد یک ابزار سفارشی',
-    emptyTitleCustom: 'هیچ ابزار سفارشی در دسترس نیست',
+    custom: {
+      title: 'هیچ ابزار سفارشی موجود نیست',
+      tip: 'یک ابزار سفارشی ایجاد کنید',
+    },
+    workflow: {
+      title: 'هیچ ابزار جریان کاری موجود نیست',
+      tip: 'جریان‌های کاری را به عنوان ابزار در استودیو منتشر کنید',
+    },
+    mcp: {
+      title: 'هیچ ابزار MCP موجود نیست',
+      tip: 'یک سرور MCP اضافه کنید',
+    },
+    agent: {
+      title: 'هیچ استراتژی عاملی موجود نیست',
+    },
   },
   createTool: {
     title: 'ایجاد ابزار سفارشی',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'نام فراخوانی ابزار برای استدلال و پرامپت‌های عامل',
   copyToolName: 'کپی نام',
   noTools: 'هیچ ابزاری یافت نشد',
+  mcp: {
+    create: {
+      cardTitle: 'افزودن سرور MCP (HTTP)',
+      cardLink: 'اطلاعات بیشتر درباره یکپارچه‌سازی سرور MCP',
+    },
+    noConfigured: 'سرور پیکربندی نشده',
+    updateTime: 'آخرین بروزرسانی',
+    toolsCount: '{count} ابزار',
+    noTools: 'ابزاری موجود نیست',
+    modal: {
+      title: 'افزودن سرور MCP (HTTP)',
+      editTitle: 'ویرایش سرور MCP (HTTP)',
+      name: 'نام و آیکون',
+      namePlaceholder: 'برای سرور MCP خود نام انتخاب کنید',
+      serverUrl: 'آدرس سرور',
+      serverUrlPlaceholder: 'URL نقطه پایانی سرور',
+      serverUrlWarning: 'به‌روزرسانی آدرس سرور ممکن است برنامه‌های وابسته به آن را مختل کند',
+      serverIdentifier: 'شناسه سرور',
+      serverIdentifierTip: 'شناسه منحصر به فرد برای سرور MCP در فضای کاری. فقط حروف کوچک، اعداد، زیرخط و خط تیره. حداکثر 24 کاراکتر.',
+      serverIdentifierPlaceholder: 'شناسه منحصر به فرد، مثال: my-mcp-server',
+      serverIdentifierWarning: 'پس از تغییر شناسه، سرور توسط برنامه‌های موجود شناسایی نخواهد شد',
+      cancel: 'لغو',
+      save: 'ذخیره',
+      confirm: 'افزودن و مجوزدهی',
+    },
+    delete: 'حذف سرور MCP',
+    deleteConfirmTitle: 'آیا مایل به حذف {mcp} هستید؟',
+    operation: {
+      edit: 'ویرایش',
+      remove: 'حذف',
+    },
+    authorize: 'مجوزدهی',
+    authorizing: 'در حال مجوزدهی...',
+    authorizingRequired: 'مجوز مورد نیاز است',
+    authorizeTip: 'پس از مجوزدهی، ابزارها در اینجا نمایش داده می‌شوند.',
+    update: 'به‌روزرسانی',
+    updating: 'در حال به‌روزرسانی...',
+    gettingTools: 'دریافت ابزارها...',
+    updateTools: 'به‌روزرسانی ابزارها...',
+    toolsEmpty: 'ابزارها بارگیری نشدند',
+    getTools: 'دریافت ابزارها',
+    toolUpdateConfirmTitle: 'به‌روزرسانی فهرست ابزارها',
+    toolUpdateConfirmContent: 'به‌روزرسانی فهرست ابزارها ممکن است بر برنامه‌های موجود تأثیر بگذارد. آیا ادامه می‌دهید؟',
+    toolsNum: '{count} ابزار موجود است',
+    onlyTool: '1 ابزار موجود است',
+    identifier: 'شناسه سرور (کلیک برای کپی)',
+    server: {
+      title: 'سرور MCP',
+      url: 'آدرس سرور',
+      reGen: 'تولید مجدد آدرس سرور؟',
+      addDescription: 'افزودن توضیحات',
+      edit: 'ویرایش توضیحات',
+      modal: {
+        addTitle: 'برای فعال‌سازی سرور MCP توضیحات اضافه کنید',
+        editTitle: 'ویرایش توضیحات',
+        description: 'توضیحات',
+        descriptionPlaceholder: 'عملکرد این ابزار و نحوه استفاده LLM از آن را توضیح دهید',
+        parameters: 'پارامترها',
+        parametersTip: 'برای کمک به LLM در درک هدف و محدودیت‌ها، برای هر پارامتر توضیحات اضافه کنید.',
+        parametersPlaceholder: 'هدف و محدودیت‌های پارامتر',
+        confirm: 'فعال‌سازی سرور MCP',
+      },
+      publishTip: 'برنامه منتشر نشده است. لطفاً ابتدا برنامه را منتشر کنید.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/fr-FR/plugin.ts b/web/i18n/fr-FR/plugin.ts
index 35d36b425a..60366e28cf 100644
--- a/web/i18n/fr-FR/plugin.ts
+++ b/web/i18n/fr-FR/plugin.ts
@@ -53,14 +53,14 @@ const translation = {
       placeholder: 'Sélectionnez un outil...',
       params: 'CONFIGURATION DE RAISONNEMENT',
       unsupportedContent: 'La version du plugin installée ne fournit pas cette action.',
-      auto: 'Automatique',
+      auto: 'Auto',
       descriptionPlaceholder: 'Brève description de l’objectif de l’outil, par exemple, obtenir la température d’un endroit spécifique.',
       unsupportedContent2: 'Cliquez pour changer de version.',
       uninstalledTitle: 'Outil non installé',
       empty: 'Cliquez sur le bouton « + » pour ajouter des outils. Vous pouvez ajouter plusieurs outils.',
       toolLabel: 'Outil',
       settings: 'PARAMÈTRES UTILISATEUR',
-      paramsTip2: 'Lorsque « Automatique » est désactivé, la valeur par défaut est utilisée.',
+      paramsTip2: 'Lorsque « Auto » est désactivé, la valeur par défaut est utilisée.',
       paramsTip1: 'Contrôle les paramètres d’inférence LLM.',
       toolSetting: 'Paramètres de l\'outil',
     },
diff --git a/web/i18n/fr-FR/tools.ts b/web/i18n/fr-FR/tools.ts
index 8f2362daf1..fdbe213df8 100644
--- a/web/i18n/fr-FR/tools.ts
+++ b/web/i18n/fr-FR/tools.ts
@@ -138,20 +138,96 @@ const translation = {
   howToGet: 'Comment obtenir',
   addToolModal: {
     type: 'type',
-    emptyTitle: 'Aucun outil de flux de travail disponible',
     added: 'supplémentaire',
     add: 'ajouter',
     category: 'catégorie',
     manageInTools: 'Gérer dans Outils',
-    emptyTip: 'Allez dans « Flux de travail -> Publier en tant qu’outil »',
-    emptyTitleCustom: 'Aucun outil personnalisé disponible',
-    emptyTipCustom: 'Créer un outil personnalisé',
+    custom: {
+      title: 'Aucun outil personnalisé disponible',
+      tip: 'Créer un outil personnalisé',
+    },
+    workflow: {
+      title: 'Aucun outil de workflow disponible',
+      tip: 'Publier des workflows en tant qu\'outils dans le Studio',
+    },
+    mcp: {
+      title: 'Aucun outil MCP disponible',
+      tip: 'Ajouter un serveur MCP',
+    },
+    agent: {
+      title: 'Aucune stratégie d\'agent disponible',
+    },
   },
   openInStudio: 'Ouvrir dans Studio',
   customToolTip: 'En savoir plus sur les outils personnalisés Dify',
   toolNameUsageTip: 'Nom de l’appel de l’outil pour le raisonnement et l’invite de l’agent',
   copyToolName: 'Copier le nom',
   noTools: 'Aucun outil trouvé',
+  mcp: {
+    create: {
+      cardTitle: 'Ajouter un Serveur MCP (HTTP)',
+      cardLink: 'En savoir plus sur l\'intégration du serveur MCP',
+    },
+    noConfigured: 'Serveur Non Configuré',
+    updateTime: 'Mis à jour',
+    toolsCount: '{count} outils',
+    noTools: 'Aucun outil disponible',
+    modal: {
+      title: 'Ajouter un Serveur MCP (HTTP)',
+      editTitle: 'Modifier le Serveur MCP (HTTP)',
+      name: 'Nom & Icône',
+      namePlaceholder: 'Nommez votre serveur MCP',
+      serverUrl: 'URL du Serveur',
+      serverUrlPlaceholder: 'URL de l\'endpoint du serveur',
+      serverUrlWarning: 'Mettre à jour l\'adresse du serveur peut perturber les applications qui dépendent de ce serveur',
+      serverIdentifier: 'Identifiant du Serveur',
+      serverIdentifierTip: 'Identifiant unique pour le serveur MCP au sein de l\'espace de travail. Seulement des lettres minuscules, des chiffres, des traits de soulignement et des tirets. Jusqu\'à 24 caractères.',
+      serverIdentifierPlaceholder: 'Identifiant unique, par ex. mon-serveur-mcp',
+      serverIdentifierWarning: 'Le serveur ne sera pas reconnu par les applications existantes après un changement d\'ID',
+      cancel: 'Annuler',
+      save: 'Enregistrer',
+      confirm: 'Ajouter & Authoriser',
+    },
+    delete: 'Supprimer le Serveur MCP',
+    deleteConfirmTitle: 'Souhaitez-vous supprimer {mcp}?',
+    operation: {
+      edit: 'Modifier',
+      remove: 'Supprimer',
+    },
+    authorize: 'Autoriser',
+    authorizing: 'Autorisation en cours...',
+    authorizingRequired: 'L\'autorisation est requise',
+    authorizeTip: 'Après autorisation, les outils seront affichés ici.',
+    update: 'Mettre à jour',
+    updating: 'Mise à jour en cours',
+    gettingTools: 'Obtention des Outils...',
+    updateTools: 'Mise à jour des Outils...',
+    toolsEmpty: 'Outils non chargés',
+    getTools: 'Obtenir des outils',
+    toolUpdateConfirmTitle: 'Mettre à jour la Liste des Outils',
+    toolUpdateConfirmContent: 'La mise à jour de la liste des outils peut affecter les applications existantes. Souhaitez-vous continuer?',
+    toolsNum: '{count} outils inclus',
+    onlyTool: '1 outil inclus',
+    identifier: 'Identifiant du Serveur (Cliquez pour Copier)',
+    server: {
+      title: 'Serveur MCP',
+      url: 'URL du Serveur',
+      reGen: 'Voulez-vous régénérer l\'URL du serveur?',
+      addDescription: 'Ajouter une description',
+      edit: 'Modifier la description',
+      modal: {
+        addTitle: 'Ajouter une description pour activer le serveur MCP',
+        editTitle: 'Modifier la description',
+        description: 'Description',
+        descriptionPlaceholder: 'Expliquez ce que fait cet outil et comment il doit être utilisé par le LLM',
+        parameters: 'Paramètres',
+        parametersTip: 'Ajoutez des descriptions pour chaque paramètre afin d\'aider le LLM à comprendre leur objectif et leurs contraintes.',
+        parametersPlaceholder: 'Objectif et contraintes du paramètre',
+        confirm: 'Activer le Serveur MCP',
+      },
+      publishTip: 'Application non publiée. Merci de publier l\'application en premier.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/hi-IN/tools.ts b/web/i18n/hi-IN/tools.ts
index 105e7e5fa6..8f721da44e 100644
--- a/web/i18n/hi-IN/tools.ts
+++ b/web/i18n/hi-IN/tools.ts
@@ -29,10 +29,21 @@ const translation = {
     add: 'जोड़ें',
     added: 'जोड़ा गया',
     manageInTools: 'उपकरणों में प्रबंधित करें',
-    emptyTitle: 'कोई कार्यप्रवाह उपकरण उपलब्ध नहीं',
-    emptyTip: 'कार्यप्रवाह -> उपकरण के रूप में प्रकाशित पर जाएं',
-    emptyTipCustom: 'एक कस्टम टूल बनाएं',
-    emptyTitleCustom: 'कोई कस्टम टूल उपलब्ध नहीं है',
+    custom: {
+      title: 'कोई कस्टम टूल उपलब्ध नहीं है',
+      tip: 'एक कस्टम टूल बनाएं',
+    },
+    workflow: {
+      title: 'कोई वर्कफ़्लो टूल उपलब्ध नहीं है',
+      tip: 'स्टूडियो में टूल के रूप में वर्कफ़्लो प्रकाशित करें',
+    },
+    mcp: {
+      title: 'कोई MCP टूल उपलब्ध नहीं है',
+      tip: 'एक MCP सर्वर जोड़ें',
+    },
+    agent: {
+      title: 'कोई एजेंट रणनीति उपलब्ध नहीं है',
+    },
   },
   createTool: {
     title: 'कस्टम उपकरण बनाएं',
@@ -157,6 +168,71 @@ const translation = {
   toolNameUsageTip: 'एजेंट तर्क और प्रेरण के लिए उपकरण कॉल नाम',
   noTools: 'कोई उपकरण नहीं मिला',
   copyToolName: 'नाम कॉपी करें',
+  mcp: {
+    create: {
+      cardTitle: 'MCP सर्वर जोड़ें (HTTP)',
+      cardLink: 'MCP सर्वर एकीकरण के बारे में अधिक जानें',
+    },
+    noConfigured: 'कॉन्फ़िगर न किया गया सर्वर',
+    updateTime: 'अपडेट किया गया',
+    toolsCount: '{count} टूल्स',
+    noTools: 'कोई टूल उपलब्ध नहीं',
+    modal: {
+      title: 'MCP सर्वर जोड़ें (HTTP)',
+      editTitle: 'MCP सर्वर संपादित करें (HTTP)',
+      name: 'नाम और आइकन',
+      namePlaceholder: 'अपने MCP सर्वर को नाम दें',
+      serverUrl: 'सर्वर URL',
+      serverUrlPlaceholder: 'सर्वर एंडपॉइंट का URL',
+      serverUrlWarning: 'सर्वर पता अपडेट करने से इस सर्वर पर निर्भर एप्लिकेशन बाधित हो सकते हैं',
+      serverIdentifier: 'सर्वर आईडेंटिफ़ायर',
+      serverIdentifierTip: 'वर्कस्पेस में MCP सर्वर के लिए अद्वितीय आईडेंटिफ़ायर। केवल लोअरकेस अक्षर, संख्याएँ, अंडरस्कोर और हाइफ़न। अधिकतम 24 वर्ण।',
+      serverIdentifierPlaceholder: 'अद्वितीय आईडेंटिफ़ायर, उदा. my-mcp-server',
+      serverIdentifierWarning: 'आईडी बदलने के बाद सर्वर को मौजूदा ऐप्स द्वारा पहचाना नहीं जाएगा',
+      cancel: 'रद्द करें',
+      save: 'सहेजें',
+      confirm: 'जोड़ें और अधिकृत करें',
+    },
+    delete: 'MCP सर्वर हटाएँ',
+    deleteConfirmTitle: '{mcp} हटाना चाहते हैं?',
+    operation: {
+      edit: 'संपादित करें',
+      remove: 'हटाएँ',
+    },
+    authorize: 'अधिकृत करें',
+    authorizing: 'अधिकृत किया जा रहा है...',
+    authorizingRequired: 'प्राधिकरण आवश्यक है',
+    authorizeTip: 'अधिकृत होने के बाद, टूल यहाँ प्रदर्शित होंगे।',
+    update: 'अपडेट करें',
+    updating: 'अपडेट हो रहा है...',
+    gettingTools: 'टूल्स प्राप्त किए जा रहे हैं...',
+    updateTools: 'टूल्स अपडेट किए जा रहे हैं...',
+    toolsEmpty: 'टूल्स लोड नहीं हुए',
+    getTools: 'टूल्स प्राप्त करें',
+    toolUpdateConfirmTitle: 'टूल सूची अपडेट करें',
+    toolUpdateConfirmContent: 'टूल सूची अपडेट करने से मौजूदा ऐप्स प्रभावित हो सकते हैं। आगे बढ़ना चाहते हैं?',
+    toolsNum: '{count} टूल्स शामिल',
+    onlyTool: '1 टूल शामिल',
+    identifier: 'सर्वर आईडेंटिफ़ायर (कॉपी करने के लिए क्लिक करें)',
+    server: {
+      title: 'MCP सर्वर',
+      url: 'सर्वर URL',
+      reGen: 'सर्वर URL पुनः उत्पन्न करना चाहते हैं?',
+      addDescription: 'विवरण जोड़ें',
+      edit: 'विवरण संपादित करें',
+      modal: {
+        addTitle: 'MCP सर्वर सक्षम करने के लिए विवरण जोड़ें',
+        editTitle: 'विवरण संपादित करें',
+        description: 'विवरण',
+        descriptionPlaceholder: 'समझाएं कि यह टूल क्या करता है और LLM द्वारा इसका उपयोग कैसे किया जाना चाहिए',
+        parameters: 'पैरामीटर्स',
+        parametersTip: 'प्रत्येक पैरामीटर के लिए विवरण जोड़ें ताकि LLM को उनके उद्देश्य और बाधाओं को समझने में मदद मिले।',
+        parametersPlaceholder: 'पैरामीटर उद्देश्य और बाधाएँ',
+        confirm: 'MCP सर्वर सक्षम करें',
+      },
+      publishTip: 'ऐप प्रकाशित नहीं हुआ। कृपया पहले ऐप प्रकाशित करें।',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/it-IT/tools.ts b/web/i18n/it-IT/tools.ts
index 3c89d3a749..8aa119b45a 100644
--- a/web/i18n/it-IT/tools.ts
+++ b/web/i18n/it-IT/tools.ts
@@ -29,10 +29,21 @@ const translation = {
     add: 'aggiungi',
     added: 'aggiunto',
     manageInTools: 'Gestisci in Strumenti',
-    emptyTitle: 'Nessun strumento di flusso di lavoro disponibile',
-    emptyTip: 'Vai a `Flusso di lavoro -> Pubblica come Strumento`',
-    emptyTitleCustom: 'Nessun attrezzo personalizzato disponibile',
-    emptyTipCustom: 'Creare uno strumento personalizzato',
+    custom: {
+      title: 'Nessuno strumento personalizzato disponibile',
+      tip: 'Crea uno strumento personalizzato',
+    },
+    workflow: {
+      title: 'Nessuno strumento workflow disponibile',
+      tip: 'Pubblica i workflow come strumenti nello Studio',
+    },
+    mcp: {
+      title: 'Nessuno strumento MCP disponibile',
+      tip: 'Aggiungi un server MCP',
+    },
+    agent: {
+      title: 'Nessuna strategia agente disponibile',
+    },
   },
   createTool: {
     title: 'Crea Strumento Personalizzato',
@@ -162,6 +173,71 @@ const translation = {
     'Nome chiamata strumento per il ragionamento e il prompting dell\'agente',
   noTools: 'Nessun utensile trovato',
   copyToolName: 'Copia nome',
+  mcp: {
+    create: {
+      cardTitle: 'Aggiungi Server MCP (HTTP)',
+      cardLink: 'Scopri di più sull\'integrazione del server MCP',
+    },
+    noConfigured: 'Server Non Configurato',
+    updateTime: 'Aggiornato',
+    toolsCount: '{count} strumenti',
+    noTools: 'Nessuno strumento disponibile',
+    modal: {
+      title: 'Aggiungi Server MCP (HTTP)',
+      editTitle: 'Modifica Server MCP (HTTP)',
+      name: 'Nome & Icona',
+      namePlaceholder: 'Dai un nome al tuo server MCP',
+      serverUrl: 'URL del Server',
+      serverUrlPlaceholder: 'URL dell\'endpoint del server',
+      serverUrlWarning: 'L\'aggiornamento dell\'indirizzo del server può interrompere le applicazioni che dipendono da questo server',
+      serverIdentifier: 'Identificatore del Server',
+      serverIdentifierTip: 'Identificatore unico per il server MCP all\'interno dello spazio di lavoro. Solo lettere minuscole, numeri, underscore e trattini. Fino a 24 caratteri.',
+      serverIdentifierPlaceholder: 'Identificatore unico, es. mio-server-mcp',
+      serverIdentifierWarning: 'Il server non sarà riconosciuto dalle app esistenti dopo una modifica dell\'ID',
+      cancel: 'Annulla',
+      save: 'Salva',
+      confirm: 'Aggiungi & Autorizza',
+    },
+    delete: 'Rimuovi Server MCP',
+    deleteConfirmTitle: 'Vuoi rimuovere {mcp}?',
+    operation: {
+      edit: 'Modifica',
+      remove: 'Rimuovi',
+    },
+    authorize: 'Autorizza',
+    authorizing: 'Autorizzando...',
+    authorizingRequired: 'Autorizzazione richiesta',
+    authorizeTip: 'Dopo l\'autorizzazione, gli strumenti verranno visualizzati qui.',
+    update: 'Aggiorna',
+    updating: 'Aggiornamento in corso',
+    gettingTools: 'Ottimizzando Strumenti...',
+    updateTools: 'Aggiornando Strumenti...',
+    toolsEmpty: 'Strumenti non caricati',
+    getTools: 'Ottieni strumenti',
+    toolUpdateConfirmTitle: 'Aggiorna Lista Strumenti',
+    toolUpdateConfirmContent: 'L\'aggiornamento della lista degli strumenti può influire sulle app esistenti. Vuoi procedere?',
+    toolsNum: '{count} strumenti inclusi',
+    onlyTool: '1 strumento incluso',
+    identifier: 'Identificatore del Server (Fai clic per Copiare)',
+    server: {
+      title: 'Server MCP',
+      url: 'URL del Server',
+      reGen: 'Vuoi rigenerare l\'URL del server?',
+      addDescription: 'Aggiungi descrizione',
+      edit: 'Modifica descrizione',
+      modal: {
+        addTitle: 'Aggiungi descrizione per abilitare il server MCP',
+        editTitle: 'Modifica descrizione',
+        description: 'Descrizione',
+        descriptionPlaceholder: 'Spiega cosa fa questo strumento e come dovrebbe essere utilizzato dal LLM',
+        parameters: 'Parametri',
+        parametersTip: 'Aggiungi descrizioni per ogni parametro per aiutare il LLM a comprendere il loro scopo e le loro restrizioni.',
+        parametersPlaceholder: 'Scopo e restrizioni del parametro',
+        confirm: 'Abilitare Server MCP',
+      },
+      publishTip: 'App non pubblicata. Pubblica l\'app prima.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/ja-JP/tools.ts b/web/i18n/ja-JP/tools.ts
index cf9dad95b3..d69cd4a6f5 100644
--- a/web/i18n/ja-JP/tools.ts
+++ b/web/i18n/ja-JP/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: '追加',
     added: '追加済',
     manageInTools: 'ツールリストに移動して管理する',
-    emptyTitle: '利用可能なワークフローツールはありません',
-    emptyTip: '追加するには、「ワークフロー -> ツールとして公開」に移動する',
-    emptyTitleCustom: 'カスタムツールはありません',
-    emptyTipCustom: 'カスタムツールの作成',
+    custom: {
+      title: 'カスタムツールはありません',
+      tip: 'カスタムツールを作成する',
+    },
+    workflow: {
+      title: '利用可能なワークフローツールはありません',
+      tip: 'スタジオでワークフローをツールに公開する',
+    },
+    mcp: {
+      title: '利用可能なMCPツールはありません',
+      tip: 'MCPサーバーを追加する',
+    },
+    agent: {
+      title: 'Agent strategy は利用できません',
+    },
   },
   createTool: {
     title: 'カスタムツールを作成する',
@@ -152,6 +163,72 @@ const translation = {
   toolNameUsageTip: 'ツール呼び出し名、エージェントの推論とプロンプトの単語に使用されます',
   copyToolName: '名前をコピー',
   noTools: 'ツールが見つかりませんでした',
+  mcp: {
+    create: {
+      cardTitle: 'MCPサーバー（HTTP）を追加',
+      cardLink: 'MCPサーバー統合について詳しく知る',
+    },
+    noConfigured: '未設定',
+    updateTime: '更新日時',
+    toolsCount: '{{count}} 個のツール',
+    noTools: '利用可能なツールはありません',
+    modal: {
+      title: 'MCPサーバー（HTTP）を追加',
+      editTitle: 'MCPサーバー（HTTP）を編集',
+      name: '名前とアイコン',
+      namePlaceholder: 'MCPサーバーの名前を入力',
+      serverUrl: 'サーバーURL',
+      serverUrlPlaceholder: 'サーバーエンドポイントのURLを入力',
+      serverUrlWarning: 'サーバーアドレスを更新すると、このサーバーに依存するアプリケーションに影響を与える可能性があります。',
+      serverIdentifier: 'サーバー識別子',
+      serverIdentifierTip: 'ワークスペース内でのMCPサーバーのユニーク識別子です。使用可能な文字は小文字、数字、アンダースコア、ハイフンで、最大24文字です。',
+      serverIdentifierPlaceholder: 'ユニーク識別子（例：my-mcp-server）',
+      serverIdentifierWarning: 'IDを変更すると、既存のアプリケーションではサーバーが認識できなくなります。',
+      cancel: 'キャンセル',
+      save: '保存',
+      confirm: '追加して承認',
+    },
+    delete: 'MCPサーバーを削除',
+    deleteConfirmTitle: '{{mcp}} を削除しますか？',
+    operation: {
+      edit: '編集',
+      remove: '削除',
+    },
+    authorize: '承認',
+    authorizing: '承認中...',
+    authorizingRequired: '承認が必要です。',
+    authorizeTip: '承認後、このページにツールが表示されるようになります。',
+    update: '更新',
+    updating: '更新中...',
+    gettingTools: 'ツール取得中...',
+    updateTools: 'ツール更新中...',
+    toolsEmpty: 'ツールが読み込まれていません',
+    getTools: 'ツールを取得',
+    toolUpdateConfirmTitle: 'ツールリストの更新',
+    toolUpdateConfirmContent: 'ツールリストを更新すると、既存のアプリケーションに重大な影響を与える可能性があります。続行しますか？',
+    toolsNum: '{{count}} 個のツールが含まれています',
+    onlyTool: '1つのツールが含まれています',
+    identifier: 'サーバー識別子（クリックしてコピー）',
+    server: {
+      title: 'MCPサーバー',
+      url: 'サーバーURL',
+      reGen: 'サーバーURLを再生成しますか？',
+      addDescription: '説明を追加',
+      edit: '説明を編集',
+      modal: {
+        addTitle: 'MCPサーバーを有効化するための説明を追加',
+        editTitle: '説明を編集',
+        description: '説明',
+        descriptionPlaceholder: 'このツールの機能とLLM（大規模言語モデル）での使用方法を説明してください。',
+        parameters: 'パラメータ',
+        parametersTip: '各パラメータの説明を追加して、LLMがその目的と制約を理解できるようにします。',
+        parametersPlaceholder: 'パラメータの目的と制約',
+        confirm: 'MCPサーバーを有効にする',
+      },
+      publishTip: 'アプリが公開されていません。まずアプリを公開してください。',
+    },
+  },
+
 }
 
 export default translation
diff --git a/web/i18n/ko-KR/tools.ts b/web/i18n/ko-KR/tools.ts
index 45c63b5f80..f660790265 100644
--- a/web/i18n/ko-KR/tools.ts
+++ b/web/i18n/ko-KR/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: '추가',
     added: '추가됨',
     manageInTools: '도구에서 관리',
-    emptyTitle: '사용 가능한 워크플로우 도구 없음',
-    emptyTip: '"워크플로우 -> 도구로 등록하기"로 이동',
-    emptyTipCustom: '사용자 지정 도구 만들기',
-    emptyTitleCustom: '사용 가능한 사용자 지정 도구가 없습니다.',
+    custom: {
+      title: '사용자 정의 도구 없음',
+      tip: '사용자 정의 도구 생성',
+    },
+    workflow: {
+      title: '워크플로우 도구 없음',
+      tip: '스튜디오에서 워크플로우를 도구로 게시',
+    },
+    mcp: {
+      title: 'MCP 도구 없음',
+      tip: 'MCP 서버 추가',
+    },
+    agent: {
+      title: '에이전트 전략 없음',
+    },
   },
   createTool: {
     title: '커스텀 도구 만들기',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'Agent 추리와 프롬프트를 위한 도구 호출 이름',
   noTools: '도구를 찾을 수 없습니다.',
   copyToolName: '이름 복사',
+  mcp: {
+    create: {
+      cardTitle: 'MCP 서버 추가 (HTTP)',
+      cardLink: 'MCP 서버 통합에 대해 자세히 알아보기',
+    },
+    noConfigured: '구성되지 않은 서버',
+    updateTime: '업데이트됨',
+    toolsCount: '{count} 도구',
+    noTools: '사용 가능한 도구 없음',
+    modal: {
+      title: 'MCP 서버 추가 (HTTP)',
+      editTitle: 'MCP 서버 수정 (HTTP)',
+      name: '이름 및 아이콘',
+      namePlaceholder: 'MCP 서버 이름 지정',
+      serverUrl: '서버 URL',
+      serverUrlPlaceholder: '서버 엔드포인트 URL',
+      serverUrlWarning: '서버 주소를 업데이트하면 이 서버에 의존하는 응용 프로그램에 지장이 발생할 수 있습니다',
+      serverIdentifier: '서버 식별자',
+      serverIdentifierTip: '작업 공간 내에서 MCP 서버의 고유 식별자. 소문자, 숫자, 밑줄 및 하이픈만 사용 가능. 최대 24자.',
+      serverIdentifierPlaceholder: '고유 식별자, 예: my-mcp-server',
+      serverIdentifierWarning: 'ID 변경 후 기존 앱에서 서버를 인식하지 못합니다',
+      cancel: '취소',
+      save: '저장',
+      confirm: '추가 및 승인',
+    },
+    delete: 'MCP 서버 제거',
+    deleteConfirmTitle: '{mcp}를 제거하시겠습니까?',
+    operation: {
+      edit: '편집',
+      remove: '제거',
+    },
+    authorize: '권한 부여',
+    authorizing: '권한 부여 중...',
+    authorizingRequired: '권한이 필요합니다',
+    authorizeTip: '권한 부여 후 도구가 여기에 표시됩니다.',
+    update: '업데이트',
+    updating: '업데이트 중',
+    gettingTools: '도구 가져오는 중...',
+    updateTools: '도구 업데이트 중...',
+    toolsEmpty: '도구가 로드되지 않음',
+    getTools: '도구 가져오기',
+    toolUpdateConfirmTitle: '도구 목록 업데이트',
+    toolUpdateConfirmContent: '도구 목록을 업데이트하면 기존 앱에 영향을 줄 수 있습니다. 계속하시겠습니까?',
+    toolsNum: '{count} 도구가 포함됨',
+    onlyTool: '1개 도구 포함',
+    identifier: '서버 식별자 (클릭하여 복사)',
+    server: {
+      title: 'MCP 서버',
+      url: '서버 URL',
+      reGen: '서버 URL을 다시 생성하시겠습니까?',
+      addDescription: '설명 추가',
+      edit: '설명 수정',
+      modal: {
+        addTitle: 'MCP 서버를 활성화하기 위한 설명 추가',
+        editTitle: '설명 수정',
+        description: '설명',
+        descriptionPlaceholder: '이 도구가 수행하는 작업과 LLM이 사용하는 방법을 설명하세요.',
+        parameters: '매개변수',
+        parametersTip: '각 매개변수의 설명을 추가하여 LLM이 목적과 제한 사항을 이해할 수 있도록 도와주세요.',
+        parametersPlaceholder: '매개변수의 목적 및 제한 사항',
+        confirm: 'MCP 서버 활성화',
+      },
+      publishTip: '앱이 게시되지 않았습니다. 먼저 앱을 게시하십시오.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/pl-PL/plugin.ts b/web/i18n/pl-PL/plugin.ts
index 948bf6e8fb..d5c05d0df8 100644
--- a/web/i18n/pl-PL/plugin.ts
+++ b/web/i18n/pl-PL/plugin.ts
@@ -51,7 +51,7 @@ const translation = {
       paramsTip1: 'Steruje parametrami wnioskowania LLM.',
       unsupportedContent: 'Zainstalowana wersja wtyczki nie zapewnia tej akcji.',
       params: 'KONFIGURACJA ROZUMOWANIA',
-      auto: 'Automatyczne',
+      auto: 'Auto',
       empty: 'Kliknij przycisk "+", aby dodać narzędzia. Możesz dodać wiele narzędzi.',
       descriptionLabel: 'Opis narzędzia',
       title: 'Dodaj narzędzie',
@@ -60,7 +60,7 @@ const translation = {
       uninstalledContent: 'Ta wtyczka jest instalowana z repozytorium lokalnego/GitHub. Proszę użyć po instalacji.',
       unsupportedTitle: 'Nieobsługiwana akcja',
       uninstalledTitle: 'Narzędzie nie jest zainstalowane',
-      paramsTip2: 'Gdy opcja "Automatycznie" jest wyłączona, używana jest wartość domyślna.',
+      paramsTip2: 'Gdy opcja "Auto" jest wyłączona, używana jest wartość domyślna.',
       toolLabel: 'Narzędzie',
       toolSetting: 'Ustawienia narzędzi',
     },
diff --git a/web/i18n/pl-PL/tools.ts b/web/i18n/pl-PL/tools.ts
index e9d92d150e..183abc3f31 100644
--- a/web/i18n/pl-PL/tools.ts
+++ b/web/i18n/pl-PL/tools.ts
@@ -146,16 +146,92 @@ const translation = {
     type: 'typ',
     category: 'kategoria',
     add: 'dodawać',
-    emptyTitle: 'Brak dostępnego narzędzia do przepływu pracy',
-    emptyTip: 'Przejdź do "Przepływ pracy -> Opublikuj jako narzędzie"',
-    emptyTitleCustom: 'Brak dostępnego narzędzia niestandardowego',
-    emptyTipCustom: 'Tworzenie narzędzia niestandardowego',
+    custom: {
+      title: 'Brak dostępnego narzędzia niestandardowego',
+      tip: 'Utwórz narzędzie niestandardowe',
+    },
+    workflow: {
+      title: 'Brak dostępnego narzędzia workflow',
+      tip: 'Publikuj przepływy pracy jako narzędzia w Studio',
+    },
+    mcp: {
+      title: 'Brak dostępnego narzędzia MCP',
+      tip: 'Dodaj serwer MCP',
+    },
+    agent: {
+      title: 'Brak dostępnej strategii agenta',
+    },
   },
   openInStudio: 'Otwieranie w Studio',
   customToolTip: 'Dowiedz się więcej o niestandardowych narzędziach Dify',
   toolNameUsageTip: 'Nazwa wywołania narzędzia do wnioskowania i podpowiadania agentowi',
   noTools: 'Nie znaleziono narzędzi',
   copyToolName: 'Kopiuj nazwę',
+  mcp: {
+    create: {
+      cardTitle: 'Dodaj serwer MCP (HTTP)',
+      cardLink: 'Dowiedz się więcej o integracji serwera MCP',
+    },
+    noConfigured: 'Serwer nieskonfigurowany',
+    updateTime: 'Zaktualizowano',
+    toolsCount: '{count} narzędzi',
+    noTools: 'Brak dostępnych narzędzi',
+    modal: {
+      title: 'Dodaj serwer MCP (HTTP)',
+      editTitle: 'Edytuj serwer MCP (HTTP)',
+      name: 'Nazwa i ikona',
+      namePlaceholder: 'Nazwij swój serwer MCP',
+      serverUrl: 'URL serwera',
+      serverUrlPlaceholder: 'URL do punktu końcowego serwera',
+      serverUrlWarning: 'Aktualizacja adresu serwera może zakłócić działanie aplikacji od niego zależnych',
+      serverIdentifier: 'Identyfikator serwera',
+      serverIdentifierTip: 'Unikalny identyfikator serwera MCP w obszarze roboczym. Tylko małe litery, cyfry, podkreślenia i myślniki. Maks. 24 znaki.',
+      serverIdentifierPlaceholder: 'Unikalny identyfikator, np. my-mcp-server',
+      serverIdentifierWarning: 'Po zmianie ID serwer nie będzie rozpoznawany przez istniejące aplikacje',
+      cancel: 'Anuluj',
+      save: 'Zapisz',
+      confirm: 'Dodaj i autoryzuj',
+    },
+    delete: 'Usuń serwer MCP',
+    deleteConfirmTitle: 'Usunąć {mcp}?',
+    operation: {
+      edit: 'Edytuj',
+      remove: 'Usuń',
+    },
+    authorize: 'Autoryzuj',
+    authorizing: 'Autoryzowanie...',
+    authorizingRequired: 'Wymagana autoryzacja',
+    authorizeTip: 'Po autoryzacji narzędzia będą wyświetlane tutaj.',
+    update: 'Aktualizuj',
+    updating: 'Aktualizowanie...',
+    gettingTools: 'Pobieranie narzędzi...',
+    updateTools: 'Aktualizowanie narzędzi...',
+    toolsEmpty: 'Narzędzia niezaładowane',
+    getTools: 'Pobierz narzędzia',
+    toolUpdateConfirmTitle: 'Aktualizuj listę narzędzi',
+    toolUpdateConfirmContent: 'Aktualizacja listy narzędzi może wpłynąć na istniejące aplikacje. Kontynuować?',
+    toolsNum: '{count} narzędzi zawartych',
+    onlyTool: '1 narzędzie zawarte',
+    identifier: 'Identyfikator serwera (Kliknij, aby skopiować)',
+    server: {
+      title: 'Serwer MCP',
+      url: 'URL serwera',
+      reGen: 'Wygenerować ponownie URL serwera?',
+      addDescription: 'Dodaj opis',
+      edit: 'Edytuj opis',
+      modal: {
+        addTitle: 'Dodaj opis, aby aktywować serwer MCP',
+        editTitle: 'Edytuj opis',
+        description: 'Opis',
+        descriptionPlaceholder: 'Wyjaśnij funkcjonalność tego narzędzia i sposób użycia przez LLM',
+        parameters: 'Parametry',
+        parametersTip: 'Dodaj opisy każdego parametru, aby pomóc LLM zrozumieć ich cel i ograniczenia.',
+        parametersPlaceholder: 'Cel i ograniczenia parametru',
+        confirm: 'Aktywuj serwer MCP',
+      },
+      publishTip: 'Aplikacja nieopublikowana. Najpierw opublikuj aplikację.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/pt-BR/plugin.ts b/web/i18n/pt-BR/plugin.ts
index 8f6501ec93..be8e7e7f97 100644
--- a/web/i18n/pt-BR/plugin.ts
+++ b/web/i18n/pt-BR/plugin.ts
@@ -47,14 +47,14 @@ const translation = {
     toolSelector: {
       uninstalledLink: 'Gerenciar em plug-ins',
       unsupportedContent2: 'Clique para mudar de versão.',
-      auto: 'Automático',
+      auto: 'Auto',
       title: 'Adicionar ferramenta',
       params: 'CONFIGURAÇÃO DE RACIOCÍNIO',
       toolLabel: 'Ferramenta',
       paramsTip1: 'Controla os parâmetros de inferência do LLM.',
       descriptionLabel: 'Descrição da ferramenta',
       uninstalledContent: 'Este plug-in é instalado a partir do repositório local/GitHub. Por favor, use após a instalação.',
-      paramsTip2: 'Quando \'Automático\' está desativado, o valor padrão é usado.',
+      paramsTip2: 'Quando \'Auto\' está desativado, o valor padrão é usado.',
       placeholder: 'Selecione uma ferramenta...',
       empty: 'Clique no botão \'+\' para adicionar ferramentas. Você pode adicionar várias ferramentas.',
       settings: 'CONFIGURAÇÕES DO USUÁRIO',
diff --git a/web/i18n/pt-BR/tools.ts b/web/i18n/pt-BR/tools.ts
index dde7add80a..bd57de362f 100644
--- a/web/i18n/pt-BR/tools.ts
+++ b/web/i18n/pt-BR/tools.ts
@@ -139,19 +139,95 @@ const translation = {
   addToolModal: {
     category: 'categoria',
     type: 'tipo',
-    emptyTip: 'Vá para "Fluxo de trabalho - > Publicar como ferramenta"',
     add: 'adicionar',
-    emptyTitle: 'Nenhuma ferramenta de fluxo de trabalho disponível',
     added: 'Adicionado',
     manageInTools: 'Gerenciar em Ferramentas',
-    emptyTitleCustom: 'Nenhuma ferramenta personalizada disponível',
-    emptyTipCustom: 'Criar uma ferramenta personalizada',
+    custom: {
+      title: 'Nenhuma ferramenta personalizada disponível',
+      tip: 'Crie uma ferramenta personalizada',
+    },
+    workflow: {
+      title: 'Nenhuma ferramenta de fluxo de trabalho disponível',
+      tip: 'Publique fluxos de trabalho como ferramentas no Studio',
+    },
+    mcp: {
+      title: 'Nenhuma ferramenta MCP disponível',
+      tip: 'Adicionar um servidor MCP',
+    },
+    agent: {
+      title: 'Nenhuma estratégia de agente disponível',
+    },
   },
   openInStudio: 'Abrir no Studio',
   customToolTip: 'Saiba mais sobre as ferramentas personalizadas da Dify',
   toolNameUsageTip: 'Nome da chamada da ferramenta para raciocínio e solicitação do agente',
   copyToolName: 'Nome da cópia',
   noTools: 'Nenhuma ferramenta encontrada',
+  mcp: {
+    create: {
+      cardTitle: 'Adicionar Servidor MCP (HTTP)',
+      cardLink: 'Saiba mais sobre a integração do servidor MCP',
+    },
+    noConfigured: 'Servidor Não Configurado',
+    updateTime: 'Atualizado',
+    toolsCount: '{{count}} ferramentas',
+    noTools: 'Nenhuma ferramenta disponível',
+    modal: {
+      title: 'Adicionar Servidor MCP (HTTP)',
+      editTitle: 'Editar Servidor MCP (HTTP)',
+      name: 'Nome & Ícone',
+      namePlaceholder: 'Dê um nome ao seu servidor MCP',
+      serverUrl: 'URL do Servidor',
+      serverUrlPlaceholder: 'URL para o endpoint do servidor',
+      serverUrlWarning: 'Atualizar o endereço do servidor pode interromper aplicações que dependem deste servidor',
+      serverIdentifier: 'Identificador do Servidor',
+      serverIdentifierTip: 'Identificador único para o servidor MCP dentro do espaço de trabalho. Apenas letras minúsculas, números, sublinhados e hífens. Até 24 caracteres.',
+      serverIdentifierPlaceholder: 'Identificador único, ex: meu-servidor-mcp',
+      serverIdentifierWarning: 'O servidor não será reconhecido por aplicativos existentes após uma mudança de ID',
+      cancel: 'Cancelar',
+      save: 'Salvar',
+      confirm: 'Adicionar e Autorizar',
+    },
+    delete: 'Remover Servidor MCP',
+    deleteConfirmTitle: 'Você gostaria de remover {{mcp}}?',
+    operation: {
+      edit: 'Editar',
+      remove: 'Remover',
+    },
+    authorize: 'Autorizar',
+    authorizing: 'Autorizando...',
+    authorizingRequired: 'Autorização é necessária',
+    authorizeTip: 'Após a autorização, as ferramentas serão exibidas aqui.',
+    update: 'Atualizar',
+    updating: 'Atualizando',
+    gettingTools: 'Obtendo Ferramentas...',
+    updateTools: 'Atualizando Ferramentas...',
+    toolsEmpty: 'Ferramentas não carregadas',
+    getTools: 'Obter ferramentas',
+    toolUpdateConfirmTitle: 'Atualizar Lista de Ferramentas',
+    toolUpdateConfirmContent: 'Atualizar a lista de ferramentas pode afetar aplicativos existentes. Você deseja continuar?',
+    toolsNum: '{{count}} ferramentas incluídas',
+    onlyTool: '1 ferramenta incluída',
+    identifier: 'Identificador do Servidor (Clique para Copiar)',
+    server: {
+      title: 'Servidor MCP',
+      url: 'URL do Servidor',
+      reGen: 'Você deseja regenerar a URL do servidor?',
+      addDescription: 'Adicionar descrição',
+      edit: 'Editar descrição',
+      modal: {
+        addTitle: 'Adicionar descrição para habilitar o servidor MCP',
+        editTitle: 'Editar descrição',
+        description: 'Descrição',
+        descriptionPlaceholder: 'Explique o que esta ferramenta faz e como deve ser utilizada pelo LLM',
+        parameters: 'Parâmetros',
+        parametersTip: 'Adicione descrições para cada parâmetro para ajudar o LLM a entender seus propósitos e restrições.',
+        parametersPlaceholder: 'Propósito e restrições do parâmetro',
+        confirm: 'Habilitar Servidor MCP',
+      },
+      publishTip: 'Aplicativo não publicado. Por favor, publique o aplicativo primeiro.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/ro-RO/plugin.ts b/web/i18n/ro-RO/plugin.ts
index a88a841e51..1c7d173f8f 100644
--- a/web/i18n/ro-RO/plugin.ts
+++ b/web/i18n/ro-RO/plugin.ts
@@ -46,7 +46,7 @@ const translation = {
     },
     toolSelector: {
       unsupportedContent: 'Versiunea de plugin instalată nu oferă această acțiune.',
-      auto: 'Automat',
+      auto: 'Auto',
       empty: 'Faceți clic pe butonul "+" pentru a adăuga instrumente. Puteți adăuga mai multe instrumente.',
       uninstalledContent: 'Acest plugin este instalat din depozitul local/GitHub. Vă rugăm să utilizați după instalare.',
       descriptionLabel: 'Descrierea instrumentului',
@@ -54,7 +54,7 @@ const translation = {
       uninstalledLink: 'Gestionați în pluginuri',
       paramsTip1: 'Controlează parametrii de inferență LLM.',
       params: 'CONFIGURAREA RAȚIONAMENTULUI',
-      paramsTip2: 'Când "Automat" este dezactivat, se folosește valoarea implicită.',
+      paramsTip2: 'Când "Auto" este dezactivat, se folosește valoarea implicită.',
       settings: 'SETĂRI UTILIZATOR',
       unsupportedTitle: 'Acțiune neacceptată',
       placeholder: 'Selectați un instrument...',
diff --git a/web/i18n/ro-RO/tools.ts b/web/i18n/ro-RO/tools.ts
index 44530754e3..8d8c77a911 100644
--- a/web/i18n/ro-RO/tools.ts
+++ b/web/i18n/ro-RO/tools.ts
@@ -142,16 +142,92 @@ const translation = {
     manageInTools: 'Gestionați în Instrumente',
     add: 'adăuga',
     type: 'tip',
-    emptyTitle: 'Nu este disponibil niciun instrument de flux de lucru',
-    emptyTip: 'Accesați "Flux de lucru -> Publicați ca instrument"',
-    emptyTitleCustom: 'Nu este disponibil niciun instrument personalizat',
-    emptyTipCustom: 'Crearea unui instrument personalizat',
+    custom: {
+      title: 'Niciun instrument personalizat disponibil',
+      tip: 'Creează un instrument personalizat',
+    },
+    workflow: {
+      title: 'Niciun instrument de flux de lucru disponibil',
+      tip: 'Publicați fluxuri de lucru ca instrumente în Studio',
+    },
+    mcp: {
+      title: 'Niciun instrument MCP disponibil',
+      tip: 'Adăugați un server MCP',
+    },
+    agent: {
+      title: 'Nicio strategie de agent disponibilă',
+    },
   },
   openInStudio: 'Deschide în Studio',
   customToolTip: 'Aflați mai multe despre instrumentele personalizate Dify',
   toolNameUsageTip: 'Numele de apel al instrumentului pentru raționamentul și solicitarea agentului',
   copyToolName: 'Copiază numele',
   noTools: 'Nu s-au găsit unelte',
+  mcp: {
+    create: {
+      cardTitle: 'Adăugare Server MCP (HTTP)',
+      cardLink: 'Aflați mai multe despre integrarea serverului MCP',
+    },
+    noConfigured: 'Server Neconfigurat',
+    updateTime: 'Actualizat',
+    toolsCount: '{count} unelte',
+    noTools: 'Nu există unelte disponibile',
+    modal: {
+      title: 'Adăugare Server MCP (HTTP)',
+      editTitle: 'Editare Server MCP (HTTP)',
+      name: 'Nume și Pictogramă',
+      namePlaceholder: 'Denumiți-vă serverul MCP',
+      serverUrl: 'URL Server',
+      serverUrlPlaceholder: 'URL către endpoint-ul serverului',
+      serverUrlWarning: 'Actualizarea adresei serverului poate întrerupe aplicațiile care depind de acesta',
+      serverIdentifier: 'Identificator Server',
+      serverIdentifierTip: 'Identificator unic pentru serverul MCP în spațiul de lucru. Doar litere mici, cifre, underscore și cratime. Maxim 24 de caractere.',
+      serverIdentifierPlaceholder: 'Identificator unic, ex: my-mcp-server',
+      serverIdentifierWarning: 'Serverul nu va fi recunoscut de aplicațiile existente după schimbarea ID-ului',
+      cancel: 'Anulare',
+      save: 'Salvare',
+      confirm: 'Adăugare și Autorizare',
+    },
+    delete: 'Eliminare Server MCP',
+    deleteConfirmTitle: 'Ștergeți {mcp}?',
+    operation: {
+      edit: 'Editare',
+      remove: 'Eliminare',
+    },
+    authorize: 'Autorizare',
+    authorizing: 'Se autorizează...',
+    authorizingRequired: 'Autorizare necesară',
+    authorizeTip: 'După autorizare, uneltele vor fi afișate aici.',
+    update: 'Actualizare',
+    updating: 'Se actualizează...',
+    gettingTools: 'Se obțin unelte...',
+    updateTools: 'Se actualizează unelte...',
+    toolsEmpty: 'Unelte neîncărcate',
+    getTools: 'Obține unelte',
+    toolUpdateConfirmTitle: 'Actualizare Listă Unelte',
+    toolUpdateConfirmContent: 'Actualizarea listei de unelte poate afecta aplicațiile existente. Continuați?',
+    toolsNum: '{count} unelte incluse',
+    onlyTool: '1 unealtă inclusă',
+    identifier: 'Identificator Server (Clic pentru Copiere)',
+    server: {
+      title: 'Server MCP',
+      url: 'URL Server',
+      reGen: 'Regenerați URL server?',
+      addDescription: 'Adăugare descriere',
+      edit: 'Editare descriere',
+      modal: {
+        addTitle: 'Adăugați descriere pentru activarea serverului MCP',
+        editTitle: 'Editare descriere',
+        description: 'Descriere',
+        descriptionPlaceholder: 'Explicați funcționalitatea acestei unelte și cum ar trebui să fie utilizată de LLM',
+        parameters: 'Parametri',
+        parametersTip: 'Adăugați descrieri pentru fiecare parametru pentru a ajuta LLM să înțeleagă scopul și constrângerile.',
+        parametersPlaceholder: 'Scopul și constrângerile parametrului',
+        confirm: 'Activare Server MCP',
+      },
+      publishTip: 'Aplicație nepublicată. Publicați aplicația mai întâi.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/ru-RU/tools.ts b/web/i18n/ru-RU/tools.ts
index e1975ee538..caa1959318 100644
--- a/web/i18n/ru-RU/tools.ts
+++ b/web/i18n/ru-RU/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'добавить',
     added: 'добавлено',
     manageInTools: 'Управлять в инструментах',
-    emptyTitle: 'Нет доступных инструментов рабочего процесса',
-    emptyTip: 'Перейдите в "Рабочий процесс -> Опубликовать как инструмент"',
-    emptyTitleCustom: 'Нет пользовательского инструмента',
-    emptyTipCustom: 'Создание пользовательского инструмента',
+    custom: {
+      title: 'Нет доступного пользовательского инструмента',
+      tip: 'Создать пользовательский инструмент',
+    },
+    workflow: {
+      title: 'Нет доступного инструмента рабочего процесса',
+      tip: 'Публиковать рабочие процессы как инструменты в Студии',
+    },
+    mcp: {
+      title: 'Нет доступного инструмента MCP',
+      tip: 'Добавить сервер MCP',
+    },
+    agent: {
+      title: 'Нет доступной стратегии агента',
+    },
   },
   createTool: {
     title: 'Создать пользовательский инструмент',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'Название вызова инструмента для рассуждений агента и подсказок',
   copyToolName: 'Копировать имя',
   noTools: 'Инструменты не найдены',
+  mcp: {
+    create: {
+      cardTitle: 'Добавить MCP сервер (HTTP)',
+      cardLink: 'Узнайте больше об интеграции MCP сервера',
+    },
+    noConfigured: 'Неконфигурированный сервер',
+    updateTime: 'Обновлено',
+    toolsCount: '{count} инструментов',
+    noTools: 'Нет доступных инструментов',
+    modal: {
+      title: 'Добавить MCP сервер (HTTP)',
+      editTitle: 'Редактировать MCP сервер (HTTP)',
+      name: 'Имя и иконка',
+      namePlaceholder: 'Назовите ваш MCP сервер',
+      serverUrl: 'URL сервера',
+      serverUrlPlaceholder: 'URL конечной точки сервера',
+      serverUrlWarning: 'Обновление адреса сервера может нарушить работу приложений, которые зависят от этого сервера',
+      serverIdentifier: 'Идентификатор сервера',
+      serverIdentifierTip: 'Уникальный идентификатор MCP сервера в рабочем пространстве. Только строчные буквы, цифры, подчеркивания и дефисы. Максимум 24 символа.',
+      serverIdentifierPlaceholder: 'Уникальный идентификатор, например, мой-сервер-mcp',
+      serverIdentifierWarning: 'Сервер не будет распознан существующими приложениями после изменения ID',
+      cancel: 'Отмена',
+      save: 'Сохранить',
+      confirm: 'Добавить и авторизовать',
+    },
+    delete: 'Удалить MCP сервер',
+    deleteConfirmTitle: 'Вы действительно хотите удалить {mcp}?',
+    operation: {
+      edit: 'Редактировать',
+      remove: 'Удалить',
+    },
+    authorize: 'Авторизовать',
+    authorizing: 'Авторизация...',
+    authorizingRequired: 'Требуется авторизация',
+    authorizeTip: 'После авторизации инструменты будут отображены здесь.',
+    update: 'Обновить',
+    updating: 'Обновление',
+    gettingTools: 'Получение инструментов...',
+    updateTools: 'Обновление инструментов...',
+    toolsEmpty: 'Инструменты не загружены',
+    getTools: 'Получить инструменты',
+    toolUpdateConfirmTitle: 'Обновить список инструментов',
+    toolUpdateConfirmContent: 'Обновление списка инструментов может повлиять на существующие приложения. Вы хотите продолжить?',
+    toolsNum: '{count} инструментов включено',
+    onlyTool: '1 инструмент включен',
+    identifier: 'Идентификатор сервера (Нажмите, чтобы скопировать)',
+    server: {
+      title: 'MCP Сервер',
+      url: 'URL сервера',
+      reGen: 'Хотите регенерировать URL сервера?',
+      addDescription: 'Добавить описание',
+      edit: 'Редактировать описание',
+      modal: {
+        addTitle: 'Добавить описание, чтобы включить MCP сервер',
+        editTitle: 'Редактировать описание',
+        description: 'Описание',
+        descriptionPlaceholder: 'Объясните, что делает этот инструмент и как его должен использовать LLM',
+        parameters: 'Параметры',
+        parametersTip: 'Добавьте описания для каждого параметра, чтобы помочь LLM понять их назначение и ограничения.',
+        parametersPlaceholder: 'Назначение и ограничения параметра',
+        confirm: 'Активировать MCP сервер',
+      },
+      publishTip: 'Приложение не опубликовано. Пожалуйста, сначала опубликуйте приложение.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/sl-SI/tools.ts b/web/i18n/sl-SI/tools.ts
index e557725462..d83f218f68 100644
--- a/web/i18n/sl-SI/tools.ts
+++ b/web/i18n/sl-SI/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'dodaj',
     added: 'dodano',
     manageInTools: 'Upravljaj v Orodjih',
-    emptyTitle: 'Orodje za potek dela ni na voljo',
-    emptyTip: 'Pojdite na "Potek dela -> Objavi kot orodje"',
-    emptyTipCustom: 'Ustvarjanje orodja po meri',
-    emptyTitleCustom: 'Orodje po meri ni na voljo',
+    custom: {
+      title: 'Žiadne prispôsobené nástroje nie sú k dispozícii',
+      tip: 'Vytvorte prispôsobený nástroj',
+    },
+    workflow: {
+      title: 'Žiadny nástroj pracovného postupu nie je k dispozícii',
+      tip: 'Publikujte pracovné postupy ako nástroje v Studio',
+    },
+    mcp: {
+      title: 'Žiadny nástroj MCP nie je k dispozícii',
+      tip: 'Pridajte server MCP',
+    },
+    agent: {
+      title: 'Žiadna stratégia agenta nie je k dispozícii',
+    },
   },
   createTool: {
     title: 'Ustvari prilagojeno orodje',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'Ime klica orodja za sklepanja in pozivanje agenta',
   copyToolName: 'Kopiraj ime',
   noTools: 'Orodja niso bila najdena',
+  mcp: {
+    create: {
+      cardTitle: 'Dodaj strežnik MCP (HTTP)',
+      cardLink: 'Več o integraciji strežnika MCP',
+    },
+    noConfigured: 'Nekonfiguriran strežnik',
+    updateTime: 'Posodobljeno',
+    toolsCount: '{count} orodij',
+    noTools: 'Na voljo ni orodij',
+    modal: {
+      title: 'Dodaj strežnik MCP (HTTP)',
+      editTitle: 'Uredi strežnik MCP (HTTP)',
+      name: 'Ime in ikona',
+      namePlaceholder: 'Poimenuj svoj strežnik MCP',
+      serverUrl: 'URL strežnika',
+      serverUrlPlaceholder: 'URL do končne točke strežnika',
+      serverUrlWarning: 'Posodobitev naslova strežnika lahko prekine aplikacije, ki so odvisne od tega strežnika',
+      serverIdentifier: 'Identifikator strežnika',
+      serverIdentifierTip: 'Edinstven identifikator za strežnik MCP v delovnem prostoru. Samo male črke, številke, podčrtaji in vezaji. Največ 24 znakov.',
+      serverIdentifierPlaceholder: 'Edinstven identifikator, npr. moj-mcp-streznik',
+      serverIdentifierWarning: 'Strežnik po spremembi ID-ja ne bo prepoznan s strani obstoječih aplikacij',
+      cancel: 'Prekliči',
+      save: 'Shrani',
+      confirm: 'Dodaj in avtoriziraj',
+    },
+    delete: 'Odstrani strežnik MCP',
+    deleteConfirmTitle: 'Odstraniti {mcp}?',
+    operation: {
+      edit: 'Uredi',
+      remove: 'Odstrani',
+    },
+    authorize: 'Avtoriziraj',
+    authorizing: 'Avtoriziranje...',
+    authorizingRequired: 'Avtorizacija je zahtevana',
+    authorizeTip: 'Po avtorizaciji bodo orodja prikazana tukaj.',
+    update: 'Posodobi',
+    updating: 'Posodabljanje...',
+    gettingTools: 'Pridobivanje orodij...',
+    updateTools: 'Posodabljanje orodij...',
+    toolsEmpty: 'Orodja niso naložena',
+    getTools: 'Pridobi orodja',
+    toolUpdateConfirmTitle: 'Posodobi seznam orodij',
+    toolUpdateConfirmContent: 'Posodobitev seznama orodij lahko vpliva na obstoječe aplikacije. Želite nadaljevati?',
+    toolsNum: 'Vključenih {count} orodij',
+    onlyTool: 'Vključeno 1 orodje',
+    identifier: 'Identifikator strežnika (Kliknite za kopiranje)',
+    server: {
+      title: 'Strežnik MCP',
+      url: 'URL strežnika',
+      reGen: 'Želite ponovno ustvariti URL strežnika?',
+      addDescription: 'Dodaj opis',
+      edit: 'Uredi opis',
+      modal: {
+        addTitle: 'Dodajte opis za omogočitev strežnika MCP',
+        editTitle: 'Uredi opis',
+        description: 'Opis',
+        descriptionPlaceholder: 'Pojasnite, kaj to orodje počne in kako naj ga uporablja LLM',
+        parameters: 'Parametri',
+        parametersTip: 'Dodajte opise za vsak parameter, da pomagate LLM razumeti njihov namen in omejitve.',
+        parametersPlaceholder: 'Namen in omejitve parametra',
+        confirm: 'Omogoči strežnik MCP',
+      },
+      publishTip: 'Aplikacija ni objavljena. Najprej objavite aplikacijo.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/th-TH/tools.ts b/web/i18n/th-TH/tools.ts
index 14c9457c4e..df36463e57 100644
--- a/web/i18n/th-TH/tools.ts
+++ b/web/i18n/th-TH/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'เพิ่ม',
     added: 'เพิ่ม',
     manageInTools: 'จัดการในเครื่องมือ',
-    emptyTitle: 'ไม่มีเครื่องมือเวิร์กโฟลว์',
-    emptyTip: 'ไปที่ "เวิร์กโฟลว์ -> เผยแพร่เป็นเครื่องมือ"',
-    emptyTitleCustom: 'ไม่มีเครื่องมือที่กําหนดเอง',
-    emptyTipCustom: 'สร้างเครื่องมือแบบกําหนดเอง',
+    custom: {
+      title: 'ไม่มีเครื่องมือกำหนดเอง',
+      tip: 'สร้างเครื่องมือกำหนดเอง',
+    },
+    workflow: {
+      title: 'ไม่มีเครื่องมือเวิร์กโฟลว์',
+      tip: 'เผยแพร่เวิร์กโฟลว์เป็นเครื่องมือใน Studio',
+    },
+    mcp: {
+      title: 'ไม่มีเครื่องมือ MCP',
+      tip: 'เพิ่มเซิร์ฟเวอร์ MCP',
+    },
+    agent: {
+      title: 'ไม่มีกลยุทธ์เอเจนต์',
+    },
   },
   createTool: {
     title: 'สร้างเครื่องมือที่กําหนดเอง',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'ชื่อการเรียกเครื่องมือสําหรับการใช้เหตุผลและการแจ้งเตือนของตัวแทน',
   noTools: 'ไม่พบเครื่องมือ',
   copyToolName: 'คัดลอกชื่อ',
+  mcp: {
+    create: {
+      cardTitle: 'เพิ่มเซิร์ฟเวอร์ MCP (HTTP)',
+      cardLink: 'เรียนรู้เพิ่มเติมเกี่ยวกับการรวมเซิร์ฟเวอร์ MCP',
+    },
+    noConfigured: 'เซิร์ฟเวอร์ที่ยังไม่ได้กำหนดค่า',
+    updateTime: 'อัปเดตแล้ว',
+    toolsCount: '{count} เครื่องมือ',
+    noTools: 'ไม่มีเครื่องมือที่ใช้ได้',
+    modal: {
+      title: 'เพิ่มเซิร์ฟเวอร์ MCP (HTTP)',
+      editTitle: 'แก้ไขเซิร์ฟเวอร์ MCP (HTTP)',
+      name: 'ชื่อ & ไอคอน',
+      namePlaceholder: 'ตั้งชื่อเซิร์ฟเวอร์ MCP ของคุณ',
+      serverUrl: 'URL ของเซิร์ฟเวอร์',
+      serverUrlPlaceholder: 'URL สำหรับจุดสิ้นสุดของเซิร์ฟเวอร์',
+      serverUrlWarning: 'การอัปเดตที่อยู่เซิร์ฟเวอร์อาจทำให้แอปพลิเคชันที่พึ่งพาเซิร์ฟเวอร์นี้หยุดทำงาน',
+      serverIdentifier: 'ตัวระบุเซิร์ฟเวอร์',
+      serverIdentifierTip: 'ตัวระบุที่ไม่ซ้ำกันสำหรับเซิร์ฟเวอร์ MCP ภายในพื้นที่ทำงาน ตัวอักษรเล็ก ตัวเลข ขีดล่าง และขีดกลางเท่านั้น ความยาวไม่เกิน 24 ตัวอักษร',
+      serverIdentifierPlaceholder: 'ตัวระบุที่ไม่ซ้ำกัน เช่น my-mcp-server',
+      serverIdentifierWarning: 'เซิร์ฟเวอร์จะไม่ถูกต้องในแอปพลิเคชันที่มีอยู่หลังจากการเปลี่ยน ID',
+      cancel: 'ยกเลิก',
+      save: 'บันทึก',
+      confirm: 'เพิ่มและอนุญาต',
+    },
+    delete: 'ลบเซิร์ฟเวอร์ MCP',
+    deleteConfirmTitle: 'คุณต้องการลบ {mcp} หรือไม่?',
+    operation: {
+      edit: 'แก้ไข',
+      remove: 'ลบ',
+    },
+    authorize: 'อนุญาต',
+    authorizing: 'กำลังอนุญาต...',
+    authorizingRequired: 'ต้องมีการอนุญาต',
+    authorizeTip: 'หลังจากอนุญาต เครื่องมือจะถูกแสดงที่นี่',
+    update: 'อัปเดต',
+    updating: 'กำลังอัปเดต',
+    gettingTools: 'กำลังโหลดเครื่องมือ...',
+    updateTools: 'กำลังอัปเดตเครื่องมือ...',
+    toolsEmpty: 'ยังไม่โหลดเครื่องมือ',
+    getTools: 'รับเครื่องมือ',
+    toolUpdateConfirmTitle: 'อัปเดตรายการเครื่องมือ',
+    toolUpdateConfirmContent: 'การอัปเดตรายการเครื่องมืออาจส่งผลต่อแอปพลิเคชันที่มีอยู่ คุณต้องการดำเนินการต่อหรือไม่?',
+    toolsNum: '{count} เครื่องมือที่รวมอยู่',
+    onlyTool: 'รวม 1 เครื่องมือ',
+    identifier: 'ตัวระบุเซิร์ฟเวอร์ (คลิกเพื่อคัดลอก)',
+    server: {
+      title: 'เซิร์ฟเวอร์ MCP',
+      url: 'URL ของเซิร์ฟเวอร์',
+      reGen: 'คุณต้องการสร้าง URL ของเซิร์ฟเวอร์ใหม่หรือไม่?',
+      addDescription: 'เพิ่มคำอธิบาย',
+      edit: 'แก้ไขคำอธิบาย',
+      modal: {
+        addTitle: 'เพิ่มคำอธิบายเพื่อเปิดใช้งานเซิร์ฟเวอร์ MCP',
+        editTitle: 'แก้ไขคำอธิบาย',
+        description: 'คำอธิบาย',
+        descriptionPlaceholder: 'อธิบายว่าเครื่องมือนี้ทำอะไรและควรใช้กับ LLM อย่างไร',
+        parameters: 'พารามิเตอร์',
+        parametersTip: 'เพิ่มคำอธิบายสำหรับแต่ละพารามิเตอร์เพื่อช่วยให้ LLM เข้าใจวัตถุประสงค์และข้อจำกัดของมัน',
+        parametersPlaceholder: 'วัตถุประสงค์และข้อจำกัดของพารามิเตอร์',
+        confirm: 'เปิดใช้งานเซิร์ฟเวอร์ MCP',
+      },
+      publishTip: 'แอปไม่ถูกเผยแพร่ กรุณาเผยแพร่แอปก่อน',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/tr-TR/tools.ts b/web/i18n/tr-TR/tools.ts
index af9ddf182f..6e641165e2 100644
--- a/web/i18n/tr-TR/tools.ts
+++ b/web/i18n/tr-TR/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: 'Ekle',
     added: 'Eklendi',
     manageInTools: 'Araçlarda Yönet',
-    emptyTitle: 'Kullanılabilir workflow aracı yok',
-    emptyTip: 'Git "Workflow -> Araç olarak Yayınla"',
-    emptyTitleCustom: 'Özel bir araç yok',
-    emptyTipCustom: 'Özel bir araç oluşturun',
+    custom: {
+      title: 'Mevcut özel araç yok',
+      tip: 'Özel bir araç oluşturun',
+    },
+    workflow: {
+      title: 'Mevcut iş akışı aracı yok',
+      tip: 'İş akışlarını Studio\'da araç olarak yayınlayın',
+    },
+    mcp: {
+      title: 'Mevcut MCP aracı yok',
+      tip: 'Bir MCP sunucusu ekleyin',
+    },
+    agent: {
+      title: 'Mevcut ajan stratejisi yok',
+    },
   },
   createTool: {
     title: 'Özel Araç Oluştur',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: 'Agent akıl yürütme ve prompt için araç çağrı adı',
   copyToolName: 'Adı Kopyala',
   noTools: 'Araç bulunamadı',
+  mcp: {
+    create: {
+      cardTitle: 'MCP Sunucusu Ekle (HTTP)',
+      cardLink: 'MCP sunucu entegrasyonu hakkında daha fazla bilgi edinin',
+    },
+    noConfigured: 'Yapılandırılmamış Sunucu',
+    updateTime: 'Güncellendi',
+    toolsCount: '{count} araç',
+    noTools: 'Kullanılabilir araç yok',
+    modal: {
+      title: 'MCP Sunucusu Ekle (HTTP)',
+      editTitle: 'MCP Sunucusunu Düzenle (HTTP)',
+      name: 'Ad ve Simge',
+      namePlaceholder: 'MCP sunucunuza ad verin',
+      serverUrl: 'Sunucu URL',
+      serverUrlPlaceholder: 'Sunucu endpoint URL',
+      serverUrlWarning: 'Sunucu adresini güncellemek, bu sunucuya bağımlı uygulamaları kesintiye uğratabilir',
+      serverIdentifier: 'Sunucu Tanımlayıcı',
+      serverIdentifierTip: 'Çalışma alanındaki MCP sunucusu için benzersiz tanımlayıcı. Sadece küçük harf, rakam, alt çizgi ve tire. En fazla 24 karakter.',
+      serverIdentifierPlaceholder: 'Benzersiz tanımlayıcı, örn. my-mcp-server',
+      serverIdentifierWarning: 'ID değiştirildikten sonra sunucu mevcut uygulamalar tarafından tanınmayacak',
+      cancel: 'İptal',
+      save: 'Kaydet',
+      confirm: 'Ekle ve Yetkilendir',
+    },
+    delete: 'MCP Sunucusunu Kaldır',
+    deleteConfirmTitle: '{mcp} kaldırılsın mı?',
+    operation: {
+      edit: 'Düzenle',
+      remove: 'Kaldır',
+    },
+    authorize: 'Yetkilendir',
+    authorizing: 'Yetkilendiriliyor...',
+    authorizingRequired: 'Yetkilendirme gerekli',
+    authorizeTip: 'Yetkilendirmeden sonra araçlar burada görüntülenecektir.',
+    update: 'Güncelle',
+    updating: 'Güncelleniyor...',
+    gettingTools: 'Araçlar alınıyor...',
+    updateTools: 'Araçlar güncelleniyor...',
+    toolsEmpty: 'Araçlar yüklenmedi',
+    getTools: 'Araçları al',
+    toolUpdateConfirmTitle: 'Araç Listesini Güncelle',
+    toolUpdateConfirmContent: 'Araç listesini güncellemek mevcut uygulamaları etkileyebilir. Devam etmek istiyor musunuz?',
+    toolsNum: '{count} araç dahil',
+    onlyTool: '1 araç dahil',
+    identifier: 'Sunucu Tanımlayıcı (Kopyalamak için Tıklayın)',
+    server: {
+      title: 'MCP Sunucusu',
+      url: 'Sunucu URL',
+      reGen: 'Sunucu URL yeniden oluşturulsun mu?',
+      addDescription: 'Açıklama ekle',
+      edit: 'Açıklamayı düzenle',
+      modal: {
+        addTitle: 'MCP Sunucusunu etkinleştirmek için açıklama ekleyin',
+        editTitle: 'Açıklamayı düzenle',
+        description: 'Açıklama',
+        descriptionPlaceholder: 'Bu aracın ne yaptığını ve LLM tarafından nasıl kullanılması gerektiğini açıklayın',
+        parameters: 'Parametreler',
+        parametersTip: 'LLM\'nin amaçlarını ve kısıtlamalarını anlamasına yardımcı olmak için her parametreye açıklamalar ekleyin.',
+        parametersPlaceholder: 'Parametre amacı ve kısıtlamaları',
+        confirm: 'MCP Sunucusunu Etkinleştir',
+      },
+      publishTip: 'Uygulama yayınlanmadı. Lütfen önce uygulamayı yayınlayın.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/uk-UA/tools.ts b/web/i18n/uk-UA/tools.ts
index d390b500d3..535c17b1ef 100644
--- a/web/i18n/uk-UA/tools.ts
+++ b/web/i18n/uk-UA/tools.ts
@@ -142,16 +142,92 @@ const translation = {
     added: 'Додано',
     type: 'тип',
     manageInTools: 'Керування в інструментах',
-    emptyTip: 'Перейдіть до розділу "Робочий процес -> Опублікувати як інструмент"',
-    emptyTitle: 'Немає доступного інструменту для роботи з робочими процесами',
-    emptyTitleCustom: 'Немає доступного спеціального інструменту',
-    emptyTipCustom: 'Створення власного інструмента',
+    custom: {
+      title: 'Немає доступного користувацького інструмента',
+      tip: 'Створити користувацький інструмент',
+    },
+    workflow: {
+      title: 'Немає доступного інструмента робочого процесу',
+      tip: 'Опублікуйте робочі процеси як інструменти в Studio',
+    },
+    mcp: {
+      title: 'Немає доступного інструмента MCP',
+      tip: 'Додати сервер MCP',
+    },
+    agent: {
+      title: 'Немає доступної стратегії агента',
+    },
   },
   openInStudio: 'Відкрити в Студії',
   customToolTip: 'Дізнайтеся більше про користувацькі інструменти Dify',
   toolNameUsageTip: 'Ім\'я виклику інструменту для міркувань і підказок агента',
   copyToolName: 'Ім\'я копії',
   noTools: 'Інструментів не знайдено',
+  mcp: {
+    create: {
+      cardTitle: 'Додати сервер MCP (HTTP)',
+      cardLink: 'Дізнатися більше про інтеграцію сервера MCP',
+    },
+    noConfigured: 'Сервер не налаштовано',
+    updateTime: 'Оновлено',
+    toolsCount: '{count} інструментів',
+    noTools: 'Інструменти відсутні',
+    modal: {
+      title: 'Додати сервер MCP (HTTP)',
+      editTitle: 'Редагувати сервер MCP (HTTP)',
+      name: 'Назва та значок',
+      namePlaceholder: 'Назвіть ваш сервер MCP',
+      serverUrl: 'URL сервера',
+      serverUrlPlaceholder: 'URL кінцевої точки сервера',
+      serverUrlWarning: 'Оновлення адреси сервера може порушити роботу додатків, що залежать від нього',
+      serverIdentifier: 'Ідентифікатор сервера',
+      serverIdentifierTip: 'Унікальний ідентифікатор сервера MCP у робочому просторі. Лише малі літери, цифри, підкреслення та дефіси. До 24 символів.',
+      serverIdentifierPlaceholder: 'Унікальний ідентифікатор, напр. my-mcp-server',
+      serverIdentifierWarning: 'Після зміни ID існуючі додатки не зможуть розпізнати сервер',
+      cancel: 'Скасувати',
+      save: 'Зберегти',
+      confirm: 'Додати та Авторизувати',
+    },
+    delete: 'Видалити сервер MCP',
+    deleteConfirmTitle: 'Видалити {mcp}?',
+    operation: {
+      edit: 'Редагувати',
+      remove: 'Видалити',
+    },
+    authorize: 'Авторизувати',
+    authorizing: 'Авторизація...',
+    authorizingRequired: 'Потрібна авторизація',
+    authorizeTip: 'Після авторизації інструменти відображатимуться тут.',
+    update: 'Оновити',
+    updating: 'Оновлення...',
+    gettingTools: 'Отримання інструментів...',
+    updateTools: 'Оновлення інструментів...',
+    toolsEmpty: 'Інструменти не завантажено',
+    getTools: 'Отримати інструменти',
+    toolUpdateConfirmTitle: 'Оновити список інструментів',
+    toolUpdateConfirmContent: 'Оновлення списку інструментів може вплинути на існуючі додатки. Продовжити?',
+    toolsNum: '{count} інструментів включено',
+    onlyTool: '1 інструмент включено',
+    identifier: 'Ідентифікатор сервера (Натисніть, щоб скопіювати)',
+    server: {
+      title: 'Сервер MCP',
+      url: 'URL сервера',
+      reGen: 'Згенерувати URL сервера знову?',
+      addDescription: 'Додати опис',
+      edit: 'Редагувати опис',
+      modal: {
+        addTitle: 'Додайте опис для активації сервера MCP',
+        editTitle: 'Редагувати опис',
+        description: 'Опис',
+        descriptionPlaceholder: 'Поясніть функціонал інструменту та його використання LLM',
+        parameters: 'Параметри',
+        parametersTip: 'Додайте описи параметрів, щоб допомогти LLM зрозуміти їх призначення та обмеження.',
+        parametersPlaceholder: 'Призначення та обмеження параметра',
+        confirm: 'Активувати сервер MCP',
+      },
+      publishTip: 'Додаток не опубліковано. Спочатку опублікуйте додаток.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/vi-VN/tools.ts b/web/i18n/vi-VN/tools.ts
index ec4665cbf5..4f3893cade 100644
--- a/web/i18n/vi-VN/tools.ts
+++ b/web/i18n/vi-VN/tools.ts
@@ -142,16 +142,92 @@ const translation = {
     type: 'kiểu',
     add: 'thêm',
     added: 'Thêm',
-    emptyTip: 'Đi tới "Quy trình làm việc -> Xuất bản dưới dạng công cụ"',
-    emptyTitle: 'Không có sẵn công cụ quy trình làm việc',
-    emptyTitleCustom: 'Không có công cụ tùy chỉnh nào có sẵn',
-    emptyTipCustom: 'Tạo công cụ tùy chỉnh',
+    custom: {
+      title: 'Không có công cụ tùy chỉnh nào',
+      tip: 'Tạo một công cụ tùy chỉnh',
+    },
+    workflow: {
+      title: 'Không có công cụ quy trình nào',
+      tip: 'Xuất bản các quy trình dưới dạng công cụ trong Studio',
+    },
+    mcp: {
+      title: 'Không có công cụ MCP nào',
+      tip: 'Thêm máy chủ MCP',
+    },
+    agent: {
+      title: 'Không có chiến lược đại lý nào',
+    },
   },
   toolNameUsageTip: 'Tên cuộc gọi công cụ để lý luận và nhắc nhở tổng đài viên',
   customToolTip: 'Tìm hiểu thêm về các công cụ tùy chỉnh Dify',
   openInStudio: 'Mở trong Studio',
   noTools: 'Không tìm thấy công cụ',
   copyToolName: 'Sao chép tên',
+  mcp: {
+    create: {
+      cardTitle: 'Thêm Máy chủ MCP (HTTP)',
+      cardLink: 'Tìm hiểu thêm về tích hợp máy chủ MCP',
+    },
+    noConfigured: 'Máy chủ Chưa được Cấu hình',
+    updateTime: 'Cập nhật',
+    toolsCount: '{count} công cụ',
+    noTools: 'Không có công cụ nào',
+    modal: {
+      title: 'Thêm Máy chủ MCP (HTTP)',
+      editTitle: 'Sửa Máy chủ MCP (HTTP)',
+      name: 'Tên & Biểu tượng',
+      namePlaceholder: 'Đặt tên máy chủ MCP',
+      serverUrl: 'URL Máy chủ',
+      serverUrlPlaceholder: 'URL đến điểm cuối máy chủ',
+      serverUrlWarning: 'Cập nhật địa chỉ máy chủ có thể làm gián đoạn ứng dụng phụ thuộc vào máy chủ này',
+      serverIdentifier: 'Định danh Máy chủ',
+      serverIdentifierTip: 'Định danh duy nhất cho máy chủ MCP trong không gian làm việc. Chỉ chữ thường, số, gạch dưới và gạch ngang. Tối đa 24 ký tự.',
+      serverIdentifierPlaceholder: 'Định danh duy nhất, VD: my-mcp-server',
+      serverIdentifierWarning: 'Máy chủ sẽ không được nhận diện bởi ứng dụng hiện có sau khi thay đổi ID',
+      cancel: 'Hủy',
+      save: 'Lưu',
+      confirm: 'Thêm & Ủy quyền',
+    },
+    delete: 'Xóa Máy chủ MCP',
+    deleteConfirmTitle: 'Xóa {mcp}?',
+    operation: {
+      edit: 'Sửa',
+      remove: 'Xóa',
+    },
+    authorize: 'Ủy quyền',
+    authorizing: 'Đang ủy quyền...',
+    authorizingRequired: 'Cần ủy quyền',
+    authorizeTip: 'Sau khi ủy quyền, công cụ sẽ hiển thị tại đây.',
+    update: 'Cập nhật',
+    updating: 'Đang cập nhật...',
+    gettingTools: 'Đang lấy công cụ...',
+    updateTools: 'Đang cập nhật công cụ...',
+    toolsEmpty: 'Công cụ chưa tải',
+    getTools: 'Lấy công cụ',
+    toolUpdateConfirmTitle: 'Cập nhật Danh sách Công cụ',
+    toolUpdateConfirmContent: 'Cập nhật danh sách công cụ có thể ảnh hưởng ứng dụng hiện có. Tiếp tục?',
+    toolsNum: 'Bao gồm {count} công cụ',
+    onlyTool: 'Bao gồm 1 công cụ',
+    identifier: 'Định danh Máy chủ (Nhấn để Sao chép)',
+    server: {
+      title: 'Máy chủ MCP',
+      url: 'URL Máy chủ',
+      reGen: 'Tạo lại URL máy chủ?',
+      addDescription: 'Thêm mô tả',
+      edit: 'Sửa mô tả',
+      modal: {
+        addTitle: 'Thêm mô tả để kích hoạt máy chủ MCP',
+        editTitle: 'Sửa mô tả',
+        description: 'Mô tả',
+        descriptionPlaceholder: 'Giải thích chức năng công cụ và cách LLM sử dụng',
+        parameters: 'Tham số',
+        parametersTip: 'Thêm mô tả cho từng tham số để giúp LLM hiểu mục đích và ràng buộc.',
+        parametersPlaceholder: 'Mục đích và ràng buộc của tham số',
+        confirm: 'Kích hoạt Máy chủ MCP',
+      },
+      publishTip: 'Ứng dụng chưa xuất bản. Vui lòng xuất bản ứng dụng trước.',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/zh-Hans/plugin.ts b/web/i18n/zh-Hans/plugin.ts
index eddd117012..89cdddc1e3 100644
--- a/web/i18n/zh-Hans/plugin.ts
+++ b/web/i18n/zh-Hans/plugin.ts
@@ -94,6 +94,7 @@ const translation = {
       unsupportedTitle: '不支持的 Action',
       unsupportedContent: '已安装的插件版本不提供这个 action。',
       unsupportedContent2: '点击切换版本',
+      unsupportedMCPTool: '当前选定的 Agent 策略插件版本不支持 MCP 工具。',
     },
     configureApp: '应用设置',
     configureModel: '模型设置',
diff --git a/web/i18n/zh-Hans/tools.ts b/web/i18n/zh-Hans/tools.ts
index 9a573ad308..4e0ccf476f 100644
--- a/web/i18n/zh-Hans/tools.ts
+++ b/web/i18n/zh-Hans/tools.ts
@@ -28,10 +28,21 @@ const translation = {
     add: '添加',
     added: '已添加',
     manageInTools: '去工具列表管理',
-    emptyTitle: '没有可用的工作流工具',
-    emptyTip: '去“工作流 -> 发布为工具”添加',
-    emptyTitleCustom: '没有可用的自定义工具',
-    emptyTipCustom: '创建自定义工具',
+    custom: {
+      title: '没有可用的自定义工具',
+      tip: '创建自定义工具',
+    },
+    workflow: {
+      title: '没有可用的工作流工具',
+      tip: '在工作室中发布工作流作为工具',
+    },
+    mcp: {
+      title: '没有可用的 MCP 工具',
+      tip: '添加 MCP 服务器',
+    },
+    agent: {
+      title: '没有可用的 agent 策略',
+    },
   },
   createTool: {
     title: '创建自定义工具',
@@ -152,6 +163,71 @@ const translation = {
   toolNameUsageTip: '工具调用名称，用于 Agent 推理和提示词',
   copyToolName: '复制名称',
   noTools: '没有工具',
+  mcp: {
+    create: {
+      cardTitle: '添加 MCP 服务 (HTTP)',
+      cardLink: '了解更多关于 MCP 服务集成的信息',
+    },
+    noConfigured: '未配置',
+    updateTime: '更新于',
+    toolsCount: '{{count}} 个工具',
+    noTools: '没有可用的工具',
+    modal: {
+      title: '添加 MCP 服务 (HTTP)',
+      editTitle: '修改 MCP 服务 (HTTP)',
+      name: '名称和图标',
+      namePlaceholder: '命名你的 MCP 服务',
+      serverUrl: '服务端点 URL',
+      serverUrlPlaceholder: '服务端点的 URL',
+      serverUrlWarning: '修改服务端点 URL 可能会影响使用当前 MCP 的应用。',
+      serverIdentifier: '服务器标识符',
+      serverIdentifierTip: '工作空间内服务器的唯一标识。支持小写字母、数字、下划线和连字符，最多 24 个字符。',
+      serverIdentifierPlaceholder: '服务器唯一标识，例如 my-mcp-server',
+      serverIdentifierWarning: '更改服务器标识符后，现有应用将无法识别此服务器',
+      cancel: '取消',
+      save: '保存',
+      confirm: '添加并授权',
+    },
+    delete: '删除 MCP 服务',
+    deleteConfirmTitle: '你想要删除 {{mcp}} 吗？',
+    operation: {
+      edit: '修改',
+      remove: '删除',
+    },
+    authorize: '授权',
+    authorizing: '授权中...',
+    authorizingRequired: '需要授权',
+    authorizeTip: '授权后，工具将显示在这里。',
+    update: '更新',
+    updating: '更新中',
+    gettingTools: '获取工具中...',
+    updateTools: '更新工具中...',
+    toolsEmpty: '工具未加载',
+    getTools: '获取工具',
+    toolUpdateConfirmTitle: '更新工具列表',
+    toolUpdateConfirmContent: '更新工具列表可能影响现有应用。您想继续吗？',
+    toolsNum: '包含 {{count}} 个工具',
+    onlyTool: '包含 1 个工具',
+    identifier: '服务器标识符 (点击复制)',
+    server: {
+      title: 'MCP 服务',
+      url: '服务端点 URL',
+      reGen: '你想要重新生成服务端点 URL 吗？',
+      addDescription: '添加描述',
+      edit: '编辑描述',
+      modal: {
+        addTitle: '添加描述以启用 MCP 服务',
+        editTitle: '编辑 MCP 服务描述',
+        description: '描述',
+        descriptionPlaceholder: '解释此工具的功能以及 LLM 应如何使用它',
+        parameters: '参数',
+        parametersTip: '为每个参数添加描述，以帮助 LLM 理解其目的和约束条件。',
+        parametersPlaceholder: '参数的用途和约束条件',
+        confirm: '启用 MCP 服务',
+      },
+      publishTip: '应用未发布。请先发布应用。',
+    },
+  },
 }
 
 export default translation
diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts
index 28a5f8aa95..6bd202d58f 100644
--- a/web/i18n/zh-Hans/workflow.ts
+++ b/web/i18n/zh-Hans/workflow.ts
@@ -232,6 +232,8 @@ const translation = {
     'utilities': '工具',
     'noResult': '未找到匹配项',
     'agent': 'Agent 策略',
+    'allAdded': '已添加全部',
+    'addAll': '添加全部',
   },
   blocks: {
     'start': '开始',
@@ -369,6 +371,10 @@ const translation = {
         ms: '毫秒',
         retries: '{{num}} 重试次数',
       },
+      typeSwitch: {
+        input: '输入值',
+        variable: '使用变量',
+      },
     },
     start: {
       required: '必填',
@@ -663,6 +669,9 @@ const translation = {
     tool: {
       authorize: '授权',
       inputVars: '输入变量',
+      settings: '设置',
+      insertPlaceholder1: '键入',
+      insertPlaceholder2: '插入变量',
       outputVars: {
         text: '工具生成的内容',
         files: {
@@ -890,6 +899,8 @@ const translation = {
         install: '安装',
         cancel: '取消',
       },
+      clickToViewParameterSchema: '点击查看参数 schema',
+      parameterSchema: '参数 Schema',
     },
   },
   tracing: {
diff --git a/web/i18n/zh-Hant/tools.ts b/web/i18n/zh-Hant/tools.ts
index 6e5a95f2a5..93c3fda5c4 100644
--- a/web/i18n/zh-Hant/tools.ts
+++ b/web/i18n/zh-Hant/tools.ts
@@ -142,16 +142,92 @@ const translation = {
     added: '添加',
     manageInTools: '在工具中管理',
     category: '類別',
-    emptyTitle: '沒有可用的工作流程工具',
-    emptyTip: '轉到“工作流 - >發佈為工具”',
-    emptyTipCustom: '創建自訂工具',
-    emptyTitleCustom: '沒有可用的自訂工具',
+    custom: {
+      title: '沒有可用的自訂工具',
+      tip: '創建一個自訂工具',
+    },
+    workflow: {
+      title: '沒有可用的工作流程工具',
+      tip: '在 Studio 中將工作流程發佈為工具',
+    },
+    mcp: {
+      title: '沒有可用的 MCP 工具',
+      tip: '新增一個 MCP 伺服器',
+    },
+    agent: {
+      title: '沒有可用的代理策略',
+    },
   },
   customToolTip: '瞭解有關 Dify 自訂工具的更多資訊',
   toolNameUsageTip: '用於代理推理和提示的工具調用名稱',
   openInStudio: '在 Studio 中打開',
   noTools: '未找到工具',
   copyToolName: '複製名稱',
+  mcp: {
+    create: {
+      cardTitle: '新增 MCP 伺服器 (HTTP)',
+      cardLink: '了解更多關於 MCP 伺服器整合',
+    },
+    noConfigured: '未配置的伺服器',
+    updateTime: '已更新',
+    toolsCount: '{{count}} 個工具',
+    noTools: '沒有可用的工具',
+    modal: {
+      title: '新增 MCP 伺服器 (HTTP)',
+      editTitle: '編輯 MCP 伺服器 (HTTP)',
+      name: '名稱與圖示',
+      namePlaceholder: '為您的 MCP 伺服器命名',
+      serverUrl: '伺服器 URL',
+      serverUrlPlaceholder: '伺服器端點的 URL',
+      serverUrlWarning: '更新伺服器地址可能會干擾依賴於此伺服器的應用程式',
+      serverIdentifier: '伺服器識別碼',
+      serverIdentifierTip: '在工作區內 MCP 伺服器的唯一識別碼。僅限小寫字母、數字、底線和連字符。最多 24 個字元。',
+      serverIdentifierPlaceholder: '唯一識別碼，例如：my-mcp-server',
+      serverIdentifierWarning: '更改 ID 之後，現有應用程式將無法識別伺服器',
+      cancel: '取消',
+      save: '儲存',
+      confirm: '新增並授權',
+    },
+    delete: '刪除 MCP 伺服器',
+    deleteConfirmTitle: '您確定要刪除 {{mcp}} 嗎？',
+    operation: {
+      edit: '編輯',
+      remove: '移除',
+    },
+    authorize: '授權',
+    authorizing: '正在授權...',
+    authorizingRequired: '需要授權',
+    authorizeTip: '授權後，這裡將顯示工具。',
+    update: '更新',
+    updating: '更新中',
+    gettingTools: '獲取工具...',
+    updateTools: '更新工具...',
+    toolsEmpty: '工具未加載',
+    getTools: '獲取工具',
+    toolUpdateConfirmTitle: '更新工具列表',
+    toolUpdateConfirmContent: '更新工具列表可能會影響現有應用程式。您要繼續嗎？',
+    toolsNum: '{{count}} 個工具包含',
+    onlyTool: '包含 1 個工具',
+    identifier: '伺服器識別碼 (點擊複製)',
+    server: {
+      title: 'MCP 伺服器',
+      url: '伺服器 URL',
+      reGen: '您想要重新生成伺服器 URL 嗎？',
+      addDescription: '新增描述',
+      edit: '編輯描述',
+      modal: {
+        addTitle: '新增描述以啟用 MCP 伺服器',
+        editTitle: '編輯描述',
+        description: '描述',
+        descriptionPlaceholder: '說明此工具的用途及如何被 LLM 使用',
+        parameters: '參數',
+        parametersTip: '為每個參數添加描述，以幫助 LLM 理解其目的和約束。',
+        parametersPlaceholder: '參數的目的和約束',
+        confirm: '啟用 MCP 伺服器',
+      },
+      publishTip: '應用程式尚未發布。請先發布應用程式。',
+    },
+  },
 }
 
 export default translation
diff --git a/web/package.json b/web/package.json
index 0862ddbb07..254c2ec1fd 100644
--- a/web/package.json
+++ b/web/package.json
@@ -144,6 +144,7 @@
     "sortablejs": "^1.15.0",
     "swr": "^2.3.0",
     "tailwind-merge": "^2.5.4",
+    "tldts": "^7.0.9",
     "use-context-selector": "^2.0.0",
     "uuid": "^10.0.0",
     "zod": "^3.23.8",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index ef945dfc54..a69dea9088 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -333,6 +333,9 @@ importers:
       tailwind-merge:
         specifier: ^2.5.4
         version: 2.6.0
+      tldts:
+        specifier: ^7.0.9
+        version: 7.0.9
       use-context-selector:
         specifier: ^2.0.0
         version: 2.0.0(react@19.0.0)(scheduler@0.23.2)
@@ -8042,6 +8045,13 @@ packages:
     resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
     engines: {node: '>=14.0.0'}
 
+  tldts-core@7.0.9:
+    resolution: {integrity: sha512-/FGY1+CryHsxF9SFiPZlMOcwQsfABkAvOJO5VEKE8TNifVEqgMF7+UVXHGhm1z4gPUfvVS/EYcwhiRU3vUa1ag==}
+
+  tldts@7.0.9:
+    resolution: {integrity: sha512-/nFtBeNs9nAKIAZE1i3ssOAroci8UqRldFVw5H6RCsNZw7NzDr+Yc3Ek7Tm8XSQKMzw7NSyRSszNxCM0ENsUbg==}
+    hasBin: true
+
   tmpl@1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
 
@@ -18054,6 +18064,12 @@ snapshots:
 
   tinyspy@3.0.2: {}
 
+  tldts-core@7.0.9: {}
+
+  tldts@7.0.9:
+    dependencies:
+      tldts-core: 7.0.9
+
   tmpl@1.0.5: {}
 
   to-buffer@1.2.1:
diff --git a/web/service/common.ts b/web/service/common.ts
index 700cd4bf51..e071d556d1 100644
--- a/web/service/common.ts
+++ b/web/service/common.ts
@@ -337,8 +337,8 @@ export const verifyWebAppForgotPasswordToken: Fetcher<CommonResponse & { is_vali
 export const changeWebAppPasswordWithToken: Fetcher<CommonResponse, { url: string; body: { token: string; new_password: string; password_confirm: string } }> = ({ url, body }) =>
   post<CommonResponse>(url, { body }, { isPublicAPI: true })
 
-export const uploadRemoteFileInfo = (url: string, isPublic?: boolean) => {
-  return post<{ id: string; name: string; size: number; mime_type: string; url: string }>('/remote-files/upload', { body: { url } }, { isPublicAPI: isPublic })
+export const uploadRemoteFileInfo = (url: string, isPublic?: boolean, silent?: boolean) => {
+  return post<{ id: string; name: string; size: number; mime_type: string; url: string }>('/remote-files/upload', { body: { url } }, { isPublicAPI: isPublic, silent })
 }
 
 export const sendEMailLoginCode = (email: string, language = 'en-US') =>
diff --git a/web/service/tools.ts b/web/service/tools.ts
index 38dcf382e6..6a88d8d567 100644
--- a/web/service/tools.ts
+++ b/web/service/tools.ts
@@ -124,6 +124,10 @@ export const fetchAllWorkflowTools = () => {
   return get<ToolWithProvider[]>('/workspaces/current/tools/workflow')
 }
 
+export const fetchAllMCPTools = () => {
+  return get<ToolWithProvider[]>('/workspaces/current/tools/mcp')
+}
+
 export const fetchLabelList = () => {
   return get<Label[]>('/workspaces/current/tool-labels')
 }
diff --git a/web/service/use-tools.ts b/web/service/use-tools.ts
index ceaa4b14b3..64a3ce7a1f 100644
--- a/web/service/use-tools.ts
+++ b/web/service/use-tools.ts
@@ -1,9 +1,11 @@
-import { get, post } from './base'
+import { del, get, post, put } from './base'
 import type {
   Collection,
+  MCPServerDetail,
   Tool,
 } from '@/app/components/tools/types'
 import type { ToolWithProvider } from '@/app/components/workflow/types'
+import type { AppIconType } from '@/types/app'
 import { useInvalid } from './use-base'
 import {
   useMutation,
@@ -61,6 +63,191 @@ export const useInvalidateAllWorkflowTools = () => {
   return useInvalid(useAllWorkflowToolsKey)
 }
 
+const useAllMCPToolsKey = [NAME_SPACE, 'MCPTools']
+export const useAllMCPTools = () => {
+  return useQuery<ToolWithProvider[]>({
+    queryKey: useAllMCPToolsKey,
+    queryFn: () => get<ToolWithProvider[]>('/workspaces/current/tools/mcp'),
+  })
+}
+
+export const useInvalidateAllMCPTools = () => {
+  return useInvalid(useAllMCPToolsKey)
+}
+
+export const useCreateMCP = () => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'create-mcp'],
+    mutationFn: (payload: {
+      name: string
+      server_url: string
+      icon_type: AppIconType
+      icon: string
+      icon_background?: string | null
+    }) => {
+      return post<ToolWithProvider>('workspaces/current/tool-provider/mcp', {
+        body: {
+          ...payload,
+        },
+      })
+    },
+  })
+}
+
+export const useUpdateMCP = ({
+  onSuccess,
+}: {
+  onSuccess?: () => void
+}) => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'update-mcp'],
+    mutationFn: (payload: {
+      name: string
+      server_url: string
+      icon_type: AppIconType
+      icon: string
+      icon_background?: string | null
+      provider_id: string
+    }) => {
+      return put('workspaces/current/tool-provider/mcp', {
+        body: {
+          ...payload,
+        },
+      })
+    },
+    onSuccess,
+  })
+}
+
+export const useDeleteMCP = ({
+  onSuccess,
+}: {
+  onSuccess?: () => void
+}) => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'delete-mcp'],
+    mutationFn: (id: string) => {
+      return del('/workspaces/current/tool-provider/mcp', {
+        body: {
+          provider_id: id,
+        },
+      })
+    },
+    onSuccess,
+  })
+}
+
+export const useAuthorizeMCP = () => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'authorize-mcp'],
+    mutationFn: (payload: { provider_id: string; }) => {
+      return post<{ result?: string; authorization_url?: string }>('/workspaces/current/tool-provider/mcp/auth', {
+        body: payload,
+      })
+    },
+  })
+}
+
+export const useUpdateMCPAuthorizationToken = () => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'refresh-mcp-server-code'],
+    mutationFn: (payload: { provider_id: string; authorization_code: string }) => {
+      return get<MCPServerDetail>('/workspaces/current/tool-provider/mcp/token', {
+        params: {
+          ...payload,
+        },
+      })
+    },
+  })
+}
+
+export const useMCPTools = (providerID: string) => {
+  return useQuery({
+    enabled: !!providerID,
+    queryKey: [NAME_SPACE, 'get-MCP-provider-tool', providerID],
+    queryFn: () => get<{ tools: Tool[] }>(`/workspaces/current/tool-provider/mcp/tools/${providerID}`),
+  })
+}
+export const useInvalidateMCPTools = () => {
+  const queryClient = useQueryClient()
+  return (providerID: string) => {
+    queryClient.invalidateQueries(
+      {
+        queryKey: [NAME_SPACE, 'get-MCP-provider-tool', providerID],
+      })
+  }
+}
+
+export const useUpdateMCPTools = () => {
+  return useMutation({
+    mutationFn: (providerID: string) => get<{ tools: Tool[] }>(`/workspaces/current/tool-provider/mcp/update/${providerID}`),
+  })
+}
+
+export const useMCPServerDetail = (appID: string) => {
+  return useQuery<MCPServerDetail>({
+    queryKey: [NAME_SPACE, 'MCPServerDetail', appID],
+    queryFn: () => get<MCPServerDetail>(`/apps/${appID}/server`),
+  })
+}
+
+export const useInvalidateMCPServerDetail = () => {
+  const queryClient = useQueryClient()
+  return (appID: string) => {
+    queryClient.invalidateQueries(
+      {
+        queryKey: [NAME_SPACE, 'MCPServerDetail', appID],
+      })
+  }
+}
+
+export const useCreateMCPServer = () => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'create-mcp-server'],
+    mutationFn: (payload: {
+      appID: string
+      description: string
+      parameters?: Record<string, string>
+    }) => {
+      const { appID, ...rest } = payload
+      return post(`apps/${appID}/server`, {
+        body: {
+          ...rest,
+        },
+      })
+    },
+  })
+}
+
+export const useUpdateMCPServer = () => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'update-mcp-server'],
+    mutationFn: (payload: {
+      appID: string
+      id: string
+      description?: string
+      status?: string
+      parameters?: Record<string, string>
+    }) => {
+      const { appID, ...rest } = payload
+      return put(`apps/${appID}/server`, {
+        body: {
+          ...rest,
+        },
+      })
+    },
+  })
+}
+
+export const useRefreshMCPServerCode = () => {
+  return useMutation({
+    mutationKey: [NAME_SPACE, 'refresh-mcp-server-code'],
+    mutationFn: (appID: string) => {
+      return get<MCPServerDetail>(`apps/${appID}/server/refresh`)
+    },
+  })
+}
+
 export const useBuiltinProviderInfo = (providerName: string) => {
   return useQuery({
     queryKey: [NAME_SPACE, 'builtin-provider-info', providerName],
diff --git a/web/service/use-workflow.ts b/web/service/use-workflow.ts
index eb07109857..2c8f86ae5d 100644
--- a/web/service/use-workflow.ts
+++ b/web/service/use-workflow.ts
@@ -1,5 +1,5 @@
 import { del, get, patch, post, put } from './base'
-import { useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query'
+import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import type {
   FetchWorkflowDraftPageParams,
   FetchWorkflowDraftPageResponse,
@@ -23,6 +23,16 @@ export const useAppWorkflow = (appID: string) => {
   })
 }
 
+export const useInvalidateAppWorkflow = () => {
+  const queryClient = useQueryClient()
+  return (appID: string) => {
+    queryClient.invalidateQueries(
+      {
+        queryKey: [NAME_SPACE, 'publish', appID],
+      })
+  }
+}
+
 export const useWorkflowConfig = (appId: string, onSuccess: (v: WorkflowConfigResponse) => void) => {
   return useQuery({
     queryKey: [NAME_SPACE, 'config', appId],
diff --git a/web/tailwind-common-config.ts b/web/tailwind-common-config.ts
index 3f64afcc29..eff1530017 100644
--- a/web/tailwind-common-config.ts
+++ b/web/tailwind-common-config.ts
@@ -71,6 +71,7 @@ const config = {
       boxShadow: {
         'xs': '0px 1px 2px 0px rgba(16, 24, 40, 0.05)',
         'sm': '0px 1px 2px 0px rgba(16, 24, 40, 0.06), 0px 1px 3px 0px rgba(16, 24, 40, 0.10)',
+        'sm-no-bottom': '0px -1px 2px 0px rgba(16, 24, 40, 0.06), 0px -1px 3px 0px rgba(16, 24, 40, 0.10)',
         'md': '0px 2px 4px -2px rgba(16, 24, 40, 0.06), 0px 4px 8px -2px rgba(16, 24, 40, 0.10)',
         'lg': '0px 4px 6px -2px rgba(16, 24, 40, 0.03), 0px 12px 16px -4px rgba(16, 24, 40, 0.08)',
         'xl': '0px 8px 8px -4px rgba(16, 24, 40, 0.03), 0px 20px 24px -4px rgba(16, 24, 40, 0.08)',
diff --git a/web/utils/plugin-version-feature.spec.ts b/web/utils/plugin-version-feature.spec.ts
new file mode 100644
index 0000000000..12ca239aa9
--- /dev/null
+++ b/web/utils/plugin-version-feature.spec.ts
@@ -0,0 +1,26 @@
+import { isSupportMCP } from './plugin-version-feature'
+
+describe('plugin-version-feature', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  describe('isSupportMCP', () => {
+    it('should call isEqualOrLaterThanVersion with the correct parameters', () => {
+      expect(isSupportMCP('0.0.3')).toBe(true)
+      expect(isSupportMCP('1.0.0')).toBe(true)
+    })
+
+    it('should return true when version is equal to the supported MCP version', () => {
+      const mockVersion = '0.0.2'
+      const result = isSupportMCP(mockVersion)
+      expect(result).toBe(true)
+    })
+
+    it('should return false when version is less than the supported MCP version', () => {
+      const mockVersion = '0.0.1'
+      const result = isSupportMCP(mockVersion)
+      expect(result).toBe(false)
+    })
+  })
+})
diff --git a/web/utils/plugin-version-feature.ts b/web/utils/plugin-version-feature.ts
new file mode 100644
index 0000000000..51d366bf9c
--- /dev/null
+++ b/web/utils/plugin-version-feature.ts
@@ -0,0 +1,10 @@
+import { isEqualOrLaterThanVersion } from './semver'
+
+const SUPPORT_MCP_VERSION = '0.0.2'
+
+export const isSupportMCP = (version?: string): boolean => {
+  if (!version)
+    return false
+
+  return isEqualOrLaterThanVersion(version, SUPPORT_MCP_VERSION)
+}
diff --git a/web/utils/semver.spec.ts b/web/utils/semver.spec.ts
new file mode 100644
index 0000000000..c2188a976c
--- /dev/null
+++ b/web/utils/semver.spec.ts
@@ -0,0 +1,75 @@
+import { compareVersion, getLatestVersion, isEqualOrLaterThanVersion } from './semver'
+
+describe('semver utilities', () => {
+  describe('getLatestVersion', () => {
+    it('should return the latest version from a list of versions', () => {
+      expect(getLatestVersion(['1.0.0', '1.1.0', '1.0.1'])).toBe('1.1.0')
+      expect(getLatestVersion(['2.0.0', '1.9.9', '1.10.0'])).toBe('2.0.0')
+      expect(getLatestVersion(['1.0.0-alpha', '1.0.0-beta', '1.0.0'])).toBe('1.0.0')
+    })
+
+    it('should handle patch versions correctly', () => {
+      expect(getLatestVersion(['1.0.1', '1.0.2', '1.0.0'])).toBe('1.0.2')
+      expect(getLatestVersion(['1.0.10', '1.0.9', '1.0.11'])).toBe('1.0.11')
+    })
+
+    it('should handle mixed version formats', () => {
+      expect(getLatestVersion(['v1.0.0', '1.1.0', 'v1.2.0'])).toBe('v1.2.0')
+      expect(getLatestVersion(['1.0.0-rc.1', '1.0.0', '1.0.0-beta'])).toBe('1.0.0')
+    })
+
+    it('should return the only version if only one version is provided', () => {
+      expect(getLatestVersion(['1.0.0'])).toBe('1.0.0')
+    })
+  })
+
+  describe('compareVersion', () => {
+    it('should return 1 when first version is greater', () => {
+      expect(compareVersion('1.1.0', '1.0.0')).toBe(1)
+      expect(compareVersion('2.0.0', '1.9.9')).toBe(1)
+      expect(compareVersion('1.0.1', '1.0.0')).toBe(1)
+    })
+
+    it('should return -1 when first version is less', () => {
+      expect(compareVersion('1.0.0', '1.1.0')).toBe(-1)
+      expect(compareVersion('1.9.9', '2.0.0')).toBe(-1)
+      expect(compareVersion('1.0.0', '1.0.1')).toBe(-1)
+    })
+
+    it('should return 0 when versions are equal', () => {
+      expect(compareVersion('1.0.0', '1.0.0')).toBe(0)
+      expect(compareVersion('2.1.3', '2.1.3')).toBe(0)
+    })
+
+    it('should handle pre-release versions correctly', () => {
+      expect(compareVersion('1.0.0-beta', '1.0.0-alpha')).toBe(1)
+      expect(compareVersion('1.0.0', '1.0.0-beta')).toBe(1)
+      expect(compareVersion('1.0.0-alpha', '1.0.0-beta')).toBe(-1)
+    })
+  })
+
+  describe('isEqualOrLaterThanVersion', () => {
+    it('should return true when baseVersion is greater than targetVersion', () => {
+      expect(isEqualOrLaterThanVersion('1.1.0', '1.0.0')).toBe(true)
+      expect(isEqualOrLaterThanVersion('2.0.0', '1.9.9')).toBe(true)
+      expect(isEqualOrLaterThanVersion('1.0.1', '1.0.0')).toBe(true)
+    })
+
+    it('should return true when baseVersion is equal to targetVersion', () => {
+      expect(isEqualOrLaterThanVersion('1.0.0', '1.0.0')).toBe(true)
+      expect(isEqualOrLaterThanVersion('2.1.3', '2.1.3')).toBe(true)
+    })
+
+    it('should return false when baseVersion is less than targetVersion', () => {
+      expect(isEqualOrLaterThanVersion('1.0.0', '1.1.0')).toBe(false)
+      expect(isEqualOrLaterThanVersion('1.9.9', '2.0.0')).toBe(false)
+      expect(isEqualOrLaterThanVersion('1.0.0', '1.0.1')).toBe(false)
+    })
+
+    it('should handle pre-release versions correctly', () => {
+      expect(isEqualOrLaterThanVersion('1.0.0', '1.0.0-beta')).toBe(true)
+      expect(isEqualOrLaterThanVersion('1.0.0-beta', '1.0.0-alpha')).toBe(true)
+      expect(isEqualOrLaterThanVersion('1.0.0-alpha', '1.0.0')).toBe(false)
+    })
+  })
+})
diff --git a/web/utils/semver.ts b/web/utils/semver.ts
index f1b9eb8d7e..aea84153ec 100644
--- a/web/utils/semver.ts
+++ b/web/utils/semver.ts
@@ -7,3 +7,7 @@ export const getLatestVersion = (versionList: string[]) => {
 export const compareVersion = (v1: string, v2: string) => {
   return semver.compare(v1, v2)
 }
+
+export const isEqualOrLaterThanVersion = (baseVersion: string, targetVersion: string) => {
+  return semver.gte(baseVersion, targetVersion)
+}

From b834131f50a86ef03f3e96b9bc8fe4640cd3c172 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:19:26 +0800
Subject: [PATCH 13/39] chore: translate i18n files (#22132)

Co-authored-by: iamjoel <2120155+iamjoel@users.noreply.github.com>
---
 web/i18n/de-DE/app.ts        | 1 +
 web/i18n/de-DE/workflow.ts   | 1 +
 web/i18n/es-ES/app.ts        | 1 +
 web/i18n/es-ES/workflow.ts   | 1 +
 web/i18n/fa-IR/app.ts        | 1 +
 web/i18n/fa-IR/workflow.ts   | 1 +
 web/i18n/fr-FR/app.ts        | 1 +
 web/i18n/fr-FR/workflow.ts   | 1 +
 web/i18n/hi-IN/app.ts        | 1 +
 web/i18n/hi-IN/workflow.ts   | 1 +
 web/i18n/it-IT/app.ts        | 1 +
 web/i18n/it-IT/workflow.ts   | 1 +
 web/i18n/ja-JP/app.ts        | 1 +
 web/i18n/ja-JP/tools.ts      | 1 -
 web/i18n/ja-JP/workflow.ts   | 1 +
 web/i18n/ko-KR/app.ts        | 1 +
 web/i18n/ko-KR/workflow.ts   | 1 +
 web/i18n/pl-PL/app.ts        | 1 +
 web/i18n/pl-PL/workflow.ts   | 1 +
 web/i18n/pt-BR/app.ts        | 1 +
 web/i18n/pt-BR/workflow.ts   | 1 +
 web/i18n/ro-RO/app.ts        | 3 +++
 web/i18n/ro-RO/workflow.ts   | 1 +
 web/i18n/ru-RU/app.ts        | 1 +
 web/i18n/ru-RU/workflow.ts   | 1 +
 web/i18n/sl-SI/app.ts        | 1 +
 web/i18n/sl-SI/workflow.ts   | 1 +
 web/i18n/th-TH/app.ts        | 1 +
 web/i18n/th-TH/workflow.ts   | 1 +
 web/i18n/tr-TR/app.ts        | 1 +
 web/i18n/tr-TR/workflow.ts   | 1 +
 web/i18n/uk-UA/app.ts        | 1 +
 web/i18n/uk-UA/workflow.ts   | 1 +
 web/i18n/vi-VN/app.ts        | 1 +
 web/i18n/vi-VN/workflow.ts   | 1 +
 web/i18n/zh-Hant/app.ts      | 1 +
 web/i18n/zh-Hant/workflow.ts | 1 +
 37 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/web/i18n/de-DE/app.ts b/web/i18n/de-DE/app.ts
index d29a475bcd..52819d0c7e 100644
--- a/web/i18n/de-DE/app.ts
+++ b/web/i18n/de-DE/app.ts
@@ -174,6 +174,7 @@ const translation = {
       title: 'Weben',
       description: 'Weave ist eine Open-Source-Plattform zur Bewertung, Testung und Überwachung von LLM-Anwendungen.',
     },
+    aliyun: {},
   },
   answerIcon: {
     descriptionInExplore: 'Gibt an, ob das web app Symbol zum Ersetzen 🤖 in Explore verwendet werden soll',
diff --git a/web/i18n/de-DE/workflow.ts b/web/i18n/de-DE/workflow.ts
index f7f757f91b..ba49f72b69 100644
--- a/web/i18n/de-DE/workflow.ts
+++ b/web/i18n/de-DE/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         ms: 'Frau',
         retries: '{{num}} Wiederholungen',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'erforderlich',
diff --git a/web/i18n/es-ES/app.ts b/web/i18n/es-ES/app.ts
index 18741226fa..4c9497e16d 100644
--- a/web/i18n/es-ES/app.ts
+++ b/web/i18n/es-ES/app.ts
@@ -172,6 +172,7 @@ const translation = {
       description: 'Weave es una plataforma de código abierto para evaluar, probar y monitorear aplicaciones de LLM.',
       title: 'Tejer',
     },
+    aliyun: {},
   },
   answerIcon: {
     title: 'Usar el icono de la aplicación web para reemplazar 🤖',
diff --git a/web/i18n/es-ES/workflow.ts b/web/i18n/es-ES/workflow.ts
index 519577150d..44516317e8 100644
--- a/web/i18n/es-ES/workflow.ts
+++ b/web/i18n/es-ES/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retries: '{{num}} Reintentos',
         retry: 'Reintentar',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'requerido',
diff --git a/web/i18n/fa-IR/app.ts b/web/i18n/fa-IR/app.ts
index 5e9bd938f2..bf2fa00c11 100644
--- a/web/i18n/fa-IR/app.ts
+++ b/web/i18n/fa-IR/app.ts
@@ -176,6 +176,7 @@ const translation = {
       title: 'بافندگی',
       description: 'ویو یک پلتفرم متن باز برای ارزیابی، آزمایش و نظارت بر برنامه‌های LLM است.',
     },
+    aliyun: {},
   },
   answerIcon: {
     descriptionInExplore: 'آیا از نماد web app برای جایگزینی 🤖 در Explore استفاده کنیم یا خیر',
diff --git a/web/i18n/fa-IR/workflow.ts b/web/i18n/fa-IR/workflow.ts
index 94903c2bd0..800dba06b8 100644
--- a/web/i18n/fa-IR/workflow.ts
+++ b/web/i18n/fa-IR/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retrySuccessful: 'امتحان مجدد با موفقیت انجام دهید',
         retryFailedTimes: '{{بار}} تلاش های مجدد ناموفق بود',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'الزامی',
diff --git a/web/i18n/fr-FR/app.ts b/web/i18n/fr-FR/app.ts
index 29d7a9b3de..18cd04a1e1 100644
--- a/web/i18n/fr-FR/app.ts
+++ b/web/i18n/fr-FR/app.ts
@@ -172,6 +172,7 @@ const translation = {
       title: 'Tisser',
       description: 'Weave est une plateforme open-source pour évaluer, tester et surveiller les applications LLM.',
     },
+    aliyun: {},
   },
   answerIcon: {
     description: 'S’il faut utiliser l’icône web app pour remplacer 🤖 dans l’application partagée',
diff --git a/web/i18n/fr-FR/workflow.ts b/web/i18n/fr-FR/workflow.ts
index a008a2a735..8c8180abff 100644
--- a/web/i18n/fr-FR/workflow.ts
+++ b/web/i18n/fr-FR/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         ms: 'ms',
         retries: '{{num}} Tentatives',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'requis',
diff --git a/web/i18n/hi-IN/app.ts b/web/i18n/hi-IN/app.ts
index 9485d7359b..e9073722f7 100644
--- a/web/i18n/hi-IN/app.ts
+++ b/web/i18n/hi-IN/app.ts
@@ -172,6 +172,7 @@ const translation = {
       title: 'बुनना',
       description: 'वीव एक ओपन-सोर्स प्लेटफ़ॉर्म है जो LLM अनुप्रयोगों का मूल्यांकन, परीक्षण और निगरानी करने के लिए है।',
     },
+    aliyun: {},
   },
   answerIcon: {
     title: 'बदलने 🤖 के लिए web app चिह्न का उपयोग करें',
diff --git a/web/i18n/hi-IN/workflow.ts b/web/i18n/hi-IN/workflow.ts
index 34293d95ba..ffddacaf3a 100644
--- a/web/i18n/hi-IN/workflow.ts
+++ b/web/i18n/hi-IN/workflow.ts
@@ -376,6 +376,7 @@ const translation = {
         retry: 'पुनर्प्रयास',
         retryOnFailure: 'विफलता पर पुनः प्रयास करें',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'आवश्यक',
diff --git a/web/i18n/it-IT/app.ts b/web/i18n/it-IT/app.ts
index feade00168..a08714df71 100644
--- a/web/i18n/it-IT/app.ts
+++ b/web/i18n/it-IT/app.ts
@@ -184,6 +184,7 @@ const translation = {
       title: 'Intrecciare',
       description: 'Weave è una piattaforma open-source per valutare, testare e monitorare le applicazioni LLM.',
     },
+    aliyun: {},
   },
   answerIcon: {
     description: 'Se utilizzare l\'icona web app per la sostituzione 🤖 nell\'applicazione condivisa',
diff --git a/web/i18n/it-IT/workflow.ts b/web/i18n/it-IT/workflow.ts
index 0f1837e084..d7e85dcc19 100644
--- a/web/i18n/it-IT/workflow.ts
+++ b/web/i18n/it-IT/workflow.ts
@@ -379,6 +379,7 @@ const translation = {
         retryFailed: 'Nuovo tentativo non riuscito',
         ms: 'ms',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'richiesto',
diff --git a/web/i18n/ja-JP/app.ts b/web/i18n/ja-JP/app.ts
index 1d94d67eb0..2058b29d9e 100644
--- a/web/i18n/ja-JP/app.ts
+++ b/web/i18n/ja-JP/app.ts
@@ -180,6 +180,7 @@ const translation = {
       title: '織る',
       description: 'Weave は、LLM アプリケーションを評価、テスト、および監視するためのオープンソースプラットフォームです。',
     },
+    aliyun: {},
   },
   answerIcon: {
     title: 'Web アプリアイコンを使用して🤖を置き換える',
diff --git a/web/i18n/ja-JP/tools.ts b/web/i18n/ja-JP/tools.ts
index d69cd4a6f5..f96a5f4182 100644
--- a/web/i18n/ja-JP/tools.ts
+++ b/web/i18n/ja-JP/tools.ts
@@ -228,7 +228,6 @@ const translation = {
       publishTip: 'アプリが公開されていません。まずアプリを公開してください。',
     },
   },
-
 }
 
 export default translation
diff --git a/web/i18n/ja-JP/workflow.ts b/web/i18n/ja-JP/workflow.ts
index e4b31548bf..04702194f8 100644
--- a/web/i18n/ja-JP/workflow.ts
+++ b/web/i18n/ja-JP/workflow.ts
@@ -369,6 +369,7 @@ const translation = {
         ms: 'ミリ秒',
         retries: '再試行回数：{{num}}',
       },
+      typeSwitch: {},
     },
     start: {
       required: '必須',
diff --git a/web/i18n/ko-KR/app.ts b/web/i18n/ko-KR/app.ts
index e9634bfbde..96407f829b 100644
--- a/web/i18n/ko-KR/app.ts
+++ b/web/i18n/ko-KR/app.ts
@@ -192,6 +192,7 @@ const translation = {
       description:
         'Weave 는 LLM 애플리케이션을 평가하고 테스트하며 모니터링하기 위한 오픈 소스 플랫폼입니다.',
     },
+    aliyun: {},
   },
   answerIcon: {
     description:
diff --git a/web/i18n/ko-KR/workflow.ts b/web/i18n/ko-KR/workflow.ts
index 1270408c6c..6a9f97862e 100644
--- a/web/i18n/ko-KR/workflow.ts
+++ b/web/i18n/ko-KR/workflow.ts
@@ -388,6 +388,7 @@ const translation = {
         ms: '미에스',
         retries: '{{숫자}} 재시도',
       },
+      typeSwitch: {},
     },
     start: {
       required: '필수',
diff --git a/web/i18n/pl-PL/app.ts b/web/i18n/pl-PL/app.ts
index ee422a8b56..141ab190e0 100644
--- a/web/i18n/pl-PL/app.ts
+++ b/web/i18n/pl-PL/app.ts
@@ -179,6 +179,7 @@ const translation = {
       title: 'Tkaj',
       description: 'Weave to platforma open-source do oceny, testowania i monitorowania aplikacji LLM.',
     },
+    aliyun: {},
   },
   answerIcon: {
     description: 'Czy w aplikacji udostępnionej ma być używana ikona aplikacji internetowej do zamiany 🤖.',
diff --git a/web/i18n/pl-PL/workflow.ts b/web/i18n/pl-PL/workflow.ts
index 07c5fa1f92..6d1c9ccc8c 100644
--- a/web/i18n/pl-PL/workflow.ts
+++ b/web/i18n/pl-PL/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retryFailedTimes: '{{times}} ponawianie prób nie powiodło się',
         ms: 'Ms',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'wymagane',
diff --git a/web/i18n/pt-BR/app.ts b/web/i18n/pt-BR/app.ts
index 742159692c..099d0a33ea 100644
--- a/web/i18n/pt-BR/app.ts
+++ b/web/i18n/pt-BR/app.ts
@@ -172,6 +172,7 @@ const translation = {
       description: 'Weave é uma plataforma de código aberto para avaliar, testar e monitorar aplicações de LLM.',
       title: 'Trançar',
     },
+    aliyun: {},
   },
   answerIcon: {
     descriptionInExplore: 'Se o ícone do web app deve ser usado para substituir 🤖 no Explore',
diff --git a/web/i18n/pt-BR/workflow.ts b/web/i18n/pt-BR/workflow.ts
index 85b05ef06f..1cb323f59a 100644
--- a/web/i18n/pt-BR/workflow.ts
+++ b/web/i18n/pt-BR/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         ms: 'ms',
         retries: '{{num}} Tentativas',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'requerido',
diff --git a/web/i18n/ro-RO/app.ts b/web/i18n/ro-RO/app.ts
index 5fdb32945c..2d63bdfba7 100644
--- a/web/i18n/ro-RO/app.ts
+++ b/web/i18n/ro-RO/app.ts
@@ -172,6 +172,9 @@ const translation = {
       title: 'Împletește',
       description: 'Weave este o platformă open-source pentru evaluarea, testarea și monitorizarea aplicațiilor LLM.',
     },
+    aliyun: {
+      description: 'Platforma de observabilitate SaaS oferită de Alibaba Cloud permite monitorizarea, urmărirea și evaluarea aplicațiilor Dify din cutie.',
+    },
   },
   answerIcon: {
     descriptionInExplore: 'Dacă să utilizați pictograma web app pentru a înlocui 🤖 în Explore',
diff --git a/web/i18n/ro-RO/workflow.ts b/web/i18n/ro-RO/workflow.ts
index 6942c1eea5..886dc3b790 100644
--- a/web/i18n/ro-RO/workflow.ts
+++ b/web/i18n/ro-RO/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retries: '{{num}} Încercări',
         retryTimes: 'Reîncercați {{times}} ori în caz de eșec',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'necesar',
diff --git a/web/i18n/ru-RU/app.ts b/web/i18n/ru-RU/app.ts
index 03283180dc..de8047b080 100644
--- a/web/i18n/ru-RU/app.ts
+++ b/web/i18n/ru-RU/app.ts
@@ -176,6 +176,7 @@ const translation = {
       description: 'Weave — это открытая платформа для оценки, тестирования и мониторинга приложений LLM.',
       title: 'Ткать',
     },
+    aliyun: {},
   },
   answerIcon: {
     title: 'Использование значка web app для замены 🤖',
diff --git a/web/i18n/ru-RU/workflow.ts b/web/i18n/ru-RU/workflow.ts
index dfdbac3ce9..aecd9e652c 100644
--- a/web/i18n/ru-RU/workflow.ts
+++ b/web/i18n/ru-RU/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retryFailedTimes: 'Повторные попытки {{times}} не увенчались успехом',
         retries: '{{число}} Повторных попыток',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'обязательно',
diff --git a/web/i18n/sl-SI/app.ts b/web/i18n/sl-SI/app.ts
index bba09351aa..152b7d63dc 100644
--- a/web/i18n/sl-SI/app.ts
+++ b/web/i18n/sl-SI/app.ts
@@ -181,6 +181,7 @@ const translation = {
       title: 'Tkanje',
       description: 'Weave je odprtokodna platforma za vrednotenje, testiranje in spremljanje aplikacij LLM.',
     },
+    aliyun: {},
   },
   mermaid: {
     handDrawn: 'Ročno narisano',
diff --git a/web/i18n/sl-SI/workflow.ts b/web/i18n/sl-SI/workflow.ts
index 16e3ae72cb..a7c2626264 100644
--- a/web/i18n/sl-SI/workflow.ts
+++ b/web/i18n/sl-SI/workflow.ts
@@ -366,6 +366,7 @@ const translation = {
       },
       insertVarTip: 'Vstavite spremenljivko',
       outputVars: 'Izhodne spremenljivke',
+      typeSwitch: {},
     },
     start: {
       outputVars: {
diff --git a/web/i18n/th-TH/app.ts b/web/i18n/th-TH/app.ts
index 3d4809e874..9d2b9af398 100644
--- a/web/i18n/th-TH/app.ts
+++ b/web/i18n/th-TH/app.ts
@@ -177,6 +177,7 @@ const translation = {
       title: 'ทอ',
       description: 'Weave เป็นแพลตฟอร์มโอเพนซอร์สสำหรับการประเมินผล ทดสอบ และตรวจสอบแอปพลิเคชัน LLM',
     },
+    aliyun: {},
   },
   mermaid: {
     handDrawn: 'วาดด้วยมือ',
diff --git a/web/i18n/th-TH/workflow.ts b/web/i18n/th-TH/workflow.ts
index 8d99c1c514..28be5c57e8 100644
--- a/web/i18n/th-TH/workflow.ts
+++ b/web/i18n/th-TH/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retries: '{{num}} ลอง',
         ms: 'นางสาว',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'ต้องระบุ',
diff --git a/web/i18n/tr-TR/app.ts b/web/i18n/tr-TR/app.ts
index 639319fd81..16bad22231 100644
--- a/web/i18n/tr-TR/app.ts
+++ b/web/i18n/tr-TR/app.ts
@@ -172,6 +172,7 @@ const translation = {
       title: 'Dokuma',
       description: 'Weave, LLM uygulamalarını değerlendirmek, test etmek ve izlemek için açık kaynaklı bir platformdur.',
     },
+    aliyun: {},
   },
   answerIcon: {
     descriptionInExplore: 'Keşfet\'te değiştirilecek 🤖 web app simgesinin kullanılıp kullanılmayacağı',
diff --git a/web/i18n/tr-TR/workflow.ts b/web/i18n/tr-TR/workflow.ts
index 63eed4bb9c..a09e5d9068 100644
--- a/web/i18n/tr-TR/workflow.ts
+++ b/web/i18n/tr-TR/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retrying: 'Yeniden deneniyor...',
         ms: 'Ms',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'gerekli',
diff --git a/web/i18n/uk-UA/app.ts b/web/i18n/uk-UA/app.ts
index 9e1d3c60c6..9786fd36db 100644
--- a/web/i18n/uk-UA/app.ts
+++ b/web/i18n/uk-UA/app.ts
@@ -172,6 +172,7 @@ const translation = {
       title: 'Ткати',
       description: 'Weave є платформою з відкритим кодом для оцінки, тестування та моніторингу LLM додатків.',
     },
+    aliyun: {},
   },
   answerIcon: {
     title: 'Використовуйте піктограму web app для заміни 🤖',
diff --git a/web/i18n/uk-UA/workflow.ts b/web/i18n/uk-UA/workflow.ts
index a6a04246c2..dd61582129 100644
--- a/web/i18n/uk-UA/workflow.ts
+++ b/web/i18n/uk-UA/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         retryFailedTimes: '{{times}} повторні спроби не вдалися',
         retryTimes: 'Повторіть спробу {{times}} у разі невдачі',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'обов\'язковий',
diff --git a/web/i18n/vi-VN/app.ts b/web/i18n/vi-VN/app.ts
index 0968fcb458..d8f80d9df0 100644
--- a/web/i18n/vi-VN/app.ts
+++ b/web/i18n/vi-VN/app.ts
@@ -172,6 +172,7 @@ const translation = {
       title: 'Dệt',
       description: 'Weave là một nền tảng mã nguồn mở để đánh giá, thử nghiệm và giám sát các ứng dụng LLM.',
     },
+    aliyun: {},
   },
   answerIcon: {
     description: 'Có nên sử dụng biểu tượng web app để thay thế 🤖 trong ứng dụng được chia sẻ hay không',
diff --git a/web/i18n/vi-VN/workflow.ts b/web/i18n/vi-VN/workflow.ts
index 47d8c13f96..05cd279728 100644
--- a/web/i18n/vi-VN/workflow.ts
+++ b/web/i18n/vi-VN/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         times: 'lần',
         ms: 'Ms',
       },
+      typeSwitch: {},
     },
     start: {
       required: 'bắt buộc',
diff --git a/web/i18n/zh-Hant/app.ts b/web/i18n/zh-Hant/app.ts
index 41cd6324c9..e5f997daff 100644
--- a/web/i18n/zh-Hant/app.ts
+++ b/web/i18n/zh-Hant/app.ts
@@ -171,6 +171,7 @@ const translation = {
       title: '編織',
       description: 'Weave 是一個開源平台，用於評估、測試和監控大型語言模型應用程序。',
     },
+    aliyun: {},
   },
   answerIcon: {
     descriptionInExplore: '是否使用 web app 圖示在 Explore 中取代 🤖',
diff --git a/web/i18n/zh-Hant/workflow.ts b/web/i18n/zh-Hant/workflow.ts
index 3368aee1b7..1d29d2f5ab 100644
--- a/web/i18n/zh-Hant/workflow.ts
+++ b/web/i18n/zh-Hant/workflow.ts
@@ -364,6 +364,7 @@ const translation = {
         ms: '毫秒',
         retries: '{{num}}重試',
       },
+      typeSwitch: {},
     },
     start: {
       required: '必填',

From 769b43cc3b2ab7f879ed477533c1d3a853ffd58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B9=9B=E9=9C=B2=E5=85=88=E7=94=9F?=
 <zhanluxianshen@163.com>
Date: Thu, 10 Jul 2025 14:21:34 +0800
Subject: [PATCH 14/39] update worklow events logs. (#19871)

Signed-off-by: zhanluxianshen <zhanluxianshen@163.com>
---
 api/core/workflow/callbacks/workflow_logging_callback.py | 6 +++---
 api/core/workflow/graph_engine/entities/graph.py         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/core/workflow/callbacks/workflow_logging_callback.py b/api/core/workflow/callbacks/workflow_logging_callback.py
index e6813a3997..12b5203ca3 100644
--- a/api/core/workflow/callbacks/workflow_logging_callback.py
+++ b/api/core/workflow/callbacks/workflow_logging_callback.py
@@ -232,14 +232,14 @@ class WorkflowLoggingCallback(WorkflowCallback):
         Publish loop started
         """
         self.print_text("\n[LoopRunStartedEvent]", color="blue")
-        self.print_text(f"Loop Node ID: {event.loop_id}", color="blue")
+        self.print_text(f"Loop Node ID: {event.loop_node_id}", color="blue")
 
     def on_workflow_loop_next(self, event: LoopRunNextEvent) -> None:
         """
         Publish loop next
         """
         self.print_text("\n[LoopRunNextEvent]", color="blue")
-        self.print_text(f"Loop Node ID: {event.loop_id}", color="blue")
+        self.print_text(f"Loop Node ID: {event.loop_node_id}", color="blue")
         self.print_text(f"Loop Index: {event.index}", color="blue")
 
     def on_workflow_loop_completed(self, event: LoopRunSucceededEvent | LoopRunFailedEvent) -> None:
@@ -250,7 +250,7 @@ class WorkflowLoggingCallback(WorkflowCallback):
             "\n[LoopRunSucceededEvent]" if isinstance(event, LoopRunSucceededEvent) else "\n[LoopRunFailedEvent]",
             color="blue",
         )
-        self.print_text(f"Node ID: {event.loop_id}", color="blue")
+        self.print_text(f"Loop Node ID: {event.loop_node_id}", color="blue")
 
     def print_text(self, text: str, color: Optional[str] = None, end: str = "\n") -> None:
         """Print text with highlighting and no end characters."""
diff --git a/api/core/workflow/graph_engine/entities/graph.py b/api/core/workflow/graph_engine/entities/graph.py
index 8e5b1e7142..362777a199 100644
--- a/api/core/workflow/graph_engine/entities/graph.py
+++ b/api/core/workflow/graph_engine/entities/graph.py
@@ -334,7 +334,7 @@ class Graph(BaseModel):
 
                     parallel = GraphParallel(
                         start_from_node_id=start_node_id,
-                        parent_parallel_id=parent_parallel.id if parent_parallel else None,
+                        parent_parallel_id=parent_parallel_id,
                         parent_parallel_start_node_id=parent_parallel.start_from_node_id if parent_parallel else None,
                     )
                     parallel_mapping[parallel.id] = parallel

From fccb00c28169047ec9ff8a10110af53a937d8084 Mon Sep 17 00:00:00 2001
From: RockChinQ <rockchinq@gmail.com>
Date: Fri, 2 May 2025 17:06:16 +0800
Subject: [PATCH 15/39] feat(auto upgrade): add upgrade setting

---
 api/models/account.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/api/models/account.py b/api/models/account.py
index 7ffeefa980..61881e9bad 100644
--- a/api/models/account.py
+++ b/api/models/account.py
@@ -299,3 +299,29 @@ class TenantPluginPermission(Base):
         db.String(16), nullable=False, server_default="everyone"
     )
     debug_permission: Mapped[DebugPermission] = mapped_column(db.String(16), nullable=False, server_default="noone")
+
+class TenantPluginAutoUpgradeStrategy(Base):
+    class StrategyOption(enum.StrEnum):
+        DISABLED = "disabled"
+        FIX_ONLY = "fix_only"
+        LATEST = "latest"
+
+    class UpgradeMode(enum.StrEnum):
+        PARTIAL = "partial"
+        EXCLUDE = "exclude"
+
+    __tablename__ = "tenant_plugin_auto_upgrade_strategies"
+    __table_args__ = (
+        db.PrimaryKeyConstraint("id", name="tenant_plugin_auto_upgrade_strategy_pkey"),
+        db.UniqueConstraint("tenant_id", name="unique_tenant_plugin_auto_upgrade_strategy"),
+    )
+
+    id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
+    tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    strategy_option: Mapped[StrategyOption] = mapped_column(db.String(16), nullable=False)
+    upgrade_time_of_day: Mapped[int] = mapped_column(db.Integer, nullable=False)
+    upgrade_mode: Mapped[UpgradeMode] = mapped_column(db.String(16), nullable=False)
+    exclude_plugins: Mapped[list[str]] = mapped_column(db.ARRAY(db.String(255)), nullable=False)
+    include_plugins: Mapped[list[str]] = mapped_column(db.ARRAY(db.String(255)), nullable=False)
+    created_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
+    updated_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())

From 71b3d6ad9cdf8bc4d8597713e6fc0f3d209aa377 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Thu, 15 May 2025 16:53:12 +0800
Subject: [PATCH 16/39] feat: crud for auto upgrade strategy

---
 api/controllers/console/workspace/plugin.py   | 117 +++++++++++++++++-
 .../versions/2025_05_15_1635-16081485540c_.py |  41 ++++++
 api/models/account.py                         |  17 ++-
 .../plugin/plugin_auto_upgrade_service.py     |  50 ++++++++
 4 files changed, 218 insertions(+), 7 deletions(-)
 create mode 100644 api/migrations/versions/2025_05_15_1635-16081485540c_.py
 create mode 100644 api/services/plugin/plugin_auto_upgrade_service.py

diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py
index c0a4734828..3b7c15688c 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -12,7 +12,8 @@ from controllers.console.wraps import account_initialization_required, setup_req
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.impl.exc import PluginDaemonClientSideError
 from libs.login import login_required
-from models.account import TenantPluginPermission
+from models.account import TenantPluginAutoUpgradeStrategy, TenantPluginPermission
+from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
 from services.plugin.plugin_parameter_service import PluginParameterService
 from services.plugin.plugin_permission_service import PluginPermissionService
 from services.plugin.plugin_service import PluginService
@@ -532,6 +533,116 @@ class PluginFetchDynamicSelectOptionsApi(Resource):
             raise ValueError(e)
 
         return jsonable_encoder({"options": options})
+    
+class PluginChangePreferencesApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def post(self):
+        user = current_user
+        if not user.is_admin_or_owner:
+            raise Forbidden()
+
+        req = reqparse.RequestParser()
+        req.add_argument("permission", type=dict, required=True, location="json")
+        req.add_argument("auto_upgrade", type=dict, required=True, location="json")
+        args = req.parse_args()
+
+        tenant_id = user.current_tenant_id
+
+        permission = args["permission"]
+
+        install_permission = TenantPluginPermission.InstallPermission(permission.get("install_permission", "everyone"))
+        debug_permission = TenantPluginPermission.DebugPermission(permission.get("debug_permission", "everyone"))
+
+        auto_upgrade = args["auto_upgrade"]
+
+        strategy_setting = TenantPluginAutoUpgradeStrategy.StrategySetting(
+            auto_upgrade.get("strategy_setting", "fix_only")
+        )
+        upgrade_time_of_day = auto_upgrade.get("upgrade_time_of_day", 0)
+        upgrade_mode = TenantPluginAutoUpgradeStrategy.UpgradeMode(auto_upgrade.get("upgrade_mode", "exclude"))
+        exclude_plugins = auto_upgrade.get("exclude_plugins", [])
+        include_plugins = auto_upgrade.get("include_plugins", [])
+
+        # set permission
+        set_permission_result = PluginPermissionService.change_permission(
+            tenant_id,
+            install_permission,
+            debug_permission,
+        )
+        if not set_permission_result:
+            return jsonable_encoder({"success": False, "message": "Failed to set permission"})
+
+        # set auto upgrade strategy
+        set_auto_upgrade_strategy_result = PluginAutoUpgradeService.change_strategy(
+            tenant_id,
+            strategy_setting,
+            upgrade_time_of_day,
+            upgrade_mode,
+            exclude_plugins,
+            include_plugins,
+        )
+        if not set_auto_upgrade_strategy_result:
+            return jsonable_encoder({"success": False, "message": "Failed to set auto upgrade strategy"})
+
+        return jsonable_encoder({"success": True})
+
+
+class PluginFetchPreferencesApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def get(self):
+        tenant_id = current_user.current_tenant_id
+
+        permission = PluginPermissionService.get_permission(tenant_id)
+
+        if not permission:
+            permission = {
+                "install_permission": TenantPluginPermission.InstallPermission.EVERYONE,
+                "debug_permission": TenantPluginPermission.DebugPermission.EVERYONE,
+            }
+        else:
+            permission = {
+                "install_permission": permission.install_permission,
+                "debug_permission": permission.debug_permission,
+            }
+
+        auto_upgrade = PluginAutoUpgradeService.get_strategy(tenant_id)
+        if not auto_upgrade:
+            auto_upgrade = {
+                "strategy_setting": TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY,
+                "upgrade_time_of_day": 0,
+                "upgrade_mode": TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE,
+                "exclude_plugins": [],
+                "include_plugins": [],
+            }
+        else:
+            auto_upgrade = {
+                "strategy_setting": auto_upgrade.strategy_setting,
+                "upgrade_time_of_day": auto_upgrade.upgrade_time_of_day,
+                "upgrade_mode": auto_upgrade.upgrade_mode,
+                "exclude_plugins": auto_upgrade.exclude_plugins,
+                "include_plugins": auto_upgrade.include_plugins,
+            }
+
+        return jsonable_encoder({"permission": permission, "auto_upgrade": auto_upgrade})
+
+
+class PluginAutoUpgradeExcludePluginApi(Resource):
+    @setup_required
+    @login_required
+    @account_initialization_required
+    def post(self):
+        # exclude one single plugin
+        tenant_id = current_user.current_tenant_id
+
+        req = reqparse.RequestParser()
+        req.add_argument("plugin_id", type=str, required=True, location="json")
+        args = req.parse_args()
+
+        return jsonable_encoder({"success": PluginAutoUpgradeService.exclude_plugin(tenant_id, args["plugin_id"])})
 
 
 api.add_resource(PluginDebuggingKeyApi, "/workspaces/current/plugin/debugging-key")
@@ -560,3 +671,7 @@ api.add_resource(PluginChangePermissionApi, "/workspaces/current/plugin/permissi
 api.add_resource(PluginFetchPermissionApi, "/workspaces/current/plugin/permission/fetch")
 
 api.add_resource(PluginFetchDynamicSelectOptionsApi, "/workspaces/current/plugin/parameters/dynamic-options")
+
+api.add_resource(PluginFetchPreferencesApi, "/workspaces/current/plugin/preferences/fetch")
+api.add_resource(PluginChangePreferencesApi, "/workspaces/current/plugin/preferences/change")
+api.add_resource(PluginAutoUpgradeExcludePluginApi, "/workspaces/current/plugin/preferences/autoupgrade/exclude")
diff --git a/api/migrations/versions/2025_05_15_1635-16081485540c_.py b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
new file mode 100644
index 0000000000..3db4754e2d
--- /dev/null
+++ b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: 16081485540c
+Revises: d28f2004b072
+Create Date: 2025-05-15 16:35:39.113777
+
+"""
+from alembic import op
+import models as models
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '16081485540c'
+down_revision = 'd28f2004b072'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('tenant_plugin_auto_upgrade_strategies',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('strategy_setting', sa.String(length=16), server_default='fix_only', nullable=False),
+    sa.Column('upgrade_time_of_day', sa.Integer(), nullable=False),
+    sa.Column('upgrade_mode', sa.String(length=16), server_default='exclude', nullable=False),
+    sa.Column('exclude_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
+    sa.Column('include_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tenant_plugin_auto_upgrade_strategy_pkey'),
+    sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin_auto_upgrade_strategy')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('tenant_plugin_auto_upgrade_strategies')
+    # ### end Alembic commands ###
diff --git a/api/models/account.py b/api/models/account.py
index 61881e9bad..d64ff3bde3 100644
--- a/api/models/account.py
+++ b/api/models/account.py
@@ -300,8 +300,9 @@ class TenantPluginPermission(Base):
     )
     debug_permission: Mapped[DebugPermission] = mapped_column(db.String(16), nullable=False, server_default="noone")
 
+
 class TenantPluginAutoUpgradeStrategy(Base):
-    class StrategyOption(enum.StrEnum):
+    class StrategySetting(enum.StrEnum):
         DISABLED = "disabled"
         FIX_ONLY = "fix_only"
         LATEST = "latest"
@@ -318,10 +319,14 @@ class TenantPluginAutoUpgradeStrategy(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    strategy_option: Mapped[StrategyOption] = mapped_column(db.String(16), nullable=False)
-    upgrade_time_of_day: Mapped[int] = mapped_column(db.Integer, nullable=False)
-    upgrade_mode: Mapped[UpgradeMode] = mapped_column(db.String(16), nullable=False)
-    exclude_plugins: Mapped[list[str]] = mapped_column(db.ARRAY(db.String(255)), nullable=False)
-    include_plugins: Mapped[list[str]] = mapped_column(db.ARRAY(db.String(255)), nullable=False)
+    strategy_setting: Mapped[StrategySetting] = mapped_column(db.String(16), nullable=False, server_default="fix_only")
+    upgrade_time_of_day: Mapped[int] = mapped_column(db.Integer, nullable=False, default=0)  # seconds of the day
+    upgrade_mode: Mapped[UpgradeMode] = mapped_column(db.String(16), nullable=False, server_default="exclude")
+    exclude_plugins: Mapped[list[str]] = mapped_column(
+        db.ARRAY(db.String(255)), nullable=False
+    )  # plugin_id (author/name)
+    include_plugins: Mapped[list[str]] = mapped_column(
+        db.ARRAY(db.String(255)), nullable=False
+    )  # plugin_id (author/name)
     created_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
diff --git a/api/services/plugin/plugin_auto_upgrade_service.py b/api/services/plugin/plugin_auto_upgrade_service.py
new file mode 100644
index 0000000000..b93d6ed915
--- /dev/null
+++ b/api/services/plugin/plugin_auto_upgrade_service.py
@@ -0,0 +1,50 @@
+from sqlalchemy.orm import Session
+
+from extensions.ext_database import db
+from models.account import TenantPluginAutoUpgradeStrategy
+
+
+class PluginAutoUpgradeService:
+    @staticmethod
+    def get_strategy(tenant_id: str) -> TenantPluginAutoUpgradeStrategy | None:
+        with Session(db.engine) as session:
+            return (
+                session.query(TenantPluginAutoUpgradeStrategy)
+                .filter(TenantPluginAutoUpgradeStrategy.tenant_id == tenant_id)
+                .first()
+            )
+
+    @staticmethod
+    def change_strategy(
+        tenant_id: str,
+        strategy_setting: TenantPluginAutoUpgradeStrategy.StrategySetting,
+        upgrade_time_of_day: int,
+        upgrade_mode: TenantPluginAutoUpgradeStrategy.UpgradeMode,
+        exclude_plugins: list[str],
+        include_plugins: list[str],
+    ) -> None:
+        with Session(db.engine) as session:
+            exist_strategy = (
+                session.query(TenantPluginAutoUpgradeStrategy)
+                .filter(TenantPluginAutoUpgradeStrategy.tenant_id == tenant_id)
+                .first()
+            )
+            if not exist_strategy:
+                strategy = TenantPluginAutoUpgradeStrategy(
+                    tenant_id=tenant_id,
+                    strategy_setting=strategy_setting,
+                    upgrade_time_of_day=upgrade_time_of_day,
+                    upgrade_mode=upgrade_mode,
+                    exclude_plugins=exclude_plugins,
+                    include_plugins=include_plugins,
+                )
+                session.add(strategy)
+            else:
+                exist_strategy.strategy_setting = strategy_setting
+                exist_strategy.upgrade_time_of_day = upgrade_time_of_day
+                exist_strategy.upgrade_mode = upgrade_mode
+                exist_strategy.exclude_plugins = exclude_plugins
+                exist_strategy.include_plugins = include_plugins
+
+            session.commit()
+            return True

From 8b62e5520a6ad0288105d0ae6fadbd78b434cccf Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Mon, 19 May 2025 15:08:47 +0800
Subject: [PATCH 17/39] feat(auto-upgrade): celery scheduled task

---
 api/extensions/ext_celery.py                 |   6 +
 api/schedule/check_upgradable_plugin_task.py | 124 +++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 api/schedule/check_upgradable_plugin_task.py

diff --git a/api/extensions/ext_celery.py b/api/extensions/ext_celery.py
index 6279b1ad36..d52d6a75a8 100644
--- a/api/extensions/ext_celery.py
+++ b/api/extensions/ext_celery.py
@@ -72,6 +72,7 @@ def init_app(app: DifyApp) -> Celery:
         "schedule.clean_messages",
         "schedule.mail_clean_document_notify_task",
         "schedule.queue_monitor_task",
+        "schedule.check_upgradable_plugin_task",
     ]
     day = dify_config.CELERY_BEAT_SCHEDULER_TIME
     beat_schedule = {
@@ -106,6 +107,11 @@ def init_app(app: DifyApp) -> Celery:
                 minutes=dify_config.QUEUE_MONITOR_INTERVAL if dify_config.QUEUE_MONITOR_INTERVAL else 30
             ),
         },
+        # every 15 minutes
+        "check_upgradable_plugin_task": {
+            "task": "schedule.check_upgradable_plugin_task.check_upgradable_plugin_task",
+            "schedule": timedelta(minutes=15),
+        },
     }
     celery_app.conf.update(beat_schedule=beat_schedule, imports=imports)
 
diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py
new file mode 100644
index 0000000000..95e9d6d16a
--- /dev/null
+++ b/api/schedule/check_upgradable_plugin_task.py
@@ -0,0 +1,124 @@
+import time
+
+import click
+
+import app
+from core.helper import marketplace
+from core.plugin.entities.plugin import PluginInstallationSource
+from core.plugin.impl.plugin import PluginInstaller
+from extensions.ext_database import db
+from models.account import TenantPluginAutoUpgradeStrategy
+
+AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL = 15 * 60  # 15 minutes
+
+RETRY_TIMES_OF_ONE_PLUGIN_IN_ONE_TENANT = 3
+
+
+@app.celery.task(queue="dataset")
+def check_upgradable_plugin_task():
+    click.echo(click.style("Start check upgradable plugin.", fg="green"))
+    start_at = time.perf_counter()
+
+    now_seconds_of_day = time.time() % 86400  # we assume the tz is UTC
+
+    # get strategies that set to be performed in the next AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL
+    strategies = (
+        db.session.query(TenantPluginAutoUpgradeStrategy)
+        .filter(
+            TenantPluginAutoUpgradeStrategy.upgrade_time_of_day >= now_seconds_of_day,
+            TenantPluginAutoUpgradeStrategy.upgrade_time_of_day
+            < now_seconds_of_day + AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL,
+            TenantPluginAutoUpgradeStrategy.strategy_setting
+            != TenantPluginAutoUpgradeStrategy.StrategySetting.DISABLED,
+        )
+        .all()
+    )
+
+    manager = PluginInstaller()
+
+    for strategy in strategies:
+        try:
+            tenant_id = strategy.tenant_id
+            strategy_setting = strategy.strategy_setting
+            upgrade_mode = strategy.upgrade_mode
+            exclude_plugins = strategy.exclude_plugins
+            include_plugins = strategy.include_plugins
+
+            if strategy_setting == TenantPluginAutoUpgradeStrategy.StrategySetting.DISABLED:
+                continue
+
+            # get plugins that need to be checked
+            plugin_ids: list[tuple[str, str, str]] = []  # plugin_id, version, unique_identifier
+
+            if upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.PARTIAL and include_plugins:
+                all_plugins = manager.list_plugins(tenant_id)
+
+                for plugin in all_plugins:
+                    if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id in include_plugins:
+                        plugin_ids.append((plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier))
+
+            elif upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE:
+                # get all plugins and remove the exclude plugins
+                all_plugins = manager.list_plugins(tenant_id)
+                plugin_ids = [
+                    (plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier)
+                    for plugin in all_plugins
+                    if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id not in exclude_plugins
+                ]
+
+            if not plugin_ids:
+                continue
+
+            # fetch latest versions from marketplace
+            manifests = marketplace.batch_fetch_plugin_manifests(plugin_ids)
+
+            for manifest in manifests:
+                for plugin_id, version, original_unique_identifier in plugin_ids:
+                    current_version = version
+                    latest_version = manifest.latest_version
+
+                    # @yeuoly review here
+                    def fix_only_checker(latest_version, current_version):
+                        latest_version_tuple = tuple(int(val) for val in latest_version.split("."))
+                        current_version_tuple = tuple(int(val) for val in current_version.split("."))
+
+                        if (
+                            latest_version_tuple[0] == current_version_tuple[0]
+                            and latest_version_tuple[1] == current_version_tuple[1]
+                        ):
+                            return latest_version_tuple[2] != current_version_tuple[2]
+                        return False
+
+                    version_checker = {
+                        TenantPluginAutoUpgradeStrategy.StrategySetting.LATEST: lambda latest_version,
+                        current_version: latest_version != current_version,
+                        TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY: fix_only_checker,
+                    }
+
+                    if version_checker[strategy_setting](latest_version, current_version):
+                        # execute upgrade
+                        new_unique_identifier = manifest.latest_package_identifier
+
+                        marketplace.record_install_plugin_event(new_unique_identifier)
+                        click.echo(click.style("Upgrade plugin: {}".format(new_unique_identifier), fg="green"))
+                        task_start_resp = manager.upgrade_plugin(
+                            tenant_id,
+                            original_unique_identifier,
+                            new_unique_identifier,
+                            PluginInstallationSource.Marketplace,
+                            {
+                                "plugin_unique_identifier": new_unique_identifier,
+                            },
+                        )
+
+        except Exception as e:
+            click.echo(click.style("Error when checking upgradable plugin: {}".format(e), fg="red"))
+            continue
+
+    end_at = time.perf_counter()
+    click.echo(
+        click.style(
+            "Checked upgradable plugin success latency: {}".format(end_at - start_at),
+            fg="green",
+        )
+    )

From c2520f7cb47c6a969973158be250a71a880cf486 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Tue, 20 May 2025 15:08:06 +0800
Subject: [PATCH 18/39] fix: bugs

---
 api/extensions/ext_celery.py                 |  2 +-
 api/schedule/check_upgradable_plugin_task.py | 98 ++++++++++++--------
 2 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/api/extensions/ext_celery.py b/api/extensions/ext_celery.py
index d52d6a75a8..be89705858 100644
--- a/api/extensions/ext_celery.py
+++ b/api/extensions/ext_celery.py
@@ -110,7 +110,7 @@ def init_app(app: DifyApp) -> Celery:
         # every 15 minutes
         "check_upgradable_plugin_task": {
             "task": "schedule.check_upgradable_plugin_task.check_upgradable_plugin_task",
-            "schedule": timedelta(minutes=15),
+            "schedule": crontab(minute="*/15"),
         },
     }
     celery_app.conf.update(beat_schedule=beat_schedule, imports=imports)
diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py
index 95e9d6d16a..96b05a814e 100644
--- a/api/schedule/check_upgradable_plugin_task.py
+++ b/api/schedule/check_upgradable_plugin_task.py
@@ -1,4 +1,5 @@
 import time
+import traceback
 
 import click
 
@@ -14,12 +15,13 @@ AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL = 15 * 60  # 15 minutes
 RETRY_TIMES_OF_ONE_PLUGIN_IN_ONE_TENANT = 3
 
 
-@app.celery.task(queue="dataset")
+@app.celery.task(queue="plugin")
 def check_upgradable_plugin_task():
     click.echo(click.style("Start check upgradable plugin.", fg="green"))
     start_at = time.perf_counter()
 
     now_seconds_of_day = time.time() % 86400  # we assume the tz is UTC
+    click.echo(click.style("Now seconds of day: {}".format(now_seconds_of_day), fg="green"))
 
     # get strategies that set to be performed in the next AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL
     strategies = (
@@ -69,50 +71,70 @@ def check_upgradable_plugin_task():
             if not plugin_ids:
                 continue
 
+            plugin_ids_plain_list = [plugin_id for plugin_id, _, _ in plugin_ids]
+
+            click.echo(click.style("Fetching manifests for plugins: {}".format(plugin_ids_plain_list), fg="green"))
+
             # fetch latest versions from marketplace
-            manifests = marketplace.batch_fetch_plugin_manifests(plugin_ids)
+            manifests = marketplace.batch_fetch_plugin_manifests(plugin_ids_plain_list)
 
             for manifest in manifests:
                 for plugin_id, version, original_unique_identifier in plugin_ids:
-                    current_version = version
-                    latest_version = manifest.latest_version
-
-                    # @yeuoly review here
-                    def fix_only_checker(latest_version, current_version):
-                        latest_version_tuple = tuple(int(val) for val in latest_version.split("."))
-                        current_version_tuple = tuple(int(val) for val in current_version.split("."))
-
-                        if (
-                            latest_version_tuple[0] == current_version_tuple[0]
-                            and latest_version_tuple[1] == current_version_tuple[1]
-                        ):
-                            return latest_version_tuple[2] != current_version_tuple[2]
-                        return False
-
-                    version_checker = {
-                        TenantPluginAutoUpgradeStrategy.StrategySetting.LATEST: lambda latest_version,
-                        current_version: latest_version != current_version,
-                        TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY: fix_only_checker,
-                    }
-
-                    if version_checker[strategy_setting](latest_version, current_version):
-                        # execute upgrade
-                        new_unique_identifier = manifest.latest_package_identifier
-
-                        marketplace.record_install_plugin_event(new_unique_identifier)
-                        click.echo(click.style("Upgrade plugin: {}".format(new_unique_identifier), fg="green"))
-                        task_start_resp = manager.upgrade_plugin(
-                            tenant_id,
-                            original_unique_identifier,
-                            new_unique_identifier,
-                            PluginInstallationSource.Marketplace,
-                            {
-                                "plugin_unique_identifier": new_unique_identifier,
-                            },
-                        )
+                    if manifest.plugin_id != plugin_id:
+                        continue
+
+                    try:
+                        current_version = version
+                        latest_version = manifest.latest_version
+
+                        # @yeuoly review here
+                        def fix_only_checker(latest_version, current_version):
+                            latest_version_tuple = tuple(int(val) for val in latest_version.split("."))
+                            current_version_tuple = tuple(int(val) for val in current_version.split("."))
+
+                            if (
+                                latest_version_tuple[0] == current_version_tuple[0]
+                                and latest_version_tuple[1] == current_version_tuple[1]
+                            ):
+                                return latest_version_tuple[2] != current_version_tuple[2]
+                            return False
+
+                        version_checker = {
+                            TenantPluginAutoUpgradeStrategy.StrategySetting.LATEST: lambda latest_version,
+                            current_version: latest_version != current_version,
+                            TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY: fix_only_checker,
+                        }
+
+                        if version_checker[strategy_setting](latest_version, current_version):
+                            # execute upgrade
+                            new_unique_identifier = manifest.latest_package_identifier
+
+                            marketplace.record_install_plugin_event(new_unique_identifier)
+                            click.echo(
+                                click.style(
+                                    "Upgrade plugin: {} -> {}".format(
+                                        original_unique_identifier, new_unique_identifier
+                                    ),
+                                    fg="green",
+                                )
+                            )
+                            task_start_resp = manager.upgrade_plugin(
+                                tenant_id,
+                                original_unique_identifier,
+                                new_unique_identifier,
+                                PluginInstallationSource.Marketplace,
+                                {
+                                    "plugin_unique_identifier": new_unique_identifier,
+                                },
+                            )
+                    except Exception as e:
+                        click.echo(click.style("Error when upgrading plugin: {}".format(e), fg="red"))
+                        traceback.print_exc()
+                    break
 
         except Exception as e:
             click.echo(click.style("Error when checking upgradable plugin: {}".format(e), fg="red"))
+            traceback.print_exc()
             continue
 
     end_at = time.perf_counter()

From 60bce19696a84246f9f0a6a739f7f7fb8c85c69d Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Tue, 24 Jun 2025 15:44:03 +0800
Subject: [PATCH 19/39] feat: combine plugin preferences apis

---
 api/models/account.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/models/account.py b/api/models/account.py
index d64ff3bde3..1fa27f71dd 100644
--- a/api/models/account.py
+++ b/api/models/account.py
@@ -308,6 +308,7 @@ class TenantPluginAutoUpgradeStrategy(Base):
         LATEST = "latest"
 
     class UpgradeMode(enum.StrEnum):
+        ALL = "all"
         PARTIAL = "partial"
         EXCLUDE = "exclude"
 

From f373e3df990b45f8224aa2932988b2b67288401f Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Tue, 24 Jun 2025 15:45:54 +0800
Subject: [PATCH 20/39] feat: add supports for `update_all` strategy

---
 api/schedule/check_upgradable_plugin_task.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py
index 96b05a814e..b709689d27 100644
--- a/api/schedule/check_upgradable_plugin_task.py
+++ b/api/schedule/check_upgradable_plugin_task.py
@@ -67,6 +67,13 @@ def check_upgradable_plugin_task():
                     for plugin in all_plugins
                     if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id not in exclude_plugins
                 ]
+            elif upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.ALL:
+                all_plugins = manager.list_plugins(tenant_id)
+                plugin_ids = [
+                    (plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier)
+                    for plugin in all_plugins
+                    if plugin.source == PluginInstallationSource.Marketplace
+                ]
 
             if not plugin_ids:
                 continue

From 6674d7fc1898f37dfe51d73c1f0e374f1028dd4c Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Tue, 24 Jun 2025 16:25:01 +0800
Subject: [PATCH 21/39] feat: exclude one plugin

---
 .../plugin/plugin_auto_upgrade_service.py     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/api/services/plugin/plugin_auto_upgrade_service.py b/api/services/plugin/plugin_auto_upgrade_service.py
index b93d6ed915..d05292a4bc 100644
--- a/api/services/plugin/plugin_auto_upgrade_service.py
+++ b/api/services/plugin/plugin_auto_upgrade_service.py
@@ -48,3 +48,40 @@ class PluginAutoUpgradeService:
 
             session.commit()
             return True
+
+    @staticmethod
+    def exclude_plugin(tenant_id: str, plugin_id: str) -> bool:
+        with Session(db.engine) as session:
+            exist_strategy = (
+                session.query(TenantPluginAutoUpgradeStrategy)
+                .filter(TenantPluginAutoUpgradeStrategy.tenant_id == tenant_id)
+                .first()
+            )
+            if not exist_strategy:
+                # create for this tenant
+                PluginAutoUpgradeService.change_strategy(
+                    tenant_id,
+                    TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY,
+                    0,
+                    TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE,
+                    [plugin_id],
+                    [],
+                )
+                return True
+            else:
+                if exist_strategy.upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE:
+                    if plugin_id not in exist_strategy.exclude_plugins:
+                        new_exclude_plugins = exist_strategy.exclude_plugins.copy()
+                        new_exclude_plugins.append(plugin_id)
+                        exist_strategy.exclude_plugins = new_exclude_plugins
+                elif exist_strategy.upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.PARTIAL:
+                    if plugin_id in exist_strategy.include_plugins:
+                        new_include_plugins = exist_strategy.include_plugins.copy()
+                        new_include_plugins.remove(plugin_id)
+                        exist_strategy.include_plugins = new_include_plugins
+                elif exist_strategy.upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.ALL:
+                    exist_strategy.upgrade_mode = TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE
+                    exist_strategy.exclude_plugins = [plugin_id]
+
+                session.commit()
+                return True

From bcfbeee333467f074b03f69c78e660cd4649ca42 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Tue, 1 Jul 2025 17:51:49 +0800
Subject: [PATCH 22/39] perf: split tasks to multi worker

---
 api/core/helper/marketplace.py                |  20 +++
 api/schedule/check_upgradable_plugin_task.py  | 123 ++-----------
 ...ss_tenant_plugin_autoupgrade_check_task.py | 163 ++++++++++++++++++
 3 files changed, 193 insertions(+), 113 deletions(-)
 create mode 100644 api/tasks/process_tenant_plugin_autoupgrade_check_task.py

diff --git a/api/core/helper/marketplace.py b/api/core/helper/marketplace.py
index 65bf4fc1db..fe3078923d 100644
--- a/api/core/helper/marketplace.py
+++ b/api/core/helper/marketplace.py
@@ -25,9 +25,29 @@ def batch_fetch_plugin_manifests(plugin_ids: list[str]) -> Sequence[MarketplaceP
     url = str(marketplace_api_url / "api/v1/plugins/batch")
     response = requests.post(url, json={"plugin_ids": plugin_ids})
     response.raise_for_status()
+
     return [MarketplacePluginDeclaration(**plugin) for plugin in response.json()["data"]["plugins"]]
 
 
+def batch_fetch_plugin_manifests_ignore_deserialization_error(
+    plugin_ids: list[str],
+) -> Sequence[MarketplacePluginDeclaration]:
+    if len(plugin_ids) == 0:
+        return []
+
+    url = str(marketplace_api_url / "api/v1/plugins/batch")
+    response = requests.post(url, json={"plugin_ids": plugin_ids})
+    response.raise_for_status()
+    result: list[MarketplacePluginDeclaration] = []
+    for plugin in response.json()["data"]["plugins"]:
+        try:
+            result.append(MarketplacePluginDeclaration(**plugin))
+        except Exception as e:
+            pass
+
+    return result
+
+
 def record_install_plugin_event(plugin_unique_identifier: str):
     url = str(marketplace_api_url / "api/v1/stats/plugins/install_count")
     response = requests.post(url, json={"unique_identifier": plugin_unique_identifier})
diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py
index b709689d27..bfe24c7b83 100644
--- a/api/schedule/check_upgradable_plugin_task.py
+++ b/api/schedule/check_upgradable_plugin_task.py
@@ -1,19 +1,14 @@
 import time
-import traceback
 
 import click
 
 import app
-from core.helper import marketplace
-from core.plugin.entities.plugin import PluginInstallationSource
-from core.plugin.impl.plugin import PluginInstaller
 from extensions.ext_database import db
 from models.account import TenantPluginAutoUpgradeStrategy
+from tasks.process_tenant_plugin_autoupgrade_check_task import process_tenant_plugin_autoupgrade_check_task
 
 AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL = 15 * 60  # 15 minutes
 
-RETRY_TIMES_OF_ONE_PLUGIN_IN_ONE_TENANT = 3
-
 
 @app.celery.task(queue="plugin")
 def check_upgradable_plugin_task():
@@ -23,7 +18,7 @@ def check_upgradable_plugin_task():
     now_seconds_of_day = time.time() % 86400  # we assume the tz is UTC
     click.echo(click.style("Now seconds of day: {}".format(now_seconds_of_day), fg="green"))
 
-    # get strategies that set to be performed in the next AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL
+    # 获取需要在下一个AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL内执行的策略
     strategies = (
         db.session.query(TenantPluginAutoUpgradeStrategy)
         .filter(
@@ -36,113 +31,15 @@ def check_upgradable_plugin_task():
         .all()
     )
 
-    manager = PluginInstaller()
-
     for strategy in strategies:
-        try:
-            tenant_id = strategy.tenant_id
-            strategy_setting = strategy.strategy_setting
-            upgrade_mode = strategy.upgrade_mode
-            exclude_plugins = strategy.exclude_plugins
-            include_plugins = strategy.include_plugins
-
-            if strategy_setting == TenantPluginAutoUpgradeStrategy.StrategySetting.DISABLED:
-                continue
-
-            # get plugins that need to be checked
-            plugin_ids: list[tuple[str, str, str]] = []  # plugin_id, version, unique_identifier
-
-            if upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.PARTIAL and include_plugins:
-                all_plugins = manager.list_plugins(tenant_id)
-
-                for plugin in all_plugins:
-                    if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id in include_plugins:
-                        plugin_ids.append((plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier))
-
-            elif upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE:
-                # get all plugins and remove the exclude plugins
-                all_plugins = manager.list_plugins(tenant_id)
-                plugin_ids = [
-                    (plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier)
-                    for plugin in all_plugins
-                    if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id not in exclude_plugins
-                ]
-            elif upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.ALL:
-                all_plugins = manager.list_plugins(tenant_id)
-                plugin_ids = [
-                    (plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier)
-                    for plugin in all_plugins
-                    if plugin.source == PluginInstallationSource.Marketplace
-                ]
-
-            if not plugin_ids:
-                continue
-
-            plugin_ids_plain_list = [plugin_id for plugin_id, _, _ in plugin_ids]
-
-            click.echo(click.style("Fetching manifests for plugins: {}".format(plugin_ids_plain_list), fg="green"))
-
-            # fetch latest versions from marketplace
-            manifests = marketplace.batch_fetch_plugin_manifests(plugin_ids_plain_list)
-
-            for manifest in manifests:
-                for plugin_id, version, original_unique_identifier in plugin_ids:
-                    if manifest.plugin_id != plugin_id:
-                        continue
-
-                    try:
-                        current_version = version
-                        latest_version = manifest.latest_version
-
-                        # @yeuoly review here
-                        def fix_only_checker(latest_version, current_version):
-                            latest_version_tuple = tuple(int(val) for val in latest_version.split("."))
-                            current_version_tuple = tuple(int(val) for val in current_version.split("."))
-
-                            if (
-                                latest_version_tuple[0] == current_version_tuple[0]
-                                and latest_version_tuple[1] == current_version_tuple[1]
-                            ):
-                                return latest_version_tuple[2] != current_version_tuple[2]
-                            return False
-
-                        version_checker = {
-                            TenantPluginAutoUpgradeStrategy.StrategySetting.LATEST: lambda latest_version,
-                            current_version: latest_version != current_version,
-                            TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY: fix_only_checker,
-                        }
-
-                        if version_checker[strategy_setting](latest_version, current_version):
-                            # execute upgrade
-                            new_unique_identifier = manifest.latest_package_identifier
-
-                            marketplace.record_install_plugin_event(new_unique_identifier)
-                            click.echo(
-                                click.style(
-                                    "Upgrade plugin: {} -> {}".format(
-                                        original_unique_identifier, new_unique_identifier
-                                    ),
-                                    fg="green",
-                                )
-                            )
-                            task_start_resp = manager.upgrade_plugin(
-                                tenant_id,
-                                original_unique_identifier,
-                                new_unique_identifier,
-                                PluginInstallationSource.Marketplace,
-                                {
-                                    "plugin_unique_identifier": new_unique_identifier,
-                                },
-                            )
-                    except Exception as e:
-                        click.echo(click.style("Error when upgrading plugin: {}".format(e), fg="red"))
-                        traceback.print_exc()
-                    break
-
-        except Exception as e:
-            click.echo(click.style("Error when checking upgradable plugin: {}".format(e), fg="red"))
-            traceback.print_exc()
-            continue
+        process_tenant_plugin_autoupgrade_check_task.delay(
+            strategy.tenant_id,
+            strategy.strategy_setting,
+            strategy.upgrade_time_of_day,
+            strategy.upgrade_mode,
+            strategy.exclude_plugins,
+            strategy.include_plugins,
+        )
 
     end_at = time.perf_counter()
     click.echo(
diff --git a/api/tasks/process_tenant_plugin_autoupgrade_check_task.py b/api/tasks/process_tenant_plugin_autoupgrade_check_task.py
new file mode 100644
index 0000000000..fc01b33f4e
--- /dev/null
+++ b/api/tasks/process_tenant_plugin_autoupgrade_check_task.py
@@ -0,0 +1,163 @@
+import traceback
+
+import click
+from celery import shared_task
+
+from core.helper import marketplace
+from core.helper.marketplace import MarketplacePluginDeclaration
+from core.plugin.entities.plugin import PluginInstallationSource
+from core.plugin.impl.plugin import PluginInstaller
+from models.account import TenantPluginAutoUpgradeStrategy
+
+RETRY_TIMES_OF_ONE_PLUGIN_IN_ONE_TENANT = 3
+
+
+cached_plugin_manifests: dict[str, MarketplacePluginDeclaration] = {}
+
+
+def marketplace_batch_fetch_plugin_manifests(
+    plugin_ids_plain_list: list[str],
+) -> list[MarketplacePluginDeclaration]:
+    global cached_plugin_manifests
+    # return marketplace.batch_fetch_plugin_manifests(plugin_ids_plain_list)
+    not_included_plugin_ids = [
+        plugin_id for plugin_id in plugin_ids_plain_list if plugin_id not in cached_plugin_manifests
+    ]
+    if not_included_plugin_ids:
+        manifests = marketplace.batch_fetch_plugin_manifests_ignore_deserialization_error(not_included_plugin_ids)
+        for manifest in manifests:
+            cached_plugin_manifests[manifest.plugin_id] = manifest
+
+        if (
+            len(manifests) == 0
+        ):  # this indicates that the plugin not found in marketplace, should set None in cache to prevent future check
+            for plugin_id in not_included_plugin_ids:
+                cached_plugin_manifests[plugin_id] = None
+
+    return [
+        cached_plugin_manifests[plugin_id]
+        for plugin_id in plugin_ids_plain_list
+        if cached_plugin_manifests[plugin_id] is not None
+    ]
+
+
+@shared_task(queue="plugin")
+def process_tenant_plugin_autoupgrade_check_task(
+    tenant_id: str,
+    strategy_setting: TenantPluginAutoUpgradeStrategy.StrategySetting,
+    upgrade_time_of_day: int,
+    upgrade_mode: TenantPluginAutoUpgradeStrategy.UpgradeMode,
+    exclude_plugins: list[str],
+    include_plugins: list[str],
+):
+    try:
+        manager = PluginInstaller()
+
+        click.echo(
+            click.style(
+                "Checking upgradable plugin for tenant: {}".format(tenant_id),
+                fg="green",
+            )
+        )
+
+        if strategy_setting == TenantPluginAutoUpgradeStrategy.StrategySetting.DISABLED:
+            return
+
+        # 获取需要检查的插件
+        plugin_ids: list[tuple[str, str, str]] = []  # plugin_id, version, unique_identifier
+        click.echo(click.style("Upgrade mode: {}".format(upgrade_mode), fg="green"))
+
+        if upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.PARTIAL and include_plugins:
+            all_plugins = manager.list_plugins(tenant_id)
+
+            for plugin in all_plugins:
+                if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id in include_plugins:
+                    plugin_ids.append(
+                        (
+                            plugin.plugin_id,
+                            plugin.version,
+                            plugin.plugin_unique_identifier,
+                        )
+                    )
+
+        elif upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE:
+            # 获取所有插件并移除exclude的
+            all_plugins = manager.list_plugins(tenant_id)
+            plugin_ids = [
+                (plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier)
+                for plugin in all_plugins
+                if plugin.source == PluginInstallationSource.Marketplace and plugin.plugin_id not in exclude_plugins
+            ]
+        elif upgrade_mode == TenantPluginAutoUpgradeStrategy.UpgradeMode.ALL:
+            all_plugins = manager.list_plugins(tenant_id)
+            plugin_ids = [
+                (plugin.plugin_id, plugin.version, plugin.plugin_unique_identifier)
+                for plugin in all_plugins
+                if plugin.source == PluginInstallationSource.Marketplace
+            ]
+
+        if not plugin_ids:
+            return
+
+        plugin_ids_plain_list = [plugin_id for plugin_id, _, _ in plugin_ids]
+
+        manifests = marketplace_batch_fetch_plugin_manifests(plugin_ids_plain_list)
+
+        if not manifests:
+            return
+
+        for manifest in manifests:
+            for plugin_id, version, original_unique_identifier in plugin_ids:
+                if manifest.plugin_id != plugin_id:
+                    continue
+
+                try:
+                    current_version = version
+                    latest_version = manifest.latest_version
+
+                    def fix_only_checker(latest_version, current_version):
+                        latest_version_tuple = tuple(int(val) for val in latest_version.split("."))
+                        current_version_tuple = tuple(int(val) for val in current_version.split("."))
+
+                        if (
+                            latest_version_tuple[0] == current_version_tuple[0]
+                            and latest_version_tuple[1] == current_version_tuple[1]
+                        ):
+                            return latest_version_tuple[2] != current_version_tuple[2]
+                        return False
+
+                    version_checker = {
+                        TenantPluginAutoUpgradeStrategy.StrategySetting.LATEST: lambda latest_version,
+                        current_version: latest_version != current_version,
+                        TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY: fix_only_checker,
+                    }
+
+                    if version_checker[strategy_setting](latest_version, current_version):
+                        # 执行升级
+                        new_unique_identifier = manifest.latest_package_identifier
+
+                        marketplace.record_install_plugin_event(new_unique_identifier)
+                        click.echo(
+                            click.style(
+                                "Upgrade plugin: {} -> {}".format(original_unique_identifier, new_unique_identifier),
+                                fg="green",
+                            )
+                        )
+                        task_start_resp = manager.upgrade_plugin(
+                            tenant_id,
+                            original_unique_identifier,
+                            new_unique_identifier,
+                            PluginInstallationSource.Marketplace,
+                            {
+                                "plugin_unique_identifier": new_unique_identifier,
+                            },
+                        )
+                except Exception as e:
+                    click.echo(click.style("Error when upgrading plugin: {}".format(e), fg="red"))
+                    traceback.print_exc()
+                break
+
+    except Exception as e:
+        click.echo(click.style("Error when checking upgradable plugin: {}".format(e), fg="red"))
+        traceback.print_exc()
+        return

From 2c795ec301878aea7346d8b702ce6307e1f61e28 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Tue, 1 Jul 2025 17:54:51 +0800
Subject: [PATCH 23/39] feat: add plugin queue to celery cmd in entrypoint.sh

---
 api/docker/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/docker/entrypoint.sh b/api/docker/entrypoint.sh
index 18d4f4885d..59d652c11b 100755
--- a/api/docker/entrypoint.sh
+++ b/api/docker/entrypoint.sh
@@ -22,7 +22,7 @@ if [[ "${MODE}" == "worker" ]]; then
 
   exec celery -A app.celery worker -P ${CELERY_WORKER_CLASS:-gevent} $CONCURRENCY_OPTION \
     --max-tasks-per-child ${MAX_TASK_PRE_CHILD:-50} --loglevel ${LOG_LEVEL:-INFO} \
-    -Q ${CELERY_QUEUES:-dataset,mail,ops_trace,app_deletion}
+    -Q ${CELERY_QUEUES:-dataset,mail,ops_trace,app_deletion,plugin}
 
 elif [[ "${MODE}" == "beat" ]]; then
   exec celery -A app.celery beat --loglevel ${LOG_LEVEL:-INFO}

From 74d61fda2a93e98e2e40e5ebe7b1e3beb59b7b64 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 2 Jul 2025 15:04:56 +0800
Subject: [PATCH 24/39] fix: ruff format

---
 api/controllers/console/workspace/plugin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py
index 3b7c15688c..e998a8fbe6 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -533,7 +533,8 @@ class PluginFetchDynamicSelectOptionsApi(Resource):
             raise ValueError(e)
 
         return jsonable_encoder({"options": options})
-    
+
+
 class PluginChangePreferencesApi(Resource):
     @setup_required
     @login_required

From 40feb607c18b1c9dd4415bd858d92c48d7ad973a Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 2 Jul 2025 15:40:21 +0800
Subject: [PATCH 25/39] fix: type static check errors

---
 api/controllers/console/workspace/plugin.py   | 27 +++++++++----------
 .../plugin/plugin_auto_upgrade_service.py     |  2 +-
 ...ss_tenant_plugin_autoupgrade_check_task.py | 17 +++++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py
index e998a8fbe6..2875ccc6de 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -598,29 +598,26 @@ class PluginFetchPreferencesApi(Resource):
         tenant_id = current_user.current_tenant_id
 
         permission = PluginPermissionService.get_permission(tenant_id)
+        permission_dict = {
+            "install_permission": TenantPluginPermission.InstallPermission.EVERYONE,
+            "debug_permission": TenantPluginPermission.DebugPermission.EVERYONE,
+        }
 
-        if not permission:
-            permission = {
-                "install_permission": TenantPluginPermission.InstallPermission.EVERYONE,
-                "debug_permission": TenantPluginPermission.DebugPermission.EVERYONE,
-            }
-        else:
-            permission = {
-                "install_permission": permission.install_permission,
-                "debug_permission": permission.debug_permission,
-            }
+        if permission:
+            permission_dict["install_permission"] = permission.install_permission
+            permission_dict["debug_permission"] = permission.debug_permission
 
         auto_upgrade = PluginAutoUpgradeService.get_strategy(tenant_id)
-        if not auto_upgrade:
-            auto_upgrade = {
+        auto_upgrade_dict = {
                 "strategy_setting": TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY,
                 "upgrade_time_of_day": 0,
                 "upgrade_mode": TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE,
                 "exclude_plugins": [],
                 "include_plugins": [],
             }
-        else:
-            auto_upgrade = {
+        
+        if auto_upgrade:
+            auto_upgrade_dict = {
                 "strategy_setting": auto_upgrade.strategy_setting,
                 "upgrade_time_of_day": auto_upgrade.upgrade_time_of_day,
                 "upgrade_mode": auto_upgrade.upgrade_mode,
@@ -628,7 +625,7 @@ class PluginFetchPreferencesApi(Resource):
                 "include_plugins": auto_upgrade.include_plugins,
             }
 
-        return jsonable_encoder({"permission": permission, "auto_upgrade": auto_upgrade})
+        return jsonable_encoder({"permission": permission_dict, "auto_upgrade": auto_upgrade_dict})
 
 
 class PluginAutoUpgradeExcludePluginApi(Resource):
diff --git a/api/services/plugin/plugin_auto_upgrade_service.py b/api/services/plugin/plugin_auto_upgrade_service.py
index d05292a4bc..3774050445 100644
--- a/api/services/plugin/plugin_auto_upgrade_service.py
+++ b/api/services/plugin/plugin_auto_upgrade_service.py
@@ -22,7 +22,7 @@ class PluginAutoUpgradeService:
         upgrade_mode: TenantPluginAutoUpgradeStrategy.UpgradeMode,
         exclude_plugins: list[str],
         include_plugins: list[str],
-    ) -> None:
+    ) -> bool:
         with Session(db.engine) as session:
             exist_strategy = (
                 session.query(TenantPluginAutoUpgradeStrategy)
diff --git a/api/tasks/process_tenant_plugin_autoupgrade_check_task.py b/api/tasks/process_tenant_plugin_autoupgrade_check_task.py
index fc01b33f4e..42484814fe 100644
--- a/api/tasks/process_tenant_plugin_autoupgrade_check_task.py
+++ b/api/tasks/process_tenant_plugin_autoupgrade_check_task.py
@@ -1,7 +1,8 @@
 import traceback
+import typing
 
 import click
-from celery import shared_task
+from celery import shared_task  # type: ignore
 
 from core.helper import marketplace
 from core.helper.marketplace import MarketplacePluginDeclaration
@@ -12,7 +13,7 @@ from models.account import TenantPluginAutoUpgradeStrategy
 RETRY_TIMES_OF_ONE_PLUGIN_IN_ONE_TENANT = 3
 
 
-cached_plugin_manifests: dict[str, MarketplacePluginDeclaration] = {}
+cached_plugin_manifests: dict[str, typing.Union[MarketplacePluginDeclaration, None]] = {}
 
 
 def marketplace_batch_fetch_plugin_manifests(
@@ -34,11 +35,13 @@ def marketplace_batch_fetch_plugin_manifests(
             for plugin_id in not_included_plugin_ids:
                 cached_plugin_manifests[plugin_id] = None
 
-    return [
-        cached_plugin_manifests[plugin_id]
-        for plugin_id in plugin_ids_plain_list
-        if cached_plugin_manifests[plugin_id] is not None
-    ]
+    result: list[MarketplacePluginDeclaration] = []
+    for plugin_id in plugin_ids_plain_list:
+        final_manifest = cached_plugin_manifests.get(plugin_id)
+        if final_manifest is not None:
+            result.append(final_manifest)
+
+    return result
 
 
 @shared_task(queue="plugin")

From 23a5dc3e3256d39865ea63d952b53bb2ee3c3095 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 2 Jul 2025 15:45:22 +0800
Subject: [PATCH 26/39] fix: ruff format

---
 api/controllers/console/workspace/plugin.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py
index 2875ccc6de..2027ca6826 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -609,13 +609,13 @@ class PluginFetchPreferencesApi(Resource):
 
         auto_upgrade = PluginAutoUpgradeService.get_strategy(tenant_id)
         auto_upgrade_dict = {
-                "strategy_setting": TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY,
-                "upgrade_time_of_day": 0,
-                "upgrade_mode": TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE,
-                "exclude_plugins": [],
-                "include_plugins": [],
-            }
-        
+            "strategy_setting": TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY,
+            "upgrade_time_of_day": 0,
+            "upgrade_mode": TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE,
+            "exclude_plugins": [],
+            "include_plugins": [],
+        }
+
         if auto_upgrade:
             auto_upgrade_dict = {
                 "strategy_setting": auto_upgrade.strategy_setting,

From 2523f5870a205d5b5fb1aebe6555e24bf367104d Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Thu, 3 Jul 2025 16:10:59 +0800
Subject: [PATCH 27/39] fix: incorrect down_revision in db migration

---
 api/migrations/versions/2025_05_15_1635-16081485540c_.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/migrations/versions/2025_05_15_1635-16081485540c_.py b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
index 3db4754e2d..c2e1abc869 100644
--- a/api/migrations/versions/2025_05_15_1635-16081485540c_.py
+++ b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
@@ -12,7 +12,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '16081485540c'
-down_revision = 'd28f2004b072'
+down_revision = '0ab65e1cc7fa'
 branch_labels = None
 depends_on = None
 

From 5b0bbe7a3b7d1a1bde5ed5cf55bd03210c092bd6 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Thu, 3 Jul 2025 16:19:54 +0800
Subject: [PATCH 28/39] ci: add `build/**` branch to build and push ci

---
 .github/workflows/build-push.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index cc735ae67c..b933560a5e 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -6,6 +6,7 @@ on:
       - "main"
       - "deploy/dev"
       - "deploy/enterprise"
+      - "build/**"
     tags:
       - "*"
 

From 23a9ad23aea94fdf42e8ea22fe4c2775b8a339eb Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Tue, 24 Jun 2025 11:04:04 +0800
Subject: [PATCH 29/39] feat: auto update button

---
 .../base/icons/src/public/llm/OpenaiTeal.tsx  | 20 -------------------
 .../icons/src/public/llm/OpenaiYellow.tsx     | 20 -------------------
 .../base/icons/src/public/llm/index.ts        |  2 --
 3 files changed, 42 deletions(-)
 delete mode 100644 web/app/components/base/icons/src/public/llm/OpenaiTeal.tsx
 delete mode 100644 web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx

diff --git a/web/app/components/base/icons/src/public/llm/OpenaiTeal.tsx b/web/app/components/base/icons/src/public/llm/OpenaiTeal.tsx
deleted file mode 100644
index ab50b42a1e..0000000000
--- a/web/app/components/base/icons/src/public/llm/OpenaiTeal.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// GENERATE BY script
-// DON NOT EDIT IT MANUALLY
-
-import * as React from 'react'
-import data from './OpenaiTeal.json'
-import IconBase from '@/app/components/base/icons/IconBase'
-import type { IconData } from '@/app/components/base/icons/IconBase'
-
-const Icon = (
-  {
-    ref,
-    ...props
-  }: React.SVGProps<SVGSVGElement> & {
-    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
-  },
-) => <IconBase {...props} ref={ref} data={data as IconData} />
-
-Icon.displayName = 'OpenaiTeal'
-
-export default Icon
diff --git a/web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx b/web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx
deleted file mode 100644
index 77dac7e322..0000000000
--- a/web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// GENERATE BY script
-// DON NOT EDIT IT MANUALLY
-
-import * as React from 'react'
-import data from './OpenaiYellow.json'
-import IconBase from '@/app/components/base/icons/IconBase'
-import type { IconData } from '@/app/components/base/icons/IconBase'
-
-const Icon = (
-  {
-    ref,
-    ...props
-  }: React.SVGProps<SVGSVGElement> & {
-    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
-  },
-) => <IconBase {...props} ref={ref} data={data as IconData} />
-
-Icon.displayName = 'OpenaiYellow'
-
-export default Icon
diff --git a/web/app/components/base/icons/src/public/llm/index.ts b/web/app/components/base/icons/src/public/llm/index.ts
index fa4a1bdd10..cc9b531ebf 100644
--- a/web/app/components/base/icons/src/public/llm/index.ts
+++ b/web/app/components/base/icons/src/public/llm/index.ts
@@ -28,11 +28,9 @@ export { default as Microsoft } from './Microsoft'
 export { default as OpenaiBlack } from './OpenaiBlack'
 export { default as OpenaiBlue } from './OpenaiBlue'
 export { default as OpenaiGreen } from './OpenaiGreen'
-export { default as OpenaiTeal } from './OpenaiTeal'
 export { default as OpenaiText } from './OpenaiText'
 export { default as OpenaiTransparent } from './OpenaiTransparent'
 export { default as OpenaiViolet } from './OpenaiViolet'
-export { default as OpenaiYellow } from './OpenaiYellow'
 export { default as OpenllmText } from './OpenllmText'
 export { default as Openllm } from './Openllm'
 export { default as ReplicateText } from './ReplicateText'

From c919823000d090a5c017421dbcb2528c249a89d7 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Tue, 24 Jun 2025 15:36:10 +0800
Subject: [PATCH 30/39] feat: downgrade modal

---
 .../update-plugin/downgrade-warning-modal.tsx | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx

diff --git a/web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx b/web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx
new file mode 100644
index 0000000000..fa5e90d182
--- /dev/null
+++ b/web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx
@@ -0,0 +1,37 @@
+import { useTranslation } from 'react-i18next'
+import Modal from '@/app/components/base/modal'
+import Button from '@/app/components/base/button'
+
+type Props = {
+  onCancel: () => void
+  onSave: () => void
+  confirmDisabled?: boolean
+}
+const DowngradeWarningModal = ({
+  onCancel,
+  onSave,
+  confirmDisabled = false,
+}: Props) => {
+  const { t } = useTranslation()
+
+  return (
+    <Modal
+      isShow
+      onClose={() => onCancel()}
+      className='w-[480px]'
+    >
+      <div className='flex flex-col items-start gap-2 self-stretch pb-4'>
+        <div className='title-2xl-semi-bold text-text-primary'>Plugin Downgrade</div>
+        <div className='system-md-regular flex grow flex-col text-text-secondary'>
+        Auto-update is currently enabled for this plugin. Downgrading the version may cause your changes to be overwritten during the next automatic update.
+        </div>
+      </div>
+      <div className='flex items-start justify-end gap-2 self-stretch pt-6'>
+        <Button variant='secondary' onClick={() => onCancel()}>{t('app.newApp.Cancel')}</Button>
+        <Button variant='primary' destructive onClick={onSave} disabled={confirmDisabled}>{t('app.newApp.Confirm')}</Button>
+      </div>
+    </Modal>
+  )
+}
+
+export default DowngradeWarningModal

From 31976996f8b7daf0f4156c8e957ce7cf4324d95d Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Thu, 26 Jun 2025 10:48:11 +0800
Subject: [PATCH 31/39] feat: select box setting

---
 .../reference-setting-modal/auto-update-setting/tool-picker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
index fcd8f64519..5676bc37a0 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
@@ -113,7 +113,7 @@ const ToolPicker: FC<Props> = ({
     <PortalToFollowElem
         placement='top'
         offset={0}
-        open={isShow}
+        open={true}
         onOpenChange={onShowChange}
       >
         <PortalToFollowElemTrigger

From 22d0fadcd0dd6bfc896308f0bf52e350d59f53f5 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Fri, 27 Jun 2025 11:36:08 +0800
Subject: [PATCH 32/39] chore: add auto update show config

---
 .../base/icons/src/public/llm/OpenaiTale.json | 37 +++++++++++++++++++
 .../base/icons/src/public/llm/OpenaiTale.tsx  | 20 ++++++++++
 .../icons/src/public/llm/OpenaiYellow.tsx     | 20 ++++++++++
 .../base/icons/src/public/llm/index.ts        |  2 +
 4 files changed, 79 insertions(+)
 create mode 100644 web/app/components/base/icons/src/public/llm/OpenaiTale.json
 create mode 100644 web/app/components/base/icons/src/public/llm/OpenaiTale.tsx
 create mode 100644 web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx

diff --git a/web/app/components/base/icons/src/public/llm/OpenaiTale.json b/web/app/components/base/icons/src/public/llm/OpenaiTale.json
new file mode 100644
index 0000000000..b5d5a015ff
--- /dev/null
+++ b/web/app/components/base/icons/src/public/llm/OpenaiTale.json
@@ -0,0 +1,37 @@
+{
+  "icon": {
+    "type": "element",
+    "isRootNode": true,
+    "name": "svg",
+    "attributes": {
+      "width": "24",
+      "height": "24",
+      "viewBox": "0 0 24 24",
+      "fill": "none",
+      "xmlns": "http://www.w3.org/2000/svg"
+    },
+    "children": [
+      {
+        "type": "element",
+        "name": "rect",
+        "attributes": {
+          "width": "24",
+          "height": "24",
+          "rx": "6",
+          "fill": "#009688"
+        },
+        "children": []
+      },
+      {
+        "type": "element",
+        "name": "path",
+        "attributes": {
+          "d": "M19.7758 11.5959C19.9546 11.9948 20.0681 12.4213 20.1145 12.8563C20.1592 13.2913 20.1369 13.7315 20.044 14.1596C19.9529 14.5878 19.7947 14.9987 19.5746 15.377C19.4302 15.6298 19.2599 15.867 19.0639 16.0854C18.8696 16.3021 18.653 16.4981 18.4174 16.67C18.1801 16.842 17.9274 16.9864 17.6591 17.105C17.3926 17.222 17.1141 17.3114 16.8286 17.3698C16.6945 17.7859 16.4951 18.1797 16.2371 18.5339C15.9809 18.8881 15.6697 19.1993 15.3155 19.4555C14.9613 19.7134 14.5693 19.9129 14.1532 20.047C13.7371 20.1829 13.302 20.2499 12.8636 20.2499C12.573 20.2516 12.2807 20.2207 11.9953 20.1622C11.7116 20.102 11.433 20.0109 11.1665 19.8923C10.9 19.7736 10.6472 19.6258 10.4116 19.4538C10.1778 19.2819 9.96115 19.0841 9.76857 18.8658C9.33871 18.9586 8.89853 18.981 8.46351 18.9363C8.02849 18.8898 7.60207 18.7763 7.20143 18.5975C6.80252 18.4204 6.43284 18.1797 6.10786 17.8857C5.78289 17.5916 5.50606 17.2478 5.28769 16.8695C5.14153 16.6167 5.02117 16.3502 4.93004 16.0734C4.83891 15.7965 4.77873 15.5111 4.74778 15.2205C4.71683 14.9317 4.71855 14.6393 4.7495 14.3488C4.78045 14.0599 4.84407 13.7745 4.9352 13.4976C4.64289 13.1727 4.40217 12.803 4.22335 12.4041C4.04624 12.0034 3.93104 11.5787 3.88634 11.1437C3.83991 10.7087 3.86398 10.2685 3.95511 9.84036C4.04624 9.41222 4.20443 9.00127 4.42452 8.62299C4.56896 8.37023 4.73918 8.13123 4.93348 7.91458C5.12778 7.69793 5.34615 7.50191 5.58171 7.32997C5.81728 7.15802 6.07176 7.01187 6.33827 6.89495C6.6065 6.7763 6.88506 6.68861 7.17048 6.63015C7.3046 6.21232 7.50406 5.82029 7.76026 5.46608C8.01817 5.11188 8.32939 4.80066 8.6836 4.54274C9.03781 4.28654 9.42984 4.08708 9.84595 3.95125C10.2621 3.81713 10.6971 3.74835 11.1355 3.75007C11.4261 3.74835 11.7184 3.77758 12.0039 3.83776C12.2893 3.89794 12.5678 3.98736 12.8344 4.106C13.1009 4.22636 13.3536 4.37251 13.5892 4.54446C13.8248 4.71812 14.0414 4.91414 14.234 5.13251C14.6621 5.04138 15.1023 5.01903 15.5373 5.06373C15.9723 5.10844 16.3971 5.22364 16.7977 5.40074C17.1966 5.57957 17.5663 5.81857 17.8913 6.1126C18.2162 6.4049 18.4931 6.74707 18.7114 7.12707C18.8576 7.37811 18.9779 7.64463 19.0691 7.92318C19.1602 8.20001 19.2221 8.48544 19.2513 8.77602C19.2823 9.06661 19.2823 9.35892 19.2496 9.64951C19.2187 9.94009 19.155 10.2255 19.0639 10.5024C19.3579 10.8273 19.5969 11.1953 19.7758 11.5959ZM14.0466 18.9363C14.4214 18.7815 14.7619 18.5528 15.049 18.2657C15.3362 17.9785 15.5648 17.6381 15.7196 17.2615C15.8743 16.8867 15.9552 16.4843 15.9552 16.0785V12.2442C15.954 12.2407 15.9529 12.2367 15.9517 12.2321C15.9506 12.2287 15.9488 12.2252 15.9466 12.2218C15.9443 12.2184 15.9414 12.2155 15.938 12.2132C15.9345 12.2098 15.9311 12.2075 15.9276 12.2063L14.54 11.4051V16.0373C14.54 16.0837 14.5332 16.1318 14.5211 16.1765C14.5091 16.223 14.4919 16.2659 14.4678 16.3072C14.4438 16.3485 14.4162 16.3863 14.3819 16.419C14.3484 16.4523 14.3109 16.4812 14.2701 16.505L10.9842 18.4015C10.9567 18.4187 10.9103 18.4428 10.8862 18.4565C11.0221 18.5717 11.1699 18.6732 11.3247 18.7626C11.4811 18.852 11.6428 18.9277 11.8113 18.9896C11.9798 19.0497 12.1535 19.0962 12.3288 19.1271C12.5059 19.1581 12.6848 19.1735 12.8636 19.1735C13.2694 19.1735 13.6717 19.0927 14.0466 18.9363ZM6.22135 16.333C6.42596 16.6855 6.69592 16.9916 7.01745 17.2392C7.34071 17.4868 7.70695 17.6673 8.09899 17.7722C8.49102 17.8771 8.90025 17.9046 9.3026 17.8513C9.70495 17.798 10.0918 17.6673 10.4443 17.4644L13.7663 15.5472L13.7749 15.5386C13.7772 15.5363 13.7789 15.5329 13.78 15.5283C13.7823 15.5249 13.7841 15.5214 13.7852 15.518V13.9017L9.77545 16.2212C9.73418 16.2453 9.6912 16.2625 9.64649 16.2763C9.60007 16.2883 9.55364 16.2935 9.5055 16.2935C9.45907 16.2935 9.41265 16.2883 9.36622 16.2763C9.32152 16.2625 9.27681 16.2453 9.23554 16.2212L5.94967 14.323C5.92044 14.3058 5.87746 14.28 5.85339 14.2645C5.82244 14.4416 5.80696 14.6204 5.80696 14.7993C5.80696 14.9781 5.82415 15.1569 5.85511 15.334C5.88605 15.5094 5.9342 15.6831 5.99438 15.8516C6.05628 16.0201 6.13194 16.1817 6.22135 16.3364V16.333ZM5.35818 9.1629C5.15529 9.51539 5.02461 9.90398 4.97131 10.3063C4.918 10.7087 4.94552 11.1162 5.0504 11.51C5.15529 11.902 5.33583 12.2682 5.58343 12.5915C5.83103 12.913 6.13881 13.183 6.48958 13.3859L9.80984 15.3048C9.81328 15.3059 9.81729 15.3071 9.82188 15.3082H9.83391C9.8385 15.3082 9.84251 15.3071 9.84595 15.3048C9.84939 15.3036 9.85283 15.3019 9.85627 15.2996L11.249 14.4949L7.23926 12.1805C7.19971 12.1565 7.16189 12.1272 7.1275 12.0946C7.09418 12.0611 7.06529 12.0236 7.04153 11.9828C7.01917 11.9415 7.00026 11.8985 6.98822 11.8521C6.97619 11.8074 6.96931 11.761 6.97103 11.7128V7.80797C6.80252 7.86987 6.63917 7.94553 6.48442 8.03494C6.32967 8.12607 6.18352 8.22924 6.04596 8.34444C5.91013 8.45965 5.78289 8.58688 5.66769 8.72444C5.55248 8.86028 5.45103 9.00815 5.36162 9.1629H5.35818ZM16.7633 11.8177C16.8046 11.8418 16.8424 11.8693 16.8768 11.9037C16.9094 11.9364 16.9387 11.9742 16.9628 12.0155C16.9851 12.0567 17.004 12.1014 17.0161 12.1461C17.0264 12.1926 17.0332 12.239 17.0315 12.2871V16.192C17.5835 15.9891 18.0649 15.6332 18.4208 15.1655C18.7785 14.6978 18.9934 14.139 19.0433 13.5544C19.0931 12.9698 18.9762 12.3817 18.7046 11.8607C18.4329 11.3397 18.0185 10.9064 17.5095 10.6141L14.1893 8.69521C14.1858 8.69406 14.1818 8.69292 14.1772 8.69177H14.1652C14.1618 8.69292 14.1578 8.69406 14.1532 8.69521C14.1497 8.69636 14.1463 8.69808 14.1429 8.70037L12.757 9.50163L16.7667 11.8177H16.7633ZM18.1475 9.7372H18.1457V9.73892L18.1475 9.7372ZM18.1457 9.73548C18.2455 9.15774 18.1784 8.56281 17.9514 8.02119C17.7262 7.47956 17.3496 7.01359 16.8682 6.67658C16.3867 6.34128 15.8193 6.1487 15.233 6.12291C14.6449 6.09884 14.0638 6.24155 13.5548 6.53386L10.2345 8.45105C10.2311 8.45334 10.2282 8.45621 10.2259 8.45965L10.2191 8.46996C10.2179 8.4734 10.2168 8.47741 10.2156 8.482C10.2145 8.48544 10.2139 8.48945 10.2139 8.49403V10.0966L14.2237 7.78046C14.2649 7.75639 14.3096 7.7392 14.3543 7.72544C14.4008 7.7134 14.4472 7.70825 14.4936 7.70825C14.5418 7.70825 14.5882 7.7134 14.6346 7.72544C14.6793 7.7392 14.7223 7.75639 14.7636 7.78046L18.0494 9.67874C18.0787 9.69593 18.1217 9.72 18.1457 9.73548ZM9.45735 7.96101C9.45735 7.91458 9.46423 7.86816 9.47627 7.82173C9.4883 7.77702 9.5055 7.73232 9.52957 7.69105C9.55364 7.6515 9.58115 7.61368 9.61554 7.57929C9.64821 7.54662 9.68604 7.51739 9.72731 7.49503L13.0132 5.59848C13.0441 5.57957 13.0871 5.55549 13.1112 5.54346C12.6607 5.1669 12.1105 4.92618 11.5276 4.85224C10.9447 4.77658 10.3532 4.86943 9.82188 5.11875C9.28885 5.36807 8.83835 5.76527 8.52369 6.26047C8.20903 6.75739 8.04224 7.33169 8.04224 7.91974V11.7541C8.04339 11.7587 8.04454 11.7627 8.04568 11.7661C8.04683 11.7696 8.04855 11.773 8.05084 11.7765C8.05313 11.7799 8.056 11.7833 8.05944 11.7868C8.06173 11.7891 8.06517 11.7914 8.06976 11.7937L9.45735 12.5949V7.96101ZM10.2105 13.0282L11.997 14.0599L13.7835 13.0282V10.9666L11.9987 9.93493L10.2122 10.9666L10.2105 13.0282Z",
+          "fill": "white"
+        },
+        "children": []
+      }
+    ]
+  },
+  "name": "OpenaiTale"
+}
diff --git a/web/app/components/base/icons/src/public/llm/OpenaiTale.tsx b/web/app/components/base/icons/src/public/llm/OpenaiTale.tsx
new file mode 100644
index 0000000000..e7ae45e293
--- /dev/null
+++ b/web/app/components/base/icons/src/public/llm/OpenaiTale.tsx
@@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import * as React from 'react'
+import data from './OpenaiTale.json'
+import IconBase from '@/app/components/base/icons/IconBase'
+import type { IconData } from '@/app/components/base/icons/IconBase'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'OpenaiTale'
+
+export default Icon
diff --git a/web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx b/web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx
new file mode 100644
index 0000000000..77dac7e322
--- /dev/null
+++ b/web/app/components/base/icons/src/public/llm/OpenaiYellow.tsx
@@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import * as React from 'react'
+import data from './OpenaiYellow.json'
+import IconBase from '@/app/components/base/icons/IconBase'
+import type { IconData } from '@/app/components/base/icons/IconBase'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'OpenaiYellow'
+
+export default Icon
diff --git a/web/app/components/base/icons/src/public/llm/index.ts b/web/app/components/base/icons/src/public/llm/index.ts
index cc9b531ebf..289942ab86 100644
--- a/web/app/components/base/icons/src/public/llm/index.ts
+++ b/web/app/components/base/icons/src/public/llm/index.ts
@@ -31,7 +31,9 @@ export { default as OpenaiGreen } from './OpenaiGreen'
 export { default as OpenaiText } from './OpenaiText'
 export { default as OpenaiTransparent } from './OpenaiTransparent'
 export { default as OpenaiViolet } from './OpenaiViolet'
+export { default as OpenaiTale } from './OpenaiTale'
 export { default as OpenllmText } from './OpenllmText'
+export { default as OpenaiYellow } from './OpenaiYellow'
 export { default as Openllm } from './Openllm'
 export { default as ReplicateText } from './ReplicateText'
 export { default as Replicate } from './Replicate'

From ad40295b7540ad09e52d12257eb8c18fd2e3ffd1 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Fri, 27 Jun 2025 19:05:12 +0800
Subject: [PATCH 33/39] feat: handle downgrade install

---
 .../update-plugin/downgrade-warning-modal.tsx | 37 -------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx

diff --git a/web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx b/web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx
deleted file mode 100644
index fa5e90d182..0000000000
--- a/web/app/components/plugins/update-plugin/downgrade-warning-modal.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
-import Button from '@/app/components/base/button'
-
-type Props = {
-  onCancel: () => void
-  onSave: () => void
-  confirmDisabled?: boolean
-}
-const DowngradeWarningModal = ({
-  onCancel,
-  onSave,
-  confirmDisabled = false,
-}: Props) => {
-  const { t } = useTranslation()
-
-  return (
-    <Modal
-      isShow
-      onClose={() => onCancel()}
-      className='w-[480px]'
-    >
-      <div className='flex flex-col items-start gap-2 self-stretch pb-4'>
-        <div className='title-2xl-semi-bold text-text-primary'>Plugin Downgrade</div>
-        <div className='system-md-regular flex grow flex-col text-text-secondary'>
-        Auto-update is currently enabled for this plugin. Downgrading the version may cause your changes to be overwritten during the next automatic update.
-        </div>
-      </div>
-      <div className='flex items-start justify-end gap-2 self-stretch pt-6'>
-        <Button variant='secondary' onClick={() => onCancel()}>{t('app.newApp.Cancel')}</Button>
-        <Button variant='primary' destructive onClick={onSave} disabled={confirmDisabled}>{t('app.newApp.Confirm')}</Button>
-      </div>
-    </Modal>
-  )
-}
-
-export default DowngradeWarningModal

From 5d722c19a74312cc109855f2fa0b2b4566a5b340 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 9 Jul 2025 10:48:02 +0800
Subject: [PATCH 34/39] feat: add switch to config celery schedule tasks

---
 api/.env.example                             | 10 +++
 api/configs/feature/__init__.py              | 36 +++++++++++
 api/extensions/ext_celery.py                 | 67 +++++++++++---------
 api/schedule/check_upgradable_plugin_task.py |  3 +-
 4 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/api/.env.example b/api/.env.example
index baa9c382c8..01fcad599e 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -451,6 +451,16 @@ APP_MAX_ACTIVE_REQUESTS=0
 # Celery beat configuration
 CELERY_BEAT_SCHEDULER_TIME=1
 
+# Celery schedule tasks configuration
+ENABLE_CLEAN_EMBEDDING_CACHE_TASK=false
+ENABLE_CLEAN_UNUSED_DATASETS_TASK=false
+ENABLE_CREATE_TIDB_SERVERLESS_TASK=false
+ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK=false
+ENABLE_CLEAN_MESSAGES=false
+ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK=false
+ENABLE_DATASETS_QUEUE_MONITOR=false
+ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK=true
+
 # Position configuration
 POSITION_TOOL_PINS=
 POSITION_TOOL_INCLUDES=
diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
index df15b92c35..c2eaa89b6e 100644
--- a/api/configs/feature/__init__.py
+++ b/api/configs/feature/__init__.py
@@ -779,6 +779,41 @@ class CeleryBeatConfig(BaseSettings):
     )
 
 
+class CeleryScheduleTasksConfig(BaseSettings):
+    ENABLE_CLEAN_EMBEDDING_CACHE_TASK: bool = Field(
+        description="Enable clean embedding cache task",
+        default=False,
+    )
+    ENABLE_CLEAN_UNUSED_DATASETS_TASK: bool = Field(
+        description="Enable clean unused datasets task",
+        default=False,
+    )
+    ENABLE_CREATE_TIDB_SERVERLESS_TASK: bool = Field(
+        description="Enable create tidb service job task",
+        default=False,
+    )
+    ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK: bool = Field(
+        description="Enable update tidb service job status task",
+        default=False,
+    )
+    ENABLE_CLEAN_MESSAGES: bool = Field(
+        description="Enable clean messages task",
+        default=False,
+    )
+    ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK: bool = Field(
+        description="Enable mail clean document notify task",
+        default=False,
+    )
+    ENABLE_DATASETS_QUEUE_MONITOR: bool = Field(
+        description="Enable queue monitor task",
+        default=False,
+    )
+    ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK: bool = Field(
+        description="Enable check upgradable plugin task",
+        default=True,
+    )
+
+
 class PositionConfig(BaseSettings):
     POSITION_PROVIDER_PINS: str = Field(
         description="Comma-separated list of pinned model providers",
@@ -907,5 +942,6 @@ class FeatureConfig(
     # hosted services config
     HostedServiceConfig,
     CeleryBeatConfig,
+    CeleryScheduleTasksConfig,
 ):
     pass
diff --git a/api/extensions/ext_celery.py b/api/extensions/ext_celery.py
index be89705858..2c2846ba26 100644
--- a/api/extensions/ext_celery.py
+++ b/api/extensions/ext_celery.py
@@ -64,55 +64,62 @@ def init_app(app: DifyApp) -> Celery:
     celery_app.set_default()
     app.extensions["celery"] = celery_app
 
-    imports = [
-        "schedule.clean_embedding_cache_task",
-        "schedule.clean_unused_datasets_task",
-        "schedule.create_tidb_serverless_task",
-        "schedule.update_tidb_serverless_status_task",
-        "schedule.clean_messages",
-        "schedule.mail_clean_document_notify_task",
-        "schedule.queue_monitor_task",
-        "schedule.check_upgradable_plugin_task",
-    ]
+    imports = []
     day = dify_config.CELERY_BEAT_SCHEDULER_TIME
-    beat_schedule = {
-        "clean_embedding_cache_task": {
+
+    # if you add a new task, please add the switch to CeleryScheduleTasksConfig
+    beat_schedule = {}
+    if dify_config.ENABLE_CLEAN_EMBEDDING_CACHE_TASK:
+        imports.append("schedule.clean_embedding_cache_task")
+        beat_schedule["clean_embedding_cache_task"] = {
             "task": "schedule.clean_embedding_cache_task.clean_embedding_cache_task",
             "schedule": timedelta(days=day),
-        },
-        "clean_unused_datasets_task": {
+        }
+    if dify_config.ENABLE_CLEAN_UNUSED_DATASETS_TASK:
+        imports.append("schedule.clean_unused_datasets_task")
+        beat_schedule["clean_unused_datasets_task"] = {
             "task": "schedule.clean_unused_datasets_task.clean_unused_datasets_task",
             "schedule": timedelta(days=day),
-        },
-        "create_tidb_serverless_task": {
+        }
+    if dify_config.ENABLE_CREATE_TIDB_SERVERLESS_TASK:
+        imports.append("schedule.create_tidb_serverless_task")
+        beat_schedule["create_tidb_serverless_task"] = {
             "task": "schedule.create_tidb_serverless_task.create_tidb_serverless_task",
             "schedule": crontab(minute="0", hour="*"),
-        },
-        "update_tidb_serverless_status_task": {
+        }
+    if dify_config.ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK:
+        imports.append("schedule.update_tidb_serverless_status_task")
+        beat_schedule["update_tidb_serverless_status_task"] = {
             "task": "schedule.update_tidb_serverless_status_task.update_tidb_serverless_status_task",
             "schedule": timedelta(minutes=10),
-        },
-        "clean_messages": {
+        }
+    if dify_config.ENABLE_CLEAN_MESSAGES:
+        imports.append("schedule.clean_messages")
+        beat_schedule["clean_messages"] = {
             "task": "schedule.clean_messages.clean_messages",
             "schedule": timedelta(days=day),
-        },
-        # every Monday
-        "mail_clean_document_notify_task": {
+        }
+    if dify_config.ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK:
+        imports.append("schedule.mail_clean_document_notify_task")
+        beat_schedule["mail_clean_document_notify_task"] = {
             "task": "schedule.mail_clean_document_notify_task.mail_clean_document_notify_task",
             "schedule": crontab(minute="0", hour="10", day_of_week="1"),
-        },
-        "datasets-queue-monitor": {
+        }
+    if dify_config.ENABLE_DATASETS_QUEUE_MONITOR:
+        imports.append("schedule.queue_monitor_task")
+        beat_schedule["datasets-queue-monitor"] = {
             "task": "schedule.queue_monitor_task.queue_monitor_task",
             "schedule": timedelta(
                 minutes=dify_config.QUEUE_MONITOR_INTERVAL if dify_config.QUEUE_MONITOR_INTERVAL else 30
             ),
-        },
-        # every 15 minutes
-        "check_upgradable_plugin_task": {
+        }
+    if dify_config.ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK:
+        imports.append("schedule.check_upgradable_plugin_task")
+        beat_schedule["check_upgradable_plugin_task"] = {
             "task": "schedule.check_upgradable_plugin_task.check_upgradable_plugin_task",
             "schedule": crontab(minute="*/15"),
-        },
-    }
+        }
+
     celery_app.conf.update(beat_schedule=beat_schedule, imports=imports)
 
     return celery_app
diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py
index bfe24c7b83..c1d6018827 100644
--- a/api/schedule/check_upgradable_plugin_task.py
+++ b/api/schedule/check_upgradable_plugin_task.py
@@ -15,10 +15,9 @@ def check_upgradable_plugin_task():
     click.echo(click.style("Start check upgradable plugin.", fg="green"))
     start_at = time.perf_counter()
 
-    now_seconds_of_day = time.time() % 86400  # we assume the tz is UTC
+    now_seconds_of_day = time.time() % 86400 - 30  # we assume the tz is UTC
     click.echo(click.style("Now seconds of day: {}".format(now_seconds_of_day), fg="green"))
 
-    # 获取需要在下一个AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL内执行的策略
     strategies = (
         db.session.query(TenantPluginAutoUpgradeStrategy)
         .filter(

From a2f64e23c9dc293a15fce86aaafaaae8d85f874e Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 9 Jul 2025 10:54:54 +0800
Subject: [PATCH 35/39] chore: add scheduler tasks switch in docker .env

---
 docker/.env.example | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docker/.env.example b/docker/.env.example
index a403f25cb2..29f2ec957a 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -1138,3 +1138,13 @@ QUEUE_MONITOR_THRESHOLD=200
 QUEUE_MONITOR_ALERT_EMAILS=
 # Monitor interval in minutes, default is 30 minutes
 QUEUE_MONITOR_INTERVAL=30
+
+# Celery schedule tasks configuration
+ENABLE_CLEAN_EMBEDDING_CACHE_TASK=false
+ENABLE_CLEAN_UNUSED_DATASETS_TASK=false
+ENABLE_CREATE_TIDB_SERVERLESS_TASK=false
+ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK=false
+ENABLE_CLEAN_MESSAGES=false
+ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK=false
+ENABLE_DATASETS_QUEUE_MONITOR=false
+ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK=true
\ No newline at end of file

From 1016678ea48656c944bd6cc1792379aa126dba9e Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 9 Jul 2025 11:03:55 +0800
Subject: [PATCH 36/39] chore: add scheduler tasks switch in docker .env

---
 docker/docker-compose.yaml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 0a95251ff0..df495bfa7f 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -514,6 +514,14 @@ x-shared-env: &shared-api-worker-env
   QUEUE_MONITOR_THRESHOLD: ${QUEUE_MONITOR_THRESHOLD:-200}
   QUEUE_MONITOR_ALERT_EMAILS: ${QUEUE_MONITOR_ALERT_EMAILS:-}
   QUEUE_MONITOR_INTERVAL: ${QUEUE_MONITOR_INTERVAL:-30}
+  ENABLE_CLEAN_EMBEDDING_CACHE_TASK: ${ENABLE_CLEAN_EMBEDDING_CACHE_TASK:-false}
+  ENABLE_CLEAN_UNUSED_DATASETS_TASK: ${ENABLE_CLEAN_UNUSED_DATASETS_TASK:-false}
+  ENABLE_CREATE_TIDB_SERVERLESS_TASK: ${ENABLE_CREATE_TIDB_SERVERLESS_TASK:-false}
+  ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK: ${ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK:-false}
+  ENABLE_CLEAN_MESSAGES: ${ENABLE_CLEAN_MESSAGES:-false}
+  ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK: ${ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK:-false}
+  ENABLE_DATASETS_QUEUE_MONITOR: ${ENABLE_DATASETS_QUEUE_MONITOR:-false}
+  ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK: ${ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK:-true}
 
 services:
   # API service
@@ -571,6 +579,28 @@ services:
       - ssrf_proxy_network
       - default
 
+  # worker_beat service
+  # Celery beat for scheduling periodic tasks.
+  worker_beat:
+    image: langgenius/dify-api:1.5.0
+    restart: always
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-worker-env
+      # Startup mode, 'worker_beat' starts the Celery beat for scheduling periodic tasks.
+      MODE: beat
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+    volumes:
+      # Mount the storage directory to the container, for storing user files.
+      - ./volumes/app/storage:/app/api/storage
+    networks:
+      - ssrf_proxy_network
+      - default
+
   # Frontend web application.
   web:
     image: langgenius/dify-web:1.5.1

From 6a29b9f766053d0cb776fdab0518ffe08d30606d Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 9 Jul 2025 11:06:32 +0800
Subject: [PATCH 37/39] chore: add worker_beat to docker compose template

---
 docker/docker-compose-template.yaml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index fd7c78c7e7..954ba16be1 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -55,6 +55,28 @@ services:
       - ssrf_proxy_network
       - default
 
+  # worker_beat service
+  # Celery beat for scheduling periodic tasks.
+  worker_beat:
+    image: langgenius/dify-api:1.5.0
+    restart: always
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-worker-env
+      # Startup mode, 'worker_beat' starts the Celery beat for scheduling periodic tasks.
+      MODE: beat
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+    volumes:
+      # Mount the storage directory to the container, for storing user files.
+      - ./volumes/app/storage:/app/api/storage
+    networks:
+      - ssrf_proxy_network
+      - default
+
   # Frontend web application.
   web:
     image: langgenius/dify-web:1.5.1

From 5e7a7cc0c7a03e9d56030875d738a1b3e35085b8 Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 9 Jul 2025 15:06:00 +0800
Subject: [PATCH 38/39] feat: create default autoupgrade strategy on tenant
 creating

---
 api/services/account_service.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/api/services/account_service.py b/api/services/account_service.py
index 2ba6f4345b..d9a9c4f280 100644
--- a/api/services/account_service.py
+++ b/api/services/account_service.py
@@ -28,6 +28,7 @@ from models.account import (
     Tenant,
     TenantAccountJoin,
     TenantAccountRole,
+    TenantPluginAutoUpgradeStrategy,
     TenantStatus,
 )
 from models.model import DifySetup
@@ -611,6 +612,17 @@ class TenantService:
         db.session.add(tenant)
         db.session.commit()
 
+        plugin_upgrade_strategy = TenantPluginAutoUpgradeStrategy(
+            tenant_id=tenant.id,
+            strategy_setting=TenantPluginAutoUpgradeStrategy.StrategySetting.FIX_ONLY,
+            upgrade_time_of_day=0,
+            upgrade_mode=TenantPluginAutoUpgradeStrategy.UpgradeMode.EXCLUDE,
+            exclude_plugins=[],
+            include_plugins=[],
+        )
+        db.session.add(plugin_upgrade_strategy)
+        db.session.commit()
+
         tenant.encrypt_public_key = generate_key_pair(tenant.id)
         db.session.commit()
         return tenant

From a519a7c50ccb965b71effca1909e7c9f4d49593a Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Thu, 10 Jul 2025 14:32:11 +0800
Subject: [PATCH 39/39] fix: db migration

---
 api/migrations/versions/2025_05_15_1635-16081485540c_.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/migrations/versions/2025_05_15_1635-16081485540c_.py b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
index c2e1abc869..70ed771391 100644
--- a/api/migrations/versions/2025_05_15_1635-16081485540c_.py
+++ b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
@@ -12,7 +12,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '16081485540c'
-down_revision = '0ab65e1cc7fa'
+down_revision = '58eb7bdb93fe'
 branch_labels = None
 depends_on = None