test: stable test

api/.vscode/launch.json.example

@@ -54,7 +54,7 @@
                 "--loglevel",
                 "DEBUG",
                 "-Q",
-                "dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,workflow_based_app_execution,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor"
+                "dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor"
             ]
         }
     ]

api/configs/middleware/__init__.py

@@ -259,20 +259,11 @@ class CeleryConfig(DatabaseConfig):
         description="Password of the Redis Sentinel master.",
         default=None,
     )
-
     CELERY_SENTINEL_SOCKET_TIMEOUT: PositiveFloat | None = Field(
         description="Timeout for Redis Sentinel socket operations in seconds.",
         default=0.1,
     )
 
-    CELERY_TASK_ANNOTATIONS: dict[str, Any] | None = Field(
-        description=(
-            "Annotations for Celery tasks as a JSON mapping of task name -> options "
-            "(for example, rate limits or other task-specific settings)."
-        ),
-        default=None,
-    )
-
     @computed_field
     def CELERY_RESULT_BACKEND(self) -> str | None:
         if self.CELERY_BACKEND in ("database", "rabbitmq"):

api/constants/languages.py

@@ -21,7 +21,6 @@ language_timezone_mapping = {
     "th-TH": "Asia/Bangkok",
     "id-ID": "Asia/Jakarta",
     "ar-TN": "Africa/Tunis",
-    "nl-NL": "Europe/Amsterdam",
 }
 
 languages = list(language_timezone_mapping.keys())

api/controllers/console/app/conversation.py

@@ -599,12 +599,7 @@ def _get_conversation(app_model, conversation_id):
     db.session.execute(
         sa.update(Conversation)
         .where(Conversation.id == conversation_id, Conversation.read_at.is_(None))
-        # Keep updated_at unchanged when only marking a conversation as read.
-        .values(
-            read_at=naive_utc_now(),
-            read_account_id=current_user.id,
-            updated_at=Conversation.updated_at,
-        )
+        .values(read_at=naive_utc_now(), read_account_id=current_user.id)
     )
     db.session.commit()
     db.session.refresh(conversation)

api/controllers/console/setup.py

@@ -42,15 +42,7 @@ class SetupResponse(BaseModel):
     tags=["console"],
 )
 def get_setup_status_api() -> SetupStatusResponse:
-    """Get system setup status.
-
-    NOTE: This endpoint is unauthenticated by design.
-
-    During first-time bootstrap there is no admin account yet, so frontend initialization must be
-    able to query setup progress before any login flow exists.
-
-    Only bootstrap-safe status information should be returned by this endpoint.
-    """
+    """Get system setup status."""
     if dify_config.EDITION == "SELF_HOSTED":
         setup_status = get_setup_status()
         if setup_status and not isinstance(setup_status, bool):
@@ -69,12 +61,7 @@ def get_setup_status_api() -> SetupStatusResponse:
 )
 @only_edition_self_hosted
 def setup_system(payload: SetupRequestPayload) -> SetupResponse:
-    """Initialize system setup with admin account.
-
-    NOTE: This endpoint is unauthenticated by design for first-time bootstrap.
-    Access is restricted by deployment mode (`SELF_HOSTED`), one-time setup guards,
-    and init-password validation rather than user session authentication.
-    """
+    """Initialize system setup with admin account."""
     if get_setup_status():
         raise AlreadySetupError()
 

api/controllers/service_api/__init__.py

@@ -34,7 +34,6 @@ from .dataset import (
     metadata,
     segment,
 )
-from .dataset.rag_pipeline import rag_pipeline_workflow
 from .end_user import end_user
 from .workspace import models
 
@@ -54,7 +53,6 @@ __all__ = [
     "message",
     "metadata",
     "models",
-    "rag_pipeline_workflow",
     "segment",
     "site",
     "workflow",

api/controllers/service_api/dataset/rag_pipeline/rag_pipeline_workflow.py

@@ -1,3 +1,5 @@
+import string
+import uuid
 from collections.abc import Generator
 from typing import Any
 
@@ -10,7 +12,6 @@ from controllers.common.errors import FilenameNotExistsError, NoFileUploadedErro
 from controllers.common.schema import register_schema_model
 from controllers.service_api import service_api_ns
 from controllers.service_api.dataset.error import PipelineRunError
-from controllers.service_api.dataset.rag_pipeline.serializers import serialize_upload_file
 from controllers.service_api.wraps import DatasetApiResource
 from core.app.apps.pipeline.pipeline_generator import PipelineGenerator
 from core.app.entities.app_invoke_entities import InvokeFrom
@@ -40,7 +41,7 @@ register_schema_model(service_api_ns, DatasourceNodeRunPayload)
 register_schema_model(service_api_ns, PipelineRunApiEntity)
 
 
-@service_api_ns.route("/datasets/<uuid:dataset_id>/pipeline/datasource-plugins")
+@service_api_ns.route(f"/datasets/{uuid:dataset_id}/pipeline/datasource-plugins")
 class DatasourcePluginsApi(DatasetApiResource):
     """Resource for datasource plugins."""
 
@@ -75,7 +76,7 @@ class DatasourcePluginsApi(DatasetApiResource):
         return datasource_plugins, 200
 
 
-@service_api_ns.route("/datasets/<uuid:dataset_id>/pipeline/datasource/nodes/<string:node_id>/run")
+@service_api_ns.route(f"/datasets/{uuid:dataset_id}/pipeline/datasource/nodes/{string:node_id}/run")
 class DatasourceNodeRunApi(DatasetApiResource):
     """Resource for datasource node run."""
 
@@ -130,7 +131,7 @@ class DatasourceNodeRunApi(DatasetApiResource):
         )
 
 
-@service_api_ns.route("/datasets/<uuid:dataset_id>/pipeline/run")
+@service_api_ns.route(f"/datasets/{uuid:dataset_id}/pipeline/run")
 class PipelineRunApi(DatasetApiResource):
     """Resource for datasource node run."""
 
@@ -231,4 +232,12 @@ class KnowledgebasePipelineFileUploadApi(DatasetApiResource):
         except services.errors.file.UnsupportedFileTypeError:
             raise UnsupportedFileTypeError()
 
-        return serialize_upload_file(upload_file), 201
+        return {
+            "id": upload_file.id,
+            "name": upload_file.name,
+            "size": upload_file.size,
+            "extension": upload_file.extension,
+            "mime_type": upload_file.mime_type,
+            "created_by": upload_file.created_by,
+            "created_at": upload_file.created_at,
+        }, 201

api/controllers/service_api/dataset/rag_pipeline/serializers.py

@@ -1,22 +0,0 @@
-"""
-Serialization helpers for Service API knowledge pipeline endpoints.
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from models.model import UploadFile
-
-
-def serialize_upload_file(upload_file: UploadFile) -> dict[str, Any]:
-    return {
-        "id": upload_file.id,
-        "name": upload_file.name,
-        "size": upload_file.size,
-        "extension": upload_file.extension,
-        "mime_type": upload_file.mime_type,
-        "created_by": upload_file.created_by,
-        "created_at": upload_file.created_at.isoformat() if upload_file.created_at else None,
-    }

api/controllers/service_api/wraps.py

@@ -217,8 +217,6 @@ def validate_dataset_token(view: Callable[Concatenate[T, P], R] | None = None):
     def decorator(view: Callable[Concatenate[T, P], R]):
         @wraps(view)
         def decorated(*args: P.args, **kwargs: P.kwargs):
-            api_token = validate_and_get_api_token("dataset")
-
             # get url path dataset_id from positional args or kwargs
             # Flask passes URL path parameters as positional arguments
             dataset_id = None
@@ -255,18 +253,12 @@ def validate_dataset_token(view: Callable[Concatenate[T, P], R] | None = None):
             # Validate dataset if dataset_id is provided
             if dataset_id:
                 dataset_id = str(dataset_id)
-                dataset = (
-                    db.session.query(Dataset)
-                    .where(
-                        Dataset.id == dataset_id,
-                        Dataset.tenant_id == api_token.tenant_id,
-                    )
-                    .first()
-                )
+                dataset = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
                 if not dataset:
                     raise NotFound("Dataset not found.")
                 if not dataset.enable_api:
                     raise Forbidden("Dataset api access is not enabled.")
+            api_token = validate_and_get_api_token("dataset")
             tenant_account_join = (
                 db.session.query(Tenant, TenantAccountJoin)
                 .where(Tenant.id == api_token.tenant_id)

api/core/app/apps/streaming_utils.py

@@ -34,7 +34,7 @@ def stream_topic_events(
             on_subscribe()
         while True:
             try:
-                msg = sub.receive(timeout=1)
+                msg = sub.receive(timeout=0.1)
             except SubscriptionClosedError:
                 return
             if msg is None:

api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py

@@ -45,8 +45,6 @@ from core.app.entities.task_entities import (
 from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
 from core.app.task_pipeline.message_cycle_manager import MessageCycleManager
 from core.base.tts import AppGeneratorTTSPublisher, AudioTrunk
-from core.file import helpers as file_helpers
-from core.file.enums import FileTransferMethod
 from core.model_manager import ModelInstance
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
 from core.model_runtime.entities.message_entities import (
@@ -58,11 +56,10 @@ from core.ops.entities.trace_entity import TraceTaskName
 from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
-from core.tools.signature import sign_tool_file
 from events.message_event import message_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
-from models.model import AppMode, Conversation, Message, MessageAgentThought, MessageFile, UploadFile
+from models.model import AppMode, Conversation, Message, MessageAgentThought
 
 logger = logging.getLogger(__name__)
 
@@ -466,85 +463,6 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
             metadata=metadata_dict,
         )
 
-    def _record_files(self):
-        with Session(db.engine, expire_on_commit=False) as session:
-            message_files = session.scalars(select(MessageFile).where(MessageFile.message_id == self._message_id)).all()
-            if not message_files:
-                return None
-
-            files_list = []
-            upload_file_ids = [
-                mf.upload_file_id
-                for mf in message_files
-                if mf.transfer_method == FileTransferMethod.LOCAL_FILE and mf.upload_file_id
-            ]
-            upload_files_map = {}
-            if upload_file_ids:
-                upload_files = session.scalars(select(UploadFile).where(UploadFile.id.in_(upload_file_ids))).all()
-                upload_files_map = {uf.id: uf for uf in upload_files}
-
-            for message_file in message_files:
-                upload_file = None
-                if message_file.transfer_method == FileTransferMethod.LOCAL_FILE and message_file.upload_file_id:
-                    upload_file = upload_files_map.get(message_file.upload_file_id)
-
-                url = None
-                filename = "file"
-                mime_type = "application/octet-stream"
-                size = 0
-                extension = ""
-
-                if message_file.transfer_method == FileTransferMethod.REMOTE_URL:
-                    url = message_file.url
-                    if message_file.url:
-                        filename = message_file.url.split("/")[-1].split("?")[0]  # Remove query params
-                elif message_file.transfer_method == FileTransferMethod.LOCAL_FILE:
-                    if upload_file:
-                        url = file_helpers.get_signed_file_url(upload_file_id=str(upload_file.id))
-                        filename = upload_file.name
-                        mime_type = upload_file.mime_type or "application/octet-stream"
-                        size = upload_file.size or 0
-                        extension = f".{upload_file.extension}" if upload_file.extension else ""
-                    elif message_file.upload_file_id:
-                        # Fallback: generate URL even if upload_file not found
-                        url = file_helpers.get_signed_file_url(upload_file_id=str(message_file.upload_file_id))
-                elif message_file.transfer_method == FileTransferMethod.TOOL_FILE and message_file.url:
-                    # For tool files, use URL directly if it's HTTP, otherwise sign it
-                    if message_file.url.startswith("http"):
-                        url = message_file.url
-                        filename = message_file.url.split("/")[-1].split("?")[0]
-                    else:
-                        # Extract tool file id and extension from URL
-                        url_parts = message_file.url.split("/")
-                        if url_parts:
-                            file_part = url_parts[-1].split("?")[0]  # Remove query params first
-                            # Use rsplit to correctly handle filenames with multiple dots
-                            if "." in file_part:
-                                tool_file_id, ext = file_part.rsplit(".", 1)
-                                extension = f".{ext}"
-                            else:
-                                tool_file_id = file_part
-                                extension = ".bin"
-                            url = sign_tool_file(tool_file_id=tool_file_id, extension=extension)
-                            filename = file_part
-
-                transfer_method_value = message_file.transfer_method
-                remote_url = message_file.url if message_file.transfer_method == FileTransferMethod.REMOTE_URL else ""
-                file_dict = {
-                    "related_id": message_file.id,
-                    "extension": extension,
-                    "filename": filename,
-                    "size": size,
-                    "mime_type": mime_type,
-                    "transfer_method": transfer_method_value,
-                    "type": message_file.type,
-                    "url": url or "",
-                    "upload_file_id": message_file.upload_file_id or message_file.id,
-                    "remote_url": remote_url,
-                }
-                files_list.append(file_dict)
-            return files_list or None
-
     def _agent_message_to_stream_response(self, answer: str, message_id: str) -> AgentMessageStreamResponse:
         """
         Agent message to stream response.

api/core/app/task_pipeline/message_cycle_manager.py

@@ -64,13 +64,7 @@ class MessageCycleManager:
 
         # Use SQLAlchemy 2.x style session.scalar(select(...))
         with session_factory.create_session() as session:
-            message_file = session.scalar(
-                select(MessageFile)
-                .where(
-                    MessageFile.message_id == message_id,
-                )
-                .where(MessageFile.belongs_to == "assistant")
-            )
+            message_file = session.scalar(select(MessageFile).where(MessageFile.message_id == message_id))
 
         if message_file:
             self._message_has_file.add(message_id)

api/core/tools/__base/tool.py

@@ -5,7 +5,7 @@ from collections.abc import Generator
 from copy import deepcopy
 from typing import TYPE_CHECKING, Any
 
-if TYPE_CHECKING:  # pragma: no cover
+if TYPE_CHECKING:
     from models.model import File
 
 from core.tools.__base.tool_runtime import ToolRuntime
@@ -171,7 +171,7 @@ class Tool(ABC):
     def create_file_message(self, file: File) -> ToolInvokeMessage:
         return ToolInvokeMessage(
             type=ToolInvokeMessage.MessageType.FILE,
-            message=ToolInvokeMessage.FileMessage(file_marker="file_marker"),
+            message=ToolInvokeMessage.FileMessage(),
             meta={"file": file},
         )
 

api/extensions/ext_celery.py

@@ -80,14 +80,8 @@ def init_app(app: DifyApp) -> Celery:
         worker_hijack_root_logger=False,
         timezone=pytz.timezone(dify_config.LOG_TZ or "UTC"),
         task_ignore_result=True,
-        task_annotations=dify_config.CELERY_TASK_ANNOTATIONS,
     )
 
-    if dify_config.CELERY_BACKEND == "redis":
-        celery_app.conf.update(
-            result_backend_transport_options=broker_transport_options,
-        )
-
     # Apply SSL configuration if enabled
     ssl_options = _get_celery_ssl_options()
     if ssl_options:

api/extensions/ext_redis.py

@@ -119,7 +119,7 @@ class RedisClientWrapper:
 
 
 redis_client: RedisClientWrapper = RedisClientWrapper()
-_pubsub_redis_client: redis.Redis | RedisCluster | None = None
+pubsub_redis_client: RedisClientWrapper = RedisClientWrapper()
 
 
 def _get_ssl_configuration() -> tuple[type[Union[Connection, SSLConnection]], dict[str, Any]]:
