[autofix.ci] apply automated fixes

Merge branch 'main' into feat/replayable-stream
remove stale comments
2026-04-21 10:31:40 +00:00 · 2026-04-21 18:27:03 +08:00 · 2026-04-21 18:23:51 +08:00 · 2026-04-21 18:23:51 +08:00 · 2026-04-21 10:09:22 +00:00 · 2026-04-21 09:28:44 +00:00
246 changed files with 7264 additions and 10375 deletions
@@ -237,6 +237,10 @@ scripts/stress-test/reports/
 .playwright-mcp/
 .serena/

+# vitest browser mode attachments (failure screenshots, traces, etc.)
+.vitest-attachments/
+**/__screenshots__/
+
 # settings
 *.local.json
 *.local.md
@@ -20,11 +20,11 @@ from core.app.apps.base_app_generator import BaseAppGenerator
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
 from core.app.apps.message_generator import MessageGenerator
 from core.app.apps.workflow.app_generator import WorkflowAppGenerator
-from core.workflow.human_input_policy import HumanInputSurface, is_recipient_type_allowed_for_surface
 from extensions.ext_database import db
 from libs.login import current_account_with_tenant, login_required
 from models import App
 from models.enums import CreatorUserRole
+from models.human_input import RecipientType
 from models.model import AppMode
 from models.workflow import WorkflowRun
 from repositories.factory import DifyAPIRepositoryFactory
@@ -56,11 +56,6 @@ class ConsoleHumanInputFormApi(Resource):
        if form.tenant_id != current_tenant_id:
            raise NotFoundError("App not found")

-    @staticmethod
-    def _ensure_console_recipient_type(form: Form) -> None:
-        if not is_recipient_type_allowed_for_surface(form.recipient_type, HumanInputSurface.CONSOLE):
-            raise NotFoundError("form not found")
-
    @setup_required
    @login_required
    @account_initialization_required
@@ -104,8 +99,10 @@ class ConsoleHumanInputFormApi(Resource):
            raise NotFoundError(f"form not found, token={form_token}")

        self._ensure_console_access(form)
-        self._ensure_console_recipient_type(form)
+
        recipient_type = form.recipient_type
+        if recipient_type not in {RecipientType.CONSOLE, RecipientType.BACKSTAGE}:
+            raise NotFoundError(f"form not found, token={form_token}")
        # The type checker is not smart enought to validate the following invariant.
        # So we need to assert it manually.
        assert recipient_type is not None, "recipient_type cannot be None here."
@@ -23,11 +23,9 @@ from .app import (
    conversation,
    file,
    file_preview,
-    human_input_form,
    message,
    site,
    workflow,
-    workflow_events,
 )
 from .dataset import (
    dataset,
@@ -52,7 +50,6 @@ __all__ = [
    "file",
    "file_preview",
    "hit_testing",
-    "human_input_form",
    "index",
    "message",
    "metadata",
@@ -61,7 +58,6 @@ __all__ = [
    "segment",
    "site",
    "workflow",
-    "workflow_events",
 ]

 api.add_namespace(service_api_ns)
@@ -1,143 +0,0 @@
-"""
-Service API human input form endpoints.
-
-This module exposes app-token authenticated APIs for fetching and submitting
-paused human input forms in workflow/chatflow runs.
-"""
-
-import json
-import logging
-from datetime import datetime
-from typing import Any
-
-from flask import Response
-from flask_restx import Resource
-from pydantic import BaseModel
-from werkzeug.exceptions import InternalServerError, NotFound
-
-from controllers.common.schema import register_schema_models
-from controllers.service_api import service_api_ns
-from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
-from core.workflow.human_input_policy import HumanInputSurface, is_recipient_type_allowed_for_surface
-from extensions.ext_database import db
-from models.model import App, EndUser
-from services.human_input_service import Form, FormNotFoundError, HumanInputService
-
-logger = logging.getLogger(__name__)
-
-
-class HumanInputFormSubmitPayload(BaseModel):
-    inputs: dict[str, Any]
-    action: str
-
-
-register_schema_models(service_api_ns, HumanInputFormSubmitPayload)
-
-
-def _stringify_default_values(values: dict[str, object]) -> dict[str, str]:
-    result: dict[str, str] = {}
-    for key, value in values.items():
-        if value is None:
-            result[key] = ""
-        elif isinstance(value, (dict, list)):
-            result[key] = json.dumps(value, ensure_ascii=False)
-        else:
-            result[key] = str(value)
-    return result
-
-
-def _to_timestamp(value: datetime) -> int:
-    return int(value.timestamp())
-
-
-def _jsonify_form_definition(form: Form) -> Response:
-    definition_payload = form.get_definition().model_dump()
-    payload = {
-        "form_content": definition_payload["rendered_content"],
-        "inputs": definition_payload["inputs"],
-        "resolved_default_values": _stringify_default_values(definition_payload["default_values"]),
-        "user_actions": definition_payload["user_actions"],
-        "expiration_time": _to_timestamp(form.expiration_time),
-    }
-    return Response(json.dumps(payload, ensure_ascii=False), mimetype="application/json")
-
-
-def _ensure_form_belongs_to_app(form: Form, app_model: App) -> None:
-    if form.app_id != app_model.id or form.tenant_id != app_model.tenant_id:
-        raise NotFound("Form not found")
-
-
-def _ensure_form_is_allowed_for_service_api(form: Form) -> None:
-    # Keep app-token callers scoped to the public web-form surface; internal HITL
-    # routes must continue to flow through console-only authentication.
-    if not is_recipient_type_allowed_for_surface(form.recipient_type, HumanInputSurface.SERVICE_API):
-        raise NotFound("Form not found")
-
-
-@service_api_ns.route("/form/human_input/<string:form_token>")
-class WorkflowHumanInputFormApi(Resource):
-    @service_api_ns.doc("get_human_input_form")
-    @service_api_ns.doc(description="Get a paused human input form by token")
-    @service_api_ns.doc(params={"form_token": "Human input form token"})
-    @service_api_ns.doc(
-        responses={
-            200: "Form retrieved successfully",
-            401: "Unauthorized - invalid API token",
-            404: "Form not found",
-            412: "Form already submitted or expired",
-        }
-    )
-    @validate_app_token
-    def get(self, app_model: App, form_token: str):
-        service = HumanInputService(db.engine)
-        form = service.get_form_by_token(form_token)
-        if form is None:
-            raise NotFound("Form not found")
-
-        _ensure_form_belongs_to_app(form, app_model)
-        _ensure_form_is_allowed_for_service_api(form)
-        service.ensure_form_active(form)
-        return _jsonify_form_definition(form)
-
-    @service_api_ns.expect(service_api_ns.models[HumanInputFormSubmitPayload.__name__])
-    @service_api_ns.doc("submit_human_input_form")
-    @service_api_ns.doc(description="Submit a paused human input form by token")
-    @service_api_ns.doc(params={"form_token": "Human input form token"})
-    @service_api_ns.doc(
-        responses={
-            200: "Form submitted successfully",
-            400: "Bad request - invalid submission data",
-            401: "Unauthorized - invalid API token",
-            404: "Form not found",
-            412: "Form already submitted or expired",
-        }
-    )
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON, required=True))
-    def post(self, app_model: App, end_user: EndUser, form_token: str):
-        payload = HumanInputFormSubmitPayload.model_validate(service_api_ns.payload or {})
-
-        service = HumanInputService(db.engine)
-        form = service.get_form_by_token(form_token)
-        if form is None:
-            raise NotFound("Form not found")
-
-        _ensure_form_belongs_to_app(form, app_model)
-        _ensure_form_is_allowed_for_service_api(form)
-
-        recipient_type = form.recipient_type
-        if recipient_type is None:
-            logger.warning("Recipient type is None for form, form_id=%s", form.id)
-            raise InternalServerError("Form recipient type is invalid")
-
-        try:
-            service.submit_form_by_token(
-                recipient_type=recipient_type,
-                form_token=form_token,
-                selected_action_id=payload.action,
-                form_data=payload.inputs,
-                submission_end_user_id=end_user.id,
-            )
-        except FormNotFoundError:
-            raise NotFound("Form not found")
-
-        return {}, 200
@@ -1,133 +0,0 @@
-"""
-Service API workflow resume event stream endpoints.
-"""
-
-import json
-from collections.abc import Generator
-
-from flask import Response, request
-from flask_restx import Resource
-from sqlalchemy.orm import sessionmaker
-from werkzeug.exceptions import NotFound
-
-from controllers.service_api import service_api_ns
-from controllers.service_api.app.error import NotWorkflowAppError
-from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
-from core.app.apps.advanced_chat.app_generator import AdvancedChatAppGenerator
-from core.app.apps.base_app_generator import BaseAppGenerator
-from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
-from core.app.apps.message_generator import MessageGenerator
-from core.app.apps.workflow.app_generator import WorkflowAppGenerator
-from extensions.ext_database import db
-from models.enums import CreatorUserRole
-from models.model import App, AppMode, EndUser
-from repositories.factory import DifyAPIRepositoryFactory
-from services.workflow_event_snapshot_service import build_workflow_event_stream
-
-
-@service_api_ns.route("/workflow/<string:task_id>/events")
-class WorkflowEventsApi(Resource):
-    """Service API for getting workflow execution events after resume."""
-
-    @service_api_ns.doc("get_workflow_events")
-    @service_api_ns.doc(description="Get workflow execution events stream after resume")
-    @service_api_ns.doc(
-        params={
-            "task_id": "Workflow run ID",
-            "user": "End user identifier (query param)",
-            "include_state_snapshot": "Whether to replay from persisted state snapshot",
-            "continue_on_pause": "Whether to keep the stream open across workflow_paused events",
-        }
-    )
-    @service_api_ns.doc(
-        responses={
-            200: "SSE event stream",
-            401: "Unauthorized - invalid API token",
-            404: "Workflow run not found",
-        }
-    )
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.QUERY, required=True))
-    def get(self, app_model: App, end_user: EndUser, task_id: str):
-        app_mode = AppMode.value_of(app_model.mode)
-        if app_mode not in {AppMode.WORKFLOW, AppMode.ADVANCED_CHAT}:
-            raise NotWorkflowAppError()
-
-        session_maker = sessionmaker(db.engine)
-        repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
-        workflow_run = repo.get_workflow_run_by_id_and_tenant_id(
-            tenant_id=app_model.tenant_id,
-            run_id=task_id,
-        )
-
-        if workflow_run is None:
-            raise NotFound("Workflow run not found")
-
-        if workflow_run.app_id != app_model.id:
-            raise NotFound("Workflow run not found")
-
-        if workflow_run.created_by_role != CreatorUserRole.END_USER:
-            raise NotFound("Workflow run not found")
-
-        if workflow_run.created_by != end_user.id:
-            raise NotFound("Workflow run not found")
-
-        workflow_run_entity = workflow_run
-
-        if workflow_run_entity.finished_at is not None:
-            response = WorkflowResponseConverter.workflow_run_result_to_finish_response(
-                task_id=workflow_run_entity.id,
-                workflow_run=workflow_run_entity,
-                creator_user=end_user,
-            )
-
-            payload = response.model_dump(mode="json")
-            payload["event"] = response.event.value
-
-            def _generate_finished_events() -> Generator[str, None, None]:
-                yield f"data: {json.dumps(payload)}\n\n"
-
-            event_generator = _generate_finished_events
-        else:
-            msg_generator = MessageGenerator()
-            generator: BaseAppGenerator
-            if app_mode == AppMode.ADVANCED_CHAT:
-                generator = AdvancedChatAppGenerator()
-            elif app_mode == AppMode.WORKFLOW:
-                generator = WorkflowAppGenerator()
-            else:
-                raise NotWorkflowAppError()
-
-            include_state_snapshot = request.args.get("include_state_snapshot", "false").lower() == "true"
-            continue_on_pause = request.args.get("continue_on_pause", "false").lower() == "true"
-            terminal_events = ["workflow_finished"] if continue_on_pause else None
-
-            def _generate_stream_events():
-                if include_state_snapshot:
-                    return generator.convert_to_event_stream(
-                        build_workflow_event_stream(
-                            app_mode=app_mode,
-                            workflow_run=workflow_run_entity,
-                            tenant_id=app_model.tenant_id,
-                            app_id=app_model.id,
-                            session_maker=session_maker,
-                            close_on_pause=not continue_on_pause,
-                        )
-                    )
-                return generator.convert_to_event_stream(
-                    msg_generator.retrieve_events(
-                        app_mode,
-                        workflow_run_entity.id,
-                        terminal_events=terminal_events,
-                    ),
-                )
-
-            event_generator = _generate_stream_events
-
-        return Response(
-            event_generator(),
-            mimetype="text/event-stream",
-            headers={
-                "Cache-Control": "no-cache",
-                "Connection": "keep-alive",
-            },
-        )
@@ -84,6 +84,9 @@ class WorkflowEventsApi(WebApiResource):

            def _generate_stream_events():
                if include_state_snapshot:
+                    # TODO(wylswz): events between shapshot and live tail may be lost.
+                    # TODO(wylswz): previous message chunks are not replayed. In order to support replay, we need
+                    # to figure out a way to deduplicate events between snapshot and stream.
                    return generator.convert_to_event_stream(
                        build_workflow_event_stream(
                            app_mode=app_mode,
@@ -34,11 +34,7 @@ from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
 from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom
-from core.app.entities.task_entities import (
-    ChatbotAppBlockingResponse,
-    ChatbotAppPausedBlockingResponse,
-    ChatbotAppStreamResponse,
-)
+from core.app.entities.task_entities import ChatbotAppBlockingResponse, ChatbotAppStreamResponse
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, PauseStatePersistenceLayer
 from core.helper.trace_id_helper import extract_external_trace_id_from_args
 from core.ops.ops_trace_manager import TraceQueueManager
@@ -659,9 +655,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
        user: Account | EndUser,
        draft_var_saver_factory: DraftVariableSaverFactory,
        stream: bool = False,
-    ) -> (
-        ChatbotAppBlockingResponse | ChatbotAppPausedBlockingResponse | Generator[ChatbotAppStreamResponse, None, None]
-    ):
+    ) -> ChatbotAppBlockingResponse | Generator[ChatbotAppStreamResponse, None, None]:
        """
        Handle response.
        :param application_generate_entity: application generate entity
@@ -3,9 +3,9 @@ from typing import Any, cast

 from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
 from core.app.entities.task_entities import (
+    AppBlockingResponse,
    AppStreamResponse,
    ChatbotAppBlockingResponse,
-    ChatbotAppPausedBlockingResponse,
    ChatbotAppStreamResponse,
    ErrorStreamResponse,
    MessageEndStreamResponse,
@@ -15,34 +15,17 @@ from core.app.entities.task_entities import (
 )


-class AdvancedChatAppGenerateResponseConverter(
-    AppGenerateResponseConverter[ChatbotAppBlockingResponse | ChatbotAppPausedBlockingResponse]
-):
+class AdvancedChatAppGenerateResponseConverter(AppGenerateResponseConverter):
+    _blocking_response_type = ChatbotAppBlockingResponse
+
    @classmethod
-    def convert_blocking_full_response(
-        cls, blocking_response: ChatbotAppBlockingResponse | ChatbotAppPausedBlockingResponse
-    ) -> dict[str, Any]:
+    def convert_blocking_full_response(cls, blocking_response: AppBlockingResponse) -> dict[str, Any]:
        """
        Convert blocking full response.
        :param blocking_response: blocking response
        :return:
        """
-        if isinstance(blocking_response, ChatbotAppPausedBlockingResponse):
-            paused_data = blocking_response.data.model_dump(mode="json")
-            return {
-                "event": "workflow_paused",
-                "task_id": blocking_response.task_id,
-                "id": blocking_response.data.id,
-                "message_id": blocking_response.data.message_id,
-                "conversation_id": blocking_response.data.conversation_id,
-                "mode": blocking_response.data.mode,
-                "answer": blocking_response.data.answer,
-                "metadata": blocking_response.data.metadata,
-                "created_at": blocking_response.data.created_at,
-                "workflow_run_id": blocking_response.data.workflow_run_id,
-                "data": paused_data,
-            }
-
+        blocking_response = cast(ChatbotAppBlockingResponse, blocking_response)
        response = {
            "event": "message",
            "task_id": blocking_response.task_id,
@@ -58,9 +41,7 @@ class AdvancedChatAppGenerateResponseConverter(
        return response

    @classmethod
-    def convert_blocking_simple_response(
-        cls, blocking_response: ChatbotAppBlockingResponse | ChatbotAppPausedBlockingResponse
-    ) -> dict[str, Any]:
+    def convert_blocking_simple_response(cls, blocking_response: AppBlockingResponse) -> dict[str, Any]:
        """
        Convert blocking simple response.
        :param blocking_response: blocking response
