diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index b6c9131c08..9c79dbc57e 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -89,7 +89,9 @@ jobs:
       - name: Web style check
         if: steps.changed-files.outputs.any_changed == 'true'
         working-directory: ./web
-        run: pnpm run lint
+        run: |
+          pnpm run lint
+          pnpm run eslint
 
   docker-compose-template:
     name: Docker Compose Template
diff --git a/api/controllers/console/auth/oauth_server.py b/api/controllers/console/auth/oauth_server.py
index 19ca464a79..f730cfa3fe 100644
--- a/api/controllers/console/auth/oauth_server.py
+++ b/api/controllers/console/auth/oauth_server.py
@@ -44,22 +44,19 @@ def oauth_server_access_token_required(view):
         if not oauth_provider_app or not isinstance(oauth_provider_app, OAuthProviderApp):
             raise BadRequest("Invalid oauth_provider_app")
 
-        if not request.headers.get("Authorization"):
-            raise BadRequest("Authorization is required")
-
         authorization_header = request.headers.get("Authorization")
         if not authorization_header:
             raise BadRequest("Authorization header is required")
 
-        parts = authorization_header.split(" ")
+        parts = authorization_header.strip().split(" ")
         if len(parts) != 2:
             raise BadRequest("Invalid Authorization header format")
 
-        token_type = parts[0]
-        if token_type != "Bearer":
+        token_type = parts[0].strip()
+        if token_type.lower() != "bearer":
             raise BadRequest("token_type is invalid")
 
-        access_token = parts[1]
+        access_token = parts[1].strip()
         if not access_token:
             raise BadRequest("access_token is required")
 
@@ -125,7 +122,10 @@ class OAuthServerUserTokenApi(Resource):
         parser.add_argument("refresh_token", type=str, required=False, location="json")
         parsed_args = parser.parse_args()
 
-        grant_type = OAuthGrantType(parsed_args["grant_type"])
+        try:
+            grant_type = OAuthGrantType(parsed_args["grant_type"])
+        except ValueError:
+            raise BadRequest("invalid grant_type")
 
         if grant_type == OAuthGrantType.AUTHORIZATION_CODE:
             if not parsed_args["code"]:
@@ -163,8 +163,6 @@ class OAuthServerUserTokenApi(Resource):
                     "refresh_token": refresh_token,
                 }
             )
-        else:
-            raise BadRequest("invalid grant_type")
 
 
 class OAuthServerUserAccountApi(Resource):
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 8d50b0d41c..22bb81f9e3 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -354,9 +354,6 @@ class DatasetInitApi(Resource):
         parser.add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
         args = parser.parse_args()
 
-        # The role of the current user in the ta table must be admin, owner, or editor, or dataset_operator
-        if not current_user.is_dataset_editor:
-            raise Forbidden()
         knowledge_config = KnowledgeConfig(**args)
         if knowledge_config.indexing_technique == "high_quality":
             if knowledge_config.embedding_model is None or knowledge_config.embedding_model_provider is None:
diff --git a/api/controllers/inner_api/wraps.py b/api/controllers/inner_api/wraps.py
index c5aa318f58..de4f1da801 100644
--- a/api/controllers/inner_api/wraps.py
+++ b/api/controllers/inner_api/wraps.py
@@ -1,8 +1,12 @@
 from base64 import b64encode
+from collections.abc import Callable
 from functools import wraps
 from hashlib import sha1
 from hmac import new as hmac_new
+from typing import ParamSpec, TypeVar
 
+P = ParamSpec("P")
+R = TypeVar("R")
 from flask import abort, request
 
 from configs import dify_config
@@ -10,9 +14,9 @@ from extensions.ext_database import db
 from models.model import EndUser
 
 
-def billing_inner_api_only(view):
+def billing_inner_api_only(view: Callable[P, R]):
     @wraps(view)
-    def decorated(*args, **kwargs):
+    def decorated(*args: P.args, **kwargs: P.kwargs):
         if not dify_config.INNER_API:
             abort(404)
 
@@ -26,9 +30,9 @@ def billing_inner_api_only(view):
     return decorated
 
 
-def enterprise_inner_api_only(view):
+def enterprise_inner_api_only(view: Callable[P, R]):
     @wraps(view)
-    def decorated(*args, **kwargs):
+    def decorated(*args: P.args, **kwargs: P.kwargs):
         if not dify_config.INNER_API:
             abort(404)
 
@@ -78,9 +82,9 @@ def enterprise_inner_api_user_auth(view):
     return decorated
 
 
-def plugin_inner_api_only(view):
+def plugin_inner_api_only(view: Callable[P, R]):
     @wraps(view)
-    def decorated(*args, **kwargs):
+    def decorated(*args: P.args, **kwargs: P.kwargs):
         if not dify_config.PLUGIN_DAEMON_KEY:
             abort(404)
 
diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py
index d2473c15af..cc4b5f65bd 100644
--- a/api/controllers/service_api/wraps.py
+++ b/api/controllers/service_api/wraps.py
@@ -1,7 +1,7 @@
 import time
 from collections.abc import Callable
 from datetime import timedelta
-from enum import Enum
+from enum import StrEnum, auto
 from functools import wraps
 from typing import Optional
 
@@ -23,14 +23,14 @@ from models.model import ApiToken, App, EndUser
 from services.feature_service import FeatureService
 
 
-class WhereisUserArg(Enum):
+class WhereisUserArg(StrEnum):
     """
     Enum for whereis_user_arg.
     """
 
-    QUERY = "query"
-    JSON = "json"
-    FORM = "form"
+    QUERY = auto()
+    JSON = auto()
+    FORM = auto()
 
 
 class FetchUserArg(BaseModel):
diff --git a/api/core/agent/base_agent_runner.py b/api/core/agent/base_agent_runner.py
index f7c83f927f..f5e45bcb47 100644
--- a/api/core/agent/base_agent_runner.py
+++ b/api/core/agent/base_agent_runner.py
@@ -334,7 +334,8 @@ class BaseAgentRunner(AppRunner):
         """
         Save agent thought
         """
-        agent_thought = db.session.query(MessageAgentThought).where(MessageAgentThought.id == agent_thought_id).first()
+        stmt = select(MessageAgentThought).where(MessageAgentThought.id == agent_thought_id)
+        agent_thought = db.session.scalar(stmt)
         if not agent_thought:
             raise ValueError("agent thought not found")
 
@@ -492,7 +493,8 @@ class BaseAgentRunner(AppRunner):
         return result
 
     def organize_agent_user_prompt(self, message: Message) -> UserPromptMessage:
-        files = db.session.query(MessageFile).where(MessageFile.message_id == message.id).all()
+        stmt = select(MessageFile).where(MessageFile.message_id == message.id)
+        files = db.session.scalars(stmt).all()
         if not files:
             return UserPromptMessage(content=message.query)
         if message.app_model_config:
diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py
index 52ae20ee16..74e282fdcd 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -450,6 +450,12 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
 
         worker_thread.start()
 
+        # release database connection, because the following new thread operations may take a long time
+        db.session.refresh(workflow)
+        db.session.refresh(message)
+        db.session.refresh(user)
+        db.session.close()
+
         # return response or stream generator
         response = self._handle_advanced_chat_response(
             application_generate_entity=application_generate_entity,
diff --git a/api/core/app/apps/advanced_chat/app_runner.py b/api/core/app/apps/advanced_chat/app_runner.py
index 452dbbec01..2a8efad15e 100644
--- a/api/core/app/apps/advanced_chat/app_runner.py
+++ b/api/core/app/apps/advanced_chat/app_runner.py
@@ -73,7 +73,9 @@ class AdvancedChatAppRunner(WorkflowBasedAppRunner):
         app_config = self.application_generate_entity.app_config
         app_config = cast(AdvancedChatAppConfig, app_config)
 
-        app_record = db.session.query(App).where(App.id == app_config.app_id).first()
+        with Session(db.engine, expire_on_commit=False) as session:
+            app_record = session.scalar(select(App).where(App.id == app_config.app_id))
+
         if not app_record:
             raise ValueError("App not found")
 
@@ -147,7 +149,7 @@ class AdvancedChatAppRunner(WorkflowBasedAppRunner):
                 environment_variables=self._workflow.environment_variables,
                 # Based on the definition of `VariableUnion`,
                 # `list[Variable]` can be safely used as `list[VariableUnion]` since they are compatible.
-                conversation_variables=cast(list[VariableUnion], conversation_variables),
+                conversation_variables=conversation_variables,
             )
 
             # init graph
diff --git a/api/core/app/apps/advanced_chat/generate_task_pipeline.py b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
index b08bd9c872..10e51ff338 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -68,7 +68,6 @@ from core.workflow.repositories.workflow_execution_repository import WorkflowExe
 from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
 from core.workflow.system_variable import SystemVariable
 from core.workflow.workflow_cycle_manager import CycleManagerWorkflowInfo, WorkflowCycleManager
-from events.message_event import message_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models import Conversation, EndUser, Message, MessageFile
@@ -886,10 +885,6 @@ class AdvancedChatAppGenerateTaskPipeline:
             self._task_state.metadata.usage = usage
         else:
             self._task_state.metadata.usage = LLMUsage.empty_usage()
-        message_was_created.send(
-            message,
-            application_generate_entity=self._application_generate_entity,
-        )
 
     def _message_end_to_stream_response(self) -> MessageEndStreamResponse:
         """
diff --git a/api/core/app/apps/agent_chat/app_runner.py b/api/core/app/apps/agent_chat/app_runner.py
index 39d6ba39f5..d3207365f3 100644
--- a/api/core/app/apps/agent_chat/app_runner.py
+++ b/api/core/app/apps/agent_chat/app_runner.py
@@ -1,6 +1,8 @@
 import logging
 from typing import cast
 
+from sqlalchemy import select
+
 from core.agent.cot_chat_agent_runner import CotChatAgentRunner
 from core.agent.cot_completion_agent_runner import CotCompletionAgentRunner
 from core.agent.entities import AgentEntity
@@ -44,8 +46,8 @@ class AgentChatAppRunner(AppRunner):
         """
         app_config = application_generate_entity.app_config
         app_config = cast(AgentChatAppConfig, app_config)
-
-        app_record = db.session.query(App).where(App.id == app_config.app_id).first()
+        app_stmt = select(App).where(App.id == app_config.app_id)
+        app_record = db.session.scalar(app_stmt)
         if not app_record:
             raise ValueError("App not found")
 
@@ -182,11 +184,12 @@ class AgentChatAppRunner(AppRunner):
 
         if {ModelFeature.MULTI_TOOL_CALL, ModelFeature.TOOL_CALL}.intersection(model_schema.features or []):
             agent_entity.strategy = AgentEntity.Strategy.FUNCTION_CALLING
-
-        conversation_result = db.session.query(Conversation).where(Conversation.id == conversation.id).first()
+        conversation_stmt = select(Conversation).where(Conversation.id == conversation.id)
+        conversation_result = db.session.scalar(conversation_stmt)
         if conversation_result is None:
             raise ValueError("Conversation not found")
-        message_result = db.session.query(Message).where(Message.id == message.id).first()
+        msg_stmt = select(Message).where(Message.id == message.id)
+        message_result = db.session.scalar(msg_stmt)
         if message_result is None:
             raise ValueError("Message not found")
         db.session.close()
diff --git a/api/core/app/apps/base_app_queue_manager.py b/api/core/app/apps/base_app_queue_manager.py
index 2cffe4a0a5..feacca1a07 100644
--- a/api/core/app/apps/base_app_queue_manager.py
+++ b/api/core/app/apps/base_app_queue_manager.py
@@ -1,7 +1,7 @@
 import queue
 import time
 from abc import abstractmethod
-from enum import Enum
+from enum import IntEnum, auto
 from typing import Any, Optional
 
 from sqlalchemy.orm import DeclarativeMeta
@@ -19,9 +19,9 @@ from core.app.entities.queue_entities import (
 from extensions.ext_redis import redis_client
 
 
-class PublishFrom(Enum):
-    APPLICATION_MANAGER = 1
-    TASK_PIPELINE = 2
+class PublishFrom(IntEnum):
+    APPLICATION_MANAGER = auto()
+    TASK_PIPELINE = auto()
 
 
 class AppQueueManager:
diff --git a/api/core/app/apps/chat/app_runner.py b/api/core/app/apps/chat/app_runner.py
index 894d7906d5..4385d0f08d 100644
--- a/api/core/app/apps/chat/app_runner.py
+++ b/api/core/app/apps/chat/app_runner.py
@@ -1,6 +1,8 @@
 import logging
 from typing import cast
 
+from sqlalchemy import select
+
 from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
 from core.app.apps.base_app_runner import AppRunner
 from core.app.apps.chat.app_config_manager import ChatAppConfig
@@ -42,8 +44,8 @@ class ChatAppRunner(AppRunner):
         """
         app_config = application_generate_entity.app_config
         app_config = cast(ChatAppConfig, app_config)
-
-        app_record = db.session.query(App).where(App.id == app_config.app_id).first()
+        stmt = select(App).where(App.id == app_config.app_id)
+        app_record = db.session.scalar(stmt)
         if not app_record:
             raise ValueError("App not found")
 
diff --git a/api/core/app/apps/completion/app_generator.py b/api/core/app/apps/completion/app_generator.py
index 64dade2968..8d2f3d488b 100644
--- a/api/core/app/apps/completion/app_generator.py
+++ b/api/core/app/apps/completion/app_generator.py
@@ -6,6 +6,7 @@ from typing import Any, Literal, Union, overload
 
 from flask import Flask, copy_current_request_context, current_app
 from pydantic import ValidationError
+from sqlalchemy import select
 
 from configs import dify_config
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
@@ -248,17 +249,14 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
         :param invoke_from: invoke from source
         :param stream: is stream
         """
-        message = (
-            db.session.query(Message)
-            .where(
-                Message.id == message_id,
-                Message.app_id == app_model.id,
-                Message.from_source == ("api" if isinstance(user, EndUser) else "console"),
-                Message.from_end_user_id == (user.id if isinstance(user, EndUser) else None),
-                Message.from_account_id == (user.id if isinstance(user, Account) else None),
-            )
-            .first()
+        stmt = select(Message).where(
+            Message.id == message_id,
+            Message.app_id == app_model.id,
+            Message.from_source == ("api" if isinstance(user, EndUser) else "console"),
+            Message.from_end_user_id == (user.id if isinstance(user, EndUser) else None),
+            Message.from_account_id == (user.id if isinstance(user, Account) else None),
         )
+        message = db.session.scalar(stmt)
 
         if not message:
             raise MessageNotExistsError()
diff --git a/api/core/app/apps/completion/app_runner.py b/api/core/app/apps/completion/app_runner.py
index 50d2a0036c..d384bff255 100644
--- a/api/core/app/apps/completion/app_runner.py
+++ b/api/core/app/apps/completion/app_runner.py
@@ -1,6 +1,8 @@
 import logging
 from typing import cast
 
+from sqlalchemy import select
+
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.base_app_runner import AppRunner
 from core.app.apps.completion.app_config_manager import CompletionAppConfig
@@ -35,8 +37,8 @@ class CompletionAppRunner(AppRunner):
         """
         app_config = application_generate_entity.app_config
         app_config = cast(CompletionAppConfig, app_config)
-
-        app_record = db.session.query(App).where(App.id == app_config.app_id).first()
+        stmt = select(App).where(App.id == app_config.app_id)
+        app_record = db.session.scalar(stmt)
         if not app_record:
             raise ValueError("App not found")
 
diff --git a/api/core/app/apps/message_based_app_generator.py b/api/core/app/apps/message_based_app_generator.py
index 11c979765b..92f3b6507c 100644
--- a/api/core/app/apps/message_based_app_generator.py
+++ b/api/core/app/apps/message_based_app_generator.py
@@ -3,6 +3,9 @@ import logging
 from collections.abc import Generator
 from typing import Optional, Union, cast
 
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
 from core.app.app_config.entities import EasyUIBasedAppConfig, EasyUIBasedAppModelConfigFrom
 from core.app.apps.base_app_generator import BaseAppGenerator
 from core.app.apps.base_app_queue_manager import AppQueueManager
@@ -83,11 +86,10 @@ class MessageBasedAppGenerator(BaseAppGenerator):
 
     def _get_app_model_config(self, app_model: App, conversation: Optional[Conversation] = None) -> AppModelConfig:
         if conversation:
-            app_model_config = (
-                db.session.query(AppModelConfig)
-                .where(AppModelConfig.id == conversation.app_model_config_id, AppModelConfig.app_id == app_model.id)
-                .first()
+            stmt = select(AppModelConfig).where(
+                AppModelConfig.id == conversation.app_model_config_id, AppModelConfig.app_id == app_model.id
             )
+            app_model_config = db.session.scalar(stmt)
 
             if not app_model_config:
                 raise AppModelConfigBrokenError()
@@ -253,7 +255,8 @@ class MessageBasedAppGenerator(BaseAppGenerator):
         :param conversation_id: conversation id
         :return: conversation
         """
-        conversation = db.session.query(Conversation).where(Conversation.id == conversation_id).first()
+        with Session(db.engine, expire_on_commit=False) as session:
+            conversation = session.scalar(select(Conversation).where(Conversation.id == conversation_id))
 
         if not conversation:
             raise ConversationNotExistsError("Conversation not exists")
@@ -266,7 +269,8 @@ class MessageBasedAppGenerator(BaseAppGenerator):
         :param message_id: message id
         :return: message
         """
-        message = db.session.query(Message).where(Message.id == message_id).first()
+        with Session(db.engine, expire_on_commit=False) as session:
+            message = session.scalar(select(Message).where(Message.id == message_id))
 
         if message is None:
             raise MessageNotExistsError("Message not exists")
diff --git a/api/core/app/features/annotation_reply/annotation_reply.py b/api/core/app/features/annotation_reply/annotation_reply.py
index b829340401..be183e2086 100644
--- a/api/core/app/features/annotation_reply/annotation_reply.py
+++ b/api/core/app/features/annotation_reply/annotation_reply.py
@@ -1,6 +1,8 @@
 import logging
 from typing import Optional
 
+from sqlalchemy import select
+
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.rag.datasource.vdb.vector_factory import Vector
 from extensions.ext_database import db
@@ -25,9 +27,8 @@ class AnnotationReplyFeature:
         :param invoke_from: invoke from
         :return:
         """
-        annotation_setting = (
-            db.session.query(AppAnnotationSetting).where(AppAnnotationSetting.app_id == app_record.id).first()
-        )
+        stmt = select(AppAnnotationSetting).where(AppAnnotationSetting.app_id == app_record.id)
+        annotation_setting = db.session.scalar(stmt)
 
         if not annotation_setting:
             return None
diff --git a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
index 471118c8cb..e3b917067f 100644
--- a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
+++ b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
@@ -472,9 +472,10 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
         :param event: agent thought event
         :return:
         """
-        agent_thought: Optional[MessageAgentThought] = (
-            db.session.query(MessageAgentThought).where(MessageAgentThought.id == event.agent_thought_id).first()
-        )
+        with Session(db.engine, expire_on_commit=False) as session:
+            agent_thought: Optional[MessageAgentThought] = (
+                session.query(MessageAgentThought).where(MessageAgentThought.id == event.agent_thought_id).first()
+            )
 
         if agent_thought:
             return AgentThoughtStreamResponse(
diff --git a/api/core/app/task_pipeline/message_cycle_manager.py b/api/core/app/task_pipeline/message_cycle_manager.py
index 50b51f70fe..5c19eda21e 100644
--- a/api/core/app/task_pipeline/message_cycle_manager.py
+++ b/api/core/app/task_pipeline/message_cycle_manager.py
@@ -3,6 +3,8 @@ from threading import Thread
 from typing import Optional, Union
 
 from flask import Flask, current_app
+from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import (
@@ -84,7 +86,8 @@ class MessageCycleManager:
     def _generate_conversation_name_worker(self, flask_app: Flask, conversation_id: str, query: str):
         with flask_app.app_context():
             # get conversation and message
-            conversation = db.session.query(Conversation).where(Conversation.id == conversation_id).first()
+            stmt = select(Conversation).where(Conversation.id == conversation_id)
+            conversation = db.session.scalar(stmt)
 
             if not conversation:
                 return
@@ -143,7 +146,8 @@ class MessageCycleManager:
         :param event: event
         :return:
         """
-        message_file = db.session.query(MessageFile).where(MessageFile.id == event.message_file_id).first()
+        with Session(db.engine, expire_on_commit=False) as session:
+            message_file = session.scalar(select(MessageFile).where(MessageFile.id == event.message_file_id))
 
         if message_file and message_file.url is not None:
             # get tool file id
@@ -183,7 +187,8 @@ class MessageCycleManager:
         :param message_id: message id
         :return:
         """
-        message_file = db.session.query(MessageFile).where(MessageFile.id == message_id).first()
+        with Session(db.engine, expire_on_commit=False) as session:
+            message_file = session.scalar(select(MessageFile).where(MessageFile.id == message_id))
         event_type = StreamEvent.MESSAGE_FILE if message_file else StreamEvent.MESSAGE
 
         return MessageStreamResponse(
diff --git a/api/core/callback_handler/index_tool_callback_handler.py b/api/core/callback_handler/index_tool_callback_handler.py
index c55ba5e0fe..5cf39d7611 100644
--- a/api/core/callback_handler/index_tool_callback_handler.py
+++ b/api/core/callback_handler/index_tool_callback_handler.py
@@ -1,6 +1,8 @@
 import logging
 from collections.abc import Sequence
 
+from sqlalchemy import select
+
 from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueRetrieverResourcesEvent
@@ -49,7 +51,8 @@ class DatasetIndexToolCallbackHandler:
         for document in documents:
             if document.metadata is not None:
                 document_id = document.metadata["document_id"]
-                dataset_document = db.session.query(DatasetDocument).where(DatasetDocument.id == document_id).first()
+                dataset_document_stmt = select(DatasetDocument).where(DatasetDocument.id == document_id)
+                dataset_document = db.session.scalar(dataset_document_stmt)
                 if not dataset_document:
                     _logger.warning(
                         "Expected DatasetDocument record to exist, but none was found, document_id=%s",
@@ -57,15 +60,12 @@ class DatasetIndexToolCallbackHandler:
                     )
                     continue
                 if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX:
-                    child_chunk = (
-                        db.session.query(ChildChunk)
-                        .where(
-                            ChildChunk.index_node_id == document.metadata["doc_id"],
-                            ChildChunk.dataset_id == dataset_document.dataset_id,
-                            ChildChunk.document_id == dataset_document.id,
-                        )
-                        .first()
+                    child_chunk_stmt = select(ChildChunk).where(
+                        ChildChunk.index_node_id == document.metadata["doc_id"],
+                        ChildChunk.dataset_id == dataset_document.dataset_id,
+                        ChildChunk.document_id == dataset_document.id,
                     )
+                    child_chunk = db.session.scalar(child_chunk_stmt)
                     if child_chunk:
                         segment = (
                             db.session.query(DocumentSegment)
diff --git a/api/core/external_data_tool/api/api.py b/api/core/external_data_tool/api/api.py
index d81f372d40..2100e7fadc 100644
--- a/api/core/external_data_tool/api/api.py
+++ b/api/core/external_data_tool/api/api.py
@@ -1,5 +1,7 @@
 from typing import Optional
 
+from sqlalchemy import select
+
 from core.extension.api_based_extension_requestor import APIBasedExtensionRequestor
 from core.external_data_tool.base import ExternalDataTool
 from core.helper import encrypter
@@ -28,13 +30,11 @@ class ApiExternalDataTool(ExternalDataTool):
         api_based_extension_id = config.get("api_based_extension_id")
         if not api_based_extension_id:
             raise ValueError("api_based_extension_id is required")
-
         # get api_based_extension
-        api_based_extension = (
-            db.session.query(APIBasedExtension)
-            .where(APIBasedExtension.tenant_id == tenant_id, APIBasedExtension.id == api_based_extension_id)
-            .first()
+        stmt = select(APIBasedExtension).where(
+            APIBasedExtension.tenant_id == tenant_id, APIBasedExtension.id == api_based_extension_id
         )
+        api_based_extension = db.session.scalar(stmt)
 
         if not api_based_extension:
             raise ValueError("api_based_extension_id is invalid")
@@ -52,13 +52,11 @@ class ApiExternalDataTool(ExternalDataTool):
             raise ValueError(f"config is required, config: {self.config}")
         api_based_extension_id = self.config.get("api_based_extension_id")
         assert api_based_extension_id is not None, "api_based_extension_id is required"
-
         # get api_based_extension
-        api_based_extension = (
-            db.session.query(APIBasedExtension)
-            .where(APIBasedExtension.tenant_id == self.tenant_id, APIBasedExtension.id == api_based_extension_id)
-            .first()
+        stmt = select(APIBasedExtension).where(
+            APIBasedExtension.tenant_id == self.tenant_id, APIBasedExtension.id == api_based_extension_id
         )
+        api_based_extension = db.session.scalar(stmt)
 
         if not api_based_extension:
             raise ValueError(
diff --git a/api/core/helper/encrypter.py b/api/core/helper/encrypter.py
index c6bb2007d6..17345dc203 100644
--- a/api/core/helper/encrypter.py
+++ b/api/core/helper/encrypter.py
@@ -3,7 +3,7 @@ import base64
 from libs import rsa
 
 
-def obfuscated_token(token: str):
+def obfuscated_token(token: str) -> str:
     if not token:
         return token
     if len(token) <= 8:
@@ -11,6 +11,10 @@ def obfuscated_token(token: str):
     return token[:6] + "*" * 12 + token[-2:]
 
 
+def full_mask_token(token_length=20):
+    return "*" * token_length
+
+
 def encrypt_token(tenant_id: str, token: str):
     from extensions.ext_database import db
     from models.account import Tenant
diff --git a/api/core/helper/marketplace.py b/api/core/helper/marketplace.py
index fe3078923d..e837f2fd38 100644
--- a/api/core/helper/marketplace.py
+++ b/api/core/helper/marketplace.py
@@ -1,6 +1,6 @@
 from collections.abc import Sequence
 
-import requests
+import httpx
 from yarl import URL
 
 from configs import dify_config
@@ -23,7 +23,7 @@ def batch_fetch_plugin_manifests(plugin_ids: list[str]) -> Sequence[MarketplaceP
         return []
 
     url = str(marketplace_api_url / "api/v1/plugins/batch")
-    response = requests.post(url, json={"plugin_ids": plugin_ids})
+    response = httpx.post(url, json={"plugin_ids": plugin_ids})
     response.raise_for_status()
 
     return [MarketplacePluginDeclaration(**plugin) for plugin in response.json()["data"]["plugins"]]
@@ -36,7 +36,7 @@ def batch_fetch_plugin_manifests_ignore_deserialization_error(
         return []
 
     url = str(marketplace_api_url / "api/v1/plugins/batch")
-    response = requests.post(url, json={"plugin_ids": plugin_ids})
+    response = httpx.post(url, json={"plugin_ids": plugin_ids})
     response.raise_for_status()
     result: list[MarketplacePluginDeclaration] = []
     for plugin in response.json()["data"]["plugins"]:
@@ -50,5 +50,5 @@ def batch_fetch_plugin_manifests_ignore_deserialization_error(
 
 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})
+    response = httpx.post(url, json={"unique_identifier": plugin_unique_identifier})
     response.raise_for_status()
diff --git a/api/core/indexing_runner.py b/api/core/indexing_runner.py
index a8e6c261c2..4a768618f5 100644
--- a/api/core/indexing_runner.py
+++ b/api/core/indexing_runner.py
@@ -8,6 +8,7 @@ import uuid
 from typing import Any, Optional, cast
 
 from flask import current_app
+from sqlalchemy import select
 from sqlalchemy.orm.exc import ObjectDeletedError
 
 from configs import dify_config
@@ -56,13 +57,11 @@ class IndexingRunner:
 
                 if not dataset:
                     raise ValueError("no dataset found")
-
                 # get the process rule
-                processing_rule = (
-                    db.session.query(DatasetProcessRule)
-                    .where(DatasetProcessRule.id == dataset_document.dataset_process_rule_id)
-                    .first()
+                stmt = select(DatasetProcessRule).where(
+                    DatasetProcessRule.id == dataset_document.dataset_process_rule_id
                 )
+                processing_rule = db.session.scalar(stmt)
                 if not processing_rule:
                     raise ValueError("no process rule found")
                 index_type = dataset_document.doc_form
@@ -123,11 +122,8 @@ class IndexingRunner:
                     db.session.query(ChildChunk).where(ChildChunk.segment_id == document_segment.id).delete()
             db.session.commit()
             # get the process rule
-            processing_rule = (
-                db.session.query(DatasetProcessRule)
-                .where(DatasetProcessRule.id == dataset_document.dataset_process_rule_id)
-                .first()
-            )
+            stmt = select(DatasetProcessRule).where(DatasetProcessRule.id == dataset_document.dataset_process_rule_id)
+            processing_rule = db.session.scalar(stmt)
             if not processing_rule:
                 raise ValueError("no process rule found")
 
@@ -208,7 +204,6 @@ class IndexingRunner:
                                     child_documents.append(child_document)
                                 document.children = child_documents
                         documents.append(document)
-
             # build index
             index_type = dataset_document.doc_form
             index_processor = IndexProcessorFactory(index_type).init_index_processor()
@@ -310,7 +305,8 @@ class IndexingRunner:
                 # delete image files and related db records
                 image_upload_file_ids = get_image_upload_file_ids(document.page_content)
                 for upload_file_id in image_upload_file_ids:
-                    image_file = db.session.query(UploadFile).where(UploadFile.id == upload_file_id).first()
+                    stmt = select(UploadFile).where(UploadFile.id == upload_file_id)
+                    image_file = db.session.scalar(stmt)
                     if image_file is None:
                         continue
                     try:
@@ -339,10 +335,8 @@ class IndexingRunner:
         if dataset_document.data_source_type == "upload_file":
             if not data_source_info or "upload_file_id" not in data_source_info:
                 raise ValueError("no upload file found")
-
-            file_detail = (
-                db.session.query(UploadFile).where(UploadFile.id == data_source_info["upload_file_id"]).one_or_none()
-            )
+            stmt = select(UploadFile).where(UploadFile.id == data_source_info["upload_file_id"])
+            file_detail = db.session.scalars(stmt).one_or_none()
 
             if file_detail:
                 extract_setting = ExtractSetting(
diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index 6cbd949be9..cb768e2036 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -110,9 +110,9 @@ class TokenBufferMemory:
         else:
             message_limit = 500
 
-        stmt = stmt.limit(message_limit)
+        msg_limit_stmt = stmt.limit(message_limit)
 
-        messages = db.session.scalars(stmt).all()
+        messages = db.session.scalars(msg_limit_stmt).all()
 
         # instead of all messages from the conversation, we only need to extract messages
         # that belong to the thread of last message
diff --git a/api/core/model_manager.py b/api/core/model_manager.py
index 51af3d1877..e567565548 100644
--- a/api/core/model_manager.py
+++ b/api/core/model_manager.py
@@ -158,8 +158,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, LargeLanguageModel):
             raise Exception("Model type instance is not LargeLanguageModel")
-
-        self.model_type_instance = cast(LargeLanguageModel, self.model_type_instance)
         return cast(
             Union[LLMResult, Generator],
             self._round_robin_invoke(
@@ -188,8 +186,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, LargeLanguageModel):
             raise Exception("Model type instance is not LargeLanguageModel")
-
-        self.model_type_instance = cast(LargeLanguageModel, self.model_type_instance)
         return cast(
             int,
             self._round_robin_invoke(
@@ -214,8 +210,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, TextEmbeddingModel):
             raise Exception("Model type instance is not TextEmbeddingModel")
-
-        self.model_type_instance = cast(TextEmbeddingModel, self.model_type_instance)
         return cast(
             TextEmbeddingResult,
             self._round_robin_invoke(
@@ -237,8 +231,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, TextEmbeddingModel):
             raise Exception("Model type instance is not TextEmbeddingModel")
-
-        self.model_type_instance = cast(TextEmbeddingModel, self.model_type_instance)
         return cast(
             list[int],
             self._round_robin_invoke(
@@ -269,8 +261,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, RerankModel):
             raise Exception("Model type instance is not RerankModel")
-
-        self.model_type_instance = cast(RerankModel, self.model_type_instance)
         return cast(
             RerankResult,
             self._round_robin_invoke(
@@ -295,8 +285,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, ModerationModel):
             raise Exception("Model type instance is not ModerationModel")
-
-        self.model_type_instance = cast(ModerationModel, self.model_type_instance)
         return cast(
             bool,
             self._round_robin_invoke(
@@ -318,8 +306,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, Speech2TextModel):
             raise Exception("Model type instance is not Speech2TextModel")
-
-        self.model_type_instance = cast(Speech2TextModel, self.model_type_instance)
         return cast(
             str,
             self._round_robin_invoke(
@@ -343,8 +329,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, TTSModel):
             raise Exception("Model type instance is not TTSModel")
-
-        self.model_type_instance = cast(TTSModel, self.model_type_instance)
         return cast(
             Iterable[bytes],
             self._round_robin_invoke(
@@ -404,8 +388,6 @@ class ModelInstance:
         """
         if not isinstance(self.model_type_instance, TTSModel):
             raise Exception("Model type instance is not TTSModel")
-
-        self.model_type_instance = cast(TTSModel, self.model_type_instance)
         return self.model_type_instance.get_tts_model_voices(
             model=self.model, credentials=self.credentials, language=language
         )
diff --git a/api/core/moderation/api/api.py b/api/core/moderation/api/api.py
index af51b72cd5..06d5c02bb8 100644
--- a/api/core/moderation/api/api.py
+++ b/api/core/moderation/api/api.py
@@ -1,6 +1,7 @@
 from typing import Optional
 
 from pydantic import BaseModel, Field
+from sqlalchemy import select
 
 from core.extension.api_based_extension_requestor import APIBasedExtensionPoint, APIBasedExtensionRequestor
 from core.helper.encrypter import decrypt_token
@@ -87,10 +88,9 @@ class ApiModeration(Moderation):
 
     @staticmethod
     def _get_api_based_extension(tenant_id: str, api_based_extension_id: str) -> Optional[APIBasedExtension]:
-        extension = (
-            db.session.query(APIBasedExtension)
-            .where(APIBasedExtension.tenant_id == tenant_id, APIBasedExtension.id == api_based_extension_id)
-            .first()
+        stmt = select(APIBasedExtension).where(
+            APIBasedExtension.tenant_id == tenant_id, APIBasedExtension.id == api_based_extension_id
         )
+        extension = db.session.scalar(stmt)
 
         return extension
diff --git a/api/core/ops/aliyun_trace/aliyun_trace.py b/api/core/ops/aliyun_trace/aliyun_trace.py
index 77852e2a98..7caad89353 100644
--- a/api/core/ops/aliyun_trace/aliyun_trace.py
+++ b/api/core/ops/aliyun_trace/aliyun_trace.py
@@ -5,6 +5,7 @@ from typing import Optional
 from urllib.parse import urljoin
 
 from opentelemetry.trace import Link, Status, StatusCode
+from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
 from core.ops.aliyun_trace.data_exporter.traceclient import (
@@ -260,15 +261,15 @@ class AliyunDataTrace(BaseTraceInstance):
             app_id = trace_info.metadata.get("app_id")
             if not app_id:
                 raise ValueError("No app_id found in trace_info metadata")
-
-            app = session.query(App).where(App.id == app_id).first()
+            app_stmt = select(App).where(App.id == app_id)
+            app = session.scalar(app_stmt)
             if not app:
                 raise ValueError(f"App with id {app_id} not found")
 
             if not app.created_by:
                 raise ValueError(f"App with id {app_id} has no creator (created_by is None)")
-
-            service_account = session.query(Account).where(Account.id == app.created_by).first()
+            account_stmt = select(Account).where(Account.id == app.created_by)
+            service_account = session.scalar(account_stmt)
             if not service_account:
                 raise ValueError(f"Creator account with id {app.created_by} not found for app {app_id}")
             current_tenant = (
diff --git a/api/core/ops/base_trace_instance.py b/api/core/ops/base_trace_instance.py
index f8e428daf1..04b46d67a8 100644
--- a/api/core/ops/base_trace_instance.py
+++ b/api/core/ops/base_trace_instance.py
@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 
+from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.ops.entities.config_entity import BaseTracingConfig
@@ -44,14 +45,15 @@ class BaseTraceInstance(ABC):
         """
         with Session(db.engine, expire_on_commit=False) as session:
             # Get the app to find its creator
-            app = session.query(App).where(App.id == app_id).first()
+            app_stmt = select(App).where(App.id == app_id)
+            app = session.scalar(app_stmt)
             if not app:
                 raise ValueError(f"App with id {app_id} not found")
 
             if not app.created_by:
                 raise ValueError(f"App with id {app_id} has no creator (created_by is None)")
-
-            service_account = session.query(Account).where(Account.id == app.created_by).first()
+            account_stmt = select(Account).where(Account.id == app.created_by)
+            service_account = session.scalar(account_stmt)
             if not service_account:
                 raise ValueError(f"Creator account with id {app.created_by} not found for app {app_id}")
 
diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index c2bc4339d7..d3040f1093 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -228,9 +228,9 @@ class OpsTraceManager:
 
         if not trace_config_data:
             return None
-
         # decrypt_token
-        app = db.session.query(App).where(App.id == app_id).first()
+        stmt = select(App).where(App.id == app_id)
+        app = db.session.scalar(stmt)
         if not app:
             raise ValueError("App not found")
 
@@ -297,20 +297,19 @@ class OpsTraceManager:
     @classmethod
     def get_app_config_through_message_id(cls, message_id: str):
         app_model_config = None
-        message_data = db.session.query(Message).where(Message.id == message_id).first()
+        message_stmt = select(Message).where(Message.id == message_id)
+        message_data = db.session.scalar(message_stmt)
         if not message_data:
             return None
         conversation_id = message_data.conversation_id
-        conversation_data = db.session.query(Conversation).where(Conversation.id == conversation_id).first()
+        conversation_stmt = select(Conversation).where(Conversation.id == conversation_id)
+        conversation_data = db.session.scalar(conversation_stmt)
         if not conversation_data:
             return None
 
         if conversation_data.app_model_config_id:
-            app_model_config = (
-                db.session.query(AppModelConfig)
-                .where(AppModelConfig.id == conversation_data.app_model_config_id)
-                .first()
-            )
+            config_stmt = select(AppModelConfig).where(AppModelConfig.id == conversation_data.app_model_config_id)
+            app_model_config = db.session.scalar(config_stmt)
         elif conversation_data.app_model_config_id is None and conversation_data.override_model_configs:
             app_model_config = conversation_data.override_model_configs
 
diff --git a/api/core/plugin/backwards_invocation/app.py b/api/core/plugin/backwards_invocation/app.py
index 74972a2a9c..549b6a8889 100644
--- a/api/core/plugin/backwards_invocation/app.py
+++ b/api/core/plugin/backwards_invocation/app.py
@@ -1,6 +1,8 @@
 from collections.abc import Generator, Mapping
 from typing import Optional, Union
 
+from sqlalchemy import select
+
 from controllers.service_api.wraps import create_or_update_end_user_for_user_id
 from core.app.app_config.common.parameters_mapping import get_parameters_from_feature_dict
 from core.app.apps.advanced_chat.app_generator import AdvancedChatAppGenerator
@@ -191,10 +193,11 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
         """
         get the user by user id
         """
-
-        user = db.session.query(EndUser).where(EndUser.id == user_id).first()
+        stmt = select(EndUser).where(EndUser.id == user_id)
+        user = db.session.scalar(stmt)
         if not user:
-            user = db.session.query(Account).where(Account.id == user_id).first()
+            stmt = select(Account).where(Account.id == user_id)
+            user = db.session.scalar(stmt)
 
         if not user:
             raise ValueError("user not found")
diff --git a/api/core/prompt/utils/prompt_message_util.py b/api/core/prompt/utils/prompt_message_util.py
index 2f4e651461..cdc6ccc821 100644
--- a/api/core/prompt/utils/prompt_message_util.py
+++ b/api/core/prompt/utils/prompt_message_util.py
@@ -87,7 +87,6 @@ class PromptMessageUtil:
             if isinstance(prompt_message.content, list):
                 for content in prompt_message.content:
                     if content.type == PromptMessageContentType.TEXT:
-                        content = cast(TextPromptMessageContent, content)
                         text += content.data
                     else:
                         content = cast(ImagePromptMessageContent, content)
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index d8cc2293a2..e0fb0591e8 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -2,7 +2,7 @@ import contextlib
 import json
 from collections import defaultdict
 from json import JSONDecodeError
-from typing import Any, Optional, cast
+from typing import Any, Optional
 
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
@@ -154,8 +154,8 @@ class ProviderManager:
         for provider_entity in provider_entities:
             # handle include, exclude
             if is_filtered(
-                include_set=cast(set[str], dify_config.POSITION_PROVIDER_INCLUDES_SET),
-                exclude_set=cast(set[str], dify_config.POSITION_PROVIDER_EXCLUDES_SET),
+                include_set=dify_config.POSITION_PROVIDER_INCLUDES_SET,
+                exclude_set=dify_config.POSITION_PROVIDER_EXCLUDES_SET,
                 data=provider_entity,
                 name_func=lambda x: x.provider,
             ):
@@ -276,15 +276,11 @@ class ProviderManager:
         :param model_type: model type
         :return:
         """
-        # Get the corresponding TenantDefaultModel record
-        default_model = (
-            db.session.query(TenantDefaultModel)
-            .where(
-                TenantDefaultModel.tenant_id == tenant_id,
-                TenantDefaultModel.model_type == model_type.to_origin_model_type(),
-            )
-            .first()
+        stmt = select(TenantDefaultModel).where(
+            TenantDefaultModel.tenant_id == tenant_id,
+            TenantDefaultModel.model_type == model_type.to_origin_model_type(),
         )
+        default_model = db.session.scalar(stmt)
 
         # If it does not exist, get the first available provider model from get_configurations
         # and update the TenantDefaultModel record
@@ -367,16 +363,11 @@ class ProviderManager:
         model_names = [model.model for model in available_models]
         if model not in model_names:
             raise ValueError(f"Model {model} does not exist.")
-
-        # Get the list of available models from get_configurations and check if it is LLM
-        default_model = (
-            db.session.query(TenantDefaultModel)
-            .where(
-                TenantDefaultModel.tenant_id == tenant_id,
-                TenantDefaultModel.model_type == model_type.to_origin_model_type(),
-            )
-            .first()
+        stmt = select(TenantDefaultModel).where(
+            TenantDefaultModel.tenant_id == tenant_id,
+            TenantDefaultModel.model_type == model_type.to_origin_model_type(),
         )
+        default_model = db.session.scalar(stmt)
 
         # create or update TenantDefaultModel record
         if default_model:
@@ -598,16 +589,13 @@ class ProviderManager:
                             provider_name_to_provider_records_dict[provider_name].append(new_provider_record)
                         except IntegrityError:
                             db.session.rollback()
-                            existed_provider_record = (
-                                db.session.query(Provider)
-                                .where(
-                                    Provider.tenant_id == tenant_id,
-                                    Provider.provider_name == ModelProviderID(provider_name).provider_name,
-                                    Provider.provider_type == ProviderType.SYSTEM.value,
-                                    Provider.quota_type == ProviderQuotaType.TRIAL.value,
-                                )
-                                .first()
+                            stmt = select(Provider).where(
+                                Provider.tenant_id == tenant_id,
+                                Provider.provider_name == ModelProviderID(provider_name).provider_name,
+                                Provider.provider_type == ProviderType.SYSTEM.value,
+                                Provider.quota_type == ProviderQuotaType.TRIAL.value,
                             )
+                            existed_provider_record = db.session.scalar(stmt)
                             if not existed_provider_record:
                                 continue
 
diff --git a/api/core/rag/datasource/keyword/jieba/jieba.py b/api/core/rag/datasource/keyword/jieba/jieba.py
index c98306ea4b..5fb6f9fcc8 100644
--- a/api/core/rag/datasource/keyword/jieba/jieba.py
+++ b/api/core/rag/datasource/keyword/jieba/jieba.py
@@ -3,6 +3,7 @@ from typing import Any, Optional
 
 import orjson
 from pydantic import BaseModel
+from sqlalchemy import select
 
 from configs import dify_config
 from core.rag.datasource.keyword.jieba.jieba_keyword_table_handler import JiebaKeywordTableHandler
@@ -211,11 +212,10 @@ class Jieba(BaseKeyword):
         return sorted_chunk_indices[:k]
 
     def _update_segment_keywords(self, dataset_id: str, node_id: str, keywords: list[str]):
-        document_segment = (
-            db.session.query(DocumentSegment)
-            .where(DocumentSegment.dataset_id == dataset_id, DocumentSegment.index_node_id == node_id)
-            .first()
+        stmt = select(DocumentSegment).where(
+            DocumentSegment.dataset_id == dataset_id, DocumentSegment.index_node_id == node_id
         )
+        document_segment = db.session.scalar(stmt)
         if document_segment:
             document_segment.keywords = keywords
             db.session.add(document_segment)
diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index e872a4e375..fefd42f84d 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -3,6 +3,7 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Optional
 
 from flask import Flask, current_app
+from sqlalchemy import select
 from sqlalchemy.orm import Session, load_only
 
 from configs import dify_config
@@ -24,7 +25,7 @@ default_retrieval_model = {
     "search_method": RetrievalMethod.SEMANTIC_SEARCH.value,
     "reranking_enable": False,
     "reranking_model": {"reranking_provider_name": "", "reranking_model_name": ""},
-    "top_k": 2,
+    "top_k": 4,
     "score_threshold_enabled": False,
 }
 
@@ -127,7 +128,8 @@ class RetrievalService:
         external_retrieval_model: Optional[dict] = None,
         metadata_filtering_conditions: Optional[dict] = None,
     ):
-        dataset = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
+        stmt = select(Dataset).where(Dataset.id == dataset_id)
+        dataset = db.session.scalar(stmt)
         if not dataset:
             return []
         metadata_condition = (
@@ -316,10 +318,8 @@ class RetrievalService:
                 if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX:
                     # Handle parent-child documents
                     child_index_node_id = document.metadata.get("doc_id")
-
-                    child_chunk = (
-                        db.session.query(ChildChunk).where(ChildChunk.index_node_id == child_index_node_id).first()
-                    )
+                    child_chunk_stmt = select(ChildChunk).where(ChildChunk.index_node_id == child_index_node_id)
+                    child_chunk = db.session.scalar(child_chunk_stmt)
 
                     if not child_chunk:
                         continue
@@ -378,17 +378,13 @@ class RetrievalService:
                     index_node_id = document.metadata.get("doc_id")
                     if not index_node_id:
                         continue
-
-                    segment = (
-                        db.session.query(DocumentSegment)
-                        .where(
-                            DocumentSegment.dataset_id == dataset_document.dataset_id,
-                            DocumentSegment.enabled == True,
-                            DocumentSegment.status == "completed",
-                            DocumentSegment.index_node_id == index_node_id,
-                        )
-                        .first()
+                    document_segment_stmt = select(DocumentSegment).where(
+                        DocumentSegment.dataset_id == dataset_document.dataset_id,
+                        DocumentSegment.enabled == True,
+                        DocumentSegment.status == "completed",
+                        DocumentSegment.index_node_id == index_node_id,
                     )
+                    segment = db.session.scalar(document_segment_stmt)
 
                     if not segment:
                         continue
diff --git a/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_openapi.py b/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_openapi.py
index 6f3e15d166..aa0204ba70 100644
--- a/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_openapi.py
+++ b/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_openapi.py
@@ -256,7 +256,7 @@ class AnalyticdbVectorOpenAPI:
         response = self._client.query_collection_data(request)
         documents = []
         for match in response.body.matches.match:
-            if match.score > score_threshold:
+            if match.score >= score_threshold:
                 metadata = json.loads(match.metadata.get("metadata_"))
                 metadata["score"] = match.score
                 doc = Document(
@@ -293,7 +293,7 @@ class AnalyticdbVectorOpenAPI:
         response = self._client.query_collection_data(request)
         documents = []
         for match in response.body.matches.match:
-            if match.score > score_threshold:
+            if match.score >= score_threshold:
                 metadata = json.loads(match.metadata.get("metadata_"))
                 metadata["score"] = match.score
                 doc = Document(
diff --git a/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py b/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py
index df2173d1ca..71472cce41 100644
--- a/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py
+++ b/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py
@@ -229,7 +229,7 @@ class AnalyticdbVectorBySql:
             documents = []
             for record in cur:
                 id, vector, score, page_content, metadata = record
-                if score > score_threshold:
+                if score >= score_threshold:
                     metadata["score"] = score
                     doc = Document(
                         page_content=page_content,
diff --git a/api/core/rag/datasource/vdb/baidu/baidu_vector.py b/api/core/rag/datasource/vdb/baidu/baidu_vector.py
index d63ca9f695..d30cf42601 100644
--- a/api/core/rag/datasource/vdb/baidu/baidu_vector.py
+++ b/api/core/rag/datasource/vdb/baidu/baidu_vector.py
@@ -157,7 +157,7 @@ class BaiduVector(BaseVector):
             if meta is not None:
                 meta = json.loads(meta)
             score = row.get("score", 0.0)
-            if score > score_threshold:
+            if score >= score_threshold:
                 meta["score"] = score
                 doc = Document(page_content=row_data.get(self.field_text), metadata=meta)
                 docs.append(doc)
diff --git a/api/core/rag/datasource/vdb/chroma/chroma_vector.py b/api/core/rag/datasource/vdb/chroma/chroma_vector.py
index 699a602365..88da86cf76 100644
--- a/api/core/rag/datasource/vdb/chroma/chroma_vector.py
+++ b/api/core/rag/datasource/vdb/chroma/chroma_vector.py
@@ -120,7 +120,7 @@ class ChromaVector(BaseVector):
             distance = distances[index]
             metadata = dict(metadatas[index])
             score = 1 - distance
-            if score > score_threshold:
+            if score >= score_threshold:
                 metadata["score"] = score
                 doc = Document(
                     page_content=documents[index],
diff --git a/api/core/rag/datasource/vdb/couchbase/couchbase_vector.py b/api/core/rag/datasource/vdb/couchbase/couchbase_vector.py
index bd986393d1..d22a7e4fd4 100644
--- a/api/core/rag/datasource/vdb/couchbase/couchbase_vector.py
+++ b/api/core/rag/datasource/vdb/couchbase/couchbase_vector.py
@@ -304,7 +304,7 @@ class CouchbaseVector(BaseVector):
         return docs
 
     def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]:
-        top_k = kwargs.get("top_k", 2)
+        top_k = kwargs.get("top_k", 4)
         try:
             CBrequest = search.SearchRequest.create(search.QueryStringQuery("text:" + query))
             search_iter = self._scope.search(
diff --git a/api/core/rag/datasource/vdb/elasticsearch/elasticsearch_vector.py b/api/core/rag/datasource/vdb/elasticsearch/elasticsearch_vector.py
index 49c4b392fe..cbad0e67de 100644
--- a/api/core/rag/datasource/vdb/elasticsearch/elasticsearch_vector.py
+++ b/api/core/rag/datasource/vdb/elasticsearch/elasticsearch_vector.py
@@ -216,7 +216,7 @@ class ElasticSearchVector(BaseVector):
         docs = []
         for doc, score in docs_and_scores:
             score_threshold = float(kwargs.get("score_threshold") or 0.0)
-            if score > score_threshold:
+            if score >= score_threshold:
                 if doc.metadata is not None:
                     doc.metadata["score"] = score
                     docs.append(doc)
diff --git a/api/core/rag/datasource/vdb/huawei/huawei_cloud_vector.py b/api/core/rag/datasource/vdb/huawei/huawei_cloud_vector.py
index 0a4067e39c..f0d014b1ec 100644
--- a/api/core/rag/datasource/vdb/huawei/huawei_cloud_vector.py
+++ b/api/core/rag/datasource/vdb/huawei/huawei_cloud_vector.py
@@ -127,7 +127,7 @@ class HuaweiCloudVector(BaseVector):
         docs = []
         for doc, score in docs_and_scores:
             score_threshold = float(kwargs.get("score_threshold") or 0.0)
-            if score > score_threshold:
+            if score >= score_threshold:
                 if doc.metadata is not None:
                     doc.metadata["score"] = score
             docs.append(doc)
diff --git a/api/core/rag/datasource/vdb/lindorm/lindorm_vector.py b/api/core/rag/datasource/vdb/lindorm/lindorm_vector.py
index 3c65a41f08..cba10b5aa5 100644
--- a/api/core/rag/datasource/vdb/lindorm/lindorm_vector.py
+++ b/api/core/rag/datasource/vdb/lindorm/lindorm_vector.py
@@ -275,7 +275,7 @@ class LindormVectorStore(BaseVector):
         docs = []
         for doc, score in docs_and_scores:
             score_threshold = kwargs.get("score_threshold", 0.0) or 0.0
-            if score > score_threshold:
+            if score >= score_threshold:
                 if doc.metadata is not None:
                     doc.metadata["score"] = score
                 docs.append(doc)
diff --git a/api/core/rag/datasource/vdb/opengauss/opengauss.py b/api/core/rag/datasource/vdb/opengauss/opengauss.py
index 3ba9569d3f..c448210d94 100644
--- a/api/core/rag/datasource/vdb/opengauss/opengauss.py
+++ b/api/core/rag/datasource/vdb/opengauss/opengauss.py
@@ -194,7 +194,7 @@ class OpenGauss(BaseVector):
                 metadata, text, distance = record
                 score = 1 - distance
                 metadata["score"] = score
-                if score > score_threshold:
+                if score >= score_threshold:
                     docs.append(Document(page_content=text, metadata=metadata))
         return docs
 
diff --git a/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py b/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py
index 3c9302f4da..71d2ba1427 100644
--- a/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py
+++ b/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py
@@ -211,7 +211,7 @@ class OpenSearchVector(BaseVector):
 
             metadata["score"] = hit["_score"]
             score_threshold = float(kwargs.get("score_threshold") or 0.0)
-            if hit["_score"] > score_threshold:
+            if hit["_score"] >= score_threshold:
                 doc = Document(page_content=hit["_source"].get(Field.CONTENT_KEY.value), metadata=metadata)
                 docs.append(doc)
 
diff --git a/api/core/rag/datasource/vdb/oracle/oraclevector.py b/api/core/rag/datasource/vdb/oracle/oraclevector.py
index 0956914070..1b99f649bf 100644
--- a/api/core/rag/datasource/vdb/oracle/oraclevector.py
+++ b/api/core/rag/datasource/vdb/oracle/oraclevector.py
@@ -261,7 +261,7 @@ class OracleVector(BaseVector):
                     metadata, text, distance = record
                     score = 1 - distance
                     metadata["score"] = score
-                    if score > score_threshold:
+                    if score >= score_threshold:
                         docs.append(Document(page_content=text, metadata=metadata))
             conn.close()
         return docs
diff --git a/api/core/rag/datasource/vdb/pgvecto_rs/pgvecto_rs.py b/api/core/rag/datasource/vdb/pgvecto_rs/pgvecto_rs.py
index e77befcdae..99cd4a22cb 100644
--- a/api/core/rag/datasource/vdb/pgvecto_rs/pgvecto_rs.py
+++ b/api/core/rag/datasource/vdb/pgvecto_rs/pgvecto_rs.py
@@ -202,7 +202,7 @@ class PGVectoRS(BaseVector):
             score = 1 - dis
             metadata["score"] = score
             score_threshold = float(kwargs.get("score_threshold") or 0.0)
-            if score > score_threshold:
+            if score >= score_threshold:
                 doc = Document(page_content=record.text, metadata=metadata)
                 docs.append(doc)
         return docs
diff --git a/api/core/rag/datasource/vdb/pgvector/pgvector.py b/api/core/rag/datasource/vdb/pgvector/pgvector.py
index 108167d749..13be18f920 100644
--- a/api/core/rag/datasource/vdb/pgvector/pgvector.py
+++ b/api/core/rag/datasource/vdb/pgvector/pgvector.py
@@ -195,7 +195,7 @@ class PGVector(BaseVector):
                 metadata, text, distance = record
                 score = 1 - distance
                 metadata["score"] = score
-                if score > score_threshold:
+                if score >= score_threshold:
                     docs.append(Document(page_content=text, metadata=metadata))
         return docs
 
diff --git a/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py b/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py
index 580da7d62e..c33e344bff 100644
--- a/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py
+++ b/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py
@@ -170,7 +170,7 @@ class VastbaseVector(BaseVector):
                 metadata, text, distance = record
                 score = 1 - distance
                 metadata["score"] = score
-                if score > score_threshold:
+                if score >= score_threshold:
                     docs.append(Document(page_content=text, metadata=metadata))
         return docs
 
diff --git a/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py b/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py
index fcf3a6d126..e55c06e665 100644
--- a/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py
+++ b/api/core/rag/datasource/vdb/qdrant/qdrant_vector.py
@@ -3,7 +3,7 @@ import os
 import uuid
 from collections.abc import Generator, Iterable, Sequence
 from itertools import islice
-from typing import TYPE_CHECKING, Any, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 import qdrant_client
 from flask import current_app
@@ -18,6 +18,7 @@ from qdrant_client.http.models import (
     TokenizerType,
 )
 from qdrant_client.local.qdrant_local import QdrantLocal
+from sqlalchemy import select
 
 from configs import dify_config
 from core.rag.datasource.vdb.field import Field
@@ -369,7 +370,7 @@ class QdrantVector(BaseVector):
                 continue
             metadata = result.payload.get(Field.METADATA_KEY.value) or {}
             # duplicate check score threshold
-            if result.score > score_threshold:
+            if result.score >= score_threshold:
                 metadata["score"] = result.score
                 doc = Document(
                     page_content=result.payload.get(Field.CONTENT_KEY.value, ""),
@@ -426,7 +427,6 @@ class QdrantVector(BaseVector):
 
     def _reload_if_needed(self):
         if isinstance(self._client, QdrantLocal):
-            self._client = cast(QdrantLocal, self._client)
             self._client._load()
 
     @classmethod
@@ -446,11 +446,8 @@ class QdrantVector(BaseVector):
 class QdrantVectorFactory(AbstractVectorFactory):
     def init_vector(self, dataset: Dataset, attributes: list, embeddings: Embeddings) -> QdrantVector:
         if dataset.collection_binding_id:
-            dataset_collection_binding = (
-                db.session.query(DatasetCollectionBinding)
-                .where(DatasetCollectionBinding.id == dataset.collection_binding_id)
-                .one_or_none()
-            )
+            stmt = select(DatasetCollectionBinding).where(DatasetCollectionBinding.id == dataset.collection_binding_id)
+            dataset_collection_binding = db.session.scalars(stmt).one_or_none()
             if dataset_collection_binding:
                 collection_name = dataset_collection_binding.collection_name
             else:
diff --git a/api/core/rag/datasource/vdb/relyt/relyt_vector.py b/api/core/rag/datasource/vdb/relyt/relyt_vector.py
index 7a42dd1a89..a200bacfb6 100644
--- a/api/core/rag/datasource/vdb/relyt/relyt_vector.py
+++ b/api/core/rag/datasource/vdb/relyt/relyt_vector.py
@@ -233,7 +233,7 @@ class RelytVector(BaseVector):
         docs = []
         for document, score in results:
             score_threshold = float(kwargs.get("score_threshold") or 0.0)
-            if 1 - score > score_threshold:
+            if 1 - score >= score_threshold:
                 docs.append(document)
         return docs
 
diff --git a/api/core/rag/datasource/vdb/tablestore/tablestore_vector.py b/api/core/rag/datasource/vdb/tablestore/tablestore_vector.py
index e66959045f..1c154ef360 100644
--- a/api/core/rag/datasource/vdb/tablestore/tablestore_vector.py
+++ b/api/core/rag/datasource/vdb/tablestore/tablestore_vector.py
@@ -300,7 +300,7 @@ class TableStoreVector(BaseVector):
         )
         documents = []
         for search_hit in search_response.search_hits:
-            if search_hit.score > score_threshold:
+            if search_hit.score >= score_threshold:
                 ots_column_map = {}
                 for col in search_hit.row[1]:
                     ots_column_map[col[0]] = col[1]
diff --git a/api/core/rag/datasource/vdb/tencent/tencent_vector.py b/api/core/rag/datasource/vdb/tencent/tencent_vector.py
index 0517d5a6d1..3df35d081f 100644
--- a/api/core/rag/datasource/vdb/tencent/tencent_vector.py
+++ b/api/core/rag/datasource/vdb/tencent/tencent_vector.py
@@ -39,6 +39,9 @@ class TencentConfig(BaseModel):
         return {"url": self.url, "username": self.username, "key": self.api_key, "timeout": self.timeout}
 
 
+bm25 = BM25Encoder.default("zh")
+
+
 class TencentVector(BaseVector):
     field_id: str = "id"
     field_vector: str = "vector"
@@ -53,7 +56,6 @@ class TencentVector(BaseVector):
         self._dimension = 1024
         self._init_database()
         self._load_collection()
-        self._bm25 = BM25Encoder.default("zh")
 
     def _load_collection(self):
         """
@@ -186,7 +188,7 @@ class TencentVector(BaseVector):
                     metadata=metadata,
                 )
                 if self._enable_hybrid_search:
-                    doc.__dict__["sparse_vector"] = self._bm25.encode_texts(texts[i])
+                    doc.__dict__["sparse_vector"] = bm25.encode_texts(texts[i])
                 docs.append(doc)
             self._client.upsert(
                 database_name=self._client_config.database,
@@ -264,7 +266,7 @@ class TencentVector(BaseVector):
             match=[
                 KeywordSearch(
                     field_name="sparse_vector",
-                    data=self._bm25.encode_queries(query),
+                    data=bm25.encode_queries(query),
                 ),
             ],
             rerank=WeightedRerank(
@@ -291,7 +293,7 @@ class TencentVector(BaseVector):
                 score = 1 - result.get("score", 0.0)
             else:
                 score = result.get("score", 0.0)
-            if score > score_threshold:
+            if score >= score_threshold:
                 meta["score"] = score
                 doc = Document(page_content=result.get(self.field_text), metadata=meta)
                 docs.append(doc)
diff --git a/api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py b/api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py
index a76b5d579c..be24f5a561 100644
--- a/api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py
+++ b/api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py
@@ -20,6 +20,7 @@ from qdrant_client.http.models import (
 )
 from qdrant_client.local.qdrant_local import QdrantLocal
 from requests.auth import HTTPDigestAuth
+from sqlalchemy import select
 
 from configs import dify_config
 from core.rag.datasource.vdb.field import Field
@@ -351,7 +352,7 @@ class TidbOnQdrantVector(BaseVector):
             metadata = result.payload.get(Field.METADATA_KEY.value) or {}
             # duplicate check score threshold
             score_threshold = kwargs.get("score_threshold") or 0.0
-            if result.score > score_threshold:
+            if result.score >= score_threshold:
                 metadata["score"] = result.score
                 doc = Document(
                     page_content=result.payload.get(Field.CONTENT_KEY.value, ""),
@@ -416,16 +417,12 @@ class TidbOnQdrantVector(BaseVector):
 
 class TidbOnQdrantVectorFactory(AbstractVectorFactory):
     def init_vector(self, dataset: Dataset, attributes: list, embeddings: Embeddings) -> TidbOnQdrantVector:
-        tidb_auth_binding = (
-            db.session.query(TidbAuthBinding).where(TidbAuthBinding.tenant_id == dataset.tenant_id).one_or_none()
-        )
+        stmt = select(TidbAuthBinding).where(TidbAuthBinding.tenant_id == dataset.tenant_id)
+        tidb_auth_binding = db.session.scalars(stmt).one_or_none()
         if not tidb_auth_binding:
             with redis_client.lock("create_tidb_serverless_cluster_lock", timeout=900):
-                tidb_auth_binding = (
-                    db.session.query(TidbAuthBinding)
-                    .where(TidbAuthBinding.tenant_id == dataset.tenant_id)
-                    .one_or_none()
-                )
+                stmt = select(TidbAuthBinding).where(TidbAuthBinding.tenant_id == dataset.tenant_id)
+                tidb_auth_binding = db.session.scalars(stmt).one_or_none()
                 if tidb_auth_binding:
                     TIDB_ON_QDRANT_API_KEY = f"{tidb_auth_binding.account}:{tidb_auth_binding.password}"
 
diff --git a/api/core/rag/datasource/vdb/upstash/upstash_vector.py b/api/core/rag/datasource/vdb/upstash/upstash_vector.py
index e4f15be2b0..9e99f14dc5 100644
--- a/api/core/rag/datasource/vdb/upstash/upstash_vector.py
+++ b/api/core/rag/datasource/vdb/upstash/upstash_vector.py
@@ -110,7 +110,7 @@ class UpstashVector(BaseVector):
             score = record.score
             if metadata is not None and text is not None:
                 metadata["score"] = score
-                if score > score_threshold:
+                if score >= score_threshold:
                     docs.append(Document(page_content=text, metadata=metadata))
         return docs
 
diff --git a/api/core/rag/datasource/vdb/vector_factory.py b/api/core/rag/datasource/vdb/vector_factory.py
index eef03ce412..661a8f37aa 100644
--- a/api/core/rag/datasource/vdb/vector_factory.py
+++ b/api/core/rag/datasource/vdb/vector_factory.py
@@ -3,6 +3,8 @@ import time
 from abc import ABC, abstractmethod
 from typing import Any, Optional
 
+from sqlalchemy import select
+
 from configs import dify_config
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelType
@@ -45,11 +47,10 @@ class Vector:
             vector_type = self._dataset.index_struct_dict["type"]
         else:
             if dify_config.VECTOR_STORE_WHITELIST_ENABLE:
-                whitelist = (
-                    db.session.query(Whitelist)
-                    .where(Whitelist.tenant_id == self._dataset.tenant_id, Whitelist.category == "vector_db")
-                    .one_or_none()
+                stmt = select(Whitelist).where(
+                    Whitelist.tenant_id == self._dataset.tenant_id, Whitelist.category == "vector_db"
                 )
+                whitelist = db.session.scalars(stmt).one_or_none()
                 if whitelist:
                     vector_type = VectorType.TIDB_ON_QDRANT
 
diff --git a/api/core/rag/datasource/vdb/vikingdb/vikingdb_vector.py b/api/core/rag/datasource/vdb/vikingdb/vikingdb_vector.py
index 9166d35bc8..a0a2e47d19 100644
--- a/api/core/rag/datasource/vdb/vikingdb/vikingdb_vector.py
+++ b/api/core/rag/datasource/vdb/vikingdb/vikingdb_vector.py
@@ -192,7 +192,7 @@ class VikingDBVector(BaseVector):
             metadata = result.fields.get(vdb_Field.METADATA_KEY.value)
             if metadata is not None:
                 metadata = json.loads(metadata)
-            if result.score > score_threshold:
+            if result.score >= score_threshold:
                 metadata["score"] = result.score
                 doc = Document(page_content=result.fields.get(vdb_Field.CONTENT_KEY.value), metadata=metadata)
                 docs.append(doc)
diff --git a/api/core/rag/datasource/vdb/weaviate/weaviate_vector.py b/api/core/rag/datasource/vdb/weaviate/weaviate_vector.py
index 5525ef1685..a7e0789a92 100644
--- a/api/core/rag/datasource/vdb/weaviate/weaviate_vector.py
+++ b/api/core/rag/datasource/vdb/weaviate/weaviate_vector.py
@@ -220,7 +220,7 @@ class WeaviateVector(BaseVector):
         for doc, score in docs_and_scores:
             score_threshold = float(kwargs.get("score_threshold") or 0.0)
             # check score threshold
-            if score > score_threshold:
+            if score >= score_threshold:
                 if doc.metadata is not None:
                     doc.metadata["score"] = score
                     docs.append(doc)
diff --git a/api/core/rag/docstore/dataset_docstore.py b/api/core/rag/docstore/dataset_docstore.py
index f8da3657fc..717cfe8f53 100644
--- a/api/core/rag/docstore/dataset_docstore.py
+++ b/api/core/rag/docstore/dataset_docstore.py
@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from typing import Any, Optional
 
-from sqlalchemy import func
+from sqlalchemy import func, select
 
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelType
@@ -41,9 +41,8 @@ class DatasetDocumentStore:
 
     @property
     def docs(self) -> dict[str, Document]:
-        document_segments = (
-            db.session.query(DocumentSegment).where(DocumentSegment.dataset_id == self._dataset.id).all()
-        )
+        stmt = select(DocumentSegment).where(DocumentSegment.dataset_id == self._dataset.id)
+        document_segments = db.session.scalars(stmt).all()
 
         output = {}
         for document_segment in document_segments:
@@ -228,10 +227,9 @@ class DatasetDocumentStore:
         return data
 
     def get_document_segment(self, doc_id: str) -> Optional[DocumentSegment]:
-        document_segment = (
-            db.session.query(DocumentSegment)
-            .where(DocumentSegment.dataset_id == self._dataset.id, DocumentSegment.index_node_id == doc_id)
-            .first()
+        stmt = select(DocumentSegment).where(
+            DocumentSegment.dataset_id == self._dataset.id, DocumentSegment.index_node_id == doc_id
         )
+        document_segment = db.session.scalar(stmt)
 
         return document_segment
diff --git a/api/core/rag/extractor/markdown_extractor.py b/api/core/rag/extractor/markdown_extractor.py
index c97765b1dc..3845392c8d 100644
--- a/api/core/rag/extractor/markdown_extractor.py
+++ b/api/core/rag/extractor/markdown_extractor.py
@@ -2,7 +2,7 @@
 
 import re
 from pathlib import Path
-from typing import Optional, cast
+from typing import Optional
 
 from core.rag.extractor.extractor_base import BaseExtractor
 from core.rag.extractor.helpers import detect_file_encodings
@@ -76,7 +76,7 @@ class MarkdownExtractor(BaseExtractor):
         markdown_tups.append((current_header, current_text))
 
         markdown_tups = [
-            (re.sub(r"#", "", cast(str, key)).strip() if key else None, re.sub(r"<.*?>", "", value))
+            (re.sub(r"#", "", key).strip() if key else None, re.sub(r"<.*?>", "", value))
             for key, value in markdown_tups
         ]
 
diff --git a/api/core/rag/extractor/notion_extractor.py b/api/core/rag/extractor/notion_extractor.py
index 17f4d1af2d..206b2bb921 100644
--- a/api/core/rag/extractor/notion_extractor.py
+++ b/api/core/rag/extractor/notion_extractor.py
@@ -4,6 +4,7 @@ import operator
 from typing import Any, Optional, cast
 
 import requests
+from sqlalchemy import select
 
 from configs import dify_config
 from core.rag.extractor.extractor_base import BaseExtractor
@@ -367,22 +368,17 @@ class NotionExtractor(BaseExtractor):
 
     @classmethod
     def _get_access_token(cls, tenant_id: str, notion_workspace_id: str) -> str:
-        data_source_binding = (
-            db.session.query(DataSourceOauthBinding)
-            .where(
-                db.and_(
-                    DataSourceOauthBinding.tenant_id == tenant_id,
-                    DataSourceOauthBinding.provider == "notion",
-                    DataSourceOauthBinding.disabled == False,
-                    DataSourceOauthBinding.source_info["workspace_id"] == f'"{notion_workspace_id}"',
-                )
-            )
-            .first()
+        stmt = select(DataSourceOauthBinding).where(
+            DataSourceOauthBinding.tenant_id == tenant_id,
+            DataSourceOauthBinding.provider == "notion",
+            DataSourceOauthBinding.disabled == False,
+            DataSourceOauthBinding.source_info["workspace_id"] == f'"{notion_workspace_id}"',
         )
+        data_source_binding = db.session.scalar(stmt)
 
         if not data_source_binding:
             raise Exception(
                 f"No notion data source binding found for tenant {tenant_id} and notion workspace {notion_workspace_id}"
             )
 
-        return cast(str, data_source_binding.access_token)
+        return data_source_binding.access_token
diff --git a/api/core/rag/extractor/pdf_extractor.py b/api/core/rag/extractor/pdf_extractor.py
index 7dfe2e357c..3c43f34104 100644
--- a/api/core/rag/extractor/pdf_extractor.py
+++ b/api/core/rag/extractor/pdf_extractor.py
@@ -2,7 +2,7 @@
 
 import contextlib
 from collections.abc import Iterator
-from typing import Optional, cast
+from typing import Optional
 
 from core.rag.extractor.blob.blob import Blob
 from core.rag.extractor.extractor_base import BaseExtractor
@@ -27,7 +27,7 @@ class PdfExtractor(BaseExtractor):
         plaintext_file_exists = False
         if self._file_cache_key:
             with contextlib.suppress(FileNotFoundError):
-                text = cast(bytes, storage.load(self._file_cache_key)).decode("utf-8")
+                text = storage.load(self._file_cache_key).decode("utf-8")
                 plaintext_file_exists = True
                 return [Document(page_content=text)]
         documents = list(self.load())
diff --git a/api/core/rag/index_processor/processor/paragraph_index_processor.py b/api/core/rag/index_processor/processor/paragraph_index_processor.py
index 9b90bd2bb3..997b0b953b 100644
--- a/api/core/rag/index_processor/processor/paragraph_index_processor.py
+++ b/api/core/rag/index_processor/processor/paragraph_index_processor.py
@@ -123,7 +123,7 @@ class ParagraphIndexProcessor(BaseIndexProcessor):
         for result in results:
             metadata = result.metadata
             metadata["score"] = result.score
-            if result.score > score_threshold:
+            if result.score >= score_threshold:
                 doc = Document(page_content=result.page_content, metadata=metadata)
                 docs.append(doc)
         return docs
diff --git a/api/core/rag/index_processor/processor/parent_child_index_processor.py b/api/core/rag/index_processor/processor/parent_child_index_processor.py
index 52756fbacd..cb7f6ab57a 100644
--- a/api/core/rag/index_processor/processor/parent_child_index_processor.py
+++ b/api/core/rag/index_processor/processor/parent_child_index_processor.py
@@ -130,13 +130,16 @@ class ParentChildIndexProcessor(BaseIndexProcessor):
                 if delete_child_chunks:
                     db.session.query(ChildChunk).where(
                         ChildChunk.dataset_id == dataset.id, ChildChunk.index_node_id.in_(child_node_ids)
-                    ).delete()
+                    ).delete(synchronize_session=False)
                     db.session.commit()
             else:
                 vector.delete()
 
                 if delete_child_chunks:
-                    db.session.query(ChildChunk).where(ChildChunk.dataset_id == dataset.id).delete()
+                    # Use existing compound index: (tenant_id, dataset_id, ...)
+                    db.session.query(ChildChunk).where(
+                        ChildChunk.tenant_id == dataset.tenant_id, ChildChunk.dataset_id == dataset.id
+                    ).delete(synchronize_session=False)
                     db.session.commit()
 
     def retrieve(
@@ -162,7 +165,7 @@ class ParentChildIndexProcessor(BaseIndexProcessor):
         for result in results:
             metadata = result.metadata
             metadata["score"] = result.score
-            if result.score > score_threshold:
+            if result.score >= score_threshold:
                 doc = Document(page_content=result.page_content, metadata=metadata)
                 docs.append(doc)
         return docs
diff --git a/api/core/rag/index_processor/processor/qa_index_processor.py b/api/core/rag/index_processor/processor/qa_index_processor.py
index 609a8aafa1..8c345b7edf 100644
--- a/api/core/rag/index_processor/processor/qa_index_processor.py
+++ b/api/core/rag/index_processor/processor/qa_index_processor.py
@@ -158,7 +158,7 @@ class QAIndexProcessor(BaseIndexProcessor):
         for result in results:
             metadata = result.metadata
             metadata["score"] = result.score
-            if result.score > score_threshold:
+            if result.score >= score_threshold:
                 doc = Document(page_content=result.page_content, metadata=metadata)
                 docs.append(doc)
         return docs
diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py
index cd4af72832..11010c9d60 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -7,7 +7,7 @@ from collections.abc import Generator, Mapping
 from typing import Any, Optional, Union, cast
 
 from flask import Flask, current_app
-from sqlalchemy import Float, and_, or_, text
+from sqlalchemy import Float, and_, or_, select, text
 from sqlalchemy import cast as sqlalchemy_cast
 from sqlalchemy.orm import Session
 
@@ -65,7 +65,7 @@ default_retrieval_model: dict[str, Any] = {
     "search_method": RetrievalMethod.SEMANTIC_SEARCH.value,
     "reranking_enable": False,
     "reranking_model": {"reranking_provider_name": "", "reranking_model_name": ""},
-    "top_k": 2,
+    "top_k": 4,
     "score_threshold_enabled": False,
 }
 
@@ -135,7 +135,8 @@ class DatasetRetrieval:
         available_datasets = []
         for dataset_id in dataset_ids:
             # get dataset from dataset id
-            dataset = db.session.query(Dataset).where(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
+            dataset_stmt = select(Dataset).where(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id)
+            dataset = db.session.scalar(dataset_stmt)
 
             # pass if dataset is not available
             if not dataset:
@@ -240,15 +241,12 @@ class DatasetRetrieval:
                     for record in records:
                         segment = record.segment
                         dataset = db.session.query(Dataset).filter_by(id=segment.dataset_id).first()
-                        document = (
-                            db.session.query(DatasetDocument)
-                            .where(
-                                DatasetDocument.id == segment.document_id,
-                                DatasetDocument.enabled == True,
-                                DatasetDocument.archived == False,
-                            )
-                            .first()
+                        dataset_document_stmt = select(DatasetDocument).where(
+                            DatasetDocument.id == segment.document_id,
+                            DatasetDocument.enabled == True,
+                            DatasetDocument.archived == False,
                         )
+                        document = db.session.scalar(dataset_document_stmt)
                         if dataset and document:
                             source = RetrievalSourceMetadata(
                                 dataset_id=dataset.id,
@@ -327,7 +325,8 @@ class DatasetRetrieval:
 
         if dataset_id:
             # get retrieval model config
-            dataset = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
+            dataset_stmt = select(Dataset).where(Dataset.id == dataset_id)
+            dataset = db.session.scalar(dataset_stmt)
             if dataset:
                 results = []
                 if dataset.provider == "external":
@@ -514,22 +513,18 @@ class DatasetRetrieval:
         dify_documents = [document for document in documents if document.provider == "dify"]
         for document in dify_documents:
             if document.metadata is not None:
-                dataset_document = (
-                    db.session.query(DatasetDocument)
-                    .where(DatasetDocument.id == document.metadata["document_id"])
-                    .first()
+                dataset_document_stmt = select(DatasetDocument).where(
+                    DatasetDocument.id == document.metadata["document_id"]
                 )
+                dataset_document = db.session.scalar(dataset_document_stmt)
                 if dataset_document:
                     if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX:
-                        child_chunk = (
-                            db.session.query(ChildChunk)
-                            .where(
-                                ChildChunk.index_node_id == document.metadata["doc_id"],
-                                ChildChunk.dataset_id == dataset_document.dataset_id,
-                                ChildChunk.document_id == dataset_document.id,
-                            )
-                            .first()
+                        child_chunk_stmt = select(ChildChunk).where(
+                            ChildChunk.index_node_id == document.metadata["doc_id"],
+                            ChildChunk.dataset_id == dataset_document.dataset_id,
+                            ChildChunk.document_id == dataset_document.id,
                         )
+                        child_chunk = db.session.scalar(child_chunk_stmt)
                         if child_chunk:
                             segment = (
                                 db.session.query(DocumentSegment)
@@ -600,7 +595,8 @@ class DatasetRetrieval:
     ):
         with flask_app.app_context():
             with Session(db.engine) as session:
-                dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
+                dataset_stmt = select(Dataset).where(Dataset.id == dataset_id)
+                dataset = db.session.scalar(dataset_stmt)
 
             if not dataset:
                 return []
@@ -647,7 +643,7 @@ class DatasetRetrieval:
                             retrieval_method=retrieval_model["search_method"],
                             dataset_id=dataset.id,
                             query=query,
-                            top_k=retrieval_model.get("top_k") or 2,
+                            top_k=retrieval_model.get("top_k") or 4,
                             score_threshold=retrieval_model.get("score_threshold", 0.0)
                             if retrieval_model["score_threshold_enabled"]
                             else 0.0,
@@ -685,7 +681,8 @@ class DatasetRetrieval:
         available_datasets = []
         for dataset_id in dataset_ids:
             # get dataset from dataset id
-            dataset = db.session.query(Dataset).where(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
+            dataset_stmt = select(Dataset).where(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id)
+            dataset = db.session.scalar(dataset_stmt)
 
             # pass if dataset is not available
             if not dataset:
@@ -743,7 +740,7 @@ class DatasetRetrieval:
             tool = DatasetMultiRetrieverTool.from_dataset(
                 dataset_ids=[dataset.id for dataset in available_datasets],
                 tenant_id=tenant_id,
-                top_k=retrieve_config.top_k or 2,
+                top_k=retrieve_config.top_k or 4,
                 score_threshold=retrieve_config.score_threshold,
                 hit_callbacks=[hit_callback],
                 return_resource=return_resource,
@@ -958,7 +955,8 @@ class DatasetRetrieval:
         self, dataset_ids: list, query: str, tenant_id: str, user_id: str, metadata_model_config: ModelConfig
     ) -> Optional[list[dict[str, Any]]]:
         # get all metadata field
-        metadata_fields = db.session.query(DatasetMetadata).where(DatasetMetadata.dataset_id.in_(dataset_ids)).all()
+        metadata_stmt = select(DatasetMetadata).where(DatasetMetadata.dataset_id.in_(dataset_ids))
+        metadata_fields = db.session.scalars(metadata_stmt).all()
         all_metadata_fields = [metadata_field.name for metadata_field in metadata_fields]
         # get metadata model config
         if metadata_model_config is None:
diff --git a/api/core/tools/tool_label_manager.py b/api/core/tools/tool_label_manager.py
index cdfefbadb3..90c09a4441 100644
--- a/api/core/tools/tool_label_manager.py
+++ b/api/core/tools/tool_label_manager.py
@@ -1,3 +1,5 @@
+from sqlalchemy import select
+
 from core.tools.__base.tool_provider import ToolProviderController
 from core.tools.builtin_tool.provider import BuiltinToolProviderController
 from core.tools.custom_tool.provider import ApiToolProviderController
@@ -54,17 +56,13 @@ class ToolLabelManager:
             return controller.tool_labels
         else:
             raise ValueError("Unsupported tool type")
-
-        labels = (
-            db.session.query(ToolLabelBinding.label_name)
-            .where(
-                ToolLabelBinding.tool_id == provider_id,
-                ToolLabelBinding.tool_type == controller.provider_type.value,
-            )
-            .all()
+        stmt = select(ToolLabelBinding.label_name).where(
+            ToolLabelBinding.tool_id == provider_id,
+            ToolLabelBinding.tool_type == controller.provider_type.value,
         )
+        labels = db.session.scalars(stmt).all()
 
-        return [label.label_name for label in labels]
+        return list(labels)
 
     @classmethod
     def get_tools_labels(cls, tool_providers: list[ToolProviderController]) -> dict[str, list[str]]:
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index 474f8e3bcc..0069c6d6ee 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING, Any, Literal, Optional, Union, cast
 
 import sqlalchemy as sa
 from pydantic import TypeAdapter
+from sqlalchemy import select
 from sqlalchemy.orm import Session
 from yarl import URL
 
@@ -198,14 +199,11 @@ class ToolManager:
                 # get specific credentials
                 if is_valid_uuid(credential_id):
                     try:
-                        builtin_provider = (
-                            db.session.query(BuiltinToolProvider)
-                            .where(
-                                BuiltinToolProvider.tenant_id == tenant_id,
-                                BuiltinToolProvider.id == credential_id,
-                            )
-                            .first()
+                        builtin_provider_stmt = select(BuiltinToolProvider).where(
+                            BuiltinToolProvider.tenant_id == tenant_id,
+                            BuiltinToolProvider.id == credential_id,
                         )
+                        builtin_provider = db.session.scalar(builtin_provider_stmt)
                     except Exception as e:
                         builtin_provider = None
                         logger.info("Error getting builtin provider %s:%s", credential_id, e, exc_info=True)
@@ -319,11 +317,10 @@ class ToolManager:
                 ),
             )
         elif provider_type == ToolProviderType.WORKFLOW:
-            workflow_provider = (
-                db.session.query(WorkflowToolProvider)
-                .where(WorkflowToolProvider.tenant_id == tenant_id, WorkflowToolProvider.id == provider_id)
-                .first()
+            workflow_provider_stmt = select(WorkflowToolProvider).where(
+                WorkflowToolProvider.tenant_id == tenant_id, WorkflowToolProvider.id == provider_id
             )
+            workflow_provider = db.session.scalar(workflow_provider_stmt)
 
             if workflow_provider is None:
                 raise ToolProviderNotFoundError(f"workflow provider {provider_id} not found")
@@ -333,16 +330,13 @@ class ToolManager:
             if controller_tools is None or len(controller_tools) == 0:
                 raise ToolProviderNotFoundError(f"workflow provider {provider_id} not found")
 
-            return cast(
-                WorkflowTool,
-                controller.get_tools(tenant_id=workflow_provider.tenant_id)[0].fork_tool_runtime(
-                    runtime=ToolRuntime(
-                        tenant_id=tenant_id,
-                        credentials={},
-                        invoke_from=invoke_from,
-                        tool_invoke_from=tool_invoke_from,
-                    )
-                ),
+            return controller.get_tools(tenant_id=workflow_provider.tenant_id)[0].fork_tool_runtime(
+                runtime=ToolRuntime(
+                    tenant_id=tenant_id,
+                    credentials={},
+                    invoke_from=invoke_from,
+                    tool_invoke_from=tool_invoke_from,
+                )
             )
         elif provider_type == ToolProviderType.APP:
             raise NotImplementedError("app provider not implemented")
@@ -652,8 +646,8 @@ class ToolManager:
                 for provider in builtin_providers:
                     # handle include, exclude
                     if is_filtered(
-                        include_set=cast(set[str], dify_config.POSITION_TOOL_INCLUDES_SET),
-                        exclude_set=cast(set[str], dify_config.POSITION_TOOL_EXCLUDES_SET),
+                        include_set=dify_config.POSITION_TOOL_INCLUDES_SET,
+                        exclude_set=dify_config.POSITION_TOOL_EXCLUDES_SET,
                         data=provider,
                         name_func=lambda x: x.identity.name,
                     ):
diff --git a/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py b/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py
index 7eb4bc017a..75c0c6738e 100644
--- a/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py
+++ b/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py
@@ -3,6 +3,7 @@ from typing import Any
 
 from flask import Flask, current_app
 from pydantic import BaseModel, Field
+from sqlalchemy import select
 
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.model_manager import ModelManager
@@ -85,17 +86,14 @@ class DatasetMultiRetrieverTool(DatasetRetrieverBaseTool):
 
         document_context_list = []
         index_node_ids = [document.metadata["doc_id"] for document in all_documents if document.metadata]
-        segments = (
-            db.session.query(DocumentSegment)
-            .where(
-                DocumentSegment.dataset_id.in_(self.dataset_ids),
-                DocumentSegment.completed_at.isnot(None),
-                DocumentSegment.status == "completed",
-                DocumentSegment.enabled == True,
-                DocumentSegment.index_node_id.in_(index_node_ids),
-            )
-            .all()
+        document_segment_stmt = select(DocumentSegment).where(
+            DocumentSegment.dataset_id.in_(self.dataset_ids),
+            DocumentSegment.completed_at.isnot(None),
+            DocumentSegment.status == "completed",
+            DocumentSegment.enabled == True,
+            DocumentSegment.index_node_id.in_(index_node_ids),
         )
+        segments = db.session.scalars(document_segment_stmt).all()
 
         if segments:
             index_node_id_to_position = {id: position for position, id in enumerate(index_node_ids)}
@@ -112,15 +110,12 @@ class DatasetMultiRetrieverTool(DatasetRetrieverBaseTool):
                 resource_number = 1
                 for segment in sorted_segments:
                     dataset = db.session.query(Dataset).filter_by(id=segment.dataset_id).first()
-                    document = (
-                        db.session.query(Document)
-                        .where(
-                            Document.id == segment.document_id,
-                            Document.enabled == True,
-                            Document.archived == False,
-                        )
-                        .first()
+                    document_stmt = select(Document).where(
+                        Document.id == segment.document_id,
+                        Document.enabled == True,
+                        Document.archived == False,
                     )
+                    document = db.session.scalar(document_stmt)
                     if dataset and document:
                         source = RetrievalSourceMetadata(
                             position=resource_number,
@@ -162,9 +157,8 @@ class DatasetMultiRetrieverTool(DatasetRetrieverBaseTool):
         hit_callbacks: list[DatasetIndexToolCallbackHandler],
     ):
         with flask_app.app_context():
-            dataset = (
-                db.session.query(Dataset).where(Dataset.tenant_id == self.tenant_id, Dataset.id == dataset_id).first()
-            )
+            stmt = select(Dataset).where(Dataset.tenant_id == self.tenant_id, Dataset.id == dataset_id)
+            dataset = db.session.scalar(stmt)
 
             if not dataset:
                 return []
@@ -181,7 +175,7 @@ class DatasetMultiRetrieverTool(DatasetRetrieverBaseTool):
                     retrieval_method="keyword_search",
                     dataset_id=dataset.id,
                     query=query,
-                    top_k=retrieval_model.get("top_k") or 2,
+                    top_k=retrieval_model.get("top_k") or 4,
                 )
                 if documents:
                     all_documents.extend(documents)
@@ -192,7 +186,7 @@ class DatasetMultiRetrieverTool(DatasetRetrieverBaseTool):
                         retrieval_method=retrieval_model["search_method"],
                         dataset_id=dataset.id,
                         query=query,
-                        top_k=retrieval_model.get("top_k") or 2,
+                        top_k=retrieval_model.get("top_k") or 4,
                         score_threshold=retrieval_model.get("score_threshold", 0.0)
                         if retrieval_model["score_threshold_enabled"]
                         else 0.0,
diff --git a/api/core/tools/utils/dataset_retriever/dataset_retriever_base_tool.py b/api/core/tools/utils/dataset_retriever/dataset_retriever_base_tool.py
index 567275531e..4f489e00f4 100644
--- a/api/core/tools/utils/dataset_retriever/dataset_retriever_base_tool.py
+++ b/api/core/tools/utils/dataset_retriever/dataset_retriever_base_tool.py
@@ -13,7 +13,7 @@ class DatasetRetrieverBaseTool(BaseModel, ABC):
     name: str = "dataset"
     description: str = "use this to retrieve a dataset. "
     tenant_id: str
-    top_k: int = 2
+    top_k: int = 4
     score_threshold: Optional[float] = None
     hit_callbacks: list[DatasetIndexToolCallbackHandler] = []
     return_resource: bool
diff --git a/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py b/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
index f7689d7707..b536c5a25c 100644
--- a/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
+++ b/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
@@ -1,6 +1,7 @@
 from typing import Any, Optional, cast
 
 from pydantic import BaseModel, Field
+from sqlalchemy import select
 
 from core.app.app_config.entities import DatasetRetrieveConfigEntity, ModelConfig
 from core.rag.datasource.retrieval_service import RetrievalService
@@ -56,9 +57,8 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
         )
 
     def _run(self, query: str) -> str:
-        dataset = (
-            db.session.query(Dataset).where(Dataset.tenant_id == self.tenant_id, Dataset.id == self.dataset_id).first()
-        )
+        dataset_stmt = select(Dataset).where(Dataset.tenant_id == self.tenant_id, Dataset.id == self.dataset_id)
+        dataset = db.session.scalar(dataset_stmt)
 
         if not dataset:
             return ""
@@ -188,15 +188,12 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
                         for record in records:
                             segment = record.segment
                             dataset = db.session.query(Dataset).filter_by(id=segment.dataset_id).first()
-                            document = (
-                                db.session.query(DatasetDocument)  # type: ignore
-                                .where(
-                                    DatasetDocument.id == segment.document_id,
-                                    DatasetDocument.enabled == True,
-                                    DatasetDocument.archived == False,
-                                )
-                                .first()
+                            dataset_document_stmt = select(DatasetDocument).where(
+                                DatasetDocument.id == segment.document_id,
+                                DatasetDocument.enabled == True,
+                                DatasetDocument.archived == False,
                             )
+                            document = db.session.scalar(dataset_document_stmt)  # type: ignore
                             if dataset and document:
                                 source = RetrievalSourceMetadata(
                                     dataset_id=dataset.id,
diff --git a/api/core/tools/utils/message_transformer.py b/api/core/tools/utils/message_transformer.py
index 8357dac0d7..bf075bd730 100644
--- a/api/core/tools/utils/message_transformer.py
+++ b/api/core/tools/utils/message_transformer.py
@@ -3,7 +3,7 @@ from collections.abc import Generator
 from datetime import date, datetime
 from decimal import Decimal
 from mimetypes import guess_extension
-from typing import Optional, cast
+from typing import Optional
 from uuid import UUID
 
 import numpy as np
@@ -159,8 +159,7 @@ class ToolFileMessageTransformer:
 
             elif message.type == ToolInvokeMessage.MessageType.JSON:
                 if isinstance(message.message, ToolInvokeMessage.JsonMessage):
-                    json_msg = cast(ToolInvokeMessage.JsonMessage, message.message)
-                    json_msg.json_object = safe_json_value(json_msg.json_object)
+                    message.message.json_object = safe_json_value(message.message.json_object)
                 yield message
             else:
                 yield message
diff --git a/api/core/tools/utils/model_invocation_utils.py b/api/core/tools/utils/model_invocation_utils.py
index 3f59b3f472..251d914800 100644
--- a/api/core/tools/utils/model_invocation_utils.py
+++ b/api/core/tools/utils/model_invocation_utils.py
@@ -129,17 +129,14 @@ class ModelInvocationUtils:
         db.session.commit()
 
         try:
-            response: LLMResult = cast(
-                LLMResult,
-                model_instance.invoke_llm(
-                    prompt_messages=prompt_messages,
-                    model_parameters=model_parameters,
-                    tools=[],
-                    stop=[],
-                    stream=False,
-                    user=user_id,
-                    callbacks=[],
-                ),
+            response: LLMResult = model_instance.invoke_llm(
+                prompt_messages=prompt_messages,
+                model_parameters=model_parameters,
+                tools=[],
+                stop=[],
+                stream=False,
+                user=user_id,
+                callbacks=[],
             )
         except InvokeRateLimitError as e:
             raise InvokeModelError(f"Invoke rate limit error: {e}")
diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index d8749f9851..c2092853ea 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -1,7 +1,9 @@
 import json
 import logging
 from collections.abc import Generator
-from typing import Any, Optional, cast
+from typing import Any, Optional
+
+from sqlalchemy import select
 
 from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
 from core.tools.__base.tool import Tool
@@ -133,7 +135,8 @@ class WorkflowTool(Tool):
                 .first()
             )
         else:
-            workflow = db.session.query(Workflow).where(Workflow.app_id == app_id, Workflow.version == version).first()
+            stmt = select(Workflow).where(Workflow.app_id == app_id, Workflow.version == version)
+            workflow = db.session.scalar(stmt)
 
         if not workflow:
             raise ValueError("workflow not found or not published")
@@ -144,7 +147,8 @@ class WorkflowTool(Tool):
         """
         get the app by app id
         """
-        app = db.session.query(App).where(App.id == app_id).first()
+        stmt = select(App).where(App.id == app_id)
+        app = db.session.scalar(stmt)
         if not app:
             raise ValueError("app not found")
 
@@ -201,14 +205,14 @@ class WorkflowTool(Tool):
                         item = self._update_file_mapping(item)
                         file = build_from_mapping(
                             mapping=item,
-                            tenant_id=str(cast(ToolRuntime, self.runtime).tenant_id),
+                            tenant_id=str(self.runtime.tenant_id),
                         )
                         files.append(file)
             elif isinstance(value, dict) and value.get("dify_model_identity") == FILE_MODEL_IDENTITY:
                 value = self._update_file_mapping(value)
                 file = build_from_mapping(
                     mapping=value,
-                    tenant_id=str(cast(ToolRuntime, self.runtime).tenant_id),
+                    tenant_id=str(self.runtime.tenant_id),
                 )
                 files.append(file)
 
diff --git a/api/core/variables/variables.py b/api/core/variables/variables.py
index 16c8116ac1..a994730cd5 100644
--- a/api/core/variables/variables.py
+++ b/api/core/variables/variables.py
@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from typing import Annotated, TypeAlias, cast
+from typing import Annotated, TypeAlias
 from uuid import uuid4
 
 from pydantic import Discriminator, Field, Tag
@@ -86,7 +86,7 @@ class SecretVariable(StringVariable):
 
     @property
     def log(self) -> str:
-        return cast(str, encrypter.obfuscated_token(self.value))
+        return encrypter.obfuscated_token(self.value)
 
 
 class NoneVariable(NoneSegment, Variable):
diff --git a/api/core/workflow/graph_engine/graph_engine.py.orig b/api/core/workflow/graph_engine/graph_engine.py.orig
new file mode 100644
index 0000000000..833cee0ffe
--- /dev/null
+++ b/api/core/workflow/graph_engine/graph_engine.py.orig
@@ -0,0 +1,339 @@
+"""
+QueueBasedGraphEngine - Main orchestrator for queue-based workflow execution.
+
+This engine uses a modular architecture with separated packages following
+Domain-Driven Design principles for improved maintainability and testability.
+"""
+
+import contextvars
+import logging
+import queue
+from collections.abc import Generator, Mapping
+from typing import final
+
+from flask import Flask, current_app
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow.entities import GraphRuntimeState
+from core.workflow.enums import NodeExecutionType
+from core.workflow.graph import Graph
+from core.workflow.graph_events import (
+    GraphEngineEvent,
+    GraphNodeEventBase,
+    GraphRunAbortedEvent,
+    GraphRunFailedEvent,
+    GraphRunStartedEvent,
+    GraphRunSucceededEvent,
+)
+from models.enums import UserFrom
+
+from .command_processing import AbortCommandHandler, CommandProcessor
+from .domain import ExecutionContext, GraphExecution
+from .entities.commands import AbortCommand
+from .error_handling import ErrorHandler
+from .event_management import EventHandler, EventManager
+from .graph_traversal import EdgeProcessor, SkipPropagator
+from .layers.base import Layer
+from .orchestration import Dispatcher, ExecutionCoordinator
+from .protocols.command_channel import CommandChannel
+from .response_coordinator import ResponseStreamCoordinator
+from .state_management import UnifiedStateManager
+from .worker_management import SimpleWorkerPool
+
+logger = logging.getLogger(__name__)
+
+
+@final
+class GraphEngine:
+    """
+    Queue-based graph execution engine.
+
+    Uses a modular architecture that delegates responsibilities to specialized
+    subsystems, following Domain-Driven Design and SOLID principles.
+    """
+
+    def __init__(
+        self,
+        tenant_id: str,
+        app_id: str,
+        workflow_id: str,
+        user_id: str,
+        user_from: UserFrom,
+        invoke_from: InvokeFrom,
+        call_depth: int,
+        graph: Graph,
+        graph_config: Mapping[str, object],
+        graph_runtime_state: GraphRuntimeState,
+        max_execution_steps: int,
+        max_execution_time: int,
+        command_channel: CommandChannel,
+        min_workers: int | None = None,
+        max_workers: int | None = None,
+        scale_up_threshold: int | None = None,
+        scale_down_idle_time: float | None = None,
+    ) -> None:
+        """Initialize the graph engine with all subsystems and dependencies."""
+
+        # === Domain Models ===
+        # Execution context encapsulates workflow execution metadata
+        self._execution_context = ExecutionContext(
+            tenant_id=tenant_id,
+            app_id=app_id,
+            workflow_id=workflow_id,
+            user_id=user_id,
+            user_from=user_from,
+            invoke_from=invoke_from,
+            call_depth=call_depth,
+            max_execution_steps=max_execution_steps,
+            max_execution_time=max_execution_time,
+        )
+
+        # Graph execution tracks the overall execution state
+        self._graph_execution = GraphExecution(workflow_id=workflow_id)
+
+        # === Core Dependencies ===
+        # Graph structure and configuration
+        self._graph = graph
+        self._graph_config = graph_config
+        self._graph_runtime_state = graph_runtime_state
+        self._command_channel = command_channel
+
+        # === Worker Management Parameters ===
+        # Parameters for dynamic worker pool scaling
+        self._min_workers = min_workers
+        self._max_workers = max_workers
+        self._scale_up_threshold = scale_up_threshold
+        self._scale_down_idle_time = scale_down_idle_time
+
+        # === Execution Queues ===
+        # Queue for nodes ready to execute
+        self._ready_queue: queue.Queue[str] = queue.Queue()
+        # Queue for events generated during execution
+        self._event_queue: queue.Queue[GraphNodeEventBase] = queue.Queue()
+
+        # === State Management ===
+        # Unified state manager handles all node state transitions and queue operations
+        self._state_manager = UnifiedStateManager(self._graph, self._ready_queue)
+
+        # === Response Coordination ===
+        # Coordinates response streaming from response nodes
+        self._response_coordinator = ResponseStreamCoordinator(
+            variable_pool=self._graph_runtime_state.variable_pool, graph=self._graph
+        )
+
+        # === Event Management ===
+        # Event manager handles both collection and emission of events
+        self._event_manager = EventManager()
+
+        # === Error Handling ===
+        # Centralized error handler for graph execution errors
+        self._error_handler = ErrorHandler(self._graph, self._graph_execution)
+
+        # === Graph Traversal Components ===
+        # Propagates skip status through the graph when conditions aren't met
+        self._skip_propagator = SkipPropagator(
+            graph=self._graph,
+            state_manager=self._state_manager,
+        )
+
+        # Processes edges to determine next nodes after execution
+        # Also handles conditional branching and route selection
+        self._edge_processor = EdgeProcessor(
+            graph=self._graph,
+            state_manager=self._state_manager,
+            response_coordinator=self._response_coordinator,
+            skip_propagator=self._skip_propagator,
+        )
+
+        # === Event Handler Registry ===
+        # Central registry for handling all node execution events
+        self._event_handler_registry = EventHandler(
+            graph=self._graph,
+            graph_runtime_state=self._graph_runtime_state,
+            graph_execution=self._graph_execution,
+            response_coordinator=self._response_coordinator,
+            event_collector=self._event_manager,
+            edge_processor=self._edge_processor,
+            state_manager=self._state_manager,
+            error_handler=self._error_handler,
+        )
+
+        # === Command Processing ===
+        # Processes external commands (e.g., abort requests)
+        self._command_processor = CommandProcessor(
+            command_channel=self._command_channel,
+            graph_execution=self._graph_execution,
+        )
+
+        # Register abort command handler
+        abort_handler = AbortCommandHandler()
+        self._command_processor.register_handler(
+            AbortCommand,
+            abort_handler,
+        )
+
+        # === Worker Pool Setup ===
+        # Capture Flask app context for worker threads
+        flask_app: Flask | None = None
+        try:
+            app = current_app._get_current_object()  # type: ignore
+            if isinstance(app, Flask):
+                flask_app = app
+        except RuntimeError:
+            pass
+
+        # Capture context variables for worker threads
+        context_vars = contextvars.copy_context()
+
+        # Create worker pool for parallel node execution
+        self._worker_pool = SimpleWorkerPool(
+            ready_queue=self._ready_queue,
+            event_queue=self._event_queue,
+            graph=self._graph,
+            flask_app=flask_app,
+            context_vars=context_vars,
+            min_workers=self._min_workers,
+            max_workers=self._max_workers,
+            scale_up_threshold=self._scale_up_threshold,
+            scale_down_idle_time=self._scale_down_idle_time,
+        )
+
+        # === Orchestration ===
+        # Coordinates the overall execution lifecycle
+        self._execution_coordinator = ExecutionCoordinator(
+            graph_execution=self._graph_execution,
+            state_manager=self._state_manager,
+            event_handler=self._event_handler_registry,
+            event_collector=self._event_manager,
+            command_processor=self._command_processor,
+            worker_pool=self._worker_pool,
+        )
+
+        # Dispatches events and manages execution flow
+        self._dispatcher = Dispatcher(
+            event_queue=self._event_queue,
+            event_handler=self._event_handler_registry,
+            event_collector=self._event_manager,
+            execution_coordinator=self._execution_coordinator,
+            max_execution_time=self._execution_context.max_execution_time,
+            event_emitter=self._event_manager,
+        )
+
+        # === Extensibility ===
+        # Layers allow plugins to extend engine functionality
+        self._layers: list[Layer] = []
+
+        # === Validation ===
+        # Ensure all nodes share the same GraphRuntimeState instance
+        self._validate_graph_state_consistency()
+
+    def _validate_graph_state_consistency(self) -> None:
+        """Validate that all nodes share the same GraphRuntimeState."""
+        expected_state_id = id(self._graph_runtime_state)
+        for node in self._graph.nodes.values():
+            if id(node.graph_runtime_state) != expected_state_id:
+                raise ValueError(f"GraphRuntimeState consistency violation: Node '{node.id}' has a different instance")
+
+    def layer(self, layer: Layer) -> "GraphEngine":
+        """Add a layer for extending functionality."""
+        self._layers.append(layer)
+        return self
+
+    def run(self) -> Generator[GraphEngineEvent, None, None]:
+        """
+        Execute the graph using the modular architecture.
+
+        Returns:
+            Generator yielding GraphEngineEvent instances
+        """
+        try:
+            # Initialize layers
+            self._initialize_layers()
+
+            # Start execution
+            self._graph_execution.start()
+            start_event = GraphRunStartedEvent()
+            yield start_event
+
+            # Start subsystems
+            self._start_execution()
+
+            # Yield events as they occur
+            yield from self._event_manager.emit_events()
+
+            # Handle completion
+            if self._graph_execution.aborted:
+                abort_reason = "Workflow execution aborted by user command"
+                if self._graph_execution.error:
+                    abort_reason = str(self._graph_execution.error)
+                yield GraphRunAbortedEvent(
+                    reason=abort_reason,
+                    outputs=self._graph_runtime_state.outputs,
+                )
+            elif self._graph_execution.has_error:
+                if self._graph_execution.error:
+                    raise self._graph_execution.error
+            else:
+                yield GraphRunSucceededEvent(
+                    outputs=self._graph_runtime_state.outputs,
+                )
+
+        except Exception as e:
+            yield GraphRunFailedEvent(error=str(e))
+            raise
+
+        finally:
+            self._stop_execution()
+
+    def _initialize_layers(self) -> None:
+        """Initialize layers with context."""
+        self._event_manager.set_layers(self._layers)
+        for layer in self._layers:
+            try:
+                layer.initialize(self._graph_runtime_state, self._command_channel)
+            except Exception as e:
+                logger.warning("Failed to initialize layer %s: %s", layer.__class__.__name__, e)
+
+            try:
+                layer.on_graph_start()
+            except Exception as e:
+                logger.warning("Layer %s failed on_graph_start: %s", layer.__class__.__name__, e)
+
+    def _start_execution(self) -> None:
+        """Start execution subsystems."""
+        # Start worker pool (it calculates initial workers internally)
+        self._worker_pool.start()
+
+        # Register response nodes
+        for node in self._graph.nodes.values():
+            if node.execution_type == NodeExecutionType.RESPONSE:
+                self._response_coordinator.register(node.id)
+
+        # Enqueue root node
+        root_node = self._graph.root_node
+        self._state_manager.enqueue_node(root_node.id)
+        self._state_manager.start_execution(root_node.id)
+
+        # Start dispatcher
+        self._dispatcher.start()
+
+    def _stop_execution(self) -> None:
+        """Stop execution subsystems."""
+        self._dispatcher.stop()
+        self._worker_pool.stop()
+        # Don't mark complete here as the dispatcher already does it
+
+        # Notify layers
+        logger = logging.getLogger(__name__)
+
+        for layer in self._layers:
+            try:
+                layer.on_graph_end(self._graph_execution.error)
+            except Exception as e:
+                logger.warning("Layer %s failed on_graph_end: %s", layer.__class__.__name__, e)
+
+    # Public property accessors for attributes that need external access
+    @property
+    def graph_runtime_state(self) -> GraphRuntimeState:
+        """Get the graph runtime state."""
+        return self._graph_runtime_state
diff --git a/api/core/workflow/nodes/agent/agent_node.py b/api/core/workflow/nodes/agent/agent_node.py
index 57b58ab8f5..fa912d5035 100644
--- a/api/core/workflow/nodes/agent/agent_node.py
+++ b/api/core/workflow/nodes/agent/agent_node.py
@@ -157,7 +157,7 @@ class AgentNode(Node):
                 messages=message_stream,
                 tool_info={
                     "icon": self.agent_strategy_icon,
-                    "agent_strategy": cast(AgentNodeData, self._node_data).agent_strategy_name,
+                    "agent_strategy": self._node_data.agent_strategy_name,
                 },
                 parameters_for_log=parameters_for_log,
                 user_id=self.user_id,
@@ -401,8 +401,7 @@ class AgentNode(Node):
             current_plugin = next(
                 plugin
                 for plugin in plugins
-                if f"{plugin.plugin_id}/{plugin.name}"
-                == cast(AgentNodeData, self._node_data).agent_strategy_provider_name
+                if f"{plugin.plugin_id}/{plugin.name}" == self._node_data.agent_strategy_provider_name
             )
             icon = current_plugin.declaration.icon
         except StopIteration:
diff --git a/api/core/workflow/nodes/document_extractor/node.py b/api/core/workflow/nodes/document_extractor/node.py
index 65dde51191..ff241b9cf0 100644
--- a/api/core/workflow/nodes/document_extractor/node.py
+++ b/api/core/workflow/nodes/document_extractor/node.py
@@ -301,12 +301,12 @@ def _extract_text_from_yaml(file_content: bytes) -> str:
             encoding = "utf-8"
 
         yaml_data = yaml.safe_load_all(file_content.decode(encoding, errors="ignore"))
-        return cast(str, yaml.dump_all(yaml_data, allow_unicode=True, sort_keys=False))
+        return yaml.dump_all(yaml_data, allow_unicode=True, sort_keys=False)
     except (UnicodeDecodeError, LookupError, yaml.YAMLError) as e:
         # If decoding fails, try with utf-8 as last resort
         try:
             yaml_data = yaml.safe_load_all(file_content.decode("utf-8", errors="ignore"))
-            return cast(str, yaml.dump_all(yaml_data, allow_unicode=True, sort_keys=False))
+            return yaml.dump_all(yaml_data, allow_unicode=True, sort_keys=False)
         except (UnicodeDecodeError, yaml.YAMLError):
             raise TextExtractionError(f"Failed to decode or parse YAML file: {e}") from e
 
diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
index d7ccb338f5..bd5cab1e72 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
+++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
@@ -6,7 +6,7 @@ from collections import defaultdict
 from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any, Optional, cast
 
-from sqlalchemy import Float, and_, func, or_, text
+from sqlalchemy import Float, and_, func, or_, select, text
 from sqlalchemy import cast as sqlalchemy_cast
 from sqlalchemy.orm import sessionmaker
 
@@ -75,7 +75,7 @@ default_retrieval_model = {
     "search_method": RetrievalMethod.SEMANTIC_SEARCH.value,
     "reranking_enable": False,
     "reranking_model": {"reranking_provider_name": "", "reranking_model_name": ""},
-    "top_k": 2,
+    "top_k": 4,
     "score_threshold_enabled": False,
 }
 
@@ -358,15 +358,12 @@ class KnowledgeRetrievalNode(Node):
                 for record in records:
                     segment = record.segment
                     dataset = db.session.query(Dataset).filter_by(id=segment.dataset_id).first()  # type: ignore
-                    document = (
-                        db.session.query(Document)
-                        .where(
-                            Document.id == segment.document_id,
-                            Document.enabled == True,
-                            Document.archived == False,
-                        )
-                        .first()
+                    stmt = select(Document).where(
+                        Document.id == segment.document_id,
+                        Document.enabled == True,
+                        Document.archived == False,
                     )
+                    document = db.session.scalar(stmt)
                     if dataset and document:
                         source = {
                             "metadata": {
@@ -505,7 +502,8 @@ class KnowledgeRetrievalNode(Node):
         self, dataset_ids: list, query: str, node_data: KnowledgeRetrievalNodeData
     ) -> list[dict[str, Any]]:
         # get all metadata field
-        metadata_fields = db.session.query(DatasetMetadata).where(DatasetMetadata.dataset_id.in_(dataset_ids)).all()
+        stmt = select(DatasetMetadata).where(DatasetMetadata.dataset_id.in_(dataset_ids))
+        metadata_fields = db.session.scalars(stmt).all()
         all_metadata_fields = [metadata_field.name for metadata_field in metadata_fields]
         if node_data.metadata_model_config is None:
             raise ValueError("metadata_model_config is required")
diff --git a/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py b/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
index 3e4882fd1e..648ea69936 100644
--- a/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
+++ b/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
@@ -138,7 +138,7 @@ class ParameterExtractorNode(Node):
         """
         Run the node.
         """
-        node_data = cast(ParameterExtractorNodeData, self._node_data)
+        node_data = self._node_data
         variable = self.graph_runtime_state.variable_pool.get(node_data.query)
         query = variable.text if variable else ""
 
diff --git a/api/core/workflow/nodes/question_classifier/question_classifier_node.py b/api/core/workflow/nodes/question_classifier/question_classifier_node.py
index 968332959c..afc45cf9cf 100644
--- a/api/core/workflow/nodes/question_classifier/question_classifier_node.py
+++ b/api/core/workflow/nodes/question_classifier/question_classifier_node.py
@@ -1,6 +1,6 @@
 import json
 from collections.abc import Mapping, Sequence
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.memory.token_buffer_memory import TokenBufferMemory
@@ -103,7 +103,7 @@ class QuestionClassifierNode(Node):
         return "1"
 
     def _run(self):
-        node_data = cast(QuestionClassifierNodeData, self._node_data)
+        node_data = self._node_data
         variable_pool = self.graph_runtime_state.variable_pool
 
         # extract variables
diff --git a/api/core/workflow/nodes/tool/tool_node.py b/api/core/workflow/nodes/tool/tool_node.py
index 39524dcd4f..9708edcb38 100644
--- a/api/core/workflow/nodes/tool/tool_node.py
+++ b/api/core/workflow/nodes/tool/tool_node.py
@@ -1,5 +1,5 @@
 from collections.abc import Generator, Mapping, Sequence
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional
 
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -61,7 +61,7 @@ class ToolNode(Node):
         """
         from core.plugin.impl.exc import PluginDaemonClientSideError, PluginInvokeError
 
-        node_data = cast(ToolNodeData, self._node_data)
+        node_data = self._node_data
 
         # fetch tool icon
         tool_info = {
diff --git a/api/core/workflow/nodes/tool/tool_node.py.orig b/api/core/workflow/nodes/tool/tool_node.py.orig
new file mode 100644
index 0000000000..9708edcb38
--- /dev/null
+++ b/api/core/workflow/nodes/tool/tool_node.py.orig
@@ -0,0 +1,493 @@
+from collections.abc import Generator, Mapping, Sequence
+from typing import TYPE_CHECKING, Any, Optional
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
+from core.file import File, FileTransferMethod
+from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
+from core.tools.errors import ToolInvokeError
+from core.tools.tool_engine import ToolEngine
+from core.tools.utils.message_transformer import ToolFileMessageTransformer
+from core.variables.segments import ArrayAnySegment, ArrayFileSegment
+from core.variables.variables import ArrayAnyVariable
+from core.workflow.enums import (
+    ErrorStrategy,
+    NodeType,
+    SystemVariableKey,
+    WorkflowNodeExecutionMetadataKey,
+    WorkflowNodeExecutionStatus,
+)
+from core.workflow.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
+from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig
+from core.workflow.nodes.base.node import Node
+from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
+from extensions.ext_database import db
+from factories import file_factory
+from models import ToolFile
+from services.tools.builtin_tools_manage_service import BuiltinToolManageService
+
+from .entities import ToolNodeData
+from .exc import (
+    ToolFileError,
+    ToolNodeError,
+    ToolParameterError,
+)
+
+if TYPE_CHECKING:
+    from core.workflow.entities import VariablePool
+
+
+class ToolNode(Node):
+    """
+    Tool Node
+    """
+
+    node_type = NodeType.TOOL
+
+    _node_data: ToolNodeData
+
+    def init_node_data(self, data: Mapping[str, Any]) -> None:
+        self._node_data = ToolNodeData.model_validate(data)
+
+    @classmethod
+    def version(cls) -> str:
+        return "1"
+
+    def _run(self) -> Generator:
+        """
+        Run the tool node
+        """
+        from core.plugin.impl.exc import PluginDaemonClientSideError, PluginInvokeError
+
+        node_data = self._node_data
+
+        # fetch tool icon
+        tool_info = {
+            "provider_type": node_data.provider_type.value,
+            "provider_id": node_data.provider_id,
+            "plugin_unique_identifier": node_data.plugin_unique_identifier,
+        }
+
+        # get tool runtime
+        try:
+            from core.tools.tool_manager import ToolManager
+
+            # This is an issue that caused problems before.
+            # Logically, we shouldn't use the node_data.version field for judgment
+            # But for backward compatibility with historical data
+            # this version field judgment is still preserved here.
+            variable_pool: VariablePool | None = None
+            if node_data.version != "1" or node_data.tool_node_version != "1":
+                variable_pool = self.graph_runtime_state.variable_pool
+            tool_runtime = ToolManager.get_workflow_tool_runtime(
+                self.tenant_id, self.app_id, self._node_id, self._node_data, self.invoke_from, variable_pool
+            )
+        except ToolNodeError as e:
+            yield StreamCompletedEvent(
+                node_run_result=NodeRunResult(
+                    status=WorkflowNodeExecutionStatus.FAILED,
+                    inputs={},
+                    metadata={WorkflowNodeExecutionMetadataKey.TOOL_INFO: tool_info},
+                    error=f"Failed to get tool runtime: {str(e)}",
+                    error_type=type(e).__name__,
+                )
+            )
+            return
+
+        # get parameters
+        tool_parameters = tool_runtime.get_merged_runtime_parameters() or []
+        parameters = self._generate_parameters(
+            tool_parameters=tool_parameters,
+            variable_pool=self.graph_runtime_state.variable_pool,
+            node_data=self._node_data,
+        )
+        parameters_for_log = self._generate_parameters(
+            tool_parameters=tool_parameters,
+            variable_pool=self.graph_runtime_state.variable_pool,
+            node_data=self._node_data,
+            for_log=True,
+        )
+        # get conversation id
+        conversation_id = self.graph_runtime_state.variable_pool.get(["sys", SystemVariableKey.CONVERSATION_ID])
+
+        try:
+            message_stream = ToolEngine.generic_invoke(
+                tool=tool_runtime,
+                tool_parameters=parameters,
+                user_id=self.user_id,
+                workflow_tool_callback=DifyWorkflowCallbackHandler(),
+                workflow_call_depth=self.workflow_call_depth,
+                app_id=self.app_id,
+                conversation_id=conversation_id.text if conversation_id else None,
+            )
+        except ToolNodeError as e:
+            yield StreamCompletedEvent(
+                node_run_result=NodeRunResult(
+                    status=WorkflowNodeExecutionStatus.FAILED,
+                    inputs=parameters_for_log,
+                    metadata={WorkflowNodeExecutionMetadataKey.TOOL_INFO: tool_info},
+                    error=f"Failed to invoke tool: {str(e)}",
+                    error_type=type(e).__name__,
+                )
+            )
+            return
+
+        try:
+            # convert tool messages
+            yield from self._transform_message(
+                messages=message_stream,
+                tool_info=tool_info,
+                parameters_for_log=parameters_for_log,
+                user_id=self.user_id,
+                tenant_id=self.tenant_id,
+                node_id=self._node_id,
+            )
+        except ToolInvokeError as e:
+            yield StreamCompletedEvent(
+                node_run_result=NodeRunResult(
+                    status=WorkflowNodeExecutionStatus.FAILED,
+                    inputs=parameters_for_log,
+                    metadata={WorkflowNodeExecutionMetadataKey.TOOL_INFO: tool_info},
+                    error=f"Failed to invoke tool {node_data.provider_name}: {str(e)}",
+                    error_type=type(e).__name__,
+                )
+            )
+        except PluginInvokeError as e:
+            yield StreamCompletedEvent(
+                node_run_result=NodeRunResult(
+                    status=WorkflowNodeExecutionStatus.FAILED,
+                    inputs=parameters_for_log,
+                    metadata={WorkflowNodeExecutionMetadataKey.TOOL_INFO: tool_info},
+                    error="An error occurred in the plugin, "
+                    f"please contact the author of {node_data.provider_name} for help, "
+                    f"error type: {e.get_error_type()}, "
+                    f"error details: {e.get_error_message()}",
+                    error_type=type(e).__name__,
+                )
+            )
+        except PluginDaemonClientSideError as e:
+            yield StreamCompletedEvent(
+                node_run_result=NodeRunResult(
+                    status=WorkflowNodeExecutionStatus.FAILED,
+                    inputs=parameters_for_log,
+                    metadata={WorkflowNodeExecutionMetadataKey.TOOL_INFO: tool_info},
+                    error=f"Failed to invoke tool, error: {e.description}",
+                    error_type=type(e).__name__,
+                )
+            )
+
+    def _generate_parameters(
+        self,
+        *,
+        tool_parameters: Sequence[ToolParameter],
+        variable_pool: "VariablePool",
+        node_data: ToolNodeData,
+        for_log: bool = False,
+    ) -> dict[str, Any]:
+        """
+        Generate parameters based on the given tool parameters, variable pool, and node data.
+
+        Args:
+            tool_parameters (Sequence[ToolParameter]): The list of tool parameters.
+            variable_pool (VariablePool): The variable pool containing the variables.
+            node_data (ToolNodeData): The data associated with the tool node.
+
+        Returns:
+            Mapping[str, Any]: A dictionary containing the generated parameters.
+
+        """
+        tool_parameters_dictionary = {parameter.name: parameter for parameter in tool_parameters}
+
+        result: dict[str, Any] = {}
+        for parameter_name in node_data.tool_parameters:
+            parameter = tool_parameters_dictionary.get(parameter_name)
+            if not parameter:
+                result[parameter_name] = None
+                continue
+            tool_input = node_data.tool_parameters[parameter_name]
+            if tool_input.type == "variable":
+                variable = variable_pool.get(tool_input.value)
+                if variable is None:
+                    if parameter.required:
+                        raise ToolParameterError(f"Variable {tool_input.value} does not exist")
+                    continue
+                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.log if for_log else segment_group.text
+            else:
+                raise ToolParameterError(f"Unknown tool input type '{tool_input.type}'")
+            result[parameter_name] = parameter_value
+
+        return result
+
+    def _fetch_files(self, variable_pool: "VariablePool") -> list[File]:
+        variable = variable_pool.get(["sys", SystemVariableKey.FILES.value])
+        assert isinstance(variable, ArrayAnyVariable | ArrayAnySegment)
+        return list(variable.value) if variable else []
+
+    def _transform_message(
+        self,
+        messages: Generator[ToolInvokeMessage, None, None],
+        tool_info: Mapping[str, Any],
+        parameters_for_log: dict[str, Any],
+        user_id: str,
+        tenant_id: str,
+        node_id: str,
+    ) -> Generator:
+        """
+        Convert ToolInvokeMessages into tuple[plain_text, files]
+        """
+        # transform message and handle file storage
+        from core.plugin.impl.plugin import PluginInstaller
+
+        message_stream = ToolFileMessageTransformer.transform_tool_invoke_messages(
+            messages=messages,
+            user_id=user_id,
+            tenant_id=tenant_id,
+            conversation_id=None,
+        )
+
+        text = ""
+        files: list[File] = []
+        json: list[dict] = []
+
+        variables: dict[str, Any] = {}
+
+        for message in message_stream:
+            if message.type in {
+                ToolInvokeMessage.MessageType.IMAGE_LINK,
+                ToolInvokeMessage.MessageType.BINARY_LINK,
+                ToolInvokeMessage.MessageType.IMAGE,
+            }:
+                assert isinstance(message.message, ToolInvokeMessage.TextMessage)
+
+                url = message.message.text
+                if message.meta:
+                    transfer_method = message.meta.get("transfer_method", FileTransferMethod.TOOL_FILE)
+                else:
+                    transfer_method = FileTransferMethod.TOOL_FILE
+
+                tool_file_id = str(url).split("/")[-1].split(".")[0]
+
+                with Session(db.engine) as session:
+                    stmt = select(ToolFile).where(ToolFile.id == tool_file_id)
+                    tool_file = session.scalar(stmt)
+                    if tool_file is None:
+                        raise ToolFileError(f"Tool file {tool_file_id} does not exist")
+
+                mapping = {
+                    "tool_file_id": tool_file_id,
+                    "type": file_factory.get_file_type_by_mime_type(tool_file.mimetype),
+                    "transfer_method": transfer_method,
+                    "url": url,
+                }
+                file = file_factory.build_from_mapping(
+                    mapping=mapping,
+                    tenant_id=tenant_id,
+                )
+                files.append(file)
+            elif message.type == ToolInvokeMessage.MessageType.BLOB:
+                # get tool file id
+                assert isinstance(message.message, ToolInvokeMessage.TextMessage)
+                assert message.meta
+
+                tool_file_id = message.message.text.split("/")[-1].split(".")[0]
+                with Session(db.engine) as session:
+                    stmt = select(ToolFile).where(ToolFile.id == tool_file_id)
+                    tool_file = session.scalar(stmt)
+                    if tool_file is None:
+                        raise ToolFileError(f"tool file {tool_file_id} not exists")
+
+                mapping = {
+                    "tool_file_id": tool_file_id,
+                    "transfer_method": FileTransferMethod.TOOL_FILE,
+                }
+
+                files.append(
+                    file_factory.build_from_mapping(
+                        mapping=mapping,
+                        tenant_id=tenant_id,
+                    )
+                )
+            elif message.type == ToolInvokeMessage.MessageType.TEXT:
+                assert isinstance(message.message, ToolInvokeMessage.TextMessage)
+                text += message.message.text
+                yield StreamChunkEvent(
+                    selector=[node_id, "text"],
+                    chunk=message.message.text,
+                    is_final=False,
+                )
+            elif message.type == ToolInvokeMessage.MessageType.JSON:
+                assert isinstance(message.message, ToolInvokeMessage.JsonMessage)
+                # JSON message handling for tool node
+                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"
+                text += stream_text
+                yield StreamChunkEvent(
+                    selector=[node_id, "text"],
+                    chunk=stream_text,
+                    is_final=False,
+                )
+            elif message.type == ToolInvokeMessage.MessageType.VARIABLE:
+                assert isinstance(message.message, ToolInvokeMessage.VariableMessage)
+                variable_name = message.message.variable_name
+                variable_value = message.message.variable_value
+                if message.message.stream:
+                    if not isinstance(variable_value, str):
+                        raise ToolNodeError("When 'stream' is True, 'variable_value' must be a string.")
+                    if variable_name not in variables:
+                        variables[variable_name] = ""
+                    variables[variable_name] += variable_value
+
+                    yield StreamChunkEvent(
+                        selector=[node_id, variable_name],
+                        chunk=variable_value,
+                        is_final=False,
+                    )
+                else:
+                    variables[variable_name] = variable_value
+            elif message.type == ToolInvokeMessage.MessageType.FILE:
+                assert message.meta is not None
+                assert isinstance(message.meta, dict)
+                # Validate that meta contains a 'file' key
+                if "file" not in message.meta:
+                    raise ToolNodeError("File message is missing 'file' key in meta")
+
+                # Validate that the file is an instance of File
+                if not isinstance(message.meta["file"], File):
+                    raise ToolNodeError(f"Expected File object but got {type(message.meta['file']).__name__}")
+                files.append(message.meta["file"])
+            elif message.type == ToolInvokeMessage.MessageType.LOG:
+                assert isinstance(message.message, ToolInvokeMessage.LogMessage)
+                if message.message.metadata:
+                    icon = tool_info.get("icon", "")
+                    dict_metadata = dict(message.message.metadata)
+                    if dict_metadata.get("provider"):
+                        manager = PluginInstaller()
+                        plugins = manager.list_plugins(tenant_id)
+                        try:
+                            current_plugin = next(
+                                plugin
+                                for plugin in plugins
+                                if f"{plugin.plugin_id}/{plugin.name}" == dict_metadata["provider"]
+                            )
+                            icon = current_plugin.declaration.icon
+                        except StopIteration:
+                            pass
+                        icon_dark = None
+                        try:
+                            builtin_tool = next(
+                                provider
+                                for provider in BuiltinToolManageService.list_builtin_tools(
+                                    user_id,
+                                    tenant_id,
+                                )
+                                if provider.name == dict_metadata["provider"]
+                            )
+                            icon = builtin_tool.icon
+                            icon_dark = builtin_tool.icon_dark
+                        except StopIteration:
+                            pass
+
+                        dict_metadata["icon"] = icon
+                        dict_metadata["icon_dark"] = icon_dark
+                        message.message.metadata = dict_metadata
+
+        # Add agent_logs to outputs['json'] to ensure frontend can access thinking process
+        json_output: list[dict[str, Any]] = []
+
+        # Step 2: normalize JSON into {"data": [...]}.change json to list[dict]
+        if json:
+            json_output.extend(json)
+        else:
+            json_output.append({"data": []})
+
+        # Send final chunk events for all streamed outputs
+        # Final chunk for text stream
+        yield StreamChunkEvent(
+            selector=[self._node_id, "text"],
+            chunk="",
+            is_final=True,
+        )
+
+        # Final chunks for any streamed variables
+        for var_name in variables:
+            yield StreamChunkEvent(
+                selector=[self._node_id, var_name],
+                chunk="",
+                is_final=True,
+            )
+
+        yield StreamCompletedEvent(
+            node_run_result=NodeRunResult(
+                status=WorkflowNodeExecutionStatus.SUCCEEDED,
+                outputs={"text": text, "files": ArrayFileSegment(value=files), "json": json_output, **variables},
+                metadata={
+                    WorkflowNodeExecutionMetadataKey.TOOL_INFO: tool_info,
+                },
+                inputs=parameters_for_log,
+            )
+        )
+
+    @classmethod
+    def _extract_variable_selector_to_variable_mapping(
+        cls,
+        *,
+        graph_config: Mapping[str, Any],
+        node_id: str,
+        node_data: Mapping[str, Any],
+    ) -> Mapping[str, Sequence[str]]:
+        """
+        Extract variable selector to variable mapping
+        :param graph_config: graph config
+        :param node_id: node id
+        :param node_data: node data
+        :return:
+        """
+        # Create typed NodeData from dict
+        typed_node_data = ToolNodeData.model_validate(node_data)
+
+        result = {}
+        for parameter_name in typed_node_data.tool_parameters:
+            input = typed_node_data.tool_parameters[parameter_name]
+            if input.type == "mixed":
+                assert isinstance(input.value, str)
+                selectors = VariableTemplateParser(input.value).extract_variable_selectors()
+                for selector in selectors:
+                    result[selector.variable] = selector.value_selector
+            elif input.type == "variable":
+                result[parameter_name] = input.value
+            elif input.type == "constant":
+                pass
+
+        result = {node_id + "." + key: value for key, value in result.items()}
+
+        return result
+
+    def _get_error_strategy(self) -> Optional[ErrorStrategy]:
+        return self._node_data.error_strategy
+
+    def _get_retry_config(self) -> RetryConfig:
+        return self._node_data.retry_config
+
+    def _get_title(self) -> str:
+        return self._node_data.title
+
+    def _get_description(self) -> Optional[str]:
+        return self._node_data.desc
+
+    def _get_default_value_dict(self) -> dict[str, Any]:
+        return self._node_data.default_value_dict
+
+    def get_base_node_data(self) -> BaseNodeData:
+        return self._node_data
+
+    @property
+    def retry(self) -> bool:
+        return self._node_data.retry_config.retry_enabled
diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py
index 78f7b39a06..6f1c530b14 100644
--- a/api/core/workflow/workflow_entry.py
+++ b/api/core/workflow/workflow_entry.py
@@ -2,7 +2,7 @@ import logging
 import time
 import uuid
 from collections.abc import Generator, Mapping, Sequence
-from typing import Any, Optional, cast
+from typing import Any, Optional
 
 from configs import dify_config
 from core.app.apps.exc import GenerateTaskStoppedError
@@ -318,7 +318,6 @@ class WorkflowEntry:
         # init graph
         graph = Graph.init(graph_config=graph_dict, node_factory=node_factory)
 
-        node_cls = cast(type[Node], node_cls)
         # init workflow run state
         node_config = {
             "id": node_id,
diff --git a/api/core/workflow/workflow_entry.py.orig b/api/core/workflow/workflow_entry.py.orig
new file mode 100644
index 0000000000..69dd1bdebc
--- /dev/null
+++ b/api/core/workflow/workflow_entry.py.orig
@@ -0,0 +1,445 @@
+import logging
+import time
+import uuid
+from collections.abc import Generator, Mapping, Sequence
+from typing import Any, Optional
+
+from configs import dify_config
+from core.app.apps.exc import GenerateTaskStoppedError
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.file.models import File
+from core.workflow.constants import ENVIRONMENT_VARIABLE_NODE_ID
+from core.workflow.entities import GraphInitParams, GraphRuntimeState, VariablePool
+from core.workflow.errors import WorkflowNodeRunFailedError
+from core.workflow.graph import Graph
+from core.workflow.graph_engine import GraphEngine
+from core.workflow.graph_engine.command_channels import InMemoryChannel
+from core.workflow.graph_engine.layers import DebugLoggingLayer, ExecutionLimitsLayer
+from core.workflow.graph_engine.protocols.command_channel import CommandChannel
+from core.workflow.graph_events import GraphEngineEvent, GraphNodeEventBase, GraphRunFailedEvent
+from core.workflow.nodes import NodeType
+from core.workflow.nodes.base.node import Node
+from core.workflow.nodes.node_factory import DifyNodeFactory
+from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+from core.workflow.system_variable import SystemVariable
+from core.workflow.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
+from factories import file_factory
+from models.enums import UserFrom
+from models.workflow import Workflow
+
+logger = logging.getLogger(__name__)
+
+
+class WorkflowEntry:
+    def __init__(
+        self,
+        tenant_id: str,
+        app_id: str,
+        workflow_id: str,
+        graph_config: Mapping[str, Any],
+        graph: Graph,
+        user_id: str,
+        user_from: UserFrom,
+        invoke_from: InvokeFrom,
+        call_depth: int,
+        graph_runtime_state: GraphRuntimeState,
+        command_channel: Optional[CommandChannel] = None,
+    ) -> None:
+        """
+        Init workflow entry
+        :param tenant_id: tenant id
+        :param app_id: app id
+        :param workflow_id: workflow id
+        :param workflow_type: workflow type
+        :param graph_config: workflow graph config
+        :param graph: workflow graph
+        :param user_id: user id
+        :param user_from: user from
+        :param invoke_from: invoke from
+        :param call_depth: call depth
+        :param variable_pool: variable pool
+        :param graph_runtime_state: pre-created graph runtime state
+        :param command_channel: command channel for external control (optional, defaults to InMemoryChannel)
+        :param thread_pool_id: thread pool id
+        """
+        # check call depth
+        workflow_call_max_depth = dify_config.WORKFLOW_CALL_MAX_DEPTH
+        if call_depth > workflow_call_max_depth:
+            raise ValueError(f"Max workflow call depth {workflow_call_max_depth} reached.")
+
+        # Use provided command channel or default to InMemoryChannel
+        if command_channel is None:
+            command_channel = InMemoryChannel()
+
+        self.command_channel = command_channel
+        self.graph_engine = GraphEngine(
+            tenant_id=tenant_id,
+            app_id=app_id,
+            workflow_id=workflow_id,
+            user_id=user_id,
+            user_from=user_from,
+            invoke_from=invoke_from,
+            call_depth=call_depth,
+            graph=graph,
+            graph_config=graph_config,
+            graph_runtime_state=graph_runtime_state,
+            max_execution_steps=dify_config.WORKFLOW_MAX_EXECUTION_STEPS,
+            max_execution_time=dify_config.WORKFLOW_MAX_EXECUTION_TIME,
+            command_channel=command_channel,
+        )
+
+        # Add debug logging layer when in debug mode
+        if dify_config.DEBUG:
+            logger.info("Debug mode enabled - adding DebugLoggingLayer to GraphEngine")
+            debug_layer = DebugLoggingLayer(
+                level="DEBUG",
+                include_inputs=True,
+                include_outputs=True,
+                include_process_data=False,  # Process data can be very verbose
+                logger_name=f"GraphEngine.Debug.{workflow_id[:8]}",  # Use workflow ID prefix for unique logger
+            )
+            self.graph_engine.layer(debug_layer)
+
+        # Add execution limits layer
+        limits_layer = ExecutionLimitsLayer(
+            max_steps=dify_config.WORKFLOW_MAX_EXECUTION_STEPS, max_time=dify_config.WORKFLOW_MAX_EXECUTION_TIME
+        )
+        self.graph_engine.layer(limits_layer)
+
+    def run(self) -> Generator[GraphEngineEvent, None, None]:
+        graph_engine = self.graph_engine
+
+        try:
+            # run workflow
+            generator = graph_engine.run()
+            yield from generator
+        except GenerateTaskStoppedError:
+            pass
+        except Exception as e:
+            logger.exception("Unknown Error when workflow entry running")
+            yield GraphRunFailedEvent(error=str(e))
+            return
+
+    @classmethod
+    def single_step_run(
+        cls,
+        *,
+        workflow: Workflow,
+        node_id: str,
+        user_id: str,
+        user_inputs: Mapping[str, Any],
+        variable_pool: VariablePool,
+        variable_loader: VariableLoader = DUMMY_VARIABLE_LOADER,
+    ) -> tuple[Node, Generator[GraphNodeEventBase, None, None]]:
+        """
+        Single step run workflow node
+        :param workflow: Workflow instance
+        :param node_id: node id
+        :param user_id: user id
+        :param user_inputs: user inputs
+        :return:
+        """
+        node_config = workflow.get_node_config_by_id(node_id)
+        node_config_data = node_config.get("data", {})
+
+        # Get node class
+        node_type = NodeType(node_config_data.get("type"))
+        node_version = node_config_data.get("version", "1")
+        node_cls = NODE_TYPE_CLASSES_MAPPING[node_type][node_version]
+
+        # init graph init params and runtime state
+        graph_init_params = GraphInitParams(
+            tenant_id=workflow.tenant_id,
+            app_id=workflow.app_id,
+            workflow_id=workflow.id,
+            graph_config=workflow.graph_dict,
+            user_id=user_id,
+            user_from=UserFrom.ACCOUNT,
+            invoke_from=InvokeFrom.DEBUGGER,
+            call_depth=0,
+        )
+        graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
+
+        # init node factory
+        node_factory = DifyNodeFactory(
+            graph_init_params=graph_init_params,
+            graph_runtime_state=graph_runtime_state,
+        )
+
+        # init graph
+        graph = Graph.init(graph_config=workflow.graph_dict, node_factory=node_factory)
+
+        # init workflow run state
+        node = node_cls(
+            id=str(uuid.uuid4()),
+            config=node_config,
+            graph_init_params=graph_init_params,
+            graph_runtime_state=graph_runtime_state,
+        )
+        node.init_node_data(node_config_data)
+
+        try:
+            # variable selector to variable mapping
+            variable_mapping = node_cls.extract_variable_selector_to_variable_mapping(
+                graph_config=workflow.graph_dict, config=node_config
+            )
+        except NotImplementedError:
+            variable_mapping = {}
+
+        # Loading missing variable from draft var here, and set it into
+        # variable_pool.
+        load_into_variable_pool(
+            variable_loader=variable_loader,
+            variable_pool=variable_pool,
+            variable_mapping=variable_mapping,
+            user_inputs=user_inputs,
+        )
+
+        cls.mapping_user_inputs_to_variable_pool(
+            variable_mapping=variable_mapping,
+            user_inputs=user_inputs,
+            variable_pool=variable_pool,
+            tenant_id=workflow.tenant_id,
+        )
+
+        try:
+            # run node
+            generator = node.run()
+        except Exception as e:
+            logger.exception(
+                "error while running node, workflow_id=%s, node_id=%s, node_type=%s, node_version=%s",
+                workflow.id,
+                node.id,
+                node.node_type,
+                node.version(),
+            )
+            raise WorkflowNodeRunFailedError(node=node, err_msg=str(e))
+        return node, generator
+
+    @staticmethod
+    def _create_single_node_graph(
+        node_id: str,
+        node_data: dict[str, Any],
+        node_width: int = 114,
+        node_height: int = 514,
+    ) -> dict[str, Any]:
+        """
+        Create a minimal graph structure for testing a single node in isolation.
+
+        :param node_id: ID of the target node
+        :param node_data: configuration data for the target node
+        :param node_width: width for UI layout (default: 200)
+        :param node_height: height for UI layout (default: 100)
+        :return: graph dictionary with start node and target node
+        """
+        node_config = {
+            "id": node_id,
+            "width": node_width,
+            "height": node_height,
+            "type": "custom",
+            "data": node_data,
+        }
+        start_node_config = {
+            "id": "start",
+            "width": node_width,
+            "height": node_height,
+            "type": "custom",
+            "data": {
+                "type": NodeType.START.value,
+                "title": "Start",
+                "desc": "Start",
+            },
+        }
+        return {
+            "nodes": [start_node_config, node_config],
+            "edges": [
+                {
+                    "source": "start",
+                    "target": node_id,
+                    "sourceHandle": "source",
+                    "targetHandle": "target",
+                }
+            ],
+        }
+
+    @classmethod
+    def run_free_node(
+        cls, node_data: dict, node_id: str, tenant_id: str, user_id: str, user_inputs: dict[str, Any]
+    ) -> tuple[Node, Generator[GraphNodeEventBase, None, None]]:
+        """
+        Run free node
+
+        NOTE: only parameter_extractor/question_classifier are supported
+
+        :param node_data: node data
+        :param node_id: node id
+        :param tenant_id: tenant id
+        :param user_id: user id
+        :param user_inputs: user inputs
+        :return:
+        """
+        # Create a minimal graph for single node execution
+        graph_dict = cls._create_single_node_graph(node_id, node_data)
+
+        node_type = NodeType(node_data.get("type", ""))
+        if node_type not in {NodeType.PARAMETER_EXTRACTOR, NodeType.QUESTION_CLASSIFIER}:
+            raise ValueError(f"Node type {node_type} not supported")
+
+        node_cls = NODE_TYPE_CLASSES_MAPPING[node_type]["1"]
+        if not node_cls:
+            raise ValueError(f"Node class not found for node type {node_type}")
+
+        # init variable pool
+        variable_pool = VariablePool(
+            system_variables=SystemVariable.empty(),
+            user_inputs={},
+            environment_variables=[],
+        )
+
+        # init graph init params and runtime state
+        graph_init_params = GraphInitParams(
+            tenant_id=tenant_id,
+            app_id="",
+            workflow_id="",
+            graph_config=graph_dict,
+            user_id=user_id,
+            user_from=UserFrom.ACCOUNT,
+            invoke_from=InvokeFrom.DEBUGGER,
+            call_depth=0,
+        )
+        graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
+
+        # init node factory
+        node_factory = DifyNodeFactory(
+            graph_init_params=graph_init_params,
+            graph_runtime_state=graph_runtime_state,
+        )
+
+        # init graph
+        graph = Graph.init(graph_config=graph_dict, node_factory=node_factory)
+
+        node_cls = cast(type[Node], node_cls)
+        # init workflow run state
+        node_config = {
+            "id": node_id,
+            "data": node_data,
+        }
+        node: Node = node_cls(
+            id=str(uuid.uuid4()),
+            config=node_config,
+            graph_init_params=graph_init_params,
+            graph_runtime_state=graph_runtime_state,
+        )
+        node.init_node_data(node_data)
+
+        try:
+            # variable selector to variable mapping
+            try:
+                variable_mapping = node_cls.extract_variable_selector_to_variable_mapping(
+                    graph_config=graph_dict, config=node_config
+                )
+            except NotImplementedError:
+                variable_mapping = {}
+
+            cls.mapping_user_inputs_to_variable_pool(
+                variable_mapping=variable_mapping,
+                user_inputs=user_inputs,
+                variable_pool=variable_pool,
+                tenant_id=tenant_id,
+            )
+
+            # run node
+            generator = node.run()
+
+            return node, generator
+        except Exception as e:
+            logger.exception(
+                "error while running node, node_id=%s, node_type=%s, node_version=%s",
+                node.id,
+                node.node_type,
+                node.version(),
+            )
+            raise WorkflowNodeRunFailedError(node=node, err_msg=str(e))
+
+    @staticmethod
+    def handle_special_values(value: Optional[Mapping[str, Any]]) -> Mapping[str, Any] | None:
+        # NOTE(QuantumGhost): Avoid using this function in new code.
+        # Keep values structured as long as possible and only convert to dict
+        # immediately before serialization (e.g., JSON serialization) to maintain
+        # data integrity and type information.
+        result = WorkflowEntry._handle_special_values(value)
+        return result if isinstance(result, Mapping) or result is None else dict(result)
+
+    @staticmethod
+    def _handle_special_values(value: Any) -> Any:
+        if value is None:
+            return value
+        if isinstance(value, dict):
+            res = {}
+            for k, v in value.items():
+                res[k] = WorkflowEntry._handle_special_values(v)
+            return res
+        if isinstance(value, list):
+            res_list = []
+            for item in value:
+                res_list.append(WorkflowEntry._handle_special_values(item))
+            return res_list
+        if isinstance(value, File):
+            return value.to_dict()
+        return value
+
+    @classmethod
+    def mapping_user_inputs_to_variable_pool(
+        cls,
+        *,
+        variable_mapping: Mapping[str, Sequence[str]],
+        user_inputs: Mapping[str, Any],
+        variable_pool: VariablePool,
+        tenant_id: str,
+    ) -> None:
+        # NOTE(QuantumGhost): This logic should remain synchronized with
+        # the implementation of `load_into_variable_pool`, specifically the logic about
+        # variable existence checking.
+
+        # WARNING(QuantumGhost): The semantics of this method are not clearly defined,
+        # and multiple parts of the codebase depend on its current behavior.
+        # Modify with caution.
+        for node_variable, variable_selector in variable_mapping.items():
+            # fetch node id and variable key from node_variable
+            node_variable_list = node_variable.split(".")
+            if len(node_variable_list) < 1:
+                raise ValueError(f"Invalid node variable {node_variable}")
+
+            node_variable_key = ".".join(node_variable_list[1:])
+
+            if (node_variable_key not in user_inputs and node_variable not in user_inputs) and not variable_pool.get(
+                variable_selector
+            ):
+                raise ValueError(f"Variable key {node_variable} not found in user inputs.")
+
+            # environment variable already exist in variable pool, not from user inputs
+            if variable_pool.get(variable_selector):
+                continue
+
+            # fetch variable node id from variable selector
+            variable_node_id = variable_selector[0]
+            variable_key_list = variable_selector[1:]
+            variable_key_list = list(variable_key_list)
+
+            # get input value
+            input_value = user_inputs.get(node_variable)
+            if not input_value:
+                input_value = user_inputs.get(node_variable_key)
+
+            if isinstance(input_value, dict) and "type" in input_value and "transfer_method" in input_value:
+                input_value = file_factory.build_from_mapping(mapping=input_value, tenant_id=tenant_id)
+            if (
+                isinstance(input_value, list)
+                and all(isinstance(item, dict) for item in input_value)
+                and all("type" in item and "transfer_method" in item for item in input_value)
+            ):
+                input_value = file_factory.build_from_mappings(mappings=input_value, tenant_id=tenant_id)
+
+            # append variable and value to variable pool
+            if variable_node_id != ENVIRONMENT_VARIABLE_NODE_ID:
+                variable_pool.add([variable_node_id] + variable_key_list, input_value)
diff --git a/api/events/event_handlers/update_provider_when_message_created.py b/api/events/event_handlers/update_provider_when_message_created.py
index 6680bc692d..35feaae4e0 100644
--- a/api/events/event_handlers/update_provider_when_message_created.py
+++ b/api/events/event_handlers/update_provider_when_message_created.py
@@ -12,6 +12,7 @@ from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity, Ch
 from core.entities.provider_entities import QuotaUnit, SystemConfiguration
 from events.message_event import message_was_created
 from extensions.ext_database import db
+from extensions.ext_redis import redis_client, redis_fallback
 from libs import datetime_utils
 from models.model import Message
 from models.provider import Provider, ProviderType
@@ -19,6 +20,32 @@ from models.provider_ids import ModelProviderID
 
 logger = logging.getLogger(__name__)
 
+# Redis cache key prefix for provider last used timestamps
+_PROVIDER_LAST_USED_CACHE_PREFIX = "provider:last_used"
+# Default TTL for cache entries (10 minutes)
+_CACHE_TTL_SECONDS = 600
+LAST_USED_UPDATE_WINDOW_SECONDS = 60 * 5
+
+
+def _get_provider_cache_key(tenant_id: str, provider_name: str) -> str:
+    """Generate Redis cache key for provider last used timestamp."""
+    return f"{_PROVIDER_LAST_USED_CACHE_PREFIX}:{tenant_id}:{provider_name}"
+
+
+@redis_fallback(default_return=None)
+def _get_last_update_timestamp(cache_key: str) -> Optional[datetime]:
+    """Get last update timestamp from Redis cache."""
+    timestamp_str = redis_client.get(cache_key)
+    if timestamp_str:
+        return datetime.fromtimestamp(float(timestamp_str.decode("utf-8")))
+    return None
+
+
+@redis_fallback()
+def _set_last_update_timestamp(cache_key: str, timestamp: datetime) -> None:
+    """Set last update timestamp in Redis cache with TTL."""
+    redis_client.setex(cache_key, _CACHE_TTL_SECONDS, str(timestamp.timestamp()))
+
 
 class _ProviderUpdateFilters(BaseModel):
     """Filters for identifying Provider records to update."""
@@ -139,7 +166,7 @@ def handle(sender: Message, **kwargs):
             provider_name,
         )
 
-    except Exception as e:
+    except Exception:
         # Log failure with timing and context
         duration = time_module.perf_counter() - start_time
 
@@ -215,8 +242,23 @@ def _execute_provider_updates(updates_to_perform: list[_ProviderUpdateOperation]
 
             # Prepare values dict for SQLAlchemy update
             update_values = {}
-            # updateing to `last_used` is removed due to performance reason.
-            # ref: https://github.com/langgenius/dify/issues/24526
+
+            # NOTE: For frequently used providers under high load, this implementation may experience
+            # race conditions or update contention despite the time-window optimization:
+            # 1. Multiple concurrent requests might check the same cache key simultaneously
+            # 2. Redis cache operations are not atomic with database updates
+            # 3. Heavy providers could still face database lock contention during peak usage
+            # The current implementation is acceptable for most scenarios, but future optimization
+            # considerations could include: batched updates, or async processing.
+            if values.last_used is not None:
+                cache_key = _get_provider_cache_key(filters.tenant_id, filters.provider_name)
+                now = datetime_utils.naive_utc_now()
+                last_update = _get_last_update_timestamp(cache_key)
+
+                if last_update is None or (now - last_update).total_seconds() > LAST_USED_UPDATE_WINDOW_SECONDS:
+                    update_values["last_used"] = values.last_used
+                    _set_last_update_timestamp(cache_key, now)
+
             if values.quota_used is not None:
                 update_values["quota_used"] = values.quota_used
             # Skip the current update operation if no updates are required.
diff --git a/api/factories/file_factory.py b/api/factories/file_factory.py
index 0ea7d3ae1e..62e3bfa3ba 100644
--- a/api/factories/file_factory.py
+++ b/api/factories/file_factory.py
@@ -3,7 +3,7 @@ import os
 import urllib.parse
 import uuid
 from collections.abc import Callable, Mapping, Sequence
-from typing import Any, cast
+from typing import Any
 
 import httpx
 from sqlalchemy import select
@@ -258,7 +258,6 @@ def _get_remote_file_info(url: str):
         mime_type = ""
 
     resp = ssrf_proxy.head(url, follow_redirects=True)
-    resp = cast(httpx.Response, resp)
     if resp.status_code == httpx.codes.OK:
         if content_disposition := resp.headers.get("Content-Disposition"):
             filename = str(content_disposition.split("filename=")[-1].strip('"'))
diff --git a/api/fields/workflow_fields.py b/api/fields/workflow_fields.py
index f048d0f3b6..53cb9de3ee 100644
--- a/api/fields/workflow_fields.py
+++ b/api/fields/workflow_fields.py
@@ -17,7 +17,7 @@ class EnvironmentVariableField(fields.Raw):
             return {
                 "id": value.id,
                 "name": value.name,
-                "value": encrypter.obfuscated_token(value.value),
+                "value": encrypter.full_mask_token(),
                 "value_type": value.value_type.value,
                 "description": value.description,
             }
diff --git a/api/migrations/versions/2025_08_29_1534-b95962a3885c_add_workflow_app_log_run_id_index.py b/api/migrations/versions/2025_08_29_1534-b95962a3885c_add_workflow_app_log_run_id_index.py
new file mode 100644
index 0000000000..465f8664a5
--- /dev/null
+++ b/api/migrations/versions/2025_08_29_1534-b95962a3885c_add_workflow_app_log_run_id_index.py
@@ -0,0 +1,32 @@
+"""chore: add workflow app log run id index
+
+Revision ID: b95962a3885c
+Revises: 0e154742a5fa
+Create Date: 2025-08-29 15:34:09.838623
+
+"""
+from alembic import op
+import models as models
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'b95962a3885c'
+down_revision = '8d289573e1da'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('workflow_app_logs', schema=None) as batch_op:
+        batch_op.create_index('workflow_app_log_workflow_run_id_idx', ['workflow_run_id'], unique=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('workflow_app_logs', schema=None) as batch_op:
+        batch_op.drop_index('workflow_app_log_workflow_run_id_idx')
+    # ### end Alembic commands ###
diff --git a/api/models/tools.py b/api/models/tools.py
index 26bbc03694..2d15b778e9 100644
--- a/api/models/tools.py
+++ b/api/models/tools.py
@@ -319,7 +319,7 @@ class MCPToolProvider(Base):
 
     @property
     def decrypted_server_url(self) -> str:
-        return cast(str, encrypter.decrypt_token(self.tenant_id, self.server_url))
+        return encrypter.decrypt_token(self.tenant_id, self.server_url)
 
     @property
     def masked_server_url(self) -> str:
diff --git a/api/models/workflow.py b/api/models/workflow.py
index 842b227028..3c449c89cc 100644
--- a/api/models/workflow.py
+++ b/api/models/workflow.py
@@ -835,6 +835,7 @@ class WorkflowAppLog(Base):
     __table_args__ = (
         sa.PrimaryKeyConstraint("id", name="workflow_app_log_pkey"),
         sa.Index("workflow_app_log_app_idx", "tenant_id", "app_id"),
+        sa.Index("workflow_app_log_workflow_run_id_idx", "workflow_run_id"),
     )
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=sa.text("uuid_generate_v4()"))
diff --git a/api/services/account_service.py b/api/services/account_service.py
index 089e667166..50ce171ded 100644
--- a/api/services/account_service.py
+++ b/api/services/account_service.py
@@ -146,7 +146,7 @@ class AccountService:
             account.last_active_at = naive_utc_now()
             db.session.commit()
 
-        return cast(Account, account)
+        return account
 
     @staticmethod
     def get_account_jwt_token(account: Account) -> str:
@@ -191,7 +191,7 @@ class AccountService:
 
         db.session.commit()
 
-        return cast(Account, account)
+        return account
 
     @staticmethod
     def update_account_password(account, password, new_password):
@@ -1127,7 +1127,7 @@ class TenantService:
     def get_custom_config(tenant_id: str) -> dict:
         tenant = db.get_or_404(Tenant, tenant_id)
 
-        return cast(dict, tenant.custom_config_dict)
+        return tenant.custom_config_dict
 
     @staticmethod
     def is_owner(account: Account, tenant: Tenant) -> bool:
diff --git a/api/services/annotation_service.py b/api/services/annotation_service.py
index 6603063c22..9ee92bc2dc 100644
--- a/api/services/annotation_service.py
+++ b/api/services/annotation_service.py
@@ -1,5 +1,5 @@
 import uuid
-from typing import cast
+from typing import Optional
 
 import pandas as pd
 from flask_login import current_user
@@ -40,7 +40,7 @@ class AppAnnotationService:
             if not message:
                 raise NotFound("Message Not Exists.")
 
-            annotation = message.annotation
+            annotation: Optional[MessageAnnotation] = message.annotation
             # save the message annotation
             if annotation:
                 annotation.content = args["answer"]
@@ -70,7 +70,7 @@ class AppAnnotationService:
                 app_id,
                 annotation_setting.collection_binding_id,
             )
-        return cast(MessageAnnotation, annotation)
+        return annotation
 
     @classmethod
     def enable_app_annotation(cls, args: dict, app_id: str) -> dict:
diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py
index 0d10aa15dd..bc574fd8bc 100644
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@@ -1149,7 +1149,7 @@ class DocumentService:
                         "search_method": RetrievalMethod.SEMANTIC_SEARCH.value,
                         "reranking_enable": False,
                         "reranking_model": {"reranking_provider_name": "", "reranking_model_name": ""},
-                        "top_k": 2,
+                        "top_k": 4,
                         "score_threshold_enabled": False,
                     }
 
@@ -1612,7 +1612,7 @@ class DocumentService:
                 search_method=RetrievalMethod.SEMANTIC_SEARCH.value,
                 reranking_enable=False,
                 reranking_model=RerankingModel(reranking_provider_name="", reranking_model_name=""),
-                top_k=2,
+                top_k=4,
                 score_threshold_enabled=False,
             )
         # save dataset
diff --git a/api/services/hit_testing_service.py b/api/services/hit_testing_service.py
index 1517ca6594..bce28da032 100644
--- a/api/services/hit_testing_service.py
+++ b/api/services/hit_testing_service.py
@@ -18,7 +18,7 @@ default_retrieval_model = {
     "search_method": RetrievalMethod.SEMANTIC_SEARCH.value,
     "reranking_enable": False,
     "reranking_model": {"reranking_provider_name": "", "reranking_model_name": ""},
-    "top_k": 2,
+    "top_k": 4,
     "score_threshold_enabled": False,
 }
 
@@ -66,7 +66,7 @@ class HitTestingService:
             retrieval_method=retrieval_model.get("search_method", "semantic_search"),
             dataset_id=dataset.id,
             query=query,
-            top_k=retrieval_model.get("top_k", 2),
+            top_k=retrieval_model.get("top_k", 4),
             score_threshold=retrieval_model.get("score_threshold", 0.0)
             if retrieval_model["score_threshold_enabled"]
             else 0.0,
diff --git a/api/services/message_service.py b/api/services/message_service.py
index a19d6ee157..13c8e948ca 100644
--- a/api/services/message_service.py
+++ b/api/services/message_service.py
@@ -112,7 +112,9 @@ class MessageService:
             base_query = base_query.where(Message.conversation_id == conversation.id)
 
         # Check if include_ids is not None and not empty to avoid WHERE false condition
-        if include_ids is not None and len(include_ids) > 0:
+        if include_ids is not None:
+            if len(include_ids) == 0:
+                return InfiniteScrollPagination(data=[], limit=limit, has_more=False)
             base_query = base_query.where(Message.id.in_(include_ids))
 
         if last_id:
diff --git a/api/tasks/duplicate_document_indexing_task.py b/api/tasks/duplicate_document_indexing_task.py
index 88e8697d17..955e898ec1 100644
--- a/api/tasks/duplicate_document_indexing_task.py
+++ b/api/tasks/duplicate_document_indexing_task.py
@@ -27,73 +27,73 @@ def duplicate_document_indexing_task(dataset_id: str, document_ids: list):
     documents = []
     start_at = time.perf_counter()
 
-    dataset = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
-    if dataset is None:
-        logger.info(click.style(f"Dataset not found: {dataset_id}", fg="red"))
-        db.session.close()
-        return
-
-    # check document limit
-    features = FeatureService.get_features(dataset.tenant_id)
     try:
-        if features.billing.enabled:
-            vector_space = features.vector_space
-            count = len(document_ids)
-            if features.billing.subscription.plan == "sandbox" and count > 1:
-                raise ValueError("Your current plan does not support batch upload, please upgrade your plan.")
-            batch_upload_limit = int(dify_config.BATCH_UPLOAD_LIMIT)
-            if count > batch_upload_limit:
-                raise ValueError(f"You have reached the batch upload limit of {batch_upload_limit}.")
-            if 0 < vector_space.limit <= vector_space.size:
-                raise ValueError(
-                    "Your total number of documents plus the number of uploads have over the limit of "
-                    "your subscription."
+        dataset = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
+        if dataset is None:
+            logger.info(click.style(f"Dataset not found: {dataset_id}", fg="red"))
+            db.session.close()
+            return
+
+        # check document limit
+        features = FeatureService.get_features(dataset.tenant_id)
+        try:
+            if features.billing.enabled:
+                vector_space = features.vector_space
+                count = len(document_ids)
+                if features.billing.subscription.plan == "sandbox" and count > 1:
+                    raise ValueError("Your current plan does not support batch upload, please upgrade your plan.")
+                batch_upload_limit = int(dify_config.BATCH_UPLOAD_LIMIT)
+                if count > batch_upload_limit:
+                    raise ValueError(f"You have reached the batch upload limit of {batch_upload_limit}.")
+                if 0 < vector_space.limit <= vector_space.size:
+                    raise ValueError(
+                        "Your total number of documents plus the number of uploads have over the limit of "
+                        "your subscription."
+                    )
+        except Exception as e:
+            for document_id in document_ids:
+                document = (
+                    db.session.query(Document)
+                    .where(Document.id == document_id, Document.dataset_id == dataset_id)
+                    .first()
                 )
-    except Exception as e:
+                if document:
+                    document.indexing_status = "error"
+                    document.error = str(e)
+                    document.stopped_at = naive_utc_now()
+                    db.session.add(document)
+            db.session.commit()
+            return
+
         for document_id in document_ids:
+            logger.info(click.style(f"Start process document: {document_id}", fg="green"))
+
             document = (
                 db.session.query(Document).where(Document.id == document_id, Document.dataset_id == dataset_id).first()
             )
+
             if document:
-                document.indexing_status = "error"
-                document.error = str(e)
-                document.stopped_at = naive_utc_now()
+                # clean old data
+                index_type = document.doc_form
+                index_processor = IndexProcessorFactory(index_type).init_index_processor()
+
+                segments = db.session.query(DocumentSegment).where(DocumentSegment.document_id == document_id).all()
+                if segments:
+                    index_node_ids = [segment.index_node_id for segment in segments]
+
+                    # delete from vector index
+                    index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
+
+                    for segment in segments:
+                        db.session.delete(segment)
+                    db.session.commit()
+
+                document.indexing_status = "parsing"
+                document.processing_started_at = naive_utc_now()
+                documents.append(document)
                 db.session.add(document)
         db.session.commit()
-        return
-    finally:
-        db.session.close()
 
-    for document_id in document_ids:
-        logger.info(click.style(f"Start process document: {document_id}", fg="green"))
-
-        document = (
-            db.session.query(Document).where(Document.id == document_id, Document.dataset_id == dataset_id).first()
-        )
-
-        if document:
-            # clean old data
-            index_type = document.doc_form
-            index_processor = IndexProcessorFactory(index_type).init_index_processor()
-
-            segments = db.session.query(DocumentSegment).where(DocumentSegment.document_id == document_id).all()
-            if segments:
-                index_node_ids = [segment.index_node_id for segment in segments]
-
-                # delete from vector index
-                index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
-
-                for segment in segments:
-                    db.session.delete(segment)
-                db.session.commit()
-
-            document.indexing_status = "parsing"
-            document.processing_started_at = naive_utc_now()
-            documents.append(document)
-            db.session.add(document)
-    db.session.commit()
-
-    try:
         indexing_runner = IndexingRunner()
         indexing_runner.run(documents)
         end_at = time.perf_counter()
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index e6f3f0ddf6..fe46ed7658 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -1,7 +1,6 @@
 import time
 import uuid
 from os import getenv
-from typing import cast
 
 import pytest
 
@@ -11,7 +10,6 @@ from core.workflow.enums import WorkflowNodeExecutionStatus
 from core.workflow.graph import Graph
 from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.code.code_node import CodeNode
-from core.workflow.nodes.code.entities import CodeNodeData
 from core.workflow.nodes.node_factory import DifyNodeFactory
 from core.workflow.system_variable import SystemVariable
 from models.enums import UserFrom
@@ -242,8 +240,6 @@ def test_execute_code_output_validator_depth():
         "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
     }
 
-    node._node_data = cast(CodeNodeData, node._node_data)
-
     # validate
     node._transform_result(result, node._node_data.outputs)
 
@@ -338,8 +334,6 @@ def test_execute_code_output_object_list():
         ]
     }
 
-    node._node_data = cast(CodeNodeData, node._node_data)
-
     # validate
     node._transform_result(result, node._node_data.outputs)
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py.orig b/api/tests/integration_tests/workflow/nodes/test_code.py.orig
new file mode 100644
index 0000000000..fe46ed7658
--- /dev/null
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py.orig
@@ -0,0 +1,390 @@
+import time
+import uuid
+from os import getenv
+
+import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow.entities import GraphInitParams, GraphRuntimeState, VariablePool
+from core.workflow.enums import WorkflowNodeExecutionStatus
+from core.workflow.graph import Graph
+from core.workflow.node_events import NodeRunResult
+from core.workflow.nodes.code.code_node import CodeNode
+from core.workflow.nodes.node_factory import DifyNodeFactory
+from core.workflow.system_variable import SystemVariable
+from models.enums import UserFrom
+from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
+
+CODE_MAX_STRING_LENGTH = int(getenv("CODE_MAX_STRING_LENGTH", "10000"))
+
+
+def init_code_node(code_config: dict):
+    graph_config = {
+        "edges": [
+            {
+                "id": "start-source-code-target",
+                "source": "start",
+                "target": "code",
+            },
+        ],
+        "nodes": [{"data": {"type": "start", "title": "Start"}, "id": "start"}, code_config],
+    }
+
+    init_params = GraphInitParams(
+        tenant_id="1",
+        app_id="1",
+        workflow_id="1",
+        graph_config=graph_config,
+        user_id="1",
+        user_from=UserFrom.ACCOUNT,
+        invoke_from=InvokeFrom.DEBUGGER,
+        call_depth=0,
+    )
+
+    # construct variable pool
+    variable_pool = VariablePool(
+        system_variables=SystemVariable(user_id="aaa", files=[]),
+        user_inputs={},
+        environment_variables=[],
+        conversation_variables=[],
+    )
+    variable_pool.add(["code", "args1"], 1)
+    variable_pool.add(["code", "args2"], 2)
+
+    graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
+
+    # Create node factory
+    node_factory = DifyNodeFactory(
+        graph_init_params=init_params,
+        graph_runtime_state=graph_runtime_state,
+    )
+
+    graph = Graph.init(graph_config=graph_config, node_factory=node_factory)
+
+    node = CodeNode(
+        id=str(uuid.uuid4()),
+        config=code_config,
+        graph_init_params=init_params,
+        graph_runtime_state=graph_runtime_state,
+    )
+
+    # Initialize node data
+    if "data" in code_config:
+        node.init_node_data(code_config["data"])
+
+    return node
+
+
+@pytest.mark.parametrize("setup_code_executor_mock", [["none"]], indirect=True)
+def test_execute_code(setup_code_executor_mock):
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": args1 + args2,
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "result": {
+                    "type": "number",
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+    node.graph_runtime_state.variable_pool.add(["1", "args1"], 1)
+    node.graph_runtime_state.variable_pool.add(["1", "args2"], 2)
+
+    # execute node
+    result = node._run()
+    assert isinstance(result, NodeRunResult)
+    assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+    assert result.outputs is not None
+    assert result.outputs["result"] == 3
+    assert result.error == ""
+
+
+@pytest.mark.parametrize("setup_code_executor_mock", [["none"]], indirect=True)
+def test_execute_code_output_validator(setup_code_executor_mock):
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": args1 + args2,
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "result": {
+                    "type": "string",
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+    node.graph_runtime_state.variable_pool.add(["1", "args1"], 1)
+    node.graph_runtime_state.variable_pool.add(["1", "args2"], 2)
+
+    # execute node
+    result = node._run()
+    assert isinstance(result, NodeRunResult)
+    assert result.status == WorkflowNodeExecutionStatus.FAILED
+    assert result.error == "Output variable `result` must be a string"
+
+
+def test_execute_code_output_validator_depth():
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": {
+                "result": args1 + args2,
+            }
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "string_validator": {
+                    "type": "string",
+                },
+                "number_validator": {
+                    "type": "number",
+                },
+                "number_array_validator": {
+                    "type": "array[number]",
+                },
+                "string_array_validator": {
+                    "type": "array[string]",
+                },
+                "object_validator": {
+                    "type": "object",
+                    "children": {
+                        "result": {
+                            "type": "number",
+                        },
+                        "depth": {
+                            "type": "object",
+                            "children": {
+                                "depth": {
+                                    "type": "object",
+                                    "children": {
+                                        "depth": {
+                                            "type": "number",
+                                        }
+                                    },
+                                }
+                            },
+                        },
+                    },
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+
+    # construct result
+    result = {
+        "number_validator": 1,
+        "string_validator": "1",
+        "number_array_validator": [1, 2, 3, 3.333],
+        "string_array_validator": ["1", "2", "3"],
+        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
+    }
+
+    # validate
+    node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "number_validator": "1",
+        "string_validator": 1,
+        "number_array_validator": ["1", "2", "3", "3.333"],
+        "string_array_validator": [1, 2, 3],
+        "object_validator": {"result": "1", "depth": {"depth": {"depth": "1"}}},
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "number_validator": 1,
+        "string_validator": (CODE_MAX_STRING_LENGTH + 1) * "1",
+        "number_array_validator": [1, 2, 3, 3.333],
+        "string_array_validator": ["1", "2", "3"],
+        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "number_validator": 1,
+        "string_validator": "1",
+        "number_array_validator": [1, 2, 3, 3.333] * 2000,
+        "string_array_validator": ["1", "2", "3"],
+        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+
+def test_execute_code_output_object_list():
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": {
+                "result": args1 + args2,
+            }
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "object_list": {
+                    "type": "array[object]",
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+
+    # construct result
+    result = {
+        "object_list": [
+            {
+                "result": 1,
+            },
+            {
+                "result": 2,
+            },
+            {
+                "result": [1, 2, 3],
+            },
+        ]
+    }
+
+    # validate
+    node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "object_list": [
+            {
+                "result": 1,
+            },
+            {
+                "result": 2,
+            },
+            {
+                "result": [1, 2, 3],
+            },
+            1,
+        ]
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+
+def test_execute_code_scientific_notation():
+    code = """
+    def main() -> dict:
+        return {
+            "result": -8.0E-5
+        }
+    """
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "result": {
+                    "type": "number",
+                },
+            },
+            "title": "123",
+            "variables": [],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+    # execute node
+    result = node._run()
+    assert isinstance(result, NodeRunResult)
+    assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
diff --git a/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py b/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py
new file mode 100644
index 0000000000..bf25968100
--- /dev/null
+++ b/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py
@@ -0,0 +1,788 @@
+from unittest.mock import Mock, patch
+
+import pytest
+from faker import Faker
+
+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 models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider, WorkflowToolProvider
+from services.tools.tools_transform_service import ToolTransformService
+
+
+class TestToolTransformService:
+    """Integration tests for ToolTransformService using testcontainers."""
+
+    @pytest.fixture
+    def mock_external_service_dependencies(self):
+        """Mock setup for external service dependencies."""
+        with (
+            patch("services.tools.tools_transform_service.dify_config") as mock_dify_config,
+        ):
+            # Setup default mock returns
+            mock_dify_config.CONSOLE_API_URL = "https://console.example.com"
+
+            yield {
+                "dify_config": mock_dify_config,
+            }
+
+    def _create_test_tool_provider(
+        self, db_session_with_containers, mock_external_service_dependencies, provider_type="api"
+    ):
+        """
+        Helper method to create a test tool provider for testing.
+
+        Args:
+            db_session_with_containers: Database session from testcontainers infrastructure
+            mock_external_service_dependencies: Mock dependencies
+            provider_type: Type of provider to create
+
+        Returns:
+            Tool provider instance
+        """
+        fake = Faker()
+
+        if provider_type == "api":
+            provider = ApiToolProvider(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                icon='{"background": "#FF6B6B", "content": "🔧"}',
+                icon_dark='{"background": "#252525", "content": "🔧"}',
+                tenant_id="test_tenant_id",
+                user_id="test_user_id",
+                credentials={"auth_type": "api_key_header", "api_key": "test_key"},
+                provider_type="api",
+            )
+        elif provider_type == "builtin":
+            provider = BuiltinToolProvider(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                icon="🔧",
+                icon_dark="🔧",
+                tenant_id="test_tenant_id",
+                provider="test_provider",
+                credential_type="api_key",
+                credentials={"api_key": "test_key"},
+            )
+        elif provider_type == "workflow":
+            provider = WorkflowToolProvider(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                icon='{"background": "#FF6B6B", "content": "🔧"}',
+                icon_dark='{"background": "#252525", "content": "🔧"}',
+                tenant_id="test_tenant_id",
+                user_id="test_user_id",
+                workflow_id="test_workflow_id",
+            )
+        elif provider_type == "mcp":
+            provider = MCPToolProvider(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                provider_icon='{"background": "#FF6B6B", "content": "🔧"}',
+                tenant_id="test_tenant_id",
+                user_id="test_user_id",
+                server_url="https://mcp.example.com",
+                server_identifier="test_server",
+                tools='[{"name": "test_tool", "description": "Test tool"}]',
+                authed=True,
+            )
+        else:
+            raise ValueError(f"Unknown provider type: {provider_type}")
+
+        from extensions.ext_database import db
+
+        db.session.add(provider)
+        db.session.commit()
+
+        return provider
+
+    def test_get_plugin_icon_url_success(self, db_session_with_containers, mock_external_service_dependencies):
+        """
+        Test successful plugin icon URL generation.
+
+        This test verifies:
+        - Proper URL construction for plugin icons
+        - Correct tenant_id and filename handling
+        - URL format compliance
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        tenant_id = fake.uuid4()
+        filename = "test_icon.png"
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_plugin_icon_url(tenant_id, filename)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, str)
+        assert "console/api/workspaces/current/plugin/icon" in result
+        assert tenant_id in result
+        assert filename in result
+        assert result.startswith("https://console.example.com")
+
+        # Verify URL structure
+        expected_url = f"https://console.example.com/console/api/workspaces/current/plugin/icon?tenant_id={tenant_id}&filename={filename}"
+        assert result == expected_url
+
+    def test_get_plugin_icon_url_with_empty_console_url(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test plugin icon URL generation when CONSOLE_API_URL is empty.
+
+        This test verifies:
+        - Fallback to relative URL when CONSOLE_API_URL is None
+        - Proper URL construction with relative path
+        """
+        # Arrange: Setup mock with empty console URL
+        mock_external_service_dependencies["dify_config"].CONSOLE_API_URL = None
+        fake = Faker()
+        tenant_id = fake.uuid4()
+        filename = "test_icon.png"
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_plugin_icon_url(tenant_id, filename)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, str)
+        assert result.startswith("/console/api/workspaces/current/plugin/icon")
+        assert tenant_id in result
+        assert filename in result
+
+        # Verify URL structure
+        expected_url = f"/console/api/workspaces/current/plugin/icon?tenant_id={tenant_id}&filename={filename}"
+        assert result == expected_url
+
+    def test_get_tool_provider_icon_url_builtin_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful tool provider icon URL generation for builtin providers.
+
+        This test verifies:
+        - Proper URL construction for builtin tool providers
+        - Correct provider type handling
+        - URL format compliance
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        provider_type = ToolProviderType.BUILT_IN.value
+        provider_name = fake.company()
+        icon = "🔧"
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_tool_provider_icon_url(provider_type, provider_name, icon)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, str)
+        assert "console/api/workspaces/current/tool-provider/builtin" in result
+        # Note: provider_name may contain spaces that get URL encoded
+        assert provider_name.replace(" ", "%20") in result or provider_name in result
+        assert result.endswith("/icon")
+        assert result.startswith("https://console.example.com")
+
+        # Verify URL structure (accounting for URL encoding)
+        # The actual result will have URL-encoded spaces (%20), so we need to compare accordingly
+        expected_url = (
+            f"https://console.example.com/console/api/workspaces/current/tool-provider/builtin/{provider_name}/icon"
+        )
+        # Convert expected URL to match the actual URL encoding
+        expected_encoded = expected_url.replace(" ", "%20")
+        assert result == expected_encoded
+
+    def test_get_tool_provider_icon_url_api_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful tool provider icon URL generation for API providers.
+
+        This test verifies:
+        - Proper icon handling for API tool providers
+        - JSON string parsing for icon data
+        - Fallback icon when parsing fails
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        provider_type = ToolProviderType.API.value
+        provider_name = fake.company()
+        icon = '{"background": "#FF6B6B", "content": "🔧"}'
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_tool_provider_icon_url(provider_type, provider_name, icon)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, dict)
+        assert result["background"] == "#FF6B6B"
+        assert result["content"] == "🔧"
+
+    def test_get_tool_provider_icon_url_api_invalid_json(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test tool provider icon URL generation for API providers with invalid JSON.
+
+        This test verifies:
+        - Proper fallback when JSON parsing fails
+        - Default icon structure when exception occurs
+        """
+        # Arrange: Setup test data with invalid JSON
+        fake = Faker()
+        provider_type = ToolProviderType.API.value
+        provider_name = fake.company()
+        icon = '{"invalid": json}'
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_tool_provider_icon_url(provider_type, provider_name, icon)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, dict)
+        assert result["background"] == "#252525"
+        # Note: emoji characters may be represented as Unicode escape sequences
+        assert result["content"] == "😁" or result["content"] == "\ud83d\ude01"
+
+    def test_get_tool_provider_icon_url_workflow_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful tool provider icon URL generation for workflow providers.
+
+        This test verifies:
+        - Proper icon handling for workflow tool providers
+        - Direct icon return for workflow type
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        provider_type = ToolProviderType.WORKFLOW.value
+        provider_name = fake.company()
+        icon = {"background": "#FF6B6B", "content": "🔧"}
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_tool_provider_icon_url(provider_type, provider_name, icon)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, dict)
+        assert result["background"] == "#FF6B6B"
+        assert result["content"] == "🔧"
+
+    def test_get_tool_provider_icon_url_mcp_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful tool provider icon URL generation for MCP providers.
+
+        This test verifies:
+        - Direct icon return for MCP type
+        - No URL transformation for MCP providers
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        provider_type = ToolProviderType.MCP.value
+        provider_name = fake.company()
+        icon = {"background": "#FF6B6B", "content": "🔧"}
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_tool_provider_icon_url(provider_type, provider_name, icon)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert isinstance(result, dict)
+        assert result["background"] == "#FF6B6B"
+        assert result["content"] == "🔧"
+
+    def test_get_tool_provider_icon_url_unknown_type(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test tool provider icon URL generation for unknown provider types.
+
+        This test verifies:
+        - Empty string return for unknown provider types
+        - Proper handling of unsupported types
+        """
+        # Arrange: Setup test data with unknown type
+        fake = Faker()
+        provider_type = "unknown_type"
+        provider_name = fake.company()
+        icon = "🔧"
+
+        # Act: Execute the method under test
+        result = ToolTransformService.get_tool_provider_icon_url(provider_type, provider_name, icon)
+
+        # Assert: Verify the expected outcomes
+        assert result == ""
+
+    def test_repack_provider_dict_success(self, db_session_with_containers, mock_external_service_dependencies):
+        """
+        Test successful provider repacking with dictionary input.
+
+        This test verifies:
+        - Proper icon URL generation for dictionary providers
+        - Correct provider type handling
+        - Icon transformation for different provider types
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        tenant_id = fake.uuid4()
+        provider = {"type": ToolProviderType.BUILT_IN.value, "name": fake.company(), "icon": "🔧"}
+
+        # Act: Execute the method under test
+        ToolTransformService.repack_provider(tenant_id, provider)
+
+        # Assert: Verify the expected outcomes
+        assert "icon" in provider
+        assert isinstance(provider["icon"], str)
+        assert "console/api/workspaces/current/tool-provider/builtin" in provider["icon"]
+        # Note: provider name may contain spaces that get URL encoded
+        assert provider["name"].replace(" ", "%20") in provider["icon"] or provider["name"] in provider["icon"]
+
+    def test_repack_provider_entity_success(self, db_session_with_containers, mock_external_service_dependencies):
+        """
+        Test successful provider repacking with ToolProviderApiEntity input.
+
+        This test verifies:
+        - Proper icon URL generation for entity providers
+        - Plugin icon handling when plugin_id is present
+        - Regular icon handling when plugin_id is not present
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        tenant_id = fake.uuid4()
+
+        # Create provider entity with plugin_id
+        provider = ToolProviderApiEntity(
+            id=fake.uuid4(),
+            author=fake.name(),
+            name=fake.company(),
+            description=I18nObject(en_US=fake.text(max_nb_chars=100)),
+            icon="test_icon.png",
+            icon_dark="test_icon_dark.png",
+            label=I18nObject(en_US=fake.company()),
+            type=ToolProviderType.API,
+            masked_credentials={},
+            is_team_authorization=True,
+            plugin_id="test_plugin_id",
+            tools=[],
+            labels=[],
+        )
+
+        # Act: Execute the method under test
+        ToolTransformService.repack_provider(tenant_id, provider)
+
+        # Assert: Verify the expected outcomes
+        assert provider.icon is not None
+        assert isinstance(provider.icon, str)
+        assert "console/api/workspaces/current/plugin/icon" in provider.icon
+        assert tenant_id in provider.icon
+        assert "test_icon.png" in provider.icon
+
+        # Verify dark icon handling
+        assert provider.icon_dark is not None
+        assert isinstance(provider.icon_dark, str)
+        assert "console/api/workspaces/current/plugin/icon" in provider.icon_dark
+        assert tenant_id in provider.icon_dark
+        assert "test_icon_dark.png" in provider.icon_dark
+
+    def test_repack_provider_entity_no_plugin_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful provider repacking with ToolProviderApiEntity input without plugin_id.
+
+        This test verifies:
+        - Proper icon URL generation for non-plugin providers
+        - Regular tool provider icon handling
+        - Dark icon handling when present
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        tenant_id = fake.uuid4()
+
+        # Create provider entity without plugin_id
+        provider = ToolProviderApiEntity(
+            id=fake.uuid4(),
+            author=fake.name(),
+            name=fake.company(),
+            description=I18nObject(en_US=fake.text(max_nb_chars=100)),
+            icon='{"background": "#FF6B6B", "content": "🔧"}',
+            icon_dark='{"background": "#252525", "content": "🔧"}',
+            label=I18nObject(en_US=fake.company()),
+            type=ToolProviderType.API,
+            masked_credentials={},
+            is_team_authorization=True,
+            plugin_id=None,
+            tools=[],
+            labels=[],
+        )
+
+        # Act: Execute the method under test
+        ToolTransformService.repack_provider(tenant_id, provider)
+
+        # Assert: Verify the expected outcomes
+        assert provider.icon is not None
+        assert isinstance(provider.icon, dict)
+        assert provider.icon["background"] == "#FF6B6B"
+        assert provider.icon["content"] == "🔧"
+
+        # Verify dark icon handling
+        assert provider.icon_dark is not None
+        assert isinstance(provider.icon_dark, dict)
+        assert provider.icon_dark["background"] == "#252525"
+        assert provider.icon_dark["content"] == "🔧"
+
+    def test_repack_provider_entity_no_dark_icon(self, db_session_with_containers, mock_external_service_dependencies):
+        """
+        Test provider repacking with ToolProviderApiEntity input without dark icon.
+
+        This test verifies:
+        - Proper handling when icon_dark is None or empty
+        - No errors when dark icon is not present
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+        tenant_id = fake.uuid4()
+
+        # Create provider entity without dark icon
+        provider = ToolProviderApiEntity(
+            id=fake.uuid4(),
+            author=fake.name(),
+            name=fake.company(),
+            description=I18nObject(en_US=fake.text(max_nb_chars=100)),
+            icon='{"background": "#FF6B6B", "content": "🔧"}',
+            icon_dark=None,
+            label=I18nObject(en_US=fake.company()),
+            type=ToolProviderType.API,
+            masked_credentials={},
+            is_team_authorization=True,
+            plugin_id=None,
+            tools=[],
+            labels=[],
+        )
+
+        # Act: Execute the method under test
+        ToolTransformService.repack_provider(tenant_id, provider)
+
+        # Assert: Verify the expected outcomes
+        assert provider.icon is not None
+        assert isinstance(provider.icon, dict)
+        assert provider.icon["background"] == "#FF6B6B"
+        assert provider.icon["content"] == "🔧"
+
+        # Verify dark icon remains None
+        assert provider.icon_dark is None
+
+    def test_builtin_provider_to_user_provider_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful conversion of builtin provider to user provider.
+
+        This test verifies:
+        - Proper entity creation with all required fields
+        - Credentials schema handling
+        - Team authorization setup
+        - Plugin ID handling
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create mock provider controller
+        mock_controller = Mock()
+        mock_controller.entity.identity.name = fake.company()
+        mock_controller.entity.identity.author = fake.name()
+        mock_controller.entity.identity.description = I18nObject(en_US=fake.text(max_nb_chars=100))
+        mock_controller.entity.identity.icon = "🔧"
+        mock_controller.entity.identity.icon_dark = "🔧"
+        mock_controller.entity.identity.label = I18nObject(en_US=fake.company())
+        mock_controller.plugin_id = None
+        mock_controller.plugin_unique_identifier = None
+        mock_controller.tool_labels = ["label1", "label2"]
+        mock_controller.need_credentials = True
+
+        # Mock credentials schema
+        mock_credential = Mock()
+        mock_credential.to_basic_provider_config.return_value.name = "api_key"
+        mock_controller.get_credentials_schema_by_type.return_value = [mock_credential]
+
+        # Create mock database provider
+        mock_db_provider = Mock()
+        mock_db_provider.credential_type = "api-key"
+        mock_db_provider.tenant_id = fake.uuid4()
+        mock_db_provider.credentials = {"api_key": "encrypted_key"}
+
+        # Mock encryption
+        with patch("services.tools.tools_transform_service.create_provider_encrypter") as mock_encrypter:
+            mock_encrypter_instance = Mock()
+            mock_encrypter_instance.decrypt.return_value = {"api_key": "decrypted_key"}
+            mock_encrypter_instance.mask_tool_credentials.return_value = {"api_key": ""}
+            mock_encrypter.return_value = (mock_encrypter_instance, None)
+
+            # Act: Execute the method under test
+            result = ToolTransformService.builtin_provider_to_user_provider(
+                mock_controller, mock_db_provider, decrypt_credentials=True
+            )
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert result.id == mock_controller.entity.identity.name
+        assert result.author == mock_controller.entity.identity.author
+        assert result.name == mock_controller.entity.identity.name
+        assert result.description == mock_controller.entity.identity.description
+        assert result.icon == mock_controller.entity.identity.icon
+        assert result.icon_dark == mock_controller.entity.identity.icon_dark
+        assert result.label == mock_controller.entity.identity.label
+        assert result.type == ToolProviderType.BUILT_IN
+        assert result.is_team_authorization is True
+        assert result.plugin_id is None
+        assert result.tools == []
+        assert result.labels == ["label1", "label2"]
+        assert result.masked_credentials == {"api_key": ""}
+        assert result.original_credentials == {"api_key": "decrypted_key"}
+
+    def test_builtin_provider_to_user_provider_plugin_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful conversion of builtin provider to user provider with plugin.
+
+        This test verifies:
+        - Plugin ID and unique identifier handling
+        - Proper entity creation for plugin providers
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create mock provider controller with plugin
+        mock_controller = Mock()
+        mock_controller.entity.identity.name = fake.company()
+        mock_controller.entity.identity.author = fake.name()
+        mock_controller.entity.identity.description = I18nObject(en_US=fake.text(max_nb_chars=100))
+        mock_controller.entity.identity.icon = "🔧"
+        mock_controller.entity.identity.icon_dark = "🔧"
+        mock_controller.entity.identity.label = I18nObject(en_US=fake.company())
+        mock_controller.plugin_id = "test_plugin_id"
+        mock_controller.plugin_unique_identifier = "test_unique_id"
+        mock_controller.tool_labels = ["label1"]
+        mock_controller.need_credentials = False
+
+        # Mock credentials schema
+        mock_credential = Mock()
+        mock_credential.to_basic_provider_config.return_value.name = "api_key"
+        mock_controller.get_credentials_schema_by_type.return_value = [mock_credential]
+
+        # Act: Execute the method under test
+        result = ToolTransformService.builtin_provider_to_user_provider(
+            mock_controller, None, decrypt_credentials=False
+        )
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        # Note: The method checks isinstance(provider_controller, PluginToolProviderController)
+        # Since we're using a Mock, this check will fail, so plugin_id will remain None
+        # In a real test with actual PluginToolProviderController, this would work
+        assert result.is_team_authorization is True
+        assert result.allow_delete is False
+
+    def test_builtin_provider_to_user_provider_no_credentials(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test conversion of builtin provider to user provider without credentials.
+
+        This test verifies:
+        - Proper handling when no credentials are needed
+        - Team authorization setup for no-credentials providers
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create mock provider controller
+        mock_controller = Mock()
+        mock_controller.entity.identity.name = fake.company()
+        mock_controller.entity.identity.author = fake.name()
+        mock_controller.entity.identity.description = I18nObject(en_US=fake.text(max_nb_chars=100))
+        mock_controller.entity.identity.icon = "🔧"
+        mock_controller.entity.identity.icon_dark = "🔧"
+        mock_controller.entity.identity.label = I18nObject(en_US=fake.company())
+        mock_controller.plugin_id = None
+        mock_controller.plugin_unique_identifier = None
+        mock_controller.tool_labels = []
+        mock_controller.need_credentials = False
+
+        # Mock credentials schema
+        mock_credential = Mock()
+        mock_credential.to_basic_provider_config.return_value.name = "api_key"
+        mock_controller.get_credentials_schema_by_type.return_value = [mock_credential]
+
+        # Act: Execute the method under test
+        result = ToolTransformService.builtin_provider_to_user_provider(
+            mock_controller, None, decrypt_credentials=False
+        )
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert result.is_team_authorization is True
+        assert result.allow_delete is False
+        assert result.masked_credentials == {}
+
+    def test_api_provider_to_controller_success(self, db_session_with_containers, mock_external_service_dependencies):
+        """
+        Test successful conversion of API provider to controller.
+
+        This test verifies:
+        - Proper controller creation from database provider
+        - Auth type handling for different credential types
+        - Backward compatibility for auth types
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create API tool provider with api_key_header auth
+        provider = ApiToolProvider(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            icon='{"background": "#FF6B6B", "content": "🔧"}',
+            tenant_id=fake.uuid4(),
+            user_id=fake.uuid4(),
+            credentials_str='{"auth_type": "api_key_header", "api_key": "test_key"}',
+            schema="{}",
+            schema_type_str="openapi",
+            tools_str="[]",
+        )
+
+        from extensions.ext_database import db
+
+        db.session.add(provider)
+        db.session.commit()
+
+        # Act: Execute the method under test
+        result = ToolTransformService.api_provider_to_controller(provider)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert hasattr(result, "from_db")
+        # Additional assertions would depend on the actual controller implementation
+
+    def test_api_provider_to_controller_api_key_query(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test conversion of API provider to controller with api_key_query auth type.
+
+        This test verifies:
+        - Proper auth type handling for query parameter authentication
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create API tool provider with api_key_query auth
+        provider = ApiToolProvider(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            icon='{"background": "#FF6B6B", "content": "🔧"}',
+            tenant_id=fake.uuid4(),
+            user_id=fake.uuid4(),
+            credentials_str='{"auth_type": "api_key_query", "api_key": "test_key"}',
+            schema="{}",
+            schema_type_str="openapi",
+            tools_str="[]",
+        )
+
+        from extensions.ext_database import db
+
+        db.session.add(provider)
+        db.session.commit()
+
+        # Act: Execute the method under test
+        result = ToolTransformService.api_provider_to_controller(provider)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert hasattr(result, "from_db")
+
+    def test_api_provider_to_controller_backward_compatibility(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test conversion of API provider to controller with backward compatibility auth types.
+
+        This test verifies:
+        - Proper handling of legacy auth type values
+        - Backward compatibility for api_key and api_key_header
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create API tool provider with legacy auth type
+        provider = ApiToolProvider(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            icon='{"background": "#FF6B6B", "content": "🔧"}',
+            tenant_id=fake.uuid4(),
+            user_id=fake.uuid4(),
+            credentials_str='{"auth_type": "api_key", "api_key": "test_key"}',
+            schema="{}",
+            schema_type_str="openapi",
+            tools_str="[]",
+        )
+
+        from extensions.ext_database import db
+
+        db.session.add(provider)
+        db.session.commit()
+
+        # Act: Execute the method under test
+        result = ToolTransformService.api_provider_to_controller(provider)
+
+        # Assert: Verify the expected outcomes
+        assert result is not None
+        assert hasattr(result, "from_db")
+
+    def test_workflow_provider_to_controller_success(
+        self, db_session_with_containers, mock_external_service_dependencies
+    ):
+        """
+        Test successful conversion of workflow provider to controller.
+
+        This test verifies:
+        - Proper controller creation from workflow provider
+        - Workflow-specific controller handling
+        """
+        # Arrange: Setup test data
+        fake = Faker()
+
+        # Create workflow tool provider
+        provider = WorkflowToolProvider(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            icon='{"background": "#FF6B6B", "content": "🔧"}',
+            tenant_id=fake.uuid4(),
+            user_id=fake.uuid4(),
+            app_id=fake.uuid4(),
+            label="Test Workflow",
+            version="1.0.0",
+            parameter_configuration="[]",
+        )
+
+        from extensions.ext_database import db
+
+        db.session.add(provider)
+        db.session.commit()
+
+        # Mock the WorkflowToolProviderController.from_db method to avoid app dependency
+        with patch("services.tools.tools_transform_service.WorkflowToolProviderController.from_db") as mock_from_db:
+            mock_controller = Mock()
+            mock_from_db.return_value = mock_controller
+
+            # Act: Execute the method under test
+            result = ToolTransformService.workflow_provider_to_controller(provider)
+
+            # Assert: Verify the expected outcomes
+            assert result is not None
+            assert result == mock_controller
+            mock_from_db.assert_called_once_with(provider)
diff --git a/web/__tests__/check-i18n.test.ts b/web/__tests__/check-i18n.test.ts
index b4c4f1540d..b579f22d4b 100644
--- a/web/__tests__/check-i18n.test.ts
+++ b/web/__tests__/check-i18n.test.ts
@@ -621,7 +621,7 @@ export default translation
                     && !trimmed.startsWith('//'))
                   break
               }
- else {
+              else {
                 break
               }
 
diff --git a/web/__tests__/description-validation.test.tsx b/web/__tests__/description-validation.test.tsx
index 85263b035f..a78a4e632e 100644
--- a/web/__tests__/description-validation.test.tsx
+++ b/web/__tests__/description-validation.test.tsx
@@ -60,7 +60,7 @@ describe('Description Validation Logic', () => {
       try {
         validateDescriptionLength(invalidDescription)
       }
- catch (error) {
+      catch (error) {
         expect((error as Error).message).toBe(expectedErrorMessage)
       }
     })
@@ -86,7 +86,7 @@ describe('Description Validation Logic', () => {
           expect(() => validateDescriptionLength(testDescription)).not.toThrow()
           expect(validateDescriptionLength(testDescription)).toBe(testDescription)
         }
- else {
+        else {
           expect(() => validateDescriptionLength(testDescription)).toThrow(
             'Description cannot exceed 400 characters.',
           )
diff --git a/web/__tests__/document-list-sorting.test.tsx b/web/__tests__/document-list-sorting.test.tsx
index 1510dbec23..77c0bb60cf 100644
--- a/web/__tests__/document-list-sorting.test.tsx
+++ b/web/__tests__/document-list-sorting.test.tsx
@@ -39,7 +39,7 @@ describe('Document List Sorting', () => {
         const result = aValue.localeCompare(bValue)
         return order === 'asc' ? result : -result
       }
- else {
+      else {
         const result = aValue - bValue
         return order === 'asc' ? result : -result
       }
diff --git a/web/__tests__/plugin-tool-workflow-error.test.tsx b/web/__tests__/plugin-tool-workflow-error.test.tsx
index 370052bc80..87bda8fa13 100644
--- a/web/__tests__/plugin-tool-workflow-error.test.tsx
+++ b/web/__tests__/plugin-tool-workflow-error.test.tsx
@@ -196,7 +196,7 @@ describe('Plugin Tool Workflow Integration', () => {
           const _pluginId = (tool.uniqueIdentifier as any).split(':')[0]
         }).toThrow()
       }
- else {
+      else {
         // Valid tools should work fine
         expect(() => {
           const _pluginId = tool.uniqueIdentifier.split(':')[0]
diff --git a/web/__tests__/real-browser-flicker.test.tsx b/web/__tests__/real-browser-flicker.test.tsx
index cf3abd5f80..52bdf4777f 100644
--- a/web/__tests__/real-browser-flicker.test.tsx
+++ b/web/__tests__/real-browser-flicker.test.tsx
@@ -252,7 +252,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
 
       if (hasStyleChange)
         console.log('⚠️  Style changes detected - this causes visible flicker')
-       else
+      else
         console.log('✅ No style changes detected')
 
       expect(timingData.length).toBeGreaterThan(1)
diff --git a/web/__tests__/workflow-parallel-limit.test.tsx b/web/__tests__/workflow-parallel-limit.test.tsx
index 0843122ab4..64e9d328f0 100644
--- a/web/__tests__/workflow-parallel-limit.test.tsx
+++ b/web/__tests__/workflow-parallel-limit.test.tsx
@@ -15,7 +15,7 @@ const originalEnv = process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT
 function setupEnvironment(value?: string) {
   if (value)
     process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT = value
-   else
+  else
     delete process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT
 
   // Clear module cache to force re-evaluation
@@ -25,7 +25,7 @@ function setupEnvironment(value?: string) {
 function restoreEnvironment() {
   if (originalEnv)
     process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT = originalEnv
-   else
+  else
     delete process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT
 
   jest.resetModules()
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/__tests__/svg-attribute-error-reproduction.spec.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/__tests__/svg-attribute-error-reproduction.spec.tsx
index a3281be8eb..b1e915b2bf 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/__tests__/svg-attribute-error-reproduction.spec.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/__tests__/svg-attribute-error-reproduction.spec.tsx
@@ -47,7 +47,7 @@ describe('SVG Attribute Error Reproduction', () => {
           console.log(`  ${index + 1}. ${error.substring(0, 100)}...`)
         })
       }
- else {
+      else {
         console.log('No inkscape errors found in this render')
       }
 
@@ -150,7 +150,7 @@ describe('SVG Attribute Error Reproduction', () => {
 
     if (problematicKeys.length > 0)
       console.log(`🚨 PROBLEM: Still found problematic attributes: ${problematicKeys.join(', ')}`)
-     else
+    else
       console.log('✅ No problematic attributes found after normalization')
   })
 })
diff --git a/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx b/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx
index 0408d2ee34..5890c2ea92 100644
--- a/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx
+++ b/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx
@@ -106,7 +106,7 @@ const AvatarWithEdit = ({ onSave, ...props }: AvatarWithEditProps) => {
             onClick={() => {
               if (hoverArea === 'right' && !onAvatarError)
                 setIsShowDeleteConfirm(true)
-               else
+              else
                 setIsShowAvatarPicker(true)
             }}
             onMouseMove={(e) => {
diff --git a/web/app/components/app-sidebar/basic.tsx b/web/app/components/app-sidebar/basic.tsx
index 00357d6c27..77a965c03e 100644
--- a/web/app/components/app-sidebar/basic.tsx
+++ b/web/app/components/app-sidebar/basic.tsx
@@ -45,8 +45,8 @@ const ICON_MAP = {
   </div>,
   dataset: <AppIcon innerIcon={DatasetSvg} className='!border-[0.5px] !border-indigo-100 !bg-indigo-25' />,
   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>,
+    <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' />,
 }
 
diff --git a/web/app/components/app-sidebar/index.tsx b/web/app/components/app-sidebar/index.tsx
index c3ff45d6a6..c60aa26f5d 100644
--- a/web/app/components/app-sidebar/index.tsx
+++ b/web/app/components/app-sidebar/index.tsx
@@ -62,12 +62,12 @@ const AppDetailNav = ({ title, desc, isExternal, icon, icon_background, navigati
   }, [appSidebarExpand, setAppSiderbarExpand])
 
   if (inWorkflowCanvas && hideHeader) {
- return (
+    return (
       <div className='flex w-0 shrink-0'>
         <AppSidebarDropdown navigation={navigation} />
       </div>
     )
-}
+  }
 
   return (
     <div
diff --git a/web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx b/web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx
index 2cf22eb621..7c5a7ec21f 100644
--- a/web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx
+++ b/web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx
@@ -121,7 +121,7 @@ describe('Sidebar Animation Issues Reproduction', () => {
     }))
   })
 
-    describe('Issue #1: Toggle Button Position Movement - FIXED', () => {
+  describe('Issue #1: Toggle Button Position Movement - FIXED', () => {
     it('should verify consistent padding prevents button position shift', () => {
       let expanded = false
       const handleToggle = () => {
diff --git a/web/app/components/app/annotation/index.tsx b/web/app/components/app/annotation/index.tsx
index bb2a95b0b5..afa8732701 100644
--- a/web/app/components/app/annotation/index.tsx
+++ b/web/app/components/app/annotation/index.tsx
@@ -84,7 +84,7 @@ const Annotation: FC<Props> = (props) => {
       setList(data as AnnotationItem[])
       setTotal(total)
     }
- finally {
+    finally {
       setIsLoading(false)
     }
   }
diff --git a/web/app/components/app/configuration/config-var/config-modal/type-select.tsx b/web/app/components/app/configuration/config-var/config-modal/type-select.tsx
index 3f6a01ed7c..beb7b03e37 100644
--- a/web/app/components/app/configuration/config-var/config-modal/type-select.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/type-select.tsx
@@ -52,13 +52,13 @@ const TypeSelector: FC<Props> = ({
         >
           <div className='flex items-center'>
             <InputVarTypeIcon type={selectedItem?.value as InputVarType} className='size-4 shrink-0 text-text-secondary' />
-          <span
-            className={`
+            <span
+              className={`
               ml-1.5 ${!selectedItem?.name && 'text-components-input-text-placeholder'}
             `}
-          >
-            {selectedItem?.name}
-          </span>
+            >
+              {selectedItem?.name}
+            </span>
           </div>
           <div className='flex items-center space-x-1'>
             <Badge uppercase={false}>{inputVarTypeToVarType(selectedItem?.value as InputVarType)}</Badge>
diff --git a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
index 86025f68fa..cb61b927bc 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
@@ -175,7 +175,6 @@ const ConfigContent: FC<Props> = ({
       ...datasetConfigs,
       reranking_enable: enable,
     })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentRerankModel, datasetConfigs, onChange])
 
   return (
diff --git a/web/app/components/app/configuration/debug/chat-user-input.tsx b/web/app/components/app/configuration/debug/chat-user-input.tsx
index ac07691ce4..b1161de075 100644
--- a/web/app/components/app/configuration/debug/chat-user-input.tsx
+++ b/web/app/components/app/configuration/debug/chat-user-input.tsx
@@ -57,10 +57,10 @@ const ChatUserInput = ({
           >
             <div>
               {type !== 'checkbox' && (
-              <div className='system-sm-semibold mb-1 flex h-6 items-center gap-1 text-text-secondary'>
-                <div className='truncate'>{name || key}</div>
-                {!required && <span className='system-xs-regular text-text-tertiary'>{t('workflow.panel.optional')}</span>}
-              </div>
+                <div className='system-sm-semibold mb-1 flex h-6 items-center gap-1 text-text-secondary'>
+                  <div className='truncate'>{name || key}</div>
+                  {!required && <span className='system-xs-regular text-text-tertiary'>{t('workflow.panel.optional')}</span>}
+                </div>
               )}
               <div className='grow'>
                 {type === 'string' && (
diff --git a/web/app/components/app/log/list.tsx b/web/app/components/app/log/list.tsx
index 67b8065745..b73d1f19de 100644
--- a/web/app/components/app/log/list.tsx
+++ b/web/app/components/app/log/list.tsx
@@ -112,72 +112,72 @@ const getFormattedChatList = (messages: ChatMessage[], conversationId: string, t
   const newChatList: IChatItem[] = []
   try {
     messages.forEach((item: ChatMessage) => {
-    const questionFiles = item.message_files?.filter((file: any) => file.belongs_to === 'user') || []
-    newChatList.push({
-      id: `question-${item.id}`,
-      content: item.inputs.query || item.inputs.default_input || item.query, // text generation: item.inputs.query; chat: item.query
-      isAnswer: false,
-      message_files: getProcessedFilesFromResponse(questionFiles.map((item: any) => ({ ...item, related_id: item.id }))),
-      parentMessageId: item.parent_message_id || undefined,
-    })
+      const questionFiles = item.message_files?.filter((file: any) => file.belongs_to === 'user') || []
+      newChatList.push({
+        id: `question-${item.id}`,
+        content: item.inputs.query || item.inputs.default_input || item.query, // text generation: item.inputs.query; chat: item.query
+        isAnswer: false,
+        message_files: getProcessedFilesFromResponse(questionFiles.map((item: any) => ({ ...item, related_id: item.id }))),
+        parentMessageId: item.parent_message_id || undefined,
+      })
 
-    const answerFiles = item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || []
-    newChatList.push({
-      id: item.id,
-      content: item.answer,
-      agent_thoughts: addFileInfos(item.agent_thoughts ? sortAgentSorts(item.agent_thoughts) : item.agent_thoughts, item.message_files),
-      feedback: item.feedbacks.find(item => item.from_source === 'user'), // user feedback
-      adminFeedback: item.feedbacks.find(item => item.from_source === 'admin'), // admin feedback
-      feedbackDisabled: false,
-      isAnswer: true,
-      message_files: getProcessedFilesFromResponse(answerFiles.map((item: any) => ({ ...item, related_id: item.id }))),
-      log: [
-        ...item.message,
-        ...(item.message[item.message.length - 1]?.role !== 'assistant'
-          ? [
-            {
-              role: 'assistant',
-              text: item.answer,
-              files: item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || [],
-            },
-          ]
-          : []),
-      ] as IChatItem['log'],
-      workflow_run_id: item.workflow_run_id,
-      conversationId,
-      input: {
-        inputs: item.inputs,
-        query: item.query,
-      },
-      more: {
-        time: dayjs.unix(item.created_at).tz(timezone).format(format),
-        tokens: item.answer_tokens + item.message_tokens,
-        latency: item.provider_response_latency.toFixed(2),
-      },
-      citation: item.metadata?.retriever_resources,
-      annotation: (() => {
-        if (item.annotation_hit_history) {
-          return {
-            id: item.annotation_hit_history.annotation_id,
-            authorName: item.annotation_hit_history.annotation_create_account?.name || 'N/A',
-            created_at: item.annotation_hit_history.created_at,
+      const answerFiles = item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || []
+      newChatList.push({
+        id: item.id,
+        content: item.answer,
+        agent_thoughts: addFileInfos(item.agent_thoughts ? sortAgentSorts(item.agent_thoughts) : item.agent_thoughts, item.message_files),
+        feedback: item.feedbacks.find(item => item.from_source === 'user'), // user feedback
+        adminFeedback: item.feedbacks.find(item => item.from_source === 'admin'), // admin feedback
+        feedbackDisabled: false,
+        isAnswer: true,
+        message_files: getProcessedFilesFromResponse(answerFiles.map((item: any) => ({ ...item, related_id: item.id }))),
+        log: [
+          ...item.message,
+          ...(item.message[item.message.length - 1]?.role !== 'assistant'
+            ? [
+              {
+                role: 'assistant',
+                text: item.answer,
+                files: item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || [],
+              },
+            ]
+            : []),
+        ] as IChatItem['log'],
+        workflow_run_id: item.workflow_run_id,
+        conversationId,
+        input: {
+          inputs: item.inputs,
+          query: item.query,
+        },
+        more: {
+          time: dayjs.unix(item.created_at).tz(timezone).format(format),
+          tokens: item.answer_tokens + item.message_tokens,
+          latency: item.provider_response_latency.toFixed(2),
+        },
+        citation: item.metadata?.retriever_resources,
+        annotation: (() => {
+          if (item.annotation_hit_history) {
+            return {
+              id: item.annotation_hit_history.annotation_id,
+              authorName: item.annotation_hit_history.annotation_create_account?.name || 'N/A',
+              created_at: item.annotation_hit_history.created_at,
+            }
           }
-        }
 
-        if (item.annotation) {
-          return {
-            id: item.annotation.id,
-            authorName: item.annotation.account.name,
-            logAnnotation: item.annotation,
-            created_at: 0,
+          if (item.annotation) {
+            return {
+              id: item.annotation.id,
+              authorName: item.annotation.account.name,
+              logAnnotation: item.annotation,
+              created_at: 0,
+            }
           }
-        }
 
-        return undefined
-      })(),
-      parentMessageId: `question-${item.id}`,
+          return undefined
+        })(),
+        parentMessageId: `question-${item.id}`,
+      })
     })
-  })
 
     return newChatList
   }
@@ -503,7 +503,7 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
 
       setThreadChatItems(getThreadMessages(tree, newAllChatItems.at(-1)?.id))
     }
- catch (error) {
+    catch (error) {
       console.error(error)
       setHasMore(false)
     }
@@ -522,7 +522,7 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
     if (outerDiv && outerDiv.scrollHeight > outerDiv.clientHeight) {
       scrollContainer = outerDiv
     }
-     else if (scrollableDiv && scrollableDiv.scrollHeight > scrollableDiv.clientHeight) {
+    else if (scrollableDiv && scrollableDiv.scrollHeight > scrollableDiv.clientHeight) {
       scrollContainer = scrollableDiv
     }
     else if (chatContainer && chatContainer.scrollHeight > chatContainer.clientHeight) {
diff --git a/web/app/components/app/overview/app-card.tsx b/web/app/components/app/overview/app-card.tsx
index 8713c8ef7b..c6df0ebfd9 100644
--- a/web/app/components/app/overview/app-card.tsx
+++ b/web/app/components/app/overview/app-card.tsx
@@ -167,7 +167,7 @@ function AppCard({
       setAppDetail(res)
       setShowAccessControl(false)
     }
- catch (error) {
+    catch (error) {
       console.error('Failed to fetch app detail:', error)
     }
   }, [appDetail, setAppDetail])
diff --git a/web/app/components/app/overview/embedded/index.tsx b/web/app/components/app/overview/embedded/index.tsx
index cd25c4ca65..6eba993e1d 100644
--- a/web/app/components/app/overview/embedded/index.tsx
+++ b/web/app/components/app/overview/embedded/index.tsx
@@ -40,12 +40,12 @@ const OPTION_MAP = {
       `<script>
  window.difyChatbotConfig = {
   token: '${token}'${isTestEnv
-        ? `,
+    ? `,
   isDev: true`
-        : ''}${IS_CE_EDITION
-          ? `,
+    : ''}${IS_CE_EDITION
+    ? `,
   baseUrl: '${url}${basePath}'`
-          : ''},
+    : ''},
   inputs: {
     // You can define the inputs from the Start node here
     // key is the variable name
diff --git a/web/app/components/app/overview/settings/index.tsx b/web/app/components/app/overview/settings/index.tsx
index 8c619a2885..8835fd2464 100644
--- a/web/app/components/app/overview/settings/index.tsx
+++ b/web/app/components/app/overview/settings/index.tsx
@@ -240,7 +240,7 @@ const SettingsModal: FC<ISettingsModalProps> = ({
             <Link href={docLink('/guides/application-publishing/launch-your-webapp-quickly/README', {
               'zh-Hans': '/guides/application-publishing/launch-your-webapp-quickly/readme',
             })}
-              target='_blank' rel='noopener noreferrer' className='text-text-accent'>{t('common.operation.learnMore')}</Link>
+            target='_blank' rel='noopener noreferrer' className='text-text-accent'>{t('common.operation.learnMore')}</Link>
           </div>
         </div>
         {/* form body */}
diff --git a/web/app/components/apps/list.tsx b/web/app/components/apps/list.tsx
index 222379e96d..aa85fb1313 100644
--- a/web/app/components/apps/list.tsx
+++ b/web/app/components/apps/list.tsx
@@ -68,7 +68,7 @@ const getKey = (
 
 const List = () => {
   const { t } = useTranslation()
-    const { systemFeatures } = useGlobalPublicStore()
+  const { systemFeatures } = useGlobalPublicStore()
   const router = useRouter()
   const { isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator } = useAppContext()
   const showTagManagementModal = useTagStore(s => s.showTagManagementModal)
diff --git a/web/app/components/base/chat/chat-with-history/hooks.tsx b/web/app/components/base/chat/chat-with-history/hooks.tsx
index e87c8ddcdf..13594a84e8 100644
--- a/web/app/components/base/chat/chat-with-history/hooks.tsx
+++ b/web/app/components/base/chat/chat-with-history/hooks.tsx
@@ -508,7 +508,7 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
   }, [mutateAppConversationData, handleConversationIdInfoChange])
 
   const handleFeedback = useCallback(async (messageId: string, feedback: Feedback) => {
-    await updateFeedback({ url: `/messages/${messageId}/feedbacks`, body: { rating: feedback.rating } }, isInstalledApp, appId)
+    await updateFeedback({ url: `/messages/${messageId}/feedbacks`, body: { rating: feedback.rating, content: feedback.content } }, isInstalledApp, appId)
     notify({ type: 'success', message: t('common.api.success') })
   }, [isInstalledApp, appId, t, notify])
 
diff --git a/web/app/components/base/chat/chat/answer/operation.tsx b/web/app/components/base/chat/chat/answer/operation.tsx
index 0fbb7ceef1..7ffb21c6d8 100644
--- a/web/app/components/base/chat/chat/answer/operation.tsx
+++ b/web/app/components/base/chat/chat/answer/operation.tsx
@@ -20,6 +20,8 @@ import EditReplyModal from '@/app/components/app/annotation/edit-annotation-moda
 import Log from '@/app/components/base/chat/chat/log'
 import ActionButton, { ActionButtonState } from '@/app/components/base/action-button'
 import NewAudioButton from '@/app/components/base/new-audio-button'
+import Modal from '@/app/components/base/modal/modal'
+import Textarea from '@/app/components/base/textarea'
 import cn from '@/utils/classnames'
 
 type OperationProps = {
@@ -32,6 +34,7 @@ type OperationProps = {
   hasWorkflowProcess: boolean
   noChatInput?: boolean
 }
+
 const Operation: FC<OperationProps> = ({
   item,
   question,
@@ -52,6 +55,8 @@ const Operation: FC<OperationProps> = ({
     onRegenerate,
   } = useChatContext()
   const [isShowReplyModal, setIsShowReplyModal] = useState(false)
+  const [isShowFeedbackModal, setIsShowFeedbackModal] = useState(false)
+  const [feedbackContent, setFeedbackContent] = useState('')
   const {
     id,
     isOpeningStatement,
@@ -70,14 +75,29 @@ const Operation: FC<OperationProps> = ({
     return messageContent
   }, [agent_thoughts, messageContent])
 
-  const handleFeedback = async (rating: 'like' | 'dislike' | null) => {
+  const handleFeedback = async (rating: 'like' | 'dislike' | null, content?: string) => {
     if (!config?.supportFeedback || !onFeedback)
       return
 
-    await onFeedback?.(id, { rating })
+    await onFeedback?.(id, { rating, content })
     setLocalFeedback({ rating })
   }
 
+  const handleThumbsDown = () => {
+    setIsShowFeedbackModal(true)
+  }
+
+  const handleFeedbackSubmit = async () => {
+    await handleFeedback('dislike', feedbackContent)
+    setFeedbackContent('')
+    setIsShowFeedbackModal(false)
+  }
+
+  const handleFeedbackCancel = () => {
+    setFeedbackContent('')
+    setIsShowFeedbackModal(false)
+  }
+
   const operationWidth = useMemo(() => {
     let width = 0
     if (!isOpeningStatement)
@@ -153,7 +173,7 @@ const Operation: FC<OperationProps> = ({
                 <ActionButton onClick={() => handleFeedback('like')}>
                   <RiThumbUpLine className='h-4 w-4' />
                 </ActionButton>
-                <ActionButton onClick={() => handleFeedback('dislike')}>
+                <ActionButton onClick={handleThumbsDown}>
                   <RiThumbDownLine className='h-4 w-4' />
                 </ActionButton>
               </>
@@ -188,6 +208,32 @@ const Operation: FC<OperationProps> = ({
         createdAt={annotation?.created_at}
         onRemove={() => onAnnotationRemoved?.(index)}
       />
+      {isShowFeedbackModal && (
+        <Modal
+          title={t('common.feedback.title') || 'Provide Feedback'}
+          subTitle={t('common.feedback.subtitle') || 'Please tell us what went wrong with this response'}
+          onClose={handleFeedbackCancel}
+          onConfirm={handleFeedbackSubmit}
+          onCancel={handleFeedbackCancel}
+          confirmButtonText={t('common.operation.submit') || 'Submit'}
+          cancelButtonText={t('common.operation.cancel') || 'Cancel'}
+        >
+          <div className='space-y-3'>
+            <div>
+              <label className='system-sm-semibold mb-2 block text-text-secondary'>
+                {t('common.feedback.content') || 'Feedback Content'}
+              </label>
+              <Textarea
+                value={feedbackContent}
+                onChange={e => setFeedbackContent(e.target.value)}
+                placeholder={t('common.feedback.placeholder') || 'Please describe what went wrong or how we can improve...'}
+                rows={4}
+                className='w-full'
+              />
+            </div>
+          </div>
+        </Modal>
+      )}
     </>
   )
 }
diff --git a/web/app/components/base/chat/embedded-chatbot/hooks.tsx b/web/app/components/base/chat/embedded-chatbot/hooks.tsx
index f0e63abc72..01fb83f235 100644
--- a/web/app/components/base/chat/embedded-chatbot/hooks.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/hooks.tsx
@@ -390,7 +390,7 @@ export const useEmbeddedChatbot = () => {
   }, [mutateAppConversationData, handleConversationIdInfoChange])
 
   const handleFeedback = useCallback(async (messageId: string, feedback: Feedback) => {
-    await updateFeedback({ url: `/messages/${messageId}/feedbacks`, body: { rating: feedback.rating } }, isInstalledApp, appId)
+    await updateFeedback({ url: `/messages/${messageId}/feedbacks`, body: { rating: feedback.rating, content: feedback.content } }, isInstalledApp, appId)
     notify({ type: 'success', message: t('common.api.success') })
   }, [isInstalledApp, appId, t, notify])
 
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
index 1235899d10..dd65f0ce72 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
@@ -46,12 +46,12 @@ const InputsFormContent = ({ showTip }: Props) => {
       {visibleInputsForms.map(form => (
         <div key={form.variable} className='space-y-1'>
           {form.type !== InputVarType.checkbox && (
-          <div className='flex h-6 items-center gap-1'>
-            <div className='system-md-semibold text-text-secondary'>{form.label}</div>
-            {!form.required && (
-              <div className='system-xs-regular text-text-tertiary'>{t('appDebug.variableTable.optional')}</div>
-            )}
-          </div>
+            <div className='flex h-6 items-center gap-1'>
+              <div className='system-md-semibold text-text-secondary'>{form.label}</div>
+              {!form.required && (
+                <div className='system-xs-regular text-text-tertiary'>{t('appDebug.variableTable.optional')}</div>
+              )}
+            </div>
           )}
           {form.type === InputVarType.textInput && (
             <Input
diff --git a/web/app/components/base/chat/types.ts b/web/app/components/base/chat/types.ts
index c463879a53..f7f7aa4dce 100644
--- a/web/app/components/base/chat/types.ts
+++ b/web/app/components/base/chat/types.ts
@@ -93,4 +93,5 @@ export type Callback = {
 
 export type Feedback = {
   rating: 'like' | 'dislike' | null
+  content?: string | null
 }
diff --git a/web/app/components/base/checkbox/index.tsx b/web/app/components/base/checkbox/index.tsx
index 3e47967c62..46ae0dbaba 100644
--- a/web/app/components/base/checkbox/index.tsx
+++ b/web/app/components/base/checkbox/index.tsx
@@ -12,12 +12,12 @@ type CheckboxProps = {
 }
 
 const Checkbox = ({
-    id,
-    checked,
-    onCheck,
-    className,
-    disabled,
-    indeterminate,
+  id,
+  checked,
+  onCheck,
+  className,
+  disabled,
+  indeterminate,
 }: CheckboxProps) => {
   const checkClassName = (checked || indeterminate)
     ? 'bg-components-checkbox-bg text-components-checkbox-icon hover:bg-components-checkbox-bg-hover'
diff --git a/web/app/components/base/date-and-time-picker/utils/dayjs.ts b/web/app/components/base/date-and-time-picker/utils/dayjs.ts
index 80dc0f780c..27200e76e9 100644
--- a/web/app/components/base/date-and-time-picker/utils/dayjs.ts
+++ b/web/app/components/base/date-and-time-picker/utils/dayjs.ts
@@ -131,7 +131,7 @@ export const formatDateForOutput = (date: Dayjs, includeTime: boolean = false, l
     // Output format with time
     return date.format('YYYY-MM-DDTHH:mm:ss.SSSZ')
   }
- else {
+  else {
     // Date-only output format without timezone
     return date.format('YYYY-MM-DD')
   }
diff --git a/web/app/components/base/form/components/base/base-field.tsx b/web/app/components/base/form/components/base/base-field.tsx
index 4005bab6bc..35ca251a5b 100644
--- a/web/app/components/base/form/components/base/base-field.tsx
+++ b/web/app/components/base/form/components/base/base-field.tsx
@@ -12,6 +12,7 @@ import PureSelect from '@/app/components/base/select/pure'
 import type { FormSchema } from '@/app/components/base/form/types'
 import { FormTypeEnum } from '@/app/components/base/form/types'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
+import Radio from '@/app/components/base/radio'
 import RadioE from '@/app/components/base/radio/ui'
 
 export type BaseFieldProps = {
@@ -102,6 +103,12 @@ const BaseField = ({
     })
   }, [values, show_on])
 
+  const booleanRadioValue = useMemo(() => {
+    if (value === null || value === undefined)
+      return undefined
+    return value ? 1 : 0
+  }, [value])
+
   if (!show)
     return null
 
@@ -204,6 +211,18 @@ const BaseField = ({
             </div>
           )
         }
+        {
+          formSchema.type === FormTypeEnum.boolean && (
+            <Radio.Group
+              className='flex w-fit items-center'
+              value={booleanRadioValue}
+              onChange={val => field.handleChange(val === 1)}
+            >
+              <Radio value={1} className='!mr-1'>True</Radio>
+              <Radio value={0}>False</Radio>
+            </Radio.Group>
+          )
+        }
         {
           formSchema.url && (
             <a
diff --git a/web/app/components/base/form/form-scenarios/demo/index.tsx b/web/app/components/base/form/form-scenarios/demo/index.tsx
index f08edee41e..3dd973d7fe 100644
--- a/web/app/components/base/form/form-scenarios/demo/index.tsx
+++ b/web/app/components/base/form/form-scenarios/demo/index.tsx
@@ -24,7 +24,7 @@ const DemoForm = () => {
     },
   })
 
-const name = useStore(form.store, state => state.values.name)
+  const name = useStore(form.store, state => state.values.name)
 
   return (
     <form
diff --git a/web/app/components/base/form/types.ts b/web/app/components/base/form/types.ts
index f4437948f3..d18c166186 100644
--- a/web/app/components/base/form/types.ts
+++ b/web/app/components/base/form/types.ts
@@ -32,6 +32,7 @@ export enum FormTypeEnum {
   multiToolSelector = 'array[tools]',
   appSelector = 'app-selector',
   dynamicSelect = 'dynamic-select',
+  boolean = 'boolean',
 }
 
 export type FormOption = {
@@ -69,10 +70,10 @@ export type GetValuesOptions = {
   needCheckValidatedValues?: boolean
 }
 export type FormRefObject = {
-    getForm: () => AnyFormApi
-    getFormValues: (obj: GetValuesOptions) => {
-      values: Record<string, any>
-      isCheckValidated: boolean
-    }
+  getForm: () => AnyFormApi
+  getFormValues: (obj: GetValuesOptions) => {
+    values: Record<string, any>
+    isCheckValidated: boolean
+  }
 }
 export type FormRef = ForwardedRef<FormRefObject>
diff --git a/web/app/components/base/mermaid/index.tsx b/web/app/components/base/mermaid/index.tsx
index 44df3e394f..7df9ee398c 100644
--- a/web/app/components/base/mermaid/index.tsx
+++ b/web/app/components/base/mermaid/index.tsx
@@ -529,9 +529,9 @@ const Flowchart = React.forwardRef((props: {
       {isLoading && !svgString && (
         <div className='px-[26px] py-4'>
           <LoadingAnim type='text'/>
-            <div className="mt-2 text-sm text-gray-500">
-              {t('common.wait_for_completion', 'Waiting for diagram code to complete...')}
-            </div>
+          <div className="mt-2 text-sm text-gray-500">
+            {t('common.wait_for_completion', 'Waiting for diagram code to complete...')}
+          </div>
         </div>
       )}
 
diff --git a/web/app/components/base/prompt-editor/plugins/current-block/component.tsx b/web/app/components/base/prompt-editor/plugins/current-block/component.tsx
index 7e56ffa6cc..1d1cb7bde5 100644
--- a/web/app/components/base/prompt-editor/plugins/current-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/current-block/component.tsx
@@ -20,9 +20,9 @@ const CurrentBlockComponent: FC<CurrentBlockComponentProps> = ({
 
   const Icon = generatorType === GeneratorType.prompt ? MagicEdit : CodeAssistant
   useEffect(() => {
-      if (!editor.hasNodes([CurrentBlockNode]))
-        throw new Error('WorkflowVariableBlockPlugin: WorkflowVariableBlock not registered on editor')
-    }, [editor])
+    if (!editor.hasNodes([CurrentBlockNode]))
+      throw new Error('WorkflowVariableBlockPlugin: WorkflowVariableBlock not registered on editor')
+  }, [editor])
 
   return (
     <div
diff --git a/web/app/components/base/prompt-editor/plugins/error-message-block/component.tsx b/web/app/components/base/prompt-editor/plugins/error-message-block/component.tsx
index e5d113f680..3fc4db2323 100644
--- a/web/app/components/base/prompt-editor/plugins/error-message-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/error-message-block/component.tsx
@@ -16,9 +16,9 @@ const ErrorMessageBlockComponent: FC<Props> = ({
   const [ref, isSelected] = useSelectOrDelete(nodeKey, DELETE_ERROR_MESSAGE_COMMAND)
 
   useEffect(() => {
-      if (!editor.hasNodes([ErrorMessageBlockNode]))
-        throw new Error('WorkflowVariableBlockPlugin: WorkflowVariableBlock not registered on editor')
-    }, [editor])
+    if (!editor.hasNodes([ErrorMessageBlockNode]))
+      throw new Error('WorkflowVariableBlockPlugin: WorkflowVariableBlock not registered on editor')
+  }, [editor])
 
   return (
     <div
diff --git a/web/app/components/base/prompt-editor/plugins/last-run-block/component.tsx b/web/app/components/base/prompt-editor/plugins/last-run-block/component.tsx
index 748a66e5a8..e7f96cd4da 100644
--- a/web/app/components/base/prompt-editor/plugins/last-run-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/last-run-block/component.tsx
@@ -16,9 +16,9 @@ const LastRunBlockComponent: FC<Props> = ({
   const [ref, isSelected] = useSelectOrDelete(nodeKey, DELETE_LAST_RUN_COMMAND)
 
   useEffect(() => {
-      if (!editor.hasNodes([LastRunBlockNode]))
-        throw new Error('WorkflowVariableBlockPlugin: WorkflowVariableBlock not registered on editor')
-    }, [editor])
+    if (!editor.hasNodes([LastRunBlockNode]))
+      throw new Error('WorkflowVariableBlockPlugin: WorkflowVariableBlock not registered on editor')
+  }, [editor])
 
   return (
     <div
diff --git a/web/app/components/base/select/index.tsx b/web/app/components/base/select/index.tsx
index aa0cf02215..a1e8ac2724 100644
--- a/web/app/components/base/select/index.tsx
+++ b/web/app/components/base/select/index.tsx
@@ -219,36 +219,36 @@ const SimpleSelect: FC<ISelectProps> = ({
           {renderTrigger && <ListboxButton className='w-full'>{renderTrigger(selectedItem)}</ListboxButton>}
           {!renderTrigger && (
             <ListboxButton onClick={() => {
-                onOpenChange?.(open)
+              onOpenChange?.(open)
             }} className={classNames(`flex h-full w-full items-center rounded-lg border-0 bg-components-input-bg-normal pl-3 pr-10 focus-visible:bg-state-base-hover-alt focus-visible:outline-none group-hover/simple-select:bg-state-base-hover-alt sm:text-sm sm:leading-6 ${disabled ? 'cursor-not-allowed' : 'cursor-pointer'}`, className)}>
               <span className={classNames('system-sm-regular block truncate text-left text-components-input-text-filled', !selectedItem?.name && 'text-components-input-text-placeholder')}>{selectedItem?.name ?? localPlaceholder}</span>
               <span className="absolute inset-y-0 right-0 flex items-center pr-2">
                 {isLoading ? <RiLoader4Line className='h-3.5 w-3.5 animate-spin text-text-secondary' />
-                : (selectedItem && !notClearable)
-                  ? (
-                    <XMarkIcon
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        setSelectedItem(null)
-                        onSelect({ name: '', value: '' })
-                      }}
-                      className="h-4 w-4 cursor-pointer text-text-quaternary"
-                      aria-hidden="false"
-                    />
-                  )
-                  : (
-                    open ? (
-                      <ChevronUpIcon
-                        className="h-4 w-4 text-text-quaternary group-hover/simple-select:text-text-secondary"
-                        aria-hidden="true"
-                      />
-                    ) : (
-                      <ChevronDownIcon
-                        className="h-4 w-4 text-text-quaternary group-hover/simple-select:text-text-secondary"
-                        aria-hidden="true"
+                  : (selectedItem && !notClearable)
+                    ? (
+                      <XMarkIcon
+                        onClick={(e) => {
+                          e.stopPropagation()
+                          setSelectedItem(null)
+                          onSelect({ name: '', value: '' })
+                        }}
+                        className="h-4 w-4 cursor-pointer text-text-quaternary"
+                        aria-hidden="false"
                       />
                     )
-                  )}
+                    : (
+                      open ? (
+                        <ChevronUpIcon
+                          className="h-4 w-4 text-text-quaternary group-hover/simple-select:text-text-secondary"
+                          aria-hidden="true"
+                        />
+                      ) : (
+                        <ChevronDownIcon
+                          className="h-4 w-4 text-text-quaternary group-hover/simple-select:text-text-secondary"
+                          aria-hidden="true"
+                        />
+                      )
+                    )}
               </span>
             </ListboxButton>
           )}
diff --git a/web/app/components/base/tag-management/selector.tsx b/web/app/components/base/tag-management/selector.tsx
index 53598654b4..e1db2fd956 100644
--- a/web/app/components/base/tag-management/selector.tsx
+++ b/web/app/components/base/tag-management/selector.tsx
@@ -226,7 +226,7 @@ const TagSelector: FC<TagSelectorProps> = ({
       const res = await fetchTagList(type)
       setTagList(res)
     }
- catch (error) {
+    catch (error) {
       setTagList([])
     }
   }
diff --git a/web/app/components/base/toast/index.tsx b/web/app/components/base/toast/index.tsx
index 245f709143..0e0e8613b7 100644
--- a/web/app/components/base/toast/index.tsx
+++ b/web/app/components/base/toast/index.tsx
@@ -60,7 +60,7 @@ const Toast = ({
       || (type === 'warning' && 'bg-toast-warning-bg')
       || (type === 'error' && 'bg-toast-error-bg')
       || (type === 'info' && 'bg-toast-info-bg')
-      }`}
+    }`}
     />
     <div className={`flex ${size === 'md' ? 'gap-1' : 'gap-0.5'}`}>
       <div className={`flex items-center justify-center ${size === 'md' ? 'p-0.5' : 'p-1'}`}>
diff --git a/web/app/components/datasets/common/retrieval-param-config/index.tsx b/web/app/components/datasets/common/retrieval-param-config/index.tsx
index 97e0a7f303..fc70ca0d89 100644
--- a/web/app/components/datasets/common/retrieval-param-config/index.tsx
+++ b/web/app/components/datasets/common/retrieval-param-config/index.tsx
@@ -61,7 +61,6 @@ const RetrievalParamConfig: FC<Props> = ({
       ...value,
       reranking_enable: enable,
     })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentModel, onChange, value])
 
   const rerankModel = useMemo(() => {
diff --git a/web/app/components/datasets/create/website/base/options-wrap.tsx b/web/app/components/datasets/create/website/base/options-wrap.tsx
index 8e9181b8e9..f17a546203 100644
--- a/web/app/components/datasets/create/website/base/options-wrap.tsx
+++ b/web/app/components/datasets/create/website/base/options-wrap.tsx
@@ -29,7 +29,6 @@ const OptionsWrap: FC<Props> = ({
   useEffect(() => {
     if (controlFoldOptions)
       foldHide()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [controlFoldOptions])
   return (
     <div className={cn(className, !fold ? 'mb-0' : 'mb-3')}>
diff --git a/web/app/components/datasets/create/website/index.tsx b/web/app/components/datasets/create/website/index.tsx
index e2d0e2df99..cd2e2a14fa 100644
--- a/web/app/components/datasets/create/website/index.tsx
+++ b/web/app/components/datasets/create/website/index.tsx
@@ -64,7 +64,6 @@ const Website: FC<Props> = ({
     checkSetApiKey().then(() => {
       setIsLoaded(true)
     })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
   const handleOnConfig = useCallback(() => {
     setShowAccountSettingModal({
@@ -97,7 +96,7 @@ const Website: FC<Props> = ({
             <span className={cn(s.jinaLogo, 'mr-2')}/>
             <span>Jina Reader</span>
           </button>}
-         {ENABLE_WEBSITE_FIRECRAWL && <button
+          {ENABLE_WEBSITE_FIRECRAWL && <button
             className={cn('rounded-lg px-4 py-2',
               selectedProvider === DataSourceProvider.fireCrawl
                 ? 'system-sm-medium border-[1.5px] border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg text-text-primary'
diff --git a/web/app/components/datasets/create/website/jina-reader/base/options-wrap.tsx b/web/app/components/datasets/create/website/jina-reader/base/options-wrap.tsx
index a5fa6871cb..02b1cadb0a 100644
--- a/web/app/components/datasets/create/website/jina-reader/base/options-wrap.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/base/options-wrap.tsx
@@ -29,7 +29,6 @@ const OptionsWrap: FC<Props> = ({
   useEffect(() => {
     if (controlFoldOptions)
       foldHide()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [controlFoldOptions])
   return (
     <div className={cn(className, !fold ? 'mb-0' : 'mb-3')}>
diff --git a/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx b/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
index c352f11d7f..aaf9ed8ffd 100644
--- a/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
+++ b/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
@@ -161,7 +161,7 @@ const CSVUploader: FC<Props> = ({
   const fileChangeHandle = (e: React.ChangeEvent<HTMLInputElement>) => {
     const currentFile = e.target.files?.[0]
     if (!isValid(currentFile))
-       return
+      return
 
     initialUpload(currentFile)
   }
diff --git a/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx b/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx
index 336e5dbb42..8e37c5d1b8 100644
--- a/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx
@@ -24,9 +24,9 @@ const InfoPanel = () => {
             {t('dataset.connectDatasetIntro.content.end')}
           </span>
           <a className='system-sm-regular self-stretch text-text-accent'
-             href={docLink('/guides/knowledge-base/connect-external-knowledge-base')}
-             target='_blank'
-             rel="noopener noreferrer">
+            href={docLink('/guides/knowledge-base/connect-external-knowledge-base')}
+            target='_blank'
+            rel="noopener noreferrer">
             {t('dataset.connectDatasetIntro.learnMore')}
           </a>
         </p>
diff --git a/web/app/components/datasets/external-knowledge-base/create/index.tsx b/web/app/components/datasets/external-knowledge-base/create/index.tsx
index b8f754e9c4..e7e8b99c2c 100644
--- a/web/app/components/datasets/external-knowledge-base/create/index.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/index.tsx
@@ -28,7 +28,7 @@ const ExternalKnowledgeBaseCreate: React.FC<ExternalKnowledgeBaseCreateProps> =
     external_knowledge_api_id: '',
     external_knowledge_id: '',
     external_retrieval_model: {
-      top_k: 2,
+      top_k: 4,
       score_threshold: 0.5,
       score_threshold_enabled: false,
     },
diff --git a/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx b/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx
index 71c5edb21a..33cff979c8 100644
--- a/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx
+++ b/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx
@@ -69,13 +69,13 @@ const ChunkDetailModal: FC<Props> = ({
             <div>
               <div className='flex gap-x-1'>
                 <div className='w-4 shrink-0 text-[13px] font-medium leading-[20px] text-text-tertiary'>Q</div>
-                <div className={cn('body-md-regular text-text-secondary line-clamp-20')}>
+                <div className={cn('body-md-regular line-clamp-20 text-text-secondary')}>
                   {content}
                 </div>
               </div>
               <div className='flex gap-x-1'>
                 <div className='w-4 shrink-0 text-[13px] font-medium leading-[20px] text-text-tertiary'>A</div>
-                <div className={cn('body-md-regular text-text-secondary line-clamp-20')}>
+                <div className={cn('body-md-regular line-clamp-20 text-text-secondary')}>
                   {answer}
                 </div>
               </div>
diff --git a/web/app/components/datasets/hit-testing/textarea.tsx b/web/app/components/datasets/hit-testing/textarea.tsx
index c92e107542..a1f736e8ff 100644
--- a/web/app/components/datasets/hit-testing/textarea.tsx
+++ b/web/app/components/datasets/hit-testing/textarea.tsx
@@ -49,7 +49,7 @@ const TextAreaWithButton = ({
   const { t } = useTranslation()
   const [isSettingsOpen, setIsSettingsOpen] = useState(false)
   const [externalRetrievalSettings, setExternalRetrievalSettings] = useState({
-    top_k: 2,
+    top_k: 4,
     score_threshold: 0.5,
     score_threshold_enabled: false,
   })
diff --git a/web/app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts b/web/app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts
index dd1cd0f696..779cd05e19 100644
--- a/web/app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts
+++ b/web/app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts
@@ -28,7 +28,6 @@ const useEditDatasetMetadata = ({
       showEditModal()
       localStorage.removeItem(isShowManageMetadataLocalStorageKey)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const { data: datasetMetaData } = useDatasetMetaData(datasetId)
diff --git a/web/app/components/goto-anything/actions/commands/registry.ts b/web/app/components/goto-anything/actions/commands/registry.ts
index 192bf6c739..3632db323e 100644
--- a/web/app/components/goto-anything/actions/commands/registry.ts
+++ b/web/app/components/goto-anything/actions/commands/registry.ts
@@ -132,7 +132,7 @@ export class SlashCommandRegistry {
       try {
         return await handler.search(args, locale)
       }
- catch (error) {
+      catch (error) {
         console.warn(`Command search failed for ${commandName}:`, error)
         return []
       }
@@ -144,7 +144,7 @@ export class SlashCommandRegistry {
       try {
         return await handler.search(args, locale)
       }
- catch (error) {
+      catch (error) {
         console.warn(`Command search failed for ${handler.name}:`, error)
         return []
       }
diff --git a/web/app/components/goto-anything/actions/index.ts b/web/app/components/goto-anything/actions/index.ts
index e0e2b3e08e..92ee22f9ec 100644
--- a/web/app/components/goto-anything/actions/index.ts
+++ b/web/app/components/goto-anything/actions/index.ts
@@ -205,7 +205,7 @@ export const searchAnything = async (
       const results = await action.search(query, query, locale)
       return { success: true, data: results, actionType: action.key }
     }
- catch (error) {
+    catch (error) {
       console.warn(`Search failed for ${action.key}:`, error)
       return { success: false, data: [], actionType: action.key, error }
     }
@@ -220,7 +220,7 @@ export const searchAnything = async (
     if (result.status === 'fulfilled' && result.value.success) {
       allResults.push(...result.value.data)
     }
- else {
+    else {
       const actionKey = globalSearchActions[index]?.key || 'unknown'
       failedActions.push(actionKey)
     }
diff --git a/web/app/components/goto-anything/index.tsx b/web/app/components/goto-anything/index.tsx
index a8d474b970..cd883ac216 100644
--- a/web/app/components/goto-anything/index.tsx
+++ b/web/app/components/goto-anything/index.tsx
@@ -166,7 +166,7 @@ const GotoAnything: FC<Props> = ({
     acc[result.type].push(result)
     return acc
   }, {} as { [key: string]: SearchResult[] }),
-    [searchResults])
+  [searchResults])
 
   const emptyResult = useMemo(() => {
     if (searchResults.length || !searchQuery.trim() || isLoading || isCommandsMode)
diff --git a/web/app/components/header/account-setting/data-source-page/data-source-website/index.tsx b/web/app/components/header/account-setting/data-source-page/data-source-website/index.tsx
index 911bf01c09..d2faa1dd6a 100644
--- a/web/app/components/header/account-setting/data-source-page/data-source-website/index.tsx
+++ b/web/app/components/header/account-setting/data-source-page/data-source-website/index.tsx
@@ -32,7 +32,6 @@ const DataSourceWebsite: FC<Props> = ({ provider }) => {
 
   useEffect(() => {
     checkSetApiKey()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const [configTarget, setConfigTarget] = useState<DataSourceProvider | null>(null)
diff --git a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx
index e999253ea7..264665805d 100644
--- a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx
@@ -100,7 +100,7 @@ const InviteModal = ({
           <div className='mb-2 text-sm font-medium text-text-primary'>{t('common.members.email')}</div>
           <div className='mb-8 flex h-36 flex-col items-stretch'>
             <ReactMultiEmail
-              className={cn('w-full border-components-input-border-active !bg-components-input-bg-normal px-3 pt-2 outline-none',
+              className={cn('h-full w-full border-components-input-border-active !bg-components-input-bg-normal px-3 pt-2 outline-none',
                 'appearance-none overflow-y-auto rounded-lg text-sm !text-text-primary',
               )}
               autoFocus
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/add-credential-in-load-balancing.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/add-credential-in-load-balancing.tsx
index 64e631614d..a0c78e3292 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/add-credential-in-load-balancing.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/add-credential-in-load-balancing.tsx
@@ -60,9 +60,9 @@ const AddCredentialInLoadBalancing = ({
           asChild
           popupContent={t('plugin.auth.credentialUnavailable')}
         >
-            {Item}
-          </Tooltip>
-        )
+          {Item}
+        </Tooltip>
+      )
     }
     return Item
   }, [notAllowCustomCredential, t, customModel])
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx
index 3e7c04a0f2..2aa64ffb89 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx
@@ -176,11 +176,11 @@ const Authorized = ({
                   onClick={() => handleEdit(
                     undefined,
                     currentCustomConfigurationModelFixedFields
-                    ? {
-                      model: currentCustomConfigurationModelFixedFields.__model_name,
-                      model_type: currentCustomConfigurationModelFixedFields.__model_type,
-                    }
-                    : undefined,
+                      ? {
+                        model: currentCustomConfigurationModelFixedFields.__model_name,
+                        model_type: currentCustomConfigurationModelFixedFields.__model_type,
+                      }
+                      : undefined,
                   )}
                   className='system-xs-medium flex h-[30px] cursor-pointer items-center px-3 text-text-accent-light-mode-only'
                 >
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Input.test.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Input.test.tsx
new file mode 100644
index 0000000000..98e5c8c792
--- /dev/null
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Input.test.tsx
@@ -0,0 +1,16 @@
+import { render } from '@testing-library/react'
+import Input from './Input'
+
+test('Input renders correctly as password type with no autocomplete', () => {
+  const { asFragment, getByPlaceholderText } = render(
+    <Input
+      type="password"
+      placeholder="API Key"
+      onChange={jest.fn()}
+    />,
+  )
+  const input = getByPlaceholderText('API Key')
+  expect(input).toHaveAttribute('type', 'password')
+  expect(input).not.toHaveAttribute('autocomplete')
+  expect(asFragment()).toMatchSnapshot()
+})
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx
index a19e330315..8340faa0c3 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx
@@ -13,6 +13,7 @@ type InputProps = {
   min?: number
   max?: number
 }
+
 const Input: FC<InputProps> = ({
   value,
   onChange,
@@ -32,23 +33,23 @@ const Input: FC<InputProps> = ({
       onChange(`${min}`)
       return
     }
-
     if (!isNaN(maxNum) && Number.parseFloat(v) > maxNum)
       onChange(`${max}`)
   }
+
   return (
     <div className='relative'>
       <input
-        autoComplete="new-password"
         tabIndex={0}
+        // Do not set autoComplete for security - prevents browser from storing sensitive API keys
         className={`
           block h-8 w-full appearance-none rounded-lg border border-transparent bg-components-input-bg-normal px-3 text-sm
           text-components-input-text-filled caret-primary-600 outline-none
           placeholder:text-sm placeholder:text-text-tertiary
           hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active
           focus:bg-components-input-bg-active focus:shadow-xs
-          ${validated && 'pr-[30px]'}
-          ${className}
+          ${validated ? 'pr-[30px]' : ''}
+          ${className || ''}
         `}
         placeholder={placeholder || ''}
         onChange={e => onChange(e.target.value)}
@@ -60,13 +61,11 @@ const Input: FC<InputProps> = ({
         min={min}
         max={max}
       />
-      {
-        validated && (
-          <div className='absolute right-2.5 top-2.5'>
-            <CheckCircle className='h-4 w-4 text-[#039855]' />
-          </div>
-        )
-      }
+      {validated && (
+        <div className='absolute right-2.5 top-2.5'>
+          <CheckCircle className='h-4 w-4 text-[#039855]' />
+        </div>
+      )}
     </div>
   )
 }
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/__snapshots__/Input.test.tsx.snap b/web/app/components/header/account-setting/model-provider-page/model-modal/__snapshots__/Input.test.tsx.snap
new file mode 100644
index 0000000000..9a5fe8dd29
--- /dev/null
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/__snapshots__/Input.test.tsx.snap
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Input renders correctly as password type with no autocomplete 1`] = `
+<DocumentFragment>
+  <div
+    class="relative"
+  >
+    <input
+      class="
+          block h-8 w-full appearance-none rounded-lg border border-transparent bg-components-input-bg-normal px-3 text-sm
+          text-components-input-text-filled caret-primary-600 outline-none
+          placeholder:text-sm placeholder:text-text-tertiary
+          hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active
+          focus:bg-components-input-bg-active focus:shadow-xs
+          
+          
+        "
+      placeholder="API Key"
+      tabindex="0"
+      type="password"
+    />
+  </div>
+</DocumentFragment>
+`;
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
index 1d6db30c4c..cbd19c7cae 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
@@ -200,8 +200,8 @@ const ModelLoadBalancingModal = ({
                   <div className='grow'>
                     <div className='text-sm text-text-secondary'>{
                       providerFormSchemaPredefined
-                       ? t('common.modelProvider.auth.providerManaged')
-                       : t('common.modelProvider.auth.specifyModelCredential')
+                        ? t('common.modelProvider.auth.providerManaged')
+                        : t('common.modelProvider.auth.specifyModelCredential')
                     }</div>
                     <div className='text-xs text-text-tertiary'>{
                       providerFormSchemaPredefined
diff --git a/web/app/components/plugins/install-plugin/install-bundle/item/github-item.tsx b/web/app/components/plugins/install-plugin/install-bundle/item/github-item.tsx
index 48f0bff3c7..a298909a7f 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/item/github-item.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/item/github-item.tsx
@@ -41,13 +41,10 @@ const Item: FC<Props> = ({
       onFetchedPayload(payload)
       setPayload({ ...payload, from: dependency.type })
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [data])
   useEffect(() => {
     if (error)
       onFetchError()
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [error])
   if (!payload) return <Loading />
   return (
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
index ee45520a61..2691877a07 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
@@ -131,7 +131,6 @@ const InstallByDSLList: ForwardRefRenderFunction<ExposeRefs, Props> = ({
       if (failedIndex.length > 0)
         setErrorIndexes([...errorIndexes, ...failedIndex])
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFetchingMarketplaceDataById])
 
   useEffect(() => {
@@ -156,15 +155,12 @@ const InstallByDSLList: ForwardRefRenderFunction<ExposeRefs, Props> = ({
       if (failedIndex.length > 0)
         setErrorIndexes([...errorIndexes, ...failedIndex])
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFetchingDataByMeta])
 
   useEffect(() => {
     // get info all failed
     if (infoByMetaError || infoByIdError)
       setErrorIndexes([...errorIndexes, ...marketPlaceInDSLIndex])
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [infoByMetaError, infoByIdError])
 
   const isLoadedAllData = (plugins.filter(p => !!p).length + errorIndexes.length) === allPlugins.length
@@ -189,8 +185,6 @@ const InstallByDSLList: ForwardRefRenderFunction<ExposeRefs, Props> = ({
   useEffect(() => {
     if (isLoadedAllData && installedInfo)
       onLoadedAllPlugin(installedInfo!)
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isLoadedAllData, installedInfo])
 
   const handleSelect = useCallback((index: number) => {
diff --git a/web/app/components/plugins/install-plugin/install-from-github/steps/loaded.tsx b/web/app/components/plugins/install-plugin/install-from-github/steps/loaded.tsx
index 0764f03ae5..c544d5dc90 100644
--- a/web/app/components/plugins/install-plugin/install-from-github/steps/loaded.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-github/steps/loaded.tsx
@@ -61,7 +61,6 @@ const Loaded: React.FC<LoadedProps> = ({
   useEffect(() => {
     if (hasInstalled && uniqueIdentifier === installedInfoPayload.uniqueIdentifier)
       onInstalled()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hasInstalled])
 
   const handleInstall = async () => {
diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx
index 5b1c478d9b..a72b40bb27 100644
--- a/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx
@@ -55,7 +55,6 @@ const Uploading: FC<Props> = ({
 
   React.useEffect(() => {
     handleUpload()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
   return (
     <>
diff --git a/web/app/components/plugins/marketplace/context.tsx b/web/app/components/plugins/marketplace/context.tsx
index 91621afaf8..248e035c1b 100644
--- a/web/app/components/plugins/marketplace/context.tsx
+++ b/web/app/components/plugins/marketplace/context.tsx
@@ -175,7 +175,6 @@ export const MarketplaceContextProvider = ({
         })
       }
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [queryPlugins, queryMarketplaceCollectionsAndPlugins, isSuccess, exclude])
 
   const handleQueryMarketplaceCollectionsAndPlugins = useCallback(() => {
diff --git a/web/app/components/plugins/plugin-auth/authorized/index.tsx b/web/app/components/plugins/plugin-auth/authorized/index.tsx
index d0bef8d11d..13265488c4 100644
--- a/web/app/components/plugins/plugin-auth/authorized/index.tsx
+++ b/web/app/components/plugins/plugin-auth/authorized/index.tsx
@@ -155,9 +155,9 @@ const Authorized = ({
   }, [setPluginDefaultCredential, onUpdate, notify, t, handleSetDoingAction])
   const { mutateAsync: updatePluginCredential } = useUpdatePluginCredentialHook(pluginPayload)
   const handleRename = useCallback(async (payload: {
-      credential_id: string
-      name: string
-    }) => {
+    credential_id: string
+    name: string
+  }) => {
     if (doingActionRef.current)
       return
     try {
@@ -306,17 +306,17 @@ const Authorized = ({
               !notAllowCustomCredential && (
                 <>
                   <div className='h-[1px] bg-divider-subtle'></div>
-                    <div className='p-2'>
-                      <Authorize
-                        pluginPayload={pluginPayload}
-                        theme='secondary'
-                        showDivider={false}
-                        canOAuth={canOAuth}
-                        canApiKey={canApiKey}
-                        disabled={disabled}
-                        onUpdate={onUpdate}
-                      />
-                    </div>
+                  <div className='p-2'>
+                    <Authorize
+                      pluginPayload={pluginPayload}
+                      theme='secondary'
+                      showDivider={false}
+                      canOAuth={canOAuth}
+                      canApiKey={canApiKey}
+                      disabled={disabled}
+                      onUpdate={onUpdate}
+                    />
+                  </div>
                 </>
               )
             }
diff --git a/web/app/components/plugins/plugin-auth/hooks/use-plugin-auth-action.ts b/web/app/components/plugins/plugin-auth/hooks/use-plugin-auth-action.ts
index fe4ab014ef..1dc2f00ec2 100644
--- a/web/app/components/plugins/plugin-auth/hooks/use-plugin-auth-action.ts
+++ b/web/app/components/plugins/plugin-auth/hooks/use-plugin-auth-action.ts
@@ -87,9 +87,9 @@ export const usePluginAuthAction = (
   }, [setPluginDefaultCredential, onUpdate, notify, t, handleSetDoingAction])
   const { mutateAsync: updatePluginCredential } = useUpdatePluginCredentialHook(pluginPayload)
   const handleRename = useCallback(async (payload: {
-      credential_id: string
-      name: string
-    }) => {
+    credential_id: string
+    name: string
+  }) => {
     if (doingActionRef.current)
       return
     try {
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
index 9c16c66a70..c2d5b76de5 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
@@ -97,7 +97,7 @@ const AppSelector: FC<Props> = ({
     try {
       await setSize((size: number) => size + 1)
     }
- finally {
+    finally {
       // Add a small delay to ensure state updates are complete
       setTimeout(() => {
         setIsLoadingMore(false)
diff --git a/web/app/components/plugins/plugin-detail-panel/detail-header.tsx b/web/app/components/plugins/plugin-detail-panel/detail-header.tsx
index 3f03a632ef..318d1112bb 100644
--- a/web/app/components/plugins/plugin-detail-panel/detail-header.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/detail-header.tsx
@@ -61,7 +61,7 @@ const DetailHeader = ({
   onUpdate,
 }: Props) => {
   const { t } = useTranslation()
-    const { userProfile: { timezone } } = useAppContext()
+  const { userProfile: { timezone } } = useAppContext()
 
   const { theme } = useTheme()
   const locale = useGetLanguage()
diff --git a/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx b/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
index a715237a43..3041f13f2f 100644
--- a/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
@@ -55,9 +55,9 @@ const EndpointModal: FC<Props> = ({
         const value = processedCredential[field.name]
         if (typeof value === 'string')
           processedCredential[field.name] = value === 'true' || value === '1' || value === 'True'
-         else if (typeof value === 'number')
+        else if (typeof value === 'number')
           processedCredential[field.name] = value === 1
-         else if (typeof value === 'boolean')
+        else if (typeof value === 'boolean')
           processedCredential[field.name] = value
       }
     })
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 44212e38ed..c92b9d171a 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
@@ -45,7 +45,7 @@ const MultipleToolSelector = ({
   canChooseMCPTool,
 }: Props) => {
   const { t } = useTranslation()
-    const { data: mcpTools } = useAllMCPTools()
+  const { data: mcpTools } = useAllMCPTools()
   const enabledCount = value.filter((item) => {
     const isMCPTool = mcpTools?.find(tool => tool.id === item.provider_name)
     if(isMCPTool)
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 6de83603a4..b0b8a45f3d 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
@@ -222,12 +222,12 @@ const ReasoningConfigForm: React.FC<Props> = ({
                   {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>
+                <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>
             )}
 
diff --git a/web/app/components/plugins/plugin-item/action.tsx b/web/app/components/plugins/plugin-item/action.tsx
index 21c1764207..6d7ff388ea 100644
--- a/web/app/components/plugins/plugin-item/action.tsx
+++ b/web/app/components/plugins/plugin-item/action.tsx
@@ -98,7 +98,6 @@ const Action: FC<Props> = ({
       hideDeleteConfirm()
       onDelete()
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [installationId, onDelete])
   return (
     <div className='flex space-x-1'>
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx
index a4875fc11b..2d00788142 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx
@@ -101,19 +101,19 @@ const AutoUpdateSetting: FC<Props> = ({
 
   const renderTimePickerTrigger = useCallback(({ inputElem, onClick, isOpen }: TriggerParams) => {
     return (
-        <div
-          className='group float-right flex h-8 w-[160px] cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2 hover:bg-state-base-hover-alt'
-          onClick={onClick}
-        >
-          <div className='flex w-0 grow items-center gap-x-1'>
-            <RiTimeLine className={cn(
-              'h-4 w-4 shrink-0 text-text-tertiary',
-              isOpen ? 'text-text-secondary' : 'group-hover:text-text-secondary',
-            )} />
-            {inputElem}
-          </div>
-          <div className='system-sm-regular text-text-tertiary'>{convertTimezoneToOffsetStr(timezone)}</div>
+      <div
+        className='group float-right flex h-8 w-[160px] cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2 hover:bg-state-base-hover-alt'
+        onClick={onClick}
+      >
+        <div className='flex w-0 grow items-center gap-x-1'>
+          <RiTimeLine className={cn(
+            'h-4 w-4 shrink-0 text-text-tertiary',
+            isOpen ? 'text-text-secondary' : 'group-hover:text-text-secondary',
+          )} />
+          {inputElem}
         </div>
+        <div className='system-sm-regular text-text-tertiary'>{convertTimezoneToOffsetStr(timezone)}</div>
+      </div>
     )
   }, [timezone])
 
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/utils.ts b/web/app/components/plugins/reference-setting-modal/auto-update-setting/utils.ts
index 23c067285f..3c677dfeef 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/utils.ts
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/utils.ts
@@ -28,10 +28,10 @@ export const dayjsToTimeOfDay = (date?: Dayjs): number => {
 }
 
 export const convertUTCDaySecondsToLocalSeconds = (utcDaySeconds: number, localTimezone: string): number => {
-    const utcDayStart = dayjs().utc().startOf('day')
-    const utcTargetTime = utcDayStart.add(utcDaySeconds, 'second')
-    const localTargetTime = utcTargetTime.tz(localTimezone)
-    const localDayStart = localTargetTime.startOf('day')
-    const secondsInLocalDay = localTargetTime.diff(localDayStart, 'second')
-    return secondsInLocalDay
+  const utcDayStart = dayjs().utc().startOf('day')
+  const utcTargetTime = utcDayStart.add(utcDaySeconds, 'second')
+  const localTargetTime = utcTargetTime.tz(localTimezone)
+  const localDayStart = localTargetTime.startOf('day')
+  const secondsInLocalDay = localTargetTime.diff(localDayStart, 'second')
+  return secondsInLocalDay
 }
diff --git a/web/app/components/plugins/update-plugin/downgrade-warning.tsx b/web/app/components/plugins/update-plugin/downgrade-warning.tsx
index a5f6e40e41..beb64793a0 100644
--- a/web/app/components/plugins/update-plugin/downgrade-warning.tsx
+++ b/web/app/components/plugins/update-plugin/downgrade-warning.tsx
@@ -20,7 +20,7 @@ const DowngradeWarningModal = ({
       <div className='flex flex-col items-start gap-2 self-stretch'>
         <div className='title-2xl-semi-bold text-text-primary'>{t(`${i18nPrefix}.title`)}</div>
         <div className='system-md-regular text-text-secondary'>
-        {t(`${i18nPrefix}.description`)}
+          {t(`${i18nPrefix}.description`)}
         </div>
       </div>
       <div className='mt-9 flex items-start justify-end space-x-2 self-stretch'>
diff --git a/web/app/components/plugins/update-plugin/from-market-place.tsx b/web/app/components/plugins/update-plugin/from-market-place.tsx
index 70bc7399f5..fd15d923be 100644
--- a/web/app/components/plugins/update-plugin/from-market-place.tsx
+++ b/web/app/components/plugins/update-plugin/from-market-place.tsx
@@ -136,47 +136,47 @@ const UpdatePluginModal: FC<Props> = ({
           onExcludeAndDowngrade={handleExcludeAndDownload}
         />
       )}
-    {!doShowDowngradeWarningModal && (
-      <>
-        <div className='system-md-regular mb-2 mt-3 text-text-secondary'>
-          {t(`${i18nPrefix}.description`)}
-        </div>
-        <div className='flex flex-wrap content-start items-start gap-1 self-stretch rounded-2xl bg-background-section-burn p-2'>
-          <Card
-            installed={uploadStep === UploadStep.installed}
-            payload={pluginManifestToCardPluginProps({
-              ...originalPackageInfo.payload,
-              icon: icon!,
-            })}
-            className='w-full'
-            titleLeft={
-              <>
-                <Badge className='mx-1' size="s" state={BadgeState.Warning}>
-                  {`${originalPackageInfo.payload.version} -> ${targetPackageInfo.version}`}
-                </Badge>
-              </>
-            }
-          />
-        </div>
-        <div className='flex items-center justify-end gap-2 self-stretch pt-5'>
-          {uploadStep === UploadStep.notStarted && (
+      {!doShowDowngradeWarningModal && (
+        <>
+          <div className='system-md-regular mb-2 mt-3 text-text-secondary'>
+            {t(`${i18nPrefix}.description`)}
+          </div>
+          <div className='flex flex-wrap content-start items-start gap-1 self-stretch rounded-2xl bg-background-section-burn p-2'>
+            <Card
+              installed={uploadStep === UploadStep.installed}
+              payload={pluginManifestToCardPluginProps({
+                ...originalPackageInfo.payload,
+                icon: icon!,
+              })}
+              className='w-full'
+              titleLeft={
+                <>
+                  <Badge className='mx-1' size="s" state={BadgeState.Warning}>
+                    {`${originalPackageInfo.payload.version} -> ${targetPackageInfo.version}`}
+                  </Badge>
+                </>
+              }
+            />
+          </div>
+          <div className='flex items-center justify-end gap-2 self-stretch pt-5'>
+            {uploadStep === UploadStep.notStarted && (
+              <Button
+                onClick={handleCancel}
+              >
+                {t('common.operation.cancel')}
+              </Button>
+            )}
             <Button
-              onClick={handleCancel}
+              variant='primary'
+              loading={uploadStep === UploadStep.upgrading}
+              onClick={handleConfirm}
+              disabled={uploadStep === UploadStep.upgrading}
             >
-              {t('common.operation.cancel')}
+              {configBtnText}
             </Button>
-          )}
-          <Button
-            variant='primary'
-            loading={uploadStep === UploadStep.upgrading}
-            onClick={handleConfirm}
-            disabled={uploadStep === UploadStep.upgrading}
-          >
-            {configBtnText}
-          </Button>
-        </div>
-      </>
-    )}
+          </div>
+        </>
+      )}
 
     </Modal>
   )
diff --git a/web/app/components/share/text-generation/result/index.tsx b/web/app/components/share/text-generation/result/index.tsx
index fc5422589c..a7eb7f7591 100644
--- a/web/app/components/share/text-generation/result/index.tsx
+++ b/web/app/components/share/text-generation/result/index.tsx
@@ -102,7 +102,7 @@ const Result: FC<IResultProps> = ({
   })
 
   const handleFeedback = async (feedback: FeedbackType) => {
-    await updateFeedback({ url: `/messages/${messageId}/feedbacks`, body: { rating: feedback.rating } }, isInstalledApp, installedAppInfo?.id)
+    await updateFeedback({ url: `/messages/${messageId}/feedbacks`, body: { rating: feedback.rating, content: feedback.content } }, isInstalledApp, installedAppInfo?.id)
     setFeedback(feedback)
   }
 
diff --git a/web/app/components/tools/mcp/detail/content.tsx b/web/app/components/tools/mcp/detail/content.tsx
index 3f927b990d..965b270bda 100644
--- a/web/app/components/tools/mcp/detail/content.tsx
+++ b/web/app/components/tools/mcp/detail/content.tsx
@@ -141,7 +141,6 @@ const MCPDetailContent: FC<Props> = ({
   useEffect(() => {
     if (isTriggerAuthorize)
       handleAuthorize()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   if (!detail)
diff --git a/web/app/components/tools/mcp/mcp-service-card.tsx b/web/app/components/tools/mcp/mcp-service-card.tsx
index 301bb66897..6c86932b32 100644
--- a/web/app/components/tools/mcp/mcp-service-card.tsx
+++ b/web/app/components/tools/mcp/mcp-service-card.tsx
@@ -209,9 +209,9 @@ function MCPServiceCard({
             >
 
               <div className="flex items-center justify-center gap-[1px]">
-                    <RiEditLine className="h-3.5 w-3.5" />
-                    <div className="system-xs-medium px-[3px] text-text-tertiary">{serverPublished ? t('tools.mcp.server.edit') : t('tools.mcp.server.addDescription')}</div>
-                  </div>
+                <RiEditLine className="h-3.5 w-3.5" />
+                <div className="system-xs-medium px-[3px] text-text-tertiary">{serverPublished ? t('tools.mcp.server.edit') : t('tools.mcp.server.addDescription')}</div>
+              </div>
             </Button>
           </div>
         </div>
diff --git a/web/app/components/tools/utils/to-form-schema.ts b/web/app/components/tools/utils/to-form-schema.ts
index dd3c5c22b4..cc17579d02 100644
--- a/web/app/components/tools/utils/to-form-schema.ts
+++ b/web/app/components/tools/utils/to-form-schema.ts
@@ -70,9 +70,9 @@ export const addDefaultValue = (value: Record<string, any>, formSchemas: { varia
     if (formSchema.type === 'boolean' && itemValue !== undefined && itemValue !== null && itemValue !== '') {
       if (typeof itemValue === 'string')
         newValues[formSchema.variable] = itemValue === 'true' || itemValue === '1' || itemValue === 'True'
-       else if (typeof itemValue === 'number')
+      else if (typeof itemValue === 'number')
         newValues[formSchema.variable] = itemValue === 1
-       else if (typeof itemValue === 'boolean')
+      else if (typeof itemValue === 'boolean')
         newValues[formSchema.variable] = itemValue
     }
   })
@@ -162,13 +162,13 @@ export const getConfiguredValue = (value: Record<string, any>, formSchemas: { va
 }
 
 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
-  }
+  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
diff --git a/web/app/components/workflow-app/hooks/use-workflow-init.ts b/web/app/components/workflow-app/hooks/use-workflow-init.ts
index 6d16dc5c44..d63c5ca7b9 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-init.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-init.ts
@@ -83,7 +83,6 @@ export const useWorkflowInit = () => {
 
   useEffect(() => {
     handleGetInitialWorkflowData()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const handleFetchPreloadData = useCallback(async () => {
diff --git a/web/app/components/workflow/block-selector/all-tools.tsx b/web/app/components/workflow/block-selector/all-tools.tsx
index 870d791d4f..f155b644a1 100644
--- a/web/app/components/workflow/block-selector/all-tools.tsx
+++ b/web/app/components/workflow/block-selector/all-tools.tsx
@@ -101,7 +101,6 @@ const AllTools = ({
         category: PluginType.tool,
       })
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchText, tags, enable_marketplace])
 
   const pluginRef = useRef<ListRef>(null)
diff --git a/web/app/components/workflow/block-selector/market-place-plugin/action.tsx b/web/app/components/workflow/block-selector/market-place-plugin/action.tsx
index 4e64929582..56ee420cff 100644
--- a/web/app/components/workflow/block-selector/market-place-plugin/action.tsx
+++ b/web/app/components/workflow/block-selector/market-place-plugin/action.tsx
@@ -60,7 +60,6 @@ const OperationDropdown: FC<Props> = ({
       downloadFile({ data: blob, fileName })
       setNeedDownload(false)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [blob])
   return (
     <PortalToFollowElem
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 dce877ab91..98b799adf4 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
@@ -56,7 +56,6 @@ const List = forwardRef<ListRef, ListProps>(({
 
   useEffect(() => {
     handleScroll()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [list])
 
   const handleHeadClick = () => {
diff --git a/web/app/components/workflow/block-selector/tool/tool.tsx b/web/app/components/workflow/block-selector/tool/tool.tsx
index 83ae062737..e0da011d2a 100644
--- a/web/app/components/workflow/block-selector/tool/tool.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool.tsx
@@ -122,7 +122,6 @@ const Tool: FC<Props> = ({
     }
     if (!hasSearchText && !isFold)
       setFold(true)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hasSearchText])
 
   const FoldIcon = isFold ? RiArrowRightSLine : RiArrowDownSLine
diff --git a/web/app/components/workflow/datasets-detail-store/provider.tsx b/web/app/components/workflow/datasets-detail-store/provider.tsx
index 7d6ede823a..1f5749bc3c 100644
--- a/web/app/components/workflow/datasets-detail-store/provider.tsx
+++ b/web/app/components/workflow/datasets-detail-store/provider.tsx
@@ -40,7 +40,6 @@ const DatasetsDetailProvider: FC<DatasetsDetailProviderProps> = ({
     }, [])
     if (allDatasetIds.length === 0) return
     updateDatasetsDetail(allDatasetIds)
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   return (
diff --git a/web/app/components/workflow/header/header-in-restoring.tsx b/web/app/components/workflow/header/header-in-restoring.tsx
index da436336ec..ff8c74d98d 100644
--- a/web/app/components/workflow/header/header-in-restoring.tsx
+++ b/web/app/components/workflow/header/header-in-restoring.tsx
@@ -82,26 +82,26 @@ const HeaderInRestoring = ({
         <RestoringTitle />
       </div>
       <div className=' flex items-center justify-end gap-x-2'>
-          <Button
-            onClick={handleRestore}
-            disabled={!currentVersion || currentVersion.version === WorkflowVersion.Draft}
-            variant='primary'
-            className={cn(
-              theme === 'dark' && 'rounded-lg border border-black/5 bg-white/10 backdrop-blur-sm',
-            )}
-          >
-            {t('workflow.common.restore')}
-          </Button>
-          <Button
-            onClick={handleCancelRestore}
-            className={cn(
-              'text-components-button-secondary-accent-text',
-              theme === 'dark' && 'rounded-lg border border-black/5 bg-white/10 backdrop-blur-sm',
-            )}
-          >
-            <div className='flex items-center gap-x-0.5'>
-              <RiHistoryLine className='h-4 w-4' />
-              <span className='px-0.5'>{t('workflow.common.exitVersions')}</span>
+        <Button
+          onClick={handleRestore}
+          disabled={!currentVersion || currentVersion.version === WorkflowVersion.Draft}
+          variant='primary'
+          className={cn(
+            theme === 'dark' && 'rounded-lg border border-black/5 bg-white/10 backdrop-blur-sm',
+          )}
+        >
+          {t('workflow.common.restore')}
+        </Button>
+        <Button
+          onClick={handleCancelRestore}
+          className={cn(
+            'text-components-button-secondary-accent-text',
+            theme === 'dark' && 'rounded-lg border border-black/5 bg-white/10 backdrop-blur-sm',
+          )}
+        >
+          <div className='flex items-center gap-x-0.5'>
+            <RiHistoryLine className='h-4 w-4' />
+            <span className='px-0.5'>{t('workflow.common.exitVersions')}</span>
           </div>
         </Button>
       </div>
diff --git a/web/app/components/workflow/header/version-history-button.tsx b/web/app/components/workflow/header/version-history-button.tsx
index 0dee845b55..0de10d94f3 100644
--- a/web/app/components/workflow/header/version-history-button.tsx
+++ b/web/app/components/workflow/header/version-history-button.tsx
@@ -49,7 +49,7 @@ const VersionHistoryButton: FC<VersionHistoryButtonProps> = ({
     e.preventDefault()
     handleViewVersionHistory()
   },
-    { exactMatch: true, useCapture: true })
+  { exactMatch: true, useCapture: true })
 
   return <Tooltip
     popupContent={<PopupContent />}
@@ -57,15 +57,15 @@ const VersionHistoryButton: FC<VersionHistoryButtonProps> = ({
     popupClassName='rounded-lg border-[0.5px] border-components-panel-border bg-components-tooltip-bg
     shadow-lg shadow-shadow-shadow-5 backdrop-blur-[5px] p-1.5'
   >
-      <Button
-        className={cn(
-          'p-2',
-          theme === 'dark' && 'rounded-lg border border-black/5 bg-white/10 backdrop-blur-sm',
-        )}
-        onClick={handleViewVersionHistory}
-      >
-        <RiHistoryLine className='h-4 w-4 text-components-button-secondary-text' />
-      </Button>
+    <Button
+      className={cn(
+        'p-2',
+        theme === 'dark' && 'rounded-lg border border-black/5 bg-white/10 backdrop-blur-sm',
+      )}
+      onClick={handleViewVersionHistory}
+    >
+      <RiHistoryLine className='h-4 w-4 text-components-button-secondary-text' />
+    </Button>
   </Tooltip>
 }
 
diff --git a/web/app/components/workflow/hooks-store/provider.tsx b/web/app/components/workflow/hooks-store/provider.tsx
index c1090ae3f8..8233664004 100644
--- a/web/app/components/workflow/hooks-store/provider.tsx
+++ b/web/app/components/workflow/hooks-store/provider.tsx
@@ -22,7 +22,6 @@ export const HooksStoreContextProvider = ({ children, ...restProps }: HooksStore
   useEffect(() => {
     if (storeRef.current && d3Selection && d3Zoom)
       storeRef.current.getState().refreshAll(restProps)
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [d3Selection, d3Zoom])
 
   if (!storeRef.current)
diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
index ffcfd81666..8bcd754961 100644
--- a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
+++ b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
@@ -54,9 +54,9 @@ export const useInspectVarsCrudCommon = ({
     if (!node)
       return undefined
     const varId = node.vars.find((varItem) => {
-        return varItem.selector[1] === varName
-      })?.id
-      return varId
+      return varItem.selector[1] === varName
+    })?.id
+    return varId
   }, [getNodeInspectVars])
 
   const getInspectVar = useCallback((nodeId: string, name: string): VarInInspect | undefined => {
@@ -71,16 +71,16 @@ export const useInspectVarsCrudCommon = ({
   }, [getNodeInspectVars])
 
   const hasSetInspectVar = useCallback((nodeId: string, name: string, sysVars: VarInInspect[], conversationVars: VarInInspect[]) => {
-      const isEnv = isENV([nodeId])
-      if (isEnv) // always have value
-        return true
-      const isSys = isSystemVar([nodeId])
-      if (isSys)
-        return sysVars.some(varItem => varItem.selector?.[1]?.replace('sys.', '') === name)
-      const isChatVar = isConversationVar([nodeId])
-      if (isChatVar)
-        return conversationVars.some(varItem => varItem.selector?.[1] === name)
-      return getInspectVar(nodeId, name) !== undefined
+    const isEnv = isENV([nodeId])
+    if (isEnv) // always have value
+      return true
+    const isSys = isSystemVar([nodeId])
+    if (isSys)
+      return sysVars.some(varItem => varItem.selector?.[1]?.replace('sys.', '') === name)
+    const isChatVar = isConversationVar([nodeId])
+    if (isChatVar)
+      return conversationVars.some(varItem => varItem.selector?.[1] === name)
+    return getInspectVar(nodeId, name) !== undefined
   }, [getInspectVar])
 
   const hasNodeInspectVars = useCallback((nodeId: string) => {
@@ -115,23 +115,23 @@ export const useInspectVarsCrudCommon = ({
     } = workflowStore.getState()
     const nodes = produce(nodesWithInspectVars, (draft) => {
       const nodeInfo = allNodes.find(node => node.id === nodeId)
-        if (nodeInfo) {
-          const index = draft.findIndex(node => node.nodeId === nodeId)
-          if (index === -1) {
-            draft.unshift({
-              nodeId,
-              nodeType: nodeInfo.data.type,
-              title: nodeInfo.data.title,
-              vars: payload,
-              nodePayload: nodeInfo.data,
-            })
-          }
-          else {
-            draft[index].vars = payload
-            // put the node to the topAdd commentMore actions
-            draft.unshift(draft.splice(index, 1)[0])
-          }
+      if (nodeInfo) {
+        const index = draft.findIndex(node => node.nodeId === nodeId)
+        if (index === -1) {
+          draft.unshift({
+            nodeId,
+            nodeType: nodeInfo.data.type,
+            title: nodeInfo.data.title,
+            vars: payload,
+            nodePayload: nodeInfo.data,
+          })
         }
+        else {
+          draft[index].vars = payload
+            // put the node to the topAdd commentMore actions
+          draft.unshift(draft.splice(index, 1)[0])
+        }
+      }
     })
     setNodesWithInspectVars(nodes)
     handleCancelNodeSuccessStatus(nodeId)
diff --git a/web/app/components/workflow/hooks/use-nodes-available-var-list.ts b/web/app/components/workflow/hooks/use-nodes-available-var-list.ts
index 5efe2519ef..e6df546890 100644
--- a/web/app/components/workflow/hooks/use-nodes-available-var-list.ts
+++ b/web/app/components/workflow/hooks/use-nodes-available-var-list.ts
@@ -35,9 +35,9 @@ const useNodesAvailableVarList = (nodes: Node[], {
   hideChatVar = false,
   passedInAvailableNodes,
 }: Params = {
-    onlyLeafNodeVar: false,
-    filterVar: () => true,
-  }) => {
+  onlyLeafNodeVar: false,
+  filterVar: () => true,
+}) => {
   const { getTreeLeafNodes, getBeforeNodesInSameBranchIncludeParent } = useWorkflow()
   const { getNodeAvailableVars } = useWorkflowVariables()
   const isChatMode = useIsChatMode()
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts
index f1f184d4bb..54af9843e6 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts
@@ -68,7 +68,7 @@ export const useWorkflowNodeStarted = () => {
       incomeEdges.forEach((edge) => {
         const incomeNode = nodes.find(node => node.id === edge.source)!
         if (!incomeNode || !('data' in incomeNode))
-           return
+          return
 
         if (
           (!incomeNode.data._runningBranchId && edge.sourceHandle === 'source')
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 9e67debd58..7635e0faf0 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
@@ -93,7 +93,7 @@ export type AgentStrategySelectorProps = {
 }
 
 export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) => {
-    const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
+  const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
 
   const { value, onChange, canChooseMCPTool } = props
   const [open, setOpen] = useState(false)
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 3b5b81ed1f..b447c3f70e 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
@@ -236,7 +236,7 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
               'zh-Hans': '/guides/workflow/node/agent#选择-agent-策略',
               'ja-JP': '/guides/workflow/node/agent#エージェント戦略の選択',
             })}
-              className='text-text-accent-secondary' target='_blank'>
+            className='text-text-accent-secondary' target='_blank'>
               {t('workflow.nodes.agent.learnMore')}
             </Link>
           </div>}
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
index 0ed79d235b..d14d26e44a 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
@@ -193,10 +193,10 @@ const FormItem: FC<Props> = ({
             language={CodeLanguage.json}
             onChange={onChange}
             noWrapper
-              className='bg h-[80px] overflow-y-auto rounded-[10px] bg-components-input-bg-normal p-1'
-              placeholder={
-                <div className='whitespace-pre'>{payload.json_schema}</div>
-              }
+            className='bg h-[80px] overflow-y-auto rounded-[10px] bg-components-input-bg-normal p-1'
+            placeholder={
+              <div className='whitespace-pre'>{payload.json_schema}</div>
+            }
           />
         )}
         {(type === InputVarType.singleFile) && (
diff --git a/web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx b/web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx
index a741629da8..ecd5e4c029 100644
--- a/web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx
+++ b/web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx
@@ -53,7 +53,6 @@ const Editor: FC<Props> = ({
 
   useEffect(() => {
     onFocusChange?.(isFocus)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFocus])
 
   return (
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
index 8117f7502f..b314082af2 100644
--- 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
@@ -11,7 +11,7 @@ const McpToolNotSupportTooltip: FC = () => {
     <Tooltip
       popupContent={
         <div className='w-[256px]'>
-        {t('plugin.detailPanel.toolSelector.unsupportedMCPTool')}
+          {t('plugin.detailPanel.toolSelector.unsupportedMCPTool')}
         </div>
       }
     >
diff --git a/web/app/components/workflow/nodes/_base/components/variable/utils.ts b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
index d96c9be6cf..474f99325f 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
@@ -694,9 +694,9 @@ const getIterationItemType = ({
       curr = Array.isArray(curr) ? curr.find(v => v.variable === key) : []
 
       if (isLast)
-      arrayType = curr?.type
+        arrayType = curr?.type
       else if (curr?.type === VarType.object || curr?.type === VarType.file)
-      curr = curr.children || []
+        curr = curr.children || []
     }
   }
 
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
index e9e45d3aad..447dfe1f40 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
@@ -55,11 +55,11 @@ const VarList: FC<Props> = ({
     const { isValid, errorKey, errorMessageKey } = checkKeys([newKey], true)
     if (!isValid) {
       setToastHandle(Toast.notify({
-          type: 'error',
-          message: t(`appDebug.varKeyError.${errorMessageKey}`, { key: errorKey }),
-        }))
-        return
-      }
+        type: 'error',
+        message: t(`appDebug.varKeyError.${errorMessageKey}`, { key: errorKey }),
+      }))
+      return
+    }
     if (list.some(item => item.variable?.trim() === newKey.trim())) {
       console.log('new key', newKey.trim())
       setToastHandle(Toast.notify({
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 21eb9b8655..7af5c5f901 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
@@ -339,7 +339,7 @@ const VarReferencePicker: FC<Props> = ({
       const data = await fetchDynamicOptions()
       setDynamicOptions(data?.options || [])
     }
- finally {
+    finally {
       setIsLoading(false)
     }
   }
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
index 264bb1e456..3594b8fdbc 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
@@ -250,7 +250,7 @@ const BasePanel: FC<BasePanelProps> = ({
 
   if(logParams.showSpecialResultPanel) {
     return (
-    <div className={cn(
+      <div className={cn(
         'relative mr-1  h-full',
       )}>
         <div
@@ -356,7 +356,7 @@ const BasePanel: FC<BasePanelProps> = ({
                     >
                       {
                         isSingleRunning ? <Stop className='h-4 w-4 text-text-tertiary' />
-                        : <RiPlayLargeLine className='h-4 w-4 text-text-tertiary' />
+                          : <RiPlayLargeLine className='h-4 w-4 text-text-tertiary' />
                       }
                     </div>
                   </Tooltip>
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
index 2ff474c0bc..e23e29c95a 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
@@ -79,11 +79,11 @@ const LastRun: FC<Props> = ({
   }, [nodeId])
 
   const handlePageVisibilityChange = useCallback(() => {
-      if (document.visibilityState === 'hidden')
-        setPageHasHide(true)
-      else
-        setPageShowed(true)
-    }, [])
+    if (document.visibilityState === 'hidden')
+      setPageHasHide(true)
+    else
+      setPageShowed(true)
+  }, [])
   useEffect(() => {
     document.addEventListener('visibilitychange', handlePageVisibilityChange)
 
diff --git a/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts b/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts
index 515f2c365b..771bfb5161 100644
--- a/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts
+++ b/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts
@@ -118,8 +118,8 @@ function useOutputVarList<T>({
   const [removedVar, setRemovedVar] = useState<ValueSelector>([])
   const removeVarInNode = useCallback(() => {
     const varId = nodesWithInspectVars.find(node => node.nodeId === id)?.vars.find((varItem) => {
-        return varItem.name === removedVar[1]
-      })?.id
+      return varItem.name === removedVar[1]
+    })?.id
     if(varId)
       deleteInspectVar(id, varId)
     removeUsedVarInNodes(removedVar)
@@ -143,8 +143,8 @@ function useOutputVarList<T>({
     setInputs(newInputs)
     onOutputKeyOrdersChange(outputKeyOrders.filter((_, i) => i !== index))
     const varId = nodesWithInspectVars.find(node => node.nodeId === id)?.vars.find((varItem) => {
-        return varItem.name === key
-      })?.id
+      return varItem.name === key
+    })?.id
     if(varId)
       deleteInspectVar(id, varId)
   }, [outputKeyOrders, isVarUsedInNodes, id, inputs, setInputs, onOutputKeyOrdersChange, nodesWithInspectVars, deleteInspectVar, showRemoveVarConfirm, varKey])
diff --git a/web/app/components/workflow/nodes/agent/panel.tsx b/web/app/components/workflow/nodes/agent/panel.tsx
index ec6fb9c506..7c87da8121 100644
--- a/web/app/components/workflow/nodes/agent/panel.tsx
+++ b/web/app/components/workflow/nodes/agent/panel.tsx
@@ -45,10 +45,10 @@ const AgentPanel: FC<NodePanelProps<AgentNodeType>> = (props) => {
   const resetEditor = useStore(s => s.setControlPromptEditorRerenderKey)
   return <div className='my-2'>
     <Field
-    required
-    title={t('workflow.nodes.agent.strategy.label')}
-    className='px-4 py-2'
-    tooltip={t('workflow.nodes.agent.strategy.tooltip')} >
+      required
+      title={t('workflow.nodes.agent.strategy.label')}
+      className='px-4 py-2'
+      tooltip={t('workflow.nodes.agent.strategy.tooltip')} >
       <AgentStrategy
         strategy={inputs.agent_strategy_name ? {
           agent_strategy_provider_name: inputs.agent_strategy_provider_name!,
diff --git a/web/app/components/workflow/nodes/agent/use-single-run-form-params.ts b/web/app/components/workflow/nodes/agent/use-single-run-form-params.ts
index 09f329b94d..b2785c39ff 100644
--- a/web/app/components/workflow/nodes/agent/use-single-run-form-params.ts
+++ b/web/app/components/workflow/nodes/agent/use-single-run-form-params.ts
@@ -76,7 +76,7 @@ const useSingleRunFormParams = ({
     return formatTracing([runResult], t)[0]
   }, [runResult, t])
 
-    const getDependentVars = () => {
+  const getDependentVars = () => {
     return varInputs.map((item) => {
       // Guard against null/undefined variable to prevent app crash
       if (!item.variable || typeof item.variable !== 'string')
diff --git a/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx b/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
index ca57b4fd12..68d4afdce8 100644
--- a/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
+++ b/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
@@ -69,7 +69,7 @@ const VarList: FC<Props> = ({
         if (item.value === WriteMode.set || item.value === WriteMode.increment || item.value === WriteMode.decrement
           || item.value === WriteMode.multiply || item.value === WriteMode.divide) {
           if(varType === VarType.boolean)
-              draft[index].value = false
+            draft[index].value = false
           draft[index].input_type = AssignerNodeInputType.constant
         }
         else {
diff --git a/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts b/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts
index 3892461c36..a61cad646f 100644
--- a/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts
+++ b/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts
@@ -31,8 +31,6 @@ const useKeyValueList = (value: string, onChange: (value: string) => void, noFil
     const newValue = list.filter(item => item.key && item.value).map(item => `${item.key}:${item.value}`).join('\n')
     if (newValue !== value)
       onChange(newValue)
-
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [list, noFilter])
   const addItem = useCallback(() => {
     setList([...list, {
diff --git a/web/app/components/workflow/nodes/http/use-config.ts b/web/app/components/workflow/nodes/http/use-config.ts
index a539a88a8b..63d14794b2 100644
--- a/web/app/components/workflow/nodes/http/use-config.ts
+++ b/web/app/components/workflow/nodes/http/use-config.ts
@@ -51,7 +51,6 @@ const useConfig = (id: string, payload: HttpNodeType) => {
       setInputs(newInputs)
       setIsDataReady(true)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultConfig])
 
   const handleMethodChange = useCallback((method: Method) => {
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx
index 3381a1f6d6..5d11bc7c6c 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx
@@ -31,7 +31,6 @@ const MetadataTrigger = ({
           handleRemoveCondition(condition.id)
       })
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [metadataList, handleRemoveCondition, selectedDatasetsLoaded])
 
   return (
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts b/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts
index 380f8b95c9..47e376cdc6 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts
@@ -172,7 +172,6 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
       }
     })
     setInputs(newInput)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentProvider?.provider, currentModel, currentRerankModel, rerankDefaultModel])
   const [selectedDatasets, setSelectedDatasets] = useState<DataSet[]>([])
   const [rerankModelOpen, setRerankModelOpen] = useState(false)
@@ -229,7 +228,6 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
       setInputs(newInputs)
       setSelectedDatasetsLoaded(true)
     })()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   useEffect(() => {
@@ -241,7 +239,6 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
     setInputs(produce(inputs, (draft) => {
       draft.query_variable_selector = query_variable_selector
     }))
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const handleOnDatasetsChange = useCallback((newDatasets: DataSet[]) => {
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
index 643059adbd..6368397b74 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
@@ -34,7 +34,6 @@ const JsonImporter: FC<JsonImporterProps> = ({
       const rect = importBtnRef.current.getBoundingClientRect()
       updateBtnWidth(rect.width)
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const handleTrigger = useCallback((e: React.MouseEvent<HTMLElement, MouseEvent>) => {
diff --git a/web/app/components/workflow/nodes/parameter-extractor/use-config.ts b/web/app/components/workflow/nodes/parameter-extractor/use-config.ts
index 3fe42b60cf..2caae83f2a 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/use-config.ts
+++ b/web/app/components/workflow/nodes/parameter-extractor/use-config.ts
@@ -155,7 +155,6 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
       return
     setModelChanged(false)
     handleVisionConfigAfterModelChanged()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isVisionModel, modelChanged])
 
   const {
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 8758490bee..fa4f4df266 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
@@ -84,10 +84,10 @@ const ClassList: FC<Props> = ({
             })()
             return (
               <div key={item.id}
-                  className={cn(
-                    'group relative rounded-[10px] bg-components-panel-bg',
-                    `-ml-${handleSideWidth} min-h-[40px] px-0 py-0`,
-              )}>
+                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')}
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 a4acf5b7f6..b4907641b5 100644
--- a/web/app/components/workflow/nodes/question-classifier/use-config.ts
+++ b/web/app/components/workflow/nodes/question-classifier/use-config.ts
@@ -88,7 +88,6 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
       return
     setModelChanged(false)
     handleVisionConfigAfterModelChanged()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isVisionModel, modelChanged])
 
   const handleQueryVarChange = useCallback((newVar: ValueSelector | string) => {
@@ -110,7 +109,6 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
         query_variable_selector: inputs.query_variable_selector.length > 0 ? inputs.query_variable_selector : query_variable_selector,
       })
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultConfig])
 
   const handleClassesChange = useCallback((newClasses: any) => {
diff --git a/web/app/components/workflow/nodes/tool/use-config.ts b/web/app/components/workflow/nodes/tool/use-config.ts
index ea8d0e21ca..c169ae71a4 100644
--- a/web/app/components/workflow/nodes/tool/use-config.ts
+++ b/web/app/components/workflow/nodes/tool/use-config.ts
@@ -140,7 +140,6 @@ const useConfig = (id: string, payload: ToolNodeType) => {
       return
     const inputsWithDefaultValue = formattingParameters()
     setInputs(inputsWithDefaultValue)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currTool])
 
   // setting when call
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 13b1da6b01..535787697e 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
@@ -61,7 +61,7 @@ const useSingleRunFormParams = ({
       Object.keys(inputs.tool_parameters).forEach((key: string) => {
         const { type, value } = inputs.tool_parameters[key]
         if (type === VarType.constant && (value === undefined || value === null)) {
-            if(!draft.tool_parameters || !draft.tool_parameters[key])
+          if(!draft.tool_parameters || !draft.tool_parameters[key])
             return
           draft[key] = value
         }
diff --git a/web/app/components/workflow/operator/export-image.tsx b/web/app/components/workflow/operator/export-image.tsx
index 546c702d64..d14014ed1e 100644
--- a/web/app/components/workflow/operator/export-image.tsx
+++ b/web/app/components/workflow/operator/export-image.tsx
@@ -122,7 +122,7 @@ const ExportImage: FC = () => {
           reactFlow.setViewport(currentViewport)
         }, 500)
       }
- else {
+      else {
         // Current viewport export (existing functionality)
         switch (type) {
           case 'png':
@@ -152,7 +152,7 @@ const ExportImage: FC = () => {
         link.click()
         document.body.removeChild(link)
       }
- else {
+      else {
         // For current view, just download
         const link = document.createElement('a')
         link.href = dataUrl
diff --git a/web/app/components/workflow/panel/inputs-panel.tsx b/web/app/components/workflow/panel/inputs-panel.tsx
index c631fa2b67..f5cdce2e7e 100644
--- a/web/app/components/workflow/panel/inputs-panel.tsx
+++ b/web/app/components/workflow/panel/inputs-panel.tsx
@@ -51,7 +51,7 @@ const InputsPanel = ({ onRun }: Props) => {
   if (startVariables) {
     startVariables.forEach((variable) => {
       if (variable.default)
-       initialInputs[variable.variable] = variable.default
+        initialInputs[variable.variable] = variable.default
     })
   }
 
diff --git a/web/app/components/workflow/panel/workflow-preview.tsx b/web/app/components/workflow/panel/workflow-preview.tsx
index 2c797e05d6..eb30fbec71 100644
--- a/web/app/components/workflow/panel/workflow-preview.tsx
+++ b/web/app/components/workflow/panel/workflow-preview.tsx
@@ -88,7 +88,7 @@ const WorkflowPreview = () => {
     <div className={
       'relative flex h-full flex-col rounded-l-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xl'
     }
-      style={{ width: `${panelWidth}px` }}
+    style={{ width: `${panelWidth}px` }}
     >
       <div
         className="absolute bottom-0 left-[3px] top-1/2 z-50 h-6 w-[3px] cursor-col-resize rounded bg-gray-300"
diff --git a/web/app/components/workflow/selection-contextmenu.tsx b/web/app/components/workflow/selection-contextmenu.tsx
index d153708bbc..e5101fb5f3 100644
--- a/web/app/components/workflow/selection-contextmenu.tsx
+++ b/web/app/components/workflow/selection-contextmenu.tsx
@@ -416,7 +416,7 @@ const SelectionContextmenu = () => {
         </div>
         <div className='h-px bg-divider-regular'></div>
         <div className='p-1'>
-            <div className='system-xs-medium px-2 py-2 text-text-tertiary'>
+          <div className='system-xs-medium px-2 py-2 text-text-tertiary'>
             {t('workflow.operator.horizontal')}
           </div>
           <div
diff --git a/web/app/components/workflow/variable-inspect/empty.tsx b/web/app/components/workflow/variable-inspect/empty.tsx
index 6b371635d7..38df10f6e3 100644
--- a/web/app/components/workflow/variable-inspect/empty.tsx
+++ b/web/app/components/workflow/variable-inspect/empty.tsx
@@ -18,7 +18,7 @@ const Empty: FC = () => {
           href='https://docs.dify.ai/en/guides/workflow/debug-and-preview/variable-inspect'
           target='_blank'
           rel='noopener noreferrer'>
-            {t('workflow.debug.variableInspect.emptyLink')}
+          {t('workflow.debug.variableInspect.emptyLink')}
         </a>
       </div>
     </div>
diff --git a/web/app/components/workflow/variable-inspect/index.tsx b/web/app/components/workflow/variable-inspect/index.tsx
index 2761dcae3c..9da35c152c 100644
--- a/web/app/components/workflow/variable-inspect/index.tsx
+++ b/web/app/components/workflow/variable-inspect/index.tsx
@@ -16,15 +16,15 @@ const VariableInspectPanel: FC = () => {
   const setVariableInspectPanelHeight = useStore(s => s.setVariableInspectPanelHeight)
 
   const maxHeight = useMemo(() => {
-      if (!workflowCanvasHeight)
-        return 480
-      return workflowCanvasHeight - 60
-    }, [workflowCanvasHeight])
+    if (!workflowCanvasHeight)
+      return 480
+    return workflowCanvasHeight - 60
+  }, [workflowCanvasHeight])
 
   const handleResize = useCallback((width: number, height: number) => {
     localStorage.setItem('workflow-variable-inpsect-panel-height', `${height}`)
     setVariableInspectPanelHeight(height)
-    }, [setVariableInspectPanelHeight])
+  }, [setVariableInspectPanelHeight])
 
   const {
     triggerRef,
diff --git a/web/app/education-apply/hooks.ts b/web/app/education-apply/hooks.ts
index 474b355166..df3ee38795 100644
--- a/web/app/education-apply/hooks.ts
+++ b/web/app/education-apply/hooks.ts
@@ -99,28 +99,28 @@ const useEducationReverifyNotice = ({
     if (isLoading || !timezone)
       return
     if (allowRefreshEducationVerify) {
-        const expired = isExpired(educationAccountExpireAt!, timezone)
-        const isExpireAtChanged = prevExpireAt !== educationAccountExpireAt
-        if (isExpireAtChanged) {
-          setPrevExpireAt(educationAccountExpireAt!)
-          setReverifyHasNoticed(false)
-          setExpiredHasNoticed(false)
-        }
-        const shouldNotice = (() => {
-          if (isExpireAtChanged)
-            return true
-          return expired ? !expiredHasNoticed : !reverifyHasNoticed
-        })()
-        if (shouldNotice) {
-          onNotice({
-            expireAt: educationAccountExpireAt!,
-            expired,
-          })
-          if (expired)
-            setExpiredHasNoticed(true)
-          else
-            setReverifyHasNoticed(true)
-        }
+      const expired = isExpired(educationAccountExpireAt!, timezone)
+      const isExpireAtChanged = prevExpireAt !== educationAccountExpireAt
+      if (isExpireAtChanged) {
+        setPrevExpireAt(educationAccountExpireAt!)
+        setReverifyHasNoticed(false)
+        setExpiredHasNoticed(false)
+      }
+      const shouldNotice = (() => {
+        if (isExpireAtChanged)
+          return true
+        return expired ? !expiredHasNoticed : !reverifyHasNoticed
+      })()
+      if (shouldNotice) {
+        onNotice({
+          expireAt: educationAccountExpireAt!,
+          expired,
+        })
+        if (expired)
+          setExpiredHasNoticed(true)
+        else
+          setReverifyHasNoticed(true)
+      }
     }
   }, [allowRefreshEducationVerify, timezone])
 
diff --git a/web/app/install/installForm.tsx b/web/app/install/installForm.tsx
index b9228865d0..8ddb5276f0 100644
--- a/web/app/install/installForm.tsx
+++ b/web/app/install/installForm.tsx
@@ -76,7 +76,7 @@ const InstallForm = () => {
       localStorage.setItem('refresh_token', loginRes.data.refresh_token)
       router.replace('/apps')
     }
- else {
+    else {
       // Fallback to signin page if auto-login fails
       router.replace('/signin')
     }
diff --git a/web/context/debug-configuration.ts b/web/context/debug-configuration.ts
index cb737c5288..bbf7be8099 100644
--- a/web/context/debug-configuration.ts
+++ b/web/context/debug-configuration.ts
@@ -233,7 +233,7 @@ const DebugConfigurationContext = createContext<IDebugConfiguration>({
       reranking_provider_name: '',
       reranking_model_name: '',
     },
-    top_k: 2,
+    top_k: 4,
     score_threshold_enabled: false,
     score_threshold: 0.7,
     datasets: {
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
index 99f85ab4cc..67b561cec0 100644
--- a/web/eslint.config.mjs
+++ b/web/eslint.config.mjs
@@ -193,11 +193,17 @@ export default combine(
       'node/prefer-global/process': 'off',
       'node/prefer-global/buffer': 'off',
       'node/no-callback-literal': 'off',
+      'eslint-comments/no-unused-disable': 'off',
+      'tailwindcss/no-arbitrary-value': 'off',
+      'tailwindcss/classnames-order': 'off',
+      'style/indent': ['error', 2, {
+        SwitchCase: 1,
+        ignoreComments: true,
 
+      }],
       // useful, but big change
       'unicorn/prefer-number-properties': 'warn',
       'unicorn/no-new-array': 'warn',
-      'style/indent': 'off',
     },
   },
   // suppress error for `no-undef` rule
diff --git a/web/i18n/de-DE/common.ts b/web/i18n/de-DE/common.ts
index 57abe75f87..70f3d97037 100644
--- a/web/i18n/de-DE/common.ts
+++ b/web/i18n/de-DE/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'Avatar entfernen',
     deleteDescription: 'Bist du sicher, dass du dein Profilbild entfernen möchtest? Dein Konto wird das standardmäßige Anfangs-Avatar verwenden.',
   },
+  feedback: {
+    content: 'Feedback-Inhalt',
+    title: 'Feedback geben',
+    subtitle: 'Bitte sagen Sie uns, was mit dieser Antwort falsch gelaufen ist.',
+    placeholder: 'Bitte beschreiben Sie, was schiefgelaufen ist oder wie wir uns verbessern können...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/de-DE/oauth.ts b/web/i18n/de-DE/oauth.ts
index 6eb684fa3c..7478a4afd5 100644
--- a/web/i18n/de-DE/oauth.ts
+++ b/web/i18n/de-DE/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     common: 'Wir respektieren Ihre Privatsphäre und werden diese Informationen nur verwenden, um Ihre Erfahrung mit unseren Entwickler-Tools zu verbessern.',
-    notLoggedIn: 'möchte auf Ihr Dify Cloud-Konto zugreifen',
-    loggedIn: 'möchte auf die folgenden Informationen aus Ihrem Dify Cloud-Konto zugreifen.',
+    notLoggedIn: 'Diese App möchte auf Ihr Dify Cloud-Konto zugreifen',
+    loggedIn: 'Diese App möchte auf die folgenden Informationen aus Ihrem Dify Cloud-Konto zugreifen.',
     needLogin: 'Bitte melden Sie sich an, um zu autorisieren.',
   },
   scopes: {
@@ -21,7 +21,7 @@ const translation = {
   login: 'Anmelden',
   unknownApp: 'Unbekannte App',
   continue: 'Fortsetzen',
-  connect: 'Verbinde zu',
+  connect: 'Verbinden mit',
 }
 
 export default translation
diff --git a/web/i18n/en-US/common.ts b/web/i18n/en-US/common.ts
index 8cbc05d1f4..2f0082edd0 100644
--- a/web/i18n/en-US/common.ts
+++ b/web/i18n/en-US/common.ts
@@ -319,6 +319,12 @@ const translation = {
       transfer: 'Transfer workspace ownership',
     },
   },
+  feedback: {
+    title: 'Provide Feedback',
+    subtitle: 'Please tell us what went wrong with this response',
+    content: 'Feedback Content',
+    placeholder: 'Please describe what went wrong or how we can improve...',
+  },
   integrations: {
     connected: 'Connected',
     google: 'Google',
diff --git a/web/i18n/en-US/oauth.ts b/web/i18n/en-US/oauth.ts
index ff71487fcd..5215330587 100644
--- a/web/i18n/en-US/oauth.ts
+++ b/web/i18n/en-US/oauth.ts
@@ -1,7 +1,7 @@
 const translation = {
   tips: {
-    loggedIn: 'wants to access the following information from your Dify Cloud account.',
-    notLoggedIn: 'wants to access your Dify Cloud account',
+    loggedIn: 'This app wants to access the following information from your Dify Cloud account.',
+    notLoggedIn: 'This app wants to access your Dify Cloud account',
     needLogin: 'Please log in to authorize',
     common: 'We respect your privacy and will only use this information to enhance your experience with our developer tools.',
   },
@@ -18,7 +18,7 @@ const translation = {
   },
   error: {
     invalidParams: 'Invalid parameters',
-    authorizeFailed: 'Authorize failed',
+    authorizeFailed: 'Authorization failed',
     authAppInfoFetchFailed: 'Failed to fetch app info for authorization',
   },
   unknownApp: 'Unknown App',
diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts
index c2836ce194..75b71b971b 100644
--- a/web/i18n/en-US/workflow.ts
+++ b/web/i18n/en-US/workflow.ts
@@ -952,7 +952,7 @@ const translation = {
       updateSuccess: 'Version updated',
       updateFailure: 'Failed to update version',
       copyIdSuccess: 'ID copied to clipboard',
-      },
+    },
   },
   debug: {
     settingsTab: 'Settings',
diff --git a/web/i18n/es-ES/common.ts b/web/i18n/es-ES/common.ts
index a77705ecf2..d17f1117ef 100644
--- a/web/i18n/es-ES/common.ts
+++ b/web/i18n/es-ES/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'Eliminar Avatar',
     deleteDescription: '¿Estás seguro de que deseas eliminar tu foto de perfil? Tu cuenta usará el avatar inicial predeterminado.',
   },
+  feedback: {
+    title: 'Proporcionar retroalimentación',
+    subtitle: 'Por favor, díganos qué salió mal con esta respuesta.',
+    placeholder: 'Por favor, describe qué salió mal o cómo podemos mejorar...',
+    content: 'Contenido de retroalimentación',
+  },
 }
 
 export default translation
diff --git a/web/i18n/es-ES/oauth.ts b/web/i18n/es-ES/oauth.ts
index fe6093ebf7..23d7eaa895 100644
--- a/web/i18n/es-ES/oauth.ts
+++ b/web/i18n/es-ES/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: 'Por favor inicie sesión para autorizar',
-    notLoggedIn: 'quiere acceder a su cuenta de Dify Cloud',
-    loggedIn: 'quiere acceder a la siguiente información de su cuenta de Dify Cloud.',
+    notLoggedIn: 'Esta aplicación quiere acceder a su cuenta de Dify Cloud',
+    loggedIn: 'Esta aplicación quiere acceder a la siguiente información de su cuenta de Dify Cloud.',
     common: 'Respetamos su privacidad y solo utilizaremos esta información para mejorar su experiencia con nuestras herramientas para desarrolladores.',
   },
   scopes: {
diff --git a/web/i18n/fa-IR/common.ts b/web/i18n/fa-IR/common.ts
index 3d240f4594..84bda8dfa5 100644
--- a/web/i18n/fa-IR/common.ts
+++ b/web/i18n/fa-IR/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'حذف آواتار',
     deleteDescription: 'آیا مطمئن هستید که می‌خواهید تصویر پروفایل خود را حذف کنید؟ حساب شما از آواتار اولیه پیش‌فرض استفاده خواهد کرد.',
   },
+  feedback: {
+    title: 'بازخورد ارائه دهید',
+    subtitle: 'لطفاً به ما بگویید که چه مشکلی در این پاسخ پیش آمده است.',
+    content: 'محتوای بازخورد',
+    placeholder: 'لطفاً توضیح دهید که چه مشکلی پیش آمد یا چگونه می‌توانیم بهبود پیدا کنیم...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/fa-IR/oauth.ts b/web/i18n/fa-IR/oauth.ts
index cb8ea498fa..380b4f78b5 100644
--- a/web/i18n/fa-IR/oauth.ts
+++ b/web/i18n/fa-IR/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: 'لطفاً برای تأیید وارد شوید',
-    notLoggedIn: 'می‌خواهد به حساب Dify Cloud شما دسترسی پیدا کند',
-    loggedIn: 'می‌خواهد به اطلاعات زیر از حساب ابر دیفی شما دسترسی پیدا کند.',
+    notLoggedIn: 'این برنامه می‌خواهد به حساب Dify Cloud شما دسترسی پیدا کند',
+    loggedIn: 'این برنامه می‌خواهد به اطلاعات زیر از حساب ابر دیفی شما دسترسی پیدا کند.',
     common: 'ما به حریم خصوصی شما احترام می‌گذاریم و تنها از این اطلاعات برای بهبود تجربه شما با ابزارهای توسعه‌دهنده‌مان استفاده خواهیم کرد.',
   },
   scopes: {
diff --git a/web/i18n/fr-FR/common.ts b/web/i18n/fr-FR/common.ts
index ac6f4c025f..7814b0206c 100644
--- a/web/i18n/fr-FR/common.ts
+++ b/web/i18n/fr-FR/common.ts
@@ -743,6 +743,12 @@ const translation = {
     deleteTitle: 'Supprimer l\'avatar',
     deleteDescription: 'Êtes-vous sûr de vouloir supprimer votre photo de profil ? Votre compte utilisera l\'avatar par défaut.',
   },
+  feedback: {
+    content: 'Contenu des retours',
+    title: 'Fournir des retours',
+    placeholder: 'Veuillez décrire ce qui n\'a pas fonctionné ou comment nous pourrions nous améliorer...',
+    subtitle: 'Veuillez nous dire ce qui n\'a pas fonctionné avec cette réponse.',
+  },
 }
 
 export default translation
diff --git a/web/i18n/fr-FR/oauth.ts b/web/i18n/fr-FR/oauth.ts
index b2fa71e143..7ce46b9d5e 100644
--- a/web/i18n/fr-FR/oauth.ts
+++ b/web/i18n/fr-FR/oauth.ts
@@ -1,9 +1,9 @@
 const translation = {
   tips: {
     needLogin: 'Veuillez vous connecter pour autoriser',
-    notLoggedIn: 'veut accéder à votre compte Dify Cloud',
+    notLoggedIn: 'Cette application veut accéder à votre compte Dify Cloud',
     common: 'Nous respectons votre vie privée et n\'utiliserons ces informations que pour améliorer votre expérience avec nos outils de développement.',
-    loggedIn: 'veut accéder aux informations suivantes de votre compte Dify Cloud.',
+    loggedIn: 'Cette application veut accéder aux informations suivantes de votre compte Dify Cloud.',
   },
   scopes: {
     email: 'E-mail',
diff --git a/web/i18n/hi-IN/common.ts b/web/i18n/hi-IN/common.ts
index 3115cda56a..a2de883cd9 100644
--- a/web/i18n/hi-IN/common.ts
+++ b/web/i18n/hi-IN/common.ts
@@ -764,6 +764,12 @@ const translation = {
     deleteTitle: 'अवतार हटाएँ',
     deleteDescription: 'क्या आप सुनिश्चित हैं कि आप अपनी प्रोफ़ाइल तस्वीर को हटाना चाहते हैं? आपका खाता डिफ़ॉल्ट प्रारंभिक अवतार का उपयोग करेगा।',
   },
+  feedback: {
+    content: 'प्रतिक्रिया सामग्री',
+    title: 'प्रतिक्रिया प्रदान करें',
+    subtitle: 'कृपया हमें बताएं कि इस प्रतिक्रिया में क्या गलत हुआ',
+    placeholder: 'कृपया बताएं कि क्या गलत हुआ या हम कैसे सुधार कर सकते हैं...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/hi-IN/oauth.ts b/web/i18n/hi-IN/oauth.ts
index 7cdba1fe5b..a2e7bb9e36 100644
--- a/web/i18n/hi-IN/oauth.ts
+++ b/web/i18n/hi-IN/oauth.ts
@@ -1,9 +1,9 @@
 const translation = {
   tips: {
     needLogin: 'कृपया प्राधिकरण के लिए लॉग इन करें',
-    notLoggedIn: 'आप आपके Dify Cloud खाते तक पहुंचना चाहते हैं',
+    notLoggedIn: 'यह ऐप आपके Dify Cloud खाते तक पहुंचना चाहता है',
     common: 'हम आपकी गोपनीयता का सम्मान करते हैं और इस जानकारी का उपयोग केवल आपके हमारे विकास उपकरणों के साथ अनुभव को बेहतर बनाने के लिए करेंगे।',
-    loggedIn: 'आप आपके Dify Cloud खाते से निम्नलिखित जानकारी तक पहुंचना चाहते हैं।',
+    loggedIn: 'यह ऐप आपके Dify Cloud खाते से निम्नलिखित जानकारी तक पहुंचना चाहता है।',
   },
   scopes: {
     name: 'नाम',
@@ -13,7 +13,7 @@ const translation = {
     timezone: 'समय क्षेत्र',
   },
   error: {
-    authorizeFailed: 'अनु autorización विफल',
+    authorizeFailed: 'प्राधिकरण विफल',
     invalidParams: 'अमान्य पैरामीटर',
     authAppInfoFetchFailed: 'प्राधिकरण के लिए ऐप जानकारी प्राप्त करने में असफल हुआ',
   },
diff --git a/web/i18n/it-IT/common.ts b/web/i18n/it-IT/common.ts
index 4c2d7dc75e..820928bb36 100644
--- a/web/i18n/it-IT/common.ts
+++ b/web/i18n/it-IT/common.ts
@@ -772,6 +772,12 @@ const translation = {
     deleteTitle: 'Rimuovi avatar',
     deleteDescription: 'Sei sicuro di voler rimuovere la tua immagine del profilo? Il tuo account utilizzerà l\'avatar iniziale predefinito.',
   },
+  feedback: {
+    title: 'Fornire feedback',
+    content: 'Contenuto del feedback',
+    subtitle: 'Per favore, dicci cosa è andato storto con questa risposta.',
+    placeholder: 'Per favore descrivi cosa è andato storto o come possiamo migliorare...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/it-IT/oauth.ts b/web/i18n/it-IT/oauth.ts
index 3955a3997e..4220666a9a 100644
--- a/web/i18n/it-IT/oauth.ts
+++ b/web/i18n/it-IT/oauth.ts
@@ -1,7 +1,7 @@
 const translation = {
   tips: {
-    notLoggedIn: 'vuole accedere al tuo account Dify Cloud',
-    loggedIn: 'vuole accedere alle seguenti informazioni dal tuo account Dify Cloud.',
+    notLoggedIn: 'Questa app vuole accedere al tuo account Dify Cloud',
+    loggedIn: 'Questa app vuole accedere alle seguenti informazioni dal tuo account Dify Cloud.',
     common: 'Rispettiamo la tua privacy e utilizzeremo queste informazioni solo per migliorare la tua esperienza con i nostri strumenti per sviluppatori.',
     needLogin: 'Per favore, accedi per autorizzare',
   },
diff --git a/web/i18n/ja-JP/common.ts b/web/i18n/ja-JP/common.ts
index f8e5643b37..ea303d86ea 100644
--- a/web/i18n/ja-JP/common.ts
+++ b/web/i18n/ja-JP/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'アバターを削除する',
     deleteDescription: '本当にプロフィール写真を削除してもよろしいですか？あなたのアカウントはデフォルトの初期アバターを使用します。',
   },
+  feedback: {
+    content: 'フィードバックコンテンツ',
+    title: 'フィードバックを提供する',
+    subtitle: 'この回答で何が間違っていたのか教えてください。',
+    placeholder: '何が間違っていたか、またはどのように改善できるかを教えてください...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ja-JP/oauth.ts b/web/i18n/ja-JP/oauth.ts
index 239892c03e..54322e1a48 100644
--- a/web/i18n/ja-JP/oauth.ts
+++ b/web/i18n/ja-JP/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
-    notLoggedIn: 'あなたのDify Cloudアカウントにアクセスしたいです',
+    notLoggedIn: 'このアプリはあなたのDify Cloudアカウントにアクセスしたいです',
     needLogin: 'ログインして認証してください',
-    loggedIn: 'あなたのDify Cloudアカウントから以下の情報にアクセスしたいと思っています。',
+    loggedIn: 'このアプリはあなたのDify Cloudアカウントから以下の情報にアクセスしたいと思っています。',
     common: '私たちはあなたのプライバシーを尊重し、この情報を私たちの開発者ツールによる体験を向上させるためにのみ使用します。',
   },
   scopes: {
@@ -17,10 +17,10 @@ const translation = {
     invalidParams: '無効なパラメータ',
     authAppInfoFetchFailed: '認証のためのアプリ情報の取得に失敗しました',
   },
-  unknownApp: '未知のアプリ',
+  unknownApp: '不明なアプリ',
   login: 'ログイン',
   switchAccount: 'アカウントを切り替える',
-  continue: '続けてください',
+  continue: '続行',
   connect: '接続する',
 }
 
diff --git a/web/i18n/ko-KR/common.ts b/web/i18n/ko-KR/common.ts
index 8b854fe050..3cb9d4bc59 100644
--- a/web/i18n/ko-KR/common.ts
+++ b/web/i18n/ko-KR/common.ts
@@ -738,6 +738,12 @@ const translation = {
     deleteTitle: '아바타 제거하기',
     deleteDescription: '프로필 사진을 제거하시겠습니까? 귀하의 계정은 기본 초기 아바타를 사용하게 됩니다.',
   },
+  feedback: {
+    content: '피드백 내용',
+    title: '피드백 제공하기',
+    subtitle: '이 응답에서 무엇이 잘못되었는지 말씀해 주세요.',
+    placeholder: '문제가 무엇인지 또는 어떻게 개선할 수 있는지 설명해 주십시오...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ko-KR/oauth.ts b/web/i18n/ko-KR/oauth.ts
index 7f86a20ce0..5c13240823 100644
--- a/web/i18n/ko-KR/oauth.ts
+++ b/web/i18n/ko-KR/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: '로그인하여 인증해 주세요.',
-    notLoggedIn: 'Dify Cloud 계정에 접근하고 싶어합니다.',
-    loggedIn: '다음 정보를 귀하의 Dify Cloud 계정에서 액세스하려고 합니다.',
+    notLoggedIn: '이 앱은 Dify Cloud 계정에 접근하고 싶어합니다.',
+    loggedIn: '이 앱은 다음 정보를 귀하의 Dify Cloud 계정에서 액세스하려고 합니다.',
     common: '우리는 귀하의 개인 정보를 존중하며, 이 정보를 개발자 도구를 통한 귀하의 경험 향상에만 사용할 것입니다.',
   },
   scopes: {
@@ -17,11 +17,11 @@ const translation = {
     authorizeFailed: '권한 부여 실패',
     authAppInfoFetchFailed: '인증을 위한 앱 정보를 가져오지 못했습니다.',
   },
-  continue: '계속하다',
+  continue: '계속',
   unknownApp: '알 수 없는 앱',
   switchAccount: '계정 전환',
   login: '로그인',
-  connect: '연결하다',
+  connect: '연결',
 }
 
 export default translation
diff --git a/web/i18n/pl-PL/common.ts b/web/i18n/pl-PL/common.ts
index 1e97c1218f..bc6ecbfc66 100644
--- a/web/i18n/pl-PL/common.ts
+++ b/web/i18n/pl-PL/common.ts
@@ -760,6 +760,12 @@ const translation = {
     deleteTitle: 'Usuń awatar',
     deleteDescription: 'Czy na pewno chcesz usunąć swoje zdjęcie profilowe? Twoje konto będzie używać domyślnego, początkowego awatara.',
   },
+  feedback: {
+    title: 'Przekaż opinie',
+    content: 'Treść opinii',
+    subtitle: 'Proszę powiedz nam, co poszło nie tak z tą odpowiedzią.',
+    placeholder: 'Proszę opisać, co poszło nie tak lub jak możemy poprawić...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/pl-PL/oauth.ts b/web/i18n/pl-PL/oauth.ts
index e8cf0a5f62..2136b29c90 100644
--- a/web/i18n/pl-PL/oauth.ts
+++ b/web/i18n/pl-PL/oauth.ts
@@ -1,9 +1,9 @@
 const translation = {
   tips: {
     needLogin: 'Proszę się zalogować, aby autoryzować',
-    notLoggedIn: 'chce uzyskać dostęp do twojego konta Dify Cloud',
+    notLoggedIn: 'Ta aplikacja chce uzyskać dostęp do twojego konta Dify Cloud',
     common: 'Szanujemy Twoją prywatność i będziemy wykorzystywać te informacje tylko w celu ulepszenia Twojego doświadczenia z naszymi narzędziami deweloperskimi.',
-    loggedIn: 'chce uzyskać dostęp do następujących informacji z twojego konta Dify Cloud.',
+    loggedIn: 'Ta aplikacja chce uzyskać dostęp do następujących informacji z twojego konta Dify Cloud.',
   },
   scopes: {
     timezone: 'Strefa czasowa',
diff --git a/web/i18n/pt-BR/common.ts b/web/i18n/pt-BR/common.ts
index 6f900dbaf3..d27702fb83 100644
--- a/web/i18n/pt-BR/common.ts
+++ b/web/i18n/pt-BR/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'Remover Avatar',
     deleteDescription: 'Você tem certeza de que deseja remover sua foto de perfil? Sua conta usará o avatar padrão inicial.',
   },
+  feedback: {
+    title: 'Fornecer feedback',
+    content: 'Conteúdo do feedback',
+    subtitle: 'Por favor, nos diga o que deu errado com esta resposta',
+    placeholder: 'Por favor, descreva o que deu errado ou como podemos melhorar...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/pt-BR/oauth.ts b/web/i18n/pt-BR/oauth.ts
index 2e45480f29..eba5d4e738 100644
--- a/web/i18n/pt-BR/oauth.ts
+++ b/web/i18n/pt-BR/oauth.ts
@@ -1,7 +1,7 @@
 const translation = {
   tips: {
-    notLoggedIn: 'quer acessar sua conta do Dify Cloud',
-    loggedIn: 'quer acessar as seguintes informações da sua conta Dify Cloud.',
+    notLoggedIn: 'Este aplicativo quer acessar sua conta do Dify Cloud',
+    loggedIn: 'Este aplicativo quer acessar as seguintes informações da sua conta Dify Cloud.',
     common: 'Respeitamos sua privacidade e usaremos essas informações apenas para melhorar sua experiência com nossas ferramentas de desenvolvedor.',
     needLogin: 'Por favor, faça login para autorizar',
   },
diff --git a/web/i18n/ro-RO/common.ts b/web/i18n/ro-RO/common.ts
index f4e59de2e2..5fa8a9e2b2 100644
--- a/web/i18n/ro-RO/common.ts
+++ b/web/i18n/ro-RO/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteDescription: 'Ești sigur că vrei să îți ștergi fotografia de profil? Contul tău va folosi avatarul inițial implicit.',
     deleteTitle: 'Îndepărtează avatarul',
   },
+  feedback: {
+    content: 'Conținut de feedback',
+    subtitle: 'Te rog să ne spui ce a mers prost cu acest răspuns',
+    placeholder: 'Vă rugăm să descrieți ce a mers prost sau cum putem îmbunătăți...',
+    title: 'Oferiți feedback',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ro-RO/oauth.ts b/web/i18n/ro-RO/oauth.ts
index 0eb9222093..c21322d2f2 100644
--- a/web/i18n/ro-RO/oauth.ts
+++ b/web/i18n/ro-RO/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: 'Vă rugăm să vă conectați pentru a autoriza',
-    loggedIn: 'vrea să acceseze următoarele informații din contul tău Dify Cloud.',
-    notLoggedIn: 'vrea să acceseze contul tău Dify Cloud',
+    loggedIn: 'Această aplicație vrea să acceseze următoarele informații din contul tău Dify Cloud.',
+    notLoggedIn: 'Această aplicație vrea să acceseze contul tău Dify Cloud',
     common: 'Respectăm confidențialitatea dvs. și vom folosi aceste informații doar pentru a îmbunătăți experiența dvs. cu instrumentele noastre pentru dezvoltatori.',
   },
   scopes: {
diff --git a/web/i18n/ru-RU/common.ts b/web/i18n/ru-RU/common.ts
index 0dfa0c5257..b44b9a345a 100644
--- a/web/i18n/ru-RU/common.ts
+++ b/web/i18n/ru-RU/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'Удалить аватар',
     deleteDescription: 'Вы уверены, что хотите удалить свою фотографию профиля? Ваш аккаунт будет использовать стандартный аватар.',
   },
+  feedback: {
+    title: 'Оставить отзыв',
+    content: 'Содержимое обратной связи',
+    placeholder: 'Пожалуйста, опишите, что пошло не так или как мы можем улучшиться...',
+    subtitle: 'Пожалуйста, сообщите нам, что пошло не так с этим ответом',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ru-RU/oauth.ts b/web/i18n/ru-RU/oauth.ts
index 26a84100d5..d530b8c780 100644
--- a/web/i18n/ru-RU/oauth.ts
+++ b/web/i18n/ru-RU/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: 'Пожалуйста, войдите, чтобы авторизоваться',
-    notLoggedIn: 'хочет получить доступ к вашей учетной записи Dify Cloud',
-    loggedIn: 'хочет получить следующую информацию из вашего аккаунта Dify Cloud.',
+    notLoggedIn: 'Это приложение хочет получить доступ к вашей учетной записи Dify Cloud',
+    loggedIn: 'Это приложение хочет получить следующую информацию из вашего аккаунта Dify Cloud.',
     common: 'Мы уважаем вашу конфиденциальность и будем использовать эту информацию только для улучшения вашего опыта с нашими инструментами разработчика.',
   },
   scopes: {
@@ -17,7 +17,7 @@ const translation = {
     authorizeFailed: 'Авторизация не удалась',
     authAppInfoFetchFailed: 'Не удалось получить информацию об приложении для авторизации',
   },
-  continue: 'Продолжайте',
+  continue: 'Продолжить',
   connect: 'Подключиться к',
   switchAccount: 'Сменить аккаунт',
   unknownApp: 'Неизвестное приложение',
diff --git a/web/i18n/sl-SI/common.ts b/web/i18n/sl-SI/common.ts
index 6d81e54078..09e39b41f1 100644
--- a/web/i18n/sl-SI/common.ts
+++ b/web/i18n/sl-SI/common.ts
@@ -823,6 +823,12 @@ const translation = {
     deleteTitle: 'Odstrani avatar',
     deleteDescription: 'Ali ste prepričani, da želite odstraniti svojo profilno sliko? Vaš račun bo uporabljal privzeti začetni avatar.',
   },
+  feedback: {
+    title: 'Posreduj povratne informacije',
+    content: 'Vsebina povratnih informacij',
+    placeholder: 'Prosimo, opišite, kaj je šlo narobe ali kako lahko izboljšamo ...',
+    subtitle: 'Prosim, povejte nam, kaj je šlo narobe s tem odzivom.',
+  },
 }
 
 export default translation
diff --git a/web/i18n/sl-SI/oauth.ts b/web/i18n/sl-SI/oauth.ts
index 2a99e1a6e3..f03bfadd50 100644
--- a/web/i18n/sl-SI/oauth.ts
+++ b/web/i18n/sl-SI/oauth.ts
@@ -1,7 +1,7 @@
 const translation = {
   tips: {
-    notLoggedIn: 'želi dostopati do vašega Dify Cloud računa',
-    loggedIn: 'želi dostopati do naslednjih informacij iz vašega računa Dify Cloud.',
+    notLoggedIn: 'Ta aplikacija želi dostopati do vašega Dify Cloud računa',
+    loggedIn: 'Ta aplikacija želi dostopati do naslednjih informacij iz vašega računa Dify Cloud.',
     common: 'Soočamo se z vašo zasebnostjo in te informacije bomo uporabili le za izboljšanje vaših izkušenj z našimi orodji za razvijalce.',
     needLogin: 'Prosimo, prijavite se za avtorizacijo',
   },
diff --git a/web/i18n/th-TH/common.ts b/web/i18n/th-TH/common.ts
index 4869a5a0b8..db30f103b3 100644
--- a/web/i18n/th-TH/common.ts
+++ b/web/i18n/th-TH/common.ts
@@ -737,6 +737,12 @@ const translation = {
     deleteTitle: 'ลบอวตาร',
     deleteDescription: 'คุณแน่ใจหรือไม่ว่าต้องการลบรูปโปรไฟล์ของคุณ? บัญชีของคุณจะใช้รูปโปรไฟล์เริ่มต้นตามค่าเริ่มต้น.',
   },
+  feedback: {
+    content: 'เนื้อหาข้อเสนอแนะ',
+    title: 'ให้ข้อเสนอแนะ',
+    placeholder: 'กรุณาบรรยายสิ่งที่ผิดพลาดหรือวิธีที่เราสามารถปรับปรุงได้...',
+    subtitle: 'กรุณาบอกเราว่าเกิดอะไรขึ้นผิดพลาดกับการตอบนี้',
+  },
 }
 
 export default translation
diff --git a/web/i18n/th-TH/oauth.ts b/web/i18n/th-TH/oauth.ts
index 74b5d123f1..626510b684 100644
--- a/web/i18n/th-TH/oauth.ts
+++ b/web/i18n/th-TH/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: 'โปรดเข้าสู่ระบบเพื่ออนุญาต',
-    notLoggedIn: 'ต้องการเข้าถึงบัญชี Dify Cloud ของคุณ',
-    loggedIn: 'ต้องการเข้าถึงข้อมูลต่อไปนี้จากบัญชี Dify Cloud ของคุณ.',
+    notLoggedIn: 'แอปพลิเคชันนี้ต้องการเข้าถึงบัญชี Dify Cloud ของคุณ',
+    loggedIn: 'แอปพลิเคชันนี้ต้องการเข้าถึงข้อมูลต่อไปนี้จากบัญชี Dify Cloud ของคุณ.',
     common: 'เรามีความเคารพต่อความเป็นส่วนตัวของคุณและจะใช้ข้อมูลนี้เพื่อปรับปรุงประสบการณ์ของคุณกับเครื่องมือนักพัฒนาของเราเท่านั้น.',
   },
   scopes: {
diff --git a/web/i18n/tr-TR/common.ts b/web/i18n/tr-TR/common.ts
index a5ea56f10e..2ecd18f787 100644
--- a/web/i18n/tr-TR/common.ts
+++ b/web/i18n/tr-TR/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'Avatarı kaldır',
     deleteDescription: 'Profil resminizi kaldırmak istediğinize emin misiniz? Hesabınız varsayılan başlangıç avatarını kullanacaktır.',
   },
+  feedback: {
+    content: 'Geri Bildirim İçeriği',
+    subtitle: 'Lütfen bu yanıtla ilgili neyin yanlış gittiğini bize bildirin',
+    title: 'Geri Bildirim Sağla',
+    placeholder: 'Lütfen neyin yanlış gittiğini veya nasıl iyileşebileceğimizı açıklayın...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/tr-TR/oauth.ts b/web/i18n/tr-TR/oauth.ts
index 65196bcfe3..3f71cdf483 100644
--- a/web/i18n/tr-TR/oauth.ts
+++ b/web/i18n/tr-TR/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
-    notLoggedIn: 'Dify Cloud hesabınıza erişmek istiyor',
+    notLoggedIn: 'Bu uygulama Dify Cloud hesabınıza erişmek istiyor',
     common: 'Gizliliğinize saygı gösteriyoruz ve bu bilgiyi yalnızca geliştirici araçlarımızla deneyiminizi geliştirmek için kullanacağız.',
-    loggedIn: 'Dify Cloud hesabınızdaki aşağıdaki bilgilere erişmek istiyor.',
+    loggedIn: 'Bu uygulama Dify Cloud hesabınızdaki aşağıdaki bilgilere erişmek istiyor.',
     needLogin: 'Lütfen yetkilendirmek için giriş yapın',
   },
   scopes: {
diff --git a/web/i18n/uk-UA/common.ts b/web/i18n/uk-UA/common.ts
index c40b330eb4..bff6634aff 100644
--- a/web/i18n/uk-UA/common.ts
+++ b/web/i18n/uk-UA/common.ts
@@ -743,6 +743,12 @@ const translation = {
     deleteTitle: 'Видалити аватар',
     deleteDescription: 'Ви впевнені, що хочете видалити своє фото профілю? Ваш обліковий запис використовуватиме стандартний початковий аватар.',
   },
+  feedback: {
+    title: 'Надати відгук',
+    content: 'Зміст відгуку',
+    placeholder: 'Будь ласка, опишіть, що пішло не так або як ми можемо покращити...',
+    subtitle: 'Будь ласка, скажіть нам, що пішло не так з цим відповіді',
+  },
 }
 
 export default translation
diff --git a/web/i18n/uk-UA/oauth.ts b/web/i18n/uk-UA/oauth.ts
index 0fc6018059..a2510c6efe 100644
--- a/web/i18n/uk-UA/oauth.ts
+++ b/web/i18n/uk-UA/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
-    notLoggedIn: 'хоче отримати доступ до вашого облікового запису Dify Cloud',
+    notLoggedIn: 'Цей додаток хоче отримати доступ до вашого облікового запису Dify Cloud',
     needLogin: 'Будь ласка, увійдіть, щоб авторизуватися.',
-    loggedIn: 'хоче отримати доступ до наступної інформації з вашого облікового запису Dify Cloud.',
+    loggedIn: 'Цей додаток хоче отримати доступ до наступної інформації з вашого облікового запису Dify Cloud.',
     common: 'Ми поважаємо вашу конфіденційність і використовуватимемо цю інформацію лише для покращення вашого досвіду з нашими інструментами для розробників.',
   },
   scopes: {
diff --git a/web/i18n/vi-VN/common.ts b/web/i18n/vi-VN/common.ts
index 60cf113ab2..40e3917a97 100644
--- a/web/i18n/vi-VN/common.ts
+++ b/web/i18n/vi-VN/common.ts
@@ -742,6 +742,12 @@ const translation = {
     deleteTitle: 'Xóa Ảnh Đại Diện',
     deleteDescription: 'Bạn có chắc chắn muốn xóa ảnh đại diện của mình không? Tài khoản của bạn sẽ sử dụng avatar mặc định.',
   },
+  feedback: {
+    content: 'Nội dung phản hồi',
+    title: 'Cung cấp phản hồi',
+    placeholder: 'Xin vui lòng miêu tả những gì đã xảy ra không đúng hoặc chúng tôi có thể cải thiện như thế nào...',
+    subtitle: 'Xin vui lòng cho chúng tôi biết điều gì đã sai với phản hồi này',
+  },
 }
 
 export default translation
diff --git a/web/i18n/vi-VN/oauth.ts b/web/i18n/vi-VN/oauth.ts
index 2c1c9ba37d..dc4c1b39bc 100644
--- a/web/i18n/vi-VN/oauth.ts
+++ b/web/i18n/vi-VN/oauth.ts
@@ -1,8 +1,8 @@
 const translation = {
   tips: {
     needLogin: 'Vui lòng đăng nhập để xác thực',
-    notLoggedIn: 'muốn truy cập vào tài khoản Dify Cloud của bạn',
-    loggedIn: 'muốn truy cập thông tin sau từ tài khoản Dify Cloud của bạn.',
+    notLoggedIn: 'Ứng dụng này muốn truy cập vào tài khoản Dify Cloud của bạn',
+    loggedIn: 'Ứng dụng này muốn truy cập thông tin sau từ tài khoản Dify Cloud của bạn.',
     common: 'Chúng tôi tôn trọng quyền riêng tư của bạn và sẽ chỉ sử dụng thông tin này để cải thiện trải nghiệm của bạn với các công cụ phát triển của chúng tôi.',
   },
   scopes: {
diff --git a/web/i18n/zh-Hans/common.ts b/web/i18n/zh-Hans/common.ts
index 8d24aa264e..5d9f01834b 100644
--- a/web/i18n/zh-Hans/common.ts
+++ b/web/i18n/zh-Hans/common.ts
@@ -742,6 +742,12 @@ const translation = {
     supportedFormats: '支持 PNG、JPG、JPEG、WEBP 和 GIF 格式',
   },
   you: '你',
+  feedback: {
+    content: '反馈内容',
+    subtitle: '请告诉我们这次回应出错的原因。',
+    title: '提供反馈',
+    placeholder: '请描述发生了什么问题或我们可以如何改进...',
+  },
 }
 
 export default translation
diff --git a/web/i18n/zh-Hant/common.ts b/web/i18n/zh-Hant/common.ts
index 009bd5ad30..de00c9ca83 100644
--- a/web/i18n/zh-Hant/common.ts
+++ b/web/i18n/zh-Hant/common.ts
@@ -489,6 +489,7 @@ const translation = {
       configLoadBalancing: '配置負載均衡',
       unAuthorized: '未經授權',
       authorizationError: '授權錯誤',
+      providerManagedTip: '當前的配置由提供者主辦。',
     },
   },
   dataSource: {
@@ -741,6 +742,12 @@ const translation = {
     deleteTitle: '移除頭像',
     deleteDescription: '您確定要刪除您的個人資料照片嗎？您的帳戶將使用默認的初始頭像。',
   },
+  feedback: {
+    title: '提供反饋',
+    content: '反饋內容',
+    placeholder: '請描述發生了什麼問題或我們可以如何改進...',
+    subtitle: '請告訴我們這個回應出了什麼問題',
+  },
 }
 
 export default translation
diff --git a/web/i18n/zh-Hant/dataset-settings.ts b/web/i18n/zh-Hant/dataset-settings.ts
index 9068706762..06295993ed 100644
--- a/web/i18n/zh-Hant/dataset-settings.ts
+++ b/web/i18n/zh-Hant/dataset-settings.ts
@@ -16,7 +16,7 @@ const translation = {
     indexMethodHighQuality: '高質量',
     indexMethodHighQualityTip: '使用 Embedding 模型進行處理，以在使用者查詢時提供更高的準確度。',
     indexMethodEconomy: '經濟',
-    indexMethodEconomyTip: '使用離線的向量引擎、關鍵詞索引等方式，降低了準確度但無需花費 Token',
+    indexMethodEconomyTip: '每個區塊使用 10 個關鍵字進行檢索，不會消耗 tokens，但可能會降低檢索的準確度。',
     embeddingModel: 'Embedding 模型',
     embeddingModelTip: '修改 Embedding 模型，請去',
     embeddingModelTipLink: '設定',
diff --git a/web/next.config.js b/web/next.config.js
index 6920a47fbf..e039ba9284 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -1,4 +1,3 @@
-const { basePath, assetPrefix } = require('./utils/var-basePath')
 const { codeInspectorPlugin } = require('code-inspector-plugin')
 const withMDX = require('@next/mdx')({
   extension: /\.mdx?$/,
@@ -24,8 +23,7 @@ const remoteImageURLs = [hasSetWebPrefix ? new URL(`${process.env.NEXT_PUBLIC_WE
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  basePath,
-  assetPrefix,
+  basePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
   webpack: (config, { dev, isServer }) => {
     if (dev) {
       config.plugins.push(codeInspectorPlugin({ bundler: 'webpack' }))
diff --git a/web/package.json b/web/package.json
index a422c7fd6c..e82b41636c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -23,9 +23,10 @@
     "build": "next build",
     "build:docker": "next build && node scripts/optimize-standalone.js",
     "start": "cp -r .next/static .next/standalone/.next/static && cp -r public .next/standalone/public && cross-env PORT=$npm_config_port HOSTNAME=$npm_config_host node .next/standalone/server.js",
-    "lint": "pnpx oxlint && pnpm eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache",
-    "lint-only-show-error": "pnpx oxlint && pnpm eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache --quiet",
+    "lint": "npx oxlint && pnpm eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache",
+    "lint-only-show-error": "npx oxlint && pnpm eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache --quiet",
     "fix": "eslint --fix .",
+    "eslint": "eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache",
     "eslint-fix": "eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache --fix",
     "eslint-fix-only-show-error": "eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache --fix --quiet",
     "eslint-complexity": "eslint --rule 'complexity: [error, {max: 15}]' --quiet",
diff --git a/web/service/base.ts b/web/service/base.ts
index 5386f9b07b..9621d21a27 100644
--- a/web/service/base.ts
+++ b/web/service/base.ts
@@ -442,29 +442,29 @@ export const ssePost = async (
         }
         onData?.(str, isFirstMessage, moreInfo)
       },
-        onCompleted,
-        onThought,
-        onMessageEnd,
-        onMessageReplace,
-        onFile,
-        onWorkflowStarted,
-        onWorkflowFinished,
-        onNodeStarted,
-        onNodeFinished,
-        onIterationStart,
-        onIterationNext,
-        onIterationFinish,
-        onLoopStart,
-        onLoopNext,
-        onLoopFinish,
-        onNodeRetry,
-        onParallelBranchStarted,
-        onParallelBranchFinished,
-        onTextChunk,
-        onTTSChunk,
-        onTTSEnd,
-        onTextReplace,
-        onAgentLog,
+      onCompleted,
+      onThought,
+      onMessageEnd,
+      onMessageReplace,
+      onFile,
+      onWorkflowStarted,
+      onWorkflowFinished,
+      onNodeStarted,
+      onNodeFinished,
+      onIterationStart,
+      onIterationNext,
+      onIterationFinish,
+      onLoopStart,
+      onLoopNext,
+      onLoopFinish,
+      onNodeRetry,
+      onParallelBranchStarted,
+      onParallelBranchFinished,
+      onTextChunk,
+      onTTSChunk,
+      onTTSEnd,
+      onTextReplace,
+      onAgentLog,
       )
     }).catch((e) => {
       if (e.toString() !== 'AbortError: The user aborted a request.' && !e.toString().includes('TypeError: Cannot assign to read only property'))
diff --git a/web/service/use-plugins-auth.ts b/web/service/use-plugins-auth.ts
index 51992361eb..82eade4008 100644
--- a/web/service/use-plugins-auth.ts
+++ b/web/service/use-plugins-auth.ts
@@ -19,11 +19,11 @@ export const useGetPluginCredentialInfo = (
     enabled: !!url,
     queryKey: [NAME_SPACE, 'credential-info', url],
     queryFn: () => get<{
-        allow_custom_token?: boolean
-        supported_credential_types: string[]
-        credentials: Credential[]
-        is_oauth_custom_client_enabled: boolean
-      }>(url),
+      allow_custom_token?: boolean
+      supported_credential_types: string[]
+      credentials: Credential[]
+      is_oauth_custom_client_enabled: boolean
+    }>(url),
     staleTime: 0,
   })
 }
@@ -107,11 +107,11 @@ export const useGetPluginOAuthUrl = (
     mutationKey: [NAME_SPACE, 'oauth-url', url],
     mutationFn: () => {
       return get<
-      {
-        authorization_url: string
-        state: string
-        context_id: string
-      }>(url)
+        {
+          authorization_url: string
+          state: string
+          context_id: string
+        }>(url)
     },
   })
 }
@@ -143,9 +143,9 @@ export const useSetPluginOAuthCustomClient = (
 ) => {
   return useMutation({
     mutationFn: (params: {
-        client_params: Record<string, any>
-        enable_oauth_custom_client: boolean
-      }) => {
+      client_params: Record<string, any>
+      enable_oauth_custom_client: boolean
+    }) => {
       return post<{ result: string }>(url, { body: params })
     },
   })
diff --git a/web/service/use-share.ts b/web/service/use-share.ts
index 6845a2f3c7..267975fd38 100644
--- a/web/service/use-share.ts
+++ b/web/service/use-share.ts
@@ -6,12 +6,7 @@ const NAME_SPACE = 'webapp'
 export const useGetWebAppAccessModeByCode = (code: string | null) => {
   return useQuery({
     queryKey: [NAME_SPACE, 'appAccessMode', code],
-    queryFn: () => {
-      if (!code || code.length === 0)
-        return Promise.reject(new Error('App code is required to get access mode'))
-
-      return getAppAccessModeByAppCode(code)
-    },
+    queryFn: () => getAppAccessModeByAppCode(code!),
     enabled: !!code,
   })
 }
diff --git a/web/utils/navigation.ts b/web/utils/navigation.ts
index fec2291f3f..15fd5711d1 100644
--- a/web/utils/navigation.ts
+++ b/web/utils/navigation.ts
@@ -32,7 +32,7 @@ export function createNavigationPath(basePath: string, preserveParams: boolean =
     const separator = queryString ? '?' : ''
     return `${basePath}${separator}${queryString}`
   }
- catch (error) {
+  catch (error) {
     // Fallback to base path if there's any error accessing location
     console.warn('Failed to preserve query parameters:', error)
     return basePath
@@ -89,7 +89,7 @@ export function extractQueryParams(paramNames: string[]): Record<string, string>
 
     return extracted
   }
- catch (error) {
+  catch (error) {
     console.warn('Failed to extract query parameters:', error)
     return {}
   }
@@ -126,7 +126,7 @@ export function createNavigationPathWithParams(
     const separator = queryString ? '?' : ''
     return `${basePath}${separator}${queryString}`
   }
- catch (error) {
+  catch (error) {
     console.warn('Failed to create navigation path with params:', error)
     return basePath
   }
@@ -155,7 +155,7 @@ export function mergeQueryParams(
   Object.entries(newParams).forEach(([key, value]) => {
     if (value === null || value === undefined)
       searchParams.delete(key)
-     else if (value !== '')
+    else if (value !== '')
       searchParams.set(key, String(value))
   })
 
diff --git a/web/utils/var-basePath.js b/web/utils/var-basePath.js
deleted file mode 100644
index ff6dd505ea..0000000000
--- a/web/utils/var-basePath.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// export basePath to next.config.js
-// same as the one exported from var.ts
-module.exports = {
-  basePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
-  assetPrefix: '',
-}
diff --git a/web/utils/var.ts b/web/utils/var.ts
index 4bbb7ca631..e3320a099d 100644
--- a/web/utils/var.ts
+++ b/web/utils/var.ts
@@ -118,7 +118,7 @@ export const getVars = (value: string) => {
 
 // Set the value of basePath
 // example: /dify
-export const basePath = ''
+export const basePath = process.env.NEXT_PUBLIC_BASE_PATH || ''
 
 export function getMarketplaceUrl(path: string, params?: Record<string, string | undefined>) {
   const searchParams = new URLSearchParams({ source: encodeURIComponent(window.location.origin) })