@@ -232,7 +232,7 @@ def _create_standalone_client(redis_params: dict[str, Any]) -> Union[redis.Redis
     return client
 
 
-def _create_pubsub_client(pubsub_url: str, use_clusters: bool) -> redis.Redis | RedisCluster:
+def _create_pubsub_client(pubsub_url: str, use_clusters: bool) -> Union[redis.Redis, RedisCluster]:
     if use_clusters:
         return RedisCluster.from_url(pubsub_url)
     return redis.Redis.from_url(pubsub_url)
@@ -256,19 +256,23 @@ def init_app(app: DifyApp):
     redis_client.initialize(client)
     app.extensions["redis"] = redis_client
 
-    global _pubsub_redis_client
-    _pubsub_redis_client = client
+    pubsub_client = client
     if dify_config.normalized_pubsub_redis_url:
-        _pubsub_redis_client = _create_pubsub_client(
+        pubsub_client = _create_pubsub_client(
             dify_config.normalized_pubsub_redis_url, dify_config.PUBSUB_REDIS_USE_CLUSTERS
         )
+    pubsub_redis_client.initialize(pubsub_client)
+
+
+def get_pubsub_redis_client() -> RedisClientWrapper:
+    return pubsub_redis_client
 
 
 def get_pubsub_broadcast_channel() -> BroadcastChannelProtocol:
-    assert _pubsub_redis_client is not None, "PubSub redis Client should be initialized here."
+    redis_conn = get_pubsub_redis_client()
     if dify_config.PUBSUB_REDIS_CHANNEL_TYPE == "sharded":
-        return ShardedRedisBroadcastChannel(_pubsub_redis_client)
-    return RedisBroadcastChannel(_pubsub_redis_client)
+        return ShardedRedisBroadcastChannel(redis_conn)  # pyright: ignore[reportArgumentType]
+    return RedisBroadcastChannel(redis_conn)  # pyright: ignore[reportArgumentType]
 
 
 P = ParamSpec("P")

api/extensions/otel/decorators/base.py

@@ -1,6 +1,6 @@
 import functools
 from collections.abc import Callable
-from typing import ParamSpec, TypeVar, cast
+from typing import Any, TypeVar, cast
 
 from opentelemetry.trace import get_tracer
 
@@ -8,8 +8,7 @@ from configs import dify_config
 from extensions.otel.decorators.handler import SpanHandler
 from extensions.otel.runtime import is_instrument_flag_enabled
 
-P = ParamSpec("P")
-R = TypeVar("R")
+T = TypeVar("T", bound=Callable[..., Any])
 
 _HANDLER_INSTANCES: dict[type[SpanHandler], SpanHandler] = {SpanHandler: SpanHandler()}
 
@@ -21,7 +20,7 @@ def _get_handler_instance(handler_class: type[SpanHandler]) -> SpanHandler:
     return _HANDLER_INSTANCES[handler_class]
 
 
-def trace_span(handler_class: type[SpanHandler] | None = None) -> Callable[[Callable[P, R]], Callable[P, R]]:
+def trace_span(handler_class: type[SpanHandler] | None = None) -> Callable[[T], T]:
     """
     Decorator that traces a function with an OpenTelemetry span.
 
@@ -31,9 +30,9 @@ def trace_span(handler_class: type[SpanHandler] | None = None) -> Callable[[Call
     :param handler_class: Optional handler class to use for this span. If None, uses the default SpanHandler.
     """
 
-    def decorator(func: Callable[P, R]) -> Callable[P, R]:
+    def decorator(func: T) -> T:
         @functools.wraps(func)
-        def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+        def wrapper(*args: Any, **kwargs: Any) -> Any:
             if not (dify_config.ENABLE_OTEL or is_instrument_flag_enabled()):
                 return func(*args, **kwargs)
 
@@ -47,6 +46,6 @@ def trace_span(handler_class: type[SpanHandler] | None = None) -> Callable[[Call
                 kwargs=kwargs,
             )
 
-        return cast(Callable[P, R], wrapper)
+        return cast(T, wrapper)
 
     return decorator

api/extensions/otel/decorators/handler.py

@@ -1,11 +1,9 @@
 import inspect
 from collections.abc import Callable, Mapping
-from typing import Any, TypeVar
+from typing import Any
 
 from opentelemetry.trace import SpanKind, Status, StatusCode
 
-R = TypeVar("R")
-
 
 class SpanHandler:
     """
@@ -33,9 +31,9 @@ class SpanHandler:
 
     def _extract_arguments(
         self,
-        wrapped: Callable[..., R],
-        args: tuple[object, ...],
-        kwargs: Mapping[str, object],
+        wrapped: Callable[..., Any],
+        args: tuple[Any, ...],
+        kwargs: Mapping[str, Any],
     ) -> dict[str, Any] | None:
         """
         Extract function arguments using inspect.signature.
@@ -64,10 +62,10 @@ class SpanHandler:
     def wrapper(
         self,
         tracer: Any,
-        wrapped: Callable[..., R],
-        args: tuple[object, ...],
-        kwargs: Mapping[str, object],
-    ) -> R:
+        wrapped: Callable[..., Any],
+        args: tuple[Any, ...],
+        kwargs: Mapping[str, Any],
+    ) -> Any:
         """
         Fully control the wrapper behavior.
 

api/extensions/otel/decorators/handlers/generate_handler.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Callable, Mapping
-from typing import Any, TypeVar
+from typing import Any
 
 from opentelemetry.trace import SpanKind, Status, StatusCode
 from opentelemetry.util.types import AttributeValue
@@ -12,19 +12,16 @@ from models.model import Account
 logger = logging.getLogger(__name__)
 
 
-R = TypeVar("R")
-
-
 class AppGenerateHandler(SpanHandler):
     """Span handler for ``AppGenerateService.generate``."""
 
     def wrapper(
         self,
         tracer: Any,
-        wrapped: Callable[..., R],
-        args: tuple[object, ...],
-        kwargs: Mapping[str, object],
-    ) -> R:
+        wrapped: Callable[..., Any],
+        args: tuple[Any, ...],
+        kwargs: Mapping[str, Any],
+    ) -> Any:
         try:
             arguments = self._extract_arguments(wrapped, args, kwargs)
             if not arguments:

api/libs/broadcast_channel/redis/_subscription.py

@@ -152,7 +152,7 @@ class RedisSubscriptionBase(Subscription):
         """Iterator for consuming messages from the subscription."""
         while not self._closed.is_set():
             try:
-                item = self._queue.get(timeout=1)
+                item = self._queue.get(timeout=0.1)
             except queue.Empty:
                 continue
 

api/libs/broadcast_channel/redis/channel.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from libs.broadcast_channel.channel import Producer, Subscriber, Subscription
-from redis import Redis, RedisCluster
+from redis import Redis
 
 from ._subscription import RedisSubscriptionBase
 
@@ -18,7 +18,7 @@ class BroadcastChannel:
 
     def __init__(
         self,
-        redis_client: Redis | RedisCluster,
+        redis_client: Redis,
     ):
         self._client = redis_client
 
@@ -27,7 +27,7 @@ class BroadcastChannel:
 
 
 class Topic:
-    def __init__(self, redis_client: Redis | RedisCluster, topic: str):
+    def __init__(self, redis_client: Redis, topic: str):
         self._client = redis_client
         self._topic = topic
 

api/libs/broadcast_channel/redis/sharded_channel.py

@@ -70,9 +70,8 @@ class _RedisShardedSubscription(RedisSubscriptionBase):
         # Since we have already filtered at the caller's site, we can safely set
         # `ignore_subscribe_messages=False`.
         if isinstance(self._client, RedisCluster):
-            # NOTE(QuantumGhost): due to an issue in upstream code, calling `get_sharded_message` without
-            # specifying the `target_node` argument would use busy-looping to wait
-            # for incoming message, consuming excessive CPU quota.
+            # NOTE(QuantumGhost): due to an issue in upstream code, calling `get_sharded_message`
+            # would use busy-looping to wait for incoming message, consuming excessive CPU quota.
             #
             # Here we specify the `target_node` to mitigate this problem.
             node = self._client.get_node_from_key(self._topic)
@@ -81,10 +80,8 @@ class _RedisShardedSubscription(RedisSubscriptionBase):
                 timeout=1,
                 target_node=node,
             )
-        elif isinstance(self._client, Redis):
-            return self._pubsub.get_sharded_message(ignore_subscribe_messages=False, timeout=1)  # type: ignore[attr-defined]
         else:
-            raise AssertionError("client should be either Redis or RedisCluster.")
+            return self._pubsub.get_sharded_message(ignore_subscribe_messages=False, timeout=1)  # type: ignore[attr-defined]
 
     def _get_message_type(self) -> str:
         return "smessage"

api/migrations/versions/2026_02_10_1507-f55813ffe2c8_fix_tenant_default_model_unique.py

@@ -1,59 +0,0 @@
-"""add unique constraint to tenant_default_models
-
-Revision ID: fix_tenant_default_model_unique
-Revises: 9d77545f524e
-Create Date: 2026-01-19 15:07:00.000000
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
-# revision identifiers, used by Alembic.
-revision = 'f55813ffe2c8'
-down_revision = 'c3df22613c99'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # First, remove duplicate records keeping only the most recent one per (tenant_id, model_type)
-    # This is necessary before adding the unique constraint
-    conn = op.get_bind()
-    
-    # Delete duplicates: keep the record with the latest updated_at for each (tenant_id, model_type)
-    # If updated_at is the same, keep the one with the largest id as tiebreaker
-    if _is_pg(conn):
-        # PostgreSQL: Use DISTINCT ON for efficient deduplication
-        conn.execute(sa.text("""
-            DELETE FROM tenant_default_models
-            WHERE id NOT IN (
-                SELECT DISTINCT ON (tenant_id, model_type) id
-                FROM tenant_default_models
-                ORDER BY tenant_id, model_type, updated_at DESC, id DESC
-            )
-        """))
-    else:
-        # MySQL: Use self-join to find and delete duplicates
-        # Keep the record with latest updated_at (or largest id if updated_at is equal)
-        conn.execute(sa.text("""
-            DELETE t1 FROM tenant_default_models t1
-            INNER JOIN tenant_default_models t2
-            ON t1.tenant_id = t2.tenant_id 
-               AND t1.model_type = t2.model_type 
-               AND (t1.updated_at < t2.updated_at 
-                    OR (t1.updated_at = t2.updated_at AND t1.id < t2.id))
-        """))
-    
-    # Now add the unique constraint
-    with op.batch_alter_table('tenant_default_models', schema=None) as batch_op:
-        batch_op.create_unique_constraint('unique_tenant_default_model_type', ['tenant_id', 'model_type'])
-
-
-def downgrade():
-    with op.batch_alter_table('tenant_default_models', schema=None) as batch_op:
-        batch_op.drop_constraint('unique_tenant_default_model_type', type_='unique')

api/models/model.py

@@ -227,7 +227,7 @@ class App(Base):
         with Session(db.engine) as session:
             if api_provider_ids:
                 existing_api_providers = [
-                    str(api_provider.id)
+                    api_provider.id
                     for api_provider in session.execute(
                         text("SELECT id FROM tool_api_providers WHERE id IN :provider_ids"),
                         {"provider_ids": tuple(api_provider_ids)},

api/models/provider.py

@@ -181,7 +181,6 @@ class TenantDefaultModel(TypeBase):
     __table_args__ = (
         sa.PrimaryKeyConstraint("id", name="tenant_default_model_pkey"),
         sa.Index("tenant_default_model_tenant_id_provider_type_idx", "tenant_id", "provider_name", "model_type"),
-        sa.UniqueConstraint("tenant_id", "model_type", name="unique_tenant_default_model_type"),
     )
 
     id: Mapped[str] = mapped_column(

api/services/account_service.py

@@ -1225,12 +1225,7 @@ class TenantService:
 
     @staticmethod
     def remove_member_from_tenant(tenant: Tenant, account: Account, operator: Account):
-        """Remove member from tenant.
-
-        If the removed member has ``AccountStatus.PENDING`` (invited but never
-        activated) and no remaining workspace memberships, the orphaned account
-        record is deleted as well.
-        """
+        """Remove member from tenant"""
         if operator.id == account.id:
             raise CannotOperateSelfError("Cannot operate self.")
 
@@ -1240,31 +1235,9 @@ class TenantService:
         if not ta:
             raise MemberNotInTenantError("Member not in tenant.")
 
-        # Capture identifiers before any deletions; attribute access on the ORM
-        # object may fail after commit() expires the instance.
-        account_id = account.id
-        account_email = account.email
-
         db.session.delete(ta)
-
-        # Clean up orphaned pending accounts (invited but never activated)
-        should_delete_account = False
-        if account.status == AccountStatus.PENDING:
-            # autoflush flushes ta deletion before this query, so 0 means no remaining joins
-            remaining_joins = db.session.query(TenantAccountJoin).filter_by(account_id=account_id).count()
-            if remaining_joins == 0:
-                db.session.delete(account)
-                should_delete_account = True
-
         db.session.commit()
 
-        if should_delete_account:
-            logger.info(
-                "Deleted orphaned pending account: account_id=%s, email=%s",
-                account_id,
-                account_email,
-            )
-
         if dify_config.BILLING_ENABLED:
             BillingService.clean_billing_info_cache(tenant.id)
 
@@ -1272,13 +1245,13 @@ class TenantService:
         from services.enterprise.account_deletion_sync import sync_workspace_member_removal
 
         sync_success = sync_workspace_member_removal(
-            workspace_id=tenant.id, member_id=account_id, source="workspace_member_removed"
+            workspace_id=tenant.id, member_id=account.id, source="workspace_member_removed"
         )
         if not sync_success:
             logger.warning(
                 "Enterprise workspace member removal sync failed: workspace_id=%s, member_id=%s",
                 tenant.id,
-                account_id,
+                account.id,
             )
 
     @staticmethod

api/services/human_input_service.py

@@ -22,7 +22,7 @@ from libs.exception import BaseHTTPException
 from models.human_input import RecipientType
 from models.model import App, AppMode
 from repositories.factory import DifyAPIRepositoryFactory
-from tasks.app_generate.workflow_execute_task import resume_app_execution
+from tasks.app_generate.workflow_execute_task import WORKFLOW_BASED_APP_EXECUTION_QUEUE, resume_app_execution
 
 
 class Form:
@@ -230,6 +230,7 @@ class HumanInputService:
             try:
                 resume_app_execution.apply_async(
                     kwargs={"payload": payload},
+                    queue=WORKFLOW_BASED_APP_EXECUTION_QUEUE,
                 )
             except Exception:  # pragma: no cover
                 logger.exception("Failed to enqueue resume task for workflow run %s", workflow_run_id)

api/services/rag_pipeline/rag_pipeline.py

@@ -1329,24 +1329,10 @@ class RagPipelineService:
         """
         Get datasource plugins
         """
-        dataset: Dataset | None = (
-            db.session.query(Dataset)
-            .where(
-                Dataset.id == dataset_id,
-                Dataset.tenant_id == tenant_id,
-            )
-            .first()
-        )
+        dataset: Dataset | None = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
         if not dataset:
             raise ValueError("Dataset not found")
-        pipeline: Pipeline | None = (
-            db.session.query(Pipeline)
-            .where(
-                Pipeline.id == dataset.pipeline_id,
-                Pipeline.tenant_id == tenant_id,
-            )
-            .first()
-        )
+        pipeline: Pipeline | None = db.session.query(Pipeline).where(Pipeline.id == dataset.pipeline_id).first()
         if not pipeline:
             raise ValueError("Pipeline not found")
 
@@ -1427,24 +1413,10 @@ class RagPipelineService:
         """
         Get pipeline
         """
-        dataset: Dataset | None = (
-            db.session.query(Dataset)
-            .where(
-                Dataset.id == dataset_id,
-                Dataset.tenant_id == tenant_id,
-            )
-            .first()
-        )
+        dataset: Dataset | None = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
         if not dataset:
             raise ValueError("Dataset not found")
-        pipeline: Pipeline | None = (
-            db.session.query(Pipeline)
-            .where(
-                Pipeline.id == dataset.pipeline_id,
-                Pipeline.tenant_id == tenant_id,
-            )
-            .first()
-        )
+        pipeline: Pipeline | None = db.session.query(Pipeline).where(Pipeline.id == dataset.pipeline_id).first()
         if not pipeline:
             raise ValueError("Pipeline not found")
         return pipeline

api/services/workflow_event_snapshot_service.py

@@ -129,15 +129,15 @@ def build_workflow_event_stream(
                         return
 
                     try:
-                        event = buffer_state.queue.get(timeout=1)
+                        event = buffer_state.queue.get(timeout=0.1)
                     except queue.Empty:
                         current_time = time.time()
                         if current_time - last_msg_time > idle_timeout:
                             logger.debug(
-                                "Idle timeout of %s seconds reached, closing workflow event stream.",
+                                "No workflow events received for %s seconds, keeping stream open",
                                 idle_timeout,
                             )
-                            return
+                            last_msg_time = current_time
                         if current_time - last_ping_time >= ping_interval:
                             yield StreamEvent.PING.value
                             last_ping_time = current_time
@@ -405,7 +405,7 @@ def _start_buffering(subscription) -> BufferState:
         dropped_count = 0
         try:
             while not buffer_state.stop_event.is_set():
-                msg = subscription.receive(timeout=1)
+                msg = subscription.receive(timeout=0.1)
                 if msg is None:
                     continue
                 event = _parse_event_message(msg)

api/services/workspace_service.py

@@ -1,7 +1,6 @@
 from flask_login import current_user
 
 from configs import dify_config
-from enums.cloud_plan import CloudPlan
 from extensions.ext_database import db
 from models.account import Tenant, TenantAccountJoin, TenantAccountRole
 from services.account_service import TenantService
@@ -54,12 +53,7 @@ class WorkspaceService:
             from services.credit_pool_service import CreditPoolService
 
             paid_pool = CreditPoolService.get_pool(tenant_id=tenant.id, pool_type="paid")
-            # if the tenant is not on the sandbox plan and the paid pool is not full, use the paid pool
-            if (
-                feature.billing.subscription.plan != CloudPlan.SANDBOX
-                and paid_pool is not None
-                and (paid_pool.quota_limit == -1 or paid_pool.quota_limit > paid_pool.quota_used)
-            ):
+            if paid_pool:
                 tenant_info["trial_credits"] = paid_pool.quota_limit
                 tenant_info["trial_credits_used"] = paid_pool.quota_used
             else:

api/tasks/clean_notion_document_task.py

@@ -23,40 +23,40 @@ def clean_notion_document_task(document_ids: list[str], dataset_id: str):
     """
     logger.info(click.style(f"Start clean document when import form notion document deleted: {dataset_id}", fg="green"))
     start_at = time.perf_counter()
-    total_index_node_ids = []
 
     with session_factory.create_session() as session:
-        dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
+        try:
+            dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
 
-        if not dataset:
-            raise Exception("Document has no dataset")
-        index_type = dataset.doc_form
-        index_processor = IndexProcessorFactory(index_type).init_index_processor()
+            if not dataset:
+                raise Exception("Document has no dataset")
+            index_type = dataset.doc_form
+            index_processor = IndexProcessorFactory(index_type).init_index_processor()
 
-        document_delete_stmt = delete(Document).where(Document.id.in_(document_ids))
-        session.execute(document_delete_stmt)
+            document_delete_stmt = delete(Document).where(Document.id.in_(document_ids))
+            session.execute(document_delete_stmt)
 
-        for document_id in document_ids:
-            segments = session.scalars(select(DocumentSegment).where(DocumentSegment.document_id == document_id)).all()
-            total_index_node_ids.extend([segment.index_node_id for segment in segments])
+            for document_id in document_ids:
+                segments = session.scalars(
+                    select(DocumentSegment).where(DocumentSegment.document_id == document_id)
+                ).all()
+                index_node_ids = [segment.index_node_id for segment in segments]
 
-    with session_factory.create_session() as session:
-        dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
-        if dataset:
-            index_processor.clean(
-                dataset, total_index_node_ids, with_keywords=True, delete_child_chunks=True, delete_summaries=True
+                index_processor.clean(
+                    dataset, index_node_ids, with_keywords=True, delete_child_chunks=True, delete_summaries=True
+                )
+                segment_ids = [segment.id for segment in segments]
+                segment_delete_stmt = delete(DocumentSegment).where(DocumentSegment.id.in_(segment_ids))
+                session.execute(segment_delete_stmt)
+            session.commit()
+            end_at = time.perf_counter()
+            logger.info(
+                click.style(
+                    "Clean document when import form notion document deleted end :: {} latency: {}".format(
+                        dataset_id, end_at - start_at
+                    ),
+                    fg="green",
+                )
             )
-
-    with session_factory.create_session() as session, session.begin():
-        segment_delete_stmt = delete(DocumentSegment).where(DocumentSegment.document_id.in_(document_ids))
-        session.execute(segment_delete_stmt)
-
-    end_at = time.perf_counter()
-    logger.info(
-        click.style(
-            "Clean document when import form notion document deleted end :: {} latency: {}".format(
-                dataset_id, end_at - start_at
-            ),
-            fg="green",
-        )
-    )
+        except Exception:
+            logger.exception("Cleaned document when import form notion document deleted  failed")

api/tasks/document_indexing_sync_task.py

@@ -27,7 +27,6 @@ def document_indexing_sync_task(dataset_id: str, document_id: str):
     """
     logger.info(click.style(f"Start sync document: {document_id}", fg="green"))
     start_at = time.perf_counter()
-    tenant_id = None
 
     with session_factory.create_session() as session, session.begin():
         document = session.query(Document).where(Document.id == document_id, Document.dataset_id == dataset_id).first()
@@ -36,120 +35,94 @@ def document_indexing_sync_task(dataset_id: str, document_id: str):
             logger.info(click.style(f"Document not found: {document_id}", fg="red"))
             return
 
-        if document.indexing_status == "parsing":
-            logger.info(click.style(f"Document {document_id} is already being processed, skipping", fg="yellow"))
-            return
-
-        dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
-        if not dataset:
-            raise Exception("Dataset not found")
-
         data_source_info = document.data_source_info_dict
-        if document.data_source_type != "notion_import":
-            logger.info(click.style(f"Document {document_id} is not a notion_import, skipping", fg="yellow"))
-            return
+        if document.data_source_type == "notion_import":
+            if (
+                not data_source_info
+                or "notion_page_id" not in data_source_info
+                or "notion_workspace_id" not in data_source_info
+            ):
+                raise ValueError("no notion page found")
+            workspace_id = data_source_info["notion_workspace_id"]
+            page_id = data_source_info["notion_page_id"]
+            page_type = data_source_info["type"]
+            page_edited_time = data_source_info["last_edited_time"]
+            credential_id = data_source_info.get("credential_id")
 
-        if (
-            not data_source_info
-            or "notion_page_id" not in data_source_info
-            or "notion_workspace_id" not in data_source_info
-        ):
-            raise ValueError("no notion page found")
+            # Get credentials from datasource provider
+            datasource_provider_service = DatasourceProviderService()
+            credential = datasource_provider_service.get_datasource_credentials(
+                tenant_id=document.tenant_id,
+                credential_id=credential_id,
+                provider="notion_datasource",
+                plugin_id="langgenius/notion_datasource",
+            )
 
-        workspace_id = data_source_info["notion_workspace_id"]
-        page_id = data_source_info["notion_page_id"]
-        page_type = data_source_info["type"]
-        page_edited_time = data_source_info["last_edited_time"]
-        credential_id = data_source_info.get("credential_id")
-        tenant_id = document.tenant_id
-        index_type = document.doc_form
-
-        segments = session.scalars(select(DocumentSegment).where(DocumentSegment.document_id == document_id)).all()
-        index_node_ids = [segment.index_node_id for segment in segments]
-
-    # Get credentials from datasource provider
-    datasource_provider_service = DatasourceProviderService()
-    credential = datasource_provider_service.get_datasource_credentials(
-        tenant_id=tenant_id,
-        credential_id=credential_id,
-        provider="notion_datasource",
-        plugin_id="langgenius/notion_datasource",
-    )
-
-    if not credential:
-        logger.error(
-            "Datasource credential not found for document %s, tenant_id: %s, credential_id: %s",
-            document_id,
-            tenant_id,
-            credential_id,
-        )
-
-        with session_factory.create_session() as session, session.begin():
-            document = session.query(Document).filter_by(id=document_id).first()
-            if document:
+            if not credential:
+                logger.error(
+                    "Datasource credential not found for document %s, tenant_id: %s, credential_id: %s",
+                    document_id,
+                    document.tenant_id,
+                    credential_id,
+                )
                 document.indexing_status = "error"
                 document.error = "Datasource credential not found. Please reconnect your Notion workspace."
                 document.stopped_at = naive_utc_now()
-        return
+                return
 
-    loader = NotionExtractor(
-        notion_workspace_id=workspace_id,
-        notion_obj_id=page_id,
-        notion_page_type=page_type,
-        notion_access_token=credential.get("integration_secret"),
-        tenant_id=tenant_id,
-    )
+            loader = NotionExtractor(
+                notion_workspace_id=workspace_id,
+                notion_obj_id=page_id,
+                notion_page_type=page_type,
+                notion_access_token=credential.get("integration_secret"),
+                tenant_id=document.tenant_id,
+            )
 
-    last_edited_time = loader.get_notion_last_edited_time()
-    if last_edited_time == page_edited_time:
-        logger.info(click.style(f"Document {document_id} content unchanged, skipping sync", fg="yellow"))
-        return
+            last_edited_time = loader.get_notion_last_edited_time()
 
-    logger.info(click.style(f"Document {document_id} content changed, starting sync", fg="green"))
+            # check the page is updated
+            if last_edited_time != page_edited_time:
+                document.indexing_status = "parsing"
+                document.processing_started_at = naive_utc_now()
 
-    try:
-        index_processor = IndexProcessorFactory(index_type).init_index_processor()
-        with session_factory.create_session() as session:
-            dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
-            if dataset:
-                index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
-        logger.info(click.style(f"Cleaned vector index for document {document_id}", fg="green"))
-    except Exception:
-        logger.exception("Failed to clean vector index for document %s", document_id)
+                # delete all document segment and index
+                try:
+                    dataset = session.query(Dataset).where(Dataset.id == dataset_id).first()
+                    if not dataset:
+                        raise Exception("Dataset not found")
+                    index_type = document.doc_form
+                    index_processor = IndexProcessorFactory(index_type).init_index_processor()
 
-    with session_factory.create_session() as session, session.begin():
-        document = session.query(Document).filter_by(id=document_id).first()
-        if not document:
-            logger.warning(click.style(f"Document {document_id} not found during sync", fg="yellow"))
-            return
+                    segments = session.scalars(
+                        select(DocumentSegment).where(DocumentSegment.document_id == document_id)
+                    ).all()
+                    index_node_ids = [segment.index_node_id for segment in segments]
 
-        data_source_info = document.data_source_info_dict
-        data_source_info["last_edited_time"] = last_edited_time
-        document.data_source_info = data_source_info
+                    # delete from vector index
+                    index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
 
-        document.indexing_status = "parsing"
-        document.processing_started_at = naive_utc_now()
+                    segment_ids = [segment.id for segment in segments]
+                    segment_delete_stmt = delete(DocumentSegment).where(DocumentSegment.id.in_(segment_ids))
+                    session.execute(segment_delete_stmt)
 
-        segment_delete_stmt = delete(DocumentSegment).where(DocumentSegment.document_id == document_id)
-        session.execute(segment_delete_stmt)
+                    end_at = time.perf_counter()
+                    logger.info(
+                        click.style(
+                            "Cleaned document when document update data source or process rule: {} latency: {}".format(
+                                document_id, end_at - start_at
+                            ),
+                            fg="green",
+                        )
+                    )
+                except Exception:
+                    logger.exception("Cleaned document when document update data source or process rule failed")
 
-        logger.info(click.style(f"Deleted segments for document {document_id}", fg="green"))
-
-    try:
-        indexing_runner = IndexingRunner()
-        with session_factory.create_session() as session:
-            document = session.query(Document).filter_by(id=document_id).first()
-            if document:
-                indexing_runner.run([document])
-        end_at = time.perf_counter()
-        logger.info(click.style(f"Sync completed for document {document_id} latency: {end_at - start_at}", fg="green"))
-    except DocumentIsPausedError as ex:
-        logger.info(click.style(str(ex), fg="yellow"))
-    except Exception as e:
-        logger.exception("document_indexing_sync_task failed for document_id: %s", document_id)
-        with session_factory.create_session() as session, session.begin():
-            document = session.query(Document).filter_by(id=document_id).first()
-            if document:
-                document.indexing_status = "error"
-                document.error = str(e)
-                document.stopped_at = naive_utc_now()
+                try:
+                    indexing_runner = IndexingRunner()
+                    indexing_runner.run([document])
+                    end_at = time.perf_counter()
+                    logger.info(click.style(f"update document: {document.id} latency: {end_at - start_at}", fg="green"))
+                except DocumentIsPausedError as ex:
+                    logger.info(click.style(str(ex), fg="yellow"))
+                except Exception:
+                    logger.exception("document_indexing_sync_task failed, document_id: %s", document_id)

api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py

@@ -153,7 +153,8 @@ class TestCleanNotionDocumentTask:
         # Execute cleanup task
         clean_notion_document_task(document_ids, dataset.id)
 
-        # Verify segments are deleted
+        # Verify documents and segments are deleted
+        assert db_session_with_containers.query(Document).filter(Document.id.in_(document_ids)).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment)
             .filter(DocumentSegment.document_id.in_(document_ids))
@@ -161,9 +162,9 @@ class TestCleanNotionDocumentTask:
             == 0
         )
 
-        # Verify index processor was called
+        # Verify index processor was called for each document
         mock_processor = mock_index_processor_factory.return_value.init_index_processor.return_value
-        mock_processor.clean.assert_called_once()
+        assert mock_processor.clean.call_count == len(document_ids)
 
         # This test successfully verifies:
         # 1. Document records are properly deleted from the database
@@ -185,12 +186,12 @@ class TestCleanNotionDocumentTask:
         non_existent_dataset_id = str(uuid.uuid4())
         document_ids = [str(uuid.uuid4()), str(uuid.uuid4())]
 
-        # Execute cleanup task with non-existent dataset - expect exception
-        with pytest.raises(Exception, match="Document has no dataset"):
-            clean_notion_document_task(document_ids, non_existent_dataset_id)
+        # Execute cleanup task with non-existent dataset
+        clean_notion_document_task(document_ids, non_existent_dataset_id)
 
-        # Verify that the index processor factory was not used
-        mock_index_processor_factory.return_value.init_index_processor.assert_not_called()
+        # Verify that the index processor was not called
+        mock_processor = mock_index_processor_factory.return_value.init_index_processor.return_value
+        mock_processor.clean.assert_not_called()
 
     def test_clean_notion_document_task_empty_document_list(
         self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
@@ -228,13 +229,9 @@ class TestCleanNotionDocumentTask:
         # Execute cleanup task with empty document list
         clean_notion_document_task([], dataset.id)
 
-        # Verify that the index processor was called once with empty node list
+        # Verify that the index processor was not called
         mock_processor = mock_index_processor_factory.return_value.init_index_processor.return_value
-        assert mock_processor.clean.call_count == 1
-        args, kwargs = mock_processor.clean.call_args
-        # args: (dataset, total_index_node_ids)
-        assert isinstance(args[0], Dataset)
-        assert args[1] == []
+        mock_processor.clean.assert_not_called()
 
     def test_clean_notion_document_task_with_different_index_types(
         self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
@@ -318,7 +315,8 @@ class TestCleanNotionDocumentTask:
             # Note: This test successfully verifies cleanup with different document types.
             # The task properly handles various index types and document configurations.
 
-            # Verify segments are deleted
+            # Verify documents and segments are deleted
+            assert db_session_with_containers.query(Document).filter(Document.id == document.id).count() == 0
             assert (
                 db_session_with_containers.query(DocumentSegment)
                 .filter(DocumentSegment.document_id == document.id)
@@ -406,7 +404,8 @@ class TestCleanNotionDocumentTask:
         # Execute cleanup task
         clean_notion_document_task([document.id], dataset.id)
 
-        # Verify segments are deleted
+        # Verify documents and segments are deleted
+        assert db_session_with_containers.query(Document).filter(Document.id == document.id).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment).filter(DocumentSegment.document_id == document.id).count()
             == 0
@@ -509,7 +508,8 @@ class TestCleanNotionDocumentTask:
 
         clean_notion_document_task(documents_to_clean, dataset.id)
 
-        # Verify only specified documents' segments are deleted
+        # Verify only specified documents and segments are deleted
+        assert db_session_with_containers.query(Document).filter(Document.id.in_(documents_to_clean)).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment)
             .filter(DocumentSegment.document_id.in_(documents_to_clean))
@@ -697,12 +697,11 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Mock index processor to raise an exception
-        mock_index_processor = mock_index_processor_factory.return_value.init_index_processor.return_value
+        mock_index_processor = mock_index_processor_factory.init_index_processor.return_value
         mock_index_processor.clean.side_effect = Exception("Index processor error")
 
-        # Execute cleanup task - current implementation propagates the exception
-        with pytest.raises(Exception, match="Index processor error"):
-            clean_notion_document_task([document.id], dataset.id)
+        # Execute cleanup task - it should handle the exception gracefully
+        clean_notion_document_task([document.id], dataset.id)
 
         # Note: This test demonstrates the task's error handling capability.
         # Even with external service errors, the database operations complete successfully.
@@ -804,7 +803,8 @@ class TestCleanNotionDocumentTask:
         all_document_ids = [doc.id for doc in documents]
         clean_notion_document_task(all_document_ids, dataset.id)
 
-        # Verify all segments are deleted
+        # Verify all documents and segments are deleted
+        assert db_session_with_containers.query(Document).filter(Document.dataset_id == dataset.id).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment).filter(DocumentSegment.dataset_id == dataset.id).count()
             == 0
@@ -914,7 +914,8 @@ class TestCleanNotionDocumentTask:
 
         clean_notion_document_task([target_document.id], target_dataset.id)
 
-        # Verify only documents' segments from target dataset are deleted
+        # Verify only documents from target dataset are deleted
+        assert db_session_with_containers.query(Document).filter(Document.id == target_document.id).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment)
             .filter(DocumentSegment.document_id == target_document.id)
@@ -1029,7 +1030,8 @@ class TestCleanNotionDocumentTask:
         all_document_ids = [doc.id for doc in documents]
         clean_notion_document_task(all_document_ids, dataset.id)
 
-        # Verify all segments are deleted regardless of status
+        # Verify all documents and segments are deleted regardless of status
+        assert db_session_with_containers.query(Document).filter(Document.dataset_id == dataset.id).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment).filter(DocumentSegment.dataset_id == dataset.id).count()
             == 0
@@ -1140,7 +1142,8 @@ class TestCleanNotionDocumentTask:
         # Execute cleanup task
         clean_notion_document_task([document.id], dataset.id)
 
-        # Verify segments are deleted
+        # Verify documents and segments are deleted
+        assert db_session_with_containers.query(Document).filter(Document.id == document.id).count() == 0
         assert (
             db_session_with_containers.query(DocumentSegment).filter(DocumentSegment.document_id == document.id).count()
             == 0

api/tests/unit_tests/conftest.py

@@ -51,7 +51,7 @@ def _patch_redis_clients_on_loaded_modules():
             continue
         if hasattr(module, "redis_client"):
             module.redis_client = redis_mock
-        if hasattr(module, "_pubsub_redis_client"):
+        if hasattr(module, "pubsub_redis_client"):
             module.pubsub_redis_client = redis_mock
 
 
@@ -72,7 +72,7 @@ def _patch_redis_clients():
 
     with (
         patch.object(ext_redis, "redis_client", redis_mock),
-        patch.object(ext_redis, "_pubsub_redis_client", redis_mock),
+        patch.object(ext_redis, "pubsub_redis_client", redis_mock),
     ):
         _patch_redis_clients_on_loaded_modules()
         yield

api/tests/unit_tests/controllers/console/app/test_conversation_read_timestamp.py

@@ -1,34 +0,0 @@
-from datetime import datetime
-from types import SimpleNamespace
-from unittest.mock import MagicMock, patch
-
-from controllers.console.app.conversation import _get_conversation
-
-
-def test_get_conversation_mark_read_keeps_updated_at_unchanged():
-    app_model = SimpleNamespace(id="app-id")
-    account = SimpleNamespace(id="account-id")
-    conversation = MagicMock()
-    conversation.id = "conversation-id"
-
-    with (
-        patch("controllers.console.app.conversation.current_account_with_tenant", return_value=(account, None)),
-        patch("controllers.console.app.conversation.naive_utc_now", return_value=datetime(2026, 2, 9, 0, 0, 0)),
-        patch("controllers.console.app.conversation.db.session") as mock_session,
-    ):
-        mock_session.query.return_value.where.return_value.first.return_value = conversation
-
-        _get_conversation(app_model, "conversation-id")
-
-        statement = mock_session.execute.call_args[0][0]
-        compiled = statement.compile()
-        sql_text = str(compiled).lower()
-        compact_sql_text = sql_text.replace(" ", "")
-        params = compiled.params
-
-        assert "updated_at=current_timestamp" not in compact_sql_text
-        assert "updated_at=conversations.updated_at" in compact_sql_text
-        assert "read_at=:read_at" in compact_sql_text
-        assert "read_account_id=:read_account_id" in compact_sql_text
-        assert params["read_at"] == datetime(2026, 2, 9, 0, 0, 0)
-        assert params["read_account_id"] == "account-id"

api/tests/unit_tests/controllers/service_api/dataset/test_rag_pipeline_file_upload_serialization.py

@@ -1,62 +0,0 @@
-"""
-Unit tests for Service API knowledge pipeline file-upload serialization.
-"""
-
-import importlib.util
-from datetime import UTC, datetime
-from pathlib import Path
-
-
-class FakeUploadFile:
-    id: str
-    name: str
-    size: int
-    extension: str
-    mime_type: str
-    created_by: str
-    created_at: datetime | None
-
-
-def _load_serialize_upload_file():
-    api_dir = Path(__file__).resolve().parents[5]
-    serializers_path = api_dir / "controllers" / "service_api" / "dataset" / "rag_pipeline" / "serializers.py"
-
-    spec = importlib.util.spec_from_file_location("rag_pipeline_serializers", serializers_path)
-    assert spec
-    assert spec.loader
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)  # type: ignore[attr-defined]
-    return module.serialize_upload_file
-
-
-def test_file_upload_created_at_is_isoformat_string():
-    serialize_upload_file = _load_serialize_upload_file()
-
-    created_at = datetime(2026, 2, 8, 12, 0, 0, tzinfo=UTC)
-    upload_file = FakeUploadFile()
-    upload_file.id = "file-1"
-    upload_file.name = "test.pdf"
-    upload_file.size = 123
-    upload_file.extension = "pdf"
-    upload_file.mime_type = "application/pdf"
-    upload_file.created_by = "account-1"
-    upload_file.created_at = created_at
-
-    result = serialize_upload_file(upload_file)
-    assert result["created_at"] == created_at.isoformat()
-
-
-def test_file_upload_created_at_none_serializes_to_null():
-    serialize_upload_file = _load_serialize_upload_file()
-
-    upload_file = FakeUploadFile()
-    upload_file.id = "file-1"
-    upload_file.name = "test.pdf"
-    upload_file.size = 123
-    upload_file.extension = "pdf"
-    upload_file.mime_type = "application/pdf"
-    upload_file.created_by = "account-1"
-    upload_file.created_at = None
-
-    result = serialize_upload_file(upload_file)
-    assert result["created_at"] is None

api/tests/unit_tests/controllers/service_api/dataset/test_rag_pipeline_route_registration.py

@@ -1,54 +0,0 @@
-"""
-Unit tests for Service API knowledge pipeline route registration.
-"""
-
-import ast
-from pathlib import Path
-
-
-def test_rag_pipeline_routes_registered():
-    api_dir = Path(__file__).resolve().parents[5]
-
-    service_api_init = api_dir / "controllers" / "service_api" / "__init__.py"
-    rag_pipeline_workflow = (
-        api_dir / "controllers" / "service_api" / "dataset" / "rag_pipeline" / "rag_pipeline_workflow.py"
-    )
-
-    assert service_api_init.exists()
-    assert rag_pipeline_workflow.exists()
-
-    init_tree = ast.parse(service_api_init.read_text(encoding="utf-8"))
-    import_found = False
-    for node in ast.walk(init_tree):
-        if not isinstance(node, ast.ImportFrom):
-            continue
-        if node.module != "dataset.rag_pipeline" or node.level != 1:
-            continue
-        if any(alias.name == "rag_pipeline_workflow" for alias in node.names):
-            import_found = True
-            break
-    assert import_found, "from .dataset.rag_pipeline import rag_pipeline_workflow not found in service_api/__init__.py"
-
-    workflow_tree = ast.parse(rag_pipeline_workflow.read_text(encoding="utf-8"))
-    route_paths: set[str] = set()
-
-    for node in ast.walk(workflow_tree):
-        if not isinstance(node, ast.ClassDef):
-            continue
-        for decorator in node.decorator_list:
-            if not isinstance(decorator, ast.Call):
-                continue
-            if not isinstance(decorator.func, ast.Attribute):
-                continue
-            if decorator.func.attr != "route":
-                continue
-            if not decorator.args:
-                continue
-            first_arg = decorator.args[0]
-            if isinstance(first_arg, ast.Constant) and isinstance(first_arg.value, str):
-                route_paths.add(first_arg.value)
-
-    assert "/datasets/<uuid:dataset_id>/pipeline/datasource-plugins" in route_paths
-    assert "/datasets/<uuid:dataset_id>/pipeline/datasource/nodes/<string:node_id>/run" in route_paths
-    assert "/datasets/<uuid:dataset_id>/pipeline/run" in route_paths
-    assert "/datasets/pipeline/file-upload" in route_paths

api/tests/unit_tests/core/app/task_pipeline/test_message_cycle_manager_optimization.py

@@ -25,19 +25,15 @@ class TestMessageCycleManagerOptimization:
         task_state = Mock()
         return MessageCycleManager(application_generate_entity=mock_application_generate_entity, task_state=task_state)
 
-    def test_get_message_event_type_with_assistant_file(self, message_cycle_manager):
-        """Test get_message_event_type returns MESSAGE_FILE when message has assistant-generated files.
-
-        This ensures that AI-generated images (belongs_to='assistant') trigger the MESSAGE_FILE event,
-        allowing the frontend to properly display generated image files with url field.
-        """
+    def test_get_message_event_type_with_message_file(self, message_cycle_manager):
+        """Test get_message_event_type returns MESSAGE_FILE when message has files."""
         with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
             # Setup mock session and message file
             mock_session = Mock()
             mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
 
             mock_message_file = Mock()
-            mock_message_file.belongs_to = "assistant"
+            # Current implementation uses session.scalar(select(...))
             mock_session.scalar.return_value = mock_message_file
 
             # Execute
@@ -48,31 +44,6 @@ class TestMessageCycleManagerOptimization:
             assert result == StreamEvent.MESSAGE_FILE
             mock_session.scalar.assert_called_once()
 
-    def test_get_message_event_type_with_user_file(self, message_cycle_manager):
-        """Test get_message_event_type returns MESSAGE when message only has user-uploaded files.
-
-        This is a regression test for the issue where user-uploaded images (belongs_to='user')
-        caused the LLM text response to be incorrectly tagged with MESSAGE_FILE event,
-        resulting in broken images in the chat UI. The query filters for belongs_to='assistant',
-        so when only user files exist, the database query returns None, resulting in MESSAGE event type.
-        """
-        with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
-            # Setup mock session and message file
-            mock_session = Mock()
-            mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-            # When querying for assistant files with only user files present, return None
-            # (simulates database query with belongs_to='assistant' filter returning no results)
-            mock_session.scalar.return_value = None
-
-            # Execute
-            with current_app.app_context():
-                result = message_cycle_manager.get_message_event_type("test-message-id")
-
-            # Assert
-            assert result == StreamEvent.MESSAGE
-            mock_session.scalar.assert_called_once()
-
     def test_get_message_event_type_without_message_file(self, message_cycle_manager):
         """Test get_message_event_type returns MESSAGE when message has no files."""
         with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
@@ -98,7 +69,7 @@ class TestMessageCycleManagerOptimization:
             mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
 
             mock_message_file = Mock()
-            mock_message_file.belongs_to = "assistant"
+            # Current implementation uses session.scalar(select(...))
             mock_session.scalar.return_value = mock_message_file
 
             # Execute: compute event type once, then pass to message_to_stream_response

api/tests/unit_tests/core/tools/test_base_tool.py

@@ -1,211 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Generator
-from dataclasses import dataclass
-from typing import Any, cast
-
-from core.app.entities.app_invoke_entities import InvokeFrom
-from core.tools.__base.tool import Tool
-from core.tools.__base.tool_runtime import ToolRuntime
-from core.tools.entities.common_entities import I18nObject
-from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage, ToolProviderType
-
-
-class DummyCastType:
-    def cast_value(self, value: Any) -> str:
-        return f"cast:{value}"
-
-
-@dataclass
-class DummyParameter:
-    name: str
-    type: DummyCastType
-    form: str = "llm"
-    required: bool = False
-    default: Any = None
-    options: list[Any] | None = None
-    llm_description: str | None = None
-
-
-class DummyTool(Tool):
-    def __init__(self, entity: ToolEntity, runtime: ToolRuntime):
-        super().__init__(entity=entity, runtime=runtime)
-        self.result: ToolInvokeMessage | list[ToolInvokeMessage] | Generator[ToolInvokeMessage, None, None] = (
-            self.create_text_message("default")
-        )
-        self.runtime_parameter_overrides: list[Any] | None = None
-        self.last_invocation: dict[str, Any] | None = None
-
-    def tool_provider_type(self) -> ToolProviderType:
-        return ToolProviderType.BUILT_IN
-
-    def _invoke(
-        self,
-        user_id: str,
-        tool_parameters: dict[str, Any],
-        conversation_id: str | None = None,
-        app_id: str | None = None,
-        message_id: str | None = None,
-    ) -> ToolInvokeMessage | list[ToolInvokeMessage] | Generator[ToolInvokeMessage, None, None]:
-        self.last_invocation = {
-            "user_id": user_id,
-            "tool_parameters": tool_parameters,
-            "conversation_id": conversation_id,
-            "app_id": app_id,
-            "message_id": message_id,
-        }
-        return self.result
-
-    def get_runtime_parameters(
-        self,
-        conversation_id: str | None = None,
-        app_id: str | None = None,
-        message_id: str | None = None,
-    ):
-        if self.runtime_parameter_overrides is not None:
-            return self.runtime_parameter_overrides
-        return super().get_runtime_parameters(
-            conversation_id=conversation_id,
-            app_id=app_id,
-            message_id=message_id,
-        )
-
-
-def _build_tool(runtime: ToolRuntime | None = None) -> DummyTool:
-    entity = ToolEntity(
-        identity=ToolIdentity(author="test", name="dummy", label=I18nObject(en_US="dummy"), provider="test"),
-        parameters=[],
-        description=None,
-        has_runtime_parameters=False,
-    )
-    runtime = runtime or ToolRuntime(tenant_id="tenant-1", invoke_from=InvokeFrom.DEBUGGER, runtime_parameters={})
-    return DummyTool(entity=entity, runtime=runtime)
-
-
-def test_invoke_supports_single_message_and_parameter_casting():
-    runtime = ToolRuntime(
-        tenant_id="tenant-1",
-        invoke_from=InvokeFrom.DEBUGGER,
-        runtime_parameters={"from_runtime": "runtime-value"},
-    )
-    tool = _build_tool(runtime)
-    tool.entity.parameters = cast(
-        Any,
-        [
-            DummyParameter(name="unused", type=DummyCastType()),
-            DummyParameter(name="age", type=DummyCastType()),
-        ],
-    )
-    tool.result = tool.create_text_message("ok")
-
-    messages = list(
-        tool.invoke(
-            user_id="user-1",
-            tool_parameters={"age": "18", "raw": "keep"},
-            conversation_id="conv-1",
-            app_id="app-1",
-            message_id="msg-1",
-        )
-    )
-
-    assert len(messages) == 1
-    assert messages[0].message.text == "ok"
-    assert tool.last_invocation == {
-        "user_id": "user-1",
-        "tool_parameters": {"age": "cast:18", "raw": "keep", "from_runtime": "runtime-value"},
-        "conversation_id": "conv-1",
-        "app_id": "app-1",
-        "message_id": "msg-1",
-    }
-
-
-def test_invoke_supports_list_and_generator_results():
-    tool = _build_tool()
-    tool.result = [tool.create_text_message("a"), tool.create_text_message("b")]
-    list_messages = list(tool.invoke(user_id="user-1", tool_parameters={}))
-    assert [msg.message.text for msg in list_messages] == ["a", "b"]
-
-    def _message_generator() -> Generator[ToolInvokeMessage, None, None]:
-        yield tool.create_text_message("g1")
-        yield tool.create_text_message("g2")
-
-    tool.result = _message_generator()
-    generated_messages = list(tool.invoke(user_id="user-2", tool_parameters={}))
-    assert [msg.message.text for msg in generated_messages] == ["g1", "g2"]
-
-
-def test_fork_tool_runtime_returns_new_tool_with_copied_entity():
-    tool = _build_tool()
-    new_runtime = ToolRuntime(tenant_id="tenant-2", invoke_from=InvokeFrom.EXPLORE, runtime_parameters={})
-
-    forked = tool.fork_tool_runtime(new_runtime)
-
-    assert isinstance(forked, DummyTool)
-    assert forked is not tool
-    assert forked.runtime == new_runtime
-    assert forked.entity == tool.entity
-    assert forked.entity is not tool.entity
-
-
-def test_get_runtime_parameters_and_merge_runtime_parameters():
-    tool = _build_tool()
-    original = DummyParameter(name="temperature", type=DummyCastType(), form="schema", required=True, default="0.7")
-    tool.entity.parameters = cast(Any, [original])
-
-    default_runtime_parameters = tool.get_runtime_parameters()
-    assert default_runtime_parameters == [original]
-
-    override = DummyParameter(name="temperature", type=DummyCastType(), form="llm", required=False, default="0.5")
-    appended = DummyParameter(name="new_param", type=DummyCastType(), form="form", required=False, default="x")
-    tool.runtime_parameter_overrides = [override, appended]
-
-    merged = tool.get_merged_runtime_parameters()
-    assert len(merged) == 2
-    assert merged[0].name == "temperature"
-    assert merged[0].form == "llm"
-    assert merged[0].required is False
-    assert merged[0].default == "0.5"
-    assert merged[1].name == "new_param"
-
-
-def test_message_factory_helpers():
-    tool = _build_tool()
-
-    image_message = tool.create_image_message("https://example.com/image.png")
-    assert image_message.type == ToolInvokeMessage.MessageType.IMAGE
-    assert image_message.message.text == "https://example.com/image.png"
-
-    file_obj = object()
-    file_message = tool.create_file_message(file_obj)  # type: ignore[arg-type]
-    assert file_message.type == ToolInvokeMessage.MessageType.FILE
-    assert file_message.message.file_marker == "file_marker"
-    assert file_message.meta == {"file": file_obj}
-
-    link_message = tool.create_link_message("https://example.com")
-    assert link_message.type == ToolInvokeMessage.MessageType.LINK
-    assert link_message.message.text == "https://example.com"
-
-    text_message = tool.create_text_message("hello")
-    assert text_message.type == ToolInvokeMessage.MessageType.TEXT
-    assert text_message.message.text == "hello"
-
-    blob_message = tool.create_blob_message(b"blob", meta={"source": "unit-test"})
-    assert blob_message.type == ToolInvokeMessage.MessageType.BLOB
-    assert blob_message.message.blob == b"blob"
-    assert blob_message.meta == {"source": "unit-test"}
-
-    json_message = tool.create_json_message({"k": "v"}, suppress_output=True)
-    assert json_message.type == ToolInvokeMessage.MessageType.JSON
-    assert json_message.message.json_object == {"k": "v"}
-    assert json_message.message.suppress_output is True
-
-    variable_message = tool.create_variable_message("answer", 42, stream=False)
-    assert variable_message.type == ToolInvokeMessage.MessageType.VARIABLE
-    assert variable_message.message.variable_name == "answer"
-    assert variable_message.message.variable_value == 42
-    assert variable_message.message.stream is False
-
-
-def test_base_abstract_invoke_placeholder_returns_none():
-    tool = _build_tool()
-    assert Tool._invoke(tool, user_id="u", tool_parameters={}) is None

api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py

@@ -255,32 +255,6 @@ def test_create_variable_message():
         assert message.message.stream is False
 
 
-def test_create_file_message_should_include_file_marker():
-    entity = ToolEntity(
-        identity=ToolIdentity(author="test", name="test tool", label=I18nObject(en_US="test tool"), provider="test"),
-        parameters=[],
-        description=None,
-        has_runtime_parameters=False,
-    )
-    runtime = ToolRuntime(tenant_id="test_tool", invoke_from=InvokeFrom.EXPLORE)
-    tool = WorkflowTool(
-        workflow_app_id="",
-        workflow_as_tool_id="",
-        version="1",
-        workflow_entities={},
-        workflow_call_depth=1,
-        entity=entity,
-        runtime=runtime,
-    )
-
-    file_obj = object()
-    message = tool.create_file_message(file_obj)  # type: ignore[arg-type]
-
-    assert message.type == ToolInvokeMessage.MessageType.FILE
-    assert message.message.file_marker == "file_marker"
-    assert message.meta == {"file": file_obj}
-
-
 def test_resolve_user_from_database_falls_back_to_end_user(monkeypatch: pytest.MonkeyPatch):
     """Ensure worker context can resolve EndUser when Account is missing."""
 

api/tests/unit_tests/factories/test_variable_factory.py

@@ -4,7 +4,7 @@ from typing import Any
 from uuid import uuid4
 
 import pytest
-from hypothesis import HealthCheck, given, settings
+from hypothesis import given, settings
 from hypothesis import strategies as st
 
 from core.file import File, FileTransferMethod, FileType
@@ -493,7 +493,7 @@ def _scalar_value() -> st.SearchStrategy[int | float | str | File | None]:
     )
 
 
-@settings(max_examples=30, suppress_health_check=[HealthCheck.too_slow, HealthCheck.filter_too_much], deadline=None)
+@settings(max_examples=50)
 @given(_scalar_value())
 def test_build_segment_and_extract_values_for_scalar_types(value):
     seg = variable_factory.build_segment(value)
@@ -504,7 +504,7 @@ def test_build_segment_and_extract_values_for_scalar_types(value):
         assert seg.value == value
 
 
-@settings(max_examples=30, suppress_health_check=[HealthCheck.too_slow, HealthCheck.filter_too_much], deadline=None)
+@settings(max_examples=50)
 @given(values=st.lists(_scalar_value(), max_size=20))
 def test_build_segment_and_extract_values_for_array_types(values):
     seg = variable_factory.build_segment(values)

api/tests/unit_tests/libs/broadcast_channel/redis/test_channel_unit_tests.py

@@ -198,15 +198,6 @@ class SubscriptionTestCase:
     description: str = ""
 
 
-class FakeRedisClient:
-    """Minimal fake Redis client for unit tests."""
-
-    def __init__(self) -> None:
-        self.publish = MagicMock()
-        self.spublish = MagicMock()
-        self.pubsub = MagicMock(return_value=MagicMock())
-
-
 class TestRedisSubscription:
     """Test cases for the _RedisSubscription class."""
 
@@ -628,13 +619,10 @@ class TestRedisSubscription:
 class TestRedisShardedSubscription:
     """Test cases for the _RedisShardedSubscription class."""
 
-    @pytest.fixture(autouse=True)
-    def patch_sharded_redis_type(self, monkeypatch):
-        monkeypatch.setattr("libs.broadcast_channel.redis.sharded_channel.Redis", FakeRedisClient)
-
     @pytest.fixture
-    def mock_redis_client(self) -> FakeRedisClient:
-        return FakeRedisClient()
+    def mock_redis_client(self) -> MagicMock:
+        client = MagicMock()
+        return client
 
     @pytest.fixture
     def mock_pubsub(self) -> MagicMock:
@@ -648,7 +636,7 @@ class TestRedisShardedSubscription:
 
     @pytest.fixture
     def sharded_subscription(
-        self, mock_pubsub: MagicMock, mock_redis_client: FakeRedisClient
+        self, mock_pubsub: MagicMock, mock_redis_client: MagicMock
     ) -> Generator[_RedisShardedSubscription, None, None]:
         """Create a _RedisShardedSubscription instance for testing."""
         subscription = _RedisShardedSubscription(
@@ -669,7 +657,7 @@ class TestRedisShardedSubscription:
 
     # ==================== Lifecycle Tests ====================
 
-    def test_sharded_subscription_initialization(self, mock_pubsub: MagicMock, mock_redis_client: FakeRedisClient):
+    def test_sharded_subscription_initialization(self, mock_pubsub: MagicMock, mock_redis_client: MagicMock):
         """Test that sharded subscription is properly initialized."""
         subscription = _RedisShardedSubscription(
             client=mock_redis_client,
@@ -982,7 +970,7 @@ class TestRedisShardedSubscription:
         ],
     )
     def test_sharded_subscription_scenarios(
-        self, test_case: SubscriptionTestCase, mock_pubsub: MagicMock, mock_redis_client: FakeRedisClient
+        self, test_case: SubscriptionTestCase, mock_pubsub: MagicMock, mock_redis_client: MagicMock
     ):
         """Test various sharded subscription scenarios using table-driven approach."""
         subscription = _RedisShardedSubscription(
@@ -1070,7 +1058,7 @@ class TestRedisShardedSubscription:
         # Close should still work
         sharded_subscription.close()  # Should not raise
 
-    def test_channel_name_variations(self, mock_pubsub: MagicMock, mock_redis_client: FakeRedisClient):
+    def test_channel_name_variations(self, mock_pubsub: MagicMock, mock_redis_client: MagicMock):
         """Test various sharded channel name formats."""
         channel_names = [
             "simple",
@@ -1132,13 +1120,10 @@ class TestRedisSubscriptionCommon:
         """Parameterized fixture providing subscription type and class."""
         return request.param
 
-    @pytest.fixture(autouse=True)
-    def patch_sharded_redis_type(self, monkeypatch):
-        monkeypatch.setattr("libs.broadcast_channel.redis.sharded_channel.Redis", FakeRedisClient)
-
     @pytest.fixture
-    def mock_redis_client(self) -> FakeRedisClient:
-        return FakeRedisClient()
+    def mock_redis_client(self) -> MagicMock:
+        client = MagicMock()
+        return client
 
     @pytest.fixture
     def mock_pubsub(self) -> MagicMock:
@@ -1155,7 +1140,7 @@ class TestRedisSubscriptionCommon:
         return pubsub
 
     @pytest.fixture
-    def subscription(self, subscription_params, mock_pubsub: MagicMock, mock_redis_client: FakeRedisClient):
+    def subscription(self, subscription_params, mock_pubsub: MagicMock, mock_redis_client: MagicMock):
         """Create a subscription instance based on parameterized type."""
         subscription_type, subscription_class = subscription_params
         topic_name = f"test-{subscription_type}-topic"

api/tests/unit_tests/services/test_account_service.py

@@ -698,132 +698,6 @@ class TestTenantService:
 
         self._assert_database_operations_called(mock_db_dependencies["db"])
 
-    # ==================== Member Removal Tests ====================
-
-    def test_remove_pending_member_deletes_orphaned_account(self):
-        """Test that removing a pending member with no other workspaces deletes the account."""
-        # Arrange
-        mock_tenant = MagicMock()
-        mock_tenant.id = "tenant-456"
-        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123", role="owner")
-        mock_pending_member = TestAccountAssociatedDataFactory.create_account_mock(
-            account_id="pending-user-789", email="pending@example.com", status=AccountStatus.PENDING
-        )
-
-        mock_ta = TestAccountAssociatedDataFactory.create_tenant_join_mock(
-            tenant_id="tenant-456", account_id="pending-user-789", role="normal"
-        )
-
-        with patch("services.account_service.db") as mock_db:
-            mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
-                tenant_id="tenant-456", account_id="operator-123", role="owner"
-            )
-
-            query_mock_permission = MagicMock()
-            query_mock_permission.filter_by.return_value.first.return_value = mock_operator_join
-
-            query_mock_ta = MagicMock()
-            query_mock_ta.filter_by.return_value.first.return_value = mock_ta
-
-            query_mock_count = MagicMock()
-            query_mock_count.filter_by.return_value.count.return_value = 0
-
-            mock_db.session.query.side_effect = [query_mock_permission, query_mock_ta, query_mock_count]
-
-            with patch("services.enterprise.account_deletion_sync.sync_workspace_member_removal") as mock_sync:
-                mock_sync.return_value = True
-
-                # Act
-                TenantService.remove_member_from_tenant(mock_tenant, mock_pending_member, mock_operator)
-
-                # Assert: enterprise sync still receives the correct member ID
-                mock_sync.assert_called_once_with(
-                    workspace_id="tenant-456",
-                    member_id="pending-user-789",
-                    source="workspace_member_removed",
-                )
-
-            # Assert: both join record and account should be deleted
-            mock_db.session.delete.assert_any_call(mock_ta)
-            mock_db.session.delete.assert_any_call(mock_pending_member)
-            assert mock_db.session.delete.call_count == 2
-
-    def test_remove_pending_member_keeps_account_with_other_workspaces(self):
-        """Test that removing a pending member who belongs to other workspaces preserves the account."""
-        # Arrange
-        mock_tenant = MagicMock()
-        mock_tenant.id = "tenant-456"
-        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123", role="owner")
-        mock_pending_member = TestAccountAssociatedDataFactory.create_account_mock(
-            account_id="pending-user-789", email="pending@example.com", status=AccountStatus.PENDING
-        )
-
-        mock_ta = TestAccountAssociatedDataFactory.create_tenant_join_mock(
-            tenant_id="tenant-456", account_id="pending-user-789", role="normal"
-        )
-
-        with patch("services.account_service.db") as mock_db:
-            mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
-                tenant_id="tenant-456", account_id="operator-123", role="owner"
-            )
-
-            query_mock_permission = MagicMock()
-            query_mock_permission.filter_by.return_value.first.return_value = mock_operator_join
-
-            query_mock_ta = MagicMock()
-            query_mock_ta.filter_by.return_value.first.return_value = mock_ta
-
-            # Remaining join count = 1 (still in another workspace)
-            query_mock_count = MagicMock()
-            query_mock_count.filter_by.return_value.count.return_value = 1
-
-            mock_db.session.query.side_effect = [query_mock_permission, query_mock_ta, query_mock_count]
-
-            with patch("services.enterprise.account_deletion_sync.sync_workspace_member_removal") as mock_sync:
-                mock_sync.return_value = True
-
-                # Act
-                TenantService.remove_member_from_tenant(mock_tenant, mock_pending_member, mock_operator)
-
-            # Assert: only the join record should be deleted, not the account
-            mock_db.session.delete.assert_called_once_with(mock_ta)
-
-    def test_remove_active_member_preserves_account(self):
-        """Test that removing an active member never deletes the account, even with no other workspaces."""
-        # Arrange
-        mock_tenant = MagicMock()
-        mock_tenant.id = "tenant-456"
-        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123", role="owner")
-        mock_active_member = TestAccountAssociatedDataFactory.create_account_mock(
-            account_id="active-user-789", email="active@example.com", status=AccountStatus.ACTIVE
-        )
-
-        mock_ta = TestAccountAssociatedDataFactory.create_tenant_join_mock(
-            tenant_id="tenant-456", account_id="active-user-789", role="normal"
-        )
-
-        with patch("services.account_service.db") as mock_db:
-            mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
-                tenant_id="tenant-456", account_id="operator-123", role="owner"
-            )
-
-            query_mock_permission = MagicMock()
-            query_mock_permission.filter_by.return_value.first.return_value = mock_operator_join
-
-            query_mock_ta = MagicMock()
-            query_mock_ta.filter_by.return_value.first.return_value = mock_ta
-
-            mock_db.session.query.side_effect = [query_mock_permission, query_mock_ta]
-
-            with patch("services.enterprise.account_deletion_sync.sync_workspace_member_removal") as mock_sync:
-                mock_sync.return_value = True
-
-                # Act
-                TenantService.remove_member_from_tenant(mock_tenant, mock_active_member, mock_operator)
-
-            # Assert: only the join record should be deleted
-            mock_db.session.delete.assert_called_once_with(mock_ta)
-
     # ==================== Tenant Switching Tests ====================
 
     def test_switch_tenant_success(self):