@@ -69,8 +50,7 @@ class AdvancedChatAppGenerateResponseConverter(
        response = cls.convert_blocking_full_response(blocking_response)

        metadata = response.get("metadata", {})
-        if isinstance(metadata, dict):
-            response["metadata"] = cls._get_simple_metadata(metadata)
+        response["metadata"] = cls._get_simple_metadata(metadata)

        return response

@@ -54,16 +54,13 @@ from core.app.entities.queue_entities import (
 )
 from core.app.entities.task_entities import (
    ChatbotAppBlockingResponse,
-    ChatbotAppPausedBlockingResponse,
    ChatbotAppStreamResponse,
    ErrorStreamResponse,
-    HumanInputRequiredResponse,
    MessageAudioEndStreamResponse,
    MessageAudioStreamResponse,
    MessageEndStreamResponse,
    PingStreamResponse,
    StreamResponse,
-    WorkflowPauseStreamResponse,
    WorkflowTaskState,
 )
 from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
@@ -74,7 +71,7 @@ from core.repositories.human_input_repository import HumanInputFormRepositoryImp
 from core.workflow.file_reference import resolve_file_record_id
 from core.workflow.system_variables import build_system_variables
 from extensions.ext_database import db
-from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
+from graphon.entities.pause_reason import HumanInputRequired
 from graphon.enums import WorkflowExecutionStatus
 from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.model_runtime.utils.encoders import jsonable_encoder
@@ -213,13 +210,7 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
        if message.status == MessageStatus.PAUSED and message.answer:
            self._task_state.answer = message.answer

-    def process(
-        self,
-    ) -> Union[
-        ChatbotAppBlockingResponse,
-        ChatbotAppPausedBlockingResponse,
-        Generator[ChatbotAppStreamResponse, None, None],
-    ]:
+    def process(self) -> Union[ChatbotAppBlockingResponse, Generator[ChatbotAppStreamResponse, None, None]]:
        """
        Process generate task pipeline.
        :return:
@@ -235,39 +226,14 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
        else:
            return self._to_blocking_response(generator)

-    def _to_blocking_response(
-        self, generator: Generator[StreamResponse, None, None]
-    ) -> Union[ChatbotAppBlockingResponse, ChatbotAppPausedBlockingResponse]:
+    def _to_blocking_response(self, generator: Generator[StreamResponse, None, None]) -> ChatbotAppBlockingResponse:
        """
        Process blocking response.
        :return:
        """
-        human_input_responses: list[HumanInputRequiredResponse] = []
        for stream_response in generator:
            if isinstance(stream_response, ErrorStreamResponse):
                raise stream_response.err
-            elif isinstance(stream_response, HumanInputRequiredResponse):
-                human_input_responses.append(stream_response)
-            elif isinstance(stream_response, WorkflowPauseStreamResponse):
-                return ChatbotAppPausedBlockingResponse(
-                    task_id=stream_response.task_id,
-                    data=ChatbotAppPausedBlockingResponse.Data(
-                        id=self._message_id,
-                        mode=self._conversation_mode,
-                        conversation_id=self._conversation_id,
-                        message_id=self._message_id,
-                        workflow_run_id=stream_response.data.workflow_run_id,
-                        answer=self._task_state.answer,
-                        metadata=self._message_end_to_stream_response().metadata,
-                        created_at=self._message_created_at,
-                        paused_nodes=stream_response.data.paused_nodes,
-                        reasons=stream_response.data.reasons,
-                        status=stream_response.data.status,
-                        elapsed_time=stream_response.data.elapsed_time,
-                        total_tokens=stream_response.data.total_tokens,
-                        total_steps=stream_response.data.total_steps,
-                    ),
-                )
            elif isinstance(stream_response, MessageEndStreamResponse):
                extras = {}
                if stream_response.metadata:
@@ -288,42 +254,8 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
            else:
                continue

-        if human_input_responses:
-            return self._build_paused_blocking_response_from_human_input(human_input_responses)
-
        raise ValueError("queue listening stopped unexpectedly.")

-    def _build_paused_blocking_response_from_human_input(
-        self, human_input_responses: list[HumanInputRequiredResponse]
-    ) -> ChatbotAppPausedBlockingResponse:
-        runtime_state = self._resolve_graph_runtime_state()
-        paused_nodes = list(dict.fromkeys(response.data.node_id for response in human_input_responses))
-        reasons = []
-        for response in human_input_responses:
-            reason = response.data.model_dump(mode="json")
-            reason["type"] = PauseReasonType.HUMAN_INPUT_REQUIRED
-            reasons.append(reason)
-
-        return ChatbotAppPausedBlockingResponse(
-            task_id=self._application_generate_entity.task_id,
-            data=ChatbotAppPausedBlockingResponse.Data(
-                id=self._message_id,
-                mode=self._conversation_mode,
-                conversation_id=self._conversation_id,
-                message_id=self._message_id,
-                workflow_run_id=human_input_responses[-1].workflow_run_id,
-                answer=self._task_state.answer,
-                metadata=self._message_end_to_stream_response().metadata,
-                created_at=self._message_created_at,
-                paused_nodes=paused_nodes,
-                reasons=reasons,
-                status=WorkflowExecutionStatus.PAUSED,
-                elapsed_time=time.perf_counter() - self._base_task_pipeline.start_at,
-                total_tokens=runtime_state.total_tokens,
-                total_steps=runtime_state.node_run_steps,
-            ),
-        )
-
    def _to_stream_response(
        self, generator: Generator[StreamResponse, None, None]
    ) -> Generator[ChatbotAppStreamResponse, Any, None]:
@@ -12,9 +12,11 @@ from core.app.entities.task_entities import (
 )


-class AgentChatAppGenerateResponseConverter(AppGenerateResponseConverter[ChatbotAppBlockingResponse]):
+class AgentChatAppGenerateResponseConverter(AppGenerateResponseConverter):
+    _blocking_response_type = ChatbotAppBlockingResponse
+
    @classmethod
-    def convert_blocking_full_response(cls, blocking_response: ChatbotAppBlockingResponse):
+    def convert_blocking_full_response(cls, blocking_response: ChatbotAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking full response.
        :param blocking_response: blocking response
@@ -35,7 +37,7 @@ class AgentChatAppGenerateResponseConverter(AppGenerateResponseConverter[Chatbot
        return response

    @classmethod
-    def convert_blocking_simple_response(cls, blocking_response: ChatbotAppBlockingResponse):
+    def convert_blocking_simple_response(cls, blocking_response: ChatbotAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking simple response.
        :param blocking_response: blocking response
@@ -1,7 +1,7 @@
 import logging
 from abc import ABC, abstractmethod
 from collections.abc import Generator, Mapping
-from typing import Any, Union, cast
+from typing import Any, Union

 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.task_entities import AppBlockingResponse, AppStreamResponse
@@ -11,10 +11,8 @@ from graphon.model_runtime.errors.invoke import InvokeError
 logger = logging.getLogger(__name__)


-class AppGenerateResponseConverter[TBlockingResponse: AppBlockingResponse](ABC):
-    @classmethod
-    def _cast_blocking_response(cls, response: AppBlockingResponse) -> TBlockingResponse:
-        return cast(TBlockingResponse, response)
+class AppGenerateResponseConverter(ABC):
+    _blocking_response_type: type[AppBlockingResponse]

    @classmethod
    def convert(
@@ -22,7 +20,7 @@ class AppGenerateResponseConverter[TBlockingResponse: AppBlockingResponse](ABC):
    ) -> Mapping[str, Any] | Generator[str | Mapping[str, Any], Any, None]:
        if invoke_from in {InvokeFrom.DEBUGGER, InvokeFrom.SERVICE_API}:
            if isinstance(response, AppBlockingResponse):
-                return cls.convert_blocking_full_response(cls._cast_blocking_response(response))
+                return cls.convert_blocking_full_response(response)
            else:

                def _generate_full_response() -> Generator[dict[str, Any] | str, Any, None]:
@@ -31,7 +29,7 @@ class AppGenerateResponseConverter[TBlockingResponse: AppBlockingResponse](ABC):
                return _generate_full_response()
        else:
            if isinstance(response, AppBlockingResponse):
-                return cls.convert_blocking_simple_response(cls._cast_blocking_response(response))
+                return cls.convert_blocking_simple_response(response)
            else:

                def _generate_simple_response() -> Generator[dict[str, Any] | str, Any, None]:
@@ -41,12 +39,12 @@ class AppGenerateResponseConverter[TBlockingResponse: AppBlockingResponse](ABC):

    @classmethod
    @abstractmethod
-    def convert_blocking_full_response(cls, blocking_response: TBlockingResponse) -> dict[str, Any]:
+    def convert_blocking_full_response(cls, blocking_response: AppBlockingResponse) -> dict[str, Any]:
        raise NotImplementedError

    @classmethod
    @abstractmethod
-    def convert_blocking_simple_response(cls, blocking_response: TBlockingResponse) -> dict[str, Any]:
+    def convert_blocking_simple_response(cls, blocking_response: AppBlockingResponse) -> dict[str, Any]:
        raise NotImplementedError

    @classmethod
@@ -12,9 +12,11 @@ from core.app.entities.task_entities import (
 )


-class ChatAppGenerateResponseConverter(AppGenerateResponseConverter[ChatbotAppBlockingResponse]):
+class ChatAppGenerateResponseConverter(AppGenerateResponseConverter):
+    _blocking_response_type = ChatbotAppBlockingResponse
+
    @classmethod
-    def convert_blocking_full_response(cls, blocking_response: ChatbotAppBlockingResponse):
+    def convert_blocking_full_response(cls, blocking_response: ChatbotAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking full response.
        :param blocking_response: blocking response
@@ -35,7 +37,7 @@ class ChatAppGenerateResponseConverter(AppGenerateResponseConverter[ChatbotAppBl
        return response

    @classmethod
-    def convert_blocking_simple_response(cls, blocking_response: ChatbotAppBlockingResponse):
+    def convert_blocking_simple_response(cls, blocking_response: ChatbotAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking simple response.
        :param blocking_response: blocking response
@@ -1,17 +0,0 @@
-from collections.abc import Mapping
-from typing import Any
-
-from graphon.entities.pause_reason import PauseReason
-
-
-def pause_reason_to_public_dict(reason: PauseReason | Mapping[str, Any]) -> dict[str, Any]:
-    if isinstance(reason, Mapping):
-        data = dict(reason)
-    else:
-        data = dict(reason.model_dump(mode="json"))
-
-    discriminator = data.pop("TYPE", None)
-    if discriminator is not None:
-        data["type"] = discriminator
-
-    return data
@@ -9,9 +9,7 @@ from typing import Any, NewType, TypedDict, Union
 from sqlalchemy import select
 from sqlalchemy.orm import Session

-from core.app.apps.common.pause_reason_serializer import pause_reason_to_public_dict
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
-from core.workflow.human_input_policy import enrich_human_input_pause_reasons
 from core.app.entities.queue_entities import (
    QueueAgentLogEvent,
    QueueHumanInputFormFilledEvent,
@@ -319,7 +317,7 @@ class WorkflowResponseConverter:
        encoded_outputs = self._encode_outputs(event.outputs) or {}
        if self._application_generate_entity.invoke_from == InvokeFrom.SERVICE_API:
            encoded_outputs = {}
-        pause_reasons = [pause_reason_to_public_dict(reason) for reason in event.reasons]
+        pause_reasons = [reason.model_dump(mode="json") for reason in event.reasons]
        human_input_form_ids = [reason.form_id for reason in event.reasons if isinstance(reason, HumanInputRequired)]
        expiration_times_by_form_id: dict[str, datetime] = {}
        display_in_ui_by_form_id: dict[str, bool] = {}
@@ -340,17 +338,6 @@ class WorkflowResponseConverter:
                    display_in_ui_by_form_id[str(form_id)] = bool(definition_payload.get("display_in_ui"))
                form_token_by_form_id = load_form_tokens_by_form_id(human_input_form_ids, session=session)

-        # Reconnect paths must preserve the same pause-reason contract as live streams;
-        # otherwise clients see schema drift after resume.
-        pause_reasons = enrich_human_input_pause_reasons(
-            pause_reasons,
-            form_tokens_by_form_id=form_token_by_form_id,
-            expiration_times_by_form_id={
-                form_id: int(expiration_time.timestamp())
-                for form_id, expiration_time in expiration_times_by_form_id.items()
-            },
-        )
-
        responses: list[StreamResponse] = []

        for reason in event.reasons:
@@ -12,9 +12,11 @@ from core.app.entities.task_entities import (
 )


-class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter[CompletionAppBlockingResponse]):
+class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter):
+    _blocking_response_type = CompletionAppBlockingResponse
+
    @classmethod
-    def convert_blocking_full_response(cls, blocking_response: CompletionAppBlockingResponse):
+    def convert_blocking_full_response(cls, blocking_response: CompletionAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking full response.
        :param blocking_response: blocking response
@@ -34,7 +36,7 @@ class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter[Comple
        return response

    @classmethod
-    def convert_blocking_simple_response(cls, blocking_response: CompletionAppBlockingResponse):
+    def convert_blocking_simple_response(cls, blocking_response: CompletionAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking simple response.
        :param blocking_response: blocking response
@@ -311,7 +311,7 @@ class MessageBasedAppGenerator(BaseAppGenerator):
        cls,
        app_mode: AppMode,
        workflow_run_id: str,
-        idle_timeout=300,
+        idle_timeout: float = 300,
        on_subscribe: Callable[[], None] | None = None,
    ) -> Generator[Mapping | str, None, None]:
        topic = cls.get_response_topic(app_mode, workflow_run_id)
@@ -1,7 +1,6 @@
-from collections.abc import Callable, Generator, Iterable, Mapping
+from collections.abc import Callable, Generator, Mapping

 from core.app.apps.streaming_utils import stream_topic_events
-from core.app.entities.task_entities import StreamEvent
 from extensions.ext_redis import get_pubsub_broadcast_channel
 from libs.broadcast_channel.channel import Topic
 from models.model import AppMode
@@ -24,10 +23,9 @@ class MessageGenerator:
        cls,
        app_mode: AppMode,
        workflow_run_id: str,
-        idle_timeout=300,
+        idle_timeout: float = 300,
        ping_interval: float = 10.0,
        on_subscribe: Callable[[], None] | None = None,
-        terminal_events: Iterable[str | StreamEvent] | None = None,
    ) -> Generator[Mapping | str, None, None]:
        topic = cls.get_response_topic(app_mode, workflow_run_id)
        return stream_topic_events(
@@ -35,5 +33,4 @@ class MessageGenerator:
            idle_timeout=idle_timeout,
            ping_interval=ping_interval,
            on_subscribe=on_subscribe,
-            terminal_events=terminal_events,
        )
@@ -13,9 +13,11 @@ from core.app.entities.task_entities import (
 )


-class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter[WorkflowAppBlockingResponse]):
+class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter):
+    _blocking_response_type = WorkflowAppBlockingResponse
+
    @classmethod
-    def convert_blocking_full_response(cls, blocking_response: WorkflowAppBlockingResponse) -> dict[str, object]:
+    def convert_blocking_full_response(cls, blocking_response: WorkflowAppBlockingResponse) -> dict[str, Any]:  # type: ignore[override]
        """
        Convert blocking full response.
        :param blocking_response: blocking response
@@ -24,7 +26,7 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter[Workflow
        return dict(blocking_response.model_dump())

    @classmethod
-    def convert_blocking_simple_response(cls, blocking_response: WorkflowAppBlockingResponse) -> dict[str, object]:
+    def convert_blocking_simple_response(cls, blocking_response: WorkflowAppBlockingResponse) -> dict[str, Any]:  # type: ignore[override]
        """
        Convert blocking simple response.
        :param blocking_response: blocking response
@@ -27,11 +27,7 @@ from core.app.apps.workflow.generate_response_converter import WorkflowAppGenera
 from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
 from core.app.entities.app_invoke_entities import InvokeFrom, RagPipelineGenerateEntity
 from core.app.entities.rag_pipeline_invoke_entities import RagPipelineInvokeEntity
-from core.app.entities.task_entities import (
-    WorkflowAppBlockingResponse,
-    WorkflowAppPausedBlockingResponse,
-    WorkflowAppStreamResponse,
-)
+from core.app.entities.task_entities import WorkflowAppBlockingResponse, WorkflowAppStreamResponse
 from core.datasource.entities.datasource_entities import (
    DatasourceProviderType,
    OnlineDriveBrowseFilesRequest,
@@ -631,11 +627,7 @@ class PipelineGenerator(BaseAppGenerator):
        user: Account | EndUser,
        draft_var_saver_factory: DraftVariableSaverFactory,
        stream: bool = False,
-    ) -> (
-        WorkflowAppBlockingResponse
-        | WorkflowAppPausedBlockingResponse
-        | Generator[WorkflowAppStreamResponse, None, None]
-    ):
+    ) -> WorkflowAppBlockingResponse | Generator[WorkflowAppStreamResponse, None, None]:
        """
        Handle response.
        :param application_generate_entity: application generate entity
@@ -27,6 +27,9 @@ def stream_topic_events(
    terminal_values = _normalize_terminal_events(terminal_events)
    last_msg_time = time.time()
    last_ping_time = last_msg_time
+    # The application layer intentionally does not use broadcast-channel replay;
+    # callers that need historical events should compose them from persisted state
+    # (see ``build_workflow_event_stream``) and then tail the live stream.
    with topic.subscribe() as sub:
        # on_subscribe fires only after the Redis subscription is active.
        # This is used to gate task start and reduce pub/sub race for the first event.
@@ -25,11 +25,7 @@ from core.app.apps.workflow.app_runner import WorkflowAppRunner
 from core.app.apps.workflow.generate_response_converter import WorkflowAppGenerateResponseConverter
 from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
-from core.app.entities.task_entities import (
-    WorkflowAppBlockingResponse,
-    WorkflowAppPausedBlockingResponse,
-    WorkflowAppStreamResponse,
-)
+from core.app.entities.task_entities import WorkflowAppBlockingResponse, WorkflowAppStreamResponse
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, PauseStatePersistenceLayer
 from core.db.session_factory import session_factory
 from core.helper.trace_id_helper import extract_external_trace_id_from_args
@@ -616,11 +612,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
        user: Account | EndUser,
        draft_var_saver_factory: DraftVariableSaverFactory,
        stream: bool = False,
-    ) -> (
-        WorkflowAppBlockingResponse
-        | WorkflowAppPausedBlockingResponse
-        | Generator[WorkflowAppStreamResponse, None, None]
-    ):
+    ) -> WorkflowAppBlockingResponse | Generator[WorkflowAppStreamResponse, None, None]:
        """
        Handle response.
        :param application_generate_entity: application generate entity
@@ -9,29 +9,24 @@ from core.app.entities.task_entities import (
    NodeStartStreamResponse,
    PingStreamResponse,
    WorkflowAppBlockingResponse,
-    WorkflowAppPausedBlockingResponse,
    WorkflowAppStreamResponse,
 )


-class WorkflowAppGenerateResponseConverter(
-    AppGenerateResponseConverter[WorkflowAppBlockingResponse | WorkflowAppPausedBlockingResponse]
-):
+class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter):
+    _blocking_response_type = WorkflowAppBlockingResponse
+
    @classmethod
-    def convert_blocking_full_response(
-        cls, blocking_response: WorkflowAppBlockingResponse | WorkflowAppPausedBlockingResponse
-    ) -> dict[str, Any]:
+    def convert_blocking_full_response(cls, blocking_response: WorkflowAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking full response.
        :param blocking_response: blocking response
        :return:
        """
-        return dict(blocking_response.model_dump())
+        return blocking_response.model_dump()

    @classmethod
-    def convert_blocking_simple_response(
-        cls, blocking_response: WorkflowAppBlockingResponse | WorkflowAppPausedBlockingResponse
-    ) -> dict[str, Any]:
+    def convert_blocking_simple_response(cls, blocking_response: WorkflowAppBlockingResponse):  # type: ignore[override]
        """
        Convert blocking simple response.
        :param blocking_response: blocking response
@@ -63,7 +58,7 @@ class WorkflowAppGenerateResponseConverter(

            if isinstance(sub_stream_response, ErrorStreamResponse):
                data = cls._error_to_stream_response(sub_stream_response.err)
-                response_chunk.update(cast(dict[str, object], data))
+                response_chunk.update(data)
            else:
                response_chunk.update(sub_stream_response.model_dump(mode="json"))
            yield response_chunk
@@ -92,9 +87,9 @@ class WorkflowAppGenerateResponseConverter(

            if isinstance(sub_stream_response, ErrorStreamResponse):
                data = cls._error_to_stream_response(sub_stream_response.err)
-                response_chunk.update(cast(dict[str, object], data))
+                response_chunk.update(data)
            elif isinstance(sub_stream_response, NodeStartStreamResponse | NodeFinishStreamResponse):
-                response_chunk.update(cast(dict[str, object], sub_stream_response.to_ignore_detail_dict()))
+                response_chunk.update(sub_stream_response.to_ignore_detail_dict())
            else:
                response_chunk.update(sub_stream_response.model_dump(mode="json"))
            yield response_chunk
@@ -42,14 +42,12 @@ from core.app.entities.queue_entities import (
 )
 from core.app.entities.task_entities import (
    ErrorStreamResponse,
-    HumanInputRequiredResponse,
    MessageAudioEndStreamResponse,
    MessageAudioStreamResponse,
    PingStreamResponse,
    StreamResponse,
    TextChunkStreamResponse,
    WorkflowAppBlockingResponse,
-    WorkflowAppPausedBlockingResponse,
    WorkflowAppStreamResponse,
    WorkflowFinishStreamResponse,
    WorkflowPauseStreamResponse,
@@ -120,11 +118,7 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
        )
        self._graph_runtime_state: GraphRuntimeState | None = self._base_task_pipeline.queue_manager.graph_runtime_state

-    def process(
-        self,
-    ) -> Union[
-        WorkflowAppBlockingResponse, WorkflowAppPausedBlockingResponse, Generator[WorkflowAppStreamResponse, None, None]
-    ]:
+    def process(self) -> Union[WorkflowAppBlockingResponse, Generator[WorkflowAppStreamResponse, None, None]]:
        """
        Process generate task pipeline.
        :return:
@@ -135,24 +129,19 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
        else:
            return self._to_blocking_response(generator)

-    def _to_blocking_response(
-        self, generator: Generator[StreamResponse, None, None]
-    ) -> Union[WorkflowAppBlockingResponse, WorkflowAppPausedBlockingResponse]:
+    def _to_blocking_response(self, generator: Generator[StreamResponse, None, None]) -> WorkflowAppBlockingResponse:
        """
        To blocking response.
        :return:
        """
-        human_input_responses: list[HumanInputRequiredResponse] = []
        for stream_response in generator:
            if isinstance(stream_response, ErrorStreamResponse):
                raise stream_response.err
-            elif isinstance(stream_response, HumanInputRequiredResponse):
-                human_input_responses.append(stream_response)
            elif isinstance(stream_response, WorkflowPauseStreamResponse):
-                return WorkflowAppPausedBlockingResponse(
+                response = WorkflowAppBlockingResponse(
                    task_id=self._application_generate_entity.task_id,
                    workflow_run_id=stream_response.data.workflow_run_id,
-                    data=WorkflowAppPausedBlockingResponse.Data(
+                    data=WorkflowAppBlockingResponse.Data(
                        id=stream_response.data.workflow_run_id,
                        workflow_id=self._workflow.id,
                        status=stream_response.data.status,
@@ -163,13 +152,12 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
                        total_steps=stream_response.data.total_steps,
                        created_at=stream_response.data.created_at,
                        finished_at=None,
-                        paused_nodes=stream_response.data.paused_nodes,
-                        reasons=stream_response.data.reasons,
                    ),
                )

+                return response
            elif isinstance(stream_response, WorkflowFinishStreamResponse):
-                return WorkflowAppBlockingResponse(
+                response = WorkflowAppBlockingResponse(
                    task_id=self._application_generate_entity.task_id,
                    workflow_run_id=stream_response.data.id,
                    data=WorkflowAppBlockingResponse.Data(
@@ -186,47 +174,12 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
                    ),
                )

+                return response
            else:
                continue

-        if human_input_responses:
-            return self._build_paused_blocking_response_from_human_input(human_input_responses)
-
        raise ValueError("queue listening stopped unexpectedly.")

-    def _build_paused_blocking_response_from_human_input(
-        self, human_input_responses: list[HumanInputRequiredResponse]
-    ) -> WorkflowAppPausedBlockingResponse:
-        runtime_state = self._resolve_graph_runtime_state()
-        paused_nodes = list(dict.fromkeys(response.data.node_id for response in human_input_responses))
-        # Graph runtime `start_at` is a perf-counter value, not an epoch timestamp, so
-        # fallback API payloads need a wall-clock source for `created_at`.
-        created_at = int(time.time())
-        reasons = []
-        for response in human_input_responses:
-            reason = response.data.model_dump(mode="json")
-            reason["type"] = "human_input_required"
-            reasons.append(reason)
-
-        return WorkflowAppPausedBlockingResponse(
-            task_id=self._application_generate_entity.task_id,
-            workflow_run_id=human_input_responses[-1].workflow_run_id,
-            data=WorkflowAppPausedBlockingResponse.Data(
-                id=human_input_responses[-1].workflow_run_id,
-                workflow_id=self._workflow.id,
-                status=WorkflowExecutionStatus.PAUSED,
-                outputs={},
-                error=None,
-                elapsed_time=time.perf_counter() - self._base_task_pipeline.start_at,
-                total_tokens=runtime_state.total_tokens,
-                total_steps=runtime_state.node_run_steps,
-                created_at=created_at,
-                finished_at=None,
-                paused_nodes=paused_nodes,
-                reasons=reasons,
-            ),
-        )
-
    def _to_stream_response(
        self, generator: Generator[StreamResponse, None, None]
    ) -> Generator[WorkflowAppStreamResponse, None, None]:
@@ -410,7 +410,7 @@ class WorkflowBasedAppRunner:
        elif isinstance(event, GraphRunFailedEvent):
            self._publish_event(QueueWorkflowFailedEvent(error=event.error, exceptions_count=event.exceptions_count))
        elif isinstance(event, GraphRunAbortedEvent):
-            self._publish_event(QueueWorkflowFailedEvent(error=event.reason or "Unknown error", exceptions_count=0))
+            self._publish_event(QueueWorkflowPartialSuccessEvent(outputs={}, exceptions_count=0))
        elif isinstance(event, GraphRunPausedEvent):
            runtime_state = workflow_entry.graph_engine.graph_runtime_state
            paused_nodes = runtime_state.get_paused_nodes()
@@ -774,34 +774,6 @@ class ChatbotAppBlockingResponse(AppBlockingResponse):
    data: Data


-class ChatbotAppPausedBlockingResponse(AppBlockingResponse):
-    """
-    ChatbotAppPausedBlockingResponse entity
-    """
-
-    class Data(BaseModel):
-        """
-        Data entity
-        """
-
-        id: str
-        mode: str
-        conversation_id: str
-        message_id: str
-        workflow_run_id: str
-        answer: str
-        metadata: Mapping[str, object] = Field(default_factory=dict)
-        created_at: int
-        paused_nodes: Sequence[str] = Field(default_factory=list)
-        reasons: Sequence[Mapping[str, Any]] = Field(default_factory=list)
-        status: WorkflowExecutionStatus
-        elapsed_time: float
-        total_tokens: int
-        total_steps: int
-
-    data: Data
-
-
 class CompletionAppBlockingResponse(AppBlockingResponse):
    """
    CompletionAppBlockingResponse entity
@@ -847,33 +819,6 @@ class WorkflowAppBlockingResponse(AppBlockingResponse):
    data: Data


-class WorkflowAppPausedBlockingResponse(AppBlockingResponse):
-    """
-    WorkflowAppPausedBlockingResponse entity
-    """
-
-    class Data(BaseModel):
-        """
-        Data entity
-        """
-
-        id: str
-        workflow_id: str
-        status: WorkflowExecutionStatus
-        outputs: Mapping[str, Any] | None = None
-        error: str | None = None
-        elapsed_time: float
-        total_tokens: int
-        total_steps: int
-        created_at: int
-        finished_at: int | None
-        paused_nodes: Sequence[str] = Field(default_factory=list)
-        reasons: Sequence[Mapping[str, Any]] = Field(default_factory=list)
-
-    workflow_run_id: str
-    data: Data
-
-
 class AgentLogStreamResponse(StreamResponse):
    """
    AgentLogStreamResponse entity
@@ -1,6 +1,6 @@
 from __future__ import annotations

-from collections.abc import Iterator
+from collections.abc import Generator  # Changed from Iterator
 from contextlib import contextmanager
 from contextvars import ContextVar
 from dataclasses import dataclass
@@ -32,7 +32,7 @@ def get_current_file_access_scope() -> FileAccessScope | None:


@contextmanager
-def bind_file_access_scope(scope: FileAccessScope) -> Iterator[None]:
+def bind_file_access_scope(scope: FileAccessScope) -> Generator[None, None, None]:  # Changed from Iterator[None]
    token = _current_file_access_scope.set(scope)
    try:
        yield
@@ -70,12 +70,32 @@ class ProviderManager:
    Request-bound managers may carry caller identity in that runtime, and the
    resulting ``ProviderConfiguration`` objects must reuse it for downstream
    model-type and schema lookups.
+
+    Configuration assembly is cached per manager instance so call chains that
+    share one request-scoped manager can reuse the same provider graph instead
+    of rebuilding it for every lookup. Call ``clear_configurations_cache()``
+    when a long-lived manager needs to observe writes performed within the same
+    instance scope.
    """

+    decoding_rsa_key: Any | None
+    decoding_cipher_rsa: Any | None
+    _model_runtime: ModelRuntime
+    _configurations_cache: dict[str, ProviderConfigurations]
+
    def __init__(self, model_runtime: ModelRuntime):
        self.decoding_rsa_key = None
        self.decoding_cipher_rsa = None
        self._model_runtime = model_runtime
+        self._configurations_cache = {}
+
+    def clear_configurations_cache(self, tenant_id: str | None = None) -> None:
+        """Drop assembled provider configurations cached on this manager instance."""
+        if tenant_id is None:
+            self._configurations_cache.clear()
+            return
+
+        self._configurations_cache.pop(tenant_id, None)

    def get_configurations(self, tenant_id: str) -> ProviderConfigurations:
        """
@@ -114,6 +134,10 @@ class ProviderManager:
        :param tenant_id:
        :return:
        """
+        cached_configurations = self._configurations_cache.get(tenant_id)
+        if cached_configurations is not None:
+            return cached_configurations
+
        # Get all provider records of the workspace
        provider_name_to_provider_records_dict = self._get_all_providers(tenant_id)

@@ -273,6 +297,8 @@ class ProviderManager:

            provider_configurations[str(provider_id_entity)] = provider_configuration

+        self._configurations_cache[tenant_id] = provider_configurations
+
        # Return the encapsulated object
        return provider_configurations

@@ -139,8 +139,10 @@ class Jieba(BaseKeyword):
            "__data__": {"index_id": self.dataset.id, "summary": None, "table": keyword_table},
        }
        dataset_keyword_table = self.dataset.dataset_keyword_table
-        keyword_data_source_type = dataset_keyword_table.data_source_type
+        keyword_data_source_type = dataset_keyword_table.data_source_type if dataset_keyword_table else "file"
        if keyword_data_source_type == "database":
+            if dataset_keyword_table is None:
+                return
            dataset_keyword_table.keyword_table = dumps_with_sets(keyword_table_dict)
            db.session.commit()
        else:
@@ -1,4 +1,5 @@
 import re
+from collections.abc import Callable
 from operator import itemgetter
 from typing import cast

@@ -80,12 +81,14 @@ class JiebaKeywordTableHandler:

            def extract_tags(self, sentence: str, top_k: int | None = 20, **kwargs):
                # Basic frequency-based keyword extraction as a fallback when TF-IDF is unavailable.
-                top_k = kwargs.pop("topK", top_k)
+                top_k = cast(int | None, kwargs.pop("topK", top_k))
+                if top_k is None:
+                    top_k = 20
                cut = getattr(jieba, "cut", None)
                if self._lcut:
                    tokens = self._lcut(sentence)
                elif callable(cut):
-                    tokens = list(cut(sentence))
+                    tokens = list(cast(Callable[[str], list[str]], cut)(sentence))
                else:
                    tokens = re.findall(r"\w+", sentence)

@@ -108,7 +111,7 @@ class JiebaKeywordTableHandler:
            sentence=text,
            topK=max_keywords_per_chunk,
        )
-        # jieba.analyse.extract_tags returns list[Any] when withFlag is False by default.
+        # jieba.analyse.extract_tags returns an untyped list when withFlag is False by default.
        keywords = cast(list[str], keywords)

        return set(self._expand_tokens_with_subtokens(set(keywords)))
@@ -158,7 +158,7 @@ class RetrievalService:
                    )

            if futures:
-                for future in concurrent.futures.as_completed(futures, timeout=3600):
+                for _ in concurrent.futures.as_completed(futures, timeout=3600):
                    if exceptions:
                        for f in futures:
                            f.cancel()
@@ -94,6 +94,7 @@ class ExtractProcessor:
        cls, extract_setting: ExtractSetting, is_automatic: bool = False, file_path: str | None = None
    ) -> list[Document]:
        if extract_setting.datasource_type == DatasourceType.FILE:
+            upload_file = extract_setting.upload_file
            with tempfile.TemporaryDirectory() as temp_dir:
                upload_file = extract_setting.upload_file
                if not file_path:
@@ -104,6 +105,7 @@ class ExtractProcessor:
                    storage.download(upload_file.key, file_path)
                input_file = Path(file_path)
                file_extension = input_file.suffix.lower()
+                assert upload_file is not None, "upload_file is required"
                etl_type = dify_config.ETL_TYPE
                extractor: BaseExtractor | None = None
                if etl_type == "Unstructured":
@@ -28,7 +28,7 @@ class FunctionCallMultiDatasetRouter:
                SystemPromptMessage(content="You are a helpful AI assistant."),
                UserPromptMessage(content=query),
            ]
-            result: LLMResult = model_instance.invoke_llm(
+            result: LLMResult = model_instance.invoke_llm(  # pyright: ignore[reportCallIssue, reportArgumentType]
                prompt_messages=prompt_messages,
                tools=dataset_tools,
                stream=False,
@@ -4,7 +4,7 @@ from __future__ import annotations

 import codecs
 import re
-from collections.abc import Collection
+from collections.abc import Set as AbstractSet
 from typing import Any, Literal

 from core.model_manager import ModelInstance
@@ -21,8 +21,8 @@ class EnhanceRecursiveCharacterTextSplitter(RecursiveCharacterTextSplitter):
    def from_encoder[T: EnhanceRecursiveCharacterTextSplitter](
        cls: type[T],
        embedding_model_instance: ModelInstance | None,
-        allowed_special: Literal["all"] | set[str] = set(),
-        disallowed_special: Literal["all"] | Collection[str] = "all",
+        allowed_special: Literal["all"] | AbstractSet[str] = frozenset(),
+        disallowed_special: Literal["all"] | AbstractSet[str] = "all",
        **kwargs: Any,
    ) -> T:
        def _token_encoder(texts: list[str]) -> list[int]:
@@ -40,6 +40,7 @@ class EnhanceRecursiveCharacterTextSplitter(RecursiveCharacterTextSplitter):

            return [len(text) for text in texts]

+        _ = _token_encoder  # kept for future token-length wiring
        return cls(length_function=_character_encoder, **kwargs)


@@ -4,7 +4,8 @@ import copy
 import logging
 import re
 from abc import ABC, abstractmethod
-from collections.abc import Callable, Collection, Iterable, Sequence, Set
+from collections.abc import Callable, Iterable, Sequence
+from collections.abc import Set as AbstractSet
 from dataclasses import dataclass
 from typing import Any, Literal

@@ -187,8 +188,8 @@ class TokenTextSplitter(TextSplitter):
        self,
        encoding_name: str = "gpt2",
        model_name: str | None = None,
-        allowed_special: Literal["all"] | Set[str] = set(),
-        disallowed_special: Literal["all"] | Collection[str] = "all",
+        allowed_special: Literal["all"] | AbstractSet[str] = frozenset(),
+        disallowed_special: Literal["all"] | AbstractSet[str] = "all",
        **kwargs: Any,
    ):
        """Create a new TextSplitter."""
@@ -207,8 +208,8 @@ class TokenTextSplitter(TextSplitter):
        else:
            enc = tiktoken.get_encoding(encoding_name)
        self._tokenizer = enc
-        self._allowed_special = allowed_special
-        self._disallowed_special = disallowed_special
+        self._allowed_special: Literal["all"] | AbstractSet[str] = allowed_special
+        self._disallowed_special: Literal["all"] | AbstractSet[str] = disallowed_special

    def split_text(self, text: str) -> list[str]:
        def _encode(_text: str) -> list[int]:
@@ -105,7 +105,7 @@ class Article:


 def extract_using_readabilipy(html: str):
-    json_article: dict[str, Any] = simple_json_from_html_string(html, use_readability=True)
+    json_article: dict[str, Any] = simple_json_from_html_string(html, use_readability=False)
    article = Article(
        title=json_article.get("title") or "",
        author=json_article.get("byline") or "",
@@ -12,10 +12,15 @@ from collections.abc import Sequence
 from sqlalchemy import select
 from sqlalchemy.orm import Session

-from core.workflow.human_input_policy import get_preferred_form_token
 from extensions.ext_database import db
 from models.human_input import HumanInputFormRecipient, RecipientType

+_FORM_TOKEN_PRIORITY = {
+    RecipientType.BACKSTAGE: 0,
+    RecipientType.CONSOLE: 1,
+    RecipientType.STANDALONE_WEB_APP: 2,
+}
+

 def load_form_tokens_by_form_id(
    form_ids: Sequence[str],
@@ -35,16 +40,16 @@ def load_form_tokens_by_form_id(


 def _load_form_tokens_by_form_id(session: Session, form_ids: Sequence[str]) -> dict[str, str]:
-    recipients_by_form_id: dict[str, list[tuple[RecipientType, str]]] = {}
+    tokens_by_form_id: dict[str, tuple[int, str]] = {}
    stmt = select(HumanInputFormRecipient).where(HumanInputFormRecipient.form_id.in_(form_ids))
    for recipient in session.scalars(stmt):
-        if not recipient.access_token:
+        priority = _FORM_TOKEN_PRIORITY.get(recipient.recipient_type)
+        if priority is None or not recipient.access_token:
            continue
-        recipients_by_form_id.setdefault(recipient.form_id, []).append((recipient.recipient_type, recipient.access_token))

-    tokens_by_form_id: dict[str, str] = {}
-    for form_id, recipients in recipients_by_form_id.items():
-        token = get_preferred_form_token(recipients)
-        if token is not None:
-            tokens_by_form_id[form_id] = token
-    return tokens_by_form_id
+        candidate = (priority, recipient.access_token)
+        current = tokens_by_form_id.get(recipient.form_id)
+        if current is None or candidate[0] < current[0]:
+            tokens_by_form_id[recipient.form_id] = candidate
+
+    return {form_id: token for form_id, (_, token) in tokens_by_form_id.items()}
@@ -1,72 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Mapping, Sequence
-from enum import StrEnum
-from typing import Any
-
-from models.human_input import RecipientType
-
-
-class HumanInputSurface(StrEnum):
-    SERVICE_API = "service_api"
-    CONSOLE = "console"
-
-
-# Service API is intentionally narrower than other surfaces: app-token callers
-# should only be able to act on end-user web forms, not internal console flows.
-_ALLOWED_RECIPIENT_TYPES_BY_SURFACE: dict[HumanInputSurface, frozenset[RecipientType]] = {
-    HumanInputSurface.SERVICE_API: frozenset({RecipientType.STANDALONE_WEB_APP}),
-    HumanInputSurface.CONSOLE: frozenset({RecipientType.CONSOLE, RecipientType.BACKSTAGE}),
-}
-
-# A single HITL form can have multiple recipient records; this shared priority
-# keeps every API surface consistent about which resume token to expose.
-_RECIPIENT_TOKEN_PRIORITY: dict[RecipientType, int] = {
-    RecipientType.BACKSTAGE: 0,
-    RecipientType.CONSOLE: 1,
-    RecipientType.STANDALONE_WEB_APP: 2,
-}
-
-
-def is_recipient_type_allowed_for_surface(
-    recipient_type: RecipientType | None,
-    surface: HumanInputSurface,
-) -> bool:
-    if recipient_type is None:
-        return False
-    return recipient_type in _ALLOWED_RECIPIENT_TYPES_BY_SURFACE[surface]
-
-
-def get_preferred_form_token(
-    recipients: Sequence[tuple[RecipientType, str]],
-) -> str | None:
-    chosen_token: str | None = None
-    chosen_priority: int | None = None
-    for recipient_type, token in recipients:
-        priority = _RECIPIENT_TOKEN_PRIORITY.get(recipient_type)
-        if priority is None or not token:
-            continue
-        if chosen_priority is None or priority < chosen_priority:
-            chosen_priority = priority
-            chosen_token = token
-    return chosen_token
-
-
-def enrich_human_input_pause_reasons(
-    reasons: Sequence[Mapping[str, Any]],
-    *,
-    form_tokens_by_form_id: Mapping[str, str],
-    expiration_times_by_form_id: Mapping[str, int],
-) -> list[dict[str, Any]]:
-    enriched: list[dict[str, Any]] = []
-    for reason in reasons:
-        updated = dict(reason)
-        if updated.get("type") == "human_input_required":
-            form_id = updated.get("form_id")
-            if isinstance(form_id, str):
-                updated["form_token"] = form_tokens_by_form_id.get(form_id)
-                expiration_time = expiration_times_by_form_id.get(form_id)
-                if expiration_time is not None:
-                    updated["expiration_time"] = expiration_time
-        enriched.append(updated)
-    return enriched
@@ -58,6 +58,7 @@ class MessageListItem(ResponseModel):
    message_files: list[MessageFile]
    status: str
    error: str | None = None
+    workflow_run_id: str | None = None
    extra_contents: list[ExecutionExtraContentDomainModel]

    @field_validator("inputs", mode="before")
@@ -76,7 +76,6 @@ class _StreamsSubscription(Subscription):
        # reading and writing the _listener / `_closed` attribute.
        self._lock = threading.Lock()
        self._closed: bool = False
-        # self._closed = threading.Event()
        self._listener: threading.Thread | None = None

    def _listen(self) -> None:
@@ -1,5 +1,5 @@
 import contextvars
-from collections.abc import Iterator
+from collections.abc import Generator  # Changed from Iterator
 from contextlib import contextmanager
 from typing import TYPE_CHECKING

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
 def preserve_flask_contexts(
    flask_app: Flask,
    context_vars: contextvars.Context,
-) -> Iterator[None]:
+) -> Generator[None, None, None]:  # Changed from Iterator[None]
    """
    A context manager that handles:
    1. flask-login's UserProxy copy
@@ -1,6 +1,6 @@
 import json
 import uuid
-from collections.abc import Iterator
+from collections.abc import Generator  # Added Generator
 from contextlib import contextmanager
 from typing import Any

@@ -75,7 +75,7 @@ class AnalyticdbVectorBySql:
        )

    @contextmanager
-    def _get_cursor(self) -> Iterator[Any]:
+    def _get_cursor(self) -> Generator[Any, None, None]:  # Changed from Iterator[Any]
        assert self.pool is not None, "Connection pool is not initialized"
        conn = self.pool.getconn()
        cur = conn.cursor()
@@ -114,10 +114,10 @@ override-dependencies = [
 dev = [
    "coverage>=7.13.4",
    "dotenv-linter>=0.7.0",
-    "faker>=20.1.0",
+    "faker>=40.15.0",
    "lxml-stubs>=0.5.1",
-    "basedpyright>=1.39.0",
-    "ruff>=0.15.10",
+    "basedpyright>=1.39.3",
+    "ruff>=0.15.11",
    "pytest>=9.0.3",
    "pytest-benchmark>=5.2.3",
    "pytest-cov>=7.1.0",
@@ -157,14 +157,14 @@ dev = [
    "types-tensorflow>=2.18.0.20260408",
    "types-tqdm>=4.67.3.20260408",
    "types-ujson>=5.10.0",
-    "boto3-stubs>=1.42.88",
+    "boto3-stubs>=1.42.92",
    "types-jmespath>=1.1.0.20260408",
-    "hypothesis>=6.151.12",
+    "hypothesis>=6.152.1",
    "types_pyOpenSSL>=24.1.0",
    "types_cffi>=2.0.0.20260408",
    "types_setuptools>=82.0.0.20260408",
    "pandas-stubs>=3.0.0",
-    "scipy-stubs>=1.15.3.0",
+    "scipy-stubs>=1.17.1.4",
    "types-python-http-client>=3.3.7.20260408",
    "import-linter>=2.3",
    "types-redis>=4.6.0.20241004",
@@ -42,7 +42,7 @@ from libs.helper import convert_datetime_to_date
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from libs.time_parser import get_time_threshold
 from models.enums import WorkflowRunTriggeredFrom
-from models.human_input import HumanInputForm, HumanInputFormRecipient
+from models.human_input import HumanInputForm
 from models.workflow import WorkflowAppLog, WorkflowArchiveLog, WorkflowPause, WorkflowPauseReason, WorkflowRun
 from repositories.api_workflow_run_repository import APIWorkflowRunRepository, RunsWithRelatedCountsDict
 from repositories.entities.workflow_pause import WorkflowPauseEntity
@@ -63,7 +63,6 @@ class _WorkflowRunError(Exception):
 def _build_human_input_required_reason(
    reason_model: WorkflowPauseReason,
    form_model: HumanInputForm | None,
-    recipients: Sequence[HumanInputFormRecipient] = (),
 ) -> HumanInputRequired:
    form_content = ""
    inputs = []
@@ -90,7 +89,7 @@ def _build_human_input_required_reason(
            resolved_default_values = dict(definition.default_values)
            node_title = definition.node_title or node_title

-    reason = HumanInputRequired(
+    return HumanInputRequired(
        form_id=form_id,
        form_content=form_content,
        inputs=inputs,
@@ -99,7 +98,6 @@ def _build_human_input_required_reason(
        node_title=node_title,
        resolved_default_values=resolved_default_values,
    )
-    return reason


 class DifyAPISQLAlchemyWorkflowRunRepository(APIWorkflowRunRepository):
@@ -806,23 +804,12 @@ class DifyAPISQLAlchemyWorkflowRunRepository(APIWorkflowRunRepository):
            form_stmt = select(HumanInputForm).where(HumanInputForm.id.in_(form_ids))
            for form in session.scalars(form_stmt).all():
                form_models[form.id] = form
-        recipients_by_form_id: dict[str, list[HumanInputFormRecipient]] = {}
-        if form_ids:
-            recipient_stmt = select(HumanInputFormRecipient).where(HumanInputFormRecipient.form_id.in_(form_ids))
-            for recipient in session.scalars(recipient_stmt).all():
-                recipients_by_form_id.setdefault(recipient.form_id, []).append(recipient)

        pause_reasons: list[PauseReason] = []
        for reason in pause_reason_models:
            if reason.type_ == PauseReasonType.HUMAN_INPUT_REQUIRED:
                form_model = form_models.get(reason.form_id)
-                pause_reasons.append(
-                    _build_human_input_required_reason(
-                        reason,
-                        form_model,
-                        recipients_by_form_id.get(reason.form_id, ()),
-                    )
-                )
+                pause_reasons.append(_build_human_input_required_reason(reason, form_model))
            else:
                pause_reasons.append(reason.to_entity())
        return pause_reasons
@@ -162,7 +162,6 @@ class AppGenerateService:
                                invoke_from=invoke_from,
                                streaming=True,
                                call_depth=0,
-                                workflow_run_id=str(uuid.uuid4()),
                            )
                            payload_json = payload.model_dump_json()

@@ -184,10 +183,6 @@ class AppGenerateService:
                    else:
                        # Blocking mode: run synchronously and return JSON instead of SSE
                        # Keep behaviour consistent with WORKFLOW blocking branch.
-                        pause_config = PauseStateLayerConfig(
-                            session_factory=session_factory.get_session_maker(),
-                            state_owner_user_id=workflow.created_by,
-                        )
                        advanced_generator = AdvancedChatAppGenerator()
                        return rate_limit.generate(
                            advanced_generator.convert_to_event_stream(
@@ -199,7 +194,6 @@ class AppGenerateService:
                                    invoke_from=invoke_from,
                                    workflow_run_id=str(uuid.uuid4()),
                                    streaming=False,
-                                    pause_state_config=pause_config,
                                )
                            ),
                            request_id=request_id,
@@ -37,10 +37,13 @@ class AppTaskService:
        Returns:
            None
        """
-        # Legacy mechanism: Set stop flag in Redis
-        AppQueueManager.set_stop_flag(task_id, invoke_from, user_id)
-
        # New mechanism: Send stop command via GraphEngine for workflow-based apps
        # This ensures proper workflow status recording in the persistence layer
        if app_mode in (AppMode.ADVANCED_CHAT, AppMode.WORKFLOW):
+            # Let the event handler process the Graphon abort event instead of
+            # stopping the queue listener immediately. Otherwise, events may be
+            # lost and the workflow run can remain stuck in the running state.
            GraphEngineManager(redis_client).send_stop_command(task_id)
+        else:
+            # Legacy mechanism: Set stop flag in Redis
+            AppQueueManager.set_stop_flag(task_id, invoke_from, user_id)
@@ -2,7 +2,7 @@ import base64
 import hashlib
 import os
 import uuid
-from collections.abc import Iterator, Sequence
+from collections.abc import Generator, Sequence  # Changed Iterator to Generator
 from contextlib import contextmanager, suppress
 from tempfile import NamedTemporaryFile
 from typing import Literal
@@ -324,7 +324,7 @@ class FileService:
    def build_upload_files_zip_tempfile(
        *,
        upload_files: Sequence[UploadFile],
-    ) -> Iterator[str]:
+    ) -> Generator[str, None, None]:  # Changed from Iterator[str]
        """
        Build a ZIP from `UploadFile`s and yield a tempfile path.

@@ -1,10 +1,10 @@
 import json
 import logging
 import time
-from typing import Any, TypedDict
+from typing import Any, TypedDict, cast

 from core.app.app_config.entities import ModelConfig
-from core.rag.datasource.retrieval_service import RetrievalService
+from core.rag.datasource.retrieval_service import DefaultRetrievalModelDict, RetrievalService
 from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.models.document import Document
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
@@ -36,6 +36,10 @@ default_retrieval_model = {
 }


+class HitTestingRetrievalModelDict(DefaultRetrievalModelDict, total=False):
+    metadata_filtering_conditions: dict[str, Any]
+
+
 class HitTestingService:
    @classmethod
    def retrieve(
@@ -51,17 +55,18 @@ class HitTestingService:
        start = time.perf_counter()

        # get retrieval model , if the model is not setting , using default
-        if not retrieval_model:
-            retrieval_model = dataset.retrieval_model or default_retrieval_model
-        assert isinstance(retrieval_model, dict)
+        resolved_retrieval_model = cast(
+            HitTestingRetrievalModelDict,
+            retrieval_model or dataset.retrieval_model or default_retrieval_model,
+        )
        document_ids_filter = None
-        metadata_filtering_conditions = retrieval_model.get("metadata_filtering_conditions", {})
-        if metadata_filtering_conditions and query:
+        metadata_filtering_conditions_raw = resolved_retrieval_model.get("metadata_filtering_conditions", {})
+        if metadata_filtering_conditions_raw and query:
            dataset_retrieval = DatasetRetrieval()

            from core.rag.entities import MetadataFilteringCondition

-            metadata_filtering_conditions = MetadataFilteringCondition.model_validate(metadata_filtering_conditions)
+            metadata_filtering_conditions = MetadataFilteringCondition.model_validate(metadata_filtering_conditions_raw)

            metadata_filter_document_ids, metadata_condition = dataset_retrieval.get_metadata_filter_condition(
                dataset_ids=[dataset.id],
@@ -78,19 +83,21 @@ class HitTestingService:
            if metadata_condition and not document_ids_filter:
                return cls.compact_retrieve_response(query, [])
        all_documents = RetrievalService.retrieve(
-            retrieval_method=RetrievalMethod(retrieval_model.get("search_method", RetrievalMethod.SEMANTIC_SEARCH)),
+            retrieval_method=RetrievalMethod(
+                resolved_retrieval_model.get("search_method", RetrievalMethod.SEMANTIC_SEARCH)
+            ),
            dataset_id=dataset.id,
            query=query,
            attachment_ids=attachment_ids,
-            top_k=retrieval_model.get("top_k", 4),
-            score_threshold=retrieval_model.get("score_threshold", 0.0)
-            if retrieval_model["score_threshold_enabled"]
+            top_k=resolved_retrieval_model.get("top_k", 4),
+            score_threshold=resolved_retrieval_model.get("score_threshold", 0.0)
+            if resolved_retrieval_model["score_threshold_enabled"]
            else 0.0,
-            reranking_model=retrieval_model.get("reranking_model", None)
-            if retrieval_model["reranking_enable"]
+            reranking_model=resolved_retrieval_model.get("reranking_model", None)
+            if resolved_retrieval_model["reranking_enable"]
            else None,
-            reranking_mode=retrieval_model.get("reranking_mode") or "reranking_model",
-            weights=retrieval_model.get("weights", None),
+            reranking_mode=resolved_retrieval_model.get("reranking_mode") or "reranking_model",
+            weights=resolved_retrieval_model.get("weights", None),
            document_ids_filter=document_ids_filter,
        )

@@ -23,7 +23,7 @@ class PluginAutoUpgradeService:
        exclude_plugins: list[str],
        include_plugins: list[str],
    ) -> bool:
-        with session_factory.create_session() as session:
+        with session_factory.create_session() as session, session.begin():
            exist_strategy = session.scalar(
                select(TenantPluginAutoUpgradeStrategy)
                .where(TenantPluginAutoUpgradeStrategy.tenant_id == tenant_id)
@@ -50,7 +50,7 @@ class PluginAutoUpgradeService:

    @staticmethod
    def exclude_plugin(tenant_id: str, plugin_id: str) -> bool:
-        with session_factory.create_session() as session:
+        with session_factory.create_session() as session, session.begin():
            exist_strategy = session.scalar(
                select(TenantPluginAutoUpgradeStrategy)
                .where(TenantPluginAutoUpgradeStrategy.tenant_id == tenant_id)
@@ -12,10 +12,8 @@ from typing import Any
 from sqlalchemy import desc, select
 from sqlalchemy.orm import Session, sessionmaker

-from core.app.apps.common.pause_reason_serializer import pause_reason_to_public_dict
 from core.app.apps.message_generator import MessageGenerator
 from core.app.entities.task_entities import (
-    HumanInputRequiredResponse,
    MessageReplaceStreamResponse,
    NodeFinishStreamResponse,
    NodeStartStreamResponse,
@@ -24,13 +22,10 @@ from core.app.entities.task_entities import (
    WorkflowStartStreamResponse,
 )
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext
-from core.workflow.human_input_forms import load_form_tokens_by_form_id
-from core.workflow.human_input_policy import enrich_human_input_pause_reasons
 from graphon.entities import WorkflowStartReason
 from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
 from graphon.runtime import GraphRuntimeState
 from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
-from models.human_input import HumanInputForm
 from models.model import AppMode, Message
 from models.workflow import WorkflowNodeExecutionTriggeredFrom, WorkflowRun
 from repositories.api_workflow_node_execution_repository import WorkflowNodeExecutionSnapshot
@@ -66,8 +61,20 @@ def build_workflow_event_stream(
    session_maker: sessionmaker[Session],
    idle_timeout: float = 300,
    ping_interval: float = 10.0,
-    close_on_pause: bool = True,
 ) -> Generator[Mapping[str, Any] | str, None, None]:
+    """Yield a stream of workflow events composed of a DB-derived snapshot followed by live tail.
+
+    The stream is assembled in two phases that are kept **structurally disjoint** so no
+    per-event deduplication is required:
+
+    1. Snapshot phase: events rebuilt from persistent state via ``_build_snapshot_events``
+       (``workflow_started``, optional ``message_replace``, ``node_started``/``node_finished``
+       for each persisted execution, and an optional terminal ``workflow_paused``). This
+       represents the history that already happened from the client's point of view.
+    2. Tail phase: events delivered by the broadcast subscription **from the moment of
+       subscription onward only**. Anything that was published before the subscription was
+       established is ignored here, since message id is not tracked in current implementation.
+    """
    topic = MessageGenerator.get_response_topic(app_mode, workflow_run.id)
    workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
    node_execution_repo = DifyAPIRepositoryFactory.create_api_workflow_node_execution_repository(session_maker)
@@ -121,14 +128,13 @@ def build_workflow_event_stream(
                    message_context=message_context,
                    pause_entity=pause_entity,
                    resumption_context=resumption_context,
-                    session_maker=session_maker,
                )

                for event in snapshot_events:
                    last_msg_time = time.time()
                    last_ping_time = last_msg_time
                    yield event
-                    if _is_terminal_event(event, close_on_pause=close_on_pause):
+                    if _is_terminal_event(event, include_paused=True):
                        return

                while True:
@@ -153,7 +159,7 @@ def build_workflow_event_stream(
                    last_msg_time = time.time()
                    last_ping_time = last_msg_time
                    yield event
-                    if _is_terminal_event(event, close_on_pause=close_on_pause):
+                    if _is_terminal_event(event, include_paused=True):
                        return
            finally:
                buffer_state.stop_event.set()
@@ -214,7 +220,6 @@ def _build_snapshot_events(
    message_context: MessageContext | None,
    pause_entity: WorkflowPauseEntity | None,
    resumption_context: WorkflowResumptionContext | None,
-    session_maker: sessionmaker[Session] | None = None,
 ) -> list[Mapping[str, Any]]:
    events: list[Mapping[str, Any]] = []

@@ -249,22 +254,12 @@ def _build_snapshot_events(
            events.append(node_finished)

    if workflow_run.status == WorkflowExecutionStatus.PAUSED and pause_entity is not None:
-        for human_input_event in _build_human_input_required_events(
-            workflow_run_id=workflow_run.id,
-            task_id=task_id,
-            pause_entity=pause_entity,
-            session_maker=session_maker,
-        ):
-            _apply_message_context(human_input_event, message_context)
-            events.append(human_input_event)
-
        pause_event = _build_pause_event(
            workflow_run=workflow_run,
            workflow_run_id=workflow_run.id,
            task_id=task_id,
            pause_entity=pause_entity,
            resumption_context=resumption_context,
-            session_maker=session_maker,
        )
        if pause_event is not None:
            _apply_message_context(pause_event, message_context)
@@ -332,92 +327,6 @@ def _build_node_started_event(
    return response.to_ignore_detail_dict()


-def _build_human_input_required_events(
-    *,
-    workflow_run_id: str,
-    task_id: str,
-    pause_entity: WorkflowPauseEntity,
-    session_maker: sessionmaker[Session] | None,
-) -> list[dict[str, Any]]:
-    reasons = [pause_reason_to_public_dict(reason) for reason in pause_entity.get_pause_reasons()]
-    human_input_form_ids = [
-        form_id
-        for reason in reasons
-        if reason.get("type") == "human_input_required"
-        for form_id in [reason.get("form_id")]
-        if isinstance(form_id, str)
-    ]
-
-    expiration_times_by_form_id: dict[str, int] = {}
-    display_in_ui_by_form_id: dict[str, bool] = {}
-    form_tokens_by_form_id: dict[str, str] = {}
-    if human_input_form_ids and session_maker is not None:
-        stmt = select(HumanInputForm.id, HumanInputForm.expiration_time, HumanInputForm.form_definition).where(
-            HumanInputForm.id.in_(human_input_form_ids)
-        )
-        with session_maker() as session:
-            for form_id, expiration_time, form_definition in session.execute(stmt):
-                expiration_times_by_form_id[str(form_id)] = int(expiration_time.timestamp())
-                try:
-                    definition_payload = json.loads(form_definition) if form_definition else {}
-                except (TypeError, json.JSONDecodeError):
-                    definition_payload = {}
-                display_in_ui_by_form_id[str(form_id)] = bool(definition_payload.get("display_in_ui"))
-            form_tokens_by_form_id = load_form_tokens_by_form_id(human_input_form_ids, session=session)
-
-    events: list[dict[str, Any]] = []
-    for reason in reasons:
-        if reason.get("type") != "human_input_required":
-            continue
-
-        form_id_raw = reason.get("form_id")
-        node_id_raw = reason.get("node_id")
-        node_title_raw = reason.get("node_title")
-        form_content_raw = reason.get("form_content")
-        if not isinstance(form_id_raw, str):
-            continue
-        if not isinstance(node_id_raw, str):
-            continue
-        if not isinstance(node_title_raw, str):
-            continue
-        if not isinstance(form_content_raw, str):
-            continue
-        form_id = form_id_raw
-        node_id = node_id_raw
-        node_title = node_title_raw
-        form_content = form_content_raw
-
-        inputs = reason.get("inputs")
-        actions = reason.get("actions")
-        resolved_default_values = reason.get("resolved_default_values")
-
-        expiration_time = expiration_times_by_form_id.get(form_id)
-        if expiration_time is None:
-            continue
-
-        response = HumanInputRequiredResponse(
-            task_id=task_id,
-            workflow_run_id=workflow_run_id,
-            data=HumanInputRequiredResponse.Data(
-                form_id=form_id,
-                node_id=node_id,
-                node_title=node_title,
-                form_content=form_content,
-                inputs=inputs if isinstance(inputs, list) else [],
-                actions=actions if isinstance(actions, list) else [],
-                display_in_ui=display_in_ui_by_form_id.get(form_id, False),
-                form_token=form_tokens_by_form_id.get(form_id),
-                resolved_default_values=(resolved_default_values if isinstance(resolved_default_values, dict) else {}),
-                expiration_time=expiration_time,
-            ),
-        )
-        payload = response.model_dump(mode="json")
-        payload["event"] = response.event.value
-        events.append(payload)
-
-    return events
-
-
 def _build_node_finished_event(
    *,
    workflow_run_id: str,
@@ -460,7 +369,6 @@ def _build_pause_event(
    task_id: str,
    pause_entity: WorkflowPauseEntity,
    resumption_context: WorkflowResumptionContext | None,
-    session_maker: sessionmaker[Session] | None,
 ) -> dict[str, Any] | None:
    paused_nodes: list[str] = []
    outputs: dict[str, Any] = {}
@@ -469,31 +377,7 @@ def _build_pause_event(
        paused_nodes = state.get_paused_nodes()
        outputs = dict(WorkflowRuntimeTypeConverter().to_json_encodable(state.outputs or {}))

-    reasons = [pause_reason_to_public_dict(reason) for reason in pause_entity.get_pause_reasons()]
-    human_input_form_ids = [
-        form_id
-        for reason in reasons
-        if reason.get("type") == "human_input_required"
-        for form_id in [reason.get("form_id")]
-        if isinstance(form_id, str)
-    ]
-    form_tokens_by_form_id: dict[str, str] = {}
-    expiration_times_by_form_id: dict[str, int] = {}
-    if human_input_form_ids and session_maker is not None:
-        with session_maker() as session:
-            form_tokens_by_form_id = load_form_tokens_by_form_id(human_input_form_ids, session=session)
-            stmt = select(HumanInputForm.id, HumanInputForm.expiration_time).where(HumanInputForm.id.in_(human_input_form_ids))
-            for row in session.execute(stmt):
-                form_id, expiration_time, *_rest = row
-                expiration_times_by_form_id[str(form_id)] = int(expiration_time.timestamp())
-        # Reconnect paths must preserve the same pause-reason contract as live streams;
-        # otherwise clients see schema drift after resume.
-        reasons = enrich_human_input_pause_reasons(
-            reasons,
-            form_tokens_by_form_id=form_tokens_by_form_id,
-            expiration_times_by_form_id=expiration_times_by_form_id,
-        )
-
+    reasons = [reason.model_dump(mode="json") for reason in pause_entity.get_pause_reasons()]
    response = WorkflowPauseStreamResponse(
        task_id=task_id,
        workflow_run_id=workflow_run_id,
@@ -578,19 +462,12 @@ def _parse_event_message(message: bytes) -> Mapping[str, Any] | None:
    return event


-def _is_terminal_event(
-    event: Mapping[str, Any] | str,
-    close_on_pause: bool = True,
-    *,
-    include_paused: bool | None = None,
-) -> bool:
-    if include_paused is not None:
-        close_on_pause = include_paused
+def _is_terminal_event(event: Mapping[str, Any] | str, include_paused=False) -> bool:
    if not isinstance(event, Mapping):
        return False
    event_type = event.get("event")
    if event_type == StreamEvent.WORKFLOW_FINISHED.value:
        return True
-    if close_on_pause:
+    if include_paused:
        return event_type == StreamEvent.WORKFLOW_PAUSED.value
    return False
@@ -399,8 +399,6 @@ def _resume_advanced_chat(
    workflow_run_id: str,
    workflow_run: WorkflowRun,
 ) -> None:
-    resumed_generate_entity = generate_entity.model_copy(update={"stream": True})
-
    try:
        triggered_from = WorkflowRunTriggeredFrom(workflow_run.triggered_from)
    except ValueError:
@@ -428,7 +426,7 @@ def _resume_advanced_chat(
            user=user,
            conversation=conversation,
            message=message,
-            application_generate_entity=resumed_generate_entity,
+            application_generate_entity=generate_entity,
            workflow_execution_repository=workflow_execution_repository,
            workflow_node_execution_repository=workflow_node_execution_repository,
            graph_runtime_state=graph_runtime_state,
@@ -438,8 +436,9 @@ def _resume_advanced_chat(
        logger.exception("Failed to resume chatflow execution for workflow run %s", workflow_run_id)
        raise

-    assert isinstance(response, Generator)
-    _publish_streaming_response(response, workflow_run_id, AppMode.ADVANCED_CHAT)
+    if generate_entity.stream:
+        assert isinstance(response, Generator)
+        _publish_streaming_response(response, workflow_run_id, AppMode.ADVANCED_CHAT)


 def _resume_workflow(
@@ -456,8 +455,6 @@ def _resume_workflow(
    workflow_run_repo,
    pause_entity,
 ) -> None:
-    resumed_generate_entity = generate_entity.model_copy(update={"stream": True})
-
    try:
        triggered_from = WorkflowRunTriggeredFrom(workflow_run.triggered_from)
    except ValueError:
@@ -483,7 +480,7 @@ def _resume_workflow(
            app_model=app_model,
            workflow=workflow,
            user=user,
-            application_generate_entity=resumed_generate_entity,
+            application_generate_entity=generate_entity,
            graph_runtime_state=graph_runtime_state,
            workflow_execution_repository=workflow_execution_repository,
            workflow_node_execution_repository=workflow_node_execution_repository,
@@ -493,8 +490,9 @@ def _resume_workflow(
        logger.exception("Failed to resume workflow execution for workflow run %s", workflow_run_id)
        raise

-    assert isinstance(response, Generator)
-    _publish_streaming_response(response, workflow_run_id, AppMode.WORKFLOW)
+    if generate_entity.stream:
+        assert isinstance(response, Generator)
+        _publish_streaming_response(response, workflow_run_id, AppMode.WORKFLOW)

    workflow_run_repo.delete_workflow_pause(pause_entity)

@@ -2,7 +2,6 @@

 from __future__ import annotations

-import secrets
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from unittest.mock import Mock
@@ -12,7 +11,6 @@ import pytest
 from sqlalchemy import Engine, delete, select
 from sqlalchemy.orm import Session, sessionmaker

-from core.workflow.human_input_adapter import DeliveryMethodType
 from extensions.ext_storage import storage
 from graphon.entities import WorkflowExecution
 from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
@@ -22,11 +20,9 @@ from graphon.nodes.human_input.enums import FormInputType, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.human_input import (
-    BackstageRecipientPayload,
    HumanInputDelivery,
    HumanInputForm,
    HumanInputFormRecipient,
-    RecipientType,
 )
 from models.workflow import WorkflowAppLog, WorkflowAppLogCreatedFrom, WorkflowPause, WorkflowPauseReason, WorkflowRun
 from repositories.entities.workflow_pause import WorkflowPauseEntity
@@ -632,12 +628,12 @@ class TestPrivateWorkflowPauseEntity:
 class TestBuildHumanInputRequiredReason:
    """Integration tests for _build_human_input_required_reason using real DB models."""

-    def test_prefers_standalone_web_app_token_when_available(
+    def test_builds_reason_from_form_definition(
        self,
        db_session_with_containers: Session,
        test_scope: _TestScope,
    ) -> None:
-        """Use the public standalone web-app token for service API payloads."""
+        """Build the graph pause reason from the stored form definition."""

        expiration_time = naive_utc_now()
        form_definition = FormDefinition(
@@ -664,40 +660,6 @@ class TestBuildHumanInputRequiredReason:
        db_session_with_containers.add(form_model)
        db_session_with_containers.flush()

-        delivery = HumanInputDelivery(
-            form_id=form_model.id,
-            delivery_method_type=DeliveryMethodType.WEBAPP,
-            channel_payload="{}",
-        )
-        db_session_with_containers.add(delivery)
-        db_session_with_containers.flush()
-
-        backstage_access_token = secrets.token_urlsafe(8)
-        backstage_recipient = HumanInputFormRecipient(
-            form_id=form_model.id,
-            delivery_id=delivery.id,
-            recipient_type=RecipientType.BACKSTAGE,
-            recipient_payload=BackstageRecipientPayload().model_dump_json(),
-            access_token=backstage_access_token,
-        )
-        console_access_token = secrets.token_urlsafe(8)
-        console_recipient = HumanInputFormRecipient(
-            form_id=form_model.id,
-            delivery_id=delivery.id,
-            recipient_type=RecipientType.CONSOLE,
-            recipient_payload="{}",
-            access_token=console_access_token,
-        )
-        web_app_access_token = secrets.token_urlsafe(8)
-        web_app_recipient = HumanInputFormRecipient(
-            form_id=form_model.id,
-            delivery_id=delivery.id,
-            recipient_type=RecipientType.STANDALONE_WEB_APP,
-            recipient_payload="{}",
-            access_token=web_app_access_token,
-        )
-        db_session_with_containers.add_all([backstage_recipient, console_recipient, web_app_recipient])
-        db_session_with_containers.flush()
        # Create a pause so the reason has a valid pause_id
        workflow_run = _create_workflow_run(
            db_session_with_containers,
@@ -726,15 +688,8 @@ class TestBuildHumanInputRequiredReason:
        # Refresh to ensure we have DB-round-tripped objects
        db_session_with_containers.refresh(form_model)
        db_session_with_containers.refresh(reason_model)
-        db_session_with_containers.refresh(backstage_recipient)
-        db_session_with_containers.refresh(console_recipient)
-        db_session_with_containers.refresh(web_app_recipient)

-        reason = _build_human_input_required_reason(
-            reason_model,
-            form_model,
-            [backstage_recipient, console_recipient, web_app_recipient],
-        )
+        reason = _build_human_input_required_reason(reason_model, form_model)

        assert isinstance(reason, HumanInputRequired)
        assert reason.node_title == "Ask Name"
@@ -742,92 +697,3 @@ class TestBuildHumanInputRequiredReason:
        assert reason.inputs[0].output_variable_name == "name"
        assert reason.actions[0].id == "approve"
        assert reason.resolved_default_values == {"name": "Alice"}
-        assert not hasattr(reason, "form_token")
-
-    def test_falls_back_to_console_token_when_web_app_token_missing(
-        self,
-        db_session_with_containers: Session,
-        test_scope: _TestScope,
-    ) -> None:
-        """Use the console token only when no standalone web-app token exists."""
-
-        expiration_time = naive_utc_now()
-        form_definition = FormDefinition(
-            form_content="content",
-            inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="name")],
-            user_actions=[UserAction(id="approve", title="Approve")],
-            rendered_content="rendered",
-            expiration_time=expiration_time,
-            default_values={"name": "Alice"},
-            node_title="Ask Name",
-            display_in_ui=True,
-        )
-
-        form_model = HumanInputForm(
-            tenant_id=test_scope.tenant_id,
-            app_id=test_scope.app_id,
-            workflow_run_id=str(uuid4()),
-            node_id="node-1",
-            form_definition=form_definition.model_dump_json(),
-            rendered_content="rendered",
-            status=HumanInputFormStatus.WAITING,
-            expiration_time=expiration_time,
-        )
-        db_session_with_containers.add(form_model)
-        db_session_with_containers.flush()
-
-        delivery = HumanInputDelivery(
-            form_id=form_model.id,
-            delivery_method_type=DeliveryMethodType.WEBAPP,
-            channel_payload="{}",
-        )
-        db_session_with_containers.add(delivery)
-        db_session_with_containers.flush()
-
-        backstage_access_token = secrets.token_urlsafe(8)
-        backstage_recipient = HumanInputFormRecipient(
-            form_id=form_model.id,
-            delivery_id=delivery.id,
-            recipient_type=RecipientType.BACKSTAGE,
-            recipient_payload=BackstageRecipientPayload().model_dump_json(),
-            access_token=backstage_access_token,
-        )
-        console_access_token = secrets.token_urlsafe(8)
-        console_recipient = HumanInputFormRecipient(
-            form_id=form_model.id,
-            delivery_id=delivery.id,
-            recipient_type=RecipientType.CONSOLE,
-            recipient_payload="{}",
-            access_token=console_access_token,
-        )
-        db_session_with_containers.add_all([backstage_recipient, console_recipient])
-        db_session_with_containers.flush()
-
-        workflow_run = _create_workflow_run(
-            db_session_with_containers,
-            test_scope,
-            status=WorkflowExecutionStatus.RUNNING,
-        )
-        pause = WorkflowPause(
-            workflow_id=test_scope.workflow_id,
-            workflow_run_id=workflow_run.id,
-            state_object_key=f"workflow-state-{uuid4()}.json",
-        )
-        db_session_with_containers.add(pause)
-        db_session_with_containers.flush()
-        test_scope.state_keys.add(pause.state_object_key)
-
-        reason_model = WorkflowPauseReason(
-            pause_id=pause.id,
-            type_=PauseReasonType.HUMAN_INPUT_REQUIRED,
-            form_id=form_model.id,
-            node_id="node-1",
-            message="",
-        )
-        db_session_with_containers.add(reason_model)
-        db_session_with_containers.commit()
-
-        reason = _build_human_input_required_reason(reason_model, form_model, [backstage_recipient, console_recipient])
-
-        assert isinstance(reason, HumanInputRequired)
-        assert not hasattr(reason, "form_token")
@@ -50,6 +50,7 @@ def make_message():
    msg.user_feedback = MagicMock(rating=None)
    msg.status = "normal"
    msg.error = None
+    msg.workflow_run_id = "22222222-2222-2222-2222-222222222222"
    return msg


@@ -84,6 +85,8 @@ class TestMessageListApi:
        assert result["limit"] == 20
        assert result["has_more"] is False
        assert len(result["data"]) == 2
+        assert result["data"][0]["workflow_run_id"] == "22222222-2222-2222-2222-222222222222"
+        assert result["data"][1]["workflow_run_id"] == "22222222-2222-2222-2222-222222222222"

    def test_get_not_chat_app(self):
        api = module.MessageListApi()
@@ -122,35 +122,6 @@ def test_post_form_invalid_recipient_type(app, monkeypatch: pytest.MonkeyPatch)
            handler(api, form_token="token")


-def test_post_form_rejects_webapp_recipient_type(app, monkeypatch: pytest.MonkeyPatch) -> None:
-    form = SimpleNamespace(tenant_id="tenant-1", recipient_type=RecipientType.STANDALONE_WEB_APP)
-
-    class _ServiceStub:
-        def __init__(self, *_args, **_kwargs):
-            pass
-
-        def get_form_by_token(self, _token):
-            return form
-
-    monkeypatch.setattr("controllers.console.human_input_form.HumanInputService", _ServiceStub)
-    monkeypatch.setattr(
-        "controllers.console.human_input_form.current_account_with_tenant",
-        lambda: (SimpleNamespace(id="user-1"), "tenant-1"),
-    )
-    monkeypatch.setattr("controllers.console.human_input_form.db", SimpleNamespace(engine=object()))
-
-    api = ConsoleHumanInputFormApi()
-    handler = _unwrap(api.post)
-
-    with app.test_request_context(
-        "/console/api/form/human_input/token",
-        method="POST",
-        json={"inputs": {"content": "ok"}, "action": "approve"},
-    ):
-        with pytest.raises(NotFoundError):
-            handler(api, form_token="token")
-
-
 def test_post_form_success(app, monkeypatch: pytest.MonkeyPatch) -> None:
    submit_mock = Mock()
    form = SimpleNamespace(tenant_id="tenant-1", recipient_type=RecipientType.CONSOLE)
@@ -1,705 +0,0 @@
-"""Dedicated tests for HITL behavior exposed through the Service API."""
-
-from __future__ import annotations
-
-import json
-import sys
-from collections.abc import Sequence
-from dataclasses import dataclass
-from datetime import UTC, datetime
-from types import SimpleNamespace
-from unittest.mock import ANY, MagicMock, Mock
-
-import pytest
-
-import services.app_generate_service as ags_module
-from controllers.service_api.app.workflow_events import WorkflowEventsApi
-from core.app.app_config.entities import AppAdditionalFeatures, WorkflowUIBasedAppConfig
-from core.app.apps.common import workflow_response_converter
-from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
-from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
-from core.app.entities.queue_entities import QueueWorkflowPausedEvent
-from core.app.entities.task_entities import (
-    ChatbotAppPausedBlockingResponse,
-    HumanInputRequiredResponse,
-    WorkflowAppPausedBlockingResponse,
-    WorkflowPauseStreamResponse,
-)
-from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext, _WorkflowGenerateEntityWrapper
-from core.workflow.system_variables import build_system_variables
-from graphon.entities import WorkflowStartReason
-from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
-from graphon.runtime import GraphRuntimeState, VariablePool
-from models.account import Account
-from models.enums import CreatorUserRole
-from models.model import AppMode
-from models.workflow import WorkflowRun
-from repositories.api_workflow_node_execution_repository import WorkflowNodeExecutionSnapshot
-from repositories.entities.workflow_pause import WorkflowPauseEntity
-from services.app_generate_service import AppGenerateService
-from services.workflow_event_snapshot_service import _build_snapshot_events
-from tests.unit_tests.controllers.service_api.conftest import _unwrap
-
-
-class _DummyRateLimit:
-    @staticmethod
-    def gen_request_key() -> str:
-        return "dummy-request-id"
-
-    def __init__(self, client_id: str, max_active_requests: int) -> None:
-        self.client_id = client_id
-        self.max_active_requests = max_active_requests
-
-    def enter(self, request_id: str | None = None) -> str:
-        return request_id or "dummy-request-id"
-
-    def exit(self, request_id: str) -> None:
-        return None
-
-    def generate(self, generator, request_id: str):
-        return generator
-
-
-def _mock_repo_for_run(monkeypatch: pytest.MonkeyPatch, workflow_run):
-    workflow_events_module = sys.modules["controllers.service_api.app.workflow_events"]
-    repo = SimpleNamespace(get_workflow_run_by_id_and_tenant_id=lambda **_kwargs: workflow_run)
-    monkeypatch.setattr(
-        workflow_events_module.DifyAPIRepositoryFactory,
-        "create_api_workflow_run_repository",
-        lambda *_args, **_kwargs: repo,
-    )
-    monkeypatch.setattr(workflow_events_module, "db", SimpleNamespace(engine=object()))
-    return workflow_events_module
-
-
-def _build_service_api_pause_converter() -> WorkflowResponseConverter:
-    application_generate_entity = SimpleNamespace(
-        inputs={},
-        files=[],
-        invoke_from=InvokeFrom.SERVICE_API,
-        app_config=SimpleNamespace(app_id="app-id", tenant_id="tenant-id"),
-    )
-    system_variables = build_system_variables(
-        user_id="user",
-        app_id="app-id",
-        workflow_id="workflow-id",
-        workflow_execution_id="run-id",
-    )
-    user = MagicMock(spec=Account)
-    user.id = "account-id"
-    user.name = "Tester"
-    user.email = "tester@example.com"
-    return WorkflowResponseConverter(
-        application_generate_entity=application_generate_entity,
-        user=user,
-        system_variables=system_variables,
-    )
-
-
-def _build_advanced_chat_paused_blocking_response() -> ChatbotAppPausedBlockingResponse:
-    data = ChatbotAppPausedBlockingResponse.Data(
-        id="msg-1",
-        mode="chat",
-        conversation_id="c1",
-        message_id="m1",
-        workflow_run_id="run-1",
-        answer="partial",
-        metadata={"usage": {"total_tokens": 1}},
-        created_at=1,
-        paused_nodes=["node-1"],
-        reasons=[
-            {
-                "type": PauseReasonType.HUMAN_INPUT_REQUIRED,
-                "form_id": "form-1",
-                "expiration_time": 100,
-            }
-        ],
-        status=WorkflowExecutionStatus.PAUSED,
-        elapsed_time=0.1,
-        total_tokens=0,
-        total_steps=0,
-    )
-    return ChatbotAppPausedBlockingResponse(task_id="t1", data=data)
-
-
-def _build_workflow_paused_blocking_response() -> WorkflowAppPausedBlockingResponse:
-    return WorkflowAppPausedBlockingResponse(
-        task_id="t1",
-        workflow_run_id="r1",
-        data=WorkflowAppPausedBlockingResponse.Data(
-            id="r1",
-            workflow_id="wf-1",
-            status=WorkflowExecutionStatus.PAUSED,
-            outputs={},
-            error=None,
-            elapsed_time=0.5,
-            total_tokens=0,
-            total_steps=2,
-            created_at=1,
-            finished_at=None,
-            paused_nodes=["node-1"],
-            reasons=[{"type": "human_input_required", "form_id": "form-1", "expiration_time": 100}],
-        ),
-    )
-
-
-@dataclass(frozen=True)
-class _FakePauseEntity(WorkflowPauseEntity):
-    pause_id: str
-    workflow_run_id: str
-    paused_at_value: datetime
-    pause_reasons: Sequence[HumanInputRequired]
-
-    @property
-    def id(self) -> str:
-        return self.pause_id
-
-    @property
-    def workflow_execution_id(self) -> str:
-        return self.workflow_run_id
-
-    def get_state(self) -> bytes:
-        raise AssertionError("state is not required for snapshot tests")
-
-    @property
-    def resumed_at(self) -> datetime | None:
-        return None
-
-    @property
-    def paused_at(self) -> datetime:
-        return self.paused_at_value
-
-    def get_pause_reasons(self) -> Sequence[HumanInputRequired]:
-        return self.pause_reasons
-
-
-def _build_workflow_run(status: WorkflowExecutionStatus) -> WorkflowRun:
-    return WorkflowRun(
-        id="run-1",
-        tenant_id="tenant-1",
-        app_id="app-1",
-        workflow_id="workflow-1",
-        type="workflow",
-        triggered_from="app-run",
-        version="v1",
-        graph=None,
-        inputs=json.dumps({"input": "value"}),
-        status=status,
-        outputs=json.dumps({}),
-        error=None,
-        elapsed_time=0.0,
-        total_tokens=0,
-        total_steps=0,
-        created_by_role=CreatorUserRole.END_USER,
-        created_by="user-1",
-        created_at=datetime(2024, 1, 1, tzinfo=UTC),
-    )
-
-
-def _build_snapshot(status: WorkflowNodeExecutionStatus) -> WorkflowNodeExecutionSnapshot:
-    created_at = datetime(2024, 1, 1, tzinfo=UTC)
-    finished_at = datetime(2024, 1, 1, 0, 0, 5, tzinfo=UTC)
-    return WorkflowNodeExecutionSnapshot(
-        execution_id="exec-1",
-        node_id="node-1",
-        node_type="human-input",
-        title="Human Input",
-        index=1,
-        status=status.value,
-        elapsed_time=0.5,
-        created_at=created_at,
-        finished_at=finished_at,
-        iteration_id=None,
-        loop_id=None,
-    )
-
-
-def _build_resumption_context(task_id: str) -> WorkflowResumptionContext:
-    app_config = WorkflowUIBasedAppConfig(
-        tenant_id="tenant-1",
-        app_id="app-1",
-        app_mode=AppMode.WORKFLOW,
-        workflow_id="workflow-1",
-    )
-    generate_entity = WorkflowAppGenerateEntity(
-        task_id=task_id,
-        app_config=app_config,
-        inputs={},
-        files=[],
-        user_id="user-1",
-        stream=True,
-        invoke_from=InvokeFrom.EXPLORE,
-        call_depth=0,
-        workflow_execution_id="run-1",
-    )
-    runtime_state = GraphRuntimeState(variable_pool=VariablePool(), start_at=0.0)
-    runtime_state.register_paused_node("node-1")
-    runtime_state.outputs = {"result": "value"}
-    wrapper = _WorkflowGenerateEntityWrapper(entity=generate_entity)
-    return WorkflowResumptionContext(
-        generate_entity=wrapper,
-        serialized_graph_runtime_state=runtime_state.dumps(),
-    )
-
-
-class TestHitlServiceApi:
-    # Service API event-stream continuation
-    def test_workflow_events_continue_on_pause_keeps_stream_open(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        workflow_run = SimpleNamespace(
-            id="run-1",
-            app_id="app-1",
-            created_by_role=CreatorUserRole.END_USER,
-            created_by="end-user-1",
-            finished_at=None,
-        )
-        workflow_events_module = _mock_repo_for_run(monkeypatch, workflow_run=workflow_run)
-        msg_generator = Mock()
-        msg_generator.retrieve_events.return_value = ["raw-event"]
-        workflow_generator = Mock()
-        workflow_generator.convert_to_event_stream.return_value = iter(["data: streamed\n\n"])
-        monkeypatch.setattr(workflow_events_module, "MessageGenerator", lambda: msg_generator)
-        monkeypatch.setattr(workflow_events_module, "WorkflowAppGenerator", lambda: workflow_generator)
-
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1&continue_on_pause=true", method="GET"):
-            response = handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-        assert response.get_data(as_text=True) == "data: streamed\n\n"
-        msg_generator.retrieve_events.assert_called_once_with(
-            AppMode.WORKFLOW,
-            "run-1",
-            terminal_events=["workflow_finished"],
-        )
-        workflow_generator.convert_to_event_stream.assert_called_once_with(["raw-event"])
-
-    def test_workflow_events_snapshot_continue_on_pause_keeps_pause_open(
-        self, app, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
-        workflow_run = SimpleNamespace(
-            id="run-1",
-            app_id="app-1",
-            created_by_role=CreatorUserRole.END_USER,
-            created_by="end-user-1",
-            finished_at=None,
-        )
-        workflow_events_module = _mock_repo_for_run(monkeypatch, workflow_run=workflow_run)
-        msg_generator = Mock()
-        workflow_generator = Mock()
-        workflow_generator.convert_to_event_stream.return_value = iter(["data: snapshot\n\n"])
-        snapshot_builder = Mock(return_value=["snapshot-events"])
-        monkeypatch.setattr(workflow_events_module, "MessageGenerator", lambda: msg_generator)
-        monkeypatch.setattr(workflow_events_module, "WorkflowAppGenerator", lambda: workflow_generator)
-        monkeypatch.setattr(workflow_events_module, "build_workflow_event_stream", snapshot_builder)
-
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context(
-            "/workflow/run-1/events?user=u1&include_state_snapshot=true&continue_on_pause=true",
-            method="GET",
-        ):
-            response = handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-        assert response.get_data(as_text=True) == "data: snapshot\n\n"
-        msg_generator.retrieve_events.assert_not_called()
-        snapshot_builder.assert_called_once_with(
-            app_mode=AppMode.WORKFLOW,
-            workflow_run=workflow_run,
-            tenant_id="tenant-1",
-            app_id="app-1",
-            session_maker=ANY,
-            close_on_pause=False,
-        )
-        workflow_generator.convert_to_event_stream.assert_called_once_with(["snapshot-events"])
-
-    def test_advanced_chat_blocking_injects_pause_state_config(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setattr(ags_module.dify_config, "BILLING_ENABLED", False)
-        monkeypatch.setattr(ags_module, "RateLimit", _DummyRateLimit)
-
-        workflow = MagicMock()
-        workflow.created_by = "owner-id"
-        monkeypatch.setattr(AppGenerateService, "_get_workflow", lambda *args, **kwargs: workflow)
-        monkeypatch.setattr(ags_module.session_factory, "get_session_maker", lambda: "session-maker")
-
-        generator_instance = MagicMock()
-        generator_instance.generate.return_value = {"result": "advanced-blocking"}
-        generator_instance.convert_to_event_stream.side_effect = lambda payload: payload
-        monkeypatch.setattr(ags_module, "AdvancedChatAppGenerator", lambda: generator_instance)
-
-        app_model = MagicMock()
-        app_model.mode = AppMode.ADVANCED_CHAT
-        app_model.id = "app-id"
-        app_model.tenant_id = "tenant-id"
-        app_model.max_active_requests = 0
-        app_model.is_agent = False
-
-        user = MagicMock()
-        user.id = "user-id"
-
-        result = AppGenerateService.generate(
-            app_model=app_model,
-            user=user,
-            args={"workflow_id": None, "query": "hi", "inputs": {}},
-            invoke_from=InvokeFrom.SERVICE_API,
-            streaming=False,
-        )
-
-        assert result == {"result": "advanced-blocking"}
-        call_kwargs = generator_instance.generate.call_args.kwargs
-        assert call_kwargs["streaming"] is False
-        assert call_kwargs["pause_state_config"] is not None
-        assert call_kwargs["pause_state_config"].session_factory == "session-maker"
-        assert call_kwargs["pause_state_config"].state_owner_user_id == "owner-id"
-
-    # Blocking payload contract
-    def test_advanced_chat_blocking_pause_payload_contract(self) -> None:
-        from core.app.apps.advanced_chat.generate_response_converter import AdvancedChatAppGenerateResponseConverter
-
-        response = AdvancedChatAppGenerateResponseConverter.convert_blocking_full_response(
-            _build_advanced_chat_paused_blocking_response()
-        )
-
-        assert response["event"] == "workflow_paused"
-        assert response["workflow_run_id"] == "run-1"
-        assert response["answer"] == "partial"
-        assert response["data"]["reasons"][0]["type"] == PauseReasonType.HUMAN_INPUT_REQUIRED
-        assert response["data"]["reasons"][0]["expiration_time"] == 100
-        assert "human_input_forms" not in response["data"]
-
-    def test_workflow_blocking_pause_payload_contract(self) -> None:
-        from core.app.apps.workflow.generate_response_converter import WorkflowAppGenerateResponseConverter
-
-        response = WorkflowAppGenerateResponseConverter.convert_blocking_full_response(
-            _build_workflow_paused_blocking_response()
-        )
-
-        assert response["workflow_run_id"] == "r1"
-        assert response["data"]["status"] == WorkflowExecutionStatus.PAUSED
-        assert response["data"]["paused_nodes"] == ["node-1"]
-        assert response["data"]["reasons"] == [
-            {"type": "human_input_required", "form_id": "form-1", "expiration_time": 100}
-        ]
-        assert "human_input_forms" not in response["data"]
-
-    def test_advanced_chat_blocking_pipeline_pause_payload_contract(self) -> None:
-        from core.app.app_config.entities import AppAdditionalFeatures
-        from core.app.apps.advanced_chat.generate_task_pipeline import AdvancedChatAppGenerateTaskPipeline
-        from models.enums import MessageStatus
-        from models.model import EndUser
-
-        app_config = WorkflowUIBasedAppConfig(
-            tenant_id="tenant",
-            app_id="app",
-            app_mode=AppMode.ADVANCED_CHAT,
-            additional_features=AppAdditionalFeatures(),
-            variables=[],
-            workflow_id="workflow-id",
-        )
-        application_generate_entity = AdvancedChatAppGenerateEntity.model_construct(
-            task_id="task",
-            app_config=app_config,
-            inputs={},
-            query="hello",
-            files=[],
-            user_id="user",
-            stream=False,
-            invoke_from=InvokeFrom.WEB_APP,
-            extras={},
-            trace_manager=None,
-            workflow_run_id="run-id",
-        )
-        pipeline = AdvancedChatAppGenerateTaskPipeline(
-            application_generate_entity=application_generate_entity,
-            workflow=SimpleNamespace(id="workflow-id", tenant_id="tenant", features_dict={}),
-            queue_manager=SimpleNamespace(invoke_from=InvokeFrom.WEB_APP, graph_runtime_state=None),
-            conversation=SimpleNamespace(id="conv-id", mode=AppMode.ADVANCED_CHAT),
-            message=SimpleNamespace(
-                id="message-id",
-                query="hello",
-                created_at=datetime.utcnow(),
-                status=MessageStatus.NORMAL,
-                answer="",
-            ),
-            user=EndUser(tenant_id="tenant", type="session", name="tester", session_id="session"),
-            stream=False,
-            dialogue_count=1,
-            draft_var_saver_factory=lambda **kwargs: None,
-        )
-        pipeline._task_state.answer = "partial answer"
-        pipeline._workflow_run_id = "run-id"
-
-        def _gen():
-            yield HumanInputRequiredResponse(
-                task_id="task",
-                workflow_run_id="run-id",
-                data=HumanInputRequiredResponse.Data(
-                    form_id="form-1",
-                    node_id="node-1",
-                    node_title="Approval",
-                    form_content="Need approval",
-                    inputs=[],
-                    actions=[UserAction(id="approve", title="Approve")],
-                    display_in_ui=True,
-                    form_token="token-1",
-                    resolved_default_values={},
-                    expiration_time=123,
-                ),
-            )
-            yield WorkflowPauseStreamResponse(
-                task_id="task",
-                workflow_run_id="run-id",
-                data=WorkflowPauseStreamResponse.Data(
-                    workflow_run_id="run-id",
-                    paused_nodes=["node-1"],
-                    outputs={},
-                    reasons=[
-                        {
-                            "type": PauseReasonType.HUMAN_INPUT_REQUIRED,
-                            "form_id": "form-1",
-                            "node_id": "node-1",
-                            "expiration_time": 123,
-                        },
-                    ],
-                    status="paused",
-                    created_at=1,
-                    elapsed_time=0.1,
-                    total_tokens=0,
-                    total_steps=0,
-                ),
-            )
-
-        response = pipeline._to_blocking_response(_gen())
-
-        assert isinstance(response, ChatbotAppPausedBlockingResponse)
-        assert response.data.answer == "partial answer"
-        assert response.data.workflow_run_id == "run-id"
-        assert response.data.reasons[0]["form_id"] == "form-1"
-        assert response.data.reasons[0]["expiration_time"] == 123
-
-    def test_workflow_blocking_pipeline_pause_payload_contract(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        from core.app.apps.workflow import generate_task_pipeline as workflow_pipeline_module
-        from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
-
-        app_config = WorkflowUIBasedAppConfig(
-            tenant_id="tenant",
-            app_id="app",
-            app_mode=AppMode.WORKFLOW,
-            additional_features=AppAdditionalFeatures(),
-            variables=[],
-            workflow_id="workflow-id",
-        )
-        application_generate_entity = WorkflowAppGenerateEntity.model_construct(
-            task_id="task",
-            app_config=app_config,
-            inputs={},
-            files=[],
-            user_id="user",
-            stream=False,
-            invoke_from=InvokeFrom.WEB_APP,
-            trace_manager=None,
-            workflow_execution_id="run-id",
-            extras={},
-            call_depth=0,
-        )
-        pipeline = WorkflowAppGenerateTaskPipeline(
-            application_generate_entity=application_generate_entity,
-            workflow=SimpleNamespace(id="workflow-id", tenant_id="tenant", features_dict={}),
-            queue_manager=SimpleNamespace(invoke_from=InvokeFrom.WEB_APP, graph_runtime_state=None),
-            user=SimpleNamespace(id="user", session_id="session"),
-            stream=False,
-            draft_var_saver_factory=lambda **kwargs: None,
-        )
-        monkeypatch.setattr(workflow_pipeline_module.time, "time", lambda: 1700000000)
-
-        def _gen():
-            yield HumanInputRequiredResponse(
-                task_id="task",
-                workflow_run_id="run",
-                data=HumanInputRequiredResponse.Data(
-                    form_id="form-1",
-                    node_id="node-1",
-                    node_title="Human Input",
-                    form_content="content",
-                    expiration_time=1,
-                ),
-            )
-            yield WorkflowPauseStreamResponse(
-                task_id="task",
-                workflow_run_id="run",
-                data=WorkflowPauseStreamResponse.Data(
-                    workflow_run_id="run",
-                    status=WorkflowExecutionStatus.PAUSED,
-                    outputs={},
-                    paused_nodes=["node-1"],
-                    reasons=[{"type": "human_input_required", "form_id": "form-1", "expiration_time": 1}],
-                    created_at=1,
-                    elapsed_time=0.1,
-                    total_tokens=0,
-                    total_steps=0,
-                ),
-            )
-
-        response = pipeline._to_blocking_response(_gen())
-
-        assert isinstance(response, WorkflowAppPausedBlockingResponse)
-        assert response.data.status == WorkflowExecutionStatus.PAUSED
-        assert response.data.paused_nodes == ["node-1"]
-        assert response.data.reasons == [{"type": "human_input_required", "form_id": "form-1", "expiration_time": 1}]
-
-    def test_service_api_pause_event_serializes_hitl_reason(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        converter = _build_service_api_pause_converter()
-        converter.workflow_start_to_stream_response(
-            task_id="task",
-            workflow_run_id="run-id",
-            workflow_id="workflow-id",
-            reason=WorkflowStartReason.INITIAL,
-        )
-
-        expiration_time = datetime(2024, 1, 1, tzinfo=UTC)
-
-        class _FakeSession:
-            def execute(self, _stmt):
-                return [("form-1", expiration_time, '{"display_in_ui": true}')]
-
-            def __enter__(self):
-                return self
-
-            def __exit__(self, exc_type, exc, tb):
-                return False
-
-        monkeypatch.setattr(workflow_response_converter, "Session", lambda **_: _FakeSession())
-        monkeypatch.setattr(workflow_response_converter, "db", SimpleNamespace(engine=object()))
-        monkeypatch.setattr(
-            workflow_response_converter,
-            "load_form_tokens_by_form_id",
-            lambda form_ids, session=None: {"form-1": "token"},
-        )
-
-        reason = HumanInputRequired(
-            form_id="form-1",
-            form_content="Rendered",
-            inputs=[
-                FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="field", default=None),
-            ],
-            actions=[UserAction(id="approve", title="Approve")],
-            display_in_ui=True,
-            node_id="node-id",
-            node_title="Human Step",
-            form_token="token",
-        )
-        queue_event = QueueWorkflowPausedEvent(
-            reasons=[reason],
-            outputs={"answer": "value"},
-            paused_nodes=["node-id"],
-        )
-
-        runtime_state = SimpleNamespace(total_tokens=0, node_run_steps=0)
-        responses = converter.workflow_pause_to_stream_response(
-            event=queue_event,
-            task_id="task",
-            graph_runtime_state=runtime_state,
-        )
-
-        assert isinstance(responses[-1], WorkflowPauseStreamResponse)
-        pause_resp = responses[-1]
-        assert pause_resp.workflow_run_id == "run-id"
-        assert pause_resp.data.paused_nodes == ["node-id"]
-        assert pause_resp.data.outputs == {}
-        assert pause_resp.data.reasons[0]["type"] == "human_input_required"
-        assert pause_resp.data.reasons[0]["form_id"] == "form-1"
-        assert pause_resp.data.reasons[0]["form_token"] == "token"
-        assert pause_resp.data.reasons[0]["expiration_time"] == int(expiration_time.timestamp())
-
-        assert isinstance(responses[0], HumanInputRequiredResponse)
-        hi_resp = responses[0]
-        assert hi_resp.data.form_id == "form-1"
-        assert hi_resp.data.node_id == "node-id"
-        assert hi_resp.data.node_title == "Human Step"
-        assert hi_resp.data.inputs[0].output_variable_name == "field"
-        assert hi_resp.data.actions[0].id == "approve"
-        assert hi_resp.data.display_in_ui is True
-        assert hi_resp.data.form_token == "token"
-        assert hi_resp.data.expiration_time == int(expiration_time.timestamp())
-
-    # Snapshot payload contract
-    def test_snapshot_events_include_pause_payload_contract(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        workflow_run = _build_workflow_run(WorkflowExecutionStatus.PAUSED)
-        snapshot = _build_snapshot(WorkflowNodeExecutionStatus.PAUSED)
-        resumption_context = _build_resumption_context("task-ctx")
-        monkeypatch.setattr(
-            "services.workflow_event_snapshot_service.load_form_tokens_by_form_id",
-            lambda form_ids, session=None: {"form-1": "wtok"},
-        )
-
-        class _SessionContext:
-            def __init__(self, session):
-                self._session = session
-
-            def __enter__(self):
-                return self._session
-
-            def __exit__(self, exc_type, exc, tb):
-                return False
-
-        def session_maker() -> _SessionContext:
-            return _SessionContext(
-                SimpleNamespace(
-                    execute=lambda _stmt: [("form-1", datetime(2024, 1, 1, tzinfo=UTC), '{"display_in_ui": true}')],
-                )
-            )
-
-        pause_entity = _FakePauseEntity(
-            pause_id="pause-1",
-            workflow_run_id="run-1",
-            paused_at_value=datetime(2024, 1, 1, tzinfo=UTC),
-            pause_reasons=[
-                HumanInputRequired(
-                    form_id="form-1",
-                    form_content="content",
-                    node_id="node-1",
-                    node_title="Human Input",
-                    form_token="wtok",
-                )
-            ],
-        )
-
-        events = _build_snapshot_events(
-            workflow_run=workflow_run,
-            node_snapshots=[snapshot],
-            task_id="task-ctx",
-            message_context=None,
-            pause_entity=pause_entity,
-            resumption_context=resumption_context,
-            session_maker=session_maker,
-        )
-
-        assert [event["event"] for event in events] == [
-            "workflow_started",
-            "node_started",
-            "node_finished",
-            "human_input_required",
-            "workflow_paused",
-        ]
-        assert events[2]["data"]["status"] == WorkflowNodeExecutionStatus.PAUSED.value
-        assert events[3]["data"]["form_token"] == "wtok"
-        assert events[3]["data"]["expiration_time"] == int(datetime(2024, 1, 1, tzinfo=UTC).timestamp())
-        pause_data = events[-1]["data"]
-        assert pause_data["paused_nodes"] == ["node-1"]
-        assert pause_data["outputs"] == {"result": "value"}
-        assert pause_data["reasons"][0]["type"] == "human_input_required"
-        assert pause_data["reasons"][0]["form_token"] == "wtok"
-        assert pause_data["reasons"][0]["expiration_time"] == int(datetime(2024, 1, 1, tzinfo=UTC).timestamp())
-        assert pause_data["status"] == WorkflowExecutionStatus.PAUSED.value
-        assert pause_data["created_at"] == int(workflow_run.created_at.timestamp())
-        assert pause_data["elapsed_time"] == workflow_run.elapsed_time
-        assert pause_data["total_tokens"] == workflow_run.total_tokens
-        assert pause_data["total_steps"] == workflow_run.total_steps
@@ -1,184 +0,0 @@
-"""Unit tests for Service API human input form endpoints."""
-
-from __future__ import annotations
-
-import json
-import sys
-from datetime import UTC, datetime
-from types import SimpleNamespace
-from unittest.mock import Mock
-
-import pytest
-from werkzeug.exceptions import NotFound
-
-from controllers.service_api.app.human_input_form import WorkflowHumanInputFormApi
-from models.human_input import RecipientType
-from tests.unit_tests.controllers.service_api.conftest import _unwrap
-
-
-class TestWorkflowHumanInputFormApi:
-    def test_get_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        definition = SimpleNamespace(
-            model_dump=lambda: {
-                "rendered_content": "Rendered form content",
-                "inputs": [{"output_variable_name": "name"}],
-                "default_values": {"name": "Alice", "age": 30, "meta": {"k": "v"}},
-                "user_actions": [{"id": "approve", "title": "Approve"}],
-            }
-        )
-        form = SimpleNamespace(
-            app_id="app-1",
-            tenant_id="tenant-1",
-            recipient_type=RecipientType.STANDALONE_WEB_APP,
-            expiration_time=datetime(2099, 1, 1, tzinfo=UTC),
-            get_definition=lambda: definition,
-        )
-        service_mock = Mock()
-        service_mock.get_form_by_token.return_value = form
-        workflow_module = sys.modules["controllers.service_api.app.human_input_form"]
-        monkeypatch.setattr(workflow_module, "HumanInputService", lambda _engine: service_mock)
-        monkeypatch.setattr(workflow_module, "db", SimpleNamespace(engine=object()))
-
-        api = WorkflowHumanInputFormApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1")
-
-        with app.test_request_context("/form/human_input/token-1", method="GET"):
-            response = handler(api, app_model=app_model, form_token="token-1")
-
-        payload = json.loads(response.get_data(as_text=True))
-        assert payload == {
-            "form_content": "Rendered form content",
-            "inputs": [{"output_variable_name": "name"}],
-            "resolved_default_values": {"name": "Alice", "age": "30", "meta": '{"k": "v"}'},
-            "user_actions": [{"id": "approve", "title": "Approve"}],
-            "expiration_time": int(form.expiration_time.timestamp()),
-        }
-        service_mock.get_form_by_token.assert_called_once_with("token-1")
-        service_mock.ensure_form_active.assert_called_once_with(form)
-
-    def test_get_form_not_in_app(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        form = SimpleNamespace(
-            app_id="another-app",
-            tenant_id="tenant-1",
-            expiration_time=datetime(2099, 1, 1, tzinfo=UTC),
-        )
-        service_mock = Mock()
-        service_mock.get_form_by_token.return_value = form
-        workflow_module = sys.modules["controllers.service_api.app.human_input_form"]
-        monkeypatch.setattr(workflow_module, "HumanInputService", lambda _engine: service_mock)
-        monkeypatch.setattr(workflow_module, "db", SimpleNamespace(engine=object()))
-
-        api = WorkflowHumanInputFormApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1")
-
-        with app.test_request_context("/form/human_input/token-1", method="GET"):
-            with pytest.raises(NotFound):
-                handler(api, app_model=app_model, form_token="token-1")
-
-    @pytest.mark.parametrize(
-        "recipient_type",
-        [
-            RecipientType.CONSOLE,
-            RecipientType.BACKSTAGE,
-            RecipientType.EMAIL_MEMBER,
-            RecipientType.EMAIL_EXTERNAL,
-        ],
-    )
-    def test_get_rejects_non_service_api_recipient_types(
-        self, app, monkeypatch: pytest.MonkeyPatch, recipient_type: RecipientType
-    ) -> None:
-        form = SimpleNamespace(
-            app_id="app-1",
-            tenant_id="tenant-1",
-            recipient_type=recipient_type,
-            expiration_time=datetime(2099, 1, 1, tzinfo=UTC),
-        )
-        service_mock = Mock()
-        service_mock.get_form_by_token.return_value = form
-        workflow_module = sys.modules["controllers.service_api.app.human_input_form"]
-        monkeypatch.setattr(workflow_module, "HumanInputService", lambda _engine: service_mock)
-        monkeypatch.setattr(workflow_module, "db", SimpleNamespace(engine=object()))
-
-        api = WorkflowHumanInputFormApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1")
-
-        with app.test_request_context("/form/human_input/token-1", method="GET"):
-            with pytest.raises(NotFound):
-                handler(api, app_model=app_model, form_token="token-1")
-
-        service_mock.ensure_form_active.assert_not_called()
-
-    def test_post_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        form = SimpleNamespace(
-            app_id="app-1",
-            tenant_id="tenant-1",
-            recipient_type=RecipientType.STANDALONE_WEB_APP,
-        )
-        service_mock = Mock()
-        service_mock.get_form_by_token.return_value = form
-        workflow_module = sys.modules["controllers.service_api.app.human_input_form"]
-        monkeypatch.setattr(workflow_module, "HumanInputService", lambda _engine: service_mock)
-        monkeypatch.setattr(workflow_module, "db", SimpleNamespace(engine=object()))
-
-        api = WorkflowHumanInputFormApi()
-        handler = _unwrap(api.post)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1")
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context(
-            "/form/human_input/token-1",
-            method="POST",
-            json={"inputs": {"name": "Alice"}, "action": "approve", "user": "external-1"},
-        ):
-            response, status = handler(api, app_model=app_model, end_user=end_user, form_token="token-1")
-
-        assert response == {}
-        assert status == 200
-        service_mock.submit_form_by_token.assert_called_once_with(
-            recipient_type=RecipientType.STANDALONE_WEB_APP,
-            form_token="token-1",
-            selected_action_id="approve",
-            form_data={"name": "Alice"},
-            submission_end_user_id="end-user-1",
-        )
-
-    @pytest.mark.parametrize(
-        "recipient_type",
-        [
-            RecipientType.CONSOLE,
-            RecipientType.BACKSTAGE,
-            RecipientType.EMAIL_MEMBER,
-            RecipientType.EMAIL_EXTERNAL,
-        ],
-    )
-    def test_post_rejects_non_service_api_recipient_types(
-        self, app, monkeypatch: pytest.MonkeyPatch, recipient_type: RecipientType
-    ) -> None:
-        form = SimpleNamespace(
-            app_id="app-1",
-            tenant_id="tenant-1",
-            recipient_type=recipient_type,
-        )
-        service_mock = Mock()
-        service_mock.get_form_by_token.return_value = form
-        workflow_module = sys.modules["controllers.service_api.app.human_input_form"]
-        monkeypatch.setattr(workflow_module, "HumanInputService", lambda _engine: service_mock)
-        monkeypatch.setattr(workflow_module, "db", SimpleNamespace(engine=object()))
-
-        api = WorkflowHumanInputFormApi()
-        handler = _unwrap(api.post)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1")
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context(
-            "/form/human_input/token-1",
-            method="POST",
-            json={"inputs": {"name": "Alice"}, "action": "approve", "user": "external-1"},
-        ):
-            with pytest.raises(NotFound):
-                handler(api, app_model=app_model, end_user=end_user, form_token="token-1")
-
-        service_mock.submit_form_by_token.assert_not_called()
@@ -1,166 +0,0 @@
-"""Unit tests for Service API workflow event stream endpoints."""
-
-from __future__ import annotations
-
-import json
-import sys
-from datetime import UTC, datetime
-from types import SimpleNamespace
-from unittest.mock import Mock
-
-import pytest
-from werkzeug.exceptions import NotFound
-
-from controllers.service_api.app.error import NotWorkflowAppError
-from controllers.service_api.app.workflow_events import WorkflowEventsApi
-from models.enums import CreatorUserRole
-from models.model import AppMode
-from tests.unit_tests.controllers.service_api.conftest import _unwrap
-
-
-def _mock_repo_for_run(monkeypatch: pytest.MonkeyPatch, workflow_run):
-    workflow_events_module = sys.modules["controllers.service_api.app.workflow_events"]
-    repo = SimpleNamespace(get_workflow_run_by_id_and_tenant_id=lambda **_kwargs: workflow_run)
-    monkeypatch.setattr(
-        workflow_events_module.DifyAPIRepositoryFactory,
-        "create_api_workflow_run_repository",
-        lambda *_args, **_kwargs: repo,
-    )
-    monkeypatch.setattr(workflow_events_module, "db", SimpleNamespace(engine=object()))
-    return workflow_events_module
-
-
-class TestWorkflowEventsApi:
-    def test_wrong_app_mode(self, app) -> None:
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1", method="GET"):
-            with pytest.raises(NotWorkflowAppError):
-                handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-    def test_workflow_run_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        _mock_repo_for_run(monkeypatch, workflow_run=None)
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1", method="GET"):
-            with pytest.raises(NotFound):
-                handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-    def test_workflow_run_permission_denied(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        workflow_run = SimpleNamespace(
-            id="run-1",
-            app_id="app-1",
-            created_by_role=CreatorUserRole.ACCOUNT,
-            created_by="another-user",
-            finished_at=None,
-        )
-        _mock_repo_for_run(monkeypatch, workflow_run=workflow_run)
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1", method="GET"):
-            with pytest.raises(NotFound):
-                handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-    def test_finished_run_returns_sse(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        workflow_run = SimpleNamespace(
-            id="run-1",
-            app_id="app-1",
-            created_by_role=CreatorUserRole.END_USER,
-            created_by="end-user-1",
-            finished_at=datetime(2099, 1, 1, tzinfo=UTC),
-        )
-        workflow_events_module = _mock_repo_for_run(monkeypatch, workflow_run=workflow_run)
-        monkeypatch.setattr(
-            workflow_events_module.WorkflowResponseConverter,
-            "workflow_run_result_to_finish_response",
-            lambda **_kwargs: SimpleNamespace(
-                model_dump=lambda mode="json": {"task_id": "run-1", "status": "succeeded"},
-                event=SimpleNamespace(value="workflow_finished"),
-            ),
-        )
-
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1", method="GET"):
-            response = handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-        assert response.mimetype == "text/event-stream"
-        body = response.get_data(as_text=True).strip()
-        assert body.startswith("data: ")
-        payload = json.loads(body[len("data: ") :])
-        assert payload["task_id"] == "run-1"
-        assert payload["event"] == "workflow_finished"
-
-    def test_running_run_streams_events(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        workflow_run = SimpleNamespace(
-            id="run-1",
-            app_id="app-1",
-            created_by_role=CreatorUserRole.END_USER,
-            created_by="end-user-1",
-            finished_at=None,
-        )
-        workflow_events_module = _mock_repo_for_run(monkeypatch, workflow_run=workflow_run)
-        msg_generator = Mock()
-        msg_generator.retrieve_events.return_value = ["raw-event"]
-        workflow_generator = Mock()
-        workflow_generator.convert_to_event_stream.return_value = iter(["data: streamed\n\n"])
-        monkeypatch.setattr(workflow_events_module, "MessageGenerator", lambda: msg_generator)
-        monkeypatch.setattr(workflow_events_module, "WorkflowAppGenerator", lambda: workflow_generator)
-
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1", method="GET"):
-            response = handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-        assert response.get_data(as_text=True) == "data: streamed\n\n"
-        msg_generator.retrieve_events.assert_called_once_with(
-            AppMode.WORKFLOW,
-            "run-1",
-            terminal_events=None,
-        )
-        workflow_generator.convert_to_event_stream.assert_called_once_with(["raw-event"])
-
-    def test_running_run_with_snapshot(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
-        workflow_run = SimpleNamespace(
-            id="run-1",
-            app_id="app-1",
-            created_by_role=CreatorUserRole.END_USER,
-            created_by="end-user-1",
-            finished_at=None,
-        )
-        workflow_events_module = _mock_repo_for_run(monkeypatch, workflow_run=workflow_run)
-        msg_generator = Mock()
-        workflow_generator = Mock()
-        workflow_generator.convert_to_event_stream.return_value = iter(["data: snapshot\n\n"])
-        snapshot_builder = Mock(return_value=["snapshot-events"])
-        monkeypatch.setattr(workflow_events_module, "MessageGenerator", lambda: msg_generator)
-        monkeypatch.setattr(workflow_events_module, "WorkflowAppGenerator", lambda: workflow_generator)
-        monkeypatch.setattr(workflow_events_module, "build_workflow_event_stream", snapshot_builder)
-
-        api = WorkflowEventsApi()
-        handler = _unwrap(api.get)
-        app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW.value)
-        end_user = SimpleNamespace(id="end-user-1")
-
-        with app.test_request_context("/workflow/run-1/events?user=u1&include_state_snapshot=true", method="GET"):
-            response = handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
-
-        assert response.get_data(as_text=True) == "data: snapshot\n\n"
-        msg_generator.retrieve_events.assert_not_called()
-        snapshot_builder.assert_called_once()
-        workflow_generator.convert_to_event_stream.assert_called_once_with(["snapshot-events"])
@@ -1,11 +1,8 @@
 from collections.abc import Generator

-import pytest
-
 from core.app.apps.advanced_chat.generate_response_converter import AdvancedChatAppGenerateResponseConverter
 from core.app.entities.task_entities import (
    ChatbotAppBlockingResponse,
-    ChatbotAppPausedBlockingResponse,
    ChatbotAppStreamResponse,
    ErrorStreamResponse,
    MessageEndStreamResponse,
@@ -13,8 +10,7 @@ from core.app.entities.task_entities import (
    NodeStartStreamResponse,
    PingStreamResponse,
 )
-from graphon.entities.pause_reason import PauseReasonType
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
+from graphon.enums import WorkflowNodeExecutionStatus


 class TestAdvancedChatGenerateResponseConverter:
@@ -32,37 +28,6 @@ class TestAdvancedChatGenerateResponseConverter:
        response = AdvancedChatAppGenerateResponseConverter.convert_blocking_simple_response(blocking)
        assert "usage" not in response["metadata"]

-    def test_blocking_full_response_derives_pause_data_from_model_dump(self, monkeypatch: pytest.MonkeyPatch):
-        data = ChatbotAppPausedBlockingResponse.Data(
-            id="msg-1",
-            mode="chat",
-            conversation_id="c1",
-            message_id="m1",
-            workflow_run_id="run-1",
-            answer="partial",
-            metadata={"usage": {"total_tokens": 1}},
-            created_at=1,
-            paused_nodes=["node-1"],
-            reasons=[{"type": PauseReasonType.HUMAN_INPUT_REQUIRED, "form_id": "form-1"}],
-            status=WorkflowExecutionStatus.PAUSED,
-            elapsed_time=0.1,
-            total_tokens=0,
-            total_steps=0,
-        )
-        original_model_dump = type(data).model_dump
-
-        def _model_dump_with_future_field(self, *args, **kwargs):
-            payload = original_model_dump(self, *args, **kwargs)
-            payload["future_field"] = "future-value"
-            return payload
-
-        monkeypatch.setattr(type(data), "model_dump", _model_dump_with_future_field)
-        blocking = ChatbotAppPausedBlockingResponse(task_id="t1", data=data)
-
-        response = AdvancedChatAppGenerateResponseConverter.convert_blocking_full_response(blocking)
-
-        assert response["data"]["future_field"] == "future-value"
-
    def test_stream_simple_response_includes_node_events(self):
        node_start = NodeStartStreamResponse(
            task_id="t1",
@@ -41,17 +41,13 @@ from core.app.entities.queue_entities import (
 from core.app.entities.task_entities import (
    AnnotationReply,
    AnnotationReplyAccount,
-    ChatbotAppPausedBlockingResponse,
-    HumanInputRequiredResponse,
    MessageAudioStreamResponse,
    MessageEndStreamResponse,
    PingStreamResponse,
 )
 from core.base.tts.app_generator_tts_publisher import AudioTrunk
 from core.workflow.system_variables import build_system_variables
-from graphon.entities.pause_reason import PauseReasonType
 from graphon.enums import BuiltinNodeTypes
-from graphon.nodes.human_input.entities import UserAction
 from graphon.runtime import GraphRuntimeState, VariablePool
 from libs.datetime_utils import naive_utc_now
 from models.enums import MessageStatus
@@ -127,57 +123,6 @@ class TestAdvancedChatGenerateTaskPipeline:
        assert response.data.answer == "done"
        assert response.data.metadata == {"k": "v"}

-    def test_to_blocking_response_falls_back_to_human_input_required_when_pause_event_missing(self):
-        pipeline = _make_pipeline()
-        pipeline._task_state.answer = "partial answer"
-        pipeline._workflow_run_id = "run-id"
-        pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
-            start_at=0.0,
-            total_tokens=7,
-            node_run_steps=3,
-        )
-
-        def _gen():
-            yield HumanInputRequiredResponse(
-                task_id="task",
-                workflow_run_id="run-id",
-                data=HumanInputRequiredResponse.Data(
-                    form_id="form-1",
-                    node_id="node-1",
-                    node_title="Approval",
-                    form_content="Need approval",
-                    inputs=[],
-                    actions=[UserAction(id="approve", title="Approve")],
-                    display_in_ui=True,
-                    form_token="token-1",
-                    resolved_default_values={},
-                    expiration_time=123,
-                ),
-            )
-
-        response = pipeline._to_blocking_response(_gen())
-
-        assert isinstance(response, ChatbotAppPausedBlockingResponse)
-        assert response.data.workflow_run_id == "run-id"
-        assert response.data.status == "paused"
-        assert response.data.paused_nodes == ["node-1"]
-        assert response.data.reasons == [
-            {
-                "type": PauseReasonType.HUMAN_INPUT_REQUIRED,
-                "form_id": "form-1",
-                "node_id": "node-1",
-                "node_title": "Approval",
-                "form_content": "Need approval",
-                "inputs": [],
-                "actions": [{"id": "approve", "title": "Approve", "button_style": "default"}],
-                "display_in_ui": True,
-                "form_token": "token-1",
-                "resolved_default_values": {},
-                "expiration_time": 123,
-            }
-        ]
-
    def test_handle_text_chunk_event_updates_state(self):
        pipeline = _make_pipeline()
        pipeline._message_cycle_manager = SimpleNamespace(
@@ -1,102 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Generator
-
-from core.app.apps.base_app_generate_response_converter import AppGenerateResponseConverter
-from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.entities.task_entities import (
-    AppStreamResponse,
-    PingStreamResponse,
-    WorkflowAppBlockingResponse,
-    WorkflowAppStreamResponse,
-)
-from graphon.enums import WorkflowExecutionStatus
-
-
-class _DummyConverter(AppGenerateResponseConverter[WorkflowAppBlockingResponse]):
-    blocking_full_calls: list[WorkflowAppBlockingResponse] = []
-    blocking_simple_calls: list[WorkflowAppBlockingResponse] = []
-    stream_full_calls: list[Generator[AppStreamResponse, None, None]] = []
-    stream_simple_calls: list[Generator[AppStreamResponse, None, None]] = []
-
-    @classmethod
-    def reset(cls) -> None:
-        cls.blocking_full_calls = []
-        cls.blocking_simple_calls = []
-        cls.stream_full_calls = []
-        cls.stream_simple_calls = []
-
-    @classmethod
-    def convert_blocking_full_response(cls, blocking_response: WorkflowAppBlockingResponse) -> dict[str, object]:
-        cls.blocking_full_calls.append(blocking_response)
-        return {"kind": "blocking-full", "task_id": blocking_response.task_id}
-
-    @classmethod
-    def convert_blocking_simple_response(cls, blocking_response: WorkflowAppBlockingResponse) -> dict[str, object]:
-        cls.blocking_simple_calls.append(blocking_response)
-        return {"kind": "blocking-simple", "task_id": blocking_response.task_id}
-
-    @classmethod
-    def convert_stream_full_response(
-        cls, stream_response: Generator[AppStreamResponse, None, None]
-    ) -> Generator[dict | str, None, None]:
-        cls.stream_full_calls.append(stream_response)
-        yield {"kind": "stream-full"}
-
-    @classmethod
-    def convert_stream_simple_response(
-        cls, stream_response: Generator[AppStreamResponse, None, None]
-    ) -> Generator[dict | str, None, None]:
-        cls.stream_simple_calls.append(stream_response)
-        yield {"kind": "stream-simple"}
-
-
-def _build_blocking_response() -> WorkflowAppBlockingResponse:
-    return WorkflowAppBlockingResponse(
-        task_id="task-1",
-        workflow_run_id="run-1",
-        data=WorkflowAppBlockingResponse.Data(
-            id="run-1",
-            workflow_id="workflow-1",
-            status=WorkflowExecutionStatus.SUCCEEDED,
-            outputs={"ok": True},
-            error=None,
-            elapsed_time=0.1,
-            total_tokens=0,
-            total_steps=1,
-            created_at=1,
-            finished_at=2,
-        ),
-    )
-
-
-def _build_stream_response() -> Generator[AppStreamResponse, None, None]:
-    yield WorkflowAppStreamResponse(
-        workflow_run_id="run-1",
-        stream_response=PingStreamResponse(task_id="task-1"),
-    )
-
-
-def test_convert_routes_blocking_response_by_invoke_from() -> None:
-    _DummyConverter.reset()
-    blocking_response = _build_blocking_response()
-
-    full_result = _DummyConverter.convert(blocking_response, InvokeFrom.SERVICE_API)
-    simple_result = _DummyConverter.convert(blocking_response, InvokeFrom.WEB_APP)
-
-    assert full_result == {"kind": "blocking-full", "task_id": "task-1"}
-    assert simple_result == {"kind": "blocking-simple", "task_id": "task-1"}
-    assert _DummyConverter.blocking_full_calls == [blocking_response]
-    assert _DummyConverter.blocking_simple_calls == [blocking_response]
-
-
-def test_convert_routes_stream_response_by_invoke_from() -> None:
-    _DummyConverter.reset()
-
-    full_result = list(_DummyConverter.convert(_build_stream_response(), InvokeFrom.SERVICE_API))
-    simple_result = list(_DummyConverter.convert(_build_stream_response(), InvokeFrom.WEB_APP))
-
-    assert full_result == [{"kind": "stream-full"}]
-    assert simple_result == [{"kind": "stream-simple"}]
-    assert len(_DummyConverter.stream_full_calls) == 1
-    assert len(_DummyConverter.stream_simple_calls) == 1
@@ -1,7 +1,6 @@
 from unittest.mock import Mock, patch

 from core.app.apps.message_generator import MessageGenerator
-from core.app.entities.task_entities import StreamEvent
 from models.model import AppMode


@@ -24,21 +23,7 @@ class TestMessageGenerator:
                "core.app.apps.message_generator.stream_topic_events", return_value=iter([{"event": "ping"}])
            ) as mock_stream,
        ):
-            events = list(
-                MessageGenerator.retrieve_events(
-                    AppMode.WORKFLOW,
-                    "run-1",
-                    idle_timeout=1,
-                    ping_interval=2,
-                    terminal_events=[StreamEvent.WORKFLOW_FINISHED.value],
-                )
-            )
+            events = list(MessageGenerator.retrieve_events(AppMode.WORKFLOW, "run-1", idle_timeout=1, ping_interval=2))

        assert events == [{"event": "ping"}]
-        mock_stream.assert_called_once_with(
-            topic="topic",
-            idle_timeout=1,
-            ping_interval=2,
-            on_subscribe=None,
-            terminal_events=[StreamEvent.WORKFLOW_FINISHED.value],
-        )
+        mock_stream.assert_called_once()
@@ -106,21 +106,3 @@ def test_stream_topic_events_emits_ping_and_idle_timeout(monkeypatch):
    assert next(generator) == StreamEvent.PING.value
    # next receive yields None -> ping interval triggers
    assert next(generator) == StreamEvent.PING.value
-
-
-def test_stream_topic_events_can_continue_past_pause():
-    topic = FakeTopic()
-    topic.publish(json.dumps({"event": StreamEvent.WORKFLOW_PAUSED.value}).encode())
-    topic.publish(json.dumps({"event": StreamEvent.WORKFLOW_FINISHED.value}).encode())
-
-    generator = stream_topic_events(
-        topic=topic,
-        idle_timeout=1.0,
-        terminal_events=[StreamEvent.WORKFLOW_FINISHED.value],
-    )
-
-    assert next(generator) == StreamEvent.PING.value
-    assert next(generator)["event"] == StreamEvent.WORKFLOW_PAUSED.value
-    assert next(generator)["event"] == StreamEvent.WORKFLOW_FINISHED.value
-    with pytest.raises(StopIteration):
-        next(generator)
@@ -7,7 +7,6 @@ from unittest.mock import MagicMock
 import pytest

 from core.app.app_config.entities import AppAdditionalFeatures, WorkflowUIBasedAppConfig
-from core.app.apps.workflow import generate_task_pipeline as workflow_pipeline_module
 from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.app.entities.queue_entities import (
@@ -37,12 +36,11 @@ from core.app.entities.queue_entities import (
 )
 from core.app.entities.task_entities import (
    ErrorStreamResponse,
-    HumanInputRequiredResponse,
    MessageAudioEndStreamResponse,
    MessageAudioStreamResponse,
    PingStreamResponse,
-    WorkflowAppPausedBlockingResponse,
    WorkflowFinishStreamResponse,
+    WorkflowPauseStreamResponse,
    WorkflowStartStreamResponse,
 )
 from core.base.tts.app_generator_tts_publisher import AudioTrunk
@@ -93,51 +91,27 @@ def _make_pipeline():


 class TestWorkflowGenerateTaskPipeline:
-    def test_to_blocking_response_falls_back_to_human_input_required_when_pause_event_missing(self, monkeypatch):
+    def test_to_blocking_response_handles_pause(self):
        pipeline = _make_pipeline()
-        pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
-            start_at=0.0,
-            total_tokens=5,
-            node_run_steps=2,
-        )
-        monkeypatch.setattr(workflow_pipeline_module.time, "time", lambda: 1700000000)

        def _gen():
-            yield HumanInputRequiredResponse(
+            yield WorkflowPauseStreamResponse(
                task_id="task",
-                workflow_run_id="run-id",
-                data=HumanInputRequiredResponse.Data(
-                    form_id="form-1",
-                    node_id="node-1",
-                    node_title="Human Input",
-                    form_content="content",
-                    expiration_time=1,
+                workflow_run_id="run",
+                data=WorkflowPauseStreamResponse.Data(
+                    workflow_run_id="run",
+                    status=WorkflowExecutionStatus.PAUSED,
+                    outputs={},
+                    created_at=1,
+                    elapsed_time=0.1,
+                    total_tokens=0,
+                    total_steps=0,
                ),
            )

        response = pipeline._to_blocking_response(_gen())

-        assert isinstance(response, WorkflowAppPausedBlockingResponse)
-        assert response.workflow_run_id == "run-id"
        assert response.data.status == WorkflowExecutionStatus.PAUSED
-        assert response.data.created_at == 1700000000
-        assert response.data.paused_nodes == ["node-1"]
-        assert response.data.reasons == [
-            {
-                "type": "human_input_required",
-                "form_id": "form-1",
-                "node_id": "node-1",
-                "node_title": "Human Input",
-                "form_content": "content",
-                "inputs": [],
-                "actions": [],
-                "display_in_ui": False,
-                "form_token": None,
-                "resolved_default_values": {},
-                "expiration_time": 1,
-            }
-        ]

    def test_to_blocking_response_handles_finish(self):
        pipeline = _make_pipeline()
@@ -372,6 +372,78 @@ def test_get_configurations_binds_manager_runtime_to_provider_configuration(
    provider_configuration.bind_model_runtime.assert_called_once_with(manager._model_runtime)


+def test_get_configurations_reuses_cached_result_for_same_tenant(mocker: MockerFixture, mock_provider_entity):
+    manager = _build_provider_manager(mocker)
+    provider_configuration = Mock()
+    provider_factory = Mock()
+    provider_factory.get_providers.return_value = [mock_provider_entity]
+    custom_configuration = SimpleNamespace(provider=None, models=[])
+    system_configuration = SimpleNamespace(enabled=False, quota_configurations=[], current_quota_type=None)
+
+    with (
+        patch.object(manager, "_get_all_providers", return_value={"openai": []}) as mock_get_all_providers,
+        patch.object(manager, "_init_trial_provider_records", return_value={"openai": []}),
+        patch.object(manager, "_get_all_provider_models", return_value={"openai": []}),
+        patch.object(manager, "_get_all_preferred_model_providers", return_value={}),
+        patch.object(manager, "_get_all_provider_model_settings", return_value={}),
+        patch.object(manager, "_get_all_provider_load_balancing_configs", return_value={}),
+        patch.object(manager, "_get_all_provider_model_credentials", return_value={}),
+        patch.object(manager, "_to_custom_configuration", return_value=custom_configuration),
+        patch.object(manager, "_to_system_configuration", return_value=system_configuration),
+        patch.object(manager, "_to_model_settings", return_value=[]),
+        patch("core.provider_manager.ModelProviderFactory", return_value=provider_factory) as mock_factory_cls,
+        patch(
+            "core.provider_manager.ProviderConfiguration",
+            return_value=provider_configuration,
+        ) as mock_provider_configuration,
+    ):
+        first = manager.get_configurations("tenant-id")
+        second = manager.get_configurations("tenant-id")
+
+    assert first is second
+    mock_get_all_providers.assert_called_once_with("tenant-id")
+    mock_factory_cls.assert_called_once_with(model_runtime=manager._model_runtime)
+    mock_provider_configuration.assert_called_once()
+    provider_configuration.bind_model_runtime.assert_called_once_with(manager._model_runtime)
+
+
+def test_clear_configurations_cache_rebuilds_requested_tenant(mocker: MockerFixture, mock_provider_entity):
+    manager = _build_provider_manager(mocker)
+    provider_factory = Mock()
+    provider_factory.get_providers.return_value = [mock_provider_entity]
+    custom_configuration = SimpleNamespace(provider=None, models=[])
+    system_configuration = SimpleNamespace(enabled=False, quota_configurations=[], current_quota_type=None)
+    provider_configuration_first = Mock()
+    provider_configuration_second = Mock()
+
+    with (
+        patch.object(manager, "_get_all_providers", return_value={"openai": []}) as mock_get_all_providers,
+        patch.object(manager, "_init_trial_provider_records", return_value={"openai": []}),
+        patch.object(manager, "_get_all_provider_models", return_value={"openai": []}),
+        patch.object(manager, "_get_all_preferred_model_providers", return_value={}),
+        patch.object(manager, "_get_all_provider_model_settings", return_value={}),
+        patch.object(manager, "_get_all_provider_load_balancing_configs", return_value={}),
+        patch.object(manager, "_get_all_provider_model_credentials", return_value={}),
+        patch.object(manager, "_to_custom_configuration", return_value=custom_configuration),
+        patch.object(manager, "_to_system_configuration", return_value=system_configuration),
+        patch.object(manager, "_to_model_settings", return_value=[]),
+        patch("core.provider_manager.ModelProviderFactory", return_value=provider_factory),
+        patch(
+            "core.provider_manager.ProviderConfiguration",
+            side_effect=[provider_configuration_first, provider_configuration_second],
+        ) as mock_provider_configuration,
+    ):
+        first = manager.get_configurations("tenant-id")
+        manager.clear_configurations_cache("tenant-id")
+        second = manager.get_configurations("tenant-id")
+
+    assert first is not second
+    assert mock_get_all_providers.call_count == 2
+    assert mock_provider_configuration.call_count == 2
+    provider_configuration_first.bind_model_runtime.assert_called_once_with(manager._model_runtime)
+    provider_configuration_second.bind_model_runtime.assert_called_once_with(manager._model_runtime)
+
+
 def test_get_provider_model_bundle_returns_selected_model_type_instance(mocker: MockerFixture):
    manager = _build_provider_manager(mocker)
    provider_configuration = Mock()
@@ -1,6 +1,5 @@
 from types import SimpleNamespace

-from core.workflow.human_input_forms import _load_form_tokens_by_form_id
 from core.workflow.human_input_forms import load_form_tokens_by_form_id
 from models.human_input import RecipientType

@@ -54,22 +53,3 @@ def test_load_form_tokens_by_form_id_ignores_unsupported_recipients() -> None:
    )

    assert load_form_tokens_by_form_id(["form-1"], session=session) == {}
-
-
-def test_load_form_tokens_by_form_id_uses_shared_priority() -> None:
-    session = _FakeSession(
-        recipients=[
-            SimpleNamespace(
-                form_id="form-1",
-                recipient_type=RecipientType.STANDALONE_WEB_APP,
-                access_token="web-token",
-            ),
-            SimpleNamespace(
-                form_id="form-1",
-                recipient_type=RecipientType.CONSOLE,
-                access_token="console-token",
-            ),
-        ]
-    )
-
-    assert _load_form_tokens_by_form_id(session, ["form-1"]) == {"form-1": "console-token"}
@@ -1,50 +0,0 @@
-from core.workflow.human_input_policy import (
-    HumanInputSurface,
-    get_preferred_form_token,
-    is_recipient_type_allowed_for_surface,
-)
-from models.human_input import RecipientType
-
-
-def test_service_api_only_allows_public_webapp_forms() -> None:
-    assert is_recipient_type_allowed_for_surface(
-        RecipientType.STANDALONE_WEB_APP,
-        HumanInputSurface.SERVICE_API,
-    )
-    assert not is_recipient_type_allowed_for_surface(
-        RecipientType.CONSOLE,
-        HumanInputSurface.SERVICE_API,
-    )
-    assert not is_recipient_type_allowed_for_surface(
-        RecipientType.BACKSTAGE,
-        HumanInputSurface.SERVICE_API,
-    )
-    assert not is_recipient_type_allowed_for_surface(
-        RecipientType.EMAIL_MEMBER,
-        HumanInputSurface.SERVICE_API,
-    )
-
-
-def test_console_only_allows_internal_console_surfaces() -> None:
-    assert is_recipient_type_allowed_for_surface(
-        RecipientType.CONSOLE,
-        HumanInputSurface.CONSOLE,
-    )
-    assert is_recipient_type_allowed_for_surface(
-        RecipientType.BACKSTAGE,
-        HumanInputSurface.CONSOLE,
-    )
-    assert not is_recipient_type_allowed_for_surface(
-        RecipientType.STANDALONE_WEB_APP,
-        HumanInputSurface.CONSOLE,
-    )
-
-
-def test_preferred_form_token_uses_shared_priority_order() -> None:
-    recipients = [
-        (RecipientType.STANDALONE_WEB_APP, "web-token"),
-        (RecipientType.CONSOLE, "console-token"),
-        (RecipientType.BACKSTAGE, "backstage-token"),
-    ]
-
-    assert get_preferred_form_token(recipients) == "backstage-token"
@@ -1,64 +0,0 @@
-from __future__ import annotations
-
-from datetime import UTC, datetime
-from types import SimpleNamespace
-
-from graphon.nodes.human_input.entities import FormDefinition, FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
-from models.human_input import RecipientType
-from repositories.sqlalchemy_api_workflow_run_repository import _build_human_input_required_reason
-
-
-def _build_form_model() -> SimpleNamespace:
-    expiration_time = datetime(2024, 1, 1, tzinfo=UTC)
-    definition = FormDefinition(
-        form_content="content",
-        inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="name")],
-        user_actions=[UserAction(id="approve", title="Approve")],
-        rendered_content="rendered",
-        expiration_time=expiration_time,
-        default_values={"name": "Alice"},
-        node_title="Ask Name",
-        display_in_ui=True,
-    )
-    return SimpleNamespace(
-        id="form-1",
-        node_id="node-1",
-        form_definition=definition.model_dump_json(),
-        expiration_time=expiration_time,
-    )
-
-
-def _build_reason_model() -> SimpleNamespace:
-    return SimpleNamespace(form_id="form-1", node_id="node-1")
-
-
-def test_build_human_input_required_reason_prefers_standalone_web_app_token() -> None:
-    reason = _build_human_input_required_reason(
-        _build_reason_model(),
-        _build_form_model(),
-        [
-            SimpleNamespace(recipient_type=RecipientType.BACKSTAGE, access_token="btok"),
-            SimpleNamespace(recipient_type=RecipientType.CONSOLE, access_token="ctok"),
-            SimpleNamespace(recipient_type=RecipientType.STANDALONE_WEB_APP, access_token="wtok"),
-        ],
-    )
-
-    assert reason.node_title == "Ask Name"
-    assert reason.resolved_default_values == {"name": "Alice"}
-    assert not hasattr(reason, "form_token")
-
-
-def test_build_human_input_required_reason_falls_back_to_console_token() -> None:
-    reason = _build_human_input_required_reason(
-        _build_reason_model(),
-        _build_form_model(),
-        [
-            SimpleNamespace(recipient_type=RecipientType.BACKSTAGE, access_token="btok"),
-            SimpleNamespace(recipient_type=RecipientType.CONSOLE, access_token="ctok"),
-        ],
-    )
-
-    assert reason.node_id == "node-1"
-    assert reason.actions[0].id == "approve"
-    assert not hasattr(reason, "form_token")
@@ -327,8 +327,7 @@ class TestGenerate:
            streaming=False,
        )
        assert result == {"result": "advanced-blocking"}
-        call_kwargs = gen_spy.call_args.kwargs
-        assert call_kwargs.get("streaming") is False
+        assert gen_spy.call_args.kwargs.get("streaming") is False
        retrieve_spy.assert_not_called()

    # -- ADVANCED_CHAT streaming --------------------------------------------
@@ -1,20 +1,14 @@
 import json
 import queue
-from collections.abc import Mapping, Sequence
+from collections.abc import Sequence
 from dataclasses import dataclass
 from datetime import UTC, datetime
-from itertools import cycle
 from threading import Event
-from types import SimpleNamespace
-from typing import Any, cast
-from unittest.mock import MagicMock

 import pytest
-from sqlalchemy.orm import Session, sessionmaker

 from core.app.app_config.entities import WorkflowUIBasedAppConfig
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
-from core.app.entities.task_entities import StreamEvent
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext, _WorkflowGenerateEntityWrapper
 from graphon.entities.pause_reason import HumanInputRequired
 from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
@@ -24,14 +18,11 @@ from models.model import AppMode
 from models.workflow import WorkflowRun
 from repositories.api_workflow_node_execution_repository import WorkflowNodeExecutionSnapshot
 from repositories.entities.workflow_pause import WorkflowPauseEntity
-from services import workflow_event_snapshot_service as service_module
 from services.workflow_event_snapshot_service import (
    BufferState,
    MessageContext,
    _build_snapshot_events,
-    _is_terminal_event,
    _resolve_task_id,
-    build_workflow_event_stream,
 )


@@ -134,6 +125,50 @@ def _build_resumption_context(task_id: str) -> WorkflowResumptionContext:
    )


+def test_build_snapshot_events_includes_pause_event() -> None:
+    workflow_run = _build_workflow_run(WorkflowExecutionStatus.PAUSED)
+    snapshot = _build_snapshot(WorkflowNodeExecutionStatus.PAUSED)
+    resumption_context = _build_resumption_context("task-ctx")
+    pause_entity = _FakePauseEntity(
+        pause_id="pause-1",
+        workflow_run_id="run-1",
+        paused_at_value=datetime(2024, 1, 1, tzinfo=UTC),
+        pause_reasons=[
+            HumanInputRequired(
+                form_id="form-1",
+                form_content="content",
+                node_id="node-1",
+                node_title="Human Input",
+            )
+        ],
+    )
+
+    events = _build_snapshot_events(
+        workflow_run=workflow_run,
+        node_snapshots=[snapshot],
+        task_id="task-ctx",
+        message_context=None,
+        pause_entity=pause_entity,
+        resumption_context=resumption_context,
+    )
+
+    assert [event["event"] for event in events] == [
+        "workflow_started",
+        "node_started",
+        "node_finished",
+        "workflow_paused",
+    ]
+    assert events[2]["data"]["status"] == WorkflowNodeExecutionStatus.PAUSED.value
+    pause_data = events[-1]["data"]
+    assert pause_data["paused_nodes"] == ["node-1"]
+    assert pause_data["outputs"] == {"result": "value"}
+    assert pause_data["status"] == WorkflowExecutionStatus.PAUSED.value
+    assert pause_data["created_at"] == int(workflow_run.created_at.timestamp())
+    assert pause_data["elapsed_time"] == workflow_run.elapsed_time
+    assert pause_data["total_tokens"] == workflow_run.total_tokens
+    assert pause_data["total_steps"] == workflow_run.total_steps
+
+
 def test_build_snapshot_events_applies_message_context() -> None:
    workflow_run = _build_workflow_run(WorkflowExecutionStatus.RUNNING)
    snapshot = _build_snapshot(WorkflowNodeExecutionStatus.SUCCEEDED)
@@ -187,658 +222,3 @@ def test_resolve_task_id_priority(context_task_id, buffered_task_id, expected) -
        buffer_state.task_id_ready.set()
    task_id = _resolve_task_id(resumption_context, buffer_state, "run-1", wait_timeout=0.0)
    assert task_id == expected
-
-
-def _build_workflow_run_additional(status: WorkflowExecutionStatus = WorkflowExecutionStatus.RUNNING) -> WorkflowRun:
-    return WorkflowRun(
-        id="run-1",
-        tenant_id="tenant-1",
-        app_id="app-1",
-        workflow_id="workflow-1",
-        type="workflow",
-        triggered_from="app-run",
-        version="v1",
-        graph=None,
-        inputs=json.dumps({"query": "hello"}),
-        status=status,
-        outputs=json.dumps({}),
-        error=None,
-        elapsed_time=1.2,
-        total_tokens=5,
-        total_steps=2,
-        created_by_role=CreatorUserRole.END_USER,
-        created_by="user-1",
-        created_at=datetime(2024, 1, 1, tzinfo=UTC),
-    )
-
-
-def _build_resumption_context_additional(task_id: str) -> WorkflowResumptionContext:
-    app_config = WorkflowUIBasedAppConfig(
-        tenant_id="tenant-1",
-        app_id="app-1",
-        app_mode=AppMode.WORKFLOW,
-        workflow_id="workflow-1",
-    )
-    generate_entity = WorkflowAppGenerateEntity(
-        task_id=task_id,
-        app_config=app_config,
-        inputs={},
-        files=[],
-        user_id="user-1",
-        stream=True,
-        invoke_from=InvokeFrom.EXPLORE,
-        call_depth=0,
-        workflow_execution_id="run-1",
-    )
-    runtime_state = GraphRuntimeState(variable_pool=VariablePool(), start_at=0.0)
-    runtime_state.outputs = {"answer": "ok"}
-    wrapper = _WorkflowGenerateEntityWrapper(entity=generate_entity)
-    return WorkflowResumptionContext(
-        generate_entity=wrapper,
-        serialized_graph_runtime_state=runtime_state.dumps(),
-    )
-
-
-class _SessionContext:
-    def __init__(self, session: Any) -> None:
-        self._session = session
-
-    def __enter__(self) -> Any:
-        return self._session
-
-    def __exit__(self, exc_type: Any, exc: Any, tb: Any) -> bool:
-        return False
-
-
-class _SessionMaker:
-    def __init__(self, session: Any) -> None:
-        self._session = session
-
-    def __call__(self) -> _SessionContext:
-        return _SessionContext(self._session)
-
-
-class _SubscriptionContext:
-    def __init__(self, subscription: Any) -> None:
-        self._subscription = subscription
-
-    def __enter__(self) -> Any:
-        return self._subscription
-
-    def __exit__(self, exc_type: Any, exc: Any, tb: Any) -> bool:
-        return False
-
-
-class _Topic:
-    def __init__(self, subscription: Any) -> None:
-        self._subscription = subscription
-
-    def subscribe(self) -> _SubscriptionContext:
-        return _SubscriptionContext(self._subscription)
-
-
-class _StaticSubscription:
-    def receive(self, timeout: int = 1) -> None:
-        return None
-
-
-@dataclass(frozen=True)
-class _PauseEntity(WorkflowPauseEntity):
-    state: bytes
-
-    @property
-    def id(self) -> str:
-        return "pause-1"
-
-    @property
-    def workflow_execution_id(self) -> str:
-        return "run-1"
-
-    @property
-    def resumed_at(self) -> datetime | None:
-        return None
-
-    @property
-    def paused_at(self) -> datetime:
-        return datetime(2024, 1, 1, tzinfo=UTC)
-
-    def get_state(self) -> bytes:
-        return self.state
-
-    def get_pause_reasons(self) -> list[Any]:
-        return []
-
-
-def test_get_message_context_should_return_none_when_no_message() -> None:
-    # Arrange
-    session = SimpleNamespace(scalar=MagicMock(return_value=None))
-    session_maker = _SessionMaker(session)
-
-    # Act
-    result = service_module._get_message_context(cast(sessionmaker[Session], session_maker), "run-1")
-
-    # Assert
-    assert result is None
-
-
-def test_get_message_context_should_default_created_at_to_zero_when_message_has_no_timestamp() -> None:
-    # Arrange
-    message = SimpleNamespace(
-        id="msg-1",
-        conversation_id="conv-1",
-        created_at=None,
-        answer="answer",
-    )
-    session = SimpleNamespace(scalar=MagicMock(return_value=message))
-    session_maker = _SessionMaker(session)
-
-    # Act
-    result = service_module._get_message_context(cast(sessionmaker[Session], session_maker), "run-1")
-
-    # Assert
-    assert result is not None
-    assert result.created_at == 0
-    assert result.message_id == "msg-1"
-    assert result.conversation_id == "conv-1"
-    assert result.answer == "answer"
-
-
-def test_load_resumption_context_should_return_none_when_pause_entity_missing() -> None:
-    # Arrange
-
-    # Act
-    result = service_module._load_resumption_context(None)
-
-    # Assert
-    assert result is None
-
-
-def test_load_resumption_context_should_return_none_when_pause_entity_state_is_invalid() -> None:
-    # Arrange
-    pause_entity = _PauseEntity(state=b"not-a-valid-state")
-
-    # Act
-    result = service_module._load_resumption_context(pause_entity)
-
-    # Assert
-    assert result is None
-
-
-def test_load_resumption_context_should_parse_valid_state_into_context() -> None:
-    # Arrange
-    context = _build_resumption_context_additional(task_id="task-ctx")
-    pause_entity = _PauseEntity(state=context.dumps().encode())
-
-    # Act
-    result = service_module._load_resumption_context(pause_entity)
-
-    # Assert
-    assert result is not None
-    assert result.get_generate_entity().task_id == "task-ctx"
-
-
-def test_resolve_task_id_should_return_workflow_run_id_when_buffer_state_is_missing() -> None:
-    # Arrange
-
-    # Act
-    result = service_module._resolve_task_id(
-        resumption_context=None,
-        buffer_state=None,
-        workflow_run_id="run-1",
-    )
-
-    # Assert
-    assert result == "run-1"
-
-
-@pytest.mark.parametrize(
-    ("payload", "expected"),
-    [
-        (b'{"event":"node_started"}', {"event": "node_started"}),
-        (b"invalid-json", None),
-        (b"[]", None),
-    ],
-)
-def test_parse_event_message_should_parse_only_json_object(
-    payload: bytes,
-    expected: dict[str, Any] | None,
-) -> None:
-    # Arrange
-
-    # Act
-    result = service_module._parse_event_message(payload)
-
-    # Assert
-    assert result == expected
-
-
-def test_is_terminal_event_should_recognize_finished_and_optional_paused_events() -> None:
-    # Arrange
-    finished_event = {"event": StreamEvent.WORKFLOW_FINISHED.value}
-    paused_event = {"event": StreamEvent.WORKFLOW_PAUSED.value}
-
-    # Act
-    is_finished = service_module._is_terminal_event(finished_event, close_on_pause=False)
-    paused_without_flag = service_module._is_terminal_event(paused_event, close_on_pause=False)
-    paused_with_flag = service_module._is_terminal_event(paused_event, close_on_pause=True)
-
-    # Assert
-    assert is_finished is True
-    assert paused_without_flag is False
-    assert paused_with_flag is True
-    assert service_module._is_terminal_event(StreamEvent.PING.value, close_on_pause=True) is False
-
-
-def test_apply_message_context_should_update_payload_when_context_exists() -> None:
-    # Arrange
-    payload: dict[str, Any] = {"event": "workflow_started"}
-    context = MessageContext(conversation_id="conv-1", message_id="msg-1", created_at=1700000000)
-
-    # Act
-    service_module._apply_message_context(payload, context)
-
-    # Assert
-    assert payload["conversation_id"] == "conv-1"
-    assert payload["message_id"] == "msg-1"
-    assert payload["created_at"] == 1700000000
-
-
-def test_start_buffering_should_capture_task_id_and_enqueue_event() -> None:
-    # Arrange
-    class Subscription:
-        def __init__(self) -> None:
-            self._calls = 0
-
-        def receive(self, timeout: int = 1) -> bytes | None:
-            self._calls += 1
-            if self._calls == 1:
-                return b'{"event":"node_started","task_id":"task-1"}'
-            return None
-
-    subscription = Subscription()
-
-    # Act
-    buffer_state = service_module._start_buffering(subscription)
-    ready = buffer_state.task_id_ready.wait(timeout=1)
-    event = buffer_state.queue.get(timeout=1)
-    buffer_state.stop_event.set()
-    finished = buffer_state.done_event.wait(timeout=1)
-
-    # Assert
-    assert ready is True
-    assert finished is True
-    assert buffer_state.task_id_hint == "task-1"
-    assert event["event"] == "node_started"
-
-
-def test_start_buffering_should_drop_old_event_when_queue_is_full(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    # Arrange
-    class QueueWithSingleFull:
-        def __init__(self) -> None:
-            self._first_put = True
-            self.items: list[dict[str, Any]] = [{"event": "old"}]
-
-        def put_nowait(self, item: dict[str, Any]) -> None:
-            if self._first_put:
-                self._first_put = False
-                raise queue.Full
-            self.items.append(item)
-
-        def get_nowait(self) -> dict[str, Any]:
-            if not self.items:
-                raise queue.Empty
-            return self.items.pop(0)
-
-        def empty(self) -> bool:
-            return len(self.items) == 0
-
-    fake_queue = QueueWithSingleFull()
-    monkeypatch.setattr(service_module.queue, "Queue", lambda maxsize=2048: fake_queue)
-
-    class Subscription:
-        def __init__(self) -> None:
-            self._calls = 0
-
-        def receive(self, timeout: int = 1) -> bytes | None:
-            self._calls += 1
-            if self._calls == 1:
-                return b'{"event":"node_started","task_id":"task-2"}'
-            return None
-
-    subscription = Subscription()
-
-    # Act
-    buffer_state = service_module._start_buffering(subscription)
-    ready = buffer_state.task_id_ready.wait(timeout=1)
-    buffer_state.stop_event.set()
-    finished = buffer_state.done_event.wait(timeout=1)
-
-    # Assert
-    assert ready is True
-    assert finished is True
-    assert fake_queue.items[-1]["task_id"] == "task-2"
-
-
-def test_start_buffering_should_set_done_event_when_subscription_raises() -> None:
-    # Arrange
-    class Subscription:
-        def receive(self, timeout: int = 1) -> bytes | None:
-            raise RuntimeError("subscription failure")
-
-    subscription = Subscription()
-
-    # Act
-    buffer_state = service_module._start_buffering(subscription)
-    finished = buffer_state.done_event.wait(timeout=1)
-
-    # Assert
-    assert finished is True
-
-
-def test_build_workflow_event_stream_should_emit_ping_and_terminal_snapshot_event(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    # Arrange
-    workflow_run = _build_workflow_run_additional(status=WorkflowExecutionStatus.RUNNING)
-    topic = _Topic(_StaticSubscription())
-    workflow_run_repo = SimpleNamespace(get_workflow_pause=MagicMock())
-    node_repo = SimpleNamespace(get_execution_snapshots_by_workflow_run=MagicMock(return_value=[]))
-    factory = SimpleNamespace(
-        create_api_workflow_run_repository=MagicMock(return_value=workflow_run_repo),
-        create_api_workflow_node_execution_repository=MagicMock(return_value=node_repo),
-    )
-    monkeypatch.setattr(service_module, "DifyAPIRepositoryFactory", factory)
-    monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
-    monkeypatch.setattr(
-        service_module,
-        "_get_message_context",
-        MagicMock(return_value=MessageContext("conv-1", "msg-1", 1700000000)),
-    )
-    monkeypatch.setattr(service_module, "_load_resumption_context", MagicMock(return_value=None))
-    buffer_state = BufferState(
-        queue=queue.Queue(),
-        stop_event=Event(),
-        done_event=Event(),
-        task_id_ready=Event(),
-        task_id_hint="task-1",
-    )
-    monkeypatch.setattr(service_module, "_start_buffering", MagicMock(return_value=buffer_state))
-    monkeypatch.setattr(service_module, "_resolve_task_id", MagicMock(return_value="task-1"))
-    monkeypatch.setattr(
-        service_module,
-        "_build_snapshot_events",
-        MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED.value, "task_id": "task-1"}]),
-    )
-
-    # Act
-    events = list(
-        build_workflow_event_stream(
-            app_mode=AppMode.ADVANCED_CHAT,
-            workflow_run=workflow_run,
-            tenant_id="tenant-1",
-            app_id="app-1",
-            session_maker=MagicMock(),
-        )
-    )
-
-    # Assert
-    assert events[0] == StreamEvent.PING.value
-    finished_event = cast(Mapping[str, Any], events[1])
-    assert finished_event["event"] == StreamEvent.WORKFLOW_FINISHED.value
-    assert buffer_state.stop_event.is_set() is True
-    node_repo.get_execution_snapshots_by_workflow_run.assert_called_once()
-    called_kwargs = node_repo.get_execution_snapshots_by_workflow_run.call_args.kwargs
-    assert called_kwargs["workflow_run_id"] == "run-1"
-
-
-def test_build_workflow_event_stream_should_emit_periodic_ping_and_stop_after_idle_timeout(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    # Arrange
-    workflow_run = _build_workflow_run_additional(status=WorkflowExecutionStatus.RUNNING)
-    topic = _Topic(_StaticSubscription())
-    workflow_run_repo = SimpleNamespace(get_workflow_pause=MagicMock())
-    node_repo = SimpleNamespace(get_execution_snapshots_by_workflow_run=MagicMock(return_value=[]))
-    factory = SimpleNamespace(
-        create_api_workflow_run_repository=MagicMock(return_value=workflow_run_repo),
-        create_api_workflow_node_execution_repository=MagicMock(return_value=node_repo),
-    )
-    monkeypatch.setattr(service_module, "DifyAPIRepositoryFactory", factory)
-    monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
-    monkeypatch.setattr(service_module, "_load_resumption_context", MagicMock(return_value=None))
-    monkeypatch.setattr(service_module, "_build_snapshot_events", MagicMock(return_value=[]))
-    monkeypatch.setattr(service_module, "_resolve_task_id", MagicMock(return_value="task-1"))
-
-    class AlwaysEmptyQueue:
-        def empty(self) -> bool:
-            return False
-
-        def get(self, timeout: int = 1) -> None:
-            raise queue.Empty
-
-    buffer_state = BufferState(
-        queue=AlwaysEmptyQueue(),  # type: ignore[arg-type]
-        stop_event=Event(),
-        done_event=Event(),
-        task_id_ready=Event(),
-        task_id_hint="task-1",
-    )
-    monkeypatch.setattr(service_module, "_start_buffering", MagicMock(return_value=buffer_state))
-    time_values = cycle([0.0, 6.0, 21.0, 26.0])
-    monkeypatch.setattr(service_module.time, "time", lambda: next(time_values))
-
-    # Act
-    events = list(
-        build_workflow_event_stream(
-            app_mode=AppMode.WORKFLOW,
-            workflow_run=workflow_run,
-            tenant_id="tenant-1",
-            app_id="app-1",
-            session_maker=MagicMock(),
-            idle_timeout=20.0,
-            ping_interval=5.0,
-        )
-    )
-
-    # Assert
-    assert events == [StreamEvent.PING.value, StreamEvent.PING.value]
-    assert buffer_state.stop_event.is_set() is True
-
-
-def test_build_workflow_event_stream_should_exit_when_buffer_done_and_empty(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    # Arrange
-    workflow_run = _build_workflow_run_additional(status=WorkflowExecutionStatus.RUNNING)
-    topic = _Topic(_StaticSubscription())
-    workflow_run_repo = SimpleNamespace(get_workflow_pause=MagicMock())
-    node_repo = SimpleNamespace(get_execution_snapshots_by_workflow_run=MagicMock(return_value=[]))
-    factory = SimpleNamespace(
-        create_api_workflow_run_repository=MagicMock(return_value=workflow_run_repo),
-        create_api_workflow_node_execution_repository=MagicMock(return_value=node_repo),
-    )
-    monkeypatch.setattr(service_module, "DifyAPIRepositoryFactory", factory)
-    monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
-    monkeypatch.setattr(service_module, "_load_resumption_context", MagicMock(return_value=None))
-    monkeypatch.setattr(service_module, "_build_snapshot_events", MagicMock(return_value=[]))
-    monkeypatch.setattr(service_module, "_resolve_task_id", MagicMock(return_value="task-1"))
-    buffer_state = BufferState(
-        queue=queue.Queue(),
-        stop_event=Event(),
-        done_event=Event(),
-        task_id_ready=Event(),
-        task_id_hint="task-1",
-    )
-    buffer_state.done_event.set()
-    monkeypatch.setattr(service_module, "_start_buffering", MagicMock(return_value=buffer_state))
-
-    # Act
-    events = list(
-        build_workflow_event_stream(
-            app_mode=AppMode.WORKFLOW,
-            workflow_run=workflow_run,
-            tenant_id="tenant-1",
-            app_id="app-1",
-            session_maker=MagicMock(),
-        )
-    )
-
-    # Assert
-    assert events == [StreamEvent.PING.value]
-    assert buffer_state.stop_event.is_set() is True
-
-
-def test_build_workflow_event_stream_should_continue_when_pause_loading_fails(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    # Arrange
-    workflow_run = _build_workflow_run_additional(status=WorkflowExecutionStatus.PAUSED)
-    topic = _Topic(_StaticSubscription())
-    workflow_run_repo = SimpleNamespace(get_workflow_pause=MagicMock(side_effect=RuntimeError("boom")))
-    node_repo = SimpleNamespace(get_execution_snapshots_by_workflow_run=MagicMock(return_value=[]))
-    factory = SimpleNamespace(
-        create_api_workflow_run_repository=MagicMock(return_value=workflow_run_repo),
-        create_api_workflow_node_execution_repository=MagicMock(return_value=node_repo),
-    )
-    monkeypatch.setattr(service_module, "DifyAPIRepositoryFactory", factory)
-    monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
-    monkeypatch.setattr(service_module, "_load_resumption_context", MagicMock(return_value=None))
-    monkeypatch.setattr(service_module, "_resolve_task_id", MagicMock(return_value="task-1"))
-    snapshot_builder = MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED.value}])
-    monkeypatch.setattr(service_module, "_build_snapshot_events", snapshot_builder)
-    buffer_state = BufferState(
-        queue=queue.Queue(),
-        stop_event=Event(),
-        done_event=Event(),
-        task_id_ready=Event(),
-        task_id_hint="task-1",
-    )
-    monkeypatch.setattr(service_module, "_start_buffering", MagicMock(return_value=buffer_state))
-
-    # Act
-    events = list(
-        build_workflow_event_stream(
-            app_mode=AppMode.WORKFLOW,
-            workflow_run=workflow_run,
-            tenant_id="tenant-1",
-            app_id="app-1",
-            session_maker=MagicMock(),
-        )
-    )
-
-    # Assert
-    assert events[0] == StreamEvent.PING.value
-    assert snapshot_builder.call_args.kwargs["pause_entity"] is None
-
-
-def test_is_terminal_event_respects_close_on_pause_flag() -> None:
-    pause_event = {"event": "workflow_paused"}
-    finish_event = {"event": "workflow_finished"}
-
-    assert _is_terminal_event(pause_event, close_on_pause=True) is True
-    assert _is_terminal_event(pause_event, close_on_pause=False) is False
-    assert _is_terminal_event(finish_event, close_on_pause=False) is True
-
-
-def test_build_snapshot_events_preserves_public_form_token(monkeypatch: pytest.MonkeyPatch) -> None:
-    workflow_run = _build_workflow_run(WorkflowExecutionStatus.PAUSED)
-    snapshot = _build_snapshot(WorkflowNodeExecutionStatus.PAUSED)
-    resumption_context = _build_resumption_context("task-ctx")
-    monkeypatch.setattr(
-        service_module, "load_form_tokens_by_form_id", lambda form_ids, session=None: {"form-1": "wtok"}
-    )
-    session_maker = _SessionMaker(
-        SimpleNamespace(
-            execute=lambda _stmt: [("form-1", datetime(2024, 1, 1, tzinfo=UTC), '{"display_in_ui": true}')],
-        )
-    )
-    pause_entity = _FakePauseEntity(
-        pause_id="pause-1",
-        workflow_run_id="run-1",
-        paused_at_value=datetime(2024, 1, 1, tzinfo=UTC),
-        pause_reasons=[
-            HumanInputRequired(
-                form_id="form-1",
-                form_content="content",
-                node_id="node-1",
-                node_title="Human Input",
-                form_token="wtok",
-            )
-        ],
-    )
-
-    events = _build_snapshot_events(
-        workflow_run=workflow_run,
-        node_snapshots=[snapshot],
-        task_id="task-ctx",
-        message_context=None,
-        pause_entity=pause_entity,
-        resumption_context=resumption_context,
-        session_maker=cast(sessionmaker[Session], session_maker),
-    )
-
-    assert events[-2]["event"] == StreamEvent.HUMAN_INPUT_REQUIRED.value
-    assert events[-2]["data"]["form_token"] == "wtok"
-    assert events[-2]["data"]["expiration_time"] == int(datetime(2024, 1, 1, tzinfo=UTC).timestamp())
-    pause_data = events[-1]["data"]
-    assert pause_data["reasons"][0]["form_token"] == "wtok"
-    assert pause_data["reasons"][0]["expiration_time"] == int(datetime(2024, 1, 1, tzinfo=UTC).timestamp())
-
-
-def test_build_workflow_event_stream_loads_pause_tokens_without_flask_app_context(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    workflow_run = _build_workflow_run_additional(status=WorkflowExecutionStatus.PAUSED)
-    topic = _Topic(_StaticSubscription())
-    pause_entity = _FakePauseEntity(
-        pause_id="pause-1",
-        workflow_run_id="run-1",
-        paused_at_value=datetime(2024, 1, 1, tzinfo=UTC),
-        pause_reasons=[
-            HumanInputRequired(
-                form_id="form-1",
-                form_content="content",
-                node_id="node-1",
-                node_title="Human Input",
-            )
-        ],
-    )
-    workflow_run_repo = SimpleNamespace(get_workflow_pause=MagicMock(return_value=pause_entity))
-    node_repo = SimpleNamespace(get_execution_snapshots_by_workflow_run=MagicMock(return_value=[]))
-    factory = SimpleNamespace(
-        create_api_workflow_run_repository=MagicMock(return_value=workflow_run_repo),
-        create_api_workflow_node_execution_repository=MagicMock(return_value=node_repo),
-    )
-    monkeypatch.setattr(service_module, "DifyAPIRepositoryFactory", factory)
-    monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
-    monkeypatch.setattr(
-        service_module, "_load_resumption_context", MagicMock(return_value=_build_resumption_context("task-1"))
-    )
-    monkeypatch.setattr(
-        service_module, "load_form_tokens_by_form_id", lambda form_ids, session=None: {"form-1": "wtok"}
-    )
-
-    session = SimpleNamespace(
-        scalar=MagicMock(return_value=None),
-        execute=lambda _stmt: [("form-1", datetime(2024, 1, 1, tzinfo=UTC), '{"display_in_ui": true}')],
-    )
-    session_maker = _SessionMaker(session)
-
-    events = list(
-        build_workflow_event_stream(
-            app_mode=AppMode.WORKFLOW,
-            workflow_run=workflow_run,
-            tenant_id="tenant-1",
-            app_id="app-1",
-            session_maker=cast(sessionmaker[Session], session_maker),
-        )
-    )
-
-    pause_event = cast(Mapping[str, Any], events[-1])
-    assert pause_event["event"] == StreamEvent.WORKFLOW_PAUSED.value
-    assert pause_event["data"]["reasons"][0]["form_token"] == "wtok"
-    assert pause_event["data"]["reasons"][0]["expiration_time"] == int(
-        datetime(2024, 1, 1, tzinfo=UTC).timestamp()
-    )
@@ -7,16 +7,11 @@ from unittest.mock import MagicMock

 import pytest

-from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
+from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom
 from models.enums import CreatorUserRole
 from models.model import App, AppMode, Conversation
 from models.workflow import Workflow, WorkflowRun
-from tasks.app_generate.workflow_execute_task import (
-    _publish_streaming_response,
-    _resume_advanced_chat,
-    _resume_app_execution,
-    _resume_workflow,
-)
+from tasks.app_generate.workflow_execute_task import _publish_streaming_response, _resume_app_execution


 class _FakeSessionContext:
@@ -43,28 +38,12 @@ def _build_advanced_chat_generate_entity(conversation_id: str | None) -> Advance
    )


-def _build_workflow_generate_entity(stream: bool) -> WorkflowAppGenerateEntity:
-    return WorkflowAppGenerateEntity(
-        task_id="task-id",
-        inputs={},
-        files=[],
-        user_id="user-id",
-        stream=stream,
-        invoke_from=InvokeFrom.WEB_APP,
-        workflow_execution_id="workflow-run-id",
-    )
-
-
-def _single_event_generator(payload):
-    yield payload
-
-
@pytest.fixture
-def mock_topic(monkeypatch: pytest.MonkeyPatch) -> MagicMock:
+def mock_topic(mocker) -> MagicMock:
    topic = MagicMock()
-    monkeypatch.setattr(
+    mocker.patch(
        "tasks.app_generate.workflow_execute_task.MessageBasedAppGenerator.get_response_topic",
-        lambda *_args, **_kwargs: topic,
+        return_value=topic,
    )
    return topic

@@ -88,35 +67,31 @@ def test_publish_streaming_response_coerces_string_uuid(mock_topic: MagicMock):
    mock_topic.publish.assert_called_once_with(json.dumps({"event": "bar"}).encode())


-def test_resume_app_execution_queries_message_by_conversation_and_workflow_run(monkeypatch: pytest.MonkeyPatch):
+def test_resume_app_execution_queries_message_by_conversation_and_workflow_run(mocker):
    workflow_run_id = "run-id"
    conversation_id = "conversation-id"
    message = MagicMock()

-    monkeypatch.setattr("tasks.app_generate.workflow_execute_task.db", SimpleNamespace(engine=object()))
+    mocker.patch("tasks.app_generate.workflow_execute_task.db", SimpleNamespace(engine=object()))

    pause_entity = MagicMock()
    pause_entity.get_state.return_value = b"state"

    workflow_run_repo = MagicMock()
    workflow_run_repo.get_workflow_pause.return_value = pause_entity
-    monkeypatch.setattr(
+    mocker.patch(
        "tasks.app_generate.workflow_execute_task.DifyAPIRepositoryFactory.create_api_workflow_run_repository",
-        lambda *_args, **_kwargs: workflow_run_repo,
+        return_value=workflow_run_repo,
    )

    generate_entity = _build_advanced_chat_generate_entity(conversation_id)
    resumption_context = MagicMock()
    resumption_context.serialized_graph_runtime_state = "{}"
    resumption_context.get_generate_entity.return_value = generate_entity
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.WorkflowResumptionContext.loads",
-        lambda *_args, **_kwargs: resumption_context,
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.GraphRuntimeState.from_snapshot",
-        lambda *_args, **_kwargs: MagicMock(),
+    mocker.patch(
+        "tasks.app_generate.workflow_execute_task.WorkflowResumptionContext.loads", return_value=resumption_context
    )
+    mocker.patch("tasks.app_generate.workflow_execute_task.GraphRuntimeState.from_snapshot", return_value=MagicMock())

    workflow_run = SimpleNamespace(
        workflow_id="wf-id",
@@ -145,15 +120,10 @@ def test_resume_app_execution_queries_message_by_conversation_and_workflow_run(m
    session.get.side_effect = _session_get
    session.scalar.return_value = message

-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.Session", lambda *_args, **_kwargs: _FakeSessionContext(session)
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task._resolve_user_for_run", lambda *_args, **_kwargs: MagicMock()
-    )
-    resume_advanced_chat = MagicMock()
-    monkeypatch.setattr("tasks.app_generate.workflow_execute_task._resume_advanced_chat", resume_advanced_chat)
-    monkeypatch.setattr("tasks.app_generate.workflow_execute_task._resume_workflow", MagicMock())
+    mocker.patch("tasks.app_generate.workflow_execute_task.Session", return_value=_FakeSessionContext(session))
+    mocker.patch("tasks.app_generate.workflow_execute_task._resolve_user_for_run", return_value=MagicMock())
+    resume_advanced_chat = mocker.patch("tasks.app_generate.workflow_execute_task._resume_advanced_chat")
+    mocker.patch("tasks.app_generate.workflow_execute_task._resume_workflow")

    _resume_app_execution({"workflow_run_id": workflow_run_id})

@@ -174,35 +144,29 @@ def test_resume_app_execution_queries_message_by_conversation_and_workflow_run(m
    assert resume_advanced_chat.call_args.kwargs["message"] is message


-def test_resume_app_execution_returns_early_when_advanced_chat_missing_conversation_id(
-    monkeypatch: pytest.MonkeyPatch,
-):
+def test_resume_app_execution_returns_early_when_advanced_chat_missing_conversation_id(mocker):
    workflow_run_id = "run-id"

-    monkeypatch.setattr("tasks.app_generate.workflow_execute_task.db", SimpleNamespace(engine=object()))
+    mocker.patch("tasks.app_generate.workflow_execute_task.db", SimpleNamespace(engine=object()))

    pause_entity = MagicMock()
    pause_entity.get_state.return_value = b"state"

    workflow_run_repo = MagicMock()
    workflow_run_repo.get_workflow_pause.return_value = pause_entity
-    monkeypatch.setattr(
+    mocker.patch(
        "tasks.app_generate.workflow_execute_task.DifyAPIRepositoryFactory.create_api_workflow_run_repository",
-        lambda *_args, **_kwargs: workflow_run_repo,
+        return_value=workflow_run_repo,
    )

    generate_entity = _build_advanced_chat_generate_entity(conversation_id=None)
    resumption_context = MagicMock()
    resumption_context.serialized_graph_runtime_state = "{}"
    resumption_context.get_generate_entity.return_value = generate_entity
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.WorkflowResumptionContext.loads",
-        lambda *_args, **_kwargs: resumption_context,
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.GraphRuntimeState.from_snapshot",
-        lambda *_args, **_kwargs: MagicMock(),
+    mocker.patch(
+        "tasks.app_generate.workflow_execute_task.WorkflowResumptionContext.loads", return_value=resumption_context
    )
+    mocker.patch("tasks.app_generate.workflow_execute_task.GraphRuntimeState.from_snapshot", return_value=MagicMock())

    workflow_run = SimpleNamespace(
        workflow_id="wf-id",
@@ -227,107 +191,12 @@ def test_resume_app_execution_returns_early_when_advanced_chat_missing_conversat

    session.get.side_effect = _session_get

-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.Session", lambda *_args, **_kwargs: _FakeSessionContext(session)
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task._resolve_user_for_run", lambda *_args, **_kwargs: MagicMock()
-    )
-    resume_advanced_chat = MagicMock()
-    monkeypatch.setattr("tasks.app_generate.workflow_execute_task._resume_advanced_chat", resume_advanced_chat)
+    mocker.patch("tasks.app_generate.workflow_execute_task.Session", return_value=_FakeSessionContext(session))
+    mocker.patch("tasks.app_generate.workflow_execute_task._resolve_user_for_run", return_value=MagicMock())
+    resume_advanced_chat = mocker.patch("tasks.app_generate.workflow_execute_task._resume_advanced_chat")

    _resume_app_execution({"workflow_run_id": workflow_run_id})

    session.scalar.assert_not_called()
    workflow_run_repo.resume_workflow_pause.assert_not_called()
    resume_advanced_chat.assert_not_called()
-
-
-def test_resume_advanced_chat_publishes_events_for_originally_blocking_runs(monkeypatch: pytest.MonkeyPatch):
-    generate_entity = _build_advanced_chat_generate_entity(conversation_id="conversation-id")
-    generate_entity.stream = False
-
-    generator_instance = MagicMock()
-    response_stream = _single_event_generator({"event": "message"})
-    generator_instance.resume.return_value = response_stream
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.AdvancedChatAppGenerator",
-        lambda: generator_instance,
-    )
-
-    publish_streaming_response = MagicMock()
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task._publish_streaming_response", publish_streaming_response
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.DifyCoreRepositoryFactory.create_workflow_execution_repository",
-        lambda **kwargs: MagicMock(),
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.DifyCoreRepositoryFactory.create_workflow_node_execution_repository",
-        lambda **kwargs: MagicMock(),
-    )
-
-    _resume_advanced_chat(
-        app_model=SimpleNamespace(id="app-id"),
-        workflow=SimpleNamespace(created_by="workflow-owner"),
-        user=MagicMock(),
-        conversation=SimpleNamespace(id="conversation-id"),
-        message=MagicMock(),
-        generate_entity=generate_entity,
-        graph_runtime_state=MagicMock(),
-        session_factory=MagicMock(),
-        pause_state_config=MagicMock(),
-        workflow_run_id="workflow-run-id",
-        workflow_run=SimpleNamespace(triggered_from="app_run"),
-    )
-
-    resumed_entity = generator_instance.resume.call_args.kwargs["application_generate_entity"]
-    assert resumed_entity.stream is True
-    publish_streaming_response.assert_called_once_with(response_stream, "workflow-run-id", AppMode.ADVANCED_CHAT)
-
-
-def test_resume_workflow_publishes_events_for_originally_blocking_runs(monkeypatch: pytest.MonkeyPatch):
-    generate_entity = _build_workflow_generate_entity(stream=False)
-
-    generator_instance = MagicMock()
-    response_stream = _single_event_generator({"event": "workflow_finished"})
-    generator_instance.resume.return_value = response_stream
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.WorkflowAppGenerator",
-        lambda: generator_instance,
-    )
-
-    publish_streaming_response = MagicMock()
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task._publish_streaming_response", publish_streaming_response
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.DifyCoreRepositoryFactory.create_workflow_execution_repository",
-        lambda **kwargs: MagicMock(),
-    )
-    monkeypatch.setattr(
-        "tasks.app_generate.workflow_execute_task.DifyCoreRepositoryFactory.create_workflow_node_execution_repository",
-        lambda **kwargs: MagicMock(),
-    )
-    workflow_run_repo = MagicMock()
-    pause_entity = MagicMock()
-
-    _resume_workflow(
-        app_model=SimpleNamespace(id="app-id"),
-        workflow=SimpleNamespace(created_by="workflow-owner"),
-        user=MagicMock(),
-        generate_entity=generate_entity,
-        graph_runtime_state=MagicMock(),
-        session_factory=MagicMock(),
-        pause_state_config=MagicMock(),
-        workflow_run_id="workflow-run-id",
-        workflow_run=SimpleNamespace(triggered_from="app_run"),
-        workflow_run_repo=workflow_run_repo,
-        pause_entity=pause_entity,
-    )
-
-    resumed_entity = generator_instance.resume.call_args.kwargs["application_generate_entity"]
-    assert resumed_entity.stream is True
-    publish_streaming_response.assert_called_once_with(response_stream, "workflow-run-id", AppMode.WORKFLOW)
-    workflow_run_repo.delete_workflow_pause.assert_called_once_with(pause_entity)
@@ -469,14 +469,14 @@ wheels = [

 [[package]]
 name = "basedpyright"
-version = "1.39.0"
+version = "1.39.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "nodejs-wheel-binaries" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ac/f4/4a77cc1ffb3dab7391642cde30163961d8ee973e9e6b6740c7d15aa3d3ba/basedpyright-1.39.0.tar.gz", hash = "sha256:6666f51c378c7ac45877c4c1c7041ee0b5b83d755ebc82f898f47b6fafe0cc4f", size = 25357403, upload-time = "2026-04-01T12:27:41.92Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/04/19/5a5b9b9197973da732638957be3a65cf514d2f5a4964eeedbf33b6c65bbd/basedpyright-1.39.3.tar.gz", hash = "sha256:2f794e6b5f4260fb89f614ca6cd23c6f305373bb6b50c4ed7794ff2ae647fb14", size = 25503187, upload-time = "2026-04-20T22:14:47.424Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/97/47/08145d1bcc3083ed20059bdecbde404bd767f91b91e2764ec01cffec9f4b/basedpyright-1.39.0-py3-none-any.whl", hash = "sha256:91b8ad50bc85ee4a985b928f9368c35c99eee5a56c44e99b2442fa12ecc3d670", size = 12353868, upload-time = "2026-04-01T12:27:38.495Z" },
+    { url = "https://files.pythonhosted.org/packages/54/5c/f950c1239ad26f3bb453e665428a2cf1893995de725a5eb0b64a2520b366/basedpyright-1.39.3-py3-none-any.whl", hash = "sha256:aba760dc83307727554f936d6b4381caa14482f30dbc2173167710e217c1f7ab", size = 12419181, upload-time = "2026-04-20T22:14:51.975Z" },
 ]

 [[package]]
@@ -618,15 +618,15 @@ wheels = [

 [[package]]
 name = "boto3-stubs"
-version = "1.42.88"
+version = "1.42.92"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "botocore-stubs" },
    { name = "types-s3transfer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c2/c7/d4dfbb4757cd72fd350ba666902ec3ac19e04d6be639e96cdad4543d4726/boto3_stubs-1.42.88.tar.gz", hash = "sha256:85215fb4938a94d1cf83cd8632f46ae7728b5ec88187d83468f393bbe64236d6", size = 102495, upload-time = "2026-04-10T19:55:57.526Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/b4/7f472d64a89f6aa6b8e8eeadc876667b7e4edfb526c6118efe2b2c98ba17/boto3_stubs-1.42.92.tar.gz", hash = "sha256:4bc934069c5e8c7b3cdd2442569dae14e8272fe207d445bd38aa578b8463638f", size = 102696, upload-time = "2026-04-20T19:55:19.858Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b4/6f/3befd72080aedbb4ad26b353a6e364645668664930ce49668fd0bab8f2b5/boto3_stubs-1.42.88-py3-none-any.whl", hash = "sha256:9e74350715ca8ccd63fc250f8eca9fa3161b3d1704339554344d72e4e21c5ed1", size = 70603, upload-time = "2026-04-10T19:55:49.921Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/ce/2fe2c6456f8dc0b8bb8d80e05e154c7975ec058991bedf54f3aeed634b79/boto3_stubs-1.42.92-py3-none-any.whl", hash = "sha256:b3994e60f0133b2dd3d9a88ceaeef48fa6367d9a9429426e919575768a1ad9c6", size = 70666, upload-time = "2026-04-20T19:55:16.398Z" },
 ]

 [package.optional-dependencies]
@@ -1616,13 +1616,13 @@ requires-dist = [

 [package.metadata.requires-dev]
 dev = [
-    { name = "basedpyright", specifier = ">=1.39.0" },
-    { name = "boto3-stubs", specifier = ">=1.42.88" },
+    { name = "basedpyright", specifier = ">=1.39.3" },
+    { name = "boto3-stubs", specifier = ">=1.42.92" },
    { name = "celery-types", specifier = ">=0.23.0" },
    { name = "coverage", specifier = ">=7.13.4" },
    { name = "dotenv-linter", specifier = ">=0.7.0" },
-    { name = "faker", specifier = ">=20.1.0" },
-    { name = "hypothesis", specifier = ">=6.151.12" },
+    { name = "faker", specifier = ">=40.15.0" },
+    { name = "hypothesis", specifier = ">=6.152.1" },
    { name = "import-linter", specifier = ">=2.3" },
    { name = "lxml-stubs", specifier = ">=0.5.1" },
    { name = "mypy", specifier = ">=1.20.1" },
@@ -1635,8 +1635,8 @@ dev = [
    { name = "pytest-mock", specifier = ">=3.15.1" },
    { name = "pytest-timeout", specifier = ">=2.4.0" },
    { name = "pytest-xdist", specifier = ">=3.8.0" },
-    { name = "ruff", specifier = ">=0.15.10" },
-    { name = "scipy-stubs", specifier = ">=1.15.3.0" },
+    { name = "ruff", specifier = ">=0.15.11" },
+    { name = "scipy-stubs", specifier = ">=1.17.1.4" },
    { name = "testcontainers", specifier = ">=4.14.2" },
    { name = "types-aiofiles", specifier = ">=25.1.0" },
    { name = "types-beautifulsoup4", specifier = ">=4.12.0" },
@@ -2351,14 +2351,14 @@ wheels = [

 [[package]]
 name = "faker"
-version = "40.13.0"
+version = "40.15.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "tzdata", marker = "sys_platform == 'win32'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/89/95/4822ffe94723553789aef783104f4f18fc20d7c4c68e1bbd633e11d09758/faker-40.13.0.tar.gz", hash = "sha256:a0751c84c3abac17327d7bb4c98e8afe70ebf7821e01dd7d0b15cd8856415525", size = 1962043, upload-time = "2026-04-06T16:44:55.68Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7f/13/6741787bd91c4109c7bed047d68273965cd52ce8a5f773c471b949334b6d/faker-40.15.0.tar.gz", hash = "sha256:20f3a6ec8c266b74d4c554e34118b21c3c2056c0b4a519d15c8decb3a4e6e795", size = 1967447, upload-time = "2026-04-17T20:05:27.555Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/8a/708103325edff16a0b0e004de0d37db8ba216a32713948c64d71f6d4a4c2/faker-40.13.0-py3-none-any.whl", hash = "sha256:c1298fd0d819b3688fb5fd358c4ba8f56c7c8c740b411fd3dbd8e30bf2c05019", size = 1994597, upload-time = "2026-04-06T16:44:53.698Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/a7/a600f8f30d4505e89166de51dd121bd540ab8e560e8cf0901de00a81de8c/faker-40.15.0-py3-none-any.whl", hash = "sha256:71ab3c3370da9d2205ab74ffb0fd51273063ad562b3a3bb69d0026a20923e318", size = 2004447, upload-time = "2026-04-17T20:05:25.437Z" },
 ]

 [[package]]
@@ -3317,14 +3317,14 @@ wheels = [

 [[package]]
 name = "hypothesis"
-version = "6.151.12"
+version = "6.152.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "sortedcontainers" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ce/ab/67ca321d1ab96fd3828b12142f1c258e2d4a668a025d06cd50ab3409787f/hypothesis-6.151.12.tar.gz", hash = "sha256:be485f503979af4c3dfa19e3fc2b967d0458e7f8c4e28128d7e215e0a55102e0", size = 463900, upload-time = "2026-04-08T19:40:06.205Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/64/b1/c32bcddb9aab9e3abc700f1f56faf14e7655c64a16ca47701a57362276ea/hypothesis-6.152.1.tar.gz", hash = "sha256:4f4ed934eee295dd84ee97592477d23e8dc03e9f12ae0ee30a4e7c9ef3fca3b0", size = 465029, upload-time = "2026-04-14T22:29:24.062Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0e/5a/6cecf134b631050a1f8605096adbe812483b60790d951470989d39b56860/hypothesis-6.151.12-py3-none-any.whl", hash = "sha256:37d4f3a768365c30571b11dfd7a6857a12173d933010b2c4ab65619f1b5952c5", size = 529656, upload-time = "2026-04-08T19:40:03.126Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/83/860fb3075e00b0fc19a22a2301bc3c96f00437558c3911bdd0a3573a4a53/hypothesis-6.152.1-py3-none-any.whl", hash = "sha256:40a3619d9e0cb97b018857c7986f75cf5de2e5ec0fa8a0b172d00747758f749e", size = 530752, upload-time = "2026-04-14T22:29:20.893Z" },
 ]

 [[package]]
@@ -5887,27 +5887,27 @@ wheels = [

 [[package]]
 name = "ruff"
-version = "0.15.10"
+version = "0.15.11"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e7/d9/aa3f7d59a10ef6b14fe3431706f854dbf03c5976be614a9796d36326810c/ruff-0.15.10.tar.gz", hash = "sha256:d1f86e67ebfdef88e00faefa1552b5e510e1d35f3be7d423dc7e84e63788c94e", size = 4631728, upload-time = "2026-04-09T14:06:09.884Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e4/8d/192f3d7103816158dfd5ea50d098ef2aec19194e6cbccd4b3485bdb2eb2d/ruff-0.15.11.tar.gz", hash = "sha256:f092b21708bf0e7437ce9ada249dfe688ff9a0954fc94abab05dcea7dcd29c33", size = 4637264, upload-time = "2026-04-16T18:46:26.58Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/eb/00/a1c2fdc9939b2c03691edbda290afcd297f1f389196172826b03d6b6a595/ruff-0.15.10-py3-none-linux_armv6l.whl", hash = "sha256:0744e31482f8f7d0d10a11fcbf897af272fefdfcb10f5af907b18c2813ff4d5f", size = 10563362, upload-time = "2026-04-09T14:06:21.189Z" },
-    { url = "https://files.pythonhosted.org/packages/5c/15/006990029aea0bebe9d33c73c3e28c80c391ebdba408d1b08496f00d422d/ruff-0.15.10-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b1e7c16ea0ff5a53b7c2df52d947e685973049be1cdfe2b59a9c43601897b22e", size = 10951122, upload-time = "2026-04-09T14:06:02.236Z" },
-    { url = "https://files.pythonhosted.org/packages/f2/c0/4ac978fe874d0618c7da647862afe697b281c2806f13ce904ad652fa87e4/ruff-0.15.10-py3-none-macosx_11_0_arm64.whl", hash = "sha256:93cc06a19e5155b4441dd72808fdf84290d84ad8a39ca3b0f994363ade4cebb1", size = 10314005, upload-time = "2026-04-09T14:06:00.026Z" },
-    { url = "https://files.pythonhosted.org/packages/da/73/c209138a5c98c0d321266372fc4e33ad43d506d7e5dd817dd89b60a8548f/ruff-0.15.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83e1dd04312997c99ea6965df66a14fb4f03ba978564574ffc68b0d61fd3989e", size = 10643450, upload-time = "2026-04-09T14:05:42.137Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/76/0deec355d8ec10709653635b1f90856735302cb8e149acfdf6f82a5feb70/ruff-0.15.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8154d43684e4333360fedd11aaa40b1b08a4e37d8ffa9d95fee6fa5b37b6fab1", size = 10379597, upload-time = "2026-04-09T14:05:49.984Z" },
-    { url = "https://files.pythonhosted.org/packages/dc/be/86bba8fc8798c081e28a4b3bb6d143ccad3fd5f6f024f02002b8f08a9fa3/ruff-0.15.10-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ab88715f3a6deb6bde6c227f3a123410bec7b855c3ae331b4c006189e895cef", size = 11146645, upload-time = "2026-04-09T14:06:12.246Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/89/140025e65911b281c57be1d385ba1d932c2366ca88ae6663685aed8d4881/ruff-0.15.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a768ff5969b4f44c349d48edf4ab4f91eddb27fd9d77799598e130fb628aa158", size = 12030289, upload-time = "2026-04-09T14:06:04.776Z" },
-    { url = "https://files.pythonhosted.org/packages/88/de/ddacca9545a5e01332567db01d44bd8cf725f2db3b3d61a80550b48308ea/ruff-0.15.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ee3ef42dab7078bda5ff6a1bcba8539e9857deb447132ad5566a038674540d0", size = 11496266, upload-time = "2026-04-09T14:05:55.485Z" },
-    { url = "https://files.pythonhosted.org/packages/bc/bb/7ddb00a83760ff4a83c4e2fc231fd63937cc7317c10c82f583302e0f6586/ruff-0.15.10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51cb8cc943e891ba99989dd92d61e29b1d231e14811db9be6440ecf25d5c1609", size = 11256418, upload-time = "2026-04-09T14:05:57.69Z" },
-    { url = "https://files.pythonhosted.org/packages/dc/8d/55de0d35aacf6cd50b6ee91ee0f291672080021896543776f4170fc5c454/ruff-0.15.10-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:e59c9bdc056a320fb9ea1700a8d591718b8faf78af065484e801258d3a76bc3f", size = 11288416, upload-time = "2026-04-09T14:05:44.695Z" },
-    { url = "https://files.pythonhosted.org/packages/68/cf/9438b1a27426ec46a80e0a718093c7f958ef72f43eb3111862949ead3cc1/ruff-0.15.10-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:136c00ca2f47b0018b073f28cb5c1506642a830ea941a60354b0e8bc8076b151", size = 10621053, upload-time = "2026-04-09T14:05:52.782Z" },
-    { url = "https://files.pythonhosted.org/packages/4c/50/e29be6e2c135e9cd4cb15fbade49d6a2717e009dff3766dd080fcb82e251/ruff-0.15.10-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8b80a2f3c9c8a950d6237f2ca12b206bccff626139be9fa005f14feb881a1ae8", size = 10378302, upload-time = "2026-04-09T14:06:14.361Z" },
-    { url = "https://files.pythonhosted.org/packages/18/2f/e0b36a6f99c51bb89f3a30239bc7bf97e87a37ae80aa2d6542d6e5150364/ruff-0.15.10-py3-none-musllinux_1_2_i686.whl", hash = "sha256:e3e53c588164dc025b671c9df2462429d60357ea91af7e92e9d56c565a9f1b07", size = 10850074, upload-time = "2026-04-09T14:06:16.581Z" },
-    { url = "https://files.pythonhosted.org/packages/11/08/874da392558ce087a0f9b709dc6ec0d60cbc694c1c772dab8d5f31efe8cb/ruff-0.15.10-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b0c52744cf9f143a393e284125d2576140b68264a93c6716464e129a3e9adb48", size = 11358051, upload-time = "2026-04-09T14:06:18.948Z" },
-    { url = "https://files.pythonhosted.org/packages/e4/46/602938f030adfa043e67112b73821024dc79f3ab4df5474c25fa4c1d2d14/ruff-0.15.10-py3-none-win32.whl", hash = "sha256:d4272e87e801e9a27a2e8df7b21011c909d9ddd82f4f3281d269b6ba19789ca5", size = 10588964, upload-time = "2026-04-09T14:06:07.14Z" },
-    { url = "https://files.pythonhosted.org/packages/25/b6/261225b875d7a13b33a6d02508c39c28450b2041bb01d0f7f1a83d569512/ruff-0.15.10-py3-none-win_amd64.whl", hash = "sha256:28cb32d53203242d403d819fd6983152489b12e4a3ae44993543d6fe62ab42ed", size = 11745044, upload-time = "2026-04-09T14:05:39.473Z" },
-    { url = "https://files.pythonhosted.org/packages/58/ed/dea90a65b7d9e69888890fb14c90d7f51bf0c1e82ad800aeb0160e4bacfd/ruff-0.15.10-py3-none-win_arm64.whl", hash = "sha256:601d1610a9e1f1c2165a4f561eeaa2e2ea1e97f3287c5aa258d3dab8b57c6188", size = 11035607, upload-time = "2026-04-09T14:05:47.593Z" },
+    { url = "https://files.pythonhosted.org/packages/02/1e/6aca3427f751295ab011828e15e9bf452200ac74484f1db4be0197b8170b/ruff-0.15.11-py3-none-linux_armv6l.whl", hash = "sha256:e927cfff503135c558eb581a0c9792264aae9507904eb27809cdcff2f2c847b7", size = 10607943, upload-time = "2026-04-16T18:46:05.967Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/26/1341c262e74f36d4e84f3d6f4df0ac68cd53331a66bfc5080daa17c84c0b/ruff-0.15.11-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:7a1b5b2938d8f890b76084d4fa843604d787a912541eae85fd7e233398bbb73e", size = 10988592, upload-time = "2026-04-16T18:46:00.742Z" },
+    { url = "https://files.pythonhosted.org/packages/03/71/850b1d6ffa9564fbb6740429bad53df1094082fe515c8c1e74b6d8d05f18/ruff-0.15.11-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d4176f3d194afbdaee6e41b9ccb1a2c287dba8700047df474abfbe773825d1cb", size = 10338501, upload-time = "2026-04-16T18:46:03.723Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/11/cc1284d3e298c45a817a6aadb6c3e1d70b45c9b36d8d9cce3387b495a03a/ruff-0.15.11-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b17c886fb88203ced3afe7f14e8d5ae96e9d2f4ccc0ee66aa19f2c2675a27e4", size = 10670693, upload-time = "2026-04-16T18:46:41.941Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/9e/f8288b034ab72b371513c13f9a41d9ba3effac54e24bfb467b007daee2ca/ruff-0.15.11-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:49fafa220220afe7758a487b048de4c8f9f767f37dfefad46b9dd06759d003eb", size = 10416177, upload-time = "2026-04-16T18:46:21.717Z" },
+    { url = "https://files.pythonhosted.org/packages/85/71/504d79abfd3d92532ba6bbe3d1c19fada03e494332a59e37c7c2dabae427/ruff-0.15.11-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2ab8427e74a00d93b8bda1307b1e60970d40f304af38bccb218e056c220120d", size = 11221886, upload-time = "2026-04-16T18:46:15.086Z" },
+    { url = "https://files.pythonhosted.org/packages/43/5a/947e6ab7a5ad603d65b474be15a4cbc6d29832db5d762cd142e4e3a74164/ruff-0.15.11-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:195072c0c8e1fc8f940652073df082e37a5d9cb43b4ab1e4d0566ab8977a13b7", size = 12075183, upload-time = "2026-04-16T18:46:07.944Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/a1/0b7bb6268775fdd3a0818aee8efd8f5b4e231d24dd4d528ced2534023182/ruff-0.15.11-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a3a0996d486af3920dec930a2e7daed4847dfc12649b537a9335585ada163e9e", size = 11516575, upload-time = "2026-04-16T18:46:31.687Z" },
+    { url = "https://files.pythonhosted.org/packages/30/c3/bb5168fc4d233cc06e95f482770d0f3c87945a0cd9f614b90ea8dc2f2833/ruff-0.15.11-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1bef2cb556d509259f1fe440bb9cd33c756222cf0a7afe90d15edf0866702431", size = 11306537, upload-time = "2026-04-16T18:46:36.988Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/92/4cfae6441f3967317946f3b788136eecf093729b94d6561f963ed810c82e/ruff-0.15.11-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:030d921a836d7d4a12cf6e8d984a88b66094ccb0e0f17ddd55067c331191bf19", size = 11296813, upload-time = "2026-04-16T18:46:24.182Z" },
+    { url = "https://files.pythonhosted.org/packages/43/26/972784c5dde8313acde8ac71ba8ac65475b85db4a2352a76c9934361f9bc/ruff-0.15.11-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:0e783b599b4577788dbbb66b9addcef87e9a8832f4ce0c19e34bf55543a2f890", size = 10633136, upload-time = "2026-04-16T18:46:39.802Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/53/3985a4f185020c2f367f2e08a103032e12564829742a1b417980ce1514a0/ruff-0.15.11-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:ae90592246625ba4a34349d68ec28d4400d75182b71baa196ddb9f82db025ef5", size = 10424701, upload-time = "2026-04-16T18:46:10.381Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/57/bf0dfb32241b56c83bb663a826133da4bf17f682ba8c096973065f6e6a68/ruff-0.15.11-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1f111d62e3c983ed20e0ca2e800f8d77433a5b1161947df99a5c2a3fb60514f0", size = 10873887, upload-time = "2026-04-16T18:46:29.157Z" },
+    { url = "https://files.pythonhosted.org/packages/02/05/e48076b2a57dc33ee8c7a957296f97c744ca891a8ffb4ffb1aaa3b3f517d/ruff-0.15.11-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:06f483d6646f59eaffba9ae30956370d3a886625f511a3108994000480621d1c", size = 11404316, upload-time = "2026-04-16T18:46:19.462Z" },
+    { url = "https://files.pythonhosted.org/packages/88/27/0195d15fe7a897cbcba0904792c4b7c9fdd958456c3a17d2ea6093716a9a/ruff-0.15.11-py3-none-win32.whl", hash = "sha256:476a2aa56b7da0b73a3ee80b6b2f0e19cce544245479adde7baa65466664d5f3", size = 10655535, upload-time = "2026-04-16T18:46:12.47Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/5e/c927b325bd4c1d3620211a4b96f47864633199feed60fa936025ab27e090/ruff-0.15.11-py3-none-win_amd64.whl", hash = "sha256:8b6756d88d7e234fb0c98c91511aae3cd519d5e3ed271cae31b20f39cb2a12a3", size = 11779692, upload-time = "2026-04-16T18:46:17.268Z" },
+    { url = "https://files.pythonhosted.org/packages/63/b6/aeadee5443e49baa2facd51131159fd6301cc4ccfc1541e4df7b021c37dd/ruff-0.15.11-py3-none-win_arm64.whl", hash = "sha256:063fed18cc1bbe0ee7393957284a6fe8b588c6a406a285af3ee3f46da2391ee4", size = 11032614, upload-time = "2026-04-16T18:46:34.487Z" },
 ]

 [[package]]
@@ -5946,14 +5946,14 @@ wheels = [

 [[package]]
 name = "scipy-stubs"
-version = "1.17.1.3"
+version = "1.17.1.4"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "optype", extra = ["numpy"] },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a7/59/59c6cc3f9970154b9ed6b1aff42a0185cdd60cef54adc0404b9e77972221/scipy_stubs-1.17.1.3.tar.gz", hash = "sha256:5eb87a8d23d726706259b012ebe76a4a96a9ae9e141fc59bf55fc8eac2ed9e0f", size = 392185, upload-time = "2026-03-22T22:11:58.34Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d1/75/d944a11fca64aa84fbb4bfcf613b758319c6103cb30a304a0e9727009d62/scipy_stubs-1.17.1.4.tar.gz", hash = "sha256:cae00c5207aa62ceb4bcadea202d9fbbf002e958f9e4de981720436b8d5c1802", size = 396980, upload-time = "2026-04-13T11:46:54.528Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2c/d4/94304532c0a75a55526119043dd44a9bd1541a21e14483cbb54261c527d2/scipy_stubs-1.17.1.3-py3-none-any.whl", hash = "sha256:7b91d3f05aa47da06fbca14eb6c5bb4c28994e9245fd250cc847e375bab31297", size = 597933, upload-time = "2026-03-22T22:11:56.525Z" },
+    { url = "https://files.pythonhosted.org/packages/92/f8/334aa5a7a482ea89cb14d92f6a4d9ffa1e193e733144d4d14c7ffcb33583/scipy_stubs-1.17.1.4-py3-none-any.whl", hash = "sha256:e6e5c390fb864745bc3d5f591de81f5cb4f84403857d4f660acb5b6339956f5b", size = 604752, upload-time = "2026-04-13T11:46:53.135Z" },
 ]

 [[package]]
@@ -273,7 +273,7 @@ SQLALCHEMY_POOL_TIMEOUT=30
 # Default is 100
 #
 # Reference: https://www.postgresql.org/docs/current/runtime-config-connection.html#GUC-MAX-CONNECTIONS
-POSTGRES_MAX_CONNECTIONS=100
+POSTGRES_MAX_CONNECTIONS=200

 # Sets the amount of shared memory used for postgres's shared buffers.
 # Default is 128MB
@@ -70,7 +70,7 @@ x-shared-env: &shared-api-worker-env
  SQLALCHEMY_POOL_PRE_PING: ${SQLALCHEMY_POOL_PRE_PING:-false}
  SQLALCHEMY_POOL_USE_LIFO: ${SQLALCHEMY_POOL_USE_LIFO:-false}
  SQLALCHEMY_POOL_TIMEOUT: ${SQLALCHEMY_POOL_TIMEOUT:-30}
-  POSTGRES_MAX_CONNECTIONS: ${POSTGRES_MAX_CONNECTIONS:-100}
+  POSTGRES_MAX_CONNECTIONS: ${POSTGRES_MAX_CONNECTIONS:-200}
  POSTGRES_SHARED_BUFFERS: ${POSTGRES_SHARED_BUFFERS:-128MB}
  POSTGRES_WORK_MEM: ${POSTGRES_WORK_MEM:-4MB}
  POSTGRES_MAINTENANCE_WORK_MEM: ${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}
@@ -129,11 +129,6 @@
      "count": 3
    }
  },
-  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-button.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -493,11 +488,6 @@
      "count": 1
    }
  },
-  "web/app/components/app/configuration/dataset-config/context-var/var-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/app/configuration/dataset-config/index.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -1001,7 +991,7 @@
      "count": 2
    },
    "ts/no-explicit-any": {
-      "count": 17
+      "count": 20
    }
  },
  "web/app/components/base/chat/chat/index.tsx": {
@@ -1086,21 +1076,11 @@
      "count": 1
    }
  },
-  "web/app/components/base/date-and-time-picker/date-picker/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 4
-    }
-  },
  "web/app/components/base/date-and-time-picker/hooks.ts": {
    "react/no-unnecessary-use-prefix": {
      "count": 2
    }
  },
-  "web/app/components/base/date-and-time-picker/time-picker/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 2
-    }
-  },
  "web/app/components/base/date-and-time-picker/types.ts": {
    "erasable-syntax-only/enums": {
      "count": 2
@@ -1195,11 +1175,6 @@
      "count": 5
    }
  },
-  "web/app/components/base/features/new-feature-panel/file-upload/setting-modal.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -1223,11 +1198,6 @@
      "count": 2
    }
  },
-  "web/app/components/base/features/new-feature-panel/text-to-speech/voice-settings.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/components/base/features/types.ts": {
    "erasable-syntax-only/enums": {
      "count": 2
@@ -1878,11 +1848,6 @@
      "count": 1
    }
  },
-  "web/app/components/base/portal-to-follow-elem/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/components/base/prompt-editor/index.stories.tsx": {
    "no-console": {
      "count": 1
@@ -1906,11 +1871,6 @@
      "count": 1
    }
  },
-  "web/app/components/base/prompt-editor/plugins/context-block/component.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/components/base/prompt-editor/plugins/context-block/index.tsx": {
    "no-barrel-files/no-barrel-files": {
      "count": 3
@@ -1940,11 +1900,6 @@
      "count": 2
    }
  },
-  "web/app/components/base/prompt-editor/plugins/history-block/component.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/components/base/prompt-editor/plugins/history-block/index.tsx": {
    "no-barrel-files/no-barrel-files": {
      "count": 3
@@ -1971,11 +1926,6 @@
      "count": 2
    }
  },
-  "web/app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/base/prompt-editor/plugins/last-run-block/index.tsx": {
    "no-barrel-files/no-barrel-files": {
      "count": 3
@@ -2263,21 +2213,6 @@
      "count": 3
    }
  },
-  "web/app/components/billing/usage-info/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/common/document-picker/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/common/document-picker/preview-document-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/datasets/common/image-previewer/index.tsx": {
    "no-irregular-whitespace": {
      "count": 1
@@ -2894,14 +2829,6 @@
      "count": 1
    }
  },
-  "web/app/components/datasets/settings/permission-selector/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/no-missing-key": {
-      "count": 1
-    }
-  },
  "web/app/components/datasets/settings/summary-index-setting.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -3069,21 +2996,11 @@
      "count": 1
    }
  },
-  "web/app/components/header/account-setting/api-based-extension-page/selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/header/account-setting/data-source-page-new/card.tsx": {
    "ts/no-explicit-any": {
      "count": 2
    }
  },
-  "web/app/components/header/account-setting/data-source-page-new/configure.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/header/account-setting/data-source-page-new/hooks/index.ts": {
    "no-barrel-files/no-barrel-files": {
      "count": 2
@@ -3138,14 +3055,6 @@
      "count": 3
    }
  },
-  "web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
  "web/app/components/header/account-setting/model-provider-page/declarations.ts": {
    "erasable-syntax-only/enums": {
      "count": 11
@@ -3167,19 +3076,6 @@
      "count": 4
    }
  },
-  "web/app/components/header/account-setting/model-provider-page/model-auth/add-custom-model.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
-  "web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
  "web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -3411,11 +3307,6 @@
      "count": 1
    }
  },
-  "web/app/components/plugins/marketplace/search-box/tags-filter.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx": {
    "ts/no-explicit-any": {
      "count": 2
@@ -3447,14 +3338,6 @@
      "count": 1
    }
  },
-  "web/app/components/plugins/plugin-auth/authorized/index.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
  "web/app/components/plugins/plugin-auth/authorized/item.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -3510,16 +3393,6 @@
      "count": 8
    }
  },
-  "web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/plugins/plugin-detail-panel/datasource-action-list.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -3668,11 +3541,6 @@
      "count": 2
    }
  },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -3713,11 +3581,6 @@
      "count": 2
    }
  },
-  "web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx": {
    "ts/no-explicit-any": {
      "count": 5
@@ -3756,16 +3619,6 @@
      "count": 2
    }
  },
-  "web/app/components/plugins/plugin-page/filter-management/category-filter.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/plugin-page/filter-management/tag-filter.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/plugins/plugin-page/index.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -3801,11 +3654,6 @@
      "count": 1
    }
  },
-  "web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/plugins/reference-setting-modal/auto-update-setting/types.ts": {
    "erasable-syntax-only/enums": {
      "count": 2
@@ -3918,11 +3766,6 @@
      "count": 1
    }
  },
-  "web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/rag-pipeline/components/rag-pipeline-header/run-mode.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -4067,11 +3910,6 @@
      "count": 1
    }
  },
-  "web/app/components/tools/labels/selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/tools/mcp/create-card.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -4211,15 +4049,7 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/block-selector/blocks.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/block-selector/featured-tools.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
    "react/set-state-in-effect": {
      "count": 2
    },
@@ -4228,9 +4058,6 @@
    }
  },
  "web/app/components/workflow/block-selector/featured-triggers.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
    "react/set-state-in-effect": {
      "count": 2
    },
@@ -4248,11 +4075,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/block-selector/main.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/block-selector/market-place-plugin/action.tsx": {
    "react/set-state-in-effect": {
      "count": 1
@@ -4268,26 +4090,11 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/block-selector/start-blocks.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/block-selector/tabs.tsx": {
    "no-restricted-imports": {
      "count": 1
    }
  },
-  "web/app/components/workflow/block-selector/tool-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/block-selector/tool/action-item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -4299,9 +4106,6 @@
    }
  },
  "web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
    "ts/no-explicit-any": {
      "count": 1
    }
@@ -4378,19 +4182,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/header/view-history.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
-  "web/app/components/workflow/header/view-workflow-history.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/hooks-store/index.ts": {
    "no-barrel-files/no-barrel-files": {
      "count": 2
@@ -4489,14 +4280,6 @@
      "count": 2
    }
  },
-  "web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 3
-    },
-    "ts/no-explicit-any": {
-      "count": 4
-    }
-  },
  "web/app/components/workflow/nodes/_base/components/agent-strategy.tsx": {
    "ts/no-empty-object-type": {
      "count": 1
@@ -4723,22 +4506,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/set-state-in-effect": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 3
-    }
-  },
-  "web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -4918,11 +4685,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/code/dependency-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/code/types.ts": {
    "erasable-syntax-only/enums": {
      "count": 1
@@ -5053,11 +4815,6 @@
      "count": 5
    }
  },
-  "web/app/components/workflow/nodes/human-input/components/button-style-dropdown.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/human-input/components/delivery-method/email-configure-modal.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -5078,16 +4835,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -5138,11 +4885,6 @@
      "count": 2
    }
  },
-  "web/app/components/workflow/nodes/if-else/components/condition-add.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-input.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -5158,11 +4900,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -5266,16 +5003,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -5291,11 +5018,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -5306,16 +5028,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/retrieval-config.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/knowledge-retrieval/default.ts": {
    "ts/no-explicit-any": {
      "count": 1
@@ -5414,17 +5126,6 @@
      "count": 2
    }
  },