api/tests/unit_tests/services/test_human_input_service.py

@@ -17,6 +17,7 @@ from core.workflow.nodes.human_input.entities import (
 from core.workflow.nodes.human_input.enums import FormInputType, HumanInputFormKind, HumanInputFormStatus
 from models.human_input import RecipientType
 from services.human_input_service import Form, FormExpiredError, HumanInputService, InvalidFormDataError
+from tasks.app_generate.workflow_execute_task import WORKFLOW_BASED_APP_EXECUTION_QUEUE
 
 
 @pytest.fixture
@@ -87,6 +88,7 @@ def test_enqueue_resume_dispatches_task_for_workflow(mocker, mock_session_factor
 
     resume_task.apply_async.assert_called_once()
     call_kwargs = resume_task.apply_async.call_args.kwargs
+    assert call_kwargs["queue"] == WORKFLOW_BASED_APP_EXECUTION_QUEUE
     assert call_kwargs["kwargs"]["payload"]["workflow_run_id"] == "workflow-run-id"
 
 
@@ -128,6 +130,7 @@ def test_enqueue_resume_dispatches_task_for_advanced_chat(mocker, mock_session_f
 
     resume_task.apply_async.assert_called_once()
     call_kwargs = resume_task.apply_async.call_args.kwargs
+    assert call_kwargs["queue"] == WORKFLOW_BASED_APP_EXECUTION_QUEUE
     assert call_kwargs["kwargs"]["payload"]["workflow_run_id"] == "workflow-run-id"
 
 

api/tests/unit_tests/tasks/test_document_indexing_sync_task.py

@@ -109,87 +109,40 @@ def mock_document_segments(document_id):
 
 @pytest.fixture
 def mock_db_session():
-    """Mock database session via session_factory.create_session().
-
-    After session split refactor, the code calls create_session() multiple times.
-    This fixture creates shared query mocks so all sessions use the same
-    query configuration, simulating database persistence across sessions.
-
-    The fixture automatically converts side_effect to cycle to prevent StopIteration.
-    Tests configure mocks the same way as before, but behind the scenes the values
-    are cycled infinitely for all sessions.
-    """
-    from itertools import cycle
-
+    """Mock database session via session_factory.create_session()."""
     with patch("tasks.document_indexing_sync_task.session_factory") as mock_sf:
-        sessions = []
+        session = MagicMock()
+        # Ensure tests can observe session.close() via context manager teardown
+        session.close = MagicMock()
+        session.commit = MagicMock()
 
-        # Shared query mocks - all sessions use these
-        shared_query = MagicMock()
-        shared_filter_by = MagicMock()
-        shared_scalars_result = MagicMock()
+        # Mock session.begin() context manager to auto-commit on exit
+        begin_cm = MagicMock()
+        begin_cm.__enter__.return_value = session
 
-        # Create custom first mock that auto-cycles side_effect
-        class CyclicMock(MagicMock):
-            def __setattr__(self, name, value):
-                if name == "side_effect" and value is not None:
-                    # Convert list/tuple to infinite cycle
-                    if isinstance(value, (list, tuple)):
-                        value = cycle(value)
-                super().__setattr__(name, value)
+        def _begin_exit_side_effect(*args, **kwargs):
+            # session.begin().__exit__() should commit if no exception
+            if args[0] is None:  # No exception
+                session.commit()
 
-        shared_query.where.return_value.first = CyclicMock()
-        shared_filter_by.first = CyclicMock()
+        begin_cm.__exit__.side_effect = _begin_exit_side_effect
+        session.begin.return_value = begin_cm
 
-        def _create_session():
-            """Create a new mock session for each create_session() call."""
-            session = MagicMock()
-            session.close = MagicMock()
-            session.commit = MagicMock()
+        # Mock create_session() context manager
+        cm = MagicMock()
+        cm.__enter__.return_value = session
 
-            # Mock session.begin() context manager
-            begin_cm = MagicMock()
-            begin_cm.__enter__.return_value = session
+        def _exit_side_effect(*args, **kwargs):
+            session.close()
 
-            def _begin_exit_side_effect(exc_type, exc, tb):
-                # commit on success
-                if exc_type is None:
-                    session.commit()
-                # return False to propagate exceptions
-                return False
+        cm.__exit__.side_effect = _exit_side_effect
+        mock_sf.create_session.return_value = cm
 
-            begin_cm.__exit__.side_effect = _begin_exit_side_effect
-            session.begin.return_value = begin_cm
-
-            # Mock create_session() context manager
-            cm = MagicMock()
-            cm.__enter__.return_value = session
-
-            def _exit_side_effect(exc_type, exc, tb):
-                session.close()
-                return False
-
-            cm.__exit__.side_effect = _exit_side_effect
-
-            # All sessions use the same shared query mocks
-            session.query.return_value = shared_query
-            shared_query.where.return_value = shared_query
-            shared_query.filter_by.return_value = shared_filter_by
-            session.scalars.return_value = shared_scalars_result
-
-            sessions.append(session)
-            # Attach helpers on the first created session for assertions across all sessions
-            if len(sessions) == 1:
-                session.get_all_sessions = lambda: sessions
-                session.any_close_called = lambda: any(s.close.called for s in sessions)
-                session.any_commit_called = lambda: any(s.commit.called for s in sessions)
-            return cm
-
-        mock_sf.create_session.side_effect = _create_session
-
-        # Create first session and return it
-        _create_session()
-        yield sessions[0]
+        query = MagicMock()
+        session.query.return_value = query
+        query.where.return_value = query
+        session.scalars.return_value = MagicMock()
+        yield session
 
 
 @pytest.fixture
@@ -248,8 +201,8 @@ class TestDocumentIndexingSyncTask:
         # Act
         document_indexing_sync_task(dataset_id, document_id)
 
-        # Assert - at least one session should have been closed
-        assert mock_db_session.any_close_called()
+        # Assert
+        mock_db_session.close.assert_called_once()
 
     def test_missing_notion_workspace_id(self, mock_db_session, mock_document, dataset_id, document_id):
         """Test that task raises error when notion_workspace_id is missing."""
@@ -292,7 +245,6 @@ class TestDocumentIndexingSyncTask:
         """Test that task handles missing credentials by updating document status."""
         # Arrange
         mock_db_session.query.return_value.where.return_value.first.return_value = mock_document
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
         mock_datasource_provider_service.get_datasource_credentials.return_value = None
 
         # Act
@@ -302,8 +254,8 @@ class TestDocumentIndexingSyncTask:
         assert mock_document.indexing_status == "error"
         assert "Datasource credential not found" in mock_document.error
         assert mock_document.stopped_at is not None
-        assert mock_db_session.any_commit_called()
-        assert mock_db_session.any_close_called()
+        mock_db_session.commit.assert_called()
+        mock_db_session.close.assert_called()
 
     def test_page_not_updated(
         self,
@@ -317,7 +269,6 @@ class TestDocumentIndexingSyncTask:
         """Test that task does nothing when page has not been updated."""
         # Arrange
         mock_db_session.query.return_value.where.return_value.first.return_value = mock_document
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
         # Return same time as stored in document
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-01T00:00:00Z"
 
@@ -327,8 +278,8 @@ class TestDocumentIndexingSyncTask:
         # Assert
         # Document status should remain unchanged
         assert mock_document.indexing_status == "completed"
-        # At least one session should have been closed via context manager teardown
-        assert mock_db_session.any_close_called()
+        # Session should still be closed via context manager teardown
+        assert mock_db_session.close.called
 
     def test_successful_sync_when_page_updated(
         self,
@@ -345,20 +296,7 @@ class TestDocumentIndexingSyncTask:
     ):
         """Test successful sync flow when Notion page has been updated."""
         # Arrange
-        # Set exact sequence of returns across calls to `.first()`:
-        # 1) document (initial fetch)
-        # 2) dataset (pre-check)
-        # 3) dataset (cleaning phase)
-        # 4) document (pre-indexing update)
-        # 5) document (indexing runner fetch)
-        mock_db_session.query.return_value.where.return_value.first.side_effect = [
-            mock_document,
-            mock_dataset,
-            mock_dataset,
-            mock_document,
-            mock_document,
-        ]
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
+        mock_db_session.query.return_value.where.return_value.first.side_effect = [mock_document, mock_dataset]
         mock_db_session.scalars.return_value.all.return_value = mock_document_segments
         # NotionExtractor returns updated time
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-02T00:00:00Z"
@@ -376,40 +314,28 @@ class TestDocumentIndexingSyncTask:
         mock_processor.clean.assert_called_once()
 
         # Verify segments were deleted from database in batch (DELETE FROM document_segments)
-        # Aggregate execute calls across all created sessions
-        execute_sqls = []
-        for s in mock_db_session.get_all_sessions():
-            execute_sqls.extend([" ".join(str(c[0][0]).split()) for c in s.execute.call_args_list])
+        execute_sqls = [" ".join(str(c[0][0]).split()) for c in mock_db_session.execute.call_args_list]
         assert any("DELETE FROM document_segments" in sql for sql in execute_sqls)
 
         # Verify indexing runner was called
         mock_indexing_runner.run.assert_called_once_with([mock_document])
 
-        # Verify session operations (across any created session)
-        assert mock_db_session.any_commit_called()
-        assert mock_db_session.any_close_called()
+        # Verify session operations
+        assert mock_db_session.commit.called
+        mock_db_session.close.assert_called_once()
 
     def test_dataset_not_found_during_cleaning(
         self,
         mock_db_session,
         mock_datasource_provider_service,
         mock_notion_extractor,
-        mock_indexing_runner,
         mock_document,
         dataset_id,
         document_id,
     ):
         """Test that task handles dataset not found during cleaning phase."""
         # Arrange
-        # Sequence: document (initial), dataset (pre-check), None (cleaning), document (update), document (indexing)
-        mock_db_session.query.return_value.where.return_value.first.side_effect = [
-            mock_document,
-            mock_dataset,
-            None,
-            mock_document,
-            mock_document,
-        ]
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
+        mock_db_session.query.return_value.where.return_value.first.side_effect = [mock_document, None]
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-02T00:00:00Z"
 
         # Act
@@ -418,8 +344,8 @@ class TestDocumentIndexingSyncTask:
         # Assert
         # Document should still be set to parsing
         assert mock_document.indexing_status == "parsing"
-        # At least one session should be closed after error
-        assert mock_db_session.any_close_called()
+        # Session should be closed after error
+        mock_db_session.close.assert_called_once()
 
     def test_cleaning_error_continues_to_indexing(
         self,
@@ -435,14 +361,8 @@ class TestDocumentIndexingSyncTask:
     ):
         """Test that indexing continues even if cleaning fails."""
         # Arrange
-        from itertools import cycle
-
-        mock_db_session.query.return_value.where.return_value.first.side_effect = cycle([mock_document, mock_dataset])
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
-        # Make the cleaning step fail but not the segment fetch
-        processor = mock_index_processor_factory.return_value.init_index_processor.return_value
-        processor.clean.side_effect = Exception("Cleaning error")
-        mock_db_session.scalars.return_value.all.return_value = []
+        mock_db_session.query.return_value.where.return_value.first.side_effect = [mock_document, mock_dataset]
+        mock_db_session.scalars.return_value.all.side_effect = Exception("Cleaning error")
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-02T00:00:00Z"
 
         # Act
@@ -451,7 +371,7 @@ class TestDocumentIndexingSyncTask:
         # Assert
         # Indexing should still be attempted despite cleaning error
         mock_indexing_runner.run.assert_called_once_with([mock_document])
-        assert mock_db_session.any_close_called()
+        mock_db_session.close.assert_called_once()
 
     def test_indexing_runner_document_paused_error(
         self,
@@ -468,10 +388,7 @@ class TestDocumentIndexingSyncTask:
     ):
         """Test that DocumentIsPausedError is handled gracefully."""
         # Arrange
-        from itertools import cycle
-
-        mock_db_session.query.return_value.where.return_value.first.side_effect = cycle([mock_document, mock_dataset])
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
+        mock_db_session.query.return_value.where.return_value.first.side_effect = [mock_document, mock_dataset]
         mock_db_session.scalars.return_value.all.return_value = mock_document_segments
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-02T00:00:00Z"
         mock_indexing_runner.run.side_effect = DocumentIsPausedError("Document paused")
@@ -481,7 +398,7 @@ class TestDocumentIndexingSyncTask:
 
         # Assert
         # Session should be closed after handling error
-        assert mock_db_session.any_close_called()
+        mock_db_session.close.assert_called_once()
 
     def test_indexing_runner_general_error(
         self,
@@ -498,10 +415,7 @@ class TestDocumentIndexingSyncTask:
     ):
         """Test that general exceptions during indexing are handled."""
         # Arrange
-        from itertools import cycle
-
-        mock_db_session.query.return_value.where.return_value.first.side_effect = cycle([mock_document, mock_dataset])
-        mock_db_session.query.return_value.filter_by.return_value.first.return_value = mock_document
+        mock_db_session.query.return_value.where.return_value.first.side_effect = [mock_document, mock_dataset]
         mock_db_session.scalars.return_value.all.return_value = mock_document_segments
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-02T00:00:00Z"
         mock_indexing_runner.run.side_effect = Exception("Indexing error")
@@ -511,7 +425,7 @@ class TestDocumentIndexingSyncTask:
 
         # Assert
         # Session should be closed after error
-        assert mock_db_session.any_close_called()
+        mock_db_session.close.assert_called_once()
 
     def test_notion_extractor_initialized_with_correct_params(
         self,
@@ -618,14 +532,7 @@ class TestDocumentIndexingSyncTask:
     ):
         """Test that index processor clean is called with correct parameters."""
         # Arrange
-        # Sequence: document (initial), dataset (pre-check), dataset (cleaning), document (update), document (indexing)
-        mock_db_session.query.return_value.where.return_value.first.side_effect = [
-            mock_document,
-            mock_dataset,
-            mock_dataset,
-            mock_document,
-            mock_document,
-        ]
+        mock_db_session.query.return_value.where.return_value.first.side_effect = [mock_document, mock_dataset]
         mock_db_session.scalars.return_value.all.return_value = mock_document_segments
         mock_notion_extractor.get_notion_last_edited_time.return_value = "2024-01-02T00:00:00Z"
 

dev/start-worker

@@ -106,10 +106,10 @@ if [[ -z "${QUEUES}" ]]; then
   # Configure queues based on edition
   if [[ "${EDITION}" == "CLOUD" ]]; then
     # Cloud edition: separate queues for dataset and trigger tasks
-    QUEUES="dataset,priority_dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow_professional,workflow_team,workflow_sandbox,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor,retention,workflow_based_app_execution"
+    QUEUES="dataset,priority_dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow_professional,workflow_team,workflow_sandbox,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor,retention"
   else
     # Community edition (SELF_HOSTED): dataset and workflow have separate queues
-    QUEUES="dataset,priority_dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor,retention,workflow_based_app_execution"
+    QUEUES="dataset,priority_dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor,retention"
   fi
 
   echo "No queues specified, using edition-based defaults: ${QUEUES}"

docker/.env.example

@@ -62,9 +62,6 @@ LANG=C.UTF-8
 LC_ALL=C.UTF-8
 PYTHONIOENCODING=utf-8
 
-# Set UV cache directory to avoid permission issues with non-existent home directory
-UV_CACHE_DIR=/tmp/.uv-cache
-
 # ------------------------------
 # Server Configuration
 # ------------------------------
@@ -387,8 +384,6 @@ CELERY_USE_SENTINEL=false
 CELERY_SENTINEL_MASTER_NAME=
 CELERY_SENTINEL_PASSWORD=
 CELERY_SENTINEL_SOCKET_TIMEOUT=0.1
-# e.g. {"tasks.add": {"rate_limit": "10/s"}}
-CELERY_TASK_ANNOTATIONS=null
 
 # ------------------------------
 # CORS Configuration

docker/docker-compose.yaml

@@ -16,7 +16,6 @@ x-shared-env: &shared-api-worker-env
   LANG: ${LANG:-C.UTF-8}
   LC_ALL: ${LC_ALL:-C.UTF-8}
   PYTHONIOENCODING: ${PYTHONIOENCODING:-utf-8}
-  UV_CACHE_DIR: ${UV_CACHE_DIR:-/tmp/.uv-cache}
   LOG_LEVEL: ${LOG_LEVEL:-INFO}
   LOG_OUTPUT_FORMAT: ${LOG_OUTPUT_FORMAT:-text}
   LOG_FILE: ${LOG_FILE:-/app/logs/server.log}
@@ -106,7 +105,6 @@ x-shared-env: &shared-api-worker-env
   CELERY_SENTINEL_MASTER_NAME: ${CELERY_SENTINEL_MASTER_NAME:-}
   CELERY_SENTINEL_PASSWORD: ${CELERY_SENTINEL_PASSWORD:-}
   CELERY_SENTINEL_SOCKET_TIMEOUT: ${CELERY_SENTINEL_SOCKET_TIMEOUT:-0.1}
-  CELERY_TASK_ANNOTATIONS: ${CELERY_TASK_ANNOTATIONS:-null}
   WEB_API_CORS_ALLOW_ORIGINS: ${WEB_API_CORS_ALLOW_ORIGINS:-*}
   CONSOLE_CORS_ALLOW_ORIGINS: ${CONSOLE_CORS_ALLOW_ORIGINS:-*}
   COOKIE_DOMAIN: ${COOKIE_DOMAIN:-}

sdks/nodejs-client/pnpm-lock.yaml

@@ -10,7 +10,7 @@ importers:
     dependencies:
       axios:
         specifier: ^1.13.2
-        version: 1.13.5
+        version: 1.13.2
     devDependencies:
       '@eslint/js':
         specifier: ^9.39.2
@@ -544,8 +544,8 @@ packages:
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
-  axios@1.13.5:
-    resolution: {integrity: sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==}
+  axios@1.13.2:
+    resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==}
 
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
@@ -1677,7 +1677,7 @@ snapshots:
 
   asynckit@0.4.0: {}
 
-  axios@1.13.5:
+  axios@1.13.2:
     dependencies:
       follow-redirects: 1.15.11
       form-data: 4.0.5

web/__tests__/billing/billing-integration.test.tsx

@@ -1,991 +0,0 @@
-import type { UsagePlanInfo, UsageResetInfo } from '@/app/components/billing/type'
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import AnnotationFull from '@/app/components/billing/annotation-full'
-import AnnotationFullModal from '@/app/components/billing/annotation-full/modal'
-import AppsFull from '@/app/components/billing/apps-full-in-dialog'
-import Billing from '@/app/components/billing/billing-page'
-import { defaultPlan, NUM_INFINITE } from '@/app/components/billing/config'
-import HeaderBillingBtn from '@/app/components/billing/header-billing-btn'
-import PlanComp from '@/app/components/billing/plan'
-import PlanUpgradeModal from '@/app/components/billing/plan-upgrade-modal'
-import PriorityLabel from '@/app/components/billing/priority-label'
-import TriggerEventsLimitModal from '@/app/components/billing/trigger-events-limit-modal'
-import { Plan } from '@/app/components/billing/type'
-import UpgradeBtn from '@/app/components/billing/upgrade-btn'
-import VectorSpaceFull from '@/app/components/billing/vector-space-full'
-
-let mockProviderCtx: Record<string, unknown> = {}
-let mockAppCtx: Record<string, unknown> = {}
-const mockSetShowPricingModal = vi.fn()
-const mockSetShowAccountSettingModal = vi.fn()
-
-vi.mock('@/context/provider-context', () => ({
-  useProviderContext: () => mockProviderCtx,
-}))
-
-vi.mock('@/context/app-context', () => ({
-  useAppContext: () => mockAppCtx,
-}))
-
-vi.mock('@/context/modal-context', () => ({
-  useModalContext: () => ({
-    setShowPricingModal: mockSetShowPricingModal,
-  }),
-  useModalContextSelector: (selector: (s: Record<string, unknown>) => unknown) =>
-    selector({
-      setShowAccountSettingModal: mockSetShowAccountSettingModal,
-    }),
-}))
-
-vi.mock('@/context/i18n', () => ({
-  useGetLanguage: () => 'en-US',
-  useGetPricingPageLanguage: () => 'en',
-}))
-
-// ─── Service mocks ──────────────────────────────────────────────────────────
-const mockRefetch = vi.fn().mockResolvedValue({ data: 'https://billing.example.com' })
-vi.mock('@/service/use-billing', () => ({
-  useBillingUrl: () => ({
-    data: 'https://billing.example.com',
-    isFetching: false,
-    refetch: mockRefetch,
-  }),
-  useBindPartnerStackInfo: () => ({ mutateAsync: vi.fn() }),
-}))
-
-vi.mock('@/service/use-education', () => ({
-  useEducationVerify: () => ({
-    mutateAsync: vi.fn().mockResolvedValue({ token: 'test-token' }),
-    isPending: false,
-  }),
-}))
-
-// ─── Navigation mocks ───────────────────────────────────────────────────────
-const mockRouterPush = vi.fn()
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: mockRouterPush }),
-  usePathname: () => '/billing',
-  useSearchParams: () => new URLSearchParams(),
-}))
-
-vi.mock('@/hooks/use-async-window-open', () => ({
-  useAsyncWindowOpen: () => vi.fn(),
-}))
-
-// ─── External component mocks ───────────────────────────────────────────────
-vi.mock('@/app/education-apply/verify-state-modal', () => ({
-  default: ({ isShow }: { isShow: boolean }) =>
-    isShow ? <div data-testid="verify-state-modal" /> : null,
-}))
-
-vi.mock('@/app/components/header/utils/util', () => ({
-  mailToSupport: () => 'mailto:support@test.com',
-}))
-
-// ─── Test data factories ────────────────────────────────────────────────────
-type PlanOverrides = {
-  type?: string
-  usage?: Partial<UsagePlanInfo>
-  total?: Partial<UsagePlanInfo>
-  reset?: Partial<UsageResetInfo>
-}
-
-const createPlanData = (overrides: PlanOverrides = {}) => ({
-  ...defaultPlan,
-  ...overrides,
-  type: overrides.type ?? defaultPlan.type,
-  usage: { ...defaultPlan.usage, ...overrides.usage },
-  total: { ...defaultPlan.total, ...overrides.total },
-  reset: { ...defaultPlan.reset, ...overrides.reset },
-})
-
-const setupProviderContext = (planOverrides: PlanOverrides = {}, extra: Record<string, unknown> = {}) => {
-  mockProviderCtx = {
-    plan: createPlanData(planOverrides),
-    enableBilling: true,
-    isFetchedPlan: true,
-    enableEducationPlan: false,
-    isEducationAccount: false,
-    allowRefreshEducationVerify: false,
-    ...extra,
-  }
-}
-
-const setupAppContext = (overrides: Record<string, unknown> = {}) => {
-  mockAppCtx = {
-    isCurrentWorkspaceManager: true,
-    userProfile: { email: 'test@example.com' },
-    langGeniusVersionInfo: { current_version: '1.0.0' },
-    ...overrides,
-  }
-}
-
-// Vitest hoists vi.mock() calls, so imports above will use mocked modules
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 1. Billing Page + Plan Component Integration
-// Tests the full data flow: BillingPage → PlanComp → UsageInfo → ProgressBar
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Billing Page + Plan Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  // Verify that the billing page renders PlanComp with all 7 usage items
-  describe('Rendering complete plan information', () => {
-    it('should display all 7 usage metrics for sandbox plan', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: {
-          buildApps: 3,
-          teamMembers: 1,
-          documentsUploadQuota: 10,
-          vectorSpace: 20,
-          annotatedResponse: 5,
-          triggerEvents: 1000,
-          apiRateLimit: 2000,
-        },
-        total: {
-          buildApps: 5,
-          teamMembers: 1,
-          documentsUploadQuota: 50,
-          vectorSpace: 50,
-          annotatedResponse: 10,
-          triggerEvents: 3000,
-          apiRateLimit: 5000,
-        },
-      })
-
-      render(<Billing />)
-
-      // Plan name
-      expect(screen.getByText(/plans\.sandbox\.name/i)).toBeInTheDocument()
-
-      // All 7 usage items should be visible
-      expect(screen.getByText(/usagePage\.buildApps/i)).toBeInTheDocument()
-      expect(screen.getByText(/usagePage\.teamMembers/i)).toBeInTheDocument()
-      expect(screen.getByText(/usagePage\.documentsUploadQuota/i)).toBeInTheDocument()
-      expect(screen.getByText(/usagePage\.vectorSpace/i)).toBeInTheDocument()
-      expect(screen.getByText(/usagePage\.annotationQuota/i)).toBeInTheDocument()
-      expect(screen.getByText(/usagePage\.triggerEvents/i)).toBeInTheDocument()
-      expect(screen.getByText(/plansCommon\.apiRateLimit/i)).toBeInTheDocument()
-    })
-
-    it('should display usage values as "usage / total" format', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { buildApps: 3, teamMembers: 1 },
-        total: { buildApps: 5, teamMembers: 1 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Check that the buildApps usage fraction "3 / 5" is rendered
-      const usageContainers = screen.getAllByText('3')
-      expect(usageContainers.length).toBeGreaterThan(0)
-      const totalContainers = screen.getAllByText('5')
-      expect(totalContainers.length).toBeGreaterThan(0)
-    })
-
-    it('should show "unlimited" for infinite quotas (professional API rate limit)', () => {
-      setupProviderContext({
-        type: Plan.professional,
-        total: { apiRateLimit: NUM_INFINITE },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.getByText(/plansCommon\.unlimited/i)).toBeInTheDocument()
-    })
-
-    it('should display reset days for trigger events when applicable', () => {
-      setupProviderContext({
-        type: Plan.professional,
-        total: { triggerEvents: 20000 },
-        reset: { triggerEvents: 7 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Reset text should be visible
-      expect(screen.getByText(/usagePage\.resetsIn/i)).toBeInTheDocument()
-    })
-  })
-
-  // Verify billing URL button visibility and behavior
-  describe('Billing URL button', () => {
-    it('should show billing button when enableBilling and isCurrentWorkspaceManager', () => {
-      setupProviderContext({ type: Plan.sandbox })
-      setupAppContext({ isCurrentWorkspaceManager: true })
-
-      render(<Billing />)
-
-      expect(screen.getByText(/viewBillingTitle/i)).toBeInTheDocument()
-      expect(screen.getByText(/viewBillingAction/i)).toBeInTheDocument()
-    })
-
-    it('should hide billing button when user is not workspace manager', () => {
-      setupProviderContext({ type: Plan.sandbox })
-      setupAppContext({ isCurrentWorkspaceManager: false })
-
-      render(<Billing />)
-
-      expect(screen.queryByText(/viewBillingTitle/i)).not.toBeInTheDocument()
-    })
-
-    it('should hide billing button when billing is disabled', () => {
-      setupProviderContext({ type: Plan.sandbox }, { enableBilling: false })
-
-      render(<Billing />)
-
-      expect(screen.queryByText(/viewBillingTitle/i)).not.toBeInTheDocument()
-    })
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 2. Plan Type Display Integration
-// Tests that different plan types render correct visual elements
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Plan Type Display Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  it('should render sandbox plan with upgrade button (premium badge)', () => {
-    setupProviderContext({ type: Plan.sandbox })
-
-    render(<PlanComp loc="test" />)
-
-    expect(screen.getByText(/plans\.sandbox\.name/i)).toBeInTheDocument()
-    expect(screen.getByText(/plans\.sandbox\.for/i)).toBeInTheDocument()
-    // Sandbox shows premium badge upgrade button (not plain)
-    expect(screen.getByText(/upgradeBtn\.encourageShort/i)).toBeInTheDocument()
-  })
-
-  it('should render professional plan with plain upgrade button', () => {
-    setupProviderContext({ type: Plan.professional })
-
-    render(<PlanComp loc="test" />)
-
-    expect(screen.getByText(/plans\.professional\.name/i)).toBeInTheDocument()
-    // Professional shows plain button because it's not team
-    expect(screen.getByText(/upgradeBtn\.encourageShort/i)).toBeInTheDocument()
-  })
-
-  it('should render team plan with plain-style upgrade button', () => {
-    setupProviderContext({ type: Plan.team })
-
-    render(<PlanComp loc="test" />)
-
-    expect(screen.getByText(/plans\.team\.name/i)).toBeInTheDocument()
-    // Team plan has isPlain=true, so shows "upgradeBtn.plain" text
-    expect(screen.getByText(/upgradeBtn\.plain/i)).toBeInTheDocument()
-  })
-
-  it('should not render upgrade button for enterprise plan', () => {
-    setupProviderContext({ type: Plan.enterprise })
-
-    render(<PlanComp loc="test" />)
-
-    expect(screen.queryByText(/upgradeBtn\.encourageShort/i)).not.toBeInTheDocument()
-    expect(screen.queryByText(/upgradeBtn\.plain/i)).not.toBeInTheDocument()
-  })
-
-  it('should show education verify button when enableEducationPlan is true and not yet verified', () => {
-    setupProviderContext({ type: Plan.sandbox }, {
-      enableEducationPlan: true,
-      isEducationAccount: false,
-    })
-
-    render(<PlanComp loc="test" />)
-
-    expect(screen.getByText(/toVerified/i)).toBeInTheDocument()
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 3. Upgrade Flow Integration
-// Tests the flow: UpgradeBtn click → setShowPricingModal
-// and PlanUpgradeModal → close + trigger pricing
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Upgrade Flow Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-    setupProviderContext({ type: Plan.sandbox })
-  })
-
-  // UpgradeBtn triggers pricing modal
-  describe('UpgradeBtn triggers pricing modal', () => {
-    it('should call setShowPricingModal when clicking premium badge upgrade button', async () => {
-      const user = userEvent.setup()
-
-      render(<UpgradeBtn />)
-
-      const badgeText = screen.getByText(/upgradeBtn\.encourage/i)
-      await user.click(badgeText)
-
-      expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call setShowPricingModal when clicking plain upgrade button', async () => {
-      const user = userEvent.setup()
-
-      render(<UpgradeBtn isPlain />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-    })
-
-    it('should use custom onClick when provided instead of setShowPricingModal', async () => {
-      const customOnClick = vi.fn()
-      const user = userEvent.setup()
-
-      render(<UpgradeBtn onClick={customOnClick} />)
-
-      const badgeText = screen.getByText(/upgradeBtn\.encourage/i)
-      await user.click(badgeText)
-
-      expect(customOnClick).toHaveBeenCalledTimes(1)
-      expect(mockSetShowPricingModal).not.toHaveBeenCalled()
-    })
-
-    it('should fire gtag event with loc parameter when clicked', async () => {
-      const mockGtag = vi.fn()
-      ;(window as unknown as Record<string, unknown>).gtag = mockGtag
-      const user = userEvent.setup()
-
-      render(<UpgradeBtn loc="billing-page" />)
-
-      const badgeText = screen.getByText(/upgradeBtn\.encourage/i)
-      await user.click(badgeText)
-
-      expect(mockGtag).toHaveBeenCalledWith('event', 'click_upgrade_btn', { loc: 'billing-page' })
-      delete (window as unknown as Record<string, unknown>).gtag
-    })
-  })
-
-  // PlanUpgradeModal integration: close modal and trigger pricing
-  describe('PlanUpgradeModal upgrade flow', () => {
-    it('should call onClose and setShowPricingModal when clicking upgrade button in modal', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <PlanUpgradeModal
-          show={true}
-          onClose={onClose}
-          title="Upgrade Required"
-          description="You need a better plan"
-        />,
-      )
-
-      // The modal should show title and description
-      expect(screen.getByText('Upgrade Required')).toBeInTheDocument()
-      expect(screen.getByText('You need a better plan')).toBeInTheDocument()
-
-      // Click the upgrade button inside the modal
-      const upgradeText = screen.getByText(/triggerLimitModal\.upgrade/i)
-      await user.click(upgradeText)
-
-      // Should close the current modal first
-      expect(onClose).toHaveBeenCalledTimes(1)
-      // Then open pricing modal
-      expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onClose and custom onUpgrade when provided', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-      const onUpgrade = vi.fn()
-
-      render(
-        <PlanUpgradeModal
-          show={true}
-          onClose={onClose}
-          onUpgrade={onUpgrade}
-          title="Test"
-          description="Test"
-        />,
-      )
-
-      const upgradeText = screen.getByText(/triggerLimitModal\.upgrade/i)
-      await user.click(upgradeText)
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-      expect(onUpgrade).toHaveBeenCalledTimes(1)
-      // Custom onUpgrade replaces default setShowPricingModal
-      expect(mockSetShowPricingModal).not.toHaveBeenCalled()
-    })
-
-    it('should call onClose when clicking dismiss button', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <PlanUpgradeModal
-          show={true}
-          onClose={onClose}
-          title="Test"
-          description="Test"
-        />,
-      )
-
-      const dismissBtn = screen.getByText(/triggerLimitModal\.dismiss/i)
-      await user.click(dismissBtn)
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-      expect(mockSetShowPricingModal).not.toHaveBeenCalled()
-    })
-  })
-
-  // Upgrade from PlanComp: clicking upgrade button in plan component triggers pricing
-  describe('PlanComp upgrade button triggers pricing', () => {
-    it('should open pricing modal when clicking upgrade in sandbox plan', async () => {
-      const user = userEvent.setup()
-      setupProviderContext({ type: Plan.sandbox })
-
-      render(<PlanComp loc="test-loc" />)
-
-      const upgradeText = screen.getByText(/upgradeBtn\.encourageShort/i)
-      await user.click(upgradeText)
-
-      expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-    })
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 4. Capacity Full Components Integration
-// Tests AppsFull, VectorSpaceFull, AnnotationFull, TriggerEventsLimitModal
-// with real child components (UsageInfo, ProgressBar, UpgradeBtn)
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Capacity Full Components Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  // AppsFull renders with correct messaging and components
-  describe('AppsFull integration', () => {
-    it('should display upgrade tip and upgrade button for sandbox plan at capacity', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { buildApps: 5 },
-        total: { buildApps: 5 },
-      })
-
-      render(<AppsFull loc="test" />)
-
-      // Should show "full" tip
-      expect(screen.getByText(/apps\.fullTip1$/i)).toBeInTheDocument()
-      // Should show upgrade button
-      expect(screen.getByText(/upgradeBtn\.encourageShort/i)).toBeInTheDocument()
-      // Should show usage/total fraction "5/5"
-      expect(screen.getByText(/5\/5/)).toBeInTheDocument()
-      // Should have a progress bar rendered
-      expect(screen.getByTestId('billing-progress-bar')).toBeInTheDocument()
-    })
-
-    it('should display upgrade tip and upgrade button for professional plan', () => {
-      setupProviderContext({
-        type: Plan.professional,
-        usage: { buildApps: 48 },
-        total: { buildApps: 50 },
-      })
-
-      render(<AppsFull loc="test" />)
-
-      expect(screen.getByText(/apps\.fullTip1$/i)).toBeInTheDocument()
-      expect(screen.getByText(/upgradeBtn\.encourageShort/i)).toBeInTheDocument()
-    })
-
-    it('should display contact tip and contact button for team plan', () => {
-      setupProviderContext({
-        type: Plan.team,
-        usage: { buildApps: 200 },
-        total: { buildApps: 200 },
-      })
-
-      render(<AppsFull loc="test" />)
-
-      // Team plan shows different tip
-      expect(screen.getByText(/apps\.fullTip2$/i)).toBeInTheDocument()
-      // Team plan shows "Contact Us" instead of upgrade
-      expect(screen.getByText(/apps\.contactUs/i)).toBeInTheDocument()
-      expect(screen.queryByText(/upgradeBtn\.encourageShort/i)).not.toBeInTheDocument()
-    })
-
-    it('should render progress bar with correct color based on usage percentage', () => {
-      // 100% usage should show error color
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { buildApps: 5 },
-        total: { buildApps: 5 },
-      })
-
-      render(<AppsFull loc="test" />)
-
-      const progressBar = screen.getByTestId('billing-progress-bar')
-      expect(progressBar).toHaveClass('bg-components-progress-error-progress')
-    })
-  })
-
-  // VectorSpaceFull renders with VectorSpaceInfo and UpgradeBtn
-  describe('VectorSpaceFull integration', () => {
-    it('should display full tip, upgrade button, and vector space usage info', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { vectorSpace: 50 },
-        total: { vectorSpace: 50 },
-      })
-
-      render(<VectorSpaceFull />)
-
-      // Should show full tip
-      expect(screen.getByText(/vectorSpace\.fullTip/i)).toBeInTheDocument()
-      expect(screen.getByText(/vectorSpace\.fullSolution/i)).toBeInTheDocument()
-      // Should show upgrade button
-      expect(screen.getByText(/upgradeBtn\.encourage$/i)).toBeInTheDocument()
-      // Should show vector space usage info
-      expect(screen.getByText(/usagePage\.vectorSpace/i)).toBeInTheDocument()
-    })
-  })
-
-  // AnnotationFull renders with Usage component and UpgradeBtn
-  describe('AnnotationFull integration', () => {
-    it('should display annotation full tip, upgrade button, and usage info', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { annotatedResponse: 10 },
-        total: { annotatedResponse: 10 },
-      })
-
-      render(<AnnotationFull />)
-
-      expect(screen.getByText(/annotatedResponse\.fullTipLine1/i)).toBeInTheDocument()
-      expect(screen.getByText(/annotatedResponse\.fullTipLine2/i)).toBeInTheDocument()
-      // UpgradeBtn rendered
-      expect(screen.getByText(/upgradeBtn\.encourage$/i)).toBeInTheDocument()
-      // Usage component should show annotation quota
-      expect(screen.getByText(/annotatedResponse\.quotaTitle/i)).toBeInTheDocument()
-    })
-  })
-
-  // AnnotationFullModal shows modal with usage and upgrade button
-  describe('AnnotationFullModal integration', () => {
-    it('should render modal with annotation info and upgrade button when show is true', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { annotatedResponse: 10 },
-        total: { annotatedResponse: 10 },
-      })
-
-      render(<AnnotationFullModal show={true} onHide={vi.fn()} />)
-
-      expect(screen.getByText(/annotatedResponse\.fullTipLine1/i)).toBeInTheDocument()
-      expect(screen.getByText(/annotatedResponse\.quotaTitle/i)).toBeInTheDocument()
-      expect(screen.getByText(/upgradeBtn\.encourage$/i)).toBeInTheDocument()
-    })
-
-    it('should not render content when show is false', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { annotatedResponse: 10 },
-        total: { annotatedResponse: 10 },
-      })
-
-      render(<AnnotationFullModal show={false} onHide={vi.fn()} />)
-
-      expect(screen.queryByText(/annotatedResponse\.fullTipLine1/i)).not.toBeInTheDocument()
-    })
-  })
-
-  // TriggerEventsLimitModal renders PlanUpgradeModal with embedded UsageInfo
-  describe('TriggerEventsLimitModal integration', () => {
-    it('should display trigger limit title, usage info, and upgrade button', () => {
-      setupProviderContext({ type: Plan.professional })
-
-      render(
-        <TriggerEventsLimitModal
-          show={true}
-          onClose={vi.fn()}
-          onUpgrade={vi.fn()}
-          usage={18000}
-          total={20000}
-          resetInDays={5}
-        />,
-      )
-
-      // Modal title and description
-      expect(screen.getByText(/triggerLimitModal\.title/i)).toBeInTheDocument()
-      expect(screen.getByText(/triggerLimitModal\.description/i)).toBeInTheDocument()
-      // Embedded UsageInfo with trigger events data
-      expect(screen.getByText(/triggerLimitModal\.usageTitle/i)).toBeInTheDocument()
-      expect(screen.getByText('18000')).toBeInTheDocument()
-      expect(screen.getByText('20000')).toBeInTheDocument()
-      // Reset info
-      expect(screen.getByText(/usagePage\.resetsIn/i)).toBeInTheDocument()
-      // Upgrade and dismiss buttons
-      expect(screen.getByText(/triggerLimitModal\.upgrade/i)).toBeInTheDocument()
-      expect(screen.getByText(/triggerLimitModal\.dismiss/i)).toBeInTheDocument()
-    })
-
-    it('should call onClose and onUpgrade when clicking upgrade', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-      const onUpgrade = vi.fn()
-      setupProviderContext({ type: Plan.professional })
-
-      render(
-        <TriggerEventsLimitModal
-          show={true}
-          onClose={onClose}
-          onUpgrade={onUpgrade}
-          usage={20000}
-          total={20000}
-        />,
-      )
-
-      const upgradeBtn = screen.getByText(/triggerLimitModal\.upgrade/i)
-      await user.click(upgradeBtn)
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-      expect(onUpgrade).toHaveBeenCalledTimes(1)
-    })
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 5. Header Billing Button Integration
-// Tests HeaderBillingBtn behavior for different plan states
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Header Billing Button Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  it('should render UpgradeBtn (premium badge) for sandbox plan', () => {
-    setupProviderContext({ type: Plan.sandbox })
-
-    render(<HeaderBillingBtn />)
-
-    expect(screen.getByText(/upgradeBtn\.encourageShort/i)).toBeInTheDocument()
-  })
-
-  it('should render "pro" badge for professional plan', () => {
-    setupProviderContext({ type: Plan.professional })
-
-    render(<HeaderBillingBtn />)
-
-    expect(screen.getByText('pro')).toBeInTheDocument()
-    expect(screen.queryByText(/upgradeBtn/i)).not.toBeInTheDocument()
-  })
-
-  it('should render "team" badge for team plan', () => {
-    setupProviderContext({ type: Plan.team })
-
-    render(<HeaderBillingBtn />)
-
-    expect(screen.getByText('team')).toBeInTheDocument()
-  })
-
-  it('should return null when billing is disabled', () => {
-    setupProviderContext({ type: Plan.sandbox }, { enableBilling: false })
-
-    const { container } = render(<HeaderBillingBtn />)
-
-    expect(container.innerHTML).toBe('')
-  })
-
-  it('should return null when plan is not fetched yet', () => {
-    setupProviderContext({ type: Plan.sandbox }, { isFetchedPlan: false })
-
-    const { container } = render(<HeaderBillingBtn />)
-
-    expect(container.innerHTML).toBe('')
-  })
-
-  it('should call onClick when clicking pro/team badge in non-display-only mode', async () => {
-    const user = userEvent.setup()
-    const onClick = vi.fn()
-    setupProviderContext({ type: Plan.professional })
-
-    render(<HeaderBillingBtn onClick={onClick} />)
-
-    await user.click(screen.getByText('pro'))
-
-    expect(onClick).toHaveBeenCalledTimes(1)
-  })
-
-  it('should not call onClick when isDisplayOnly is true', async () => {
-    const user = userEvent.setup()
-    const onClick = vi.fn()
-    setupProviderContext({ type: Plan.professional })
-
-    render(<HeaderBillingBtn onClick={onClick} isDisplayOnly />)
-
-    await user.click(screen.getByText('pro'))
-
-    expect(onClick).not.toHaveBeenCalled()
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 6. PriorityLabel Integration
-// Tests priority badge display for different plan types
-// ═══════════════════════════════════════════════════════════════════════════
-describe('PriorityLabel Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  it('should display "standard" priority for sandbox plan', () => {
-    setupProviderContext({ type: Plan.sandbox })
-
-    render(<PriorityLabel />)
-
-    expect(screen.getByText(/plansCommon\.priority\.standard/i)).toBeInTheDocument()
-  })
-
-  it('should display "priority" for professional plan with icon', () => {
-    setupProviderContext({ type: Plan.professional })
-
-    const { container } = render(<PriorityLabel />)
-
-    expect(screen.getByText(/plansCommon\.priority\.priority/i)).toBeInTheDocument()
-    // Professional plan should show the priority icon
-    expect(container.querySelector('svg')).toBeInTheDocument()
-  })
-
-  it('should display "top-priority" for team plan with icon', () => {
-    setupProviderContext({ type: Plan.team })
-
-    const { container } = render(<PriorityLabel />)
-
-    expect(screen.getByText(/plansCommon\.priority\.top-priority/i)).toBeInTheDocument()
-    expect(container.querySelector('svg')).toBeInTheDocument()
-  })
-
-  it('should display "top-priority" for enterprise plan', () => {
-    setupProviderContext({ type: Plan.enterprise })
-
-    render(<PriorityLabel />)
-
-    expect(screen.getByText(/plansCommon\.priority\.top-priority/i)).toBeInTheDocument()
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 7. Usage Display Edge Cases
-// Tests storage mode, threshold logic, and progress bar color integration
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Usage Display Edge Cases', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  // Vector space storage mode behavior
-  describe('VectorSpace storage mode in PlanComp', () => {
-    it('should show "< 50" for sandbox plan with low vector space usage', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { vectorSpace: 10 },
-        total: { vectorSpace: 50 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Storage mode: usage below threshold shows "< 50"
-      expect(screen.getByText(/</)).toBeInTheDocument()
-    })
-
-    it('should show indeterminate progress bar for usage below threshold', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { vectorSpace: 10 },
-        total: { vectorSpace: 50 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Should have an indeterminate progress bar
-      expect(screen.getByTestId('billing-progress-bar-indeterminate')).toBeInTheDocument()
-    })
-
-    it('should show actual usage for pro plan above threshold', () => {
-      setupProviderContext({
-        type: Plan.professional,
-        usage: { vectorSpace: 1024 },
-        total: { vectorSpace: 5120 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Pro plan above threshold shows actual value
-      expect(screen.getByText('1024')).toBeInTheDocument()
-    })
-  })
-
-  // Progress bar color logic through real components
-  describe('Progress bar color reflects usage severity', () => {
-    it('should show normal color for low usage percentage', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        usage: { buildApps: 1 },
-        total: { buildApps: 5 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // 20% usage - normal color
-      const progressBars = screen.getAllByTestId('billing-progress-bar')
-      // At least one should have the normal progress color
-      const hasNormalColor = progressBars.some(bar =>
-        bar.classList.contains('bg-components-progress-bar-progress-solid'),
-      )
-      expect(hasNormalColor).toBe(true)
-    })
-  })
-
-  // Reset days calculation in PlanComp
-  describe('Reset days integration', () => {
-    it('should not show reset for sandbox trigger events (no reset_date)', () => {
-      setupProviderContext({
-        type: Plan.sandbox,
-        total: { triggerEvents: 3000 },
-        reset: { triggerEvents: null },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Find the trigger events section - should not have reset text
-      const triggerSection = screen.getByText(/usagePage\.triggerEvents/i)
-      const parent = triggerSection.closest('[class*="flex flex-col"]')
-      // No reset text should appear (sandbox doesn't show reset for triggerEvents)
-      expect(parent?.textContent).not.toContain('usagePage.resetsIn')
-    })
-
-    it('should show reset for professional trigger events with reset date', () => {
-      setupProviderContext({
-        type: Plan.professional,
-        total: { triggerEvents: 20000 },
-        reset: { triggerEvents: 14 },
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Professional plan with finite triggerEvents should show reset
-      const resetTexts = screen.getAllByText(/usagePage\.resetsIn/i)
-      expect(resetTexts.length).toBeGreaterThan(0)
-    })
-  })
-})
-
-// ═══════════════════════════════════════════════════════════════════════════
-// 8. Cross-Component Upgrade Flow (End-to-End)
-// Tests the complete chain: capacity alert → upgrade button → pricing
-// ═══════════════════════════════════════════════════════════════════════════
-describe('Cross-Component Upgrade Flow', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setupAppContext()
-  })
-
-  it('should trigger pricing from AppsFull upgrade button', async () => {
-    const user = userEvent.setup()
-    setupProviderContext({
-      type: Plan.sandbox,
-      usage: { buildApps: 5 },
-      total: { buildApps: 5 },
-    })
-
-    render(<AppsFull loc="app-create" />)
-
-    const upgradeText = screen.getByText(/upgradeBtn\.encourageShort/i)
-    await user.click(upgradeText)
-
-    expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-  })
-
-  it('should trigger pricing from VectorSpaceFull upgrade button', async () => {
-    const user = userEvent.setup()
-    setupProviderContext({
-      type: Plan.sandbox,
-      usage: { vectorSpace: 50 },
-      total: { vectorSpace: 50 },
-    })
-
-    render(<VectorSpaceFull />)
-
-    const upgradeText = screen.getByText(/upgradeBtn\.encourage$/i)
-    await user.click(upgradeText)
-
-    expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-  })
-
-  it('should trigger pricing from AnnotationFull upgrade button', async () => {
-    const user = userEvent.setup()
-    setupProviderContext({
-      type: Plan.sandbox,
-      usage: { annotatedResponse: 10 },
-      total: { annotatedResponse: 10 },
-    })
-
-    render(<AnnotationFull />)
-
-    const upgradeText = screen.getByText(/upgradeBtn\.encourage$/i)
-    await user.click(upgradeText)
-
-    expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-  })
-
-  it('should trigger pricing from TriggerEventsLimitModal through PlanUpgradeModal', async () => {
-    const user = userEvent.setup()
-    const onClose = vi.fn()
-    setupProviderContext({ type: Plan.professional })
-
-    render(
-      <TriggerEventsLimitModal
-        show={true}
-        onClose={onClose}
-        onUpgrade={vi.fn()}
-        usage={20000}
-        total={20000}
-      />,
-    )
-
-    // TriggerEventsLimitModal passes onUpgrade to PlanUpgradeModal
-    // PlanUpgradeModal's upgrade button calls onClose then onUpgrade
-    const upgradeBtn = screen.getByText(/triggerLimitModal\.upgrade/i)
-    await user.click(upgradeBtn)
-
-    expect(onClose).toHaveBeenCalledTimes(1)
-  })
-
-  it('should trigger pricing from AnnotationFullModal upgrade button', async () => {
-    const user = userEvent.setup()
-    setupProviderContext({
-      type: Plan.sandbox,
-      usage: { annotatedResponse: 10 },
-      total: { annotatedResponse: 10 },
-    })
-
-    render(<AnnotationFullModal show={true} onHide={vi.fn()} />)
-
-    const upgradeText = screen.getByText(/upgradeBtn\.encourage$/i)
-    await user.click(upgradeText)
-
-    expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
-  })
-})

web/__tests__/billing/cloud-plan-payment-flow.test.tsx

@@ -1,296 +0,0 @@
-/**
- * Integration test: Cloud Plan Payment Flow
- *
- * Tests the payment flow for cloud plan items:
- *   CloudPlanItem → Button click → permission check → fetch URL → redirect
- *
- * Covers plan comparison, downgrade prevention, monthly/yearly pricing,
- * and workspace manager permission enforcement.
- */
-import type { BasicPlan } from '@/app/components/billing/type'
-import { cleanup, render, screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import { ALL_PLANS } from '@/app/components/billing/config'
-import { PlanRange } from '@/app/components/billing/pricing/plan-switcher/plan-range-switcher'
-import CloudPlanItem from '@/app/components/billing/pricing/plans/cloud-plan-item'
-import { Plan } from '@/app/components/billing/type'
-
-// ─── Mock state ──────────────────────────────────────────────────────────────
-let mockAppCtx: Record<string, unknown> = {}
-const mockFetchSubscriptionUrls = vi.fn()
-const mockInvoices = vi.fn()
-const mockOpenAsyncWindow = vi.fn()
-const mockToastNotify = vi.fn()
-
-// ─── Context mocks ───────────────────────────────────────────────────────────
-vi.mock('@/context/app-context', () => ({
-  useAppContext: () => mockAppCtx,
-}))
-
-vi.mock('@/context/i18n', () => ({
-  useGetLanguage: () => 'en-US',
-}))
-
-// ─── Service mocks ───────────────────────────────────────────────────────────
-vi.mock('@/service/billing', () => ({
-  fetchSubscriptionUrls: (...args: unknown[]) => mockFetchSubscriptionUrls(...args),
-}))
-
-vi.mock('@/service/client', () => ({
-  consoleClient: {
-    billing: {
-      invoices: () => mockInvoices(),
-    },
-  },
-}))
-
-vi.mock('@/hooks/use-async-window-open', () => ({
-  useAsyncWindowOpen: () => mockOpenAsyncWindow,
-}))
-
-vi.mock('@/app/components/base/toast', () => ({
-  default: { notify: (args: unknown) => mockToastNotify(args) },
-}))
-
-// ─── Navigation mocks ───────────────────────────────────────────────────────
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: vi.fn() }),
-  usePathname: () => '/billing',
-  useSearchParams: () => new URLSearchParams(),
-}))
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-const setupAppContext = (overrides: Record<string, unknown> = {}) => {
-  mockAppCtx = {
-    isCurrentWorkspaceManager: true,
-    ...overrides,
-  }
-}
-
-type RenderCloudPlanItemOptions = {
-  currentPlan?: BasicPlan
-  plan?: BasicPlan
-  planRange?: PlanRange
-  canPay?: boolean
-}
-
-const renderCloudPlanItem = ({
-  currentPlan = Plan.sandbox,
-  plan = Plan.professional,
-  planRange = PlanRange.monthly,
-  canPay = true,
-}: RenderCloudPlanItemOptions = {}) => {
-  return render(
-    <CloudPlanItem
-      currentPlan={currentPlan}
-      plan={plan}
-      planRange={planRange}
-      canPay={canPay}
-    />,
-  )
-}
-
-// ═══════════════════════════════════════════════════════════════════════════════
-describe('Cloud Plan Payment Flow', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    cleanup()
-    setupAppContext()
-    mockFetchSubscriptionUrls.mockResolvedValue({ url: 'https://pay.example.com/checkout' })
-    mockInvoices.mockResolvedValue({ url: 'https://billing.example.com/invoices' })
-  })
-
-  // ─── 1. Plan Display ────────────────────────────────────────────────────
-  describe('Plan display', () => {
-    it('should render plan name and description', () => {
-      renderCloudPlanItem({ plan: Plan.professional })
-
-      expect(screen.getByText(/plans\.professional\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plans\.professional\.description/i)).toBeInTheDocument()
-    })
-
-    it('should show "Free" price for sandbox plan', () => {
-      renderCloudPlanItem({ plan: Plan.sandbox })
-
-      expect(screen.getByText(/plansCommon\.free/i)).toBeInTheDocument()
-    })
-
-    it('should show monthly price for paid plans', () => {
-      renderCloudPlanItem({ plan: Plan.professional, planRange: PlanRange.monthly })
-
-      expect(screen.getByText(`$${ALL_PLANS.professional.price}`)).toBeInTheDocument()
-    })
-
-    it('should show yearly discounted price (10 months) and strikethrough original (12 months)', () => {
-      renderCloudPlanItem({ plan: Plan.professional, planRange: PlanRange.yearly })
-
-      const yearlyPrice = ALL_PLANS.professional.price * 10
-      const originalPrice = ALL_PLANS.professional.price * 12
-
-      expect(screen.getByText(`$${yearlyPrice}`)).toBeInTheDocument()
-      expect(screen.getByText(`$${originalPrice}`)).toBeInTheDocument()
-    })
-
-    it('should show "most popular" badge for professional plan', () => {
-      renderCloudPlanItem({ plan: Plan.professional })
-
-      expect(screen.getByText(/plansCommon\.mostPopular/i)).toBeInTheDocument()
-    })
-
-    it('should not show "most popular" badge for sandbox or team plans', () => {
-      const { unmount } = renderCloudPlanItem({ plan: Plan.sandbox })
-      expect(screen.queryByText(/plansCommon\.mostPopular/i)).not.toBeInTheDocument()
-      unmount()
-
-      renderCloudPlanItem({ plan: Plan.team })
-      expect(screen.queryByText(/plansCommon\.mostPopular/i)).not.toBeInTheDocument()
-    })
-  })
-
-  // ─── 2. Button Text Logic ───────────────────────────────────────────────
-  describe('Button text logic', () => {
-    it('should show "Current Plan" when plan matches current plan', () => {
-      renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.professional })
-
-      expect(screen.getByText(/plansCommon\.currentPlan/i)).toBeInTheDocument()
-    })
-
-    it('should show "Start for Free" for sandbox plan when not current', () => {
-      renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.sandbox })
-
-      expect(screen.getByText(/plansCommon\.startForFree/i)).toBeInTheDocument()
-    })
-
-    it('should show "Start Building" for professional plan when not current', () => {
-      renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.professional })
-
-      expect(screen.getByText(/plansCommon\.startBuilding/i)).toBeInTheDocument()
-    })
-
-    it('should show "Get Started" for team plan when not current', () => {
-      renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.team })
-
-      expect(screen.getByText(/plansCommon\.getStarted/i)).toBeInTheDocument()
-    })
-  })
-
-  // ─── 3. Downgrade Prevention ────────────────────────────────────────────
-  describe('Downgrade prevention', () => {
-    it('should disable sandbox button when user is on professional plan (downgrade)', () => {
-      renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.sandbox })
-
-      const button = screen.getByRole('button')
-      expect(button).toBeDisabled()
-    })
-
-    it('should disable sandbox and professional buttons when user is on team plan', () => {
-      const { unmount } = renderCloudPlanItem({ currentPlan: Plan.team, plan: Plan.sandbox })
-      expect(screen.getByRole('button')).toBeDisabled()
-      unmount()
-
-      renderCloudPlanItem({ currentPlan: Plan.team, plan: Plan.professional })
-      expect(screen.getByRole('button')).toBeDisabled()
-    })
-
-    it('should not disable current paid plan button (for invoice management)', () => {
-      renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.professional })
-
-      const button = screen.getByRole('button')
-      expect(button).not.toBeDisabled()
-    })
-
-    it('should enable higher-tier plan buttons for upgrade', () => {
-      renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.team })
-
-      const button = screen.getByRole('button')
-      expect(button).not.toBeDisabled()
-    })
-  })
-
-  // ─── 4. Payment URL Flow ────────────────────────────────────────────────
-  describe('Payment URL flow', () => {
-    it('should call fetchSubscriptionUrls with plan and "month" for monthly range', async () => {
-      const user = userEvent.setup()
-      // Simulate clicking on a professional plan button (user is on sandbox)
-      renderCloudPlanItem({
-        currentPlan: Plan.sandbox,
-        plan: Plan.professional,
-        planRange: PlanRange.monthly,
-      })
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockFetchSubscriptionUrls).toHaveBeenCalledWith(Plan.professional, 'month')
-      })
-    })
-
-    it('should call fetchSubscriptionUrls with plan and "year" for yearly range', async () => {
-      const user = userEvent.setup()
-      renderCloudPlanItem({
-        currentPlan: Plan.sandbox,
-        plan: Plan.team,
-        planRange: PlanRange.yearly,
-      })
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockFetchSubscriptionUrls).toHaveBeenCalledWith(Plan.team, 'year')
-      })
-    })
-
-    it('should open invoice management for current paid plan', async () => {
-      const user = userEvent.setup()
-      renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.professional })
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockOpenAsyncWindow).toHaveBeenCalled()
-      })
-      // Should NOT call fetchSubscriptionUrls (invoice, not subscription)
-      expect(mockFetchSubscriptionUrls).not.toHaveBeenCalled()
-    })
-
-    it('should not do anything when clicking on sandbox free plan button', async () => {
-      const user = userEvent.setup()
-      renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.sandbox })
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      // Wait a tick and verify no actions were taken
-      await waitFor(() => {
-        expect(mockFetchSubscriptionUrls).not.toHaveBeenCalled()
-        expect(mockOpenAsyncWindow).not.toHaveBeenCalled()
-      })
-    })
-  })
-
-  // ─── 5. Permission Check ────────────────────────────────────────────────
-  describe('Permission check', () => {
-    it('should show error toast when non-manager clicks upgrade button', async () => {
-      setupAppContext({ isCurrentWorkspaceManager: false })
-      const user = userEvent.setup()
-      renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.professional })
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockToastNotify).toHaveBeenCalledWith(
-          expect.objectContaining({
-            type: 'error',
-          }),
-        )
-      })
-      // Should not proceed with payment
-      expect(mockFetchSubscriptionUrls).not.toHaveBeenCalled()
-    })
-  })
-})

web/__tests__/billing/education-verification-flow.test.tsx

@@ -1,318 +0,0 @@
-/**
- * Integration test: Education Verification Flow
- *
- * Tests the education plan verification flow in PlanComp:
- *   PlanComp → handleVerify → useEducationVerify → router.push → education-apply
- *   PlanComp → handleVerify → error → show VerifyStateModal
- *
- * Also covers education button visibility based on context flags.
- */
-import type { UsagePlanInfo, UsageResetInfo } from '@/app/components/billing/type'
-import { cleanup, render, screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import { defaultPlan } from '@/app/components/billing/config'
-import PlanComp from '@/app/components/billing/plan'
-import { Plan } from '@/app/components/billing/type'
-
-// ─── Mock state ──────────────────────────────────────────────────────────────
-let mockProviderCtx: Record<string, unknown> = {}
-let mockAppCtx: Record<string, unknown> = {}
-const mockSetShowPricingModal = vi.fn()
-const mockSetShowAccountSettingModal = vi.fn()
-const mockRouterPush = vi.fn()
-const mockMutateAsync = vi.fn()
-
-// ─── Context mocks ───────────────────────────────────────────────────────────
-vi.mock('@/context/provider-context', () => ({
-  useProviderContext: () => mockProviderCtx,
-}))
-
-vi.mock('@/context/app-context', () => ({
-  useAppContext: () => mockAppCtx,
-}))
-
-vi.mock('@/context/modal-context', () => ({
-  useModalContext: () => ({
-    setShowPricingModal: mockSetShowPricingModal,
-  }),
-  useModalContextSelector: (selector: (s: Record<string, unknown>) => unknown) =>
-    selector({
-      setShowAccountSettingModal: mockSetShowAccountSettingModal,
-    }),
-}))
-
-vi.mock('@/context/i18n', () => ({
-  useGetLanguage: () => 'en-US',
-}))
-
-// ─── Service mocks ───────────────────────────────────────────────────────────
-vi.mock('@/service/use-education', () => ({
-  useEducationVerify: () => ({
-    mutateAsync: mockMutateAsync,
-    isPending: false,
-  }),
-}))
-
-vi.mock('@/service/use-billing', () => ({
-  useBillingUrl: () => ({
-    data: 'https://billing.example.com',
-    isFetching: false,
-    refetch: vi.fn(),
-  }),
-}))
-
-// ─── Navigation mocks ───────────────────────────────────────────────────────
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: mockRouterPush }),
-  usePathname: () => '/billing',
-  useSearchParams: () => new URLSearchParams(),
-}))
-
-vi.mock('@/hooks/use-async-window-open', () => ({
-  useAsyncWindowOpen: () => vi.fn(),
-}))
-
-// ─── External component mocks ───────────────────────────────────────────────
-vi.mock('@/app/education-apply/verify-state-modal', () => ({
-  default: ({ isShow, title, content, email, showLink }: {
-    isShow: boolean
-    title?: string
-    content?: string
-    email?: string
-    showLink?: boolean
-  }) =>
-    isShow
-      ? (
-          <div data-testid="verify-state-modal">
-            {title && <span data-testid="modal-title">{title}</span>}
-            {content && <span data-testid="modal-content">{content}</span>}
-            {email && <span data-testid="modal-email">{email}</span>}
-            {showLink && <span data-testid="modal-show-link">link</span>}
-          </div>
-        )
-      : null,
-}))
-
-// ─── Test data factories ────────────────────────────────────────────────────
-type PlanOverrides = {
-  type?: string
-  usage?: Partial<UsagePlanInfo>
-  total?: Partial<UsagePlanInfo>
-  reset?: Partial<UsageResetInfo>
-}
-
-const createPlanData = (overrides: PlanOverrides = {}) => ({
-  ...defaultPlan,
-  ...overrides,
-  type: overrides.type ?? defaultPlan.type,
-  usage: { ...defaultPlan.usage, ...overrides.usage },
-  total: { ...defaultPlan.total, ...overrides.total },
-  reset: { ...defaultPlan.reset, ...overrides.reset },
-})
-
-const setupContexts = (
-  planOverrides: PlanOverrides = {},
-  providerOverrides: Record<string, unknown> = {},
-  appOverrides: Record<string, unknown> = {},
-) => {
-  mockProviderCtx = {
-    plan: createPlanData(planOverrides),
-    enableBilling: true,
-    isFetchedPlan: true,
-    enableEducationPlan: false,
-    isEducationAccount: false,
-    allowRefreshEducationVerify: false,
-    ...providerOverrides,
-  }
-  mockAppCtx = {
-    isCurrentWorkspaceManager: true,
-    userProfile: { email: 'student@university.edu' },
-    langGeniusVersionInfo: { current_version: '1.0.0' },
-    ...appOverrides,
-  }
-}
-
-// ═══════════════════════════════════════════════════════════════════════════════
-describe('Education Verification Flow', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    cleanup()
-    setupContexts()
-  })
-
-  // ─── 1. Education Button Visibility ─────────────────────────────────────
-  describe('Education button visibility', () => {
-    it('should not show verify button when enableEducationPlan is false', () => {
-      setupContexts({}, { enableEducationPlan: false })
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.queryByText(/toVerified/i)).not.toBeInTheDocument()
-    })
-
-    it('should show verify button when enableEducationPlan is true and not yet verified', () => {
-      setupContexts({}, { enableEducationPlan: true, isEducationAccount: false })
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.getByText(/toVerified/i)).toBeInTheDocument()
-    })
-
-    it('should not show verify button when already verified and not about to expire', () => {
-      setupContexts({}, {
-        enableEducationPlan: true,
-        isEducationAccount: true,
-        allowRefreshEducationVerify: false,
-      })
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.queryByText(/toVerified/i)).not.toBeInTheDocument()
-    })
-
-    it('should show verify button when about to expire (allowRefreshEducationVerify is true)', () => {
-      setupContexts({}, {
-        enableEducationPlan: true,
-        isEducationAccount: true,
-        allowRefreshEducationVerify: true,
-      })
-
-      render(<PlanComp loc="test" />)
-
-      // Shown because isAboutToExpire = allowRefreshEducationVerify = true
-      expect(screen.getByText(/toVerified/i)).toBeInTheDocument()
-    })
-  })
-
-  // ─── 2. Successful Verification Flow ────────────────────────────────────
-  describe('Successful verification flow', () => {
-    it('should navigate to education-apply with token on successful verification', async () => {
-      mockMutateAsync.mockResolvedValue({ token: 'edu-token-123' })
-      setupContexts({}, { enableEducationPlan: true, isEducationAccount: false })
-      const user = userEvent.setup()
-
-      render(<PlanComp loc="test" />)
-
-      const verifyButton = screen.getByText(/toVerified/i)
-      await user.click(verifyButton)
-
-      await waitFor(() => {
-        expect(mockMutateAsync).toHaveBeenCalledTimes(1)
-        expect(mockRouterPush).toHaveBeenCalledWith('/education-apply?token=edu-token-123')
-      })
-    })
-
-    it('should remove education verifying flag from localStorage on success', async () => {
-      mockMutateAsync.mockResolvedValue({ token: 'token-xyz' })
-      setupContexts({}, { enableEducationPlan: true, isEducationAccount: false })
-      const user = userEvent.setup()
-
-      render(<PlanComp loc="test" />)
-
-      await user.click(screen.getByText(/toVerified/i))
-
-      await waitFor(() => {
-        expect(localStorage.removeItem).toHaveBeenCalledWith('educationVerifying')
-      })
-    })
-  })
-
-  // ─── 3. Failed Verification Flow ────────────────────────────────────────
-  describe('Failed verification flow', () => {
-    it('should show VerifyStateModal with rejection info on error', async () => {
-      mockMutateAsync.mockRejectedValue(new Error('Verification failed'))
-      setupContexts({}, { enableEducationPlan: true, isEducationAccount: false })
-      const user = userEvent.setup()
-
-      render(<PlanComp loc="test" />)
-
-      // Modal should not be visible initially
-      expect(screen.queryByTestId('verify-state-modal')).not.toBeInTheDocument()
-
-      const verifyButton = screen.getByText(/toVerified/i)
-      await user.click(verifyButton)
-
-      // Modal should appear after verification failure
-      await waitFor(() => {
-        expect(screen.getByTestId('verify-state-modal')).toBeInTheDocument()
-      })
-
-      // Modal should display rejection title and content
-      expect(screen.getByTestId('modal-title')).toHaveTextContent(/rejectTitle/i)
-      expect(screen.getByTestId('modal-content')).toHaveTextContent(/rejectContent/i)
-    })
-
-    it('should show email and link in VerifyStateModal', async () => {
-      mockMutateAsync.mockRejectedValue(new Error('fail'))
-      setupContexts({}, { enableEducationPlan: true, isEducationAccount: false })
-      const user = userEvent.setup()
-
-      render(<PlanComp loc="test" />)
-
-      await user.click(screen.getByText(/toVerified/i))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('modal-email')).toHaveTextContent('student@university.edu')
-        expect(screen.getByTestId('modal-show-link')).toBeInTheDocument()
-      })
-    })
-
-    it('should not redirect on verification failure', async () => {
-      mockMutateAsync.mockRejectedValue(new Error('fail'))
-      setupContexts({}, { enableEducationPlan: true, isEducationAccount: false })
-      const user = userEvent.setup()
-
-      render(<PlanComp loc="test" />)
-
-      await user.click(screen.getByText(/toVerified/i))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('verify-state-modal')).toBeInTheDocument()
-      })
-
-      // Should NOT navigate
-      expect(mockRouterPush).not.toHaveBeenCalled()
-    })
-  })
-
-  // ─── 4. Education + Upgrade Coexistence ─────────────────────────────────
-  describe('Education and upgrade button coexistence', () => {
-    it('should show both education verify and upgrade buttons for sandbox user', () => {
-      setupContexts(
-        { type: Plan.sandbox },
-        { enableEducationPlan: true, isEducationAccount: false },
-      )
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.getByText(/toVerified/i)).toBeInTheDocument()
-      expect(screen.getByText(/upgradeBtn\.encourageShort/i)).toBeInTheDocument()
-    })
-
-    it('should not show upgrade button for enterprise plan', () => {
-      setupContexts(
-        { type: Plan.enterprise },
-        { enableEducationPlan: true, isEducationAccount: false },
-      )
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.getByText(/toVerified/i)).toBeInTheDocument()
-      expect(screen.queryByText(/upgradeBtn\.encourageShort/i)).not.toBeInTheDocument()
-      expect(screen.queryByText(/upgradeBtn\.plain/i)).not.toBeInTheDocument()
-    })
-
-    it('should show team plan with plain upgrade button and education button', () => {
-      setupContexts(
-        { type: Plan.team },
-        { enableEducationPlan: true, isEducationAccount: false },
-      )
-
-      render(<PlanComp loc="test" />)
-
-      expect(screen.getByText(/toVerified/i)).toBeInTheDocument()
-      expect(screen.getByText(/upgradeBtn\.plain/i)).toBeInTheDocument()
-    })
-  })
-})