-  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/index.tsx": {
-    "erasable-syntax-only/enums": {
-      "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/set-state-in-effect": {
-      "count": 2
-    }
-  },
  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -5496,11 +5197,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/loop/components/condition-add.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/loop/components/condition-list/condition-input.tsx": {
    "ts/no-explicit-any": {
      "count": 1
@@ -5516,11 +5212,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/nodes/loop/components/condition-number-input.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -5871,24 +5562,11 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-refresh/only-export-components": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/note-node/note-editor/toolbar/command.tsx": {
    "no-restricted-imports": {
      "count": 1
    }
  },
-  "web/app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/note-node/note-editor/utils.ts": {
    "regexp/no-useless-quantifier": {
      "count": 1
@@ -6012,11 +5690,6 @@
      "count": 1
    }
  },
-  "web/app/components/workflow/panel/version-history-panel/filter/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
  "web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx": {
    "no-restricted-imports": {
      "count": 1
@@ -6315,14 +5988,6 @@
      "count": 5
    }
  },
-  "web/app/education-apply/search-input.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
  "web/app/education-apply/verify-state-modal.tsx": {
    "react/set-state-in-effect": {
      "count": 1
@@ -11,6 +11,27 @@ Shared design tokens, the `cn()` utility, a Tailwind CSS preset, and headless pr
 - Props pattern: `Omit<BaseXxx.Root.Props, 'className' | ...> & VariantProps<typeof xxxVariants> & { /* custom */ }`.
 - When a component accepts a prop typed from a shared internal module, `export type` it from that component so consumers import it from the component subpath.

+## Overlay Primitive Selection: Tooltip vs PreviewCard vs Popover
+
+Pick by the **trigger's purpose** and **a11y reach**, not visual richness.
+
+| Primitive     | Opens on              | Trigger's purpose          | Content                   | Reachable on touch / SR? |
+| ------------- | --------------------- | -------------------------- | ------------------------- | ------------------------ |
+| `Tooltip`     | hover / focus         | has its own action         | short plain-text label    | ❌ (label only)          |
+| `PreviewCard` | hover / focus         | has a primary click target | supplementary preview     | ❌ (via click target)    |
+| `Popover`     | click / tap (+ hover) | **to open the popup**      | anything, incl. long text | ✅                       |
+
+Base UI decision rule ([docs]):
+
+> _"If the trigger's purpose is to open the popup itself, it's a popover.
+> If the trigger's purpose is unrelated to opening the popup, it's a tooltip."_
+
+Apply this first, then narrow:
+
+- `Tooltip` — ephemeral visual label. Trigger must already carry its own `aria-label` / visible text; tooltip mirrors it for sighted mouse/keyboard users. No interactive UI, no multi-line prose. Not dwell-able.
+- `PreviewCard` — hover-revealed rich supplementary preview anchored to a trigger whose click goes somewhere (link, selectable row, jumpable chip). **Hard contract:** the popup MUST NOT contain information or actions unreachable from the trigger's click destination — touch and SR users can't open it. If the info is unique to the popup, switch to `Popover` (click or `openOnHover`) or move it to the click destination. Do not hand-roll "hover to open" on top of `Popover` to evade this split.
+- `Popover` — any popup with its own interactions, or any "infotip" (`?` / `(i)` glyph whose sole purpose is to reveal help text). Pass `openOnHover` on `PopoverTrigger` for the infotip case — unlike `Tooltip` / `PreviewCard`, this stays accessible to touch and SR users because the popover still opens on tap and focus.
+
 ## Border Radius: Figma Token → Tailwind Class Mapping

 The Figma design system uses `--radius/*` tokens whose scale is **offset by one step** from Tailwind CSS v4 defaults. When translating Figma specs to code, always use this mapping — never use `radius-*` as a CSS class, and never extend `borderRadius` in the preset.
@@ -34,3 +55,5 @@ The Figma design system uses `--radius/*` tokens whose scale is **offset by one
 - **Do not** use `radius-*` as CSS class names. The old `@utility radius-*` definitions have been removed.
 - When the Figma MCP returns `rounded-[var(--radius/sm, 6px)]`, convert it to the standard Tailwind class from the table above (e.g. `rounded-md`).
 - For values without a standard Tailwind equivalent (10px, 20px, 28px), use arbitrary values like `rounded-[10px]`.
+
+[docs]: https://base-ui.com/react/components/tooltip#infotips
@@ -49,6 +49,10 @@
      "types": "./src/popover/index.tsx",
      "import": "./src/popover/index.tsx"
    },
+    "./preview-card": {
+      "types": "./src/preview-card/index.tsx",
+      "import": "./src/preview-card/index.tsx"
+    },
    "./scroll-area": {
      "types": "./src/scroll-area/index.tsx",
      "import": "./src/scroll-area/index.tsx"
@@ -20,7 +20,7 @@ const meta = {
    layout: 'centered',
    docs: {
      description: {
-        component: 'Compound popover built on Base UI Popover. Use it for contextual affordances, overflow menus, filters, and forms that anchor to a trigger. Control placement via the `placement` prop on `PopoverContent` and compose arbitrary children inside the popup.',
+        component: 'Compound popover built on Base UI Popover. Use it for contextual affordances, overflow menus, filters, and forms that anchor to a trigger. Control placement via the `placement` prop on `PopoverContent` and compose arbitrary children inside the popup.\n\nPass `openOnHover` on `PopoverTrigger` when the popup should also reveal on hover (see the **Infotip** story). Unlike `Tooltip` and `PreviewCard`, hover on `Popover` still falls back to tap/focus, so touch and screen-reader users can reach the content.',
      },
    },
  },
@@ -101,6 +101,48 @@ export const WithActions: Story = {
  ),
 }

+export const Infotip: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: [
+          'The **infotip** pattern from [Base UI](https://base-ui.com/react/components/tooltip#infotips): an info glyph (`?`, `(i)`) whose sole purpose is to reveal explanatory text. Use `Popover` with `openOnHover` on the trigger — never `Tooltip`.',
+          '',
+          'Why not `Tooltip`? Tooltips are disabled on touch devices and not announced to screen readers; descriptive help text hidden in them is unreachable for those users. Why not `PreviewCard`? PreviewCard\'s a11y contract requires the trigger to already own a primary click destination, but an info glyph has no other purpose.',
+          '',
+          'Base UI rule of thumb: *"If the trigger\'s purpose is to open the popup itself, it\'s a popover. If the trigger\'s purpose is unrelated to opening the popup, it\'s a tooltip."*',
+          '',
+          'Hover, tap, or focus the `?` icon to open. In the Dify app, reach for `@/app/components/base/infotip` (`<Infotip aria-label={...}>{helpText}</Infotip>`) which wraps this pattern with consistent delays (300/200), typography, and `aria-label` plumbing.',
+        ].join('\n'),
+      },
+    },
+  },
+  render: () => (
+    <div className="flex items-center gap-2 text-sm font-medium text-text-secondary">
+      <span>Usage priority</span>
+      <Popover>
+        <PopoverTrigger
+          openOnHover
+          delay={300}
+          closeDelay={200}
+          aria-label="Set which resource to use first when running models."
+          render={(
+            <span className="inline-flex h-4 w-4 shrink-0 items-center justify-center">
+              <span aria-hidden className="i-ri-question-line h-3.5 w-3.5 text-text-quaternary hover:text-text-tertiary" />
+            </span>
+          )}
+        />
+        <PopoverContent
+          placement="top"
+          popupClassName="max-w-[300px] px-3 py-2 system-xs-regular text-text-tertiary"
+        >
+          Set which resource to use first when running models. The Trial quota will be used after the paid quota is exhausted.
+        </PopoverContent>
+      </Popover>
+    </div>
+  ),
+}
+
 const PLACEMENTS: Placement[] = [
  'top-start',
  'top',
@@ -0,0 +1,127 @@
+import { render } from 'vitest-browser-react'
+import {
+  PreviewCard,
+  PreviewCardContent,
+  PreviewCardTrigger,
+} from '..'
+
+const renderWithSafeViewport = (ui: import('react').ReactNode) => render(
+  <div style={{ minHeight: '100vh', minWidth: '100vw', padding: '240px' }}>
+    {ui}
+  </div>,
+)
+
+describe('PreviewCardContent', () => {
+  describe('Placement', () => {
+    it('should use bottom placement and default offsets when placement props are not provided', async () => {
+      const screen = await renderWithSafeViewport(
+        <PreviewCard open>
+          <PreviewCardTrigger
+            render={<button type="button" aria-label="preview trigger">Open</button>}
+          />
+          <PreviewCardContent
+            positionerProps={{ 'role': 'group', 'aria-label': 'default positioner' }}
+            popupProps={{ 'role': 'dialog', 'aria-label': 'default popup' }}
+          >
+            <span>Default content</span>
+          </PreviewCardContent>
+        </PreviewCard>,
+      )
+
+      await expect.element(screen.getByRole('group', { name: 'default positioner' })).toHaveAttribute('data-side', 'bottom')
+      await expect.element(screen.getByRole('group', { name: 'default positioner' })).toHaveAttribute('data-align', 'center')
+      await expect.element(screen.getByRole('dialog', { name: 'default popup' })).toHaveTextContent('Default content')
+    })
+
+    it('should apply parsed custom placement and custom offsets when placement props are provided', async () => {
+      const screen = await renderWithSafeViewport(
+        <PreviewCard open>
+          <PreviewCardTrigger
+            render={<button type="button" aria-label="preview trigger">Open</button>}
+          />
+          <PreviewCardContent
+            placement="top-end"
+            sideOffset={14}
+            alignOffset={6}
+            positionerProps={{ 'role': 'group', 'aria-label': 'custom positioner' }}
+            popupProps={{ 'role': 'dialog', 'aria-label': 'custom popup' }}
+          >
+            <span>Custom placement content</span>
+          </PreviewCardContent>
+        </PreviewCard>,
+      )
+
+      await expect.element(screen.getByRole('group', { name: 'custom positioner' })).toHaveAttribute('data-side', 'top')
+      await expect.element(screen.getByRole('group', { name: 'custom positioner' })).toHaveAttribute('data-align', 'end')
+      await expect.element(screen.getByRole('dialog', { name: 'custom popup' })).toHaveTextContent('Custom placement content')
+    })
+  })
+
+  describe('Passthrough props', () => {
+    it('should forward positionerProps and popupProps when passthrough props are provided', async () => {
+      const onPopupClick = vi.fn()
+
+      const screen = await render(
+        <PreviewCard open>
+          <PreviewCardTrigger
+            render={<button type="button" aria-label="preview trigger">Open</button>}
+          />
+          <PreviewCardContent
+            positionerProps={{
+              'role': 'group',
+              'aria-label': 'preview positioner',
+              'id': 'preview-positioner-id',
+            }}
+            popupProps={{
+              'id': 'preview-popup-id',
+              'role': 'dialog',
+              'aria-label': 'preview content',
+              'onClick': onPopupClick,
+            }}
+          >
+            <span>Preview body</span>
+          </PreviewCardContent>
+        </PreviewCard>,
+      )
+
+      const popup = screen.getByRole('dialog', { name: 'preview content' })
+      await popup.click()
+
+      await expect.element(screen.getByRole('group', { name: 'preview positioner' })).toHaveAttribute('id', 'preview-positioner-id')
+      await expect.element(popup).toHaveAttribute('id', 'preview-popup-id')
+      expect(onPopupClick).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('Trigger click behavior', () => {
+    it('should forward the trigger click to the consumer handler so the primary action runs', async () => {
+      const onPrimaryClick = vi.fn()
+
+      const screen = await renderWithSafeViewport(
+        <PreviewCard>
+          <PreviewCardTrigger
+            render={(
+              <button
+                type="button"
+                aria-label="preview trigger"
+                onClick={onPrimaryClick}
+              >
+                Open
+              </button>
+            )}
+          />
+          <PreviewCardContent
+            popupProps={{ 'role': 'dialog', 'aria-label': 'preview content' }}
+          >
+            <span>Preview body</span>
+          </PreviewCardContent>
+        </PreviewCard>,
+      )
+
+      const trigger = screen.getByRole('button', { name: 'preview trigger' })
+      await trigger.click()
+
+      expect(onPrimaryClick).toHaveBeenCalledTimes(1)
+    })
+  })
+})
@@ -0,0 +1,213 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Placement } from '.'
+import { useState } from 'react'
+import {
+  createPreviewCardHandle,
+  PreviewCard,
+  PreviewCardContent,
+  PreviewCardTrigger,
+} from '.'
+
+const rowButtonClassName
+  = 'flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm text-text-secondary hover:bg-state-base-hover'
+
+const triggerButtonClassName
+  = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'
+
+const inlineLinkClassName
+  = 'text-text-accent underline decoration-text-accent/60 decoration-1 underline-offset-2 outline-hidden hover:decoration-text-accent focus-visible:rounded-xs focus-visible:no-underline focus-visible:outline focus-visible:outline-2 focus-visible:outline-text-accent data-[popup-open]:decoration-text-accent'
+
+const meta = {
+  title: 'Base/UI/PreviewCard',
+  component: PreviewCard,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component:
+          'Hover- and focus-activated rich preview for triggers whose primary click has its own destination (following a link, selecting a row, jumping to a definition). Built on Base UI PreviewCard.\n\n**A11y contract:** touch and screen-reader users cannot open the preview. Never place information or actions in the popup that are not also reachable from the trigger\'s primary click destination. If that is unavoidable, add a separate click affordance (Popover) or move the unique content onto the destination.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof PreviewCard>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+// --- Canonical: inline link preview ---------------------------------------
+// Mirrors Base UI's own PreviewCard docs demo: an inline `<a href>` in a
+// paragraph, hovering reveals a rich preview (image + summary) of the link's
+// destination. The Wikipedia URL and Unsplash image are the exact assets used
+// in base-ui.com's public docs so the story renders a real preview.
+// https://base-ui.com/react/components/preview-card
+const typographyPreview = createPreviewCardHandle()
+
+export const LinkPreview: Story = {
+  name: 'Link preview (canonical)',
+  parameters: {
+    docs: {
+      description: {
+        story:
+          'The prototypical PreviewCard use case: an inline hyperlink with a rich hover preview of the destination. Uses a detached trigger + `createPreviewCardHandle()` so the trigger can sit inline in prose while the popup content is defined elsewhere. The trigger renders a real `<a href>` — click still follows the link; the preview is strictly supplementary.',
+      },
+    },
+  },
+  render: () => (
+    <div className="max-w-md p-6 text-sm leading-6 text-text-secondary">
+      <p>
+        The principles of good
+        {' '}
+        <PreviewCardTrigger
+          handle={typographyPreview}
+          href="https://en.wikipedia.org/wiki/Typography"
+          target="_blank"
+          rel="noreferrer"
+          className={inlineLinkClassName}
+        >
+          typography
+        </PreviewCardTrigger>
+        {' '}
+        remain in the digital age.
+      </p>
+
+      <PreviewCard handle={typographyPreview}>
+        <PreviewCardContent popupClassName="w-[240px] p-2">
+          <div className="flex flex-col gap-2">
+            <img
+              width="224"
+              height="150"
+              className="block max-w-none rounded-md"
+              src="https://images.unsplash.com/photo-1619615391095-dfa29e1672ef?q=80&w=448&h=300"
+              alt="Station Hofplein signage in Rotterdam, Netherlands"
+            />
+            <p className="m-0 text-xs leading-5 text-text-secondary">
+              <strong className="text-text-primary">Typography</strong>
+              {' '}
+              is the art and science of arranging type to make written language legible, readable, and visually appealing.
+            </p>
+          </div>
+        </PreviewCardContent>
+      </PreviewCard>
+    </div>
+  ),
+}
+
+export const Supplementary: Story = {
+  name: 'Supplementary preview on a button trigger',
+  parameters: {
+    docs: {
+      description: {
+        story:
+          'Application-level adaptation of the same semantic: the trigger is a `<button>` that owns a primary action (selecting a model row) rather than an `<a>`. The preview still only shows supplementary info reachable from the selection destination, so the a11y contract holds.',
+      },
+    },
+  },
+  render: () => (
+    <PreviewCard>
+      <PreviewCardTrigger
+        render={(
+          <button type="button" className={rowButtonClassName}>
+            <span className="i-ri-sparkling-fill h-4 w-4 text-text-accent" />
+            <span>gpt-4o</span>
+          </button>
+        )}
+      />
+      <PreviewCardContent
+        placement="right"
+        popupClassName="w-[220px] p-3"
+      >
+        <div className="flex flex-col gap-2">
+          <div className="text-sm font-medium text-text-primary">gpt-4o</div>
+          <div className="text-xs text-text-tertiary">
+            Multimodal flagship model. Vision, audio and 128k context.
+          </div>
+        </div>
+      </PreviewCardContent>
+    </PreviewCard>
+  ),
+}
+
+const PLACEMENTS: Placement[] = [
+  'top-start',
+  'top',
+  'top-end',
+  'right-start',
+  'right',
+  'right-end',
+  'bottom-start',
+  'bottom',
+  'bottom-end',
+  'left-start',
+  'left',
+  'left-end',
+]
+
+const PlacementsDemo = () => {
+  const [placement, setPlacement] = useState<Placement>('bottom')
+
+  return (
+    <div className="flex flex-col items-center gap-4 p-20">
+      <div className="grid grid-cols-3 gap-2 text-xs">
+        {PLACEMENTS.map(value => (
+          <button
+            key={value}
+            type="button"
+            onClick={() => setPlacement(value)}
+            className={`rounded-md border border-divider-subtle px-2 py-1 text-text-secondary ${
+              placement === value ? 'bg-state-base-hover' : 'bg-components-button-secondary-bg'
+            }`}
+          >
+            {value}
+          </button>
+        ))}
+      </div>
+      <PreviewCard open>
+        <PreviewCardTrigger
+          render={<button type="button" className={triggerButtonClassName}>Hover me</button>}
+        />
+        <PreviewCardContent placement={placement} popupClassName="w-56 p-3">
+          <div className="flex flex-col gap-1">
+            <div className="text-sm font-semibold text-text-primary">
+              placement="
+              {placement}
+              "
+            </div>
+            <div className="text-xs text-text-secondary">
+              Preview positions itself relative to the trigger.
+            </div>
+          </div>
+        </PreviewCardContent>
+      </PreviewCard>
+    </div>
+  )
+}
+
+export const Placements: Story = {
+  parameters: {
+    layout: 'fullscreen',
+  },
+  render: () => <PlacementsDemo />,
+}
+
+const CustomDelayDemo = () => (
+  <PreviewCard>
+    <PreviewCardTrigger
+      delay={100}
+      closeDelay={100}
+      render={<button type="button" className={triggerButtonClassName}>Snappy trigger</button>}
+    />
+    <PreviewCardContent popupClassName="w-64 p-3">
+      <div className="flex flex-col gap-1">
+        <div className="text-sm font-semibold text-text-primary">Fast hover</div>
+        <div className="text-xs text-text-secondary">
+          Base UI defaults (600ms / 300ms) are tuned for link previews. Override per trigger for denser UIs.
+        </div>
+      </div>
+    </PreviewCardContent>
+  </PreviewCard>
+)
+
+export const CustomDelays: Story = {
+  render: () => <CustomDelayDemo />,
+}
@@ -0,0 +1,81 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import type { Placement } from '../placement'
+import { PreviewCard as BasePreviewCard } from '@base-ui/react/preview-card'
+import { cn } from '../cn'
+import { parsePlacement } from '../placement'
+
+export type { Placement }
+
+/**
+ * PreviewCard is a hover/focus-triggered rich preview intended to supplement a
+ * trigger whose primary action is its own click destination (e.g. a link, a
+ * selectable row, a chip that jumps to a definition).
+ *
+ * A11y contract — match Base UI's guidance:
+ * - The popup MUST NOT contain information or actions that are not also
+ *   reachable from the trigger's primary click destination. Touch and screen
+ *   reader users cannot open the card and must be able to get the same
+ *   information/actions without it.
+ * - If content is unique to the popup, either (a) add a separate click-triggered
+ *   affordance (Popover) next to the trigger, or (b) move the unique content
+ *   onto the click destination.
+ */
+export const PreviewCard = BasePreviewCard.Root
+export const PreviewCardTrigger = BasePreviewCard.Trigger
+export const createPreviewCardHandle = BasePreviewCard.createHandle
+
+type PreviewCardContentProps = {
+  children: ReactNode
+  placement?: Placement
+  sideOffset?: number
+  alignOffset?: number
+  className?: string
+  popupClassName?: string
+  positionerProps?: Omit<
+    BasePreviewCard.Positioner.Props,
+    'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
+  >
+  popupProps?: Omit<
+    BasePreviewCard.Popup.Props,
+    'children' | 'className'
+  >
+}
+
+export function PreviewCardContent({
+  children,
+  placement = 'bottom',
+  sideOffset = 8,
+  alignOffset = 0,
+  className,
+  popupClassName,
+  positionerProps,
+  popupProps,
+}: PreviewCardContentProps) {
+  const { side, align } = parsePlacement(placement)
+
+  return (
+    <BasePreviewCard.Portal>
+      <BasePreviewCard.Positioner
+        side={side}
+        align={align}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        className={cn('z-1002 outline-hidden', className)}
+        {...positionerProps}
+      >
+        <BasePreviewCard.Popup
+          className={cn(
+            'rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg',
+            'origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-ending-style:opacity-0 data-starting-style:scale-95 data-starting-style:opacity-0 motion-reduce:transition-none',
+            popupClassName,
+          )}
+          {...popupProps}
+        >
+          {children}
+        </BasePreviewCard.Popup>
+      </BasePreviewCard.Positioner>
+    </BasePreviewCard.Portal>
+  )
+}
@@ -46,20 +46,7 @@ describe('TooltipContent', () => {
    })
  })

-  describe('Variant and popup props', () => {
-    it('should render popup content when variant is plain', async () => {
-      const screen = await render(
-        <Tooltip open>
-          <TooltipTrigger aria-label="tooltip trigger">Trigger</TooltipTrigger>
-          <TooltipContent variant="plain" role="tooltip" aria-label="plain tooltip">
-            Plain tooltip body
-          </TooltipContent>
-        </Tooltip>,
-      )
-
-      await expect.element(screen.getByRole('tooltip', { name: 'plain tooltip' })).toHaveTextContent('Plain tooltip body')
-    })
-
+  describe('Popup props', () => {
    it('should forward popup props and handlers when popup props are provided', async () => {
      const onMouseEnter = vi.fn()

@@ -83,7 +70,11 @@ describe('TooltipContent', () => {

      await expect.element(popup).toHaveAttribute('id', 'tooltip-popup-id')
      await expect.element(popup).toHaveAttribute('data-track-id', 'tooltip-track')
-      expect(onMouseEnter).toHaveBeenCalledTimes(1)
+      // Intent of the assertion is "handler is wired up". The exact call count
+      // depends on vitest-browser's pointer simulation and Base UI's internal
+      // pointer tracking (both of which may fire more than one enter event for
+      // a single `.hover()` action), so assert presence, not count.
+      expect(onMouseEnter).toHaveBeenCalled()
    })

    it('should apply className to the popup and positionerClassName to the positioner', async () => {
@@ -8,8 +8,8 @@ import {
  TooltipTrigger,
 } from '.'

-const triggerButtonClassName = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'
 const iconButtonClassName = 'inline-flex h-8 w-8 items-center justify-center rounded-lg border border-divider-subtle bg-components-button-secondary-bg text-text-secondary shadow-xs hover:bg-state-base-hover'
+const triggerButtonClassName = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'

 const meta = {
  title: 'Base/UI/Tooltip',
@@ -25,7 +25,7 @@ const meta = {
    layout: 'centered',
    docs: {
      description: {
-        component: 'Compound tooltip built on Base UI Tooltip. Wrap the app in `TooltipProvider` (done automatically in these stories) so multiple tooltips share open/close delays. Each tooltip pairs a `TooltipTrigger` with a `TooltipContent` and supports placement, offsets, and two style variants.',
+        component: 'Compound tooltip built on Base UI Tooltip. Wrap the app in `TooltipProvider` (done automatically in these stories) so multiple tooltips share open/close delays. Each tooltip pairs a `TooltipTrigger` with a `TooltipContent` and supports placement and offsets.\n\n**Usage contract** (mirrors the [Base UI tooltip guidelines](https://base-ui.com/react/components/tooltip#alternatives-to-tooltips)):\n\n- Tooltips are **supplementary visual labels** for sighted mouse and keyboard users. They are disabled on touch devices and are not announced to screen readers.\n- The trigger **must carry its own `aria-label` or visible text** that matches the tooltip — the tooltip does not replace labeling.\n- Keep content short and non-interactive (an icon-button label, a keyboard shortcut, one-word clarification).\n- **Do not** place descriptions, prose, links, or interactive controls inside a tooltip — touch and screen-reader users cannot reach them.\n- For hover-triggered rich previews that users move their cursor onto, use `PreviewCard` (dwell-able, structured content).\n- For an info icon that explains a concept (an "infotip"), or for any hover popup that needs interactive content or to reach touch/assistive-tech users, use `Popover` with `openOnHover` on the trigger.',
      },
    },
  },
@@ -35,47 +35,58 @@ const meta = {
 export default meta
 type Story = StoryObj<typeof meta>

-export const Default: Story = {
-  render: () => (
-    <Tooltip>
-      <TooltipTrigger
-        render={<button type="button" className={triggerButtonClassName} />}
-      >
-        Hover me
-      </TooltipTrigger>
-      <TooltipContent>
-        Tooltips describe interactive elements without a click.
-      </TooltipContent>
-    </Tooltip>
-  ),
-}
+const ICON_ACTIONS = [
+  { icon: 'i-ri-pencil-line', label: 'Edit' },
+  { icon: 'i-ri-file-copy-line', label: 'Duplicate' },
+  { icon: 'i-ri-archive-line', label: 'Archive' },
+  { icon: 'i-ri-delete-bin-line', label: 'Delete' },
+] as const

-export const Plain: Story = {
+export const IconButton: Story = {
+  name: 'Icon button (canonical)',
  parameters: {
    docs: {
      description: {
-        story: 'Use `variant="plain"` to render the popup without default chrome (background, padding, typography). Apply your own styling via `className` on `TooltipContent`.',
+        story: 'The canonical tooltip use case: an icon-only button surfaces its accessible label as a tooltip for sighted mouse and keyboard users. The trigger already carries `aria-label` — the tooltip mirrors that label visually; it does **not** replace it.',
+      },
+    },
+  },
+  render: () => (
+    <div className="flex items-center gap-3">
+      {ICON_ACTIONS.map(({ icon, label }) => (
+        <Tooltip key={label}>
+          <TooltipTrigger
+            render={(
+              <button type="button" aria-label={label} className={iconButtonClassName}>
+                <span aria-hidden className={`${icon} h-4 w-4`} />
+              </button>
+            )}
+          />
+          <TooltipContent>{label}</TooltipContent>
+        </Tooltip>
+      ))}
+    </div>
+  ),
+}
+
+export const KeyboardShortcut: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: 'A short, supplementary hint that surfaces a keyboard shortcut next to a visible button label. The trigger is fully self-describing ("Save"); the tooltip only adds non-essential extra clarity for mouse/keyboard users.',
      },
    },
  },
  render: () => (
    <Tooltip>
      <TooltipTrigger
-        render={<button type="button" className={triggerButtonClassName} />}
-      >
-        Preview details
-      </TooltipTrigger>
-      <TooltipContent
-        variant="plain"
-        className="rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-4 shadow-lg"
-      >
-        <div className="flex w-64 flex-col gap-1">
-          <span className="text-sm font-semibold text-text-primary">Dataset preview</span>
-          <span className="text-xs text-text-secondary">
-            32 documents • Last indexed 2 minutes ago
-          </span>
-        </div>
-      </TooltipContent>
+        render={(
+          <button type="button" className={triggerButtonClassName}>
+            Save
+          </button>
+        )}
+      />
+      <TooltipContent>⌘S</TooltipContent>
    </Tooltip>
  ),
 }
@@ -116,14 +127,10 @@ const PlacementsDemo = () => {
      </div>
      <Tooltip open>
        <TooltipTrigger
-          render={<button type="button" className={triggerButtonClassName} />}
-        >
-          Anchor
-        </TooltipTrigger>
+          render={<button type="button" aria-label="Placement anchor" className={iconButtonClassName}><span aria-hidden className="i-ri-pushpin-line h-4 w-4" /></button>}
+        />
        <TooltipContent placement={placement}>
-          placement="
-          {placement}
-          "
+          {`placement="${placement}"`}
        </TooltipContent>
      </Tooltip>
    </div>
@@ -133,113 +140,45 @@ const PlacementsDemo = () => {
 export const Placements: Story = {
  parameters: {
    layout: 'fullscreen',
+    docs: {
+      description: {
+        story: 'Placement reference. `placement` accepts the 12 standard side/align combinations; Base UI flips automatically if the tooltip would overflow the viewport.',
+      },
+    },
  },
  render: () => <PlacementsDemo />,
 }

-export const OnIconButtons: Story = {
-  parameters: {
-    docs: {
-      description: {
-        story: 'Tooltips are essential for icon-only buttons. The trigger is the button; the tooltip provides the accessible label and hover hint.',
-      },
-    },
-  },
-  render: () => (
-    <div className="flex items-center gap-3">
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <button type="button" aria-label="Edit" className={iconButtonClassName}>
-              <span aria-hidden className="i-ri-pencil-line h-4 w-4" />
-            </button>
-          )}
-        />
-        <TooltipContent>Edit</TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <button type="button" aria-label="Duplicate" className={iconButtonClassName}>
-              <span aria-hidden className="i-ri-file-copy-line h-4 w-4" />
-            </button>
-          )}
-        />
-        <TooltipContent>Duplicate</TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <button type="button" aria-label="Archive" className={iconButtonClassName}>
-              <span aria-hidden className="i-ri-archive-line h-4 w-4" />
-            </button>
-          )}
-        />
-        <TooltipContent>Archive</TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <button type="button" aria-label="Delete" className={iconButtonClassName}>
-              <span aria-hidden className="i-ri-delete-bin-line h-4 w-4" />
-            </button>
-          )}
-        />
-        <TooltipContent>Delete</TooltipContent>
-      </Tooltip>
-    </div>
-  ),
-}
-
-export const LongContent: Story = {
-  render: () => (
-    <Tooltip>
-      <TooltipTrigger
-        render={<button type="button" className={triggerButtonClassName} />}
-      >
-        What are tokens?
-      </TooltipTrigger>
-      <TooltipContent>
-        Tokens are the basic units a model reads. English text averages ~4 characters per token; non-Latin scripts often use more tokens per character. Both input and output count toward your quota.
-      </TooltipContent>
-    </Tooltip>
-  ),
-}
-
 const DELAY_PRESETS: Array<{ label: string, delay: number }> = [
-  { label: 'Instant (0ms)', delay: 0 },
-  { label: 'Fast (150ms)', delay: 150 },
-  { label: 'Default (600ms)', delay: 600 },
+  { label: 'Instant', delay: 0 },
+  { label: 'Fast', delay: 150 },
+  { label: 'Default', delay: 600 },
 ]

-const DelayDemo = () => {
-  return (
-    <div className="flex items-center gap-3">
-      {DELAY_PRESETS.map(({ label, delay }) => (
-        <TooltipProvider key={delay} delay={delay}>
-          <Tooltip>
-            <TooltipTrigger
-              render={<button type="button" className={triggerButtonClassName} />}
-            >
-              {label}
-            </TooltipTrigger>
-            <TooltipContent>
-              Appeared after
-              {delay}
-              ms hover delay.
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      ))}
-    </div>
-  )
-}
+const DelayDemo = () => (
+  <div className="flex items-center gap-3">
+    {DELAY_PRESETS.map(({ label, delay }) => (
+      <TooltipProvider key={delay} delay={delay}>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button type="button" aria-label={`${label} (${delay}ms)`} className={iconButtonClassName}>
+                <span aria-hidden className="i-ri-timer-line h-4 w-4" />
+              </button>
+            )}
+          />
+          <TooltipContent>{`${label} (${delay}ms)`}</TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    ))}
+  </div>
+)

 export const WithDelay: Story = {
  parameters: {
    docs: {
      description: {
-        story: '`TooltipProvider` controls hover `delay` (and `closeDelay`) for the tooltips nested inside it. Adjacent tooltips under the same provider open instantly after the first has been shown.',
+        story: '`TooltipProvider` controls hover `delay` (and `closeDelay`) for the tooltips nested inside it. Adjacent tooltips under the same provider open instantly after the first has been shown. The Dify app root sets `delay={300} closeDelay={200}` — override locally only when the surrounding UX demands it.',
      },
    },
  },
@@ -8,7 +8,28 @@ import { parsePlacement } from '../placement'

 export type { Placement }

-type TooltipContentVariant = 'default' | 'plain'
+/**
+ * Tooltip is an **ephemeral hint** tied to a trigger (typically an icon button,
+ * badge, or short label). It follows Base UI's Tooltip semantics:
+ *
+ * - Opens on pointer hover or keyboard focus on the trigger.
+ * - Closes as soon as the pointer leaves the trigger — the popup itself is
+ *   **not dwell-able**; users cannot move their cursor onto the tooltip.
+ * - Must contain only short, non-interactive text. No links, buttons, form
+ *   controls, or structured panels.
+ *
+ * If you need any of the following, use `PreviewCard` instead (hover-triggered
+ * rich preview that users can move their cursor onto):
+ *
+ * - Multi-line or structured content (icon + title + metadata)
+ * - Content the user needs to "stop and read" for more than ~1 second
+ * - Content wider than ~300px
+ *
+ * If you need interactive affordances (buttons, links, forms) use `Popover`.
+ */
+export const TooltipProvider = BaseTooltip.Provider
+export const Tooltip = BaseTooltip.Root
+export const TooltipTrigger = BaseTooltip.Trigger

 type TooltipContentProps = {
  children: ReactNode
@@ -17,7 +38,6 @@ type TooltipContentProps = {
  alignOffset?: number
  positionerClassName?: string
  className?: string
-  variant?: TooltipContentVariant
 } & Omit<BaseTooltip.Popup.Props, 'children' | 'className'>

 export function TooltipContent({
@@ -27,7 +47,6 @@ export function TooltipContent({
  alignOffset = 0,
  positionerClassName,
  className,
-  variant = 'default',
  ...props
 }: TooltipContentProps) {
  const { side, align } = parsePlacement(placement)
@@ -43,7 +62,7 @@ export function TooltipContent({
      >
        <BaseTooltip.Popup
          className={cn(
-            variant === 'default' && 'max-w-[300px] rounded-md bg-components-panel-bg px-3 py-2 text-left system-xs-regular wrap-break-word text-text-tertiary shadow-lg',
+            'max-w-[300px] rounded-md bg-components-panel-bg px-3 py-2 text-left system-xs-regular wrap-break-word text-text-tertiary shadow-lg',
            'origin-(--transform-origin) transition-opacity data-ending-style:opacity-0 data-instant:transition-none data-starting-style:opacity-0 motion-reduce:transition-none',
            className,
          )}
@@ -55,7 +74,3 @@ export function TooltipContent({
    </BaseTooltip.Portal>
  )
 }
-
-export const TooltipProvider = BaseTooltip.Provider
-export const Tooltip = BaseTooltip.Root
-export const TooltipTrigger = BaseTooltip.Trigger
@@ -42,15 +42,15 @@ overrides:
  svgo@>=3.0.0 <3.3.3: 3.3.3
  tar@<=7.5.10: 7.5.11
  undici@>=7.0.0 <7.24.0: 7.24.0
-  vite: npm:@voidzero-dev/vite-plus-core@0.1.18
-  vitest: npm:@voidzero-dev/vite-plus-test@0.1.18
+  vite: npm:@voidzero-dev/vite-plus-core@0.1.19
+  vitest: npm:@voidzero-dev/vite-plus-test@0.1.19
  yaml@>=2.0.0 <2.8.3: 2.8.3
  yauzl@<3.2.1: 3.2.1
 catalog:
  '@amplitude/analytics-browser': 2.39.0
  '@amplitude/plugin-session-replay-browser': 1.27.7
  '@antfu/eslint-config': 8.2.0
-  '@base-ui/react': 1.4.0
+  '@base-ui/react': 1.4.1
  '@chromatic-com/storybook': 5.1.2
  '@cucumber/cucumber': 12.8.0
  '@egoist/tailwindcss-icons': 1.9.2
@@ -222,10 +222,10 @@ catalog:
  use-context-selector: 2.0.0
  uuid: 13.0.0
  vinext: 0.0.41
-  vite: npm:@voidzero-dev/vite-plus-core@0.1.18
+  vite: npm:@voidzero-dev/vite-plus-core@0.1.19
  vite-plugin-inspect: 12.0.0-beta.1
-  vite-plus: 0.1.18
-  vitest: npm:@voidzero-dev/vite-plus-test@0.1.18
+  vite-plus: 0.1.19
+  vitest: npm:@voidzero-dev/vite-plus-test@0.1.19
  vitest-browser-react: 2.2.0
  vitest-canvas-mock: 1.1.4
  zod: 4.3.6
@@ -39,7 +39,7 @@ const jsonResponse = (
    ...init,
    headers: {
      "content-type": "application/json",
-      ...(init.headers ?? {}),
+      ...init.headers,
    },
  });

@@ -47,7 +47,7 @@ const textResponse = (body: string, init: ResponseInit = {}): Response =>
  new Response(body, {
    ...init,
    headers: {
-      ...(init.headers ?? {}),
+      ...init.headers,
    },
  });

@@ -14,7 +14,7 @@ const jsonResponse = (body: unknown, init: ResponseInit = {}): Response =>
    ...init,
    headers: {
      "content-type": "application/json",
-      ...(init.headers ?? {}),
+      ...init.headers,
    },
  });

@@ -4,6 +4,7 @@ export default defineConfig({
  pack: {
    entry: ["src/index.ts"],
    format: ["esm"],
+    platform: "node",
    dts: true,
    clean: true,
    sourcemap: true,
@@ -0,0 +1,127 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import * as React from 'react'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '../base-ui-popover'
+
+type PopoverHarnessProps = {
+  useRenderElement?: boolean
+  preventDefaultOnTrigger?: boolean
+}
+
+const PopoverHarness = ({
+  useRenderElement = false,
+  preventDefaultOnTrigger = false,
+}: PopoverHarnessProps) => {
+  const [open, setOpen] = React.useState(false)
+
+  return (
+    <div>
+      <div data-testid="outside-area">outside</div>
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger
+          render={useRenderElement
+            ? (
+                <button
+                  type="button"
+                  data-testid="custom-trigger"
+                  onClick={(event) => {
+                    if (preventDefaultOnTrigger)
+                      event.preventDefault()
+                  }}
+                >
+                  toggle
+                </button>
+              )
+            : undefined}
+        >
+          fallback trigger
+        </PopoverTrigger>
+        <PopoverContent
+          className="custom-content"
+          placement="bottom-start"
+          sideOffset={4}
+          alignOffset={8}
+          positionerProps={{ 'data-positioner': 'true' } as unknown as React.HTMLAttributes<HTMLDivElement>}
+          popupProps={{ 'data-popup': 'true' } as unknown as React.HTMLAttributes<HTMLDivElement>}
+        >
+          <div>popover body</div>
+        </PopoverContent>
+      </Popover>
+      <div data-testid="open-state">{open ? 'open' : 'closed'}</div>
+    </div>
+  )
+}
+
+describe('base-ui-popover mock', () => {
+  it('should toggle popover content from the fallback trigger and expose content props', () => {
+    render(<PopoverHarness />)
+
+    expect(screen.getByTestId('open-state')).toHaveTextContent('closed')
+    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+
+    fireEvent.click(screen.getByTestId('popover-trigger'))
+
+    expect(screen.getByTestId('open-state')).toHaveTextContent('open')
+    expect(screen.getByTestId('popover-content')).toHaveAttribute('data-placement', 'bottom-start')
+    expect(screen.getByTestId('popover-content')).toHaveAttribute('data-side-offset', '4')
+    expect(screen.getByTestId('popover-content')).toHaveAttribute('data-align-offset', '8')
+    expect(screen.getByTestId('popover-content')).toHaveAttribute('data-positioner', 'true')
+    expect(screen.getByTestId('popover-content')).toHaveAttribute('data-popup', 'true')
+    expect(screen.getByTestId('popover-content')).toHaveClass('custom-content')
+  })
+
+  it('should keep the popover open on inside clicks and close it on outside clicks or escape', () => {
+    render(<PopoverHarness useRenderElement />)
+
+    fireEvent.click(screen.getByTestId('custom-trigger'))
+    expect(screen.getByTestId('open-state')).toHaveTextContent('open')
+
+    fireEvent.mouseDown(screen.getByTestId('popover-content'))
+    expect(screen.getByTestId('open-state')).toHaveTextContent('open')
+
+    fireEvent.keyDown(document, { key: 'Escape' })
+    expect(screen.getByTestId('open-state')).toHaveTextContent('closed')
+
+    fireEvent.click(screen.getByTestId('custom-trigger'))
+    expect(screen.getByTestId('open-state')).toHaveTextContent('open')
+
+    fireEvent.mouseDown(screen.getByTestId('outside-area'))
+    expect(screen.getByTestId('open-state')).toHaveTextContent('closed')
+  })
+
+  it('should preserve rendered trigger props and respect preventDefault', () => {
+    render(<PopoverHarness useRenderElement preventDefaultOnTrigger />)
+
+    fireEvent.click(screen.getByTestId('custom-trigger'))
+
+    expect(screen.getByTestId('custom-trigger')).toHaveAttribute('data-popover-trigger', 'true')
+    expect(screen.getByTestId('open-state')).toHaveTextContent('closed')
+    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+  })
+
+  it('should keep the popover closed when the fallback trigger click is prevented', () => {
+    const handleClick = (event: React.MouseEvent<HTMLElement>) => {
+      event.preventDefault()
+    }
+
+    render(
+      <div>
+        <Popover open={false} onOpenChange={vi.fn()}>
+          <PopoverTrigger onClick={handleClick}>
+            fallback trigger
+          </PopoverTrigger>
+          <PopoverContent>
+            <div>popover body</div>
+          </PopoverContent>
+        </Popover>
+      </div>,
+    )
+
+    fireEvent.click(screen.getByTestId('popover-trigger'))
+
+    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+  })
+})
@@ -0,0 +1,154 @@
+import type { ReactNode } from 'react'
+import * as React from 'react'
+
+const PopoverContext = React.createContext({
+  open: false,
+  onOpenChange: (_open: boolean) => {},
+})
+
+type PopoverProps = {
+  children?: ReactNode
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}
+
+type PopoverTriggerProps = React.HTMLAttributes<HTMLElement> & {
+  children?: ReactNode
+  nativeButton?: boolean
+  render?: React.ReactElement
+}
+
+type PopoverContentProps = React.HTMLAttributes<HTMLDivElement> & {
+  children?: ReactNode
+  placement?: string
+  sideOffset?: number
+  alignOffset?: number
+  positionerProps?: React.HTMLAttributes<HTMLDivElement>
+  popupProps?: React.HTMLAttributes<HTMLDivElement>
+}
+
+export const Popover = ({
+  children,
+  open = false,
+  onOpenChange,
+}: PopoverProps) => {
+  React.useEffect(() => {
+    if (!open)
+      return
+
+    const handleMouseDown = (event: MouseEvent) => {
+      const target = event.target as Element | null
+      if (target?.closest?.('[data-popover-trigger="true"], [data-popover-content="true"]'))
+        return
+
+      onOpenChange?.(false)
+    }
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'Escape')
+        onOpenChange?.(false)
+    }
+
+    document.addEventListener('mousedown', handleMouseDown)
+    document.addEventListener('keydown', handleKeyDown)
+
+    return () => {
+      document.removeEventListener('mousedown', handleMouseDown)
+      document.removeEventListener('keydown', handleKeyDown)
+    }
+  }, [open, onOpenChange])
+
+  return (
+    <PopoverContext.Provider value={{
+      open,
+      onOpenChange: onOpenChange ?? (() => {}),
+    }}
+    >
+      <div data-testid="popover" data-open={String(open)}>
+        {children}
+      </div>
+    </PopoverContext.Provider>
+  )
+}
+
+export const PopoverTrigger = ({
+  children,
+  render,
+  nativeButton: _nativeButton,
+  onClick,
+  ...props
+}: PopoverTriggerProps) => {
+  const { open, onOpenChange } = React.useContext(PopoverContext)
+  const node = render ?? children
+
+  if (React.isValidElement(node)) {
+    const triggerElement = node as React.ReactElement<Record<string, unknown>>
+    const childProps = (triggerElement.props ?? {}) as React.HTMLAttributes<HTMLElement> & { 'data-testid'?: string }
+
+    return React.cloneElement(triggerElement, {
+      ...props,
+      ...childProps,
+      'data-testid': childProps['data-testid'] ?? 'popover-trigger',
+      'data-popover-trigger': 'true',
+      'onClick': (event: React.MouseEvent<HTMLElement>) => {
+        childProps.onClick?.(event)
+        onClick?.(event)
+        if (event.defaultPrevented)
+          return
+        onOpenChange(!open)
+      },
+    })
+  }
+
+  return (
+    <div
+      data-testid="popover-trigger"
+      data-popover-trigger="true"
+      onClick={(event) => {
+        onClick?.(event)
+        if (event.defaultPrevented)
+          return
+        onOpenChange(!open)
+      }}
+      {...props}
+    >
+      {node}
+    </div>
+  )
+}
+
+export const PopoverContent = ({
+  children,
+  className,
+  placement,
+  sideOffset,
+  alignOffset,
+  positionerProps,
+  popupProps,
+  ...props
+}: PopoverContentProps) => {
+  const { open } = React.useContext(PopoverContext)
+
+  if (!open)
+    return null
+
+  return (
+    <div
+      data-testid="popover-content"
+      data-popover-content="true"
+      data-placement={placement}
+      data-side-offset={sideOffset}
+      data-align-offset={alignOffset}
+      className={className}
+      {...positionerProps}
+      {...popupProps}
+      {...props}
+    >
+      {children}
+    </div>
+  )
+}
+
+export const PopoverClose = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const PopoverTitle = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const PopoverDescription = ({ children }: { children?: ReactNode }) => <>{children}</>
@@ -3,13 +3,13 @@ import type { FC } from 'react'
 import type { PopupProps } from './config-popup'

 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useCallback, useRef, useState } from 'react'
 import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
+import * as React from 'react'
+import { useState } from 'react'
 import ConfigPopup from './config-popup'

 type Props = {
@@ -25,36 +25,31 @@ const ConfigBtn: FC<Props> = ({
  children,
  ...popupProps
 }) => {
-  const [open, doSetOpen] = useState(false)
-  const openRef = useRef(open)
-  const setOpen = useCallback((v: boolean) => {
-    doSetOpen(v)
-    openRef.current = v
-  }, [doSetOpen])
-
-  const handleTrigger = useCallback(() => {
-    setOpen(!openRef.current)
-  }, [setOpen])
+  const [open, setOpen] = useState(false)

  if (popupProps.readOnly && !hasConfigured)
    return null

  return (
-    <PortalToFollowElem
+    <Popover
      open={open}
      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={12}
    >
-      <PortalToFollowElemTrigger onClick={handleTrigger}>
-        <div className={cn('select-none', className)}>
-          {children}
-        </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-11">
+      <PopoverTrigger
+        render={(
+          <div className={cn('select-none', className)}>
+            {children}
+          </div>
+        )}
+      />
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={12}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
        <ConfigPopup {...popupProps} />
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
  )
 }
 export default React.memo(ConfigBtn)
@@ -10,6 +10,72 @@ vi.mock('@/next/navigation', () => ({
  usePathname: () => '/test',
 }))

+vi.mock('@langgenius/dify-ui/popover', async () => {
+  const React = await import('react')
+  const PopoverContext = React.createContext({
+    open: false,
+    setOpen: (_open: boolean) => {},
+  })
+
+  const Popover = ({
+    children,
+    open: controlledOpen,
+    onOpenChange,
+  }: {
+    children: React.ReactNode
+    open?: boolean
+    onOpenChange?: (open: boolean) => void
+  }) => {
+    const [uncontrolledOpen, setUncontrolledOpen] = React.useState(false)
+    const isControlled = controlledOpen !== undefined
+    const open = isControlled ? !!controlledOpen : uncontrolledOpen
+    const setOpen = (nextOpen: boolean) => {
+      if (!isControlled)
+        setUncontrolledOpen(nextOpen)
+      onOpenChange?.(nextOpen)
+    }
+
+    return (
+      <PopoverContext.Provider value={{ open, setOpen }}>
+        {children}
+      </PopoverContext.Provider>
+    )
+  }
+
+  const PopoverTrigger = ({ render }: { render: React.ReactNode }) => {
+    const { open, setOpen } = React.useContext(PopoverContext)
+    return (
+      <div
+        data-testid="popover-trigger"
+        onClick={() => setOpen(!open)}
+      >
+        {render}
+      </div>
+    )
+  }
+
+  const PopoverContent = ({
+    children,
+    ...props
+  }: React.HTMLAttributes<HTMLDivElement> & { children?: React.ReactNode }) => {
+    const { open } = React.useContext(PopoverContext)
+    if (!open)
+      return null
+
+    return (
+      <div data-testid="popover-content" {...props}>
+        {children}
+      </div>
+    )
+  }
+
+  return {
+    Popover,
+    PopoverTrigger,
+    PopoverContent,
+  }
+})
+
 type PortalToFollowElemProps = {
  children: React.ReactNode
  open?: boolean
@@ -209,20 +275,17 @@ describe('ContextVar', () => {
      // Act
      render(<ContextVar {...props} />)

-      const triggers = screen.getAllByTestId('portal-trigger')
-      const varPickerTrigger = triggers[triggers.length - 1]
+      const varPickerTrigger = screen.getByTestId('popover-trigger')

      await user.click(varPickerTrigger!)
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()

      // Select a different option
-      const options = screen.getAllByText('var2')
-      expect(options.length).toBeGreaterThan(0)
-      await user.click(options[0]!)
+      await user.click(screen.getByText('var2'))

      // Assert
      expect(onChange).toHaveBeenCalledWith('var2')
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
    })

    it('should toggle dropdown when clicking the trigger button', async () => {
@@ -233,16 +296,15 @@ describe('ContextVar', () => {
      // Act
      render(<ContextVar {...props} />)

-      const triggers = screen.getAllByTestId('portal-trigger')
-      const varPickerTrigger = triggers[triggers.length - 1]
+      const varPickerTrigger = screen.getByTestId('popover-trigger')

      // Open dropdown
      await user.click(varPickerTrigger!)
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()

      // Close dropdown
      await user.click(varPickerTrigger!)
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
    })
  })

@@ -18,18 +18,21 @@ type PortalToFollowElemProps = {
 type PortalToFollowElemTriggerProps = React.HTMLAttributes<HTMLElement> & { children?: React.ReactNode, asChild?: boolean }
 type PortalToFollowElemContentProps = React.HTMLAttributes<HTMLDivElement> & { children?: React.ReactNode }

-vi.mock('@/app/components/base/portal-to-follow-elem', () => {
-  const PortalContext = React.createContext({ open: false })
+vi.mock('@langgenius/dify-ui/popover', () => {
+  const PortalContext = React.createContext({
+    open: false,
+    onOpenChange: undefined as ((open: boolean) => void) | undefined,
+  })

-  const PortalToFollowElem = ({ children, open }: PortalToFollowElemProps) => {
+  const Popover = ({ children, open, onOpenChange }: PortalToFollowElemProps) => {
    return (
-      <PortalContext.Provider value={{ open: !!open }}>
+      <PortalContext.Provider value={{ open: !!open, onOpenChange }}>
        <div data-testid="portal">{children}</div>
      </PortalContext.Provider>
    )
  }

-  const PortalToFollowElemContent = ({ children, ...props }: PortalToFollowElemContentProps) => {
+  const PopoverContent = ({ children, ...props }: PortalToFollowElemContentProps) => {
    const { open } = React.useContext(PortalContext)
    if (!open)
      return null
@@ -40,24 +43,41 @@ vi.mock('@/app/components/base/portal-to-follow-elem', () => {
    )
  }

-  const PortalToFollowElemTrigger = ({ children, asChild, ...props }: PortalToFollowElemTriggerProps) => {
+  const PopoverTrigger = ({ children, asChild, render, ...props }: PortalToFollowElemTriggerProps & { render?: React.ReactNode }) => {
+    const { open, onOpenChange } = React.useContext(PortalContext)
+    const content = render ?? children
+    const handleClick = (e: React.MouseEvent<HTMLElement>) => {
+      props.onClick?.(e)
+      if (!props.onClick)
+        onOpenChange?.(!open)
+    }
+
+    if (React.isValidElement(content)) {
+      return React.cloneElement(content, {
+        ...props,
+        'onClick': handleClick,
+        'data-testid': 'portal-trigger',
+      } as React.HTMLAttributes<HTMLElement>)
+    }
+
    if (asChild && React.isValidElement(children)) {
      return React.cloneElement(children, {
        ...props,
+        'onClick': handleClick,
        'data-testid': 'portal-trigger',
      } as React.HTMLAttributes<HTMLElement>)
    }
    return (
-      <div data-testid="portal-trigger" {...props}>
-        {children}
+      <div data-testid="portal-trigger" {...props} onClick={handleClick}>
+        {content}
      </div>
    )
  }

  return {
-    PortalToFollowElem,
-    PortalToFollowElemContent,
-    PortalToFollowElemTrigger,
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
  }
 })

@@ -3,15 +3,15 @@ import type { FC } from 'react'
 import type { IInputTypeIconProps } from '@/app/components/app/configuration/config-var/input-type-icon'
 import { ChevronDownIcon } from '@heroicons/react/24/outline'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import IconTypeIcon from '@/app/components/app/configuration/config-var/input-type-icon'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'

 type Option = { name: string, value: string, type: string }
 export type Props = {
@@ -33,6 +33,7 @@ const VarItem: FC<{ item: Option }> = ({ item }) => (
    </div>
  </div>
 )
+
 const VarPicker: FC<Props> = ({
  triggerClassName,
  className,
@@ -45,47 +46,51 @@ const VarPicker: FC<Props> = ({
  const [open, setOpen] = useState(false)
  const currItem = options.find(item => item.value === value)
  const notSetVar = !currItem
+
  return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 8,
-      }}
-    >
-      <PortalToFollowElemTrigger className={cn(triggerClassName)} onClick={() => setOpen(v => !v)}>
-        <div className={cn(
-          className,
-          notSetVar ? 'border-[#FEDF89] bg-[#FFFCF5] text-[#DC6803]' : 'border-components-button-secondary-border text-text-accent hover:bg-components-button-secondary-bg',
-          open ? 'bg-components-button-secondary-bg' : 'bg-transparent',
-          `
-          flex h-8 cursor-pointer items-center justify-center space-x-1 rounded-lg border px-2 text-[13px]
-          font-medium shadow-xs
-          `,
-        )}
-        >
-          <div>
-            {value
-              ? (
-                  <VarItem item={currItem as Option} />
-                )
-              : (
-                  <div>
-                    {notSelectedVarTip || t('feature.dataSet.queryVariable.choosePlaceholder', { ns: 'appDebug' })}
-                  </div>
-                )}
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        nativeButton={false}
+        render={(
+          <div className={cn(triggerClassName)}>
+            <div className={cn(
+              className,
+              notSetVar ? 'border-[#FEDF89] bg-[#FFFCF5] text-[#DC6803]' : 'border-components-button-secondary-border text-text-accent hover:bg-components-button-secondary-bg',
+              open ? 'bg-components-button-secondary-bg' : 'bg-transparent',
+              `
+              flex h-8 cursor-pointer items-center justify-center space-x-1 rounded-lg border px-2 text-[13px]
+              font-medium shadow-xs
+              `,
+            )}
+            >
+              <div>
+                {currItem
+                  ? (
+                      <VarItem item={currItem} />
+                    )
+                  : (
+                      <div>
+                        {notSelectedVarTip || t('feature.dataSet.queryVariable.choosePlaceholder', { ns: 'appDebug' })}
+                      </div>
+                    )}
+              </div>
+              <ChevronDownIcon className={cn(open && 'rotate-180 text-text-tertiary', 'h-3.5 w-3.5')} />
+            </div>
          </div>
-          <ChevronDownIcon className={cn(open && 'rotate-180 text-text-tertiary', 'h-3.5 w-3.5')} />
-        </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent style={{ zIndex: 1000 }}>
+        )}
+      />
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={8}
+        popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
+        positionerProps={{ style: { zIndex: 1000 } }}
+      >
        {options.length > 0
          ? (
              <div className="max-h-[50vh] w-[240px] overflow-y-auto rounded-lg border border-components-panel-border bg-components-panel-bg p-1 shadow-lg">
-                {options.map(({ name, value, type }, index) => (
+                {options.map(({ name, value, type }) => (
                  <div
-                    key={index}
+                    key={value}
                    className="flex cursor-pointer rounded-lg px-3 py-1 hover:bg-state-base-hover"
                    onClick={() => {
                      onChange(value)
@@ -103,9 +108,9 @@ const VarPicker: FC<Props> = ({
                <div className="text-xs leading-normal text-text-tertiary">{t('feature.dataSet.queryVariable.noVarTip', { ns: 'appDebug' })}</div>
              </div>
            )}
-
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
  )
 }
+
 export default React.memo(VarPicker)
@@ -125,6 +125,7 @@ const defaultChatHookReturn: Partial<ChatHookReturn> = {
  handleSend: vi.fn(),
  handleStop: vi.fn(),
  handleSwitchSibling: vi.fn(),
+  handleReconnect: vi.fn(),
  isResponding: false,
  suggestedQuestions: [],
 }
@@ -605,6 +606,95 @@ describe('ChatWrapper', () => {
    expect(handleSwitchSibling).not.toHaveBeenCalled()
  })

+  it('should reconnect to a recent running workflow on mount', () => {
+    const handleReconnect = vi.fn()
+    vi.mocked(useChat).mockReturnValue({
+      ...defaultChatHookReturn,
+      chatList: [],
+      handleReconnect,
+    } as unknown as ChatHookReturn)
+
+    vi.mocked(useChatWithHistoryContext).mockReturnValue({
+      ...defaultContextValue,
+      appPrevChatTree: [{
+        id: 'running-answer',
+        isAnswer: true,
+        content: 'partial content',
+        workflow_run_id: 'run-active',
+        created_at: Math.floor(Date.now() / 1000) - 30,
+        children: [],
+      } as unknown as ChatItemInTree],
+    })
+
+    render(<ChatWrapper />)
+    expect(handleReconnect).toHaveBeenCalledWith(
+      'running-answer',
+      'run-active',
+      expect.objectContaining({ isPublicAPI: true }),
+    )
+  })
+
+  it('should not reconnect to an old workflow beyond the retention window', () => {
+    const handleReconnect = vi.fn()
+    vi.mocked(useChat).mockReturnValue({
+      ...defaultChatHookReturn,
+      chatList: [],
+      handleReconnect,
+    } as unknown as ChatHookReturn)
+
+    vi.mocked(useChatWithHistoryContext).mockReturnValue({
+      ...defaultContextValue,
+      appPrevChatTree: [{
+        id: 'old-answer',
+        isAnswer: true,
+        content: 'old content',
+        workflow_run_id: 'run-old',
+        created_at: Math.floor(Date.now() / 1000) - 700,
+        children: [],
+      } as unknown as ChatItemInTree],
+    })
+
+    render(<ChatWrapper />)
+    expect(handleReconnect).not.toHaveBeenCalled()
+  })
+
+  it('should prefer paused workflow over running workflow for reconnection', () => {
+    const handleSwitchSibling = vi.fn()
+    const handleReconnect = vi.fn()
+    vi.mocked(useChat).mockReturnValue({
+      ...defaultChatHookReturn,
+      chatList: [],
+      handleSwitchSibling,
+      handleReconnect,
+    } as unknown as ChatHookReturn)
+
+    vi.mocked(useChatWithHistoryContext).mockReturnValue({
+      ...defaultContextValue,
+      appPrevChatTree: [
+        {
+          id: 'running-answer',
+          isAnswer: true,
+          content: '',
+          workflow_run_id: 'run-active',
+          created_at: Math.floor(Date.now() / 1000) - 10,
+          children: [],
+        } as unknown as ChatItemInTree,
+        {
+          id: 'paused-answer',
+          isAnswer: true,
+          content: '',
+          workflow_run_id: 'run-paused',
+          humanInputFormDataList: [{ node_id: 'n-1' }],
+          children: [],
+        } as unknown as ChatItemInTree,
+      ],
+    })
+
+    render(<ChatWrapper />)
+    expect(handleSwitchSibling).toHaveBeenCalledWith('paused-answer', expect.any(Object))
+    expect(handleReconnect).not.toHaveBeenCalled()
+  })
+
  it('should call stopChatMessageResponding when handleStop is triggered', () => {
    const handleStop = vi.fn()
    vi.mocked(useChat).mockReturnValue({
@@ -1836,6 +1836,82 @@ describe('useChatWithHistory', () => {
      expect(messageWithFiles?.children?.[0]?.message_files).toHaveLength(1)
      expect(messageWithFiles?.children?.[0]?.agent_thoughts?.[0]?.message_files).toHaveLength(1)
    })
+
+    it('should pass through workflow_run_id from item and created_at', async () => {
+      const listData = createConversationData({
+        data: [createConversationItem({ id: 'conversation-1' })],
+      })
+      mockFetchConversations.mockResolvedValue(listData)
+      mockFetchChatList.mockResolvedValue({
+        data: [
+          {
+            id: 'msg-running',
+            query: 'Running query',
+            answer: 'Running answer',
+            message_files: [],
+            feedback: null,
+            retriever_resources: [],
+            agent_thoughts: null,
+            parent_message_id: null,
+            inputs: {},
+            status: 'normal',
+            workflow_run_id: 'wf-direct-id',
+            created_at: 1700000000,
+          },
+        ],
+      })
+
+      const { result } = await renderWithClient(() => useChatWithHistory())
+
+      await waitFor(() => {
+        expect(result!.current.appPrevChatTree.length).toBeGreaterThan(0)
+      })
+
+      const answerNode = result!.current.appPrevChatTree[0]?.children?.[0]
+      expect(answerNode?.workflow_run_id).toBe('wf-direct-id')
+      expect(answerNode?.created_at).toBe(1700000000)
+    })
+
+    it('should prefer item.workflow_run_id over extra_contents workflow_run_id', async () => {
+      const listData = createConversationData({
+        data: [createConversationItem({ id: 'conversation-1' })],
+      })
+      mockFetchConversations.mockResolvedValue(listData)
+      mockFetchChatList.mockResolvedValue({
+        data: [
+          {
+            id: 'msg-both',
+            query: 'Both query',
+            answer: 'Both answer',
+            message_files: [],
+            feedback: null,
+            retriever_resources: [],
+            agent_thoughts: null,
+            parent_message_id: null,
+            inputs: {},
+            status: 'paused',
+            workflow_run_id: 'wf-item-level',
+            extra_contents: [
+              {
+                type: 'human_input',
+                submitted: false,
+                form_definition: { fields: [] },
+                workflow_run_id: 'wf-extra-level',
+              },
+            ],
+          },
+        ],
+      })
+
+      const { result } = await renderWithClient(() => useChatWithHistory())
+
+      await waitFor(() => {
+        expect(result!.current.appPrevChatTree.length).toBeGreaterThan(0)
+      })
+
+      const answerNode = result!.current.appPrevChatTree[0]?.children?.[0]
+      expect(answerNode?.workflow_run_id).toBe('wf-item-level')
+    })
  })

  // Scenario: newConversation merge replaces existing conversation item when id already exists.
@@ -79,6 +79,7 @@ const ChatWrapper = () => {
    handleSend,
    handleStop,
    handleSwitchSibling,
+    handleReconnect,
    isResponding: respondingState,
    suggestedQuestions,
  } = useChat(
@@ -140,37 +141,47 @@ const ChatWrapper = () => {
    setIsResponding(respondingState)
  }, [respondingState, setIsResponding])

-  // Resume paused workflows when chat history is loaded
+  // Resume paused workflows or reconnect to running workflows when chat history is loaded
  useEffect(() => {
    if (!appPrevChatTree || appPrevChatTree.length === 0)
      return

-    // Find the last answer item with workflow_run_id that needs resumption (DFS - find deepest first)
-    let lastPausedNode: ChatItemInTree | undefined
-    const findLastPausedWorkflow = (nodes: ChatItemInTree[]) => {
-      nodes.forEach((node) => {
-        // DFS: recurse to children first
-        if (node.children && node.children.length > 0)
-          findLastPausedWorkflow(node.children)
+    const STREAM_RETENTION_SECONDS = 600

-        // Track the last node with humanInputFormDataList
-        if (node.isAnswer && node.workflow_run_id && node.humanInputFormDataList && node.humanInputFormDataList.length > 0)
-          lastPausedNode = node
+    let lastPausedNode: ChatItemInTree | undefined
+    let lastRunningNode: ChatItemInTree | undefined
+    const findReconnectableWorkflow = (nodes: ChatItemInTree[]) => {
+      nodes.forEach((node) => {
+        if (node.isAnswer && node.workflow_run_id) {
+          if (node.humanInputFormDataList && node.humanInputFormDataList.length > 0) {
+            lastPausedNode = node
+          }
+          else if (
+            node.created_at
+            && (Date.now() / 1000 - node.created_at) < STREAM_RETENTION_SECONDS
+          ) {
+            lastRunningNode = node
+          }
+        }
+
+        if (node.children && node.children.length > 0)
+          findReconnectableWorkflow(node.children)
      })
    }

-    findLastPausedWorkflow(appPrevChatTree)
+    findReconnectableWorkflow(appPrevChatTree)
+
+    const callbacks = {
+      onGetSuggestedQuestions: (responseItemId: string) => fetchSuggestedQuestions(responseItemId, appSourceType, appId),
+      onConversationComplete: currentConversationId ? undefined : handleNewConversationCompleted,
+      isPublicAPI: appSourceType === AppSourceType.webApp,
+    }

-    // Only resume the last paused workflow
    if (lastPausedNode) {
-      handleSwitchSibling(
-        lastPausedNode.id,
-        {
-          onGetSuggestedQuestions: responseItemId => fetchSuggestedQuestions(responseItemId, appSourceType, appId),
-          onConversationComplete: currentConversationId ? undefined : handleNewConversationCompleted,
-          isPublicAPI: appSourceType === AppSourceType.webApp,
-        },
-      )
+      handleSwitchSibling(lastPausedNode.id, callbacks)
+    }
+    else if (lastRunningNode) {
+      handleReconnect(lastRunningNode.id, lastRunningNode.workflow_run_id!, callbacks)
    }
  }, [])

@@ -35,12 +35,12 @@ function getFormattedChatList(messages: any[]) {
    const answerFiles = item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || []
    const humanInputFormDataList: HumanInputFormData[] = []
    const humanInputFilledFormDataList: HumanInputFilledFormData[] = []
-    let workflowRunId = ''
+    let workflowRunIdFromExtra = ''
    if (item.status === 'paused') {
      item.extra_contents?.forEach((content: ExtraContent) => {
        if (content.type === 'human_input' && !content.submitted) {
          humanInputFormDataList.push(content.form_definition)
-          workflowRunId = content.workflow_run_id
+          workflowRunIdFromExtra = content.workflow_run_id
        }
      })
    }
@@ -62,7 +62,8 @@ function getFormattedChatList(messages: any[]) {
      parentMessageId: `question-${item.id}`,
      humanInputFormDataList,
      humanInputFilledFormDataList,
-      workflow_run_id: workflowRunId,
+      workflow_run_id: item.workflow_run_id || workflowRunIdFromExtra,
+      created_at: item.created_at,
    })
  })
  return newChatList
@@ -437,7 +438,7 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
    if (conversationId === currentConversationId)
      handleNewConversation()
    handleUpdateConversationList()
-  }, [isInstalledApp, appId, t, handleUpdateConversationList, handleNewConversation, currentConversationId, conversationDeleting])
+  }, [conversationDeleting, currentConversationId, handleNewConversation, handleUpdateConversationList, appSourceType, appId, t])
  const [conversationRenaming, setConversationRenaming] = useState(false)
  const handleRenameConversation = useCallback(async (conversationId: string, newName: string, { onSuccess }: Callback) => {
    if (conversationRenaming)
@@ -463,7 +464,7 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
    finally {
      setConversationRenaming(false)
    }
-  }, [isInstalledApp, appId, t, conversationRenaming, originConversationList])
+  }, [conversationRenaming, t, appSourceType, appId, originConversationList])
  const handleNewConversationCompleted = useCallback((newConversationId: string) => {
    setNewConversationId(newConversationId)
    handleConversationIdInfoChange(newConversationId)
@@ -1,3 +1,4 @@
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import {
  RiChatSettingsLine,
 } from '@remixicon/react'
@@ -6,30 +7,29 @@ import { useTranslation } from 'react-i18next'
 import ActionButton, { ActionButtonState } from '@/app/components/base/action-button'
 import InputsFormContent from '@/app/components/base/chat/chat-with-history/inputs-form/content'
 import { Message3Fill } from '@/app/components/base/icons/src/public/other'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'

 const ViewFormDropdown = () => {
  const { t } = useTranslation()
  const [open, setOpen] = useState(false)

  return (
-    <PortalToFollowElem
+    <Popover
      open={open}
      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-        crossAxis: 4,
-      }}
    >
-      <PortalToFollowElemTrigger
-        onClick={() => setOpen(v => !v)}
+      <PopoverTrigger
+        render={(
+          <ActionButton size="l" state={open ? ActionButtonState.Hover : ActionButtonState.Default}>
+            <RiChatSettingsLine className="h-[18px] w-[18px]" />
+          </ActionButton>
+        )}
+      />
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={4}
+        alignOffset={4}
+        popupClassName="border-none bg-transparent shadow-none"
      >
-        <ActionButton size="l" state={open ? ActionButtonState.Hover : ActionButtonState.Default}>
-          <RiChatSettingsLine className="h-[18px] w-[18px]" />
-        </ActionButton>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-50">
        <div className="w-[400px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg backdrop-blur-xs">
          <div className="flex items-center gap-3 rounded-t-2xl border-b border-divider-subtle px-6 py-4">
            <Message3Fill className="h-6 w-6 shrink-0" />
@@ -39,8 +39,8 @@ const ViewFormDropdown = () => {
            <InputsFormContent />
          </div>
        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>

  )
 }
@@ -1264,6 +1264,102 @@ describe('useChat', () => {
    })
  })

+  describe('handleReconnect', () => {
+    it('should call sseGet with include_state_snapshot and rebuild from snapshot events', () => {
+      let callbacks: HookCallbacks
+
+      vi.mocked(sseGet).mockImplementation(async (_url, _params, options) => {
+        callbacks = options as HookCallbacks
+      })
+
+      const prevChatTree = [{
+        id: 'q-1',
+        content: 'query',
+        isAnswer: false,
+        children: [{
+          id: 'm-reconnect',
+          content: 'stale partial content',
+          isAnswer: true,
+          siblingIndex: 0,
+          workflowProcess: { status: 'running', tracing: [{ node_id: 'old-node' }] },
+        }],
+      }]
+
+      const { result } = renderHook(() => useChat(undefined, undefined, prevChatTree as ChatItemInTree[]))
+
+      act(() => {
+        result.current.handleReconnect('m-reconnect', 'wr-reconnect', { isPublicAPI: true })
+      })
+
+      expect(sseGet).toHaveBeenCalledWith(
+        '/workflow/wr-reconnect/events?include_state_snapshot=true',
+        expect.any(Object),
+        expect.any(Object),
+      )
+
+      // Content is not reset until onWorkflowStarted fires
+      const beforeStart = result.current.chatList[1]
+      expect(beforeStart.content).toBe('stale partial content')
+
+      act(() => {
+        callbacks.onWorkflowStarted({ workflow_run_id: 'wr-reconnect', task_id: 't-1' })
+      })
+
+      // After onWorkflowStarted, content is reset and workflowProcess is fresh
+      const afterStart = result.current.chatList[1]
+      expect(afterStart.content).toBe('')
+      expect(afterStart.workflowProcess).toEqual({ status: WorkflowRunningStatus.Running, tracing: [] })
+
+      act(() => {
+        callbacks.onMessageReplace({ answer: 'full snapshot text' })
+        callbacks.onNodeStarted({ data: { node_id: 'n-1', id: 'n-1', title: 'Node 1' } })
+        callbacks.onNodeFinished({ data: { node_id: 'n-1', id: 'n-1', title: 'Node 1', status: 'succeeded' } })
+        callbacks.onWorkflowFinished({ data: { status: 'succeeded' } })
+        callbacks.onCompleted()
+      })
+
+      const lastResponse = result.current.chatList[1]
+      expect(lastResponse.content).toBe('full snapshot text')
+      expect(lastResponse.workflowProcess?.status).toBe('succeeded')
+      expect(lastResponse.workflowProcess?.tracing).toHaveLength(1)
+      expect(result.current.isResponding).toBe(false)
+    })
+
+    it('should abort previous stream when reconnecting again', () => {
+      const callbacksList: HookCallbacks[] = []
+      vi.mocked(sseGet).mockImplementation(async (_url, _params, options) => {
+        callbacksList.push(options as HookCallbacks)
+      })
+
+      const prevChatTree = [{
+        id: 'q-1',
+        content: 'query',
+        isAnswer: false,
+        children: [{
+          id: 'm-rc',
+          content: 'partial',
+          isAnswer: true,
+          siblingIndex: 0,
+        }],
+      }]
+
+      const { result } = renderHook(() => useChat(undefined, undefined, prevChatTree as ChatItemInTree[]))
+      const previousAbort = createAbortControllerMock()
+
+      act(() => {
+        result.current.handleReconnect('m-rc', 'wr-1', { isPublicAPI: true })
+      })
+      act(() => {
+        callbacksList[0].getAbortController(previousAbort)
+      })
+      act(() => {
+        result.current.handleReconnect('m-rc', 'wr-2', { isPublicAPI: true })
+      })
+
+      expect(previousAbort.abort).toHaveBeenCalledTimes(1)
+    })
+  })
+
  describe('createAudioPlayerManager branch cases', () => {
    it('should handle ttsUrl generation for appId with installed apps', async () => {
      vi.mocked(usePathname).mockReturnValue('/explore/installed/app')
@@ -1444,6 +1540,89 @@ describe('useChat', () => {
    })
  })

+  describe('onWorkflowStarted re-enables responding in handleSend', () => {
+    it('should set isResponding back to true when onWorkflowStarted fires after stop', () => {
+      let callbacks: HookCallbacks
+      vi.mocked(ssePost).mockImplementation(async (_url, _params, options) => {
+        callbacks = options as HookCallbacks
+      })
+
+      const stopChat = vi.fn()
+      const { result } = renderHook(() => useChat(undefined, undefined, undefined, stopChat))
+
+      act(() => {
+        result.current.handleSend('test-url', { query: 'workflow restart' }, {})
+      })
+      expect(result.current.isResponding).toBe(true)
+
+      act(() => {
+        callbacks.onWorkflowStarted({ workflow_run_id: 'wr-1', task_id: 't-1' })
+        callbacks.onData('part', true, { messageId: 'm-1', conversationId: 'c-1', taskId: 't-1' })
+      })
+
+      act(() => {
+        result.current.handleStop()
+      })
+      expect(result.current.isResponding).toBe(false)
+
+      act(() => {
+        callbacks.onWorkflowStarted({ workflow_run_id: 'wr-2', task_id: 't-2' })
+      })
+      expect(result.current.isResponding).toBe(true)
+    })
+  })
+
+  describe('abortInflightRequests on unmount', () => {
+    it('should abort all in-flight requests when the hook unmounts', () => {
+      let callbacks: HookCallbacks
+      vi.mocked(ssePost).mockImplementation(async (_url, _params, options) => {
+        callbacks = options as HookCallbacks
+      })
+
+      const workflowAbort = createAbortControllerMock()
+      const conversationAbort = createAbortControllerMock()
+      const suggestedAbort = createAbortControllerMock()
+
+      const config = { suggested_questions_after_answer: { enabled: true } }
+      const onGetConversationMessages = vi.fn().mockImplementation(async (_id: string, setAbort: (ac: AbortController) => void) => {
+        setAbort(conversationAbort)
+        return {
+          data: [{
+            id: 'm-1',
+            answer: 'a',
+            message: [{ role: 'assistant', text: 'a' }],
+            created_at: Date.now(),
+            answer_tokens: 1,
+            message_tokens: 1,
+            provider_response_latency: 0.1,
+            inputs: {},
+            query: 'q',
+          }],
+        }
+      })
+      const onGetSuggestedQuestions = vi.fn().mockImplementation(async (_id: string, setAbort: (ac: AbortController) => void) => {
+        setAbort(suggestedAbort)
+        return { data: [] }
+      })
+
+      const { result, unmount } = renderHook(() => useChat(config as ChatConfig))
+
+      act(() => {
+        result.current.handleSend('test-url', { query: 'unmount' }, {
+          onGetConversationMessages,
+          onGetSuggestedQuestions,
+        })
+      })
+      act(() => {
+        callbacks.getAbortController(workflowAbort)
+      })
+
+      unmount()
+
+      expect(workflowAbort.abort).toHaveBeenCalled()
+    })
+  })
+
  describe('annotations and siblings', () => {
    const prevChatTree = [{
      id: 'q-1',
@@ -143,6 +143,67 @@ describe('Answer Component', () => {
    })
  })

+  describe('ContentSwitch visibility while responding', () => {
+    it('should hide ContentSwitch when responding in non-human-inputs layout', () => {
+      render(
+        <Answer
+          {...defaultProps}
+          responding={true}
+          item={{
+            ...defaultProps.item,
+            siblingCount: 3,
+            siblingIndex: 1,
+            prevSibling: 'msg-0',
+            nextSibling: 'msg-2',
+          } as unknown as ChatItem}
+          switchSibling={vi.fn()}
+        />,
+      )
+      expect(screen.queryByRole('button', { name: 'Previous' })).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'Next' })).not.toBeInTheDocument()
+    })
+
+    it('should hide ContentSwitch when responding in human-inputs layout with content', () => {
+      render(
+        <Answer
+          {...defaultProps}
+          responding={true}
+          item={{
+            ...defaultProps.item,
+            content: 'partial response',
+            siblingCount: 3,
+            siblingIndex: 1,
+            prevSibling: 'msg-0',
+            nextSibling: 'msg-2',
+            humanInputFormDataList: [{ id: 'form1' }],
+          } as unknown as ChatItem}
+          switchSibling={vi.fn()}
+        />,
+      )
+      expect(screen.queryByRole('button', { name: 'Previous' })).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'Next' })).not.toBeInTheDocument()
+    })
+
+    it('should show ContentSwitch when not responding with siblings', () => {
+      render(
+        <Answer
+          {...defaultProps}
+          responding={false}
+          item={{
+            ...defaultProps.item,
+            siblingCount: 3,
+            siblingIndex: 1,
+            prevSibling: 'msg-0',
+            nextSibling: 'msg-2',
+          } as unknown as ChatItem}
+          switchSibling={vi.fn()}
+        />,
+      )
+      expect(screen.getByRole('button', { name: 'Previous' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Next' })).toBeInTheDocument()
+    })
+  })
+
  describe('Interactions', () => {
    it('should handle switch sibling', () => {
      const mockSwitchSibling = vi.fn()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
autofix-ci[bot]andGitHub	73a1dc293f	[autofix.ci] apply automated fixes	2026-04-21 10:31:40 +00:00
Yunlu WenandGitHub	26c00ffd85	Merge branch 'main' into feat/replayable-stream	2026-04-21 18:27:03 +08:00
yunlu.wen	33db927327	remove stale comments	2026-04-21 18:23:51 +08:00
yunlu.wen	d226a5bdd3	rollback unnecessary changes	2026-04-21 18:23:51 +08:00
Coding On Star GitHub CodingOnStarautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	d65a6b4810	refactor: migrate from PortalToFollowElem to Popover component across various components (#35454 ) Co-authored-by: CodingOnStar <hanxujiang@dify.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 10:09:22 +00:00
zyssyz123andGitHub	44a91e344c	fix(plugin): persist tenant plugin auto-upgrade strategy changes (#35464 )	2026-04-21 09:28:44 +00:00
autofix-ci[bot]andGitHub	2c5a9ec1a0	[autofix.ci] apply automated fixes	2026-04-21 09:24:45 +00:00
yunlu.wen	b59d8d3446	resolve conflicts	2026-04-21 17:19:48 +08:00
yunlu.wen	87bbcc4e3b	improve workflow stop event handling	2026-04-21 17:18:11 +08:00
yyhandGitHub	0fec9af6a6	chore(deps): bump vite-plus to 0.1.19 (#35462 )	2026-04-21 09:11:11 +00:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5e5113e08e	chore(deps-dev): bump the dev group in /api with 6 updates (#35402 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-04-21 08:59:59 +00:00
yyhandGitHub	73f9a9e7d6	chore(deps): bump base ui to 1.4.1 (#35459 )	2026-04-21 08:18:31 +00:00
yunlu.wen	91008c0329	Merge remote-tracking branch 'upstream/main' into feat/replayable-stream	2026-04-21 16:05:26 +08:00
JoelandGitHub	48d23cd744	feat: support slash variable filtering in prompt editor (#35460 )	2026-04-21 07:57:16 +00:00
yunlu.wen	49e12984c3	remove replay	2026-04-21 15:52:02 +08:00
Mallikharjuna Mulpuri GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	0b60bf6ef0	refactor: replace deprecated Iterator with Generator in contextmanagers #35433 (#35441 ) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 07:44:49 +00:00
非法操作andGitHub	3b24d8d2d1	fix: webscaper sometime not work (#35450 )	2026-04-21 06:04:56 +00:00
yyh GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	051ba99cd2	refactor(billing): use Infotip for UsageInfo help icon, migrate storage tooltip to dify-ui (#35448 ) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 06:00:02 +00:00
agenthaulk GitHub Asuka Minato	dc83e8aa09	chore: resolve oxlint warnings across web and SDK (#34540 ) Co-authored-by: Asuka Minato <i@asukaminato.eu.org>	2026-04-21 04:43:45 +00:00
tmimmanuel GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	77f8f2babb	refactor(api): tighten core rag typing batch 1 (#35210 ) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 04:32:43 +00:00
-LAN-andGitHub	77d6c108e7	fix(workflow): cache provider configurations during graph init (#35447 )	2026-04-21 04:29:35 +00:00
yyh GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	c2a5962023	feat(dify-ui): add PreviewCard primitive (#35434 ) Signed-off-by: yyh <yuanyouhuilyz@gmail.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 04:05:22 +00:00
Coding On Star GitHub CodingOnStarautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	d583b1b835	refactor(web): continue replacing PortalToFollowElem with Popover components (#35431 ) Co-authored-by: CodingOnStar <hanxujiang@dify.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 02:44:52 +00:00
Markus Lobedann GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	da00de6688	fix: increase maximum PostgreSQL connections to 200 (#35439 ) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>	2026-04-21 01:59:21 +00:00
twwu	34c46561e9	fix(eslint): update suppression count for ts/no-explicit-any rule	2026-04-20 18:17:16 +08:00
twwu	a25e3b66c1	test(chat): enhance unit tests for chat hooks and answer component visibility	2026-04-20 17:52:45 +08:00
twwu	45b0751826	fix(chat): add abort mechanism for in-flight requests on unmount	2026-04-20 17:17:42 +08:00
twwu	ea58415f88	fix(chat): update conversation handling and improve response logic	2026-04-17 16:22:22 +08:00
twwu	73ff36cb0e	refactor: remove replay parameter from workflow event URL	2026-04-17 14:18:14 +08:00
yunlu.wen	6afdde1bc4	remove replay capability	2026-04-17 11:58:21 +08:00
yunlu.wen	c294006ecf	fix unit tests	2026-04-17 11:10:11 +08:00
autofix-ci[bot]andGitHub	53c0dde3d5	[autofix.ci] apply automated fixes	2026-04-16 09:45:48 +00:00
yunlu.wen	a1759fccb8	feat: replayable message	2026-04-16 17:41:21 +08:00