web/__tests__/billing/partner-stack-flow.test.tsx

@@ -1,326 +0,0 @@
-/**
- * Integration test: Partner Stack Flow
- *
- * Tests the PartnerStack integration:
- *   PartnerStack component → usePSInfo hook → cookie management → bind API call
- *
- * Covers URL param reading, cookie persistence, API bind on mount,
- * cookie cleanup after successful bind, and error handling for 400 status.
- */
-import { act, cleanup, render, renderHook, waitFor } from '@testing-library/react'
-import Cookies from 'js-cookie'
-import * as React from 'react'
-import usePSInfo from '@/app/components/billing/partner-stack/use-ps-info'
-import { PARTNER_STACK_CONFIG } from '@/config'
-
-// ─── Mock state ──────────────────────────────────────────────────────────────
-let mockSearchParams = new URLSearchParams()
-const mockMutateAsync = vi.fn()
-
-// ─── Module mocks ────────────────────────────────────────────────────────────
-vi.mock('next/navigation', () => ({
-  useSearchParams: () => mockSearchParams,
-  useRouter: () => ({ push: vi.fn() }),
-  usePathname: () => '/',
-}))
-
-vi.mock('@/service/use-billing', () => ({
-  useBindPartnerStackInfo: () => ({
-    mutateAsync: mockMutateAsync,
-  }),
-  useBillingUrl: () => ({
-    data: '',
-    isFetching: false,
-    refetch: vi.fn(),
-  }),
-}))
-
-vi.mock('@/config', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    IS_CLOUD_EDITION: true,
-    PARTNER_STACK_CONFIG: {
-      cookieName: 'partner_stack_info',
-      saveCookieDays: 90,
-    },
-  }
-})
-
-// ─── Cookie helpers ──────────────────────────────────────────────────────────
-const getCookieData = () => {
-  const raw = Cookies.get(PARTNER_STACK_CONFIG.cookieName)
-  if (!raw)
-    return null
-  try {
-    return JSON.parse(raw)
-  }
-  catch {
-    return null
-  }
-}
-
-const setCookieData = (data: Record<string, string>) => {
-  Cookies.set(PARTNER_STACK_CONFIG.cookieName, JSON.stringify(data))
-}
-
-const clearCookie = () => {
-  Cookies.remove(PARTNER_STACK_CONFIG.cookieName)
-}
-
-// ═══════════════════════════════════════════════════════════════════════════════
-describe('Partner Stack Flow', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    cleanup()
-    clearCookie()
-    mockSearchParams = new URLSearchParams()
-    mockMutateAsync.mockResolvedValue({})
-  })
-
-  // ─── 1. URL Param Reading ───────────────────────────────────────────────
-  describe('URL param reading', () => {
-    it('should read ps_partner_key and ps_xid from URL search params', () => {
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'partner-123',
-        ps_xid: 'click-456',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-
-      expect(result.current.psPartnerKey).toBe('partner-123')
-      expect(result.current.psClickId).toBe('click-456')
-    })
-
-    it('should fall back to cookie when URL params are not present', () => {
-      setCookieData({ partnerKey: 'cookie-partner', clickId: 'cookie-click' })
-
-      const { result } = renderHook(() => usePSInfo())
-
-      expect(result.current.psPartnerKey).toBe('cookie-partner')
-      expect(result.current.psClickId).toBe('cookie-click')
-    })
-
-    it('should prefer URL params over cookie values', () => {
-      setCookieData({ partnerKey: 'cookie-partner', clickId: 'cookie-click' })
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'url-partner',
-        ps_xid: 'url-click',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-
-      expect(result.current.psPartnerKey).toBe('url-partner')
-      expect(result.current.psClickId).toBe('url-click')
-    })
-
-    it('should return null for both values when no params and no cookie', () => {
-      const { result } = renderHook(() => usePSInfo())
-
-      expect(result.current.psPartnerKey).toBeUndefined()
-      expect(result.current.psClickId).toBeUndefined()
-    })
-  })
-
-  // ─── 2. Cookie Persistence (saveOrUpdate) ───────────────────────────────
-  describe('Cookie persistence via saveOrUpdate', () => {
-    it('should save PS info to cookie when URL params provide new values', () => {
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'new-partner',
-        ps_xid: 'new-click',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-      act(() => result.current.saveOrUpdate())
-
-      const cookieData = getCookieData()
-      expect(cookieData).toEqual({
-        partnerKey: 'new-partner',
-        clickId: 'new-click',
-      })
-    })
-
-    it('should not update cookie when values have not changed', () => {
-      setCookieData({ partnerKey: 'same-partner', clickId: 'same-click' })
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'same-partner',
-        ps_xid: 'same-click',
-      })
-
-      const cookieSetSpy = vi.spyOn(Cookies, 'set')
-      const { result } = renderHook(() => usePSInfo())
-      act(() => result.current.saveOrUpdate())
-
-      // Should not call set because values haven't changed
-      expect(cookieSetSpy).not.toHaveBeenCalled()
-      cookieSetSpy.mockRestore()
-    })
-
-    it('should not save to cookie when partner key is missing', () => {
-      mockSearchParams = new URLSearchParams({
-        ps_xid: 'click-only',
-      })
-
-      const cookieSetSpy = vi.spyOn(Cookies, 'set')
-      const { result } = renderHook(() => usePSInfo())
-      act(() => result.current.saveOrUpdate())
-
-      expect(cookieSetSpy).not.toHaveBeenCalled()
-      cookieSetSpy.mockRestore()
-    })
-
-    it('should not save to cookie when click ID is missing', () => {
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'partner-only',
-      })
-
-      const cookieSetSpy = vi.spyOn(Cookies, 'set')
-      const { result } = renderHook(() => usePSInfo())
-      act(() => result.current.saveOrUpdate())
-
-      expect(cookieSetSpy).not.toHaveBeenCalled()
-      cookieSetSpy.mockRestore()
-    })
-  })
-
-  // ─── 3. Bind API Flow ──────────────────────────────────────────────────
-  describe('Bind API flow', () => {
-    it('should call mutateAsync with partnerKey and clickId on bind', async () => {
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'bind-partner',
-        ps_xid: 'bind-click',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-      await act(async () => {
-        await result.current.bind()
-      })
-
-      expect(mockMutateAsync).toHaveBeenCalledWith({
-        partnerKey: 'bind-partner',
-        clickId: 'bind-click',
-      })
-    })
-
-    it('should remove cookie after successful bind', async () => {
-      setCookieData({ partnerKey: 'rm-partner', clickId: 'rm-click' })
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'rm-partner',
-        ps_xid: 'rm-click',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-      await act(async () => {
-        await result.current.bind()
-      })
-
-      // Cookie should be removed after successful bind
-      expect(Cookies.get(PARTNER_STACK_CONFIG.cookieName)).toBeUndefined()
-    })
-
-    it('should remove cookie on 400 error (already bound)', async () => {
-      mockMutateAsync.mockRejectedValue({ status: 400 })
-      setCookieData({ partnerKey: 'err-partner', clickId: 'err-click' })
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'err-partner',
-        ps_xid: 'err-click',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-      await act(async () => {
-        await result.current.bind()
-      })
-
-      // Cookie should be removed even on 400
-      expect(Cookies.get(PARTNER_STACK_CONFIG.cookieName)).toBeUndefined()
-    })
-
-    it('should not remove cookie on non-400 errors', async () => {
-      mockMutateAsync.mockRejectedValue({ status: 500 })
-      setCookieData({ partnerKey: 'keep-partner', clickId: 'keep-click' })
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'keep-partner',
-        ps_xid: 'keep-click',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-      await act(async () => {
-        await result.current.bind()
-      })
-
-      // Cookie should still exist for non-400 errors
-      const cookieData = getCookieData()
-      expect(cookieData).toBeTruthy()
-    })
-
-    it('should not call bind when partner key is missing', async () => {
-      mockSearchParams = new URLSearchParams({
-        ps_xid: 'click-only',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-      await act(async () => {
-        await result.current.bind()
-      })
-
-      expect(mockMutateAsync).not.toHaveBeenCalled()
-    })
-
-    it('should not call bind a second time (idempotency)', async () => {
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'partner-once',
-        ps_xid: 'click-once',
-      })
-
-      const { result } = renderHook(() => usePSInfo())
-
-      // First bind
-      await act(async () => {
-        await result.current.bind()
-      })
-      expect(mockMutateAsync).toHaveBeenCalledTimes(1)
-
-      // Second bind should be skipped (hasBind = true)
-      await act(async () => {
-        await result.current.bind()
-      })
-      expect(mockMutateAsync).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  // ─── 4. PartnerStack Component Mount ────────────────────────────────────
-  describe('PartnerStack component mount behavior', () => {
-    it('should call saveOrUpdate and bind on mount when IS_CLOUD_EDITION is true', async () => {
-      mockSearchParams = new URLSearchParams({
-        ps_partner_key: 'mount-partner',
-        ps_xid: 'mount-click',
-      })
-
-      // Use lazy import so the mocks are applied
-      const { default: PartnerStack } = await import('@/app/components/billing/partner-stack')
-
-      render(<PartnerStack />)
-
-      // The component calls saveOrUpdate and bind in useEffect
-      await waitFor(() => {
-        // Bind should have been called
-        expect(mockMutateAsync).toHaveBeenCalledWith({
-          partnerKey: 'mount-partner',
-          clickId: 'mount-click',
-        })
-      })
-
-      // Cookie should have been saved (saveOrUpdate was called before bind)
-      // After bind succeeds, cookie is removed
-      expect(Cookies.get(PARTNER_STACK_CONFIG.cookieName)).toBeUndefined()
-    })
-
-    it('should render nothing (return null)', async () => {
-      const { default: PartnerStack } = await import('@/app/components/billing/partner-stack')
-
-      const { container } = render(<PartnerStack />)
-
-      expect(container.innerHTML).toBe('')
-    })
-  })
-})

web/__tests__/billing/pricing-modal-flow.test.tsx

@@ -1,327 +0,0 @@
-/**
- * Integration test: Pricing Modal Flow
- *
- * Tests the full Pricing modal lifecycle:
- *   Pricing → PlanSwitcher (category + range toggle) → Plans (cloud / self-hosted)
- *   → CloudPlanItem / SelfHostedPlanItem → Footer
- *
- * Validates cross-component state propagation when the user switches between
- * cloud / self-hosted categories and monthly / yearly plan ranges.
- */
-import { cleanup, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import { ALL_PLANS } from '@/app/components/billing/config'
-import Pricing from '@/app/components/billing/pricing'
-import { Plan } from '@/app/components/billing/type'
-
-// ─── Mock state ──────────────────────────────────────────────────────────────
-let mockProviderCtx: Record<string, unknown> = {}
-let mockAppCtx: Record<string, unknown> = {}
-
-// ─── Context mocks ───────────────────────────────────────────────────────────
-vi.mock('@/context/provider-context', () => ({
-  useProviderContext: () => mockProviderCtx,
-}))
-
-vi.mock('@/context/app-context', () => ({
-  useAppContext: () => mockAppCtx,
-}))
-
-vi.mock('@/context/i18n', () => ({
-  useGetLanguage: () => 'en-US',
-  useGetPricingPageLanguage: () => 'en',
-}))
-
-// ─── Service mocks ───────────────────────────────────────────────────────────
-vi.mock('@/service/billing', () => ({
-  fetchSubscriptionUrls: vi.fn().mockResolvedValue({ url: 'https://pay.example.com' }),
-}))
-
-vi.mock('@/service/client', () => ({
-  consoleClient: {
-    billing: {
-      invoices: vi.fn().mockResolvedValue({ url: 'https://invoice.example.com' }),
-    },
-  },
-}))
-
-vi.mock('@/hooks/use-async-window-open', () => ({
-  useAsyncWindowOpen: () => vi.fn(),
-}))
-
-// ─── Navigation mocks ───────────────────────────────────────────────────────
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: vi.fn() }),
-  usePathname: () => '/billing',
-  useSearchParams: () => new URLSearchParams(),
-}))
-
-// ─── External component mocks (lightweight) ─────────────────────────────────
-vi.mock('@/app/components/base/icons/src/public/billing', () => ({
-  Azure: () => <span data-testid="icon-azure" />,
-  GoogleCloud: () => <span data-testid="icon-gcloud" />,
-  AwsMarketplaceLight: () => <span data-testid="icon-aws-light" />,
-  AwsMarketplaceDark: () => <span data-testid="icon-aws-dark" />,
-}))
-
-vi.mock('@/hooks/use-theme', () => ({
-  default: () => ({ theme: 'light' }),
-  useTheme: () => ({ theme: 'light' }),
-}))
-
-// Self-hosted List uses t() with returnObjects which returns string in mock;
-// mock it to avoid deep i18n dependency (unit tests cover this component)
-vi.mock('@/app/components/billing/pricing/plans/self-hosted-plan-item/list', () => ({
-  default: ({ plan }: { plan: string }) => (
-    <div data-testid={`self-hosted-list-${plan}`}>Features</div>
-  ),
-}))
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-const defaultPlanData = {
-  type: Plan.sandbox,
-  usage: {
-    buildApps: 1,
-    teamMembers: 1,
-    documentsUploadQuota: 0,
-    vectorSpace: 10,
-    annotatedResponse: 1,
-    triggerEvents: 0,
-    apiRateLimit: 0,
-  },
-  total: {
-    buildApps: 5,
-    teamMembers: 1,
-    documentsUploadQuota: 50,
-    vectorSpace: 50,
-    annotatedResponse: 10,
-    triggerEvents: 3000,
-    apiRateLimit: 5000,
-  },
-}
-
-const setupContexts = (planOverrides: Record<string, unknown> = {}, appOverrides: Record<string, unknown> = {}) => {
-  mockProviderCtx = {
-    plan: { ...defaultPlanData, ...planOverrides },
-    enableBilling: true,
-    isFetchedPlan: true,
-    enableEducationPlan: false,
-    isEducationAccount: false,
-    allowRefreshEducationVerify: false,
-  }
-  mockAppCtx = {
-    isCurrentWorkspaceManager: true,
-    userProfile: { email: 'test@example.com' },
-    langGeniusVersionInfo: { current_version: '1.0.0' },
-    ...appOverrides,
-  }
-}
-
-// ═══════════════════════════════════════════════════════════════════════════════
-describe('Pricing Modal Flow', () => {
-  const onCancel = vi.fn()
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    cleanup()
-    setupContexts()
-  })
-
-  // ─── 1. Initial Rendering ────────────────────────────────────────────────
-  describe('Initial rendering', () => {
-    it('should render header with close button and footer with pricing link', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      // Header close button exists (multiple plan buttons also exist)
-      const buttons = screen.getAllByRole('button')
-      expect(buttons.length).toBeGreaterThanOrEqual(1)
-      // Footer pricing link
-      expect(screen.getByText(/plansCommon\.comparePlanAndFeatures/i)).toBeInTheDocument()
-    })
-
-    it('should default to cloud category with three cloud plans', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      // Three cloud plans: sandbox, professional, team
-      expect(screen.getByText(/plans\.sandbox\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plans\.professional\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plans\.team\.name/i)).toBeInTheDocument()
-    })
-
-    it('should show plan range switcher (annual billing toggle) by default for cloud', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      expect(screen.getByText(/plansCommon\.annualBilling/i)).toBeInTheDocument()
-    })
-
-    it('should show tax tip in footer for cloud category', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      // Use exact match to avoid matching taxTipSecond
-      expect(screen.getByText('billing.plansCommon.taxTip')).toBeInTheDocument()
-      expect(screen.getByText('billing.plansCommon.taxTipSecond')).toBeInTheDocument()
-    })
-  })
-
-  // ─── 2. Category Switching ───────────────────────────────────────────────
-  describe('Category switching', () => {
-    it('should switch to self-hosted plans when clicking self-hosted tab', async () => {
-      const user = userEvent.setup()
-      render(<Pricing onCancel={onCancel} />)
-
-      // Click the self-hosted tab
-      const selfTab = screen.getByText(/plansCommon\.self/i)
-      await user.click(selfTab)
-
-      // Self-hosted plans should appear
-      expect(screen.getByText(/plans\.community\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plans\.premium\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plans\.enterprise\.name/i)).toBeInTheDocument()
-
-      // Cloud plans should disappear
-      expect(screen.queryByText(/plans\.sandbox\.name/i)).not.toBeInTheDocument()
-    })
-
-    it('should hide plan range switcher for self-hosted category', async () => {
-      const user = userEvent.setup()
-      render(<Pricing onCancel={onCancel} />)
-
-      await user.click(screen.getByText(/plansCommon\.self/i))
-
-      // Annual billing toggle should not be visible
-      expect(screen.queryByText(/plansCommon\.annualBilling/i)).not.toBeInTheDocument()
-    })
-
-    it('should hide tax tip in footer for self-hosted category', async () => {
-      const user = userEvent.setup()
-      render(<Pricing onCancel={onCancel} />)
-
-      await user.click(screen.getByText(/plansCommon\.self/i))
-
-      expect(screen.queryByText('billing.plansCommon.taxTip')).not.toBeInTheDocument()
-    })
-
-    it('should switch back to cloud plans when clicking cloud tab', async () => {
-      const user = userEvent.setup()
-      render(<Pricing onCancel={onCancel} />)
-
-      // Switch to self-hosted
-      await user.click(screen.getByText(/plansCommon\.self/i))
-      expect(screen.queryByText(/plans\.sandbox\.name/i)).not.toBeInTheDocument()
-
-      // Switch back to cloud
-      await user.click(screen.getByText(/plansCommon\.cloud/i))
-      expect(screen.getByText(/plans\.sandbox\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plansCommon\.annualBilling/i)).toBeInTheDocument()
-    })
-  })
-
-  // ─── 3. Plan Range Switching (Monthly ↔ Yearly) ──────────────────────────
-  describe('Plan range switching', () => {
-    it('should show monthly prices by default', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      // Professional monthly price: $59
-      const proPriceStr = `$${ALL_PLANS.professional.price}`
-      expect(screen.getByText(proPriceStr)).toBeInTheDocument()
-
-      // Team monthly price: $159
-      const teamPriceStr = `$${ALL_PLANS.team.price}`
-      expect(screen.getByText(teamPriceStr)).toBeInTheDocument()
-    })
-
-    it('should show "Free" for sandbox plan regardless of range', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      expect(screen.getByText(/plansCommon\.free/i)).toBeInTheDocument()
-    })
-
-    it('should show "most popular" badge only for professional plan', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      expect(screen.getByText(/plansCommon\.mostPopular/i)).toBeInTheDocument()
-    })
-  })
-
-  // ─── 4. Cloud Plan Button States ─────────────────────────────────────────
-  describe('Cloud plan button states', () => {
-    it('should show "Current Plan" for the current plan (sandbox)', () => {
-      setupContexts({ type: Plan.sandbox })
-      render(<Pricing onCancel={onCancel} />)
-
-      expect(screen.getByText(/plansCommon\.currentPlan/i)).toBeInTheDocument()
-    })
-
-    it('should show specific button text for non-current plans', () => {
-      setupContexts({ type: Plan.sandbox })
-      render(<Pricing onCancel={onCancel} />)
-
-      // Professional button text
-      expect(screen.getByText(/plansCommon\.startBuilding/i)).toBeInTheDocument()
-      // Team button text
-      expect(screen.getByText(/plansCommon\.getStarted/i)).toBeInTheDocument()
-    })
-
-    it('should mark sandbox as "Current Plan" for professional user (enterprise normalized to team)', () => {
-      setupContexts({ type: Plan.enterprise })
-      render(<Pricing onCancel={onCancel} />)
-
-      // Enterprise is normalized to team for display, so team is "Current Plan"
-      expect(screen.getByText(/plansCommon\.currentPlan/i)).toBeInTheDocument()
-    })
-  })
-
-  // ─── 5. Self-Hosted Plan Details ─────────────────────────────────────────
-  describe('Self-hosted plan details', () => {
-    it('should show cloud provider icons only for premium plan', async () => {
-      const user = userEvent.setup()
-      render(<Pricing onCancel={onCancel} />)
-
-      await user.click(screen.getByText(/plansCommon\.self/i))
-
-      // Premium plan should show Azure and Google Cloud icons
-      expect(screen.getByTestId('icon-azure')).toBeInTheDocument()
-      expect(screen.getByTestId('icon-gcloud')).toBeInTheDocument()
-    })
-
-    it('should show "coming soon" text for premium plan cloud providers', async () => {
-      const user = userEvent.setup()
-      render(<Pricing onCancel={onCancel} />)
-
-      await user.click(screen.getByText(/plansCommon\.self/i))
-
-      expect(screen.getByText(/plans\.premium\.comingSoon/i)).toBeInTheDocument()
-    })
-  })
-
-  // ─── 6. Close Handling ───────────────────────────────────────────────────
-  describe('Close handling', () => {
-    it('should call onCancel when pressing ESC key', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      // ahooks useKeyPress listens on document for keydown events
-      document.dispatchEvent(new KeyboardEvent('keydown', {
-        key: 'Escape',
-        code: 'Escape',
-        keyCode: 27,
-        bubbles: true,
-      }))
-
-      expect(onCancel).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  // ─── 7. Pricing URL ─────────────────────────────────────────────────────
-  describe('Pricing page URL', () => {
-    it('should render pricing link with correct URL', () => {
-      render(<Pricing onCancel={onCancel} />)
-
-      const link = screen.getByText(/plansCommon\.comparePlanAndFeatures/i)
-      expect(link.closest('a')).toHaveAttribute(
-        'href',
-        'https://dify.ai/en/pricing#plans-and-features',
-      )
-    })
-  })
-})

web/__tests__/billing/self-hosted-plan-flow.test.tsx

@@ -1,225 +0,0 @@
-/**
- * Integration test: Self-Hosted Plan Flow
- *
- * Tests the self-hosted plan items:
- *   SelfHostedPlanItem → Button click → permission check → redirect to external URL
- *
- * Covers community/premium/enterprise plan rendering, external URL navigation,
- * and workspace manager permission enforcement.
- */
-import { cleanup, render, screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import { contactSalesUrl, getStartedWithCommunityUrl, getWithPremiumUrl } from '@/app/components/billing/config'
-import SelfHostedPlanItem from '@/app/components/billing/pricing/plans/self-hosted-plan-item'
-import { SelfHostedPlan } from '@/app/components/billing/type'
-
-let mockAppCtx: Record<string, unknown> = {}
-const mockToastNotify = vi.fn()
-
-const originalLocation = window.location
-let assignedHref = ''
-
-vi.mock('@/context/app-context', () => ({
-  useAppContext: () => mockAppCtx,
-}))
-
-vi.mock('@/context/i18n', () => ({
-  useGetLanguage: () => 'en-US',
-}))
-
-vi.mock('@/hooks/use-theme', () => ({
-  default: () => ({ theme: 'light' }),
-  useTheme: () => ({ theme: 'light' }),
-}))
-
-vi.mock('@/app/components/base/icons/src/public/billing', () => ({
-  Azure: () => <span data-testid="icon-azure" />,
-  GoogleCloud: () => <span data-testid="icon-gcloud" />,
-  AwsMarketplaceLight: () => <span data-testid="icon-aws-light" />,
-  AwsMarketplaceDark: () => <span data-testid="icon-aws-dark" />,
-}))
-
-vi.mock('@/app/components/base/toast', () => ({
-  default: { notify: (args: unknown) => mockToastNotify(args) },
-}))
-
-vi.mock('@/app/components/billing/pricing/plans/self-hosted-plan-item/list', () => ({
-  default: ({ plan }: { plan: string }) => (
-    <div data-testid={`self-hosted-list-${plan}`}>Features</div>
-  ),
-}))
-
-const setupAppContext = (overrides: Record<string, unknown> = {}) => {
-  mockAppCtx = {
-    isCurrentWorkspaceManager: true,
-    ...overrides,
-  }
-}
-
-describe('Self-Hosted Plan Flow', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    cleanup()
-    setupAppContext()
-
-    // Mock window.location with minimal getter/setter (Location props are non-enumerable)
-    assignedHref = ''
-    Object.defineProperty(window, 'location', {
-      configurable: true,
-      value: {
-        get href() { return assignedHref },
-        set href(value: string) { assignedHref = value },
-      },
-    })
-  })
-
-  afterEach(() => {
-    // Restore original location
-    Object.defineProperty(window, 'location', {
-      configurable: true,
-      value: originalLocation,
-    })
-  })
-
-  // ─── 1. Plan Rendering ──────────────────────────────────────────────────
-  describe('Plan rendering', () => {
-    it('should render community plan with name and description', () => {
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.community} />)
-
-      expect(screen.getByText(/plans\.community\.name/i)).toBeInTheDocument()
-      expect(screen.getByText(/plans\.community\.description/i)).toBeInTheDocument()
-    })
-
-    it('should render premium plan with cloud provider icons', () => {
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.premium} />)
-
-      expect(screen.getByText(/plans\.premium\.name/i)).toBeInTheDocument()
-      expect(screen.getByTestId('icon-azure')).toBeInTheDocument()
-      expect(screen.getByTestId('icon-gcloud')).toBeInTheDocument()
-    })
-
-    it('should render enterprise plan without cloud provider icons', () => {
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.enterprise} />)
-
-      expect(screen.getByText(/plans\.enterprise\.name/i)).toBeInTheDocument()
-      expect(screen.queryByTestId('icon-azure')).not.toBeInTheDocument()
-    })
-
-    it('should not show price tip for community (free) plan', () => {
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.community} />)
-
-      expect(screen.queryByText(/plans\.community\.priceTip/i)).not.toBeInTheDocument()
-    })
-
-    it('should show price tip for premium plan', () => {
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.premium} />)
-
-      expect(screen.getByText(/plans\.premium\.priceTip/i)).toBeInTheDocument()
-    })
-
-    it('should render features list for each plan', () => {
-      const { unmount: unmount1 } = render(<SelfHostedPlanItem plan={SelfHostedPlan.community} />)
-      expect(screen.getByTestId('self-hosted-list-community')).toBeInTheDocument()
-      unmount1()
-
-      const { unmount: unmount2 } = render(<SelfHostedPlanItem plan={SelfHostedPlan.premium} />)
-      expect(screen.getByTestId('self-hosted-list-premium')).toBeInTheDocument()
-      unmount2()
-
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.enterprise} />)
-      expect(screen.getByTestId('self-hosted-list-enterprise')).toBeInTheDocument()
-    })
-
-    it('should show AWS marketplace icon for premium plan button', () => {
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.premium} />)
-
-      expect(screen.getByTestId('icon-aws-light')).toBeInTheDocument()
-    })
-  })
-
-  // ─── 2. Navigation Flow ─────────────────────────────────────────────────
-  describe('Navigation flow', () => {
-    it('should redirect to GitHub when clicking community plan button', async () => {
-      const user = userEvent.setup()
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.community} />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      expect(assignedHref).toBe(getStartedWithCommunityUrl)
-    })
-
-    it('should redirect to AWS Marketplace when clicking premium plan button', async () => {
-      const user = userEvent.setup()
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.premium} />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      expect(assignedHref).toBe(getWithPremiumUrl)
-    })
-
-    it('should redirect to Typeform when clicking enterprise plan button', async () => {
-      const user = userEvent.setup()
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.enterprise} />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      expect(assignedHref).toBe(contactSalesUrl)
-    })
-  })
-
-  // ─── 3. Permission Check ────────────────────────────────────────────────
-  describe('Permission check', () => {
-    it('should show error toast when non-manager clicks community button', async () => {
-      setupAppContext({ isCurrentWorkspaceManager: false })
-      const user = userEvent.setup()
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.community} />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockToastNotify).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'error' }),
-        )
-      })
-      // Should NOT redirect
-      expect(assignedHref).toBe('')
-    })
-
-    it('should show error toast when non-manager clicks premium button', async () => {
-      setupAppContext({ isCurrentWorkspaceManager: false })
-      const user = userEvent.setup()
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.premium} />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockToastNotify).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'error' }),
-        )
-      })
-      expect(assignedHref).toBe('')
-    })
-
-    it('should show error toast when non-manager clicks enterprise button', async () => {
-      setupAppContext({ isCurrentWorkspaceManager: false })
-      const user = userEvent.setup()
-      render(<SelfHostedPlanItem plan={SelfHostedPlan.enterprise} />)
-
-      const button = screen.getByRole('button')
-      await user.click(button)
-
-      await waitFor(() => {
-        expect(mockToastNotify).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'error' }),
-        )
-      })
-      expect(assignedHref).toBe('')
-    })
-  })
-})

web/__tests__/workflow-parallel-limit.test.tsx

@@ -0,0 +1,261 @@
+/**
+ * MAX_PARALLEL_LIMIT Configuration Bug Test
+ *
+ * This test reproduces and verifies the fix for issue #23083:
+ * MAX_PARALLEL_LIMIT environment variable does not take effect in iteration panel
+ */
+
+import { render, screen } from '@testing-library/react'
+import * as React from 'react'
+
+// Mock environment variables before importing constants
+const originalEnv = process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT
+
+// Test with different environment values
+function setupEnvironment(value?: string) {
+  if (value)
+    process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT = value
+  else
+    delete process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT
+
+  // Clear module cache to force re-evaluation
+  vi.resetModules()
+}
+
+function restoreEnvironment() {
+  if (originalEnv)
+    process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT = originalEnv
+  else
+    delete process.env.NEXT_PUBLIC_MAX_PARALLEL_LIMIT
+
+  vi.resetModules()
+}
+
+// Mock i18next with proper implementation
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string) => {
+      if (key.includes('MaxParallelismTitle'))
+        return 'Max Parallelism'
+      if (key.includes('MaxParallelismDesc'))
+        return 'Maximum number of parallel executions'
+      if (key.includes('parallelMode'))
+        return 'Parallel Mode'
+      if (key.includes('parallelPanelDesc'))
+        return 'Enable parallel execution'
+      if (key.includes('errorResponseMethod'))
+        return 'Error Response Method'
+      return key
+    },
+  }),
+  initReactI18next: {
+    type: '3rdParty',
+    init: vi.fn(),
+  },
+}))
+
+// Mock i18next module completely to prevent initialization issues
+vi.mock('i18next', () => ({
+  use: vi.fn().mockReturnThis(),
+  init: vi.fn().mockReturnThis(),
+  t: vi.fn(key => key),
+  isInitialized: true,
+}))
+
+// Mock the useConfig hook
+vi.mock('@/app/components/workflow/nodes/iteration/use-config', () => ({
+  default: () => ({
+    inputs: {
+      is_parallel: true,
+      parallel_nums: 5,
+      error_handle_mode: 'terminated',
+    },
+    changeParallel: vi.fn(),
+    changeParallelNums: vi.fn(),
+    changeErrorHandleMode: vi.fn(),
+  }),
+}))
+
+// Mock other components
+vi.mock('@/app/components/workflow/nodes/_base/components/variable/var-reference-picker', () => ({
+  default: function MockVarReferencePicker() {
+    return <div data-testid="var-reference-picker">VarReferencePicker</div>
+  },
+}))
+
+vi.mock('@/app/components/workflow/nodes/_base/components/split', () => ({
+  default: function MockSplit() {
+    return <div data-testid="split">Split</div>
+  },
+}))
+
+vi.mock('@/app/components/workflow/nodes/_base/components/field', () => ({
+  default: function MockField({ title, children }: { title: string, children: React.ReactNode }) {
+    return (
+      <div data-testid="field">
+        <label>{title}</label>
+        {children}
+      </div>
+    )
+  },
+}))
+
+const getParallelControls = () => ({
+  numberInput: screen.getByRole('spinbutton'),
+  slider: screen.getByRole('slider'),
+})
+
+describe('MAX_PARALLEL_LIMIT Configuration Bug', () => {
+  const mockNodeData = {
+    id: 'test-iteration-node',
+    type: 'iteration' as const,
+    data: {
+      title: 'Test Iteration',
+      desc: 'Test iteration node',
+      iterator_selector: ['test'],
+      output_selector: ['output'],
+      is_parallel: true,
+      parallel_nums: 5,
+      error_handle_mode: 'terminated' as const,
+    },
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    restoreEnvironment()
+  })
+
+  afterAll(() => {
+    restoreEnvironment()
+  })
+
+  describe('Environment Variable Parsing', () => {
+    it('should parse MAX_PARALLEL_LIMIT from NEXT_PUBLIC_MAX_PARALLEL_LIMIT environment variable', async () => {
+      setupEnvironment('25')
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+      expect(MAX_PARALLEL_LIMIT).toBe(25)
+    })
+
+    it('should fallback to default when environment variable is not set', async () => {
+      setupEnvironment() // No environment variable
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+      expect(MAX_PARALLEL_LIMIT).toBe(10)
+    })
+
+    it('should handle invalid environment variable values', async () => {
+      setupEnvironment('invalid')
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+
+      // Should fall back to default when parsing fails
+      expect(MAX_PARALLEL_LIMIT).toBe(10)
+    })
+
+    it('should handle empty environment variable', async () => {
+      setupEnvironment('')
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+
+      // Should fall back to default when empty
+      expect(MAX_PARALLEL_LIMIT).toBe(10)
+    })
+
+    // Edge cases for boundary values
+    it('should clamp MAX_PARALLEL_LIMIT to MIN when env is 0 or negative', async () => {
+      setupEnvironment('0')
+      let { MAX_PARALLEL_LIMIT } = await import('@/config')
+      expect(MAX_PARALLEL_LIMIT).toBe(10) // Falls back to default
+
+      setupEnvironment('-5')
+      ;({ MAX_PARALLEL_LIMIT } = await import('@/config'))
+      expect(MAX_PARALLEL_LIMIT).toBe(10) // Falls back to default
+    })
+
+    it('should handle float numbers by parseInt behavior', async () => {
+      setupEnvironment('12.7')
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+      // parseInt truncates to integer
+      expect(MAX_PARALLEL_LIMIT).toBe(12)
+    })
+  })
+
+  describe('UI Component Integration (Main Fix Verification)', () => {
+    it('should render iteration panel with environment-configured max value', async () => {
+      // Set environment variable to a different value
+      setupEnvironment('30')
+
+      // Import Panel after setting environment
+      const Panel = await import('@/app/components/workflow/nodes/iteration/panel').then(mod => mod.default)
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+
+      render(
+        <Panel
+          id="test-node"
+          // @ts-expect-error  key type mismatch
+          data={mockNodeData.data}
+        />,
+      )
+
+      // Behavior-focused assertion: UI max should equal MAX_PARALLEL_LIMIT
+      const { numberInput, slider } = getParallelControls()
+      expect(numberInput).toHaveAttribute('max', String(MAX_PARALLEL_LIMIT))
+      expect(slider).toHaveAttribute('aria-valuemax', String(MAX_PARALLEL_LIMIT))
+
+      // Verify the actual values
+      expect(MAX_PARALLEL_LIMIT).toBe(30)
+      expect(numberInput.getAttribute('max')).toBe('30')
+      expect(slider.getAttribute('aria-valuemax')).toBe('30')
+    })
+
+    it('should maintain UI consistency with different environment values', async () => {
+      setupEnvironment('15')
+      const Panel = await import('@/app/components/workflow/nodes/iteration/panel').then(mod => mod.default)
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+
+      render(
+        <Panel
+          id="test-node"
+          // @ts-expect-error  key type mismatch
+          data={mockNodeData.data}
+        />,
+      )
+
+      // Both input and slider should use the same max value from MAX_PARALLEL_LIMIT
+      const { numberInput, slider } = getParallelControls()
+
+      expect(numberInput.getAttribute('max')).toBe(slider.getAttribute('aria-valuemax'))
+      expect(numberInput.getAttribute('max')).toBe(String(MAX_PARALLEL_LIMIT))
+    })
+  })
+
+  describe('Legacy Constant Verification (For Transition Period)', () => {
+    // Marked as transition/deprecation tests
+    it('should maintain MAX_ITERATION_PARALLEL_NUM for backward compatibility', async () => {
+      const { MAX_ITERATION_PARALLEL_NUM } = await import('@/app/components/workflow/constants')
+      expect(typeof MAX_ITERATION_PARALLEL_NUM).toBe('number')
+      expect(MAX_ITERATION_PARALLEL_NUM).toBe(10) // Hardcoded legacy value
+    })
+
+    it('should demonstrate MAX_PARALLEL_LIMIT vs legacy constant difference', async () => {
+      setupEnvironment('50')
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+      const { MAX_ITERATION_PARALLEL_NUM } = await import('@/app/components/workflow/constants')
+
+      // MAX_PARALLEL_LIMIT is configurable, MAX_ITERATION_PARALLEL_NUM is not
+      expect(MAX_PARALLEL_LIMIT).toBe(50)
+      expect(MAX_ITERATION_PARALLEL_NUM).toBe(10)
+      expect(MAX_PARALLEL_LIMIT).not.toBe(MAX_ITERATION_PARALLEL_NUM)
+    })
+  })
+
+  describe('Constants Validation', () => {
+    it('should validate that required constants exist and have correct types', async () => {
+      const { MAX_PARALLEL_LIMIT } = await import('@/config')
+      const { MIN_ITERATION_PARALLEL_NUM } = await import('@/app/components/workflow/constants')
+      expect(typeof MAX_PARALLEL_LIMIT).toBe('number')
+      expect(typeof MIN_ITERATION_PARALLEL_NUM).toBe('number')
+      expect(MAX_PARALLEL_LIMIT).toBeGreaterThanOrEqual(MIN_ITERATION_PARALLEL_NUM)
+    })
+  })
+})

web/app/components/app/configuration/dataset-config/card-item/index.spec.tsx

@@ -3,8 +3,7 @@ import type { MockedFunction } from 'vitest'
 import type { IndexingType } from '@/app/components/datasets/create/step-two'
 import type { DataSet } from '@/models/datasets'
 import type { RetrievalConfig } from '@/types/app'
-import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import { ChunkingMode, DatasetPermission, DataSourceType } from '@/models/datasets'
 import { RETRIEVE_METHOD } from '@/types/app'
@@ -137,6 +136,12 @@ const renderItem = (config: DataSet, props?: Partial<React.ComponentProps<typeof
   return { onSave, onRemove }
 }
 
+const getActionButtons = (card: HTMLElement) => {
+  const actionButtons = Array.from(card.querySelectorAll<HTMLButtonElement>('button.action-btn'))
+  expect(actionButtons).toHaveLength(2)
+  return actionButtons
+}
+
 describe('dataset-config/card-item', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -155,7 +160,7 @@ describe('dataset-config/card-item', () => {
     renderItem(dataset)
 
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
-    const actionButtons = within(card).getAllByRole('button', { hidden: true })
+    const actionButtons = getActionButtons(card)
 
     expect(screen.getByText(dataset.name)).toBeInTheDocument()
     expect(screen.getByText('dataset.indexingTechnique.high_quality · dataset.indexingMethod.semantic_search')).toBeInTheDocument()
@@ -164,20 +169,19 @@ describe('dataset-config/card-item', () => {
   })
 
   it('should open settings drawer from edit action and close after saving', async () => {
-    const user = userEvent.setup()
     const dataset = createDataset()
     const { onSave } = renderItem(dataset)
 
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
-    const [editButton] = within(card).getAllByRole('button', { hidden: true })
-    await user.click(editButton)
+    const [editButton] = getActionButtons(card)
+    fireEvent.click(editButton)
 
     expect(screen.getByText('Mock settings modal')).toBeInTheDocument()
     await waitFor(() => {
       expect(screen.getByRole('dialog')).toBeVisible()
     })
 
-    await user.click(screen.getByText('Save changes'))
+    fireEvent.click(screen.getByRole('button', { name: 'Save changes' }))
 
     await waitFor(() => {
       expect(onSave).toHaveBeenCalledWith(expect.objectContaining({ name: 'Updated dataset' }))
@@ -188,13 +192,11 @@ describe('dataset-config/card-item', () => {
   })
 
   it('should call onRemove and toggle destructive state on hover', async () => {
-    const user = userEvent.setup()
     const dataset = createDataset()
     const { onRemove } = renderItem(dataset)
 
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
-    const buttons = within(card).getAllByRole('button', { hidden: true })
-    const deleteButton = buttons[buttons.length - 1]
+    const [, deleteButton] = getActionButtons(card)
 
     expect(deleteButton.className).not.toContain('action-btn-destructive')
 
@@ -205,7 +207,7 @@ describe('dataset-config/card-item', () => {
     fireEvent.mouseLeave(deleteButton)
     expect(deleteButton.className).not.toContain('action-btn-destructive')
 
-    await user.click(deleteButton)
+    fireEvent.click(deleteButton)
     expect(onRemove).toHaveBeenCalledWith(dataset.id)
   })
 
@@ -223,14 +225,13 @@ describe('dataset-config/card-item', () => {
 
   it('should apply mask overlay on mobile when drawer is open', async () => {
     mockedUseBreakpoints.mockReturnValue(MediaType.mobile)
-    const user = userEvent.setup()
     const dataset = createDataset()
 
     renderItem(dataset)
 
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
-    const [editButton] = within(card).getAllByRole('button', { hidden: true })
-    await user.click(editButton)
+    const [editButton] = getActionButtons(card)
+    fireEvent.click(editButton)
     expect(screen.getByText('Mock settings modal')).toBeInTheDocument()
 
     const overlay = Array.from(document.querySelectorAll('[class]'))

web/app/components/base/badge/index.tsx

@@ -3,6 +3,7 @@ import type { CSSProperties, ReactNode } from 'react'
 import { cva } from 'class-variance-authority'
 import * as React from 'react'
 import { cn } from '@/utils/classnames'
+import './index.css'
 
 enum BadgeState {
   Warning = 'warning',

web/app/components/base/chat/chat/answer/human-input-content/utils.ts

@@ -8,7 +8,6 @@ import { UserActionButtonType } from '@/app/components/workflow/nodes/human-inpu
 import 'dayjs/locale/en'
 import 'dayjs/locale/zh-cn'
 import 'dayjs/locale/ja'
-import 'dayjs/locale/nl'
 
 dayjs.extend(utc)
 dayjs.extend(relativeTime)
@@ -46,7 +45,6 @@ const localeMap: Record<string, string> = {
   'en-US': 'en',
   'zh-Hans': 'zh-cn',
   'ja-JP': 'ja',
-  'nl-NL': 'nl',
 }
 
 export const getRelativeTime = (

web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx

@@ -98,9 +98,7 @@ const VoiceParamConfig = ({
               className="h-full w-full cursor-pointer rounded-lg border-0 bg-components-input-bg-normal py-1.5 pl-3 pr-10 focus-visible:bg-state-base-hover focus-visible:outline-none group-hover:bg-state-base-hover sm:text-sm sm:leading-6"
             >
               <span className={cn('block truncate text-left text-text-secondary', !languageItem?.name && 'text-text-tertiary')}>
-                {languageItem?.name
-                  ? t(`voice.language.${replace(languageItem?.value ?? '', '-', '')}`, languageItem?.name, { ns: 'common' as const })
-                  : localLanguagePlaceholder}
+                {languageItem?.name ? t(`voice.language.${replace(languageItem?.value, '-', '')}`, { ns: 'common' }) : localLanguagePlaceholder}
               </span>
               <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
                 <ChevronDownIcon
@@ -131,7 +129,7 @@ const VoiceParamConfig = ({
                         <span
                           className={cn('block', selected && 'font-normal')}
                         >
-                          {t(`voice.language.${replace((item.value), '-', '')}`, item.name, { ns: 'common' as const })}
+                          {t(`voice.language.${replace((item.value), '-', '')}`, { ns: 'common' })}
                         </span>
                         {(selected || item.value === text2speech?.language) && (
                           <span

web/app/components/base/form/components/field/input-type-select/types.tsx

@@ -1,5 +1,5 @@
 import type { RemixiconComponentType } from '@remixicon/react'
-import * as z from 'zod'
+import { z } from 'zod'
 
 export const InputTypeEnum = z.enum([
   'text-input',

web/app/components/base/form/form-scenarios/base/utils.ts

@@ -1,6 +1,6 @@
 import type { ZodNumber, ZodSchema, ZodString } from 'zod'
 import type { BaseConfiguration } from './types'
-import * as z from 'zod'
+import { z } from 'zod'
 import { BaseFieldType } from './types'
 
 export const generateZodSchema = (fields: BaseConfiguration[]) => {

web/app/components/base/form/form-scenarios/demo/types.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 
 const ContactMethod = z.union([
   z.literal('email'),
@@ -22,10 +22,10 @@ export const UserSchema = z.object({
     .min(3, 'Surname must be at least 3 characters long')
     .regex(/^[A-Z]/, 'Surname must start with a capital letter'),
   isAcceptingTerms: z.boolean().refine(val => val, {
-    error: 'You must accept the terms and conditions',
+    message: 'You must accept the terms and conditions',
   }),
   contact: z.object({
-    email: z.email('Invalid email address'),
+    email: z.string().email('Invalid email address'),
     phone: z.string().optional(),
     preferredContactMethod: ContactMethod,
   }),

web/app/components/base/form/form-scenarios/input-field/utils.ts

@@ -1,6 +1,6 @@
 import type { ZodSchema, ZodString } from 'zod'
 import type { InputFieldConfiguration } from './types'
-import * as z from 'zod'
+import { z } from 'zod'
 import { SupportedFileTypes, TransferMethod } from '@/app/components/rag-pipeline/components/panel/input-field/editor/form/schema'
 import { InputFieldType } from './types'
 

web/app/components/base/param-item/top-k-item.tsx

@@ -2,7 +2,6 @@
 import type { FC } from 'react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import { env } from '@/env'
 import ParamItem from '.'
 
 type Props = {
@@ -12,7 +11,12 @@ type Props = {
   enable: boolean
 }
 
-const maxTopK = env.NEXT_PUBLIC_TOP_K_MAX_VALUE
+const maxTopK = (() => {
+  const configValue = Number.parseInt(globalThis.document?.body?.getAttribute('data-public-top-k-max-value') || '', 10)
+  if (configValue && !isNaN(configValue))
+    return configValue
+  return 10
+})()
 const VALUE_LIMIT = {
   default: 2,
   step: 1,

web/app/components/base/premium-badge/index.tsx

@@ -4,6 +4,7 @@ import { cva } from 'class-variance-authority'
 import * as React from 'react'
 import { Highlight } from '@/app/components/base/icons/src/public/common'
 import { cn } from '@/utils/classnames'
+import './index.css'
 
 const PremiumBadgeVariants = cva(
   'premium-badge',

web/app/components/base/with-input-validation/index.spec.tsx

@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react'
 import { noop } from 'es-toolkit/function'
-import * as z from 'zod'
+import { z } from 'zod'
 import withValidation from '.'
 
 describe('withValidation HOC', () => {

web/app/components/base/with-input-validation/index.stories.tsx

@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import * as z from 'zod'
+import { z } from 'zod'
 import withValidation from '.'
 
 // Sample components to wrap with validation
@@ -65,7 +65,7 @@ const ProductCard = ({ name, price, category, inStock }: ProductCardProps) => {
 // Create validated versions
 const userSchema = z.object({
   name: z.string().min(1, 'Name is required'),
-  email: z.email('Invalid email'),
+  email: z.string().email('Invalid email'),
   age: z.number().min(0).max(150),
 })
 
@@ -371,7 +371,7 @@ export const ConfigurationValidation: Story = {
     )
 
     const configSchema = z.object({
-      apiUrl: z.url('Must be valid URL'),
+      apiUrl: z.string().url('Must be valid URL'),
       timeout: z.number().min(0).max(30000),
       retries: z.number().min(0).max(5),
       debug: z.boolean(),
@@ -430,7 +430,7 @@ export const UsageDocumentation: Story = {
         <div>
           <h4 className="mb-2 text-sm font-semibold text-gray-900">Usage Example</h4>
           <pre className="overflow-x-auto rounded-lg bg-gray-900 p-4 text-xs text-gray-100">
-            {`import * as z from 'zod'
+            {`import { z } from 'zod'
 import withValidation from './withValidation'
 
 // Define your component

web/app/components/billing/__tests__/config.spec.ts

@@ -1,141 +0,0 @@
-import { ALL_PLANS, contactSalesUrl, contractSales, defaultPlan, getStartedWithCommunityUrl, getWithPremiumUrl, NUM_INFINITE, unAvailable } from '../config'
-import { Priority } from '../type'
-
-describe('Billing Config', () => {
-  describe('Constants', () => {
-    it('should define NUM_INFINITE as -1', () => {
-      expect(NUM_INFINITE).toBe(-1)
-    })
-
-    it('should define contractSales string', () => {
-      expect(contractSales).toBe('contractSales')
-    })
-
-    it('should define unAvailable string', () => {
-      expect(unAvailable).toBe('unAvailable')
-    })
-
-    it('should define valid URL constants', () => {
-      expect(contactSalesUrl).toMatch(/^https:\/\//)
-      expect(getStartedWithCommunityUrl).toMatch(/^https:\/\//)
-      expect(getWithPremiumUrl).toMatch(/^https:\/\//)
-    })
-  })
-
-  describe('ALL_PLANS', () => {
-    const requiredFields: (keyof typeof ALL_PLANS.sandbox)[] = [
-      'level',
-      'price',
-      'modelProviders',
-      'teamWorkspace',
-      'teamMembers',
-      'buildApps',
-      'documents',
-      'vectorSpace',
-      'documentsUploadQuota',
-      'documentsRequestQuota',
-      'apiRateLimit',
-      'documentProcessingPriority',
-      'messageRequest',
-      'triggerEvents',
-      'annotatedResponse',
-      'logHistory',
-    ]
-
-    it.each(['sandbox', 'professional', 'team'] as const)('should have all required fields for %s plan', (planKey) => {
-      const plan = ALL_PLANS[planKey]
-      for (const field of requiredFields)
-        expect(plan[field]).toBeDefined()
-    })
-
-    it('should have ascending plan levels: sandbox < professional < team', () => {
-      expect(ALL_PLANS.sandbox.level).toBeLessThan(ALL_PLANS.professional.level)
-      expect(ALL_PLANS.professional.level).toBeLessThan(ALL_PLANS.team.level)
-    })
-
-    it('should have ascending plan prices: sandbox < professional < team', () => {
-      expect(ALL_PLANS.sandbox.price).toBeLessThan(ALL_PLANS.professional.price)
-      expect(ALL_PLANS.professional.price).toBeLessThan(ALL_PLANS.team.price)
-    })
-
-    it('should have sandbox as the free plan', () => {
-      expect(ALL_PLANS.sandbox.price).toBe(0)
-    })
-
-    it('should have ascending team member limits', () => {
-      expect(ALL_PLANS.sandbox.teamMembers).toBeLessThan(ALL_PLANS.professional.teamMembers)
-      expect(ALL_PLANS.professional.teamMembers).toBeLessThan(ALL_PLANS.team.teamMembers)
-    })
-
-    it('should have ascending document processing priority', () => {
-      expect(ALL_PLANS.sandbox.documentProcessingPriority).toBe(Priority.standard)
-      expect(ALL_PLANS.professional.documentProcessingPriority).toBe(Priority.priority)
-      expect(ALL_PLANS.team.documentProcessingPriority).toBe(Priority.topPriority)
-    })
-
-    it('should have unlimited API rate limit for professional and team plans', () => {
-      expect(ALL_PLANS.sandbox.apiRateLimit).not.toBe(NUM_INFINITE)
-      expect(ALL_PLANS.professional.apiRateLimit).toBe(NUM_INFINITE)
-      expect(ALL_PLANS.team.apiRateLimit).toBe(NUM_INFINITE)
-    })
-
-    it('should have unlimited log history for professional and team plans', () => {
-      expect(ALL_PLANS.professional.logHistory).toBe(NUM_INFINITE)
-      expect(ALL_PLANS.team.logHistory).toBe(NUM_INFINITE)
-    })
-
-    it('should have unlimited trigger events only for team plan', () => {
-      expect(ALL_PLANS.sandbox.triggerEvents).not.toBe(NUM_INFINITE)
-      expect(ALL_PLANS.professional.triggerEvents).not.toBe(NUM_INFINITE)
-      expect(ALL_PLANS.team.triggerEvents).toBe(NUM_INFINITE)
-    })
-  })
-
-  describe('defaultPlan', () => {
-    it('should default to sandbox plan type', () => {
-      expect(defaultPlan.type).toBe('sandbox')
-    })
-
-    it('should have usage object with all required fields', () => {
-      const { usage } = defaultPlan
-      expect(usage).toHaveProperty('documents')
-      expect(usage).toHaveProperty('vectorSpace')
-      expect(usage).toHaveProperty('buildApps')
-      expect(usage).toHaveProperty('teamMembers')
-      expect(usage).toHaveProperty('annotatedResponse')
-      expect(usage).toHaveProperty('documentsUploadQuota')
-      expect(usage).toHaveProperty('apiRateLimit')
-      expect(usage).toHaveProperty('triggerEvents')
-    })
-
-    it('should have total object with all required fields', () => {
-      const { total } = defaultPlan
-      expect(total).toHaveProperty('documents')
-      expect(total).toHaveProperty('vectorSpace')
-      expect(total).toHaveProperty('buildApps')
-      expect(total).toHaveProperty('teamMembers')
-      expect(total).toHaveProperty('annotatedResponse')
-      expect(total).toHaveProperty('documentsUploadQuota')
-      expect(total).toHaveProperty('apiRateLimit')
-      expect(total).toHaveProperty('triggerEvents')
-    })
-
-    it('should use sandbox plan API rate limit and trigger events in total', () => {
-      expect(defaultPlan.total.apiRateLimit).toBe(ALL_PLANS.sandbox.apiRateLimit)
-      expect(defaultPlan.total.triggerEvents).toBe(ALL_PLANS.sandbox.triggerEvents)
-    })
-
-    it('should have reset info with null values', () => {
-      expect(defaultPlan.reset.apiRateLimit).toBeNull()
-      expect(defaultPlan.reset.triggerEvents).toBeNull()
-    })
-
-    it('should have usage values not exceeding totals', () => {
-      expect(defaultPlan.usage.documents).toBeLessThanOrEqual(defaultPlan.total.documents)
-      expect(defaultPlan.usage.vectorSpace).toBeLessThanOrEqual(defaultPlan.total.vectorSpace)
-      expect(defaultPlan.usage.buildApps).toBeLessThanOrEqual(defaultPlan.total.buildApps)
-      expect(defaultPlan.usage.teamMembers).toBeLessThanOrEqual(defaultPlan.total.teamMembers)
-      expect(defaultPlan.usage.annotatedResponse).toBeLessThanOrEqual(defaultPlan.total.annotatedResponse)
-    })
-  })
-})

web/app/components/billing/annotation-full/index.spec.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react'
-import AnnotationFull from '../index'
+import AnnotationFull from './index'
 
-vi.mock('../usage', () => ({
+vi.mock('./usage', () => ({
   default: (props: { className?: string }) => {
     return (
       <div data-testid="usage-component" data-classname={props.className ?? ''}>
@@ -11,7 +11,7 @@ vi.mock('../usage', () => ({
   },
 }))
 
-vi.mock('../../upgrade-btn', () => ({
+vi.mock('../upgrade-btn', () => ({
   default: (props: { loc?: string }) => {
     return (
       <button type="button" data-testid="upgrade-btn">
@@ -29,21 +29,27 @@ describe('AnnotationFull', () => {
   // Rendering marketing copy with action button
   describe('Rendering', () => {
     it('should render tips when rendered', () => {
+      // Act
       render(<AnnotationFull />)
 
+      // Assert
       expect(screen.getByText('billing.annotatedResponse.fullTipLine1')).toBeInTheDocument()
       expect(screen.getByText('billing.annotatedResponse.fullTipLine2')).toBeInTheDocument()
     })
 
     it('should render upgrade button when rendered', () => {
+      // Act
       render(<AnnotationFull />)
 
+      // Assert
       expect(screen.getByTestId('upgrade-btn')).toBeInTheDocument()
     })
 
     it('should render Usage component when rendered', () => {
+      // Act
       render(<AnnotationFull />)
 
+      // Assert
       const usageComponent = screen.getByTestId('usage-component')
       expect(usageComponent).toBeInTheDocument()
     })

web/app/components/billing/annotation-full/modal.spec.tsx

@@ -1,7 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import AnnotationFullModal from '../modal'
+import AnnotationFullModal from './modal'
 
-vi.mock('../usage', () => ({
+vi.mock('./usage', () => ({
   default: (props: { className?: string }) => {
     return (
       <div data-testid="usage-component" data-classname={props.className ?? ''}>
@@ -12,7 +12,7 @@ vi.mock('../usage', () => ({
 }))
 
 let mockUpgradeBtnProps: { loc?: string } | null = null
-vi.mock('../../upgrade-btn', () => ({
+vi.mock('../upgrade-btn', () => ({
   default: (props: { loc?: string }) => {
     mockUpgradeBtnProps = props
     return (
@@ -29,7 +29,7 @@ type ModalSnapshot = {
   className?: string
 }
 let mockModalProps: ModalSnapshot | null = null
-vi.mock('../../../base/modal', () => ({
+vi.mock('../../base/modal', () => ({
   default: ({ isShow, children, onClose, closable, className }: { isShow: boolean, children: React.ReactNode, onClose: () => void, closable?: boolean, className?: string }) => {
     mockModalProps = {
       isShow,
@@ -61,8 +61,10 @@ describe('AnnotationFullModal', () => {
   // Rendering marketing copy inside modal
   describe('Rendering', () => {
     it('should display main info when visible', () => {
+      // Act
       render(<AnnotationFullModal show onHide={vi.fn()} />)
 
+      // Assert
       expect(screen.getByText('billing.annotatedResponse.fullTipLine1')).toBeInTheDocument()
       expect(screen.getByText('billing.annotatedResponse.fullTipLine2')).toBeInTheDocument()
       expect(screen.getByTestId('usage-component')).toHaveAttribute('data-classname', 'mt-4')
@@ -79,8 +81,10 @@ describe('AnnotationFullModal', () => {
   // Controlling modal visibility
   describe('Visibility', () => {
     it('should not render content when hidden', () => {
+      // Act
       const { container } = render(<AnnotationFullModal show={false} onHide={vi.fn()} />)
 
+      // Assert
       expect(container).toBeEmptyDOMElement()
       expect(mockModalProps).toEqual(expect.objectContaining({ isShow: false }))
     })
@@ -89,11 +93,14 @@ describe('AnnotationFullModal', () => {
   // Handling close interactions
   describe('Close handling', () => {
     it('should trigger onHide when close control is clicked', () => {
+      // Arrange
       const onHide = vi.fn()
 
+      // Act
       render(<AnnotationFullModal show onHide={onHide} />)
       fireEvent.click(screen.getByTestId('mock-modal-close'))
 
+      // Assert
       expect(onHide).toHaveBeenCalledTimes(1)
     })
   })

web/app/components/billing/annotation-full/usage.spec.tsx

@@ -1,5 +1,11 @@
 import { render, screen } from '@testing-library/react'
-import Usage from '../usage'
+import Usage from './usage'
+
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+}))
 
 const mockPlan = {
   usage: {
@@ -17,25 +23,33 @@ vi.mock('@/context/provider-context', () => ({
 }))
 
 describe('Usage', () => {
+  // Rendering: renders UsageInfo with correct props from context
   describe('Rendering', () => {
     it('should render usage info with data from provider context', () => {
+      // Arrange & Act
       render(<Usage />)
 
-      expect(screen.getByText('billing.annotatedResponse.quotaTitle')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('annotatedResponse.quotaTitle')).toBeInTheDocument()
     })
 
     it('should pass className to UsageInfo component', () => {
+      // Arrange
       const testClassName = 'mt-4'
 
+      // Act
       const { container } = render(<Usage className={testClassName} />)
 
+      // Assert
       const wrapper = container.firstChild as HTMLElement
       expect(wrapper).toHaveClass(testClassName)
     })
 
     it('should display usage and total values from context', () => {
+      // Arrange & Act
       render(<Usage />)
 
+      // Assert
       expect(screen.getByText('50')).toBeInTheDocument()
       expect(screen.getByText('100')).toBeInTheDocument()
     })

web/app/components/billing/apps-full-in-dialog/index.spec.tsx

@@ -8,7 +8,7 @@ import { Plan } from '@/app/components/billing/type'
 import { mailToSupport } from '@/app/components/header/utils/util'
 import { useAppContext } from '@/context/app-context'
 import { baseProviderContextValue, useProviderContext } from '@/context/provider-context'
-import AppsFull from '../index'
+import AppsFull from './index'
 
 vi.mock('@/context/app-context', () => ({
   useAppContext: vi.fn(),
@@ -120,8 +120,10 @@ describe('AppsFull', () => {
   // Rendering behavior for non-team plans.
   describe('Rendering', () => {
     it('should render the sandbox messaging and upgrade button', () => {
+      // Act
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByText('billing.apps.fullTip1')).toBeInTheDocument()
       expect(screen.getByText('billing.apps.fullTip1des')).toBeInTheDocument()
       expect(screen.getByText('billing.upgradeBtn.encourageShort')).toBeInTheDocument()
@@ -129,8 +131,10 @@ describe('AppsFull', () => {
     })
   })
 
+  // Prop-driven behavior for team plans and contact CTA.
   describe('Props', () => {
     it('should render team messaging and contact button for non-sandbox plans', () => {
+      // Arrange
       ;(useProviderContext as Mock).mockReturnValue(buildProviderContext({
         plan: {
           ...baseProviderContextValue.plan,
@@ -145,6 +149,7 @@ describe('AppsFull', () => {
       }))
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByText('billing.apps.fullTip2')).toBeInTheDocument()
       expect(screen.getByText('billing.apps.fullTip2des')).toBeInTheDocument()
       expect(screen.queryByText('billing.upgradeBtn.encourageShort')).not.toBeInTheDocument()
@@ -153,6 +158,7 @@ describe('AppsFull', () => {
     })
 
     it('should render upgrade button for professional plans', () => {
+      // Arrange
       ;(useProviderContext as Mock).mockReturnValue(buildProviderContext({
         plan: {
           ...baseProviderContextValue.plan,
@@ -166,14 +172,17 @@ describe('AppsFull', () => {
         },
       }))
 
+      // Act
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByText('billing.apps.fullTip1')).toBeInTheDocument()
       expect(screen.getByText('billing.upgradeBtn.encourageShort')).toBeInTheDocument()
       expect(screen.queryByText('billing.apps.contactUs')).not.toBeInTheDocument()
     })
 
     it('should render contact button for enterprise plans', () => {
+      // Arrange
       ;(useProviderContext as Mock).mockReturnValue(buildProviderContext({
         plan: {
           ...baseProviderContextValue.plan,
@@ -187,8 +196,10 @@ describe('AppsFull', () => {
         },
       }))
 
+      // Act
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByText('billing.apps.fullTip1')).toBeInTheDocument()
       expect(screen.queryByText('billing.upgradeBtn.encourageShort')).not.toBeInTheDocument()
       expect(screen.getByRole('link', { name: 'billing.apps.contactUs' })).toHaveAttribute('href', 'mailto:support@example.com')
@@ -196,8 +207,10 @@ describe('AppsFull', () => {
     })
   })
 
+  // Edge cases for progress color thresholds.
   describe('Edge Cases', () => {
     it('should use the success color when usage is below 50%', () => {
+      // Arrange
       ;(useProviderContext as Mock).mockReturnValue(buildProviderContext({
         plan: {
           ...baseProviderContextValue.plan,
@@ -211,12 +224,15 @@ describe('AppsFull', () => {
         },
       }))
 
+      // Act
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByTestId('billing-progress-bar')).toHaveClass('bg-components-progress-bar-progress-solid')
     })
 
     it('should use the warning color when usage is between 50% and 80%', () => {
+      // Arrange
       ;(useProviderContext as Mock).mockReturnValue(buildProviderContext({
         plan: {
           ...baseProviderContextValue.plan,
@@ -230,12 +246,15 @@ describe('AppsFull', () => {
         },
       }))
 
+      // Act
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByTestId('billing-progress-bar')).toHaveClass('bg-components-progress-warning-progress')
     })
 
     it('should use the error color when usage is 80% or higher', () => {
+      // Arrange
       ;(useProviderContext as Mock).mockReturnValue(buildProviderContext({
         plan: {
           ...baseProviderContextValue.plan,
@@ -249,8 +268,10 @@ describe('AppsFull', () => {
         },
       }))
 
+      // Act
       render(<AppsFull loc="billing_dialog" />)
 
+      // Assert
       expect(screen.getByTestId('billing-progress-bar')).toHaveClass('bg-components-progress-error-progress')
     })
   })

web/app/components/billing/billing-page/index.spec.tsx

@@ -1,5 +1,5 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import Billing from '../index'
+import Billing from './index'
 
 let currentBillingUrl: string | null = 'https://billing'
 let fetching = false
@@ -33,7 +33,7 @@ vi.mock('@/context/provider-context', () => ({
   }),
 }))
 
-vi.mock('../../plan', () => ({
+vi.mock('../plan', () => ({
   default: ({ loc }: { loc: string }) => <div data-testid="plan-component" data-loc={loc} />,
 }))
 

web/app/components/billing/header-billing-btn/index.spec.tsx

@@ -1,6 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import { Plan } from '../../type'
-import HeaderBillingBtn from '../index'
+import { Plan } from '../type'
+import HeaderBillingBtn from './index'
 
 type HeaderGlobal = typeof globalThis & {
   __mockProviderContext?: ReturnType<typeof vi.fn>
@@ -26,7 +26,7 @@ vi.mock('@/context/provider-context', () => {
   }
 })
 
-vi.mock('../../upgrade-btn', () => ({
+vi.mock('../upgrade-btn', () => ({
   default: () => <button data-testid="upgrade-btn" type="button">Upgrade</button>,
 }))
 
@@ -70,42 +70,6 @@ describe('HeaderBillingBtn', () => {
     expect(screen.getByTestId('upgrade-btn')).toBeInTheDocument()
   })
 
-  it('renders team badge for team plan with correct styling', () => {
-    ensureProviderContextMock().mockReturnValueOnce({
-      plan: { type: Plan.team },
-      enableBilling: true,
-      isFetchedPlan: true,
-    })
-
-    render(<HeaderBillingBtn />)
-
-    const badge = screen.getByText('team').closest('div')
-    expect(badge).toBeInTheDocument()
-    expect(badge).toHaveClass('bg-[#E0EAFF]')
-  })
-
-  it('renders nothing when plan is not fetched', () => {
-    ensureProviderContextMock().mockReturnValueOnce({
-      plan: { type: Plan.professional },
-      enableBilling: true,
-      isFetchedPlan: false,
-    })
-
-    const { container } = render(<HeaderBillingBtn />)
-    expect(container.firstChild).toBeNull()
-  })
-
-  it('renders sandbox upgrade btn with undefined onClick in display-only mode', () => {
-    ensureProviderContextMock().mockReturnValueOnce({
-      plan: { type: Plan.sandbox },
-      enableBilling: true,
-      isFetchedPlan: true,
-    })
-
-    render(<HeaderBillingBtn isDisplayOnly />)
-    expect(screen.getByTestId('upgrade-btn')).toBeInTheDocument()
-  })
-
   it('renders plan badge and forwards clicks when not display-only', () => {
     const onClick = vi.fn()
 

web/app/components/billing/partner-stack/index.spec.tsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import PartnerStack from '../index'
+import PartnerStack from './index'
 
 let isCloudEdition = true
 
@@ -12,7 +12,7 @@ vi.mock('@/config', () => ({
   },
 }))
 
-vi.mock('../use-ps-info', () => ({
+vi.mock('./use-ps-info', () => ({
   default: () => ({
     saveOrUpdate,
     bind,
@@ -40,23 +40,4 @@ describe('PartnerStack', () => {
     expect(saveOrUpdate).toHaveBeenCalledTimes(1)
     expect(bind).toHaveBeenCalledTimes(1)
   })
-
-  it('renders null (no visible DOM)', () => {
-    const { container } = render(<PartnerStack />)
-
-    expect(container.innerHTML).toBe('')
-  })
-
-  it('does not call helpers again on rerender', () => {
-    const { rerender } = render(<PartnerStack />)
-
-    expect(saveOrUpdate).toHaveBeenCalledTimes(1)
-    expect(bind).toHaveBeenCalledTimes(1)
-
-    rerender(<PartnerStack />)
-
-    // useEffect with [] should not run again on rerender
-    expect(saveOrUpdate).toHaveBeenCalledTimes(1)
-    expect(bind).toHaveBeenCalledTimes(1)
-  })
 })

web/app/components/billing/partner-stack/use-ps-info.spec.tsx

@@ -1,6 +1,6 @@
 import { act, renderHook } from '@testing-library/react'
 import { PARTNER_STACK_CONFIG } from '@/config'
-import usePSInfo from '../use-ps-info'
+import usePSInfo from './use-ps-info'
 
 let searchParamsValues: Record<string, string | null> = {}
 const setSearchParams = (values: Record<string, string | null>) => {
@@ -193,107 +193,4 @@ describe('usePSInfo', () => {
       domain: '.dify.ai',
     })
   })
-
-  // Cookie parse failure: covers catch block (L14-16)
-  it('should fall back to empty object when cookie contains invalid JSON', () => {
-    const { get } = ensureCookieMocks()
-    get.mockReturnValue('not-valid-json{{{')
-    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    setSearchParams({
-      ps_partner_key: 'from-url',
-      ps_xid: 'click-url',
-    })
-
-    const { result } = renderHook(() => usePSInfo())
-
-    expect(consoleSpy).toHaveBeenCalledWith(
-      'Failed to parse partner stack info from cookie:',
-      expect.any(SyntaxError),
-    )
-    // Should still pick up values from search params
-    expect(result.current.psPartnerKey).toBe('from-url')
-    expect(result.current.psClickId).toBe('click-url')
-    consoleSpy.mockRestore()
-  })
-
-  // No keys at all: covers saveOrUpdate early return (L30) and bind no-op (L45 false branch)
-  it('should not save or bind when neither search params nor cookie have keys', () => {
-    const { get, set } = ensureCookieMocks()
-    get.mockReturnValue('{}')
-    setSearchParams({})
-
-    const { result } = renderHook(() => usePSInfo())
-
-    expect(result.current.psPartnerKey).toBeUndefined()
-    expect(result.current.psClickId).toBeUndefined()
-
-    act(() => {
-      result.current.saveOrUpdate()
-    })
-    expect(set).not.toHaveBeenCalled()
-  })
-
-  it('should not call mutateAsync when keys are missing during bind', async () => {
-    const { get } = ensureCookieMocks()
-    get.mockReturnValue('{}')
-    setSearchParams({})
-
-    const { result } = renderHook(() => usePSInfo())
-
-    const mutate = ensureMutateAsync()
-    await act(async () => {
-      await result.current.bind()
-    })
-
-    expect(mutate).not.toHaveBeenCalled()
-  })
-
-  // Non-400 error: covers L55 false branch (shouldRemoveCookie stays false)
-  it('should not remove cookie when bind fails with non-400 error', async () => {
-    const mutate = ensureMutateAsync()
-    mutate.mockRejectedValueOnce({ status: 500 })
-    setSearchParams({
-      ps_partner_key: 'bind-partner',
-      ps_xid: 'bind-click',
-    })
-
-    const { result } = renderHook(() => usePSInfo())
-
-    await act(async () => {
-      await result.current.bind()
-    })
-
-    const { remove } = ensureCookieMocks()
-    expect(remove).not.toHaveBeenCalled()
-  })
-
-  // Fallback to cookie values: covers L19-20 right side of || operator
-  it('should use cookie values when search params are absent', () => {
-    const { get } = ensureCookieMocks()
-    get.mockReturnValue(JSON.stringify({
-      partnerKey: 'cookie-partner',
-      clickId: 'cookie-click',
-    }))
-    setSearchParams({})
-
-    const { result } = renderHook(() => usePSInfo())
-
-    expect(result.current.psPartnerKey).toBe('cookie-partner')
-    expect(result.current.psClickId).toBe('cookie-click')
-  })
-
-  // Partial key missing: only partnerKey present, no clickId
-  it('should not save when only one key is available', () => {
-    const { get, set } = ensureCookieMocks()
-    get.mockReturnValue('{}')
-    setSearchParams({ ps_partner_key: 'partial-key' })
-
-    const { result } = renderHook(() => usePSInfo())
-
-    act(() => {
-      result.current.saveOrUpdate()
-    })
-
-    expect(set).not.toHaveBeenCalled()
-  })
 })

web/app/components/billing/plan-upgrade-modal/index.spec.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as React from 'react'
-import PlanUpgradeModal from '../index'
+import PlanUpgradeModal from './index'
 
 const mockSetShowPricingModal = vi.fn()
 
@@ -39,11 +39,13 @@ describe('PlanUpgradeModal', () => {
 
   // Rendering and props-driven content
   it('should render modal with provided content when visible', () => {
+    // Arrange
     const extraInfoText = 'Additional upgrade details'
     renderComponent({
       extraInfo: <div>{extraInfoText}</div>,
     })
 
+    // Assert
     expect(screen.getByText(baseProps.title)).toBeInTheDocument()
     expect(screen.getByText(baseProps.description)).toBeInTheDocument()
     expect(screen.getByText(extraInfoText)).toBeInTheDocument()
@@ -53,32 +55,40 @@ describe('PlanUpgradeModal', () => {
 
   // Guard against rendering when modal is hidden
   it('should not render content when show is false', () => {
+    // Act
     renderComponent({ show: false })
 
+    // Assert
     expect(screen.queryByText(baseProps.title)).not.toBeInTheDocument()
     expect(screen.queryByText(baseProps.description)).not.toBeInTheDocument()
   })
 
   // User closes the modal from dismiss button
   it('should call onClose when dismiss button is clicked', async () => {
+    // Arrange
     const user = userEvent.setup()
     const onClose = vi.fn()
     renderComponent({ onClose })
 
+    // Act
     await user.click(screen.getByText('billing.triggerLimitModal.dismiss'))
 
+    // Assert
     expect(onClose).toHaveBeenCalledTimes(1)
   })
 
   // Upgrade path uses provided callback over pricing modal
   it('should call onUpgrade and onClose when upgrade button is clicked with onUpgrade provided', async () => {
+    // Arrange
     const user = userEvent.setup()
     const onClose = vi.fn()
     const onUpgrade = vi.fn()
     renderComponent({ onClose, onUpgrade })
 
+    // Act
     await user.click(screen.getByText('billing.triggerLimitModal.upgrade'))
 
+    // Assert
     expect(onClose).toHaveBeenCalledTimes(1)
     expect(onUpgrade).toHaveBeenCalledTimes(1)
     expect(mockSetShowPricingModal).not.toHaveBeenCalled()
@@ -86,12 +96,15 @@ describe('PlanUpgradeModal', () => {
 
   // Fallback upgrade path opens pricing modal when no onUpgrade is supplied
   it('should open pricing modal when upgrade button is clicked without onUpgrade', async () => {
+    // Arrange
     const user = userEvent.setup()
     const onClose = vi.fn()
     renderComponent({ onClose, onUpgrade: undefined })
 
+    // Act
     await user.click(screen.getByText('billing.triggerLimitModal.upgrade'))
 
+    // Assert
     expect(onClose).toHaveBeenCalledTimes(1)
     expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
   })

web/app/components/billing/plan/assets/enterprise.spec.tsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import Enterprise from '../enterprise'
+import Enterprise from './enterprise'
 
 describe('Enterprise Icon Component', () => {
   describe('Rendering', () => {

web/app/components/billing/plan/assets/index.spec.tsx

@@ -1,11 +1,11 @@
 import { render } from '@testing-library/react'
-import EnterpriseDirect from '../enterprise'
+import EnterpriseDirect from './enterprise'
 
-import { Enterprise, Professional, Sandbox, Team } from '../index'
-import ProfessionalDirect from '../professional'
+import { Enterprise, Professional, Sandbox, Team } from './index'
+import ProfessionalDirect from './professional'
 // Import real components for comparison
-import SandboxDirect from '../sandbox'
-import TeamDirect from '../team'
+import SandboxDirect from './sandbox'
+import TeamDirect from './team'
 
 describe('Billing Plan Assets - Integration Tests', () => {
   describe('Exports', () => {

web/app/components/billing/plan/assets/professional.spec.tsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import Professional from '../professional'
+import Professional from './professional'
 
 describe('Professional Icon Component', () => {
   describe('Rendering', () => {

web/app/components/billing/plan/assets/sandbox.spec.tsx

@@ -1,6 +1,6 @@
 import { render } from '@testing-library/react'
 import * as React from 'react'
-import Sandbox from '../sandbox'
+import Sandbox from './sandbox'
 
 describe('Sandbox Icon Component', () => {
   describe('Rendering', () => {

web/app/components/billing/plan/assets/team.spec.tsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import Team from '../team'
+import Team from './team'
 
 describe('Team Icon Component', () => {
   describe('Rendering', () => {

web/app/components/billing/plan/index.spec.tsx

@@ -1,7 +1,7 @@
 import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { EDUCATION_VERIFYING_LOCALSTORAGE_ITEM } from '@/app/education-apply/constants'
-import { Plan, SelfHostedPlan } from '../../type'
-import PlanComp from '../index'
+import { Plan } from '../type'
+import PlanComp from './index'
 
 let currentPath = '/billing'
 
@@ -14,7 +14,8 @@ vi.mock('next/navigation', () => ({
 
 const setShowAccountSettingModalMock = vi.fn()
 vi.mock('@/context/modal-context', () => ({
-  useModalContextSelector: (selector: (state: { setShowAccountSettingModal: typeof setShowAccountSettingModalMock }) => unknown) => selector({
+  // eslint-disable-next-line ts/no-explicit-any
+  useModalContextSelector: (selector: any) => selector({
     setShowAccountSettingModal: setShowAccountSettingModalMock,
   }),
 }))
@@ -46,10 +47,11 @@ const verifyStateModalMock = vi.fn(props => (
   </div>
 ))
 vi.mock('@/app/education-apply/verify-state-modal', () => ({
-  default: (props: { isShow: boolean, title?: string, content?: string, email?: string, showLink?: boolean, onConfirm?: () => void, onCancel?: () => void }) => verifyStateModalMock(props),
+  // eslint-disable-next-line ts/no-explicit-any
+  default: (props: any) => verifyStateModalMock(props),
 }))
 
-vi.mock('../../upgrade-btn', () => ({
+vi.mock('../upgrade-btn', () => ({
   default: () => <button data-testid="plan-upgrade-btn" type="button">Upgrade</button>,
 }))
 
@@ -170,66 +172,6 @@ describe('PlanComp', () => {
     expect(screen.getByText('education.toVerified')).toBeInTheDocument()
   })
 
-  it('renders enterprise plan without upgrade button', () => {
-    providerContextMock.mockReturnValue({
-      plan: { ...planMock, type: SelfHostedPlan.enterprise },
-      enableEducationPlan: false,
-      allowRefreshEducationVerify: false,
-      isEducationAccount: false,
-    })
-    render(<PlanComp loc="billing-page" />)
-
-    expect(screen.getByText('billing.plans.enterprise.name')).toBeInTheDocument()
-    expect(screen.queryByTestId('plan-upgrade-btn')).not.toBeInTheDocument()
-  })
-
-  it('shows apiRateLimit reset info for sandbox plan', () => {
-    providerContextMock.mockReturnValue({
-      plan: {
-        ...planMock,
-        type: Plan.sandbox,
-        total: { ...planMock.total, apiRateLimit: 5000 },
-        reset: { ...planMock.reset, apiRateLimit: null },
-      },
-      enableEducationPlan: false,
-      allowRefreshEducationVerify: false,
-      isEducationAccount: false,
-    })
-    render(<PlanComp loc="billing-page" />)
-
-    // Sandbox plan with finite apiRateLimit and null reset uses getDaysUntilEndOfMonth()
-    expect(screen.getByText('billing.plans.sandbox.name')).toBeInTheDocument()
-  })
-
-  it('shows apiRateLimit reset info when reset is a number', () => {
-    providerContextMock.mockReturnValue({
-      plan: {
-        ...planMock,
-        type: Plan.professional,
-        total: { ...planMock.total, apiRateLimit: 5000 },
-        reset: { ...planMock.reset, apiRateLimit: 3 },
-      },
-      enableEducationPlan: false,
-      allowRefreshEducationVerify: false,
-      isEducationAccount: false,
-    })
-    render(<PlanComp loc="billing-page" />)
-
-    expect(screen.getByText('billing.plans.professional.name')).toBeInTheDocument()
-  })
-
-  it('does not show education verify when enableEducationPlan is false', () => {
-    providerContextMock.mockReturnValue({
-      plan: planMock,
-      enableEducationPlan: false,
-      allowRefreshEducationVerify: false,
-      isEducationAccount: false,
-    })
-    render(<PlanComp loc="billing-page" />)
-
-    expect(screen.queryByText('education.toVerified')).not.toBeInTheDocument()
-  })
-
   it('handles modal onConfirm and onCancel callbacks', async () => {
     mutateAsyncMock.mockRejectedValueOnce(new Error('boom'))
     render(<PlanComp loc="billing-page" />)

web/app/components/billing/pricing/assets/__tests__/components.spec.tsx

@@ -1,81 +0,0 @@
-import { render } from '@testing-library/react'
-import {
-  Cloud,
-  Community,
-  Enterprise,
-  EnterpriseNoise,
-  NoiseBottom,
-  NoiseTop,
-  Premium,
-  PremiumNoise,
-  Professional,
-  Sandbox,
-  SelfHosted,
-  Team,
-} from '../index'
-
-// Static SVG components (no props)
-describe('Static Pricing Asset Components', () => {
-  const staticComponents = [
-    { name: 'Community', Component: Community },
-    { name: 'Enterprise', Component: Enterprise },
-    { name: 'EnterpriseNoise', Component: EnterpriseNoise },
-    { name: 'NoiseBottom', Component: NoiseBottom },
-    { name: 'NoiseTop', Component: NoiseTop },
-    { name: 'Premium', Component: Premium },
-    { name: 'PremiumNoise', Component: PremiumNoise },
-    { name: 'Professional', Component: Professional },
-    { name: 'Sandbox', Component: Sandbox },
-    { name: 'Team', Component: Team },
-  ]
-
-  it.each(staticComponents)('$name should render an SVG element', ({ Component }) => {
-    const { container } = render(<Component />)
-    expect(container.querySelector('svg')).toBeInTheDocument()
-  })
-
-  it.each(staticComponents)('$name should render without errors on rerender', ({ Component }) => {
-    const { container, rerender } = render(<Component />)
-    rerender(<Component />)
-    expect(container.querySelector('svg')).toBeInTheDocument()
-  })
-})
-
-// Interactive SVG components with isActive prop
-describe('Cloud', () => {
-  it('should render an SVG element', () => {
-    const { container } = render(<Cloud isActive={false} />)
-    expect(container.querySelector('svg')).toBeInTheDocument()
-  })
-
-  it('should use primary color when inactive', () => {
-    const { container } = render(<Cloud isActive={false} />)
-    const rects = container.querySelectorAll('rect[fill="var(--color-text-primary)"]')
-    expect(rects.length).toBeGreaterThan(0)
-  })
-
-  it('should use accent color when active', () => {
-    const { container } = render(<Cloud isActive={true} />)
-    const rects = container.querySelectorAll('rect[fill="var(--color-saas-dify-blue-accessible)"]')
-    expect(rects.length).toBeGreaterThan(0)
-  })
-})
-
-describe('SelfHosted', () => {
-  it('should render an SVG element', () => {
-    const { container } = render(<SelfHosted isActive={false} />)
-    expect(container.querySelector('svg')).toBeInTheDocument()
-  })
-
-  it('should use primary color when inactive', () => {
-    const { container } = render(<SelfHosted isActive={false} />)
-    const rects = container.querySelectorAll('rect[fill="var(--color-text-primary)"]')
-    expect(rects.length).toBeGreaterThan(0)
-  })
-
-  it('should use accent color when active', () => {
-    const { container } = render(<SelfHosted isActive={true} />)
-    const rects = container.querySelectorAll('rect[fill="var(--color-saas-dify-blue-accessible)"]')
-    expect(rects.length).toBeGreaterThan(0)
-  })
-})

web/app/components/billing/pricing/assets/index.spec.tsx

@@ -12,11 +12,13 @@ import {
   Sandbox,
   SelfHosted,
   Team,
-} from '../index'
+} from './index'
 
 describe('Pricing Assets', () => {
+  // Rendering: each asset should render an svg.
   describe('Rendering', () => {
     it('should render static assets without crashing', () => {
+      // Arrange
       const assets = [
         <Community key="community" />,
         <Enterprise key="enterprise" />,
@@ -42,29 +44,37 @@ describe('Pricing Assets', () => {
   // Props: active state should change fill color for selectable assets.
   describe('Props', () => {
     it('should render active state for Cloud', () => {
+      // Arrange
       const { container } = render(<Cloud isActive />)
 
+      // Assert
       const rects = Array.from(container.querySelectorAll('rect'))
       expect(rects.some(rect => rect.getAttribute('fill') === 'var(--color-saas-dify-blue-accessible)')).toBe(true)
     })
 
     it('should render inactive state for Cloud', () => {
+      // Arrange
       const { container } = render(<Cloud isActive={false} />)
 
+      // Assert
       const rects = Array.from(container.querySelectorAll('rect'))
       expect(rects.some(rect => rect.getAttribute('fill') === 'var(--color-text-primary)')).toBe(true)
     })
 
     it('should render active state for SelfHosted', () => {
+      // Arrange
       const { container } = render(<SelfHosted isActive />)
 
+      // Assert
       const rects = Array.from(container.querySelectorAll('rect'))
       expect(rects.some(rect => rect.getAttribute('fill') === 'var(--color-saas-dify-blue-accessible)')).toBe(true)
     })
 
     it('should render inactive state for SelfHosted', () => {
+      // Arrange
       const { container } = render(<SelfHosted isActive={false} />)
 
+      // Assert
       const rects = Array.from(container.querySelectorAll('rect'))
       expect(rects.some(rect => rect.getAttribute('fill') === 'var(--color-text-primary)')).toBe(true)
     })

web/app/components/billing/pricing/footer.spec.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react'
 import * as React from 'react'
-import { CategoryEnum } from '..'
-import Footer from '../footer'
+import { CategoryEnum } from '.'
+import Footer from './footer'
 
 vi.mock('next/link', () => ({
   default: ({ children, href, className, target }: { children: React.ReactNode, href: string, className?: string, target?: string }) => (
@@ -16,10 +16,13 @@ describe('Footer', () => {
     vi.clearAllMocks()
   })
 
+  // Rendering behavior
   describe('Rendering', () => {
     it('should render tax tips and comparison link when in cloud category', () => {
+      // Arrange
       render(<Footer pricingPageURL="https://dify.ai/pricing#plans-and-features" currentCategory={CategoryEnum.CLOUD} />)
 
+      // Assert
       expect(screen.getByText('billing.plansCommon.taxTip')).toBeInTheDocument()
       expect(screen.getByText('billing.plansCommon.taxTipSecond')).toBeInTheDocument()
       expect(screen.getByTestId('pricing-link')).toHaveAttribute('href', 'https://dify.ai/pricing#plans-and-features')
@@ -27,19 +30,25 @@ describe('Footer', () => {
     })
   })
 
+  // Prop-driven behavior
   describe('Props', () => {
     it('should hide tax tips when category is self-hosted', () => {
+      // Arrange
       render(<Footer pricingPageURL="https://dify.ai/pricing#plans-and-features" currentCategory={CategoryEnum.SELF} />)
 
+      // Assert
       expect(screen.queryByText('billing.plansCommon.taxTip')).not.toBeInTheDocument()
       expect(screen.queryByText('billing.plansCommon.taxTipSecond')).not.toBeInTheDocument()
     })
   })
 
+  // Edge case rendering behavior
   describe('Edge Cases', () => {
     it('should render link even when pricing URL is empty', () => {
+      // Arrange
       render(<Footer pricingPageURL="" currentCategory={CategoryEnum.CLOUD} />)
 
+      // Assert
       expect(screen.getByTestId('pricing-link')).toHaveAttribute('href', '')
     })
   })

web/app/components/billing/pricing/header.spec.tsx

@@ -1,39 +1,74 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
-import Header from '../header'
+import Header from './header'
+
+let mockTranslations: Record<string, string> = {}
+
+vi.mock('react-i18next', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-i18next')>()
+  return {
+    ...actual,
+    useTranslation: () => ({
+      t: (key: string, options?: { ns?: string }) => {
+        if (mockTranslations[key])
+          return mockTranslations[key]
+        const prefix = options?.ns ? `${options.ns}.` : ''
+        return `${prefix}${key}`
+      },
+    }),
+  }
+})
 
 describe('Header', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    mockTranslations = {}
   })
 
+  // Rendering behavior
   describe('Rendering', () => {
     it('should render title and description translations', () => {
+      // Arrange
       const handleClose = vi.fn()
 
+      // Act
       render(<Header onClose={handleClose} />)
 
+      // Assert
       expect(screen.getByText('billing.plansCommon.title.plans')).toBeInTheDocument()
       expect(screen.getByText('billing.plansCommon.title.description')).toBeInTheDocument()
       expect(screen.getByRole('button')).toBeInTheDocument()
     })
   })
 
+  // Prop-driven behavior
   describe('Props', () => {
     it('should invoke onClose when close button is clicked', () => {
+      // Arrange
       const handleClose = vi.fn()
       render(<Header onClose={handleClose} />)
 
+      // Act
       fireEvent.click(screen.getByRole('button'))
 
+      // Assert
       expect(handleClose).toHaveBeenCalledTimes(1)
     })
   })
 
+  // Edge case rendering behavior
   describe('Edge Cases', () => {
-    it('should render structural elements with translation keys', () => {
+    it('should render structure when translations are empty strings', () => {
+      // Arrange
+      mockTranslations = {
+        'billing.plansCommon.title.plans': '',
+        'billing.plansCommon.title.description': '',
+      }
+
+      // Act
       const { container } = render(<Header onClose={vi.fn()} />)
 
+      // Assert
       expect(container.querySelector('span')).toBeInTheDocument()
       expect(container.querySelector('p')).toBeInTheDocument()
       expect(screen.getByRole('button')).toBeInTheDocument()

web/app/components/billing/pricing/index.spec.tsx

@@ -1,24 +1,17 @@
 import type { Mock } from 'vitest'
-import type { UsagePlanInfo } from '../../type'
+import type { UsagePlanInfo } from '../type'
 import { fireEvent, render, screen } from '@testing-library/react'
+import { useKeyPress } from 'ahooks'
 import * as React from 'react'
 import { useAppContext } from '@/context/app-context'
 import { useGetPricingPageLanguage } from '@/context/i18n'
 import { useProviderContext } from '@/context/provider-context'
-import { Plan } from '../../type'
-import Pricing from '../index'
+import { Plan } from '../type'
+import Pricing from './index'
 
+let mockTranslations: Record<string, string> = {}
 let mockLanguage: string | null = 'en'
 
-vi.mock('../plans/self-hosted-plan-item/list', () => ({
-  default: ({ plan }: { plan: string }) => (
-    <div data-testid={`list-${plan}`}>
-      List for
-      {plan}
-    </div>
-  ),
-}))
-
 vi.mock('next/link', () => ({
   default: ({ children, href, className, target }: { children: React.ReactNode, href: string, className?: string, target?: string }) => (
     <a href={href} className={className} target={target} data-testid="pricing-link">
@@ -27,6 +20,10 @@ vi.mock('next/link', () => ({
   ),
 }))
 
+vi.mock('ahooks', () => ({
+  useKeyPress: vi.fn(),
+}))
+
 vi.mock('@/context/app-context', () => ({
   useAppContext: vi.fn(),
 }))
@@ -39,6 +36,24 @@ vi.mock('@/context/i18n', () => ({
   useGetPricingPageLanguage: vi.fn(),
 }))
 
+vi.mock('react-i18next', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-i18next')>()
+  return {
+    ...actual,
+    useTranslation: () => ({
+      t: (key: string, options?: { returnObjects?: boolean, ns?: string }) => {
+        if (options?.returnObjects)
+          return mockTranslations[key] ?? []
+        if (mockTranslations[key])
+          return mockTranslations[key]
+        const prefix = options?.ns ? `${options.ns}.` : ''
+        return `${prefix}${key}`
+      },
+    }),
+    Trans: ({ i18nKey }: { i18nKey: string }) => <span>{i18nKey}</span>,
+  }
+})
+
 const buildUsage = (): UsagePlanInfo => ({
   buildApps: 0,
   teamMembers: 0,
@@ -52,6 +67,7 @@ const buildUsage = (): UsagePlanInfo => ({
 describe('Pricing', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    mockTranslations = {}
     mockLanguage = 'en'
     ;(useAppContext as Mock).mockReturnValue({ isCurrentWorkspaceManager: true })
     ;(useProviderContext as Mock).mockReturnValue({
@@ -64,33 +80,42 @@ describe('Pricing', () => {
     ;(useGetPricingPageLanguage as Mock).mockImplementation(() => mockLanguage)
   })
 
+  // Rendering behavior
   describe('Rendering', () => {
     it('should render pricing header and localized footer link', () => {
+      // Arrange
       render(<Pricing onCancel={vi.fn()} />)
 
+      // Assert
       expect(screen.getByText('billing.plansCommon.title.plans')).toBeInTheDocument()
       expect(screen.getByTestId('pricing-link')).toHaveAttribute('href', 'https://dify.ai/en/pricing#plans-and-features')
     })
   })
 
+  // Prop-driven behavior
   describe('Props', () => {
-    it('should allow switching categories and handle esc key', () => {
+    it('should register esc key handler and allow switching categories', () => {
+      // Arrange
       const handleCancel = vi.fn()
       render(<Pricing onCancel={handleCancel} />)
 
+      // Act
       fireEvent.click(screen.getByText('billing.plansCommon.self'))
-      expect(screen.queryByRole('switch')).not.toBeInTheDocument()
 
-      fireEvent.keyDown(window, { key: 'Escape', keyCode: 27 })
-      expect(handleCancel).toHaveBeenCalled()
+      // Assert
+      expect(useKeyPress).toHaveBeenCalledWith(['esc'], handleCancel)
+      expect(screen.queryByRole('switch')).not.toBeInTheDocument()
     })
   })
 
+  // Edge case rendering behavior
   describe('Edge Cases', () => {
     it('should fall back to default pricing URL when language is empty', () => {
+      // Arrange
       mockLanguage = ''
       render(<Pricing onCancel={vi.fn()} />)
 
+      // Assert
       expect(screen.getByTestId('pricing-link')).toHaveAttribute('href', 'https://dify.ai/pricing#plans-and-features')
     })
   })

web/app/components/billing/pricing/plan-switcher/index.spec.tsx

@@ -1,16 +1,36 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
-import { CategoryEnum } from '../../index'
-import PlanSwitcher from '../index'
-import { PlanRange } from '../plan-range-switcher'
+import { CategoryEnum } from '../index'
+import PlanSwitcher from './index'
+import { PlanRange } from './plan-range-switcher'
+
+let mockTranslations: Record<string, string> = {}
+
+vi.mock('react-i18next', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-i18next')>()
+  return {
+    ...actual,
+    useTranslation: () => ({
+      t: (key: string, options?: { ns?: string }) => {
+        if (key in mockTranslations)
+          return mockTranslations[key]
+        const prefix = options?.ns ? `${options.ns}.` : ''
+        return `${prefix}${key}`
+      },
+    }),
+  }
+})
 
 describe('PlanSwitcher', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    mockTranslations = {}
   })
 
+  // Rendering behavior
   describe('Rendering', () => {
     it('should render category tabs and plan range switcher for cloud', () => {
+      // Arrange
       render(
         <PlanSwitcher
           currentCategory={CategoryEnum.CLOUD}
@@ -20,14 +40,17 @@ describe('PlanSwitcher', () => {
         />,
       )
 
+      // Assert
       expect(screen.getByText('billing.plansCommon.cloud')).toBeInTheDocument()
       expect(screen.getByText('billing.plansCommon.self')).toBeInTheDocument()
       expect(screen.getByRole('switch')).toBeInTheDocument()
     })
   })
 
+  // Prop-driven behavior
   describe('Props', () => {
     it('should call onChangeCategory when selecting a tab', () => {
+      // Arrange
       const handleChangeCategory = vi.fn()
       render(
         <PlanSwitcher
@@ -38,13 +61,16 @@ describe('PlanSwitcher', () => {
         />,
       )
 
+      // Act
       fireEvent.click(screen.getByText('billing.plansCommon.self'))
 
+      // Assert
       expect(handleChangeCategory).toHaveBeenCalledTimes(1)
       expect(handleChangeCategory).toHaveBeenCalledWith(CategoryEnum.SELF)
     })
 
     it('should hide plan range switcher when category is self-hosted', () => {
+      // Arrange
       render(
         <PlanSwitcher
           currentCategory={CategoryEnum.SELF}
@@ -54,12 +80,21 @@ describe('PlanSwitcher', () => {
         />,
       )
 
+      // Assert
       expect(screen.queryByRole('switch')).not.toBeInTheDocument()
     })
   })
 
+  // Edge case rendering behavior
   describe('Edge Cases', () => {
-    it('should render tabs with translation keys', () => {
+    it('should render tabs when translation strings are empty', () => {
+      // Arrange
+      mockTranslations = {
+        'plansCommon.cloud': '',
+        'plansCommon.self': '',
+      }
+
+      // Act
       const { container } = render(
         <PlanSwitcher
           currentCategory={CategoryEnum.SELF}
@@ -69,10 +104,11 @@ describe('PlanSwitcher', () => {
         />,
       )
 
+      // Assert
       const labels = container.querySelectorAll('span')
       expect(labels).toHaveLength(2)
-      expect(labels[0]?.textContent).toBe('billing.plansCommon.cloud')
-      expect(labels[1]?.textContent).toBe('billing.plansCommon.self')
+      expect(labels[0]?.textContent).toBe('')
+      expect(labels[1]?.textContent).toBe('')
     })
   })
 })

web/app/components/billing/pricing/plan-switcher/plan-range-switcher.spec.tsx

@@ -1,50 +1,86 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
-import PlanRangeSwitcher, { PlanRange } from '../plan-range-switcher'
+import PlanRangeSwitcher, { PlanRange } from './plan-range-switcher'
+
+let mockTranslations: Record<string, string> = {}
+
+vi.mock('react-i18next', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('react-i18next')>()
+  return {
+    ...actual,
+    useTranslation: () => ({
+      t: (key: string, options?: { ns?: string }) => {
+        if (mockTranslations[key])
+          return mockTranslations[key]
+        const prefix = options?.ns ? `${options.ns}.` : ''
+        return `${prefix}${key}`
+      },
+    }),
+  }
+})
 
 describe('PlanRangeSwitcher', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    mockTranslations = {}
   })
 
+  // Rendering behavior
   describe('Rendering', () => {
     it('should render the annual billing label', () => {
+      // Arrange
       render(<PlanRangeSwitcher value={PlanRange.monthly} onChange={vi.fn()} />)
 
-      expect(screen.getByText(/billing\.plansCommon\.annualBilling/)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('billing.plansCommon.annualBilling')).toBeInTheDocument()
       expect(screen.getByRole('switch')).toHaveAttribute('aria-checked', 'false')
     })
   })
 
+  // Prop-driven behavior
   describe('Props', () => {
     it('should switch to yearly when toggled from monthly', () => {
+      // Arrange
       const handleChange = vi.fn()
       render(<PlanRangeSwitcher value={PlanRange.monthly} onChange={handleChange} />)
 
+      // Act
       fireEvent.click(screen.getByRole('switch'))
 
+      // Assert
       expect(handleChange).toHaveBeenCalledTimes(1)
       expect(handleChange).toHaveBeenCalledWith(PlanRange.yearly)
     })
 
     it('should switch to monthly when toggled from yearly', () => {
+      // Arrange
       const handleChange = vi.fn()
       render(<PlanRangeSwitcher value={PlanRange.yearly} onChange={handleChange} />)
 
+      // Act
       fireEvent.click(screen.getByRole('switch'))
 
+      // Assert
       expect(handleChange).toHaveBeenCalledTimes(1)
       expect(handleChange).toHaveBeenCalledWith(PlanRange.monthly)
     })
   })
 
+  // Edge case rendering behavior
   describe('Edge Cases', () => {
-    it('should render label with translation key and params', () => {
-      render(<PlanRangeSwitcher value={PlanRange.monthly} onChange={vi.fn()} />)
+    it('should render when the translation string is empty', () => {
+      // Arrange
+      mockTranslations = {
+        'billing.plansCommon.annualBilling': '',
+      }
 
-      const label = screen.getByText(/billing\.plansCommon\.annualBilling/)
+      // Act
+      const { container } = render(<PlanRangeSwitcher value={PlanRange.monthly} onChange={vi.fn()} />)
+
+      // Assert
+      const label = container.querySelector('span')
       expect(label).toBeInTheDocument()
-      expect(label.textContent).toContain('percent')
+      expect(label?.textContent).toBe('')
     })
   })
 })

web/app/components/billing/pricing/plan-switcher/tab.spec.tsx

@@ -1,6 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
-import Tab from '../tab'
+import Tab from './tab'
 
 const Icon = ({ isActive }: { isActive: boolean }) => (
   <svg data-testid="tab-icon" data-active={isActive ? 'true' : 'false'} />
@@ -11,8 +11,10 @@ describe('PlanSwitcherTab', () => {
     vi.clearAllMocks()
   })
 
+  // Rendering behavior
   describe('Rendering', () => {
     it('should render label and icon', () => {
+      // Arrange
       render(
         <Tab
           Icon={Icon}
@@ -23,13 +25,16 @@ describe('PlanSwitcherTab', () => {
         />,
       )
 
+      // Assert
       expect(screen.getByText('Cloud')).toBeInTheDocument()
       expect(screen.getByTestId('tab-icon')).toHaveAttribute('data-active', 'false')
     })
   })
 
+  // Prop-driven behavior
   describe('Props', () => {
     it('should call onClick with the provided value', () => {
+      // Arrange
       const handleClick = vi.fn()
       render(
         <Tab
@@ -41,13 +46,16 @@ describe('PlanSwitcherTab', () => {
         />,
       )
 
+      // Act
       fireEvent.click(screen.getByText('Self'))
 
+      // Assert
       expect(handleClick).toHaveBeenCalledTimes(1)
       expect(handleClick).toHaveBeenCalledWith('self')
     })
 
     it('should apply active text class when isActive is true', () => {
+      // Arrange
       render(
         <Tab
           Icon={Icon}
@@ -58,13 +66,16 @@ describe('PlanSwitcherTab', () => {
         />,
       )
 
+      // Assert
       expect(screen.getByText('Cloud')).toHaveClass('text-saas-dify-blue-accessible')
       expect(screen.getByTestId('tab-icon')).toHaveAttribute('data-active', 'true')
     })
   })
 
+  // Edge case rendering behavior
   describe('Edge Cases', () => {
     it('should render when label is empty', () => {
+      // Arrange
       const { container } = render(
         <Tab
           Icon={Icon}
@@ -75,6 +86,7 @@ describe('PlanSwitcherTab', () => {
         />,
       )
 
+      // Assert
       const label = container.querySelector('span')
       expect(label).toBeInTheDocument()
       expect(label?.textContent).toBe('')

web/app/components/billing/pricing/plans/cloud-plan-item/button.spec.tsx

@@ -1,12 +1,13 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
-import { Plan } from '../../../../type'
-import Button from '../button'
+import { Plan } from '../../../type'
+import Button from './button'
 
 describe('CloudPlanButton', () => {
   describe('Disabled state', () => {
     it('should disable button and hide arrow when plan is not available', () => {
       const handleGetPayUrl = vi.fn()
+      // Arrange
       render(
         <Button
           plan={Plan.team}
@@ -17,6 +18,7 @@ describe('CloudPlanButton', () => {
       )
 
       const button = screen.getByRole('button', { name: /Get started/i })
+      // Assert
       expect(button).toBeDisabled()
       expect(button.className).toContain('cursor-not-allowed')
       expect(handleGetPayUrl).not.toHaveBeenCalled()
@@ -26,6 +28,7 @@ describe('CloudPlanButton', () => {
   describe('Enabled state', () => {
     it('should invoke handler and render arrow when plan is available', () => {
       const handleGetPayUrl = vi.fn()
+      // Arrange
       render(
         <Button
           plan={Plan.sandbox}
@@ -36,8 +39,10 @@ describe('CloudPlanButton', () => {
       )
 
       const button = screen.getByRole('button', { name: /Start now/i })
+      // Act
       fireEvent.click(button)
 
+      // Assert
       expect(handleGetPayUrl).toHaveBeenCalledTimes(1)
       expect(button).not.toBeDisabled()
     })

web/app/components/billing/pricing/plans/cloud-plan-item/index.spec.tsx

@@ -5,13 +5,13 @@ import { useAppContext } from '@/context/app-context'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import { fetchSubscriptionUrls } from '@/service/billing'
 import { consoleClient } from '@/service/client'
-import Toast from '../../../../../base/toast'
-import { ALL_PLANS } from '../../../../config'
-import { Plan } from '../../../../type'
-import { PlanRange } from '../../../plan-switcher/plan-range-switcher'
-import CloudPlanItem from '../index'
+import Toast from '../../../../base/toast'
+import { ALL_PLANS } from '../../../config'
+import { Plan } from '../../../type'
+import { PlanRange } from '../../plan-switcher/plan-range-switcher'
+import CloudPlanItem from './index'
 
-vi.mock('../../../../../base/toast', () => ({
+vi.mock('../../../../base/toast', () => ({
   default: {
     notify: vi.fn(),
   },
@@ -37,7 +37,7 @@ vi.mock('@/hooks/use-async-window-open', () => ({
   useAsyncWindowOpen: vi.fn(),
 }))
 
-vi.mock('../../../assets', () => ({
+vi.mock('../../assets', () => ({
   Sandbox: () => <div>Sandbox Icon</div>,
   Professional: () => <div>Professional Icon</div>,
   Team: () => <div>Team Icon</div>,
@@ -66,6 +66,13 @@ beforeAll(() => {
   })
 })
 
+afterAll(() => {
+  Object.defineProperty(window, 'location', {
+    configurable: true,
+    value: originalLocation,
+  })
+})
+
 beforeEach(() => {
   vi.clearAllMocks()
   mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: true })
@@ -75,13 +82,6 @@ beforeEach(() => {
   assignedHref = ''
 })
 
-afterAll(() => {
-  Object.defineProperty(window, 'location', {
-    configurable: true,
-    value: originalLocation,
-  })
-})
-
 describe('CloudPlanItem', () => {
   // Static content for each plan
   describe('Rendering', () => {
@@ -117,32 +117,6 @@ describe('CloudPlanItem', () => {
       expect(screen.getByText(/billing\.plansCommon\.priceTip.*billing\.plansCommon\.year/)).toBeInTheDocument()
     })
 
-    it('should show "most popular" badge for professional plan', () => {
-      render(
-        <CloudPlanItem
-          plan={Plan.professional}
-          currentPlan={Plan.sandbox}
-          planRange={PlanRange.monthly}
-          canPay
-        />,
-      )
-
-      expect(screen.getByText('billing.plansCommon.mostPopular')).toBeInTheDocument()
-    })
-
-    it('should not show "most popular" badge for non-professional plans', () => {
-      render(
-        <CloudPlanItem
-          plan={Plan.team}
-          currentPlan={Plan.sandbox}
-          planRange={PlanRange.monthly}
-          canPay
-        />,
-      )
-
-      expect(screen.queryByText('billing.plansCommon.mostPopular')).not.toBeInTheDocument()
-    })
-
     it('should disable CTA when workspace already on higher tier', () => {
       render(
         <CloudPlanItem
@@ -218,128 +192,5 @@ describe('CloudPlanItem', () => {
         expect(assignedHref).toBe('https://subscription.example')
       })
     })
-
-    // Covers L92-93: isFreePlan guard inside handleGetPayUrl
-    it('should do nothing when clicking sandbox plan CTA that is not the current plan', async () => {
-      render(
-        <CloudPlanItem
-          plan={Plan.sandbox}
-          currentPlan={Plan.professional}
-          planRange={PlanRange.monthly}
-          canPay
-        />,
-      )
-
-      // Sandbox viewed from a higher plan is disabled, but let's verify no API calls
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      await waitFor(() => {
-        expect(mockFetchSubscriptionUrls).not.toHaveBeenCalled()
-        expect(mockBillingInvoices).not.toHaveBeenCalled()
-        expect(assignedHref).toBe('')
-      })
-    })
-
-    // Covers L95: yearly subscription URL ('year' parameter)
-    it('should fetch yearly subscription url when planRange is yearly', async () => {
-      render(
-        <CloudPlanItem
-          plan={Plan.team}
-          currentPlan={Plan.sandbox}
-          planRange={PlanRange.yearly}
-          canPay
-        />,
-      )
-
-      fireEvent.click(screen.getByRole('button', { name: 'billing.plansCommon.getStarted' }))
-
-      await waitFor(() => {
-        expect(mockFetchSubscriptionUrls).toHaveBeenCalledWith(Plan.team, 'year')
-        expect(assignedHref).toBe('https://subscription.example')
-      })
-    })
-
-    // Covers L62-63: loading guard prevents double click
-    it('should ignore second click while loading', async () => {
-      // Make the first fetch hang until we resolve it
-      let resolveFirst!: (v: { url: string }) => void
-      mockFetchSubscriptionUrls.mockImplementationOnce(
-        () => new Promise((resolve) => { resolveFirst = resolve }),
-      )
-
-      render(
-        <CloudPlanItem
-          plan={Plan.professional}
-          currentPlan={Plan.sandbox}
-          planRange={PlanRange.monthly}
-          canPay
-        />,
-      )
-
-      const button = screen.getByRole('button', { name: 'billing.plansCommon.startBuilding' })
-
-      // First click starts loading
-      fireEvent.click(button)
-      // Second click while loading should be ignored
-      fireEvent.click(button)
-
-      // Resolve first request
-      resolveFirst({ url: 'https://first.example' })
-
-      await waitFor(() => {
-        expect(mockFetchSubscriptionUrls).toHaveBeenCalledTimes(1)
-      })
-    })
-
-    // Covers L82-83, L85-87: openAsyncWindow error path when invoices returns no url
-    it('should invoke onError when billing invoices returns empty url', async () => {
-      mockBillingInvoices.mockResolvedValue({ url: '' })
-      const openWindow = vi.fn(async (cb: () => Promise<string>, opts: { onError?: (e: Error) => void }) => {
-        try {
-          await cb()
-        }
-        catch (e) {
-          opts.onError?.(e as Error)
-        }
-      })
-      mockUseAsyncWindowOpen.mockReturnValue(openWindow)
-
-      render(
-        <CloudPlanItem
-          plan={Plan.professional}
-          currentPlan={Plan.professional}
-          planRange={PlanRange.monthly}
-          canPay
-        />,
-      )
-
-      fireEvent.click(screen.getByRole('button', { name: 'billing.plansCommon.currentPlan' }))
-
-      await waitFor(() => {
-        expect(openWindow).toHaveBeenCalledTimes(1)
-        // The onError callback should have been passed to openAsyncWindow
-        const callArgs = openWindow.mock.calls[0]
-        expect(callArgs[1]).toHaveProperty('onError')
-      })
-    })
-
-    // Covers monthly price display (L139 !isYear branch for price)
-    it('should display monthly pricing without discount', () => {
-      render(
-        <CloudPlanItem
-          plan={Plan.team}
-          currentPlan={Plan.sandbox}
-          planRange={PlanRange.monthly}
-          canPay
-        />,
-      )
-
-      const teamPlan = ALL_PLANS[Plan.team]
-      expect(screen.getByText(`$${teamPlan.price}`)).toBeInTheDocument()
-      expect(screen.getByText(/billing\.plansCommon\.priceTip.*billing\.plansCommon\.month/)).toBeInTheDocument()
-      // Should NOT show crossed-out yearly price
-      expect(screen.queryByText(`$${teamPlan.price * 12}`)).not.toBeInTheDocument()
-    })
   })
 })

web/app/components/billing/pricing/plans/cloud-plan-item/list/index.spec.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react'
 import * as React from 'react'
-import { Plan } from '../../../../../type'
-import List from '../index'
+import { Plan } from '../../../../type'
+import List from './index'
 
 describe('CloudPlanItem/List', () => {
   it('should show sandbox specific quotas', () => {

web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.spec.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import Item from '../index'
+import Item from './index'
 
 describe('Item', () => {
   beforeEach(() => {
@@ -9,10 +9,13 @@ describe('Item', () => {
   // Rendering the plan item row
   describe('Rendering', () => {
     it('should render the provided label when tooltip is absent', () => {
+      // Arrange
       const label = 'Monthly credits'
 
+      // Act
       const { container } = render(<Item label={label} />)
 
+      // Assert
       expect(screen.getByText(label)).toBeInTheDocument()
       expect(container.querySelector('.group')).toBeNull()
     })
@@ -21,21 +24,27 @@ describe('Item', () => {
   // Toggling the optional tooltip indicator
   describe('Tooltip behavior', () => {
     it('should render tooltip content when tooltip text is provided', () => {
+      // Arrange
       const label = 'Workspace seats'
       const tooltip = 'Seats define how many teammates can join the workspace.'
 
+      // Act
       const { container } = render(<Item label={label} tooltip={tooltip} />)
 
+      // Assert
       expect(screen.getByText(label)).toBeInTheDocument()
       expect(screen.getByText(tooltip)).toBeInTheDocument()
       expect(container.querySelector('.group')).not.toBeNull()
     })
 
     it('should treat an empty tooltip string as absent', () => {
+      // Arrange
       const label = 'Vector storage'
 
+      // Act
       const { container } = render(<Item label={label} tooltip="" />)
 
+      // Assert
       expect(screen.getByText(label)).toBeInTheDocument()
       expect(container.querySelector('.group')).toBeNull()
     })

web/app/components/billing/pricing/plans/cloud-plan-item/list/item/tooltip.spec.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import Tooltip from '../tooltip'
+import Tooltip from './tooltip'
 
 describe('Tooltip', () => {
   beforeEach(() => {
@@ -9,20 +9,26 @@ describe('Tooltip', () => {
   // Rendering the info tooltip container
   describe('Rendering', () => {
     it('should render the content panel when provide with text', () => {
+      // Arrange
       const content = 'Usage resets on the first day of every month.'
 
+      // Act
       render(<Tooltip content={content} />)
 
+      // Assert
       expect(() => screen.getByText(content)).not.toThrow()
     })
   })
 
   describe('Icon rendering', () => {
     it('should render the icon when provided with content', () => {
+      // Arrange
       const content = 'Tooltips explain each plan detail.'
 
+      // Act
       render(<Tooltip content={content} />)
 
+      // Assert
       expect(screen.getByTestId('tooltip-icon')).toBeInTheDocument()
     })
   })
@@ -30,6 +36,7 @@ describe('Tooltip', () => {
   // Handling empty strings while keeping structure consistent
   describe('Edge cases', () => {
     it('should render without crashing when passed empty content', () => {
+      // Arrange
       const content = ''
 
       // Act and Assert

web/app/components/billing/pricing/plans/index.spec.tsx

@@ -1,14 +1,14 @@
 import type { Mock } from 'vitest'
-import type { UsagePlanInfo } from '../../../type'
+import type { UsagePlanInfo } from '../../type'
 import { render, screen } from '@testing-library/react'
 import * as React from 'react'
-import { Plan } from '../../../type'
-import { PlanRange } from '../../plan-switcher/plan-range-switcher'
-import cloudPlanItem from '../cloud-plan-item'
-import Plans from '../index'
-import selfHostedPlanItem from '../self-hosted-plan-item'
+import { Plan } from '../../type'
+import { PlanRange } from '../plan-switcher/plan-range-switcher'
+import cloudPlanItem from './cloud-plan-item'
+import Plans from './index'
+import selfHostedPlanItem from './self-hosted-plan-item'
 
-vi.mock('../cloud-plan-item', () => ({
+vi.mock('./cloud-plan-item', () => ({
   default: vi.fn(props => (
     <div data-testid={`cloud-plan-${props.plan}`} data-current-plan={props.currentPlan}>
       Cloud
@@ -18,7 +18,7 @@ vi.mock('../cloud-plan-item', () => ({
   )),
 }))
 
-vi.mock('../self-hosted-plan-item', () => ({
+vi.mock('./self-hosted-plan-item', () => ({
   default: vi.fn(props => (
     <div data-testid={`self-plan-${props.plan}`}>
       Self

web/app/components/billing/pricing/plans/self-hosted-plan-item/button.spec.tsx

@@ -3,8 +3,8 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
 import useTheme from '@/hooks/use-theme'
 import { Theme } from '@/types/app'
-import { SelfHostedPlan } from '../../../../type'
-import Button from '../button'
+import { SelfHostedPlan } from '../../../type'
+import Button from './button'
 
 vi.mock('@/hooks/use-theme')
 

web/app/components/billing/pricing/plans/self-hosted-plan-item/index.spec.tsx

@@ -2,21 +2,30 @@ import type { Mock } from 'vitest'
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
 import { useAppContext } from '@/context/app-context'
-import Toast from '../../../../../base/toast'
-import { contactSalesUrl, getStartedWithCommunityUrl, getWithPremiumUrl } from '../../../../config'
-import { SelfHostedPlan } from '../../../../type'
-import SelfHostedPlanItem from '../index'
+import Toast from '../../../../base/toast'
+import { contactSalesUrl, getStartedWithCommunityUrl, getWithPremiumUrl } from '../../../config'
+import { SelfHostedPlan } from '../../../type'
+import SelfHostedPlanItem from './index'
 
-vi.mock('../list', () => ({
-  default: ({ plan }: { plan: string }) => (
-    <div data-testid={`list-${plan}`}>
-      List for
-      {plan}
-    </div>
-  ),
+const featuresTranslations: Record<string, string[]> = {
+  'billing.plans.community.features': ['community-feature-1', 'community-feature-2'],
+  'billing.plans.premium.features': ['premium-feature-1'],
+  'billing.plans.enterprise.features': ['enterprise-feature-1'],
+}
+
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string, options?: Record<string, unknown>) => {
+      const prefix = options?.ns ? `${options.ns}.` : ''
+      if (options?.returnObjects)
+        return featuresTranslations[`${prefix}${key}`] || []
+      return `${prefix}${key}`
+    },
+  }),
+  Trans: ({ i18nKey, ns }: { i18nKey: string, ns?: string }) => <span>{ns ? `${ns}.${i18nKey}` : i18nKey}</span>,
 }))
 
-vi.mock('../../../../../base/toast', () => ({
+vi.mock('../../../../base/toast', () => ({
   default: {
     notify: vi.fn(),
   },
@@ -26,7 +35,7 @@ vi.mock('@/context/app-context', () => ({
   useAppContext: vi.fn(),
 }))
 
-vi.mock('../../../assets', () => ({
+vi.mock('../../assets', () => ({
   Community: () => <div>Community Icon</div>,
   Premium: () => <div>Premium Icon</div>,
   Enterprise: () => <div>Enterprise Icon</div>,
@@ -54,12 +63,6 @@ beforeAll(() => {
   })
 })
 
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: true })
-  assignedHref = ''
-})
-
 afterAll(() => {
   Object.defineProperty(window, 'location', {
     configurable: true,
@@ -67,7 +70,14 @@ afterAll(() => {
   })
 })
 
+beforeEach(() => {
+  vi.clearAllMocks()
+  mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: true })
+  assignedHref = ''
+})
+
 describe('SelfHostedPlanItem', () => {
+  // Copy rendering for each plan
   describe('Rendering', () => {
     it('should display community plan info', () => {
       render(<SelfHostedPlanItem plan={SelfHostedPlan.community} />)
@@ -75,7 +85,8 @@ describe('SelfHostedPlanItem', () => {
       expect(screen.getByText('billing.plans.community.name')).toBeInTheDocument()
       expect(screen.getByText('billing.plans.community.description')).toBeInTheDocument()
       expect(screen.getByText('billing.plans.community.price')).toBeInTheDocument()
-      expect(screen.getByTestId('list-community')).toBeInTheDocument()
+      expect(screen.getByText('billing.plans.community.includesTitle')).toBeInTheDocument()
+      expect(screen.getByText('community-feature-1')).toBeInTheDocument()
     })
 
     it('should show premium extras such as cloud provider notice', () => {
@@ -86,6 +97,7 @@ describe('SelfHostedPlanItem', () => {
     })
   })
 
+  // CTA behavior for each plan
   describe('CTA interactions', () => {
     it('should show toast when non-manager tries to proceed', () => {
       mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: false })

web/app/components/billing/pricing/plans/self-hosted-plan-item/list/__tests__/index.spec.tsx

@@ -1,20 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import * as React from 'react'
-import { SelfHostedPlan } from '@/app/components/billing/type'
-import { createReactI18nextMock } from '@/test/i18n-mock'
-import List from '../index'
-
-// Override global i18n mock to support returnObjects: true for feature arrays
-vi.mock('react-i18next', () => createReactI18nextMock({
-  'billing.plans.community.features': ['Feature A', 'Feature B'],
-}))
-
-describe('SelfHostedPlanItem/List', () => {
-  it('should render plan info', () => {
-    render(<List plan={SelfHostedPlan.community} />)
-
-    expect(screen.getByText('plans.community.includesTitle')).toBeInTheDocument()
-    expect(screen.getByText('Feature A')).toBeInTheDocument()
-    expect(screen.getByText('Feature B')).toBeInTheDocument()
-  })
-})