Merge remote-tracking branch 'origin/main' into deploy/saas

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

api/.env.example

@@ -666,7 +666,6 @@ PLUGIN_REMOTE_INSTALL_PORT=5003
 PLUGIN_REMOTE_INSTALL_HOST=localhost
 PLUGIN_MAX_PACKAGE_SIZE=15728640
 PLUGIN_MODEL_SCHEMA_CACHE_TTL=3600
-PLUGIN_MODEL_PROVIDERS_CACHE_ENABLED=true
 PLUGIN_MODEL_PROVIDERS_CACHE_TTL=86400
 # Comma-separated marketplace plugin IDs whose latest versions are installed for newly registered users.
 # Example: langgenius/openai,langgenius/gemini
@@ -678,8 +677,6 @@ INNER_API_KEY_FOR_PLUGIN=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y
 
 # Dify Agent backend
 AGENT_BACKEND_BASE_URL=http://localhost:5050
-# Bearer token sent to the Agent backend /runs API. Must match DIFY_AGENT_API_TOKEN on the server side.
-AGENT_BACKEND_API_TOKEN=dify-agent-run-token-for-dev-only
 AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS=30
 AGENT_BACKEND_STREAM_MAX_RECONNECTS=3
 AGENT_BACKEND_RUN_TIMEOUT_SECONDS=1200

api/app_factory.py

@@ -1,13 +1,10 @@
 import logging
 import time
-from collections.abc import Callable
-from typing import NamedTuple
 
 import socketio
 from flask import request
 from opentelemetry.trace import get_current_span
 from opentelemetry.trace.span import INVALID_SPAN_ID, INVALID_TRACE_ID
-from werkzeug.exceptions import Forbidden, HTTPException, ServiceUnavailable
 
 from configs import dify_config
 from contexts.wrapper import RecyclableContextVar
@@ -45,53 +42,6 @@ _CONSOLE_EXEMPT_PREFIXES = (
     "/console/api/activate/check",
 )
 
-_WEBAPP_EXEMPT_PREFIXES = ("/api/system-features",)
-
-_INVALID_LICENSE_STATUSES = (LicenseStatus.INACTIVE, LicenseStatus.EXPIRED, LicenseStatus.LOST)
-
-
-def _session_surface_error(license_status: LicenseStatus | None) -> HTTPException:
-    if license_status is None:
-        return UnauthorizedAndForceLogout("Unable to verify enterprise license. Please contact your administrator.")
-    return UnauthorizedAndForceLogout(f"Enterprise license is {license_status}. Please contact your administrator.")
-
-
-def _bearer_surface_error(license_status: LicenseStatus | None) -> HTTPException:
-    """Token-authed: forcing a logout is meaningless and license state must not leak."""
-    return Forbidden(description="license_required")
-
-
-def _retryable_surface_error(license_status: LicenseStatus | None) -> HTTPException:
-    """Webhook senders retry on 5xx but treat 4xx as permanent, disabling the subscription."""
-    return ServiceUnavailable(description="license_required")
-
-
-class _LicenseGatedSurface(NamedTuple):
-    prefix: str
-    exempt_prefixes: tuple[str, ...]
-    build_error: Callable[[LicenseStatus | None], HTTPException]
-
-
-# /files (plugin-daemon data plane), /inner/api (enterprise control plane) and /health
-# stay ungated: blocking them breaks workflow execution or license recovery itself.
-_LICENSE_GATED_SURFACES = (
-    _LicenseGatedSurface("/console/api/", _CONSOLE_EXEMPT_PREFIXES, _session_surface_error),
-    _LicenseGatedSurface("/api/", _WEBAPP_EXEMPT_PREFIXES, _session_surface_error),
-    _LicenseGatedSurface("/v1", (), _bearer_surface_error),
-    _LicenseGatedSurface("/mcp", (), _bearer_surface_error),
-    _LicenseGatedSurface("/triggers", (), _retryable_surface_error),
-)
-
-
-def _match_license_gated_surface(path: str) -> _LicenseGatedSurface | None:
-    for surface in _LICENSE_GATED_SURFACES:
-        if not path.startswith(surface.prefix):
-            continue
-        if any(path.startswith(exempt) for exempt in surface.exempt_prefixes):
-            return None
-        return surface
-    return None
-
 
 # ----------------------------
 # Application Factory Function
@@ -112,17 +62,38 @@ def create_flask_app_with_configs() -> DifyApp:
         init_request_context()
         RecyclableContextVar.increment_thread_recycles()
 
+        # Enterprise license validation for API endpoints (both console and webapp)
+        # When license expires, block all API access except bootstrap endpoints needed
+        # for the frontend to load the license expiration page without infinite reloads.
         if dify_config.ENTERPRISE_ENABLED:
-            surface = _match_license_gated_surface(request.path)
-            if surface is not None:
-                try:
-                    license_status = EnterpriseService.get_cached_license_status()
-                except Exception:
-                    logger.exception("Failed to check enterprise license status")
-                    license_status = None
+            is_console_api = request.path.startswith("/console/api/")
+            is_webapp_api = request.path.startswith("/api/")
 
-                if license_status is None or license_status in _INVALID_LICENSE_STATUSES:
-                    raise surface.build_error(license_status)
+            if is_console_api or is_webapp_api:
+                if is_console_api:
+                    is_exempt = any(request.path.startswith(p) for p in _CONSOLE_EXEMPT_PREFIXES)
+                else:  # webapp API
+                    is_exempt = request.path.startswith("/api/system-features")
+
+                if not is_exempt:
+                    try:
+                        # Check license status (cached — see EnterpriseService for TTL details)
+                        license_status = EnterpriseService.get_cached_license_status()
+                        if license_status in (LicenseStatus.INACTIVE, LicenseStatus.EXPIRED, LicenseStatus.LOST):
+                            raise UnauthorizedAndForceLogout(
+                                f"Enterprise license is {license_status}. Please contact your administrator."
+                            )
+                        if license_status is None:
+                            raise UnauthorizedAndForceLogout(
+                                "Unable to verify enterprise license. Please contact your administrator."
+                            )
+                    except UnauthorizedAndForceLogout:
+                        raise
+                    except Exception:
+                        logger.exception("Failed to check enterprise license status")
+                        raise UnauthorizedAndForceLogout(
+                            "Unable to verify enterprise license. Please contact your administrator."
+                        )
 
     # add after request hook for injecting trace headers from OpenTelemetry span context
     # Only adds headers when OTEL is enabled and has valid context

api/clients/agent_backend/factory.py

@@ -11,7 +11,6 @@ from clients.agent_backend.fake_client import FakeAgentBackendRunClient, FakeAge
 def create_agent_backend_run_client(
     *,
     base_url: str | None = None,
-    api_token: str | None = None,
     use_fake: bool = False,
     fake_scenario: str | FakeAgentBackendScenario = FakeAgentBackendScenario.SUCCESS,
     stream_read_timeout_seconds: float = 30,
@@ -23,11 +22,8 @@ def create_agent_backend_run_client(
         return FakeAgentBackendRunClient(scenario=FakeAgentBackendScenario(fake_scenario))
     if base_url is None:
         raise ValueError("base_url is required when creating a real Agent backend client")
-    headers: dict[str, str] = {}
-    if api_token:
-        headers["Authorization"] = f"Bearer {api_token}"
     return DifyAgentBackendRunClient(
-        Client(base_url=base_url, stream_timeout=stream_read_timeout_seconds, headers=headers),
+        Client(base_url=base_url, stream_timeout=stream_read_timeout_seconds),
         stream_max_reconnects=stream_max_reconnects,
         stream_timeout_seconds=stream_run_timeout_seconds,
     )

api/configs/extra/agent_backend_config.py

@@ -12,11 +12,6 @@ class AgentBackendConfig(BaseSettings):
         default=None,
     )
 
-    AGENT_BACKEND_API_TOKEN: str | None = Field(
-        description="Bearer token for authenticating with the Agent backend /runs API.",
-        default=None,
-    )
-
     AGENT_BACKEND_USE_FAKE: bool = Field(
         description="Use the deterministic in-process fake Agent backend client.",
         default=False,

api/configs/feature/__init__.py

@@ -266,12 +266,6 @@ class PluginConfig(BaseSettings):
         default=60 * 60,
     )
 
-    PLUGIN_MODEL_PROVIDERS_CACHE_ENABLED: bool = Field(
-        description="Whether tenant plugin model providers are cached in Redis. Disable when plugins are installed "
-        "by a system other than this one, which cannot invalidate the cache when a tenant's plugins change.",
-        default=True,
-    )
-
     PLUGIN_MODEL_PROVIDERS_CACHE_TTL: PositiveInt = Field(
         description="TTL in seconds for caching tenant plugin model providers in Redis",
         default=60 * 60 * 24,

api/controllers/console/app/app.py

@@ -58,7 +58,6 @@ from services.app_service import (
     AppResponseView,
     AppService,
     CreateAppParams,
-    RecentAppMode,
     StarredAppListParams,
 )
 from services.enterprise import rbac_service as enterprise_rbac_service
@@ -140,10 +139,6 @@ class AppListBaseQuery(BaseModel):
             raise ValueError("Invalid UUID format in creator_ids.") from exc
 
 
-class RecentAppListQuery(BaseModel):
-    limit: int = Field(default=8, ge=1, le=8, description="Number of recently modified apps to return (1-8)")
-
-
 class AppListQuery(AppListBaseQuery):
     pass
 
@@ -416,33 +411,6 @@ class AppPartial(AppResponseModel):
         return to_timestamp(value)
 
 
-class RecentAppResponse(ResponseModel):
-    id: str
-    name: str
-    icon_type: IconType | None = None
-    icon: str | None = None
-    icon_background: str | None = None
-    mode: RecentAppMode
-    author_name: str | None = None
-    updated_at: int
-    permission_keys: list[str] = Field(default_factory=list)
-    maintainer: str | None = None
-
-    @computed_field(return_type=str | None)  # type: ignore[prop-decorator]
-    @property
-    def icon_url(self) -> str | None:
-        return build_icon_url(self.icon_type, self.icon)
-
-    @field_validator("updated_at", mode="before")
-    @classmethod
-    def _normalize_timestamp(cls, value: datetime | int) -> int:
-        return to_timestamp(value)
-
-
-class RecentAppListResponse(ResponseModel):
-    data: list[RecentAppResponse]
-
-
 class AppDetail(AppResponseModel):
     id: str
     name: str
@@ -607,8 +575,6 @@ register_schema_models(
 register_response_schema_models(
     console_ns,
     AppPartial,
-    RecentAppResponse,
-    RecentAppListResponse,
     AppDetailWithSite,
     AppPagination,
 )
@@ -733,49 +699,6 @@ class AppListApi(Resource):
         return app_detail.model_dump(mode="json"), 201
 
 
-@console_ns.route("/apps/recent")
-class RecentAppListApi(Resource):
-    @console_ns.doc("list_recent_apps")
-    @console_ns.doc(description="Get recently modified apps for the home Continue Work section")
-    @console_ns.doc(params=query_params_from_model(RecentAppListQuery))
-    @console_ns.response(200, "Success", console_ns.models[RecentAppListResponse.__name__])
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @enterprise_license_required
-    @with_session(write=False)
-    @with_current_user_id
-    @with_current_tenant_id
-    def get(self, current_tenant_id: str, current_user_id: str, session: Session):
-        """Return the lightweight app cards needed by the Explore home page."""
-        args = query_params_from_request(RecentAppListQuery)
-        params = AppListParams(limit=args.limit)
-
-        permissions = enterprise_rbac_service.RBACService.MyPermissions.get(
-            current_tenant_id,
-            current_user_id,
-            session=session,
-        )
-        if dify_config.RBAC_ENABLED:
-            access_filter = resolve_app_access_filter(
-                current_tenant_id,
-                current_user_id,
-                session=session,
-                permissions=permissions,
-            )
-            access_filter.apply_to_params(params)
-
-        recent_apps = AppService().get_recent_apps(current_user_id, current_tenant_id, params, session)
-        permission_keys_map = permissions.app.permission_keys_by_resource_ids([app.id for app in recent_apps])
-        response_items = [
-            RecentAppResponse.model_validate(app, from_attributes=True).model_copy(
-                update={"permission_keys": permission_keys_map.get(app.id, [])}
-            )
-            for app in recent_apps
-        ]
-        return dump_response(RecentAppListResponse, {"data": response_items}), 200
-
-
 @console_ns.route("/apps/starred")
 class StarredAppListApi(Resource):
     @console_ns.doc("list_starred_apps")

api/controllers/console/workspace/model_providers.py

@@ -26,7 +26,11 @@ from libs.helper import dump_response, uuid_value
 from libs.login import login_required
 from models import Account
 from services.billing_service import BillingService
-from services.entities.model_provider_entities import ProviderResponse
+from services.entities.model_provider_entities import (
+    ModelProviderPluginSummaryResponse,
+    ModelProviderSummaryResponse,
+    ProviderResponse,
+)
 from services.model_provider_service import ModelProviderService
 
 
@@ -91,6 +95,11 @@ class ModelProviderListResponse(ResponseModel):
     data: list[ProviderResponse]
 
 
+class ModelProviderSummaryListResponse(ResponseModel):
+    data: list[ModelProviderSummaryResponse]
+    plugins: dict[str, ModelProviderPluginSummaryResponse]
+
+
 class ProviderCredentialsResponse(ResponseModel):
     credentials: dict[str, Any] | None = None
 
@@ -114,6 +123,7 @@ register_response_schema_models(
     console_ns,
     SimpleResultResponse,
     ModelProviderListResponse,
+    ModelProviderSummaryListResponse,
     ProviderCredentialsResponse,
     ValidationResultResponse,
     ModelProviderPaymentCheckoutUrlResponse,
@@ -140,6 +150,25 @@ class ModelProviderListApi(Resource):
         return ModelProviderListResponse(data=provider_list).model_dump(mode="json")
 
 
+@console_ns.route("/workspaces/current/model-providers/summary")
+class ModelProviderSummaryListApi(Resource):
+    @console_ns.response(
+        200,
+        "Model provider summaries retrieved successfully",
+        console_ns.models[ModelProviderSummaryListResponse.__name__],
+    )
+    @setup_required
+    @login_required
+    @account_initialization_required
+    @with_current_tenant_id
+    def get(self, tenant_id: str):
+        providers, plugins = ModelProviderService().get_provider_summary_list(tenant_id=tenant_id)
+        return dump_response(
+            ModelProviderSummaryListResponse,
+            {"data": providers, "plugins": plugins},
+        )
+
+
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/credentials")
 class ModelProviderCredentialApi(Resource):
     @console_ns.doc(params=query_params_from_model(ParserCredentialId))

api/controllers/console/workspace/plugin.py

@@ -1,5 +1,5 @@
 import io
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from datetime import datetime
 from typing import Any, Literal, TypedDict
 
@@ -43,6 +43,7 @@ from core.plugin.entities.plugin_daemon import PluginDecodeResponse, PluginInsta
 from core.plugin.impl.exc import PluginDaemonClientSideError
 from core.plugin.plugin_service import PluginService
 from core.tools.builtin_tool.providers._positions import BuiltinToolProviderSort
+from core.tools.entities.api_entities import ToolProviderApiEntity
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.tool_manager import ToolManager
@@ -90,9 +91,21 @@ class ParserList(BaseModel):
     page_size: int = Field(default=256, ge=1, le=256, description="Page size (1-256)")
 
 
+type PluginCategoryListLanguage = Literal["en_US", "zh_Hans", "ja_JP", "pt_BR"]
+
+
 class PluginCategoryListQuery(BaseModel):
     page: int = Field(default=1, ge=1, description="Page number")
     page_size: int = Field(default=256, ge=1, le=256, description="Page size (1-256)")
+    query: str = Field(default="", max_length=256, description="Case-insensitive search query")
+    tags: list[str] = Field(default_factory=list, max_length=128, description="Match any plugin tag")
+    language: Literal["en_US", "zh_Hans", "ja_JP", "pt_BR"] = Field(
+        default="en_US", description="Language used for localized label and description search"
+    )
+
+
+class PluginInstalledIdsQuery(BaseModel):
+    category: PluginCategory = Field(description="Plugin category to include")
 
 
 class ParserLatest(BaseModel):
@@ -325,6 +338,10 @@ class PluginListResponse(ResponseModel):
     total: int
 
 
+class PluginInstalledIdsResponse(ResponseModel):
+    plugin_ids: list[str]
+
+
 class PluginVersionsResponse(ResponseModel):
     versions: Mapping[str, PluginService.LatestPluginCache | None]
 
@@ -384,6 +401,7 @@ register_schema_models(
     console_ns,
     ParserList,
     PluginCategoryListQuery,
+    PluginInstalledIdsQuery,
     PluginAutoUpgradeSettingsPayload,
     PluginPermissionSettingsPayload,
     ParserLatest,
@@ -420,6 +438,7 @@ register_response_schema_models(
     PluginDebuggingKeyResponse,
     PluginDynamicOptionsResponse,
     PluginInstallationsResponse,
+    PluginInstalledIdsResponse,
     PluginInstallTaskStartResponse,
     PluginListResponse,
     PluginManifestResponse,
@@ -477,7 +496,39 @@ def _read_upload_content(file: FileStorage, max_size: int) -> bytes:
     return content
 
 
-def _list_hardcoded_builtin_tool_providers(tenant_id: str) -> list[dict[str, Any]]:
+def _localized_builtin_tool_text(value: I18nObject, language: PluginCategoryListLanguage) -> str:
+    return value.to_dict()[language] or value.en_US
+
+
+def _builtin_tool_provider_matches_filters(
+    provider: ToolProviderApiEntity,
+    *,
+    query: str,
+    tags: Sequence[str],
+    language: PluginCategoryListLanguage,
+) -> bool:
+    if tags and not any(tag in provider.labels for tag in tags):
+        return False
+    if not query:
+        return True
+
+    lower_query = query.lower()
+    candidates = (
+        provider.name,
+        _localized_builtin_tool_text(provider.label, language),
+        _localized_builtin_tool_text(provider.description, language),
+    )
+    return any(lower_query in candidate.lower() for candidate in candidates)
+
+
+def _list_hardcoded_builtin_tool_providers(
+    tenant_id: str,
+    *,
+    query: str = "",
+    tags: Sequence[str] = (),
+    language: PluginCategoryListLanguage = "en_US",
+) -> list[dict[str, Any]]:
+    """List builtin providers using the same search and tag semantics as category plugins."""
     db_builtin_providers = {
         str(ToolProviderID(provider.provider)): provider
         for provider in ToolManager.list_default_builtin_providers(tenant_id)
@@ -498,6 +549,13 @@ def _list_hardcoded_builtin_tool_providers(tenant_id: str) -> list[dict[str, Any
             db_provider=db_builtin_providers.get(provider.entity.identity.name),
             decrypt_credentials=False,
         )
+        if not _builtin_tool_provider_matches_filters(
+            user_provider,
+            query=query,
+            tags=tags,
+            language=language,
+        ):
+            continue
         ToolTransformService.repack_provider(tenant_id=tenant_id, provider=user_provider)
         builtin_providers.append(user_provider)
 
@@ -552,7 +610,9 @@ class PluginCategoryListApi(Resource):
     @account_initialization_required
     @with_current_tenant_id
     def get(self, tenant_id: str, category: str):
-        args = PluginCategoryListQuery.model_validate(request.args.to_dict(flat=True))
+        args = PluginCategoryListQuery.model_validate(
+            {**request.args.to_dict(flat=True), "tags": request.args.getlist("tags")}
+        )
 
         try:
             plugin_category = PluginCategory(category)
@@ -560,13 +620,26 @@ class PluginCategoryListApi(Resource):
             return {"code": "invalid_param", "message": "invalid plugin category"}, 400
 
         try:
-            plugins = PluginService.list_by_category(tenant_id, plugin_category, args.page, args.page_size)
+            plugins = PluginService.list_by_category(
+                tenant_id,
+                plugin_category,
+                args.page,
+                args.page_size,
+                query=args.query,
+                tags=args.tags,
+                language=args.language,
+            )
         except PluginDaemonClientSideError as e:
             return {"code": "plugin_error", "message": e.description}, 400
 
         builtin_tools = []
         if plugin_category == PluginCategory.Tool:
-            builtin_tools = _list_hardcoded_builtin_tool_providers(tenant_id)
+            builtin_tools = _list_hardcoded_builtin_tool_providers(
+                tenant_id,
+                query=args.query,
+                tags=args.tags,
+                language=args.language,
+            )
 
         return dump_response(
             PluginCategoryListResponse,
@@ -578,6 +651,24 @@ class PluginCategoryListApi(Resource):
         )
 
 
+@console_ns.route("/workspaces/current/plugin/installed-ids")
+class PluginInstalledIdsApi(Resource):
+    @console_ns.doc(params=query_params_from_model(PluginInstalledIdsQuery))
+    @console_ns.response(200, "Success", console_ns.models[PluginInstalledIdsResponse.__name__])
+    @setup_required
+    @login_required
+    @account_initialization_required
+    @with_current_tenant_id
+    def get(self, tenant_id: str):
+        args = PluginInstalledIdsQuery.model_validate(request.args.to_dict(flat=True))
+        try:
+            plugin_ids = PluginService.list_installed_plugin_ids(tenant_id, args.category)
+        except PluginDaemonClientSideError as e:
+            return {"code": "plugin_error", "message": e.description}, 400
+
+        return dump_response(PluginInstalledIdsResponse, {"plugin_ids": plugin_ids})
+
+
 @console_ns.route("/workspaces/current/plugin/list/latest-versions")
 class PluginListLatestVersionsApi(Resource):
     @console_ns.expect(console_ns.models[ParserLatest.__name__])

api/controllers/inner_api/__init__.py

@@ -23,6 +23,7 @@ from .knowledge import retrieval as _knowledge_retrieval
 from .plugin import agent_config as _agent_config
 from .plugin import agent_drive as _agent_drive
 from .plugin import plugin as _plugin
+from .workspace import plugin_model_providers as _plugin_model_providers
 from .workspace import workspace as _workspace
 
 api.add_namespace(inner_api_ns)
@@ -35,6 +36,7 @@ __all__ = [
     "_knowledge_retrieval",
     "_mail",
     "_plugin",
+    "_plugin_model_providers",
     "_runtime_credentials",
     "_workspace",
     "api",

api/controllers/inner_api/workspace/plugin_model_providers.py

@@ -0,0 +1,39 @@
+from flask_restx import Resource
+from pydantic import BaseModel, ConfigDict, Field
+
+from controllers.common.schema import register_schema_model
+from controllers.console.wraps import setup_required
+from controllers.inner_api import inner_api_ns
+from controllers.inner_api.wraps import enterprise_inner_api_only
+from core.plugin.plugin_service import PluginService
+
+
+class InvalidatePluginModelProvidersCachePayload(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    tenant_ids: list[str] = Field(default_factory=list, description="Workspace ids whose cache should be invalidated")
+
+
+register_schema_model(inner_api_ns, InvalidatePluginModelProvidersCachePayload)
+
+
+@inner_api_ns.route("/enterprise/workspace/plugin-model-providers/invalidate")
+class EnterprisePluginModelProvidersCacheInvalidate(Resource):
+    @setup_required
+    @enterprise_inner_api_only
+    @inner_api_ns.doc(
+        "enterprise_invalidate_plugin_model_providers_cache",
+        responses={
+            200: "Cache invalidated",
+            400: "Invalid request",
+            401: "Unauthorized - invalid API key",
+        },
+    )
+    @inner_api_ns.expect(inner_api_ns.models[InvalidatePluginModelProvidersCachePayload.__name__])
+    def post(self):
+        args = InvalidatePluginModelProvidersCachePayload.model_validate(inner_api_ns.payload or {})
+
+        for tenant_id in args.tenant_ids:
+            PluginService.invalidate_plugin_model_providers_cache(tenant_id)
+
+        return {"result": "success"}, 200

api/core/app/apps/agent_app/app_generator.py

@@ -538,7 +538,6 @@ class AgentAppGenerator(MessageBasedAppGenerator):
             request_builder=AgentAppRuntimeRequestBuilder(credentials_provider=credentials_provider),
             agent_backend_client=create_agent_backend_run_client(
                 base_url=dify_config.AGENT_BACKEND_BASE_URL,
-                api_token=dify_config.AGENT_BACKEND_API_TOKEN,
                 use_fake=dify_config.AGENT_BACKEND_USE_FAKE,
                 fake_scenario=dify_config.AGENT_BACKEND_FAKE_SCENARIO,
                 stream_read_timeout_seconds=dify_config.AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS,

api/core/plugin/entities/plugin_daemon.py

@@ -12,7 +12,7 @@ from core.agent.plugin_entities import AgentProviderEntityWithPlugin
 from core.datasource.entities.datasource_entities import DatasourceProviderEntityWithPlugin
 from core.plugin.entities.base import BasePluginEntity
 from core.plugin.entities.parameters import PluginParameterOption
-from core.plugin.entities.plugin import PluginDeclaration, PluginEntity
+from core.plugin.entities.plugin import PluginDeclaration, PluginEntity, PluginInstallationSource
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderEntityWithPlugin
 from core.trigger.entities.entities import TriggerProviderEntity
@@ -94,6 +94,18 @@ class PluginModelProviderEntity(BaseModel):
     declaration: ProviderEntity = Field(description="The declaration of the model provider.")
 
 
+class PluginModelProviderBinding(BaseModel):
+    """Lightweight installation metadata for one model provider."""
+
+    provider: str
+    installation_id: str
+    plugin_id: str
+    plugin_unique_identifier: str
+    runtime_type: str
+    source: PluginInstallationSource
+    version: str
+
+
 class PluginTextEmbeddingNumTokensResponse(BaseModel):
     """
     Response for number of tokens.
@@ -207,6 +219,10 @@ class PluginListResponse(BaseModel):
     total: int
 
 
+class PluginInstalledIdsDaemonResponse(BaseModel):
+    plugin_ids: list[str]
+
+
 class PluginListWithoutTotalResponse(BaseModel):
     list: list[PluginEntity]
     has_more: bool

api/core/plugin/impl/model.py

@@ -6,6 +6,7 @@ from core.plugin.entities.plugin_daemon import (
     PluginBasicBooleanResponse,
     PluginDaemonInnerError,
     PluginLLMNumTokensResponse,
+    PluginModelProviderBinding,
     PluginModelProviderEntity,
     PluginModelSchemaEntity,
     PluginStringResultResponse,
@@ -47,6 +48,14 @@ class PluginModelClient(BasePluginClient):
         )
         return response
 
+    def fetch_model_provider_bindings(self, tenant_id: str) -> Sequence[PluginModelProviderBinding]:
+        """Fetch only model-provider installation identities from the daemon."""
+        return self._request_with_plugin_daemon_response(
+            "GET",
+            f"plugin/{tenant_id}/management/models/bindings",
+            list[PluginModelProviderBinding],
+        )
+
     def get_model_schema(
         self,
         tenant_id: str,

api/core/plugin/impl/plugin.py

@@ -14,6 +14,7 @@ from core.plugin.entities.plugin import (
 )
 from core.plugin.entities.plugin_daemon import (
     PluginDecodeResponse,
+    PluginInstalledIdsDaemonResponse,
     PluginInstallTask,
     PluginInstallTaskStartResponse,
     PluginListResponse,
@@ -68,6 +69,16 @@ class PluginInstaller(BasePluginClient):
         )
         return result.list
 
+    def list_installed_plugin_ids(self, tenant_id: str, category: PluginCategory) -> list[str]:
+        """List all currently installed plugin IDs in one category."""
+        result = self._request_with_plugin_daemon_response(
+            "GET",
+            f"plugin/{tenant_id}/management/installation/ids",
+            PluginInstalledIdsDaemonResponse,
+            params={"category": category.value},
+        )
+        return result.plugin_ids
+
     def list_plugins_with_total(self, tenant_id: str, page: int, page_size: int) -> PluginListResponse:
         return self._request_with_plugin_daemon_response(
             "GET",
@@ -77,13 +88,28 @@ class PluginInstaller(BasePluginClient):
         )
 
     def list_plugins_by_category(
-        self, tenant_id: str, category: PluginCategory, page: int, page_size: int
+        self,
+        tenant_id: str,
+        category: PluginCategory,
+        page: int,
+        page_size: int,
+        *,
+        query: str = "",
+        tags: Sequence[str] = (),
+        language: str = "en_US",
     ) -> PluginListWithoutTotalResponse:
         return self._request_with_plugin_daemon_response(
             "GET",
             f"plugin/{tenant_id}/management/{category.value}/list",
             PluginListWithoutTotalResponse,
-            params={"page": page, "page_size": page_size, "response_type": "paged"},
+            params={
+                "page": page,
+                "page_size": page_size,
+                "response_type": "paged",
+                "query": query,
+                "tags": list(tags),
+                "language": language,
+            },
         )
 
     def upload_pkg(

api/core/plugin/plugin_service.py

@@ -48,6 +48,7 @@ from core.plugin.entities.plugin_daemon import (
     PluginInstallTaskStatus,
     PluginListResponse,
     PluginListWithoutTotalResponse,
+    PluginModelProviderBinding,
     PluginModelProviderEntity,
     PluginVerification,
 )
@@ -78,6 +79,12 @@ class _RedisLock(Protocol):
     def release(self) -> None: ...
 
 
+class _ModelPluginIdentity(Protocol):
+    plugin_id: str
+    plugin_unique_identifier: str
+    source: PluginInstallationSource
+
+
 class PluginService:
     class LatestPluginCache(BaseModel):
         plugin_id: str
@@ -265,7 +272,7 @@ class PluginService:
             logger.warning("Failed to cache plugin model providers for tenant %s.", tenant_id, exc_info=True)
 
     @classmethod
-    def _get_remote_model_plugin_cache_marker(cls, plugins: Sequence[PluginEntity]) -> str | None:
+    def _get_remote_model_plugin_cache_marker(cls, plugins: Sequence[_ModelPluginIdentity]) -> str | None:
         remote_model_plugins = sorted(
             f"{plugin.plugin_id}:{plugin.plugin_unique_identifier}"
             for plugin in plugins
@@ -350,7 +357,7 @@ class PluginService:
     def _should_invalidate_model_provider_cache_for_remote_model_plugins(
         cls,
         tenant_id: str,
-        plugins: Sequence[PluginEntity],
+        plugins: Sequence[_ModelPluginIdentity],
     ) -> bool:
         remote_model_plugin_marker = cls._get_remote_model_plugin_cache_marker(plugins)
         cached_remote_model_plugin_marker = cls._load_cached_remote_model_plugin_marker(tenant_id)
@@ -434,18 +441,14 @@ class PluginService:
                     exc_info=True,
                 )
 
-    @classmethod
-    def _fetch_plugin_model_providers_uncached(
-        cls, tenant_id: str, client: PluginModelClient | None
-    ) -> tuple[ProviderEntity, ...]:
-        model_client = client or PluginModelClient()
-        return tuple(cls._to_provider_entity(provider) for provider in model_client.fetch_model_providers(tenant_id))
-
     @classmethod
     def _fetch_and_cache_plugin_model_providers(
         cls, tenant_id: str, client: PluginModelClient | None, *, refresh_generation: int | None
     ) -> tuple[ProviderEntity, ...]:
-        providers = cls._fetch_plugin_model_providers_uncached(tenant_id, client)
+        model_client = client or PluginModelClient()
+        providers = tuple(
+            cls._to_provider_entity(provider) for provider in model_client.fetch_model_providers(tenant_id)
+        )
         generation = cls._load_plugin_model_providers_generation(tenant_id)
         if generation is not None and generation == refresh_generation:
             cls._store_cached_plugin_model_providers(tenant_id, generation, providers)
@@ -475,9 +478,6 @@ class PluginService:
         are intentionally owned by this service so tenant isolation and cache
         expiry are handled in one place.
         """
-        if not dify_config.PLUGIN_MODEL_PROVIDERS_CACHE_ENABLED:
-            return cls._fetch_plugin_model_providers_uncached(tenant_id, client)
-
         deadline = time.monotonic() + cls.PLUGIN_MODEL_PROVIDERS_LOCK_WAIT_TIMEOUT
 
         while True:
@@ -663,6 +663,26 @@ class PluginService:
         plugins = manager.list_plugins(tenant_id)
         return plugins
 
+    @staticmethod
+    def list_installed_plugin_ids(tenant_id: str, category: PluginCategory) -> Sequence[str]:
+        """List all currently installed plugin IDs in one category through the daemon's lightweight query."""
+        manager = PluginInstaller()
+        return manager.list_installed_plugin_ids(tenant_id, category)
+
+    @staticmethod
+    def list_model_provider_bindings(
+        tenant_id: str, *, client: PluginModelClient | None = None
+    ) -> Sequence[PluginModelProviderBinding]:
+        """Return fresh model bindings and reconcile remote-debug provider metadata before it is read."""
+        model_client = client or PluginModelClient()
+        bindings = model_client.fetch_model_provider_bindings(tenant_id)
+        if PluginService._should_invalidate_model_provider_cache_for_remote_model_plugins(tenant_id, bindings):
+            PluginService.invalidate_plugin_model_providers_cache(tenant_id)
+
+        marker = PluginService._get_remote_model_plugin_cache_marker(bindings)
+        PluginService._store_cached_remote_model_plugin_marker(tenant_id, marker)
+        return bindings
+
     @staticmethod
     def list_with_total(tenant_id: str, user_id: str, page: int, page_size: int) -> PluginListResponse:
         """List tenant plugins with endpoint counts reconciled from live records.
@@ -679,17 +699,33 @@ class PluginService:
 
     @staticmethod
     def list_by_category(
-        tenant_id: str, category: PluginCategory, page: int, page_size: int
+        tenant_id: str,
+        category: PluginCategory,
+        page: int,
+        page_size: int,
+        *,
+        query: str = "",
+        tags: Sequence[str] = (),
+        language: str = "en_US",
     ) -> PluginListWithoutTotalResponse:
         """
         List plugins in one category with a has-more cursor signal and without calculating total.
 
-        The daemon scans tenant installations in the existing list order and stops once it finds one extra match.
-        This keeps pagination usable before category is persisted on installation rows.
+        The daemon applies category, search, and tag filters before pagination, then stops once it finds one extra
+        match. Only a complete, unfiltered first page may reconcile the model-provider cache; the unpaginated model
+        binding read is the authoritative marker source for larger result sets.
         """
         manager = PluginInstaller()
-        plugins = manager.list_plugins_by_category(tenant_id, category, page, page_size)
-        if category == PluginCategory.Model:
+        plugins = manager.list_plugins_by_category(
+            tenant_id,
+            category,
+            page,
+            page_size,
+            query=query,
+            tags=tags,
+            language=language,
+        )
+        if category == PluginCategory.Model and page == 1 and not plugins.has_more and not query and not tags:
             should_invalidate_model_provider_cache = (
                 PluginService._should_invalidate_model_provider_cache_for_remote_model_plugins(
                     tenant_id,

api/core/rag/retrieval/dataset_retrieval.py

@@ -2023,8 +2023,6 @@ class DatasetRetrieval:
             redis_client.zremrangebyscore(key, 0, current_time - 60000)
             request_count = redis_client.zcard(key)
             if request_count > knowledge_rate_limit.limit:
-                # The rate-limit exception is raised after this block, so commit the audit row
-                # explicitly instead of relying on the Session context, which only closes it.
                 with session_factory.create_session() as session:
                     rate_limit_log = RateLimitLog(
                         tenant_id=tenant_id,
@@ -2032,7 +2030,6 @@ class DatasetRetrieval:
                         operation="knowledge",
                     )
                     session.add(rate_limit_log)
-                    session.commit()
                 raise exc.RateLimitExceededError(
                     "you have reached the knowledge base request rate limit of your subscription."
                 )

api/core/tools/mcp_tool/tool.py

@@ -107,8 +107,6 @@ class MCPTool(Tool):
         if self.entity.output_schema and result.structuredContent:
             for k, v in result.structuredContent.items():
                 yield self.create_variable_message(k, v)
-        elif result.structuredContent:
-            yield self.create_json_message(result.structuredContent)
 
     def _process_text_content(self, content: TextContent) -> Generator[ToolInvokeMessage, None, None]:
         """Process text content and yield appropriate messages."""

api/core/workflow/node_factory.py

@@ -497,7 +497,6 @@ class DifyNodeFactory(NodeFactory):
                 ),
                 "agent_backend_client": create_agent_backend_run_client(
                     base_url=dify_config.AGENT_BACKEND_BASE_URL,
-                    api_token=dify_config.AGENT_BACKEND_API_TOKEN,
                     use_fake=dify_config.AGENT_BACKEND_USE_FAKE,
                     fake_scenario=dify_config.AGENT_BACKEND_FAKE_SCENARIO,
                     stream_read_timeout_seconds=dify_config.AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS,

api/models/model.py

@@ -1117,14 +1117,14 @@ class ExporleBanner(TypeBase):
     status: Mapped[BannerStatus] = mapped_column(
         EnumText(BannerStatus, length=255),
         nullable=False,
-        server_default=sa.text("'enabled'"),
+        server_default=sa.text("'enabled'::character varying"),
         default=BannerStatus.ENABLED,
     )
     created_at: Mapped[datetime] = mapped_column(
         sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
     )
     language: Mapped[str] = mapped_column(
-        String(255), nullable=False, server_default=sa.text("'en-US'"), default="en-US"
+        String(255), nullable=False, server_default=sa.text("'en-US'::character varying"), default="en-US"
     )
 
 

api/openapi/markdown/console-openapi.md

@@ -1672,23 +1672,6 @@ Create a new application
 | 200 | Import confirmed | **application/json**: [Import](#import)<br> |
 | 400 | Import failed | **application/json**: [Import](#import)<br> |
 
-### [GET] /apps/recent
-**Return the lightweight app cards needed by the Explore home page**
-
-Get recently modified apps for the home Continue Work section
-
-#### Parameters
-
-| Name | Located in | Description | Required | Schema |
-| ---- | ---------- | ----------- | -------- | ------ |
-| limit | query | Number of recently modified apps to return (1-8) | No | integer, <br>**Default:** 8 |
-
-#### Responses
-
-| Code | Description | Schema |
-| ---- | ----------- | ------ |
-| 200 | Success | **application/json**: [RecentAppListResponse](#recentapplistresponse)<br> |
-
 ### [GET] /apps/starred
 Get applications starred by the current account
 
@@ -10584,6 +10567,13 @@ Update a plugin endpoint
 | ---- | ----------- | ------ |
 | 200 | Model providers retrieved successfully | **application/json**: [ModelProviderListResponse](#modelproviderlistresponse)<br> |
 
+### [GET] /workspaces/current/model-providers/summary
+#### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Model provider summaries retrieved successfully | **application/json**: [ModelProviderSummaryListResponse](#modelprovidersummarylistresponse)<br> |
+
 ### [GET] /workspaces/current/model-providers/{provider}/checkout-url
 #### Parameters
 
@@ -11129,6 +11119,19 @@ Returns permission flags that control workspace features like member invitations
 | ---- | ----------- | ------ |
 | 200 | Success | **application/json**: [PluginInstallTaskStartResponse](#plugininstalltaskstartresponse)<br> |
 
+### [GET] /workspaces/current/plugin/installed-ids
+#### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| category | query | Plugin category to include | Yes | string, <br>**Available values:** "agent-strategy", "datasource", "extension", "model", "tool", "trigger" |
+
+#### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | **application/json**: [PluginInstalledIdsResponse](#plugininstalledidsresponse)<br> |
+
 ### [GET] /workspaces/current/plugin/list
 #### Parameters
 
@@ -11387,8 +11390,11 @@ Returns permission flags that control workspace features like member invitations
 
 | Name | Located in | Description | Required | Schema |
 | ---- | ---------- | ----------- | -------- | ------ |
+| language | query | Language used for localized label and description search | No | string, <br>**Available values:** "en_US", "ja_JP", "pt_BR", "zh_Hans", <br>**Default:** en_US |
 | page | query | Page number | No | integer, <br>**Default:** 1 |
 | page_size | query | Page size (1-256) | No | integer, <br>**Default:** 256 |
+| query | query | Case-insensitive search query | No | string |
+| tags | query | Match any plugin tag | No | [ string ] |
 | category | path |  | Yes | string |
 
 #### Responses
@@ -19324,6 +19330,16 @@ Enum class for model property key.
 | ---- | ---- | ----------- | -------- |
 | ModelPropertyKey | string | Enum class for model property key. |  |
 
+#### ModelProviderCustomConfigurationSummaryResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| available_credentials | [ [CredentialConfiguration](#credentialconfiguration) ] |  | Yes |
+| current_credential_id | string |  | No |
+| current_credential_name | string |  | No |
+| current_credential_usable | boolean |  | Yes |
+| status | [CustomConfigurationStatus](#customconfigurationstatus) |  | Yes |
+
 #### ModelProviderListResponse
 
 | Name | Type | Description | Required |
@@ -19336,6 +19352,49 @@ Enum class for model property key.
 | ---- | ---- | ----------- | -------- |
 | payment_link | string |  | Yes |
 
+#### ModelProviderPluginSummaryResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| installation_id | string |  | Yes |
+| plugin_id | string |  | Yes |
+| plugin_unique_identifier | string |  | Yes |
+| runtime_type | string |  | Yes |
+| source | [PluginInstallationSource](#plugininstallationsource) |  | Yes |
+| version | string |  | Yes |
+
+#### ModelProviderSummaryListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [ModelProviderSummaryResponse](#modelprovidersummaryresponse) ] |  | Yes |
+| plugins | object |  | Yes |
+
+#### ModelProviderSummaryResponse
+
+Fields required to render the collapsed model-provider list.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| configurate_methods | [ [ConfigurateMethod](#configuratemethod) ] |  | Yes |
+| custom_configuration | [ModelProviderCustomConfigurationSummaryResponse](#modelprovidercustomconfigurationsummaryresponse) |  | Yes |
+| description | [I18nObject](#i18nobject) |  | No |
+| icon_small | [I18nObject](#i18nobject) |  | No |
+| icon_small_dark | [I18nObject](#i18nobject) |  | No |
+| is_configured | boolean |  | Yes |
+| label | [I18nObject](#i18nobject) |  | Yes |
+| plugin_id | string |  | Yes |
+| preferred_provider_type | [ProviderType](#providertype) |  | Yes |
+| provider | string |  | Yes |
+| supported_model_types | [ [ModelType](#modeltype) ] |  | Yes |
+| system_configuration | [ModelProviderSystemConfigurationSummaryResponse](#modelprovidersystemconfigurationsummaryresponse) |  | Yes |
+
+#### ModelProviderSystemConfigurationSummaryResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enabled | boolean |  | Yes |
+
 #### ModelSelectorScope
 
 | Name | Type | Description | Required |
@@ -20324,8 +20383,11 @@ Shared permission levels for resources (datasets, credentials, etc.)
 
 | Name | Type | Description | Required |
 | ---- | ---- | ----------- | -------- |
+| language | string, <br>**Available values:** "en_US", "ja_JP", "pt_BR", "zh_Hans", <br>**Default:** en_US | Language used for localized label and description search<br>*Enum:* `"en_US"`, `"ja_JP"`, `"pt_BR"`, `"zh_Hans"` | No |
 | page | integer, <br>**Default:** 1 | Page number | No |
 | page_size | integer, <br>**Default:** 256 | Page size (1-256) | No |
+| query | string | Case-insensitive search query | No |
+| tags | [ string ] | Match any plugin tag | No |
 
 #### PluginCategoryListResponse
 
@@ -20526,6 +20588,18 @@ Shared permission levels for resources (datasets, credentials, etc.)
 | ---- | ---- | ----------- | -------- |
 | plugins | [ [PluginInstallationItemResponse](#plugininstallationitemresponse) ] |  | Yes |
 
+#### PluginInstalledIdsQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| category | [PluginCategory](#plugincategory) | Plugin category to include | Yes |
+
+#### PluginInstalledIdsResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_ids | [ string ] |  | Yes |
+
 #### PluginListResponse
 
 | Name | Type | Description | Required |
@@ -21035,28 +21109,6 @@ Whitelist scopes accepted by RBAC app and dataset access config APIs.
 | result | string |  | Yes |
 | updated_at | integer |  | Yes |
 
-#### RecentAppListResponse
-
-| Name | Type | Description | Required |
-| ---- | ---- | ----------- | -------- |
-| data | [ [RecentAppResponse](#recentappresponse) ] |  | Yes |
-
-#### RecentAppResponse
-
-| Name | Type | Description | Required |
-| ---- | ---- | ----------- | -------- |
-| author_name | string |  | No |
-| icon | string |  | No |
-| icon_background | string |  | No |
-| icon_type | [IconType](#icontype) |  | No |
-| icon_url | string |  | Yes |
-| id | string |  | Yes |
-| maintainer | string |  | No |
-| mode | string, <br>**Available values:** "advanced-chat", "agent-chat", "chat", "completion", "workflow" | *Enum:* `"advanced-chat"`, `"agent-chat"`, `"chat"`, `"completion"`, `"workflow"` | Yes |
-| name | string |  | Yes |
-| permission_keys | [ string ] |  | No |
-| updated_at | integer |  | Yes |
-
 #### RecommendedAppDetailNullableResponse
 
 | Name | Type | Description | Required |

api/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "dify-api"
-version = "1.16.1"
+version = "1.16.0"
 requires-python = "~=3.12.0"
 
 dependencies = [
     # Legacy: mature and widely deployed
     "bleach>=6.4.0,<7.0.0",
-    "boto3>=1.43.56,<2.0.0",
+    "boto3>=1.43.46,<2.0.0",
     "celery>=5.6.3,<6.0.0",
     "croniter>=6.2.2,<7.0.0",
     "dify-agent",
@@ -193,10 +193,10 @@ dev = [
 ############################################################
 storage = [
     "azure-storage-blob>=12.30.0,<13.0.0",
-    "bce-python-sdk==0.9.76",
+    "bce-python-sdk==0.9.72",
     "cos-python-sdk-v5>=1.9.44,<2.0.0",
     "esdk-obs-python>=3.26.6,<4.0.0",
-    "google-cloud-storage>=3.13.0,<4.0.0",
+    "google-cloud-storage>=3.12.1,<4.0.0",
     "opendal==0.46.0",
     "oss2>=2.19.1,<3.0.0",
     "supabase>=2.31.0,<3.0.0",

api/services/app_service.py

@@ -1,7 +1,6 @@
 import json
 import logging
 from collections.abc import Sequence
-from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, Literal, NotRequired, TypedDict, cast, override
 
@@ -42,20 +41,6 @@ from tasks.remove_app_and_related_data_task import remove_app_and_related_data_t
 logger = logging.getLogger(__name__)
 
 AppListSortBy = Literal["last_modified", "recently_created", "earliest_created"]
-RecentAppMode = Literal[
-    AppMode.COMPLETION,
-    AppMode.WORKFLOW,
-    AppMode.CHAT,
-    AppMode.ADVANCED_CHAT,
-    AppMode.AGENT_CHAT,
-]
-RECENT_APP_MODES: tuple[RecentAppMode, ...] = (
-    AppMode.COMPLETION,
-    AppMode.WORKFLOW,
-    AppMode.CHAT,
-    AppMode.ADVANCED_CHAT,
-    AppMode.AGENT_CHAT,
-)
 
 
 class AppListBaseParams(BaseModel):
@@ -80,19 +65,6 @@ class StarredAppListParams(AppListBaseParams):
     pass
 
 
-@dataclass(frozen=True)
-class RecentAppListItem:
-    id: str
-    name: str
-    icon_type: IconType | None
-    icon: str | None
-    icon_background: str | None
-    mode: RecentAppMode
-    author_name: str | None
-    updated_at: datetime
-    maintainer: str | None
-
-
 class CreateAppParams(BaseModel):
     name: str = Field(min_length=1)
     description: str | None = None
@@ -351,62 +323,6 @@ class AppService:
 
         return app_models
 
-    def get_recent_apps(
-        self,
-        user_id: str,
-        tenant_id: str,
-        params: AppListParams,
-        session: Session,
-    ) -> list[RecentAppListItem]:
-        """Return recently modified apps as one lightweight, non-paginated projection."""
-        filters = self._build_app_list_filters(user_id, tenant_id, params, session)
-        if not filters:
-            return []
-
-        stmt = (
-            sa.select(
-                App.id,
-                App.name,
-                App.icon_type,
-                App.icon,
-                App.icon_background,
-                App.mode,
-                Account.name.label("author_name"),
-                App.updated_at,
-                App.maintainer,
-            )
-            .outerjoin(Account, Account.id == App.created_by)
-            .where(*filters, App.mode.in_(RECENT_APP_MODES))
-            .order_by(App.updated_at.desc())
-            .limit(params.limit)
-        )
-        rows = session.execute(stmt).all()
-
-        return [
-            RecentAppListItem(
-                id=str(app_id),
-                name=name,
-                icon_type=icon_type,
-                icon=icon,
-                icon_background=icon_background,
-                mode=cast(RecentAppMode, mode),
-                author_name=author_name,
-                updated_at=updated_at,
-                maintainer=maintainer,
-            )
-            for (
-                app_id,
-                name,
-                icon_type,
-                icon,
-                icon_background,
-                mode,
-                author_name,
-                updated_at,
-                maintainer,
-            ) in rows
-        ]
-
     def get_paginate_starred_apps(
         self,
         user_id: str,

api/services/entities/model_provider_entities.py

@@ -17,6 +17,7 @@ from core.entities.provider_entities import (
     QuotaConfiguration,
     UnaddedModelConfiguration,
 )
+from core.plugin.entities.plugin import PluginInstallationSource
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import (
     FetchFrom,
@@ -69,6 +70,64 @@ class SystemConfigurationResponse(BaseModel):
     quota_configurations: list[QuotaConfiguration] = []
 
 
+class ModelProviderCustomConfigurationSummaryResponse(BaseModel):
+    status: CustomConfigurationStatus
+    available_credentials: list[CredentialConfiguration]
+    current_credential_id: str | None = None
+    current_credential_name: str | None = None
+    current_credential_usable: bool
+
+
+class ModelProviderSystemConfigurationSummaryResponse(BaseModel):
+    enabled: bool
+
+
+class ModelProviderPluginSummaryResponse(BaseModel):
+    installation_id: str
+    plugin_id: str
+    plugin_unique_identifier: str
+    runtime_type: str
+    source: PluginInstallationSource
+    version: str
+
+
+class ModelProviderSummaryResponse(BaseModel):
+    """Fields required to render the collapsed model-provider list."""
+
+    tenant_id: str = Field(exclude=True)
+    provider: str
+    plugin_id: str
+    label: I18nObject
+    description: I18nObject | None = None
+    icon_small: I18nObject | None = None
+    icon_small_dark: I18nObject | None = None
+    supported_model_types: Sequence[ModelType]
+    configurate_methods: list[ConfigurateMethod]
+    preferred_provider_type: ProviderType
+    is_configured: bool
+    custom_configuration: ModelProviderCustomConfigurationSummaryResponse
+    system_configuration: ModelProviderSystemConfigurationSummaryResponse
+
+    model_config = ConfigDict(protected_namespaces=())
+
+    @model_validator(mode="after")
+    def build_icon_urls(self):
+        url_prefix = (
+            dify_config.CONSOLE_API_URL + f"/console/api/workspaces/{self.tenant_id}/model-providers/{self.provider}"
+        )
+        if self.icon_small is not None:
+            self.icon_small = I18nObject(
+                en_US=f"{url_prefix}/icon_small/en_US",
+                zh_Hans=f"{url_prefix}/icon_small/zh_Hans",
+            )
+        if self.icon_small_dark is not None:
+            self.icon_small_dark = I18nObject(
+                en_US=f"{url_prefix}/icon_small_dark/en_US",
+                zh_Hans=f"{url_prefix}/icon_small_dark/zh_Hans",
+            )
+        return self
+
+
 class ProviderResponse(BaseModel):
     """
     Model class for provider response.

api/services/model_provider_service.py

@@ -1,18 +1,42 @@
 import logging
+from collections import defaultdict
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
 
+from sqlalchemy import and_, select
+
 if TYPE_CHECKING:
     from models.account import Account
 
+from configs import dify_config
+from core.db.session_factory import session_factory
 from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity
+from core.entities.provider_entities import CredentialConfiguration
+from core.helper.position_helper import is_filtered
+from core.plugin.entities.plugin import PluginInstallationSource
+from core.plugin.entities.plugin_daemon import PluginModelProviderBinding
 from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory, create_plugin_provider_manager
+from core.plugin.plugin_service import PluginService
 from core.provider_manager import ProviderManager
+from extensions import ext_hosting_provider
 from graphon.model_runtime.entities.model_entities import ModelType, ParameterRule
-from models.provider import ProviderType
+from models.provider import (
+    Provider,
+    ProviderCredential,
+    ProviderModel,
+    ProviderModelCredential,
+    ProviderType,
+    TenantPreferredModelProvider,
+)
+from models.provider_ids import ModelProviderID
 from services.entities.model_provider_entities import (
     CustomConfigurationResponse,
     CustomConfigurationStatus,
     DefaultModelResponse,
+    ModelProviderCustomConfigurationSummaryResponse,
+    ModelProviderPluginSummaryResponse,
+    ModelProviderSummaryResponse,
+    ModelProviderSystemConfigurationSummaryResponse,
     ModelWithProviderEntityResponse,
     ProviderResponse,
     ProviderWithModelsResponse,
@@ -24,6 +48,17 @@ from services.errors.app_model_config import ProviderNotFoundError
 logger = logging.getLogger(__name__)
 
 
+@dataclass(slots=True)
+class _ProviderSummaryState:
+    has_custom_provider: bool = False
+    available_credentials: list[CredentialConfiguration] = field(default_factory=list)
+    has_custom_models: bool = False
+    current_credential_id: str | None = None
+    current_credential_name: str | None = None
+    current_credential_usable: bool = False
+    preferred_provider_type: ProviderType | None = None
+
+
 class ModelProviderService:
     """
     Model Provider Service
@@ -132,6 +167,242 @@ class ModelProviderService:
 
         return provider_responses
 
+    @staticmethod
+    def _load_provider_summary_states(tenant_id: str) -> dict[str, _ProviderSummaryState]:
+        """Load only the workspace columns required by the collapsed provider list."""
+        with session_factory.create_session() as session:
+            custom_provider_rows = session.execute(
+                select(
+                    Provider.provider_name,
+                    Provider.credential_id,
+                    ProviderCredential.provider_name.label("credential_provider_name"),
+                    ProviderCredential.credential_name,
+                )
+                .outerjoin(
+                    ProviderCredential,
+                    and_(
+                        ProviderCredential.id == Provider.credential_id,
+                        ProviderCredential.tenant_id == tenant_id,
+                    ),
+                )
+                .where(
+                    Provider.tenant_id == tenant_id,
+                    Provider.provider_type == ProviderType.CUSTOM,
+                    Provider.is_valid.is_(True),
+                )
+            ).all()
+            credential_rows = session.execute(
+                select(
+                    ProviderCredential.id,
+                    ProviderCredential.provider_name,
+                    ProviderCredential.credential_name,
+                )
+                .where(ProviderCredential.tenant_id == tenant_id)
+                .order_by(
+                    ProviderCredential.created_at.desc(),
+                    ProviderCredential.id.desc(),
+                )
+            ).all()
+            custom_model_rows = session.execute(
+                select(ProviderModel.provider_name.label("provider_name"))
+                .where(
+                    ProviderModel.tenant_id == tenant_id,
+                    ProviderModel.is_valid.is_(True),
+                )
+                .union(
+                    select(ProviderModelCredential.provider_name.label("provider_name")).where(
+                        ProviderModelCredential.tenant_id == tenant_id
+                    )
+                )
+            ).all()
+            preferred_provider_rows = session.execute(
+                select(
+                    TenantPreferredModelProvider.provider_name,
+                    TenantPreferredModelProvider.preferred_provider_type,
+                ).where(TenantPreferredModelProvider.tenant_id == tenant_id)
+            ).all()
+
+        states: defaultdict[str, _ProviderSummaryState] = defaultdict(_ProviderSummaryState)
+        for credential in credential_rows:
+            provider_name = str(ModelProviderID(credential.provider_name))
+            states[provider_name].available_credentials.append(
+                CredentialConfiguration(
+                    credential_id=credential.id,
+                    credential_name=credential.credential_name,
+                )
+            )
+
+        selected_provider_priorities: dict[str, bool] = {}
+        for provider in custom_provider_rows:
+            provider_name = str(ModelProviderID(provider.provider_name))
+            state = states[provider_name]
+            state.has_custom_provider = True
+
+            is_canonical_row = provider.provider_name == provider_name
+            if provider_name in selected_provider_priorities and not is_canonical_row:
+                continue
+            selected_provider_priorities[provider_name] = is_canonical_row
+            state.current_credential_id = provider.credential_id
+            if (
+                provider.credential_provider_name is not None
+                and str(ModelProviderID(provider.credential_provider_name)) == provider_name
+            ):
+                state.current_credential_name = provider.credential_name
+                state.current_credential_usable = True
+            else:
+                state.current_credential_name = None
+                state.current_credential_usable = False
+
+        for model in custom_model_rows:
+            states[str(ModelProviderID(model.provider_name))].has_custom_models = True
+
+        preferred_provider_priorities: dict[str, bool] = {}
+        for preferred_provider in preferred_provider_rows:
+            provider_name = str(ModelProviderID(preferred_provider.provider_name))
+            is_canonical_row = preferred_provider.provider_name == provider_name
+            if provider_name in preferred_provider_priorities and not is_canonical_row:
+                continue
+            preferred_provider_priorities[provider_name] = is_canonical_row
+            states[provider_name].preferred_provider_type = preferred_provider.preferred_provider_type
+
+        return dict(states)
+
+    @staticmethod
+    def _is_system_provider_enabled(provider: str) -> bool:
+        configuration = ext_hosting_provider.hosting_configuration.provider_map.get(provider)
+        return bool(configuration and configuration.enabled and configuration.quotas)
+
+    @staticmethod
+    def _select_binding(
+        current_binding: PluginModelProviderBinding | None,
+        candidate_binding: PluginModelProviderBinding,
+    ) -> PluginModelProviderBinding:
+        """Prefer a remote-debug runtime when one shadows an installed plugin."""
+        if current_binding is None:
+            return candidate_binding
+        if (
+            candidate_binding.source == PluginInstallationSource.Remote
+            and current_binding.source != PluginInstallationSource.Remote
+        ):
+            return candidate_binding
+        return current_binding
+
+    @staticmethod
+    def _get_preferred_provider_type(
+        state: _ProviderSummaryState,
+        *,
+        custom_present: bool,
+        system_enabled: bool,
+    ) -> ProviderType:
+        if state.preferred_provider_type is not None:
+            return state.preferred_provider_type
+        if dify_config.EDITION == "CLOUD" and system_enabled:
+            return ProviderType.SYSTEM
+        if custom_present:
+            return ProviderType.CUSTOM
+        if system_enabled:
+            return ProviderType.SYSTEM
+        return ProviderType.CUSTOM
+
+    def get_provider_summary_list(
+        self, tenant_id: str
+    ) -> tuple[list[ModelProviderSummaryResponse], dict[str, ModelProviderPluginSummaryResponse]]:
+        """Build the complete first-screen provider projection without assembling provider configurations."""
+        # Read bindings first: remote-debug identity changes invalidate provider metadata
+        # before the provider cache is consulted.
+        bindings = PluginService.list_model_provider_bindings(tenant_id)
+        provider_entities = PluginService.fetch_plugin_model_providers(tenant_id=tenant_id)
+        states = self._load_provider_summary_states(tenant_id)
+
+        bindings_by_provider: dict[str, PluginModelProviderBinding] = {}
+        for binding in bindings:
+            provider_name = (
+                str(ModelProviderID(binding.provider))
+                if binding.provider.count("/") == 2
+                else str(ModelProviderID(f"{binding.plugin_id}/{binding.provider}"))
+            )
+            bindings_by_provider[provider_name] = self._select_binding(
+                bindings_by_provider.get(provider_name),
+                binding,
+            )
+
+        provider_summaries: list[ModelProviderSummaryResponse] = []
+        emitted_provider_names: set[str] = set()
+        for provider_entity in provider_entities:
+            if is_filtered(
+                include_set=dify_config.POSITION_PROVIDER_INCLUDES_SET,
+                exclude_set=dify_config.POSITION_PROVIDER_EXCLUDES_SET,
+                data=provider_entity,
+                name_func=lambda provider: provider.provider,
+            ):
+                continue
+
+            provider_id = ModelProviderID(provider_entity.provider)
+            provider_name = str(provider_id)
+            if provider_name in emitted_provider_names:
+                continue
+            emitted_provider_names.add(provider_name)
+
+            state = states.get(provider_name, _ProviderSummaryState())
+            custom_configured = (
+                state.has_custom_provider and bool(state.available_credentials)
+            ) or state.has_custom_models
+            custom_present = state.has_custom_provider or state.has_custom_models
+            system_enabled = self._is_system_provider_enabled(provider_name)
+            preferred_provider_type = self._get_preferred_provider_type(
+                state,
+                custom_present=custom_present,
+                system_enabled=system_enabled,
+            )
+
+            provider_summaries.append(
+                ModelProviderSummaryResponse(
+                    tenant_id=tenant_id,
+                    provider=provider_name,
+                    plugin_id=provider_id.plugin_id,
+                    label=provider_entity.label,
+                    description=provider_entity.description,
+                    icon_small=provider_entity.icon_small,
+                    icon_small_dark=provider_entity.icon_small_dark,
+                    supported_model_types=provider_entity.supported_model_types,
+                    configurate_methods=provider_entity.configurate_methods,
+                    preferred_provider_type=preferred_provider_type,
+                    is_configured=custom_configured or system_enabled,
+                    custom_configuration=ModelProviderCustomConfigurationSummaryResponse(
+                        status=CustomConfigurationStatus.ACTIVE
+                        if custom_configured
+                        else CustomConfigurationStatus.NO_CONFIGURE,
+                        available_credentials=state.available_credentials,
+                        current_credential_id=state.current_credential_id,
+                        current_credential_name=state.current_credential_name,
+                        current_credential_usable=state.current_credential_usable,
+                    ),
+                    system_configuration=ModelProviderSystemConfigurationSummaryResponse(
+                        enabled=system_enabled,
+                    ),
+                )
+            )
+
+        plugin_bindings: dict[str, PluginModelProviderBinding] = {}
+        for binding in bindings_by_provider.values():
+            plugin_bindings[binding.plugin_id] = self._select_binding(
+                plugin_bindings.get(binding.plugin_id),
+                binding,
+            )
+
+        plugin_summaries = {
+            plugin_id: ModelProviderPluginSummaryResponse(
+                installation_id=binding.installation_id,
+                plugin_id=binding.plugin_id,
+                plugin_unique_identifier=binding.plugin_unique_identifier,
+                runtime_type=binding.runtime_type,
+                source=binding.source,
+                version=binding.version,
+            )
+            for plugin_id, binding in plugin_bindings.items()
+        }
+        return provider_summaries, plugin_summaries
+
     def get_models_by_provider(self, tenant_id: str, provider: str) -> list[ModelWithProviderEntityResponse]:
         """
         get provider models.

api/tasks/agent_backend_session_cleanup_task.py

@@ -22,7 +22,6 @@ def _create_agent_backend_client():
         return None
     return create_agent_backend_run_client(
         base_url=dify_config.AGENT_BACKEND_BASE_URL,
-        api_token=dify_config.AGENT_BACKEND_API_TOKEN,
         use_fake=dify_config.AGENT_BACKEND_USE_FAKE,
         fake_scenario=dify_config.AGENT_BACKEND_FAKE_SCENARIO,
         stream_read_timeout_seconds=dify_config.AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS,

api/tests/unit_tests/configs/test_env_consistency.py

@@ -4,7 +4,6 @@ from dotenv import dotenv_values
 
 BASE_API_AND_DOCKER_CONFIG_SET_DIFF: frozenset[str] = frozenset(
     (
-        "AGENT_BACKEND_API_TOKEN",
         "APP_MAX_EXECUTION_TIME",
         "BATCH_UPLOAD_LIMIT",
         "CELERY_BEAT_SCHEDULER_TIME",
@@ -44,7 +43,6 @@ BASE_API_AND_DOCKER_CONFIG_SET_DIFF: frozenset[str] = frozenset(
 
 BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF: frozenset[str] = frozenset(
     (
-        "AGENT_BACKEND_API_TOKEN",
         "BATCH_UPLOAD_LIMIT",
         "CELERY_BEAT_SCHEDULER_TIME",
         "HTTP_REQUEST_MAX_CONNECT_TIMEOUT",

api/tests/unit_tests/conftest.py

@@ -1,13 +1,11 @@
 import os
-import shutil
 from collections.abc import Iterator
-from pathlib import Path
 from unittest.mock import MagicMock, patch
 
 import pytest
 from flask import Flask
 from sqlalchemy import create_engine
-from sqlalchemy.engine import URL, Engine
+from sqlalchemy.engine import Engine
 from sqlalchemy.orm import Session, sessionmaker
 
 # Getting the absolute path of the current file's directory
@@ -37,7 +35,7 @@ os.environ.setdefault("OPENDAL_SCHEME", "fs")
 os.environ.setdefault("OPENDAL_FS_ROOT", "/tmp/dify-storage")
 os.environ.setdefault("STORAGE_TYPE", "opendal")
 
-import core.db.session_factory as session_factory_module
+from core.db.session_factory import configure_session_factory, session_factory
 from extensions import ext_redis
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.base import TypeBase
@@ -113,70 +111,42 @@ def reset_secret_key():
         dify_config.SECRET_KEY = original
 
 
+@pytest.fixture(scope="session")
+def _unit_test_engine():
+    engine = create_engine("sqlite:///:memory:")
+    yield engine
+    engine.dispose()
+
+
 @pytest.fixture
-def _sqlite_engine(_sqlite_database_template: Path, tmp_path: Path) -> Iterator[Engine]:
-    """Create an engine over a pristine per-test copy of the SQLite schema."""
-
-    database_path = tmp_path / "unit-tests.sqlite3"
-    shutil.copyfile(_sqlite_database_template, database_path)
-    engine = create_engine(URL.create("sqlite", database=str(database_path)))
+def sqlite_engine() -> Iterator[Engine]:
+    """Create an isolated in-memory SQLite engine for tests that need a disposable database."""
 
+    engine = create_engine("sqlite:///:memory:")
     try:
         yield engine
     finally:
         engine.dispose()
-        database_path.unlink(missing_ok=True)
 
 
-@pytest.fixture(scope="session")
-def _sqlite_database_template(tmp_path_factory: pytest.TempPathFactory) -> Path:
-    """Create one empty full-schema SQLite database per pytest worker."""
+@pytest.fixture
+def sqlite_session(request: pytest.FixtureRequest, sqlite_engine: Engine) -> Iterator[Session]:
+    """Yield a SQLite session after creating the model tables passed through ``request.param``."""
 
-    database_path = tmp_path_factory.mktemp("sqlite-template") / "unit-tests.sqlite3"
-    engine = create_engine(URL.create("sqlite", database=str(database_path)))
-    try:
-        TypeBase.metadata.create_all(engine)
-    finally:
-        engine.dispose()
-    return database_path
+    models: tuple[type[TypeBase], ...] = request.param
+    tables = [model.metadata.tables[model.__tablename__] for model in models]
+    TypeBase.metadata.create_all(sqlite_engine, tables=tables)
+    session_factory = sessionmaker(bind=sqlite_engine, expire_on_commit=False)
+    with session_factory() as session:
+        yield session
 
 
 @pytest.fixture(autouse=True)
-def _sqlite_session_factory(
-    _sqlite_engine: Engine,
-    monkeypatch: pytest.MonkeyPatch,
-) -> sessionmaker[Session]:
-    """Bind all unit-test Sessions to the pristine full-schema SQLite database."""
-
-    factory = sessionmaker(bind=_sqlite_engine, expire_on_commit=False)
-    monkeypatch.setattr(session_factory_module, "_session_maker", factory)
-    return factory
-
-
-@pytest.fixture
-def sqlite_engine(_sqlite_engine: Engine) -> Engine:
-    """Expose the pristine full-schema SQLite engine to tests."""
-
-    return _sqlite_engine
-
-
-@pytest.fixture
-def sqlite_session_factory(_sqlite_session_factory: sessionmaker[Session]) -> sessionmaker[Session]:
-    """Expose the shared SQLite session factory to tests."""
-
-    return _sqlite_session_factory
-
-
-@pytest.fixture
-def sqlite_session(_sqlite_session_factory: sessionmaker[Session]) -> Iterator[Session]:
-    """Yield a session over the pristine full-schema SQLite database.
-
-    Legacy indirect model parameters remain accepted by pytest but are ignored.
-    Remove those decorators as their test files receive individual review.
-    """
-
-    with _sqlite_session_factory() as session:
-        yield session
+def _configure_session_factory(_unit_test_engine):
+    try:
+        session_factory.get_session_maker()
+    except RuntimeError:
+        configure_session_factory(_unit_test_engine, expire_on_commit=False)
 
 
 def persist_service_api_tenant_owner(session: Session, tenant: Tenant, owner: Account) -> TenantAccountJoin:

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

@@ -708,121 +708,6 @@ def test_app_list_api_attaches_permission_keys(app, app_module):
     assert resp["data"][0]["permission_keys"] == ["app.acl.view_layout", "app.acl.edit"]
 
 
-def test_recent_app_list_api_returns_only_home_card_fields(app, app_module):
-    method = app_module.RecentAppListApi.get
-    while hasattr(method, "__wrapped__"):
-        method = method.__wrapped__
-
-    recent_app = SimpleNamespace(
-        id="app-1",
-        name="Recent App",
-        icon_type="emoji",
-        icon="🚀",
-        icon_background="#FFFFFF",
-        mode="chat",
-        author_name="Recent Author",
-        updated_at=_ts(15),
-        maintainer="acct-1",
-    )
-    get_recent_apps = MagicMock(return_value=[recent_app])
-
-    with app.test_request_context("/apps/recent?limit=8"):
-        with pytest.MonkeyPatch.context() as monkeypatch:
-            monkeypatch.setattr(dify_config, "RBAC_ENABLED", False)
-            monkeypatch.setattr(app_module.AppService, "get_recent_apps", get_recent_apps)
-            monkeypatch.setattr(
-                app_module.enterprise_rbac_service.RBACService.MyPermissions,
-                "get",
-                lambda tenant_id, account_id, session: app_module.enterprise_rbac_service.MyPermissionsResponse(
-                    app=app_module.enterprise_rbac_service.ResourcePermissionSnapshot(
-                        overrides=[
-                            app_module.enterprise_rbac_service.ResourcePermissionKeys(
-                                resource_id="app-1",
-                                permission_keys=["app.acl.monitor"],
-                            )
-                        ]
-                    )
-                ),
-            )
-
-            resp, status = method(app_module.RecentAppListApi(), "tenant-1", "acct-1", MagicMock())
-
-    assert status == 200
-    assert resp == {
-        "data": [
-            {
-                "id": "app-1",
-                "name": "Recent App",
-                "icon_type": "emoji",
-                "icon": "🚀",
-                "icon_background": "#FFFFFF",
-                "mode": "chat",
-                "author_name": "Recent Author",
-                "updated_at": int(_ts(15).timestamp()),
-                "permission_keys": ["app.acl.monitor"],
-                "maintainer": "acct-1",
-                "icon_url": None,
-            }
-        ]
-    }
-    params = get_recent_apps.call_args.args[2]
-    assert params.limit == 8
-    assert "total" not in resp
-    assert "description" not in resp["data"][0]
-    assert "tags" not in resp["data"][0]
-    assert "workflow" not in resp["data"][0]
-
-
-@pytest.mark.parametrize("mode", ["channel", "rag-pipeline", "agent"])
-def test_recent_app_response_rejects_non_home_app_modes(app_module, mode: str) -> None:
-    with pytest.raises(ValidationError):
-        app_module.RecentAppResponse.model_validate(
-            {
-                "id": "app-1",
-                "name": "Recent App",
-                "mode": mode,
-                "updated_at": _ts(),
-            }
-        )
-
-
-def test_recent_app_list_api_applies_rbac_visibility_filter(app, app_module):
-    method = app_module.RecentAppListApi.get
-    while hasattr(method, "__wrapped__"):
-        method = method.__wrapped__
-
-    get_recent_apps = MagicMock(return_value=[])
-    with app.test_request_context("/apps/recent"):
-        with pytest.MonkeyPatch.context() as monkeypatch:
-            monkeypatch.setattr(dify_config, "RBAC_ENABLED", True)
-            monkeypatch.setattr(app_module.AppService, "get_recent_apps", get_recent_apps)
-            monkeypatch.setattr(
-                app_module.enterprise_rbac_service.RBACService.MyPermissions,
-                "get",
-                lambda tenant_id, account_id, session: app_module.enterprise_rbac_service.MyPermissionsResponse(
-                    workspace=app_module.enterprise_rbac_service.WorkspacePermissionSnapshot(
-                        permission_keys=["app.create_and_management"]
-                    )
-                ),
-            )
-            monkeypatch.setattr(
-                app_module.enterprise_rbac_service.RBACService.AppAccess,
-                "whitelist_resources",
-                lambda tenant_id, account_id: SimpleNamespace(
-                    unrestricted=False,
-                    resource_ids=["app-shared"],
-                ),
-            )
-
-            resp, status = method(app_module.RecentAppListApi(), "tenant-1", "acct-1", MagicMock())
-
-    assert status == 200
-    assert resp == {"data": []}
-    params = get_recent_apps.call_args.args[2]
-    assert params.accessible_app_ids == ["app-shared"]
-    assert params.include_own_apps is True
-
-
 def test_app_list_api_limits_to_apps_created_by_current_user_without_view_permission(app, app_module):
     method = app_module.AppListApi.get
     while hasattr(method, "__wrapped__"):

api/tests/unit_tests/controllers/console/workspace/test_model_providers.py

@@ -15,9 +15,11 @@ from controllers.console.workspace.model_providers import (
     ModelProviderIconApi,
     ModelProviderListApi,
     ModelProviderPaymentCheckoutUrlApi,
+    ModelProviderSummaryListApi,
     ModelProviderValidateApi,
     PreferredProviderTypeUpdateApi,
 )
+from core.entities.provider_entities import CredentialConfiguration
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.model_runtime.entities.provider_entities import ConfigurateMethod
@@ -27,6 +29,10 @@ from models.provider import ProviderType
 from services.entities.model_provider_entities import (
     CustomConfigurationResponse,
     CustomConfigurationStatus,
+    ModelProviderCustomConfigurationSummaryResponse,
+    ModelProviderPluginSummaryResponse,
+    ModelProviderSummaryResponse,
+    ModelProviderSystemConfigurationSummaryResponse,
     ProviderResponse,
     SystemConfigurationResponse,
 )
@@ -140,6 +146,80 @@ class TestModelProviderListApi:
         assert result == {"data": []}
 
 
+class TestModelProviderSummaryListApi:
+    def test_get_success(self, app: Flask):
+        api = ModelProviderSummaryListApi()
+        method = unwrap(api.get)
+        provider = ModelProviderSummaryResponse(
+            tenant_id="tenant1",
+            provider="langgenius/openai/openai",
+            plugin_id="langgenius/openai",
+            label=I18nObject(en_US="OpenAI"),
+            description=I18nObject(en_US="OpenAI models"),
+            icon_small=I18nObject(en_US="icon.svg"),
+            icon_small_dark=None,
+            supported_model_types=[ModelType.LLM],
+            configurate_methods=[ConfigurateMethod.PREDEFINED_MODEL],
+            preferred_provider_type=ProviderType.CUSTOM,
+            is_configured=True,
+            custom_configuration=ModelProviderCustomConfigurationSummaryResponse(
+                status=CustomConfigurationStatus.ACTIVE,
+                available_credentials=[
+                    CredentialConfiguration(
+                        credential_id=VALID_UUID,
+                        credential_name="production",
+                    ),
+                    CredentialConfiguration(
+                        credential_id="223e4567-e89b-12d3-a456-426614174000",
+                        credential_name="backup",
+                    ),
+                ],
+                current_credential_id=VALID_UUID,
+                current_credential_name="production",
+                current_credential_usable=True,
+            ),
+            system_configuration=ModelProviderSystemConfigurationSummaryResponse(enabled=False),
+        )
+        plugin = ModelProviderPluginSummaryResponse(
+            installation_id="installation-1",
+            plugin_id="langgenius/openai",
+            plugin_unique_identifier="langgenius/openai:1.0.0@checksum",
+            runtime_type="local",
+            source="marketplace",
+            version="1.0.0",
+        )
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.workspace.model_providers.ModelProviderService.get_provider_summary_list",
+                return_value=([provider], {"langgenius/openai": plugin}),
+            ) as get_provider_summary_list,
+        ):
+            result = method(api, "tenant1")
+
+        get_provider_summary_list.assert_called_once_with(tenant_id="tenant1")
+        assert result["data"][0]["provider"] == "langgenius/openai/openai"
+        assert "tenant_id" not in result["data"][0]
+        assert result["data"][0]["custom_configuration"] == {
+            "status": "active",
+            "available_credentials": [
+                {
+                    "credential_id": VALID_UUID,
+                    "credential_name": "production",
+                },
+                {
+                    "credential_id": "223e4567-e89b-12d3-a456-426614174000",
+                    "credential_name": "backup",
+                },
+            ],
+            "current_credential_id": VALID_UUID,
+            "current_credential_name": "production",
+            "current_credential_usable": True,
+        }
+        assert result["plugins"]["langgenius/openai"]["installation_id"] == "installation-1"
+
+
 class TestModelProviderCredentialApi:
     def test_get_success(self, app: Flask):
         api = ModelProviderCredentialApi()

api/tests/unit_tests/controllers/console/workspace/test_plugin.py

@@ -28,6 +28,7 @@ from controllers.console.workspace.plugin import (
     PluginFetchMarketplacePkgApi,
     PluginFetchPermissionApi,
     PluginIconApi,
+    PluginInstalledIdsApi,
     PluginInstallFromGithubApi,
     PluginInstallFromMarketplaceApi,
     PluginInstallFromPkgApi,
@@ -41,12 +42,16 @@ from controllers.console.workspace.plugin import (
     PluginUploadFromBundleApi,
     PluginUploadFromGithubApi,
     PluginUploadFromPkgApi,
+    _list_hardcoded_builtin_tool_providers,
 )
 from core.plugin.entities.parameters import PluginParameterOption
-from core.plugin.entities.plugin import PluginDeclaration, PluginEntity, PluginInstallation
+from core.plugin.entities.plugin import PluginCategory, PluginDeclaration, PluginEntity, PluginInstallation
 from core.plugin.entities.plugin_daemon import PluginInstallTask
 from core.plugin.impl.exc import PluginDaemonClientSideError
 from core.plugin.plugin_service import PluginService
+from core.tools.entities.api_entities import ToolProviderApiEntity
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolProviderType
 from models.account import (
     Account,
     TenantAccountRole,
@@ -445,7 +450,7 @@ class TestPluginCategoryListApi:
         mock_list = MagicMock(list=[plugin_item], has_more=True)
 
         with (
-            app.test_request_context("/?page=2&page_size=10"),
+            app.test_request_context("/?page=2&page_size=10&query=weather&tags=search&tags=rag&language=zh_Hans"),
             patch(
                 "controllers.console.workspace.plugin.PluginService.list_by_category", return_value=mock_list
             ) as list_mock,
@@ -456,18 +461,75 @@ class TestPluginCategoryListApi:
         ):
             result = method(api, "t1", "tool")
 
-        list_mock.assert_called_once()
-        assert list_mock.call_args.args[0] == "t1"
-        assert list_mock.call_args.args[1] == "tool"
-        assert list_mock.call_args.args[2] == 2
-        assert list_mock.call_args.args[3] == 10
+        list_mock.assert_called_once_with(
+            "t1",
+            "tool",
+            2,
+            10,
+            query="weather",
+            tags=["search", "rag"],
+            language="zh_Hans",
+        )
         assert result["plugins"][0]["id"] == "entity-1"
         assert result["plugins"][0]["plugin_unique_identifier"] == "test-author/test-plugin:1.0.0@checksum"
         assert result["builtin_tools"][0]["id"] == "builtin"
         assert result["builtin_tools"][0]["type"] == "builtin"
         assert result["has_more"] is True
         assert "total" not in result
-        builtin_mock.assert_called_once_with("t1")
+        builtin_mock.assert_called_once_with(
+            "t1",
+            query="weather",
+            tags=["search", "rag"],
+            language="zh_Hans",
+        )
+
+    def test_builtin_tool_providers_use_the_category_list_filters(self):
+        search_provider = ToolProviderApiEntity(
+            id="search-provider",
+            author="dify",
+            name="search-provider",
+            description=I18nObject(en_US="Search provider", zh_Hans="搜索工具"),
+            icon="icon.svg",
+            label=I18nObject(en_US="Search", zh_Hans="搜索"),
+            type=ToolProviderType.BUILT_IN,
+            labels=["search"],
+        )
+        rag_provider = ToolProviderApiEntity(
+            id="rag-provider",
+            author="dify",
+            name="rag-provider",
+            description=I18nObject(en_US="RAG provider", zh_Hans="知识库工具"),
+            icon="icon.svg",
+            label=I18nObject(en_US="RAG", zh_Hans="知识库"),
+            type=ToolProviderType.BUILT_IN,
+            labels=["rag"],
+        )
+
+        with (
+            patch("controllers.console.workspace.plugin.ToolManager.list_default_builtin_providers", return_value=[]),
+            patch(
+                "controllers.console.workspace.plugin.ToolManager.list_hardcoded_providers",
+                return_value=[MagicMock(), MagicMock()],
+            ),
+            patch("controllers.console.workspace.plugin.is_filtered", return_value=False),
+            patch(
+                "controllers.console.workspace.plugin.ToolTransformService.builtin_provider_to_user_provider",
+                side_effect=[search_provider, rag_provider],
+            ),
+            patch("controllers.console.workspace.plugin.ToolTransformService.repack_provider"),
+            patch(
+                "controllers.console.workspace.plugin.BuiltinToolProviderSort.sort",
+                side_effect=lambda providers: providers,
+            ),
+        ):
+            result = _list_hardcoded_builtin_tool_providers(
+                "t1",
+                query="搜索",
+                tags=["search", "weather"],
+                language="zh_Hans",
+            )
+
+        assert [provider["id"] for provider in result] == ["search-provider"]
 
     def test_non_tool_category_does_not_include_builtin_tools(self, app: Flask):
         api = PluginCategoryListApi()
@@ -730,6 +792,39 @@ class TestPluginListInstallationsFromIdsApi:
             assert result == ({"code": "plugin_error", "message": "error"}, 400)
 
 
+class TestPluginInstalledIdsApi:
+    def test_success(self, app: Flask):
+        api = PluginInstalledIdsApi()
+        method = unwrap(api.get)
+
+        with (
+            app.test_request_context("/?category=tool"),
+            patch(
+                "controllers.console.workspace.plugin.PluginService.list_installed_plugin_ids",
+                return_value=["langgenius/openai", "langgenius/anthropic"],
+            ) as list_installed_plugin_ids,
+        ):
+            result = method(api, "t1")
+
+        assert result == {"plugin_ids": ["langgenius/openai", "langgenius/anthropic"]}
+        list_installed_plugin_ids.assert_called_once_with("t1", PluginCategory.Tool)
+
+    def test_daemon_error(self, app: Flask):
+        api = PluginInstalledIdsApi()
+        method = unwrap(api.get)
+
+        with (
+            app.test_request_context("/?category=tool"),
+            patch(
+                "controllers.console.workspace.plugin.PluginService.list_installed_plugin_ids",
+                side_effect=PluginDaemonClientSideError("error"),
+            ),
+        ):
+            result = method(api, "t1")
+
+        assert result == ({"code": "plugin_error", "message": "error"}, 400)
+
+
 class TestPluginUploadFromGithubApi:
     def test_success(self, app: Flask, user):
         api = PluginUploadFromGithubApi()

api/tests/unit_tests/controllers/inner_api/workspace/test_plugin_model_providers.py

@@ -0,0 +1,64 @@
+import inspect
+from unittest.mock import call, patch
+
+import pytest
+from flask import Flask
+from pydantic import ValidationError
+
+from controllers.inner_api.workspace.plugin_model_providers import (
+    EnterprisePluginModelProvidersCacheInvalidate,
+    InvalidatePluginModelProvidersCachePayload,
+)
+
+
+class TestInvalidatePluginModelProvidersCachePayload:
+    def test_valid_payload(self):
+        payload = InvalidatePluginModelProvidersCachePayload.model_validate(
+            {"tenant_ids": ["tenant-alpha", "tenant-beta"]}
+        )
+        assert payload.tenant_ids == ["tenant-alpha", "tenant-beta"]
+
+    def test_missing_tenant_ids_defaults_to_empty(self):
+        payload = InvalidatePluginModelProvidersCachePayload.model_validate({})
+        assert payload.tenant_ids == []
+
+    def test_unknown_field_rejected(self):
+        with pytest.raises(ValidationError):
+            InvalidatePluginModelProvidersCachePayload.model_validate({"tenant_ids": ["tenant-alpha"], "generation": 7})
+
+
+class TestEnterprisePluginModelProvidersCacheInvalidate:
+    @pytest.fixture
+    def api_instance(self):
+        return EnterprisePluginModelProvidersCacheInvalidate()
+
+    def _post(self, api_instance, app: Flask, payload):
+        unwrapped_post = inspect.unwrap(api_instance.post)
+        with app.test_request_context():
+            with patch("controllers.inner_api.workspace.plugin_model_providers.inner_api_ns") as mock_ns:
+                mock_ns.payload = payload
+                return unwrapped_post(api_instance)
+
+    @patch("controllers.inner_api.workspace.plugin_model_providers.PluginService")
+    def test_post_invalidates_once_per_tenant(self, mock_plugin_service, api_instance, app: Flask):
+        result = self._post(api_instance, app, {"tenant_ids": ["tenant-alpha", "tenant-beta"]})
+
+        assert result == ({"result": "success"}, 200)
+        assert mock_plugin_service.invalidate_plugin_model_providers_cache.call_args_list == [
+            call("tenant-alpha"),
+            call("tenant-beta"),
+        ]
+
+    @patch("controllers.inner_api.workspace.plugin_model_providers.PluginService")
+    def test_post_with_empty_list_is_a_no_op(self, mock_plugin_service, api_instance, app: Flask):
+        result = self._post(api_instance, app, {"tenant_ids": []})
+
+        assert result == ({"result": "success"}, 200)
+        mock_plugin_service.invalidate_plugin_model_providers_cache.assert_not_called()
+
+    @patch("controllers.inner_api.workspace.plugin_model_providers.PluginService")
+    def test_post_with_missing_payload_is_a_no_op(self, mock_plugin_service, api_instance, app: Flask):
+        result = self._post(api_instance, app, None)
+
+        assert result == ({"result": "success"}, 200)
+        mock_plugin_service.invalidate_plugin_model_providers_cache.assert_not_called()

api/tests/unit_tests/controllers/service_api/app/test_file_preview.py

@@ -1,31 +1,17 @@
-"""Unit tests for the Service API file-preview endpoint.
-
-Ownership checks run against persisted message, file, app, and upload rows so the
-tests exercise the same SQLAlchemy statements and tenant boundary as production.
-Storage remains mocked because it is the external I/O boundary of the endpoint.
+"""
+Unit tests for Service API File Preview endpoint
 """
 
 import logging
-from collections.abc import Iterator
-from dataclasses import dataclass
-from datetime import datetime
-from decimal import Decimal
+import uuid
 from typing import Protocol, cast
 from unittest.mock import Mock, patch
-from uuid import uuid4
 
 import pytest
-from sqlalchemy import event
-from sqlalchemy.engine import Engine
-from sqlalchemy.orm import Session
 
 from controllers.service_api.app.error import FileAccessDeniedError, FileNotFoundError
 from controllers.service_api.app.file_preview import FilePreviewApi
-from extensions.storage.storage_type import StorageType
-from graphon.file import FileTransferMethod, FileType
-from models.base import TypeBase
-from models.enums import ConversationFromSource, CreatorUserRole
-from models.model import App, AppMode, Message, MessageFile, UploadFile
+from models.model import App, EndUser, Message, MessageFile, UploadFile
 
 
 class _FilePreviewLogRecord(Protocol):
@@ -34,252 +20,367 @@ class _FilePreviewLogRecord(Protocol):
     error: str
 
 
-@dataclass(frozen=True)
-class _Database:
-    """Expose the real test session through the interface used by the controller."""
-
-    session: Session
-
-
-@dataclass(frozen=True)
-class _PreviewRecords:
-    app: App
-    message: Message
-    message_file: MessageFile
-    upload_file: UploadFile
-
-
-@pytest.fixture
-def database(sqlite_engine: Engine) -> Iterator[_Database]:
-    """Create only the tables required by file ownership validation."""
-
-    models = (App, Message, MessageFile, UploadFile)
-    tables = [TypeBase.metadata.tables[model.__tablename__] for model in models]
-    TypeBase.metadata.create_all(sqlite_engine, tables=tables)
-    with Session(sqlite_engine, expire_on_commit=False) as session:
-        yield _Database(session)
-
-
-@pytest.fixture
-def file_preview_api() -> FilePreviewApi:
-    """Create the resource instance under test."""
-
-    return FilePreviewApi()
-
-
-def _upload_file(*, tenant_id: str, file_id: str | None = None) -> UploadFile:
-    upload_file = UploadFile(
-        tenant_id=tenant_id,
-        storage_type=StorageType.LOCAL,
-        key="storage/key/test_file.jpg",
-        name="test_file.jpg",
-        size=1024,
-        extension="jpg",
-        mime_type="image/jpeg",
-        created_by_role=CreatorUserRole.ACCOUNT,
-        created_by=str(uuid4()),
-        created_at=datetime(2026, 1, 1),
-        used=True,
-    )
-    if file_id is not None:
-        upload_file.id = file_id
-    return upload_file
-
-
-def _persist_preview_records(
-    session: Session,
-    *,
-    app_id: str | None = None,
-    app_tenant_id: str | None = None,
-    upload_tenant_id: str | None = None,
-) -> _PreviewRecords:
-    app_id = app_id or str(uuid4())
-    app_tenant_id = app_tenant_id or str(uuid4())
-    upload_file = _upload_file(tenant_id=upload_tenant_id or app_tenant_id)
-    app = App(
-        id=app_id,
-        tenant_id=app_tenant_id,
-        name="Preview app",
-        description="",
-        mode=AppMode.CHAT,
-        icon_type=None,
-        icon="",
-        icon_background=None,
-        enable_site=True,
-        enable_api=True,
-    )
-    message = Message(
-        id=str(uuid4()),
-        app_id=app_id,
-        conversation_id=str(uuid4()),
-        _inputs={},
-        query="preview",
-        message={},
-        message_unit_price=Decimal(0),
-        answer="answer",
-        answer_unit_price=Decimal(0),
-        currency="USD",
-        from_source=ConversationFromSource.API,
-    )
-    message_file = MessageFile(
-        message_id=message.id,
-        type=FileType.IMAGE,
-        transfer_method=FileTransferMethod.LOCAL_FILE,
-        created_by_role=CreatorUserRole.ACCOUNT,
-        created_by=str(uuid4()),
-        upload_file_id=upload_file.id,
-    )
-    session.add_all([app, message, message_file, upload_file])
-    session.commit()
-    return _PreviewRecords(app=app, message=message, message_file=message_file, upload_file=upload_file)
-
-
 class TestFilePreviewApi:
-    """Exercise ownership validation and response construction."""
+    """Test suite for FilePreviewApi"""
 
-    def test_validate_file_ownership_success(self, file_preview_api: FilePreviewApi, database: _Database):
-        records = _persist_preview_records(database.session)
+    @pytest.fixture
+    def file_preview_api(self):
+        """Create FilePreviewApi instance for testing"""
+        return FilePreviewApi()
 
-        with patch("controllers.service_api.app.file_preview.db", database):
-            message_file, upload_file = file_preview_api._validate_file_ownership(
-                records.upload_file.id, records.app.id
-            )
+    @pytest.fixture
+    def mock_app(self):
+        """Mock App model"""
+        app = Mock(spec=App)
+        app.id = str(uuid.uuid4())
+        app.tenant_id = str(uuid.uuid4())
+        return app
 
-        assert message_file.id == records.message_file.id
-        assert upload_file.id == records.upload_file.id
-        assert upload_file.tenant_id == records.app.tenant_id
+    @pytest.fixture
+    def mock_end_user(self):
+        """Mock EndUser model"""
+        end_user = Mock(spec=EndUser)
+        end_user.id = str(uuid.uuid4())
+        return end_user
 
-    def test_validate_file_ownership_file_not_found(self, file_preview_api: FilePreviewApi, database: _Database):
-        with patch("controllers.service_api.app.file_preview.db", database):
-            with pytest.raises(FileNotFoundError, match="File not found in message context"):
-                file_preview_api._validate_file_ownership(str(uuid4()), str(uuid4()))
+    @pytest.fixture
+    def mock_upload_file(self):
+        """Mock UploadFile model"""
+        upload_file = Mock(spec=UploadFile)
+        upload_file.id = str(uuid.uuid4())
+        upload_file.name = "test_file.jpg"
+        upload_file.extension = "jpg"
+        upload_file.mime_type = "image/jpeg"
+        upload_file.size = 1024
+        upload_file.key = "storage/key/test_file.jpg"
+        upload_file.tenant_id = str(uuid.uuid4())
+        return upload_file
 
-    def test_validate_file_ownership_access_denied(self, file_preview_api: FilePreviewApi, database: _Database):
-        records = _persist_preview_records(database.session)
+    @pytest.fixture
+    def mock_message_file(self):
+        """Mock MessageFile model"""
+        message_file = Mock(spec=MessageFile)
+        message_file.id = str(uuid.uuid4())
+        message_file.upload_file_id = str(uuid.uuid4())
+        message_file.message_id = str(uuid.uuid4())
+        return message_file
 
-        with patch("controllers.service_api.app.file_preview.db", database):
-            with pytest.raises(FileAccessDeniedError, match="not owned by requesting app"):
-                file_preview_api._validate_file_ownership(records.upload_file.id, str(uuid4()))
+    @pytest.fixture
+    def mock_message(self):
+        """Mock Message model"""
+        message = Mock(spec=Message)
+        message.id = str(uuid.uuid4())
+        message.app_id = str(uuid.uuid4())
+        return message
 
-    def test_validate_file_ownership_upload_file_not_found(self, file_preview_api: FilePreviewApi, database: _Database):
-        records = _persist_preview_records(database.session)
-        database.session.delete(records.upload_file)
-        database.session.commit()
+    def test_validate_file_ownership_success(
+        self, file_preview_api: FilePreviewApi, mock_app, mock_upload_file, mock_message_file, mock_message
+    ):
+        """Test successful file ownership validation"""
+        file_id = str(uuid.uuid4())
+        app_id = mock_app.id
 
-        with patch("controllers.service_api.app.file_preview.db", database):
-            with pytest.raises(FileNotFoundError, match="Upload file record not found"):
-                file_preview_api._validate_file_ownership(records.upload_file.id, records.app.id)
+        # Set up the mocks
+        mock_upload_file.tenant_id = mock_app.tenant_id
+        mock_message.app_id = app_id
+        mock_message_file.upload_file_id = file_id
+        mock_message_file.message_id = mock_message.id
 
-    def test_validate_file_ownership_tenant_mismatch(self, file_preview_api: FilePreviewApi, database: _Database):
-        records = _persist_preview_records(database.session, upload_tenant_id=str(uuid4()))
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock scalar() for MessageFile and Message queries
+            mock_db.session.scalar.side_effect = [
+                mock_message_file,  # MessageFile query
+                mock_message,  # Message query
+            ]
+            # Mock get() for UploadFile and App PK lookups
+            mock_db.session.get.side_effect = [
+                mock_upload_file,  # UploadFile query
+                mock_app,  # App query for tenant validation
+            ]
 
-        with patch("controllers.service_api.app.file_preview.db", database):
-            with pytest.raises(FileAccessDeniedError, match="tenant mismatch"):
-                file_preview_api._validate_file_ownership(records.upload_file.id, records.app.id)
+            # Execute the method
+            result_message_file, result_upload_file = file_preview_api._validate_file_ownership(file_id, app_id)
+
+            # Assertions
+            assert result_message_file == mock_message_file
+            assert result_upload_file == mock_upload_file
+
+    def test_validate_file_ownership_file_not_found(self, file_preview_api: FilePreviewApi):
+        """Test file ownership validation when MessageFile not found"""
+        file_id = str(uuid.uuid4())
+        app_id = str(uuid.uuid4())
+
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock MessageFile not found via scalar()
+            mock_db.session.scalar.return_value = None
+
+            # Execute and assert exception
+            with pytest.raises(FileNotFoundError) as exc_info:
+                file_preview_api._validate_file_ownership(file_id, app_id)
+
+            assert "File not found in message context" in str(exc_info.value)
+
+    def test_validate_file_ownership_access_denied(self, file_preview_api: FilePreviewApi, mock_message_file):
+        """Test file ownership validation when Message not owned by app"""
+        file_id = str(uuid.uuid4())
+        app_id = str(uuid.uuid4())
+
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock MessageFile found but Message not owned by app via scalar()
+            mock_db.session.scalar.side_effect = [
+                mock_message_file,  # MessageFile query - found
+                None,  # Message query - not found (access denied)
+            ]
+
+            # Execute and assert exception
+            with pytest.raises(FileAccessDeniedError) as exc_info:
+                file_preview_api._validate_file_ownership(file_id, app_id)
+
+            assert "not owned by requesting app" in str(exc_info.value)
+
+    def test_validate_file_ownership_upload_file_not_found(
+        self, file_preview_api: FilePreviewApi, mock_message_file, mock_message
+    ):
+        """Test file ownership validation when UploadFile not found"""
+        file_id = str(uuid.uuid4())
+        app_id = str(uuid.uuid4())
+
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock scalar() for MessageFile and Message
+            mock_db.session.scalar.side_effect = [
+                mock_message_file,  # MessageFile query - found
+                mock_message,  # Message query - found
+            ]
+            # Mock get() for UploadFile - not found
+            mock_db.session.get.return_value = None
+
+            # Execute and assert exception
+            with pytest.raises(FileNotFoundError) as exc_info:
+                file_preview_api._validate_file_ownership(file_id, app_id)
+
+            assert "Upload file record not found" in str(exc_info.value)
+
+    def test_validate_file_ownership_tenant_mismatch(
+        self, file_preview_api: FilePreviewApi, mock_app, mock_upload_file, mock_message_file, mock_message
+    ):
+        """Test file ownership validation with tenant mismatch"""
+        file_id = str(uuid.uuid4())
+        app_id = mock_app.id
+
+        # Set up tenant mismatch
+        mock_upload_file.tenant_id = "different_tenant_id"
+        mock_app.tenant_id = "app_tenant_id"
+        mock_message.app_id = app_id
+        mock_message_file.upload_file_id = file_id
+        mock_message_file.message_id = mock_message.id
+
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock scalar() for MessageFile and Message queries
+            mock_db.session.scalar.side_effect = [
+                mock_message_file,  # MessageFile query
+                mock_message,  # Message query
+            ]
+            # Mock get() for UploadFile and App PK lookups
+            mock_db.session.get.side_effect = [
+                mock_upload_file,  # UploadFile query
+                mock_app,  # App query for tenant validation
+            ]
+
+            # Execute and assert exception
+            with pytest.raises(FileAccessDeniedError) as exc_info:
+                file_preview_api._validate_file_ownership(file_id, app_id)
+
+            assert "tenant mismatch" in str(exc_info.value)
 
     def test_validate_file_ownership_invalid_input(self, file_preview_api: FilePreviewApi):
-        with pytest.raises(FileAccessDeniedError, match="Invalid file or app identifier"):
+        """Test file ownership validation with invalid input"""
+
+        # Test with empty file_id
+        with pytest.raises(FileAccessDeniedError) as exc_info:
             file_preview_api._validate_file_ownership("", "app_id")
+        assert "Invalid file or app identifier" in str(exc_info.value)
 
-        with pytest.raises(FileAccessDeniedError, match="Invalid file or app identifier"):
+        # Test with empty app_id
+        with pytest.raises(FileAccessDeniedError) as exc_info:
             file_preview_api._validate_file_ownership("file_id", "")
+        assert "Invalid file or app identifier" in str(exc_info.value)
 
-    @pytest.mark.parametrize(
-        ("as_attachment", "mime_type", "name", "extension", "size"),
-        [
-            (False, "image/jpeg", "test_file.jpg", "jpg", 1024),
-            (True, "image/jpeg", "test_file.jpg", "jpg", 1024),
-            (False, "text/html", "unsafe.html", "html", 1024),
-            (False, "video/mp4", "test_file.mp4", "mp4", 1024),
-            (False, "image/jpeg", "test_file.jpg", "jpg", 0),
-        ],
-    )
-    def test_build_file_response(
-        self,
-        file_preview_api: FilePreviewApi,
-        as_attachment: bool,
-        mime_type: str,
-        name: str,
-        extension: str,
-        size: int,
-    ):
-        upload_file = _upload_file(tenant_id=str(uuid4()))
-        upload_file.mime_type = mime_type
-        upload_file.name = name
-        upload_file.extension = extension
-        upload_file.size = size
+    def test_build_file_response_basic(self, file_preview_api: FilePreviewApi, mock_upload_file):
+        """Test basic file response building"""
+        mock_generator = Mock()
 
-        response = file_preview_api._build_file_response(Mock(), upload_file, as_attachment)
+        response = file_preview_api._build_file_response(mock_generator, mock_upload_file, False)
 
+        # Check response properties
+        assert response.mimetype == mock_upload_file.mime_type
         assert response.direct_passthrough is True
+        assert response.headers["Content-Length"] == str(mock_upload_file.size)
         assert "Cache-Control" in response.headers
-        assert ("Content-Length" in response.headers) is bool(size)
-        if as_attachment or mime_type == "text/html":
-            assert "attachment" in response.headers["Content-Disposition"]
-            assert response.headers["Content-Type"] == "application/octet-stream"
-        else:
-            assert response.mimetype == mime_type
-        if mime_type == "text/html":
-            assert response.headers["X-Content-Type-Options"] == "nosniff"
-        if mime_type.startswith("video/"):
-            assert response.headers["Accept-Ranges"] == "bytes"
+
+    def test_build_file_response_as_attachment(self, file_preview_api: FilePreviewApi, mock_upload_file):
+        """Test file response building with attachment flag"""
+        mock_generator = Mock()
+
+        response = file_preview_api._build_file_response(mock_generator, mock_upload_file, True)
+
+        # Check attachment-specific headers
+        assert "attachment" in response.headers["Content-Disposition"]
+        assert mock_upload_file.name in response.headers["Content-Disposition"]
+        assert response.headers["Content-Type"] == "application/octet-stream"
+
+    def test_build_file_response_html_forces_attachment(self, file_preview_api: FilePreviewApi, mock_upload_file):
+        """Test HTML files are forced to download"""
+        mock_generator = Mock()
+        mock_upload_file.mime_type = "text/html"
+        mock_upload_file.name = "unsafe.html"
+        mock_upload_file.extension = "html"
+
+        response = file_preview_api._build_file_response(mock_generator, mock_upload_file, False)
+
+        assert "attachment" in response.headers["Content-Disposition"]
+        assert response.headers["Content-Type"] == "application/octet-stream"
+        assert response.headers["X-Content-Type-Options"] == "nosniff"
+
+    def test_build_file_response_audio_video(self, file_preview_api: FilePreviewApi, mock_upload_file):
+        """Test file response building for audio/video files"""
+        mock_generator = Mock()
+        mock_upload_file.mime_type = "video/mp4"
+
+        response = file_preview_api._build_file_response(mock_generator, mock_upload_file, False)
+
+        # Check Range support for media files
+        assert response.headers["Accept-Ranges"] == "bytes"
+
+    def test_build_file_response_no_size(self, file_preview_api: FilePreviewApi, mock_upload_file):
+        """Test file response building when size is unknown"""
+        mock_generator = Mock()
+        mock_upload_file.size = 0  # Unknown size
+
+        response = file_preview_api._build_file_response(mock_generator, mock_upload_file, False)
+
+        # Content-Length should not be set when size is unknown
+        assert "Content-Length" not in response.headers
 
     @patch("controllers.service_api.app.file_preview.storage")
-    def test_components_use_validated_file(
-        self, mock_storage: Mock, file_preview_api: FilePreviewApi, database: _Database
+    def test_get_method_integration(
+        self,
+        mock_storage,
+        file_preview_api: FilePreviewApi,
+        mock_app,
+        mock_end_user,
+        mock_upload_file,
+        mock_message_file,
+        mock_message,
     ):
-        records = _persist_preview_records(database.session)
-        generator = Mock()
+        """Test the full GET method integration (without decorator)"""
+        file_id = str(uuid.uuid4())
+        app_id = mock_app.id
 
-        with patch("controllers.service_api.app.file_preview.db", database):
-            message_file, upload_file = file_preview_api._validate_file_ownership(
-                records.upload_file.id, records.app.id
-            )
-            response = file_preview_api._build_file_response(generator, upload_file, False)
+        # Set up mocks
+        mock_upload_file.tenant_id = mock_app.tenant_id
+        mock_message.app_id = app_id
+        mock_message_file.upload_file_id = file_id
+        mock_message_file.message_id = mock_message.id
 
-        assert message_file.id == records.message_file.id
-        assert response.mimetype == "image/jpeg"
-        mock_storage.load.assert_not_called()
+        mock_generator = Mock()
+        mock_storage.load.return_value = mock_generator
+
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock scalar() for MessageFile and Message queries
+            mock_db.session.scalar.side_effect = [
+                mock_message_file,  # MessageFile query
+                mock_message,  # Message query
+            ]
+            # Mock get() for UploadFile and App PK lookups
+            mock_db.session.get.side_effect = [
+                mock_upload_file,  # UploadFile query
+                mock_app,  # App query for tenant validation
+            ]
+
+            # Test the core logic directly without Flask decorators
+            # Validate file ownership
+            result_message_file, result_upload_file = file_preview_api._validate_file_ownership(file_id, app_id)
+            assert result_message_file == mock_message_file
+            assert result_upload_file == mock_upload_file
+
+            # Test file response building
+            response = file_preview_api._build_file_response(mock_generator, mock_upload_file, False)
+            assert response is not None
+
+            # Verify storage was called correctly
+            mock_storage.load.assert_not_called()  # Since we're testing components separately
 
     @patch("controllers.service_api.app.file_preview.storage")
-    def test_storage_error_remains_external(
-        self, mock_storage: Mock, file_preview_api: FilePreviewApi, database: _Database
+    def test_storage_error_handling(
+        self,
+        mock_storage,
+        file_preview_api: FilePreviewApi,
+        mock_app,
+        mock_upload_file,
+        mock_message_file,
+        mock_message,
     ):
-        records = _persist_preview_records(database.session)
-        mock_storage.load.side_effect = OSError("Storage error")
+        """Test storage error handling in the core logic"""
+        file_id = str(uuid.uuid4())
+        app_id = mock_app.id
 
-        with patch("controllers.service_api.app.file_preview.db", database):
-            _, upload_file = file_preview_api._validate_file_ownership(records.upload_file.id, records.app.id)
+        # Set up mocks
+        mock_upload_file.tenant_id = mock_app.tenant_id
+        mock_message.app_id = app_id
+        mock_message_file.upload_file_id = file_id
+        mock_message_file.message_id = mock_message.id
 
-        with pytest.raises(OSError, match="Storage error"):
-            mock_storage.load(upload_file.key, stream=True)
+        # Mock storage error
+        mock_storage.load.side_effect = Exception("Storage error")
+
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock scalar() for MessageFile and Message queries
+            mock_db.session.scalar.side_effect = [
+                mock_message_file,  # MessageFile query
+                mock_message,  # Message query
+            ]
+            # Mock get() for UploadFile and App PK lookups
+            mock_db.session.get.side_effect = [
+                mock_upload_file,  # UploadFile query
+                mock_app,  # App query for tenant validation
+            ]
+
+            # First validate file ownership works
+            result_message_file, result_upload_file = file_preview_api._validate_file_ownership(file_id, app_id)
+            assert result_message_file == mock_message_file
+            assert result_upload_file == mock_upload_file
+
+            # Test storage error handling
+            with pytest.raises(Exception) as exc_info:
+                mock_storage.load(mock_upload_file.key, stream=True)
+
+            assert "Storage error" in str(exc_info.value)
 
     def test_validate_file_ownership_unexpected_error_logging(
-        self,
-        file_preview_api: FilePreviewApi,
-        database: _Database,
-        sqlite_engine: Engine,
-        caplog: pytest.LogCaptureFixture,
+        self, file_preview_api: FilePreviewApi, caplog: pytest.LogCaptureFixture
     ):
-        file_id = str(uuid4())
-        app_id = str(uuid4())
+        """Test that unexpected errors are logged properly"""
+        file_id = str(uuid.uuid4())
+        app_id = str(uuid.uuid4())
 
-        def fail_statement(*_args: object) -> None:
-            raise RuntimeError("Unexpected database error")
+        with patch("controllers.service_api.app.file_preview.db") as mock_db:
+            # Mock database scalar to raise unexpected exception
+            mock_db.session.scalar.side_effect = Exception("Unexpected database error")
 
-        event.listen(sqlite_engine, "before_cursor_execute", fail_statement)
-        try:
-            with patch("controllers.service_api.app.file_preview.db", database):
-                with caplog.at_level(logging.ERROR, logger="controllers.service_api.app.file_preview"):
-                    with pytest.raises(FileAccessDeniedError, match="File access validation failed"):
-                        file_preview_api._validate_file_ownership(file_id, app_id)
-        finally:
-            event.remove(sqlite_engine, "before_cursor_execute", fail_statement)
+            # Execute and assert exception
+            with caplog.at_level(logging.ERROR, logger="controllers.service_api.app.file_preview"):
+                with pytest.raises(FileAccessDeniedError) as exc_info:
+                    file_preview_api._validate_file_ownership(file_id, app_id)
 
-        assert len(caplog.records) == 1
-        log_record = caplog.records[0]
-        assert log_record.getMessage() == "Unexpected error during file ownership validation"
-        record = cast(_FilePreviewLogRecord, log_record)
-        assert record.file_id == file_id
-        assert record.app_id == app_id
-        assert record.error == "Unexpected database error"
+            # Verify error message
+            assert "File access validation failed" in str(exc_info.value)
+
+            # Verify logging was called with the structured context fields. The ``extra`` keys
+            # are attached to the LogRecord as attributes, so they are not in ``caplog.text``.
+            assert len(caplog.records) == 1
+            log_record = caplog.records[0]
+            assert log_record.getMessage() == "Unexpected error during file ownership validation"
+            record = cast(_FilePreviewLogRecord, log_record)
+            assert record.file_id == file_id
+            assert record.app_id == app_id
+            assert record.error == "Unexpected database error"

api/tests/unit_tests/controllers/test_swagger.py

@@ -634,6 +634,11 @@ def test_console_plugin_category_list_exported_schema_uses_typed_items(tmp_path)
     console_openapi_path = next(path for path in written_paths if path.name == "console-openapi.json")
     payload = json.loads(console_openapi_path.read_text(encoding="utf-8"))
     operation = payload["paths"]["/workspaces/current/plugin/{category}/list"]["get"]
+    parameters = {parameter["name"]: parameter for parameter in operation["parameters"]}
+    assert parameters["query"]["in"] == "query"
+    assert parameters["tags"]["in"] == "query"
+    assert parameters["tags"]["schema"]["type"] == "array"
+    assert parameters["language"]["in"] == "query"
     response_ref = operation["responses"]["200"]["content"]["application/json"]["schema"]["$ref"].removeprefix(
         "#/components/schemas/"
     )
@@ -661,3 +666,112 @@ def test_console_plugin_category_list_exported_schema_uses_typed_items(tmp_path)
     builtin_tool_schema = schemas["PluginCategoryBuiltinToolProviderResponse"]
     for field in ("plugin_unique_identifier", "team_credentials", "type", "tools"):
         assert field in builtin_tool_schema["properties"]
+
+
+def test_console_installed_plugin_ids_exported_schema_is_lightweight(tmp_path):
+    from dev.generate_swagger_specs import generate_specs
+
+    written_paths = generate_specs(tmp_path)
+    console_openapi_path = next(path for path in written_paths if path.name == "console-openapi.json")
+    payload = json.loads(console_openapi_path.read_text(encoding="utf-8"))
+    operation = payload["paths"]["/workspaces/current/plugin/installed-ids"]["get"]
+    parameters = {parameter["name"]: parameter for parameter in operation["parameters"]}
+    assert parameters["category"]["in"] == "query"
+    assert parameters["category"]["required"] is True
+    assert parameters["category"]["schema"]["enum"] == [
+        "agent-strategy",
+        "datasource",
+        "extension",
+        "model",
+        "tool",
+        "trigger",
+    ]
+    response_ref = operation["responses"]["200"]["content"]["application/json"]["schema"]["$ref"].removeprefix(
+        "#/components/schemas/"
+    )
+    response_schema = payload["components"]["schemas"][response_ref]
+
+    assert response_schema["required"] == ["plugin_ids"]
+    assert response_schema["properties"] == {
+        "plugin_ids": {
+            "items": {"type": "string"},
+            "title": "Plugin Ids",
+            "type": "array",
+        }
+    }
+
+
+def test_console_model_provider_summary_exported_schema_is_lightweight(tmp_path):
+    from dev.generate_swagger_specs import generate_specs
+
+    written_paths = generate_specs(tmp_path)
+    console_openapi_path = next(path for path in written_paths if path.name == "console-openapi.json")
+    payload = json.loads(console_openapi_path.read_text(encoding="utf-8"))
+    operation = payload["paths"]["/workspaces/current/model-providers/summary"]["get"]
+    assert operation.get("parameters", []) == []
+
+    response_ref = operation["responses"]["200"]["content"]["application/json"]["schema"]["$ref"].removeprefix(
+        "#/components/schemas/"
+    )
+    response_schema = payload["components"]["schemas"][response_ref]
+    assert response_schema["required"] == ["data", "plugins"]
+    assert response_schema["properties"]["data"]["items"]["$ref"] == (
+        "#/components/schemas/ModelProviderSummaryResponse"
+    )
+    assert response_schema["properties"]["plugins"]["additionalProperties"]["$ref"] == (
+        "#/components/schemas/ModelProviderPluginSummaryResponse"
+    )
+
+    provider_properties = payload["components"]["schemas"]["ModelProviderSummaryResponse"]["properties"]
+    assert set(provider_properties) == {
+        "configurate_methods",
+        "custom_configuration",
+        "description",
+        "icon_small",
+        "icon_small_dark",
+        "is_configured",
+        "label",
+        "plugin_id",
+        "preferred_provider_type",
+        "provider",
+        "supported_model_types",
+        "system_configuration",
+    }
+    assert "provider_credential_schema" not in provider_properties
+    assert "model_credential_schema" not in provider_properties
+
+    custom_configuration_schema = payload["components"]["schemas"]["ModelProviderCustomConfigurationSummaryResponse"]
+    custom_configuration_properties = custom_configuration_schema["properties"]
+    assert set(custom_configuration_schema["required"]) == {
+        "available_credentials",
+        "current_credential_usable",
+        "status",
+    }
+    assert set(custom_configuration_properties) == {
+        "available_credentials",
+        "current_credential_id",
+        "current_credential_name",
+        "current_credential_usable",
+        "status",
+    }
+    assert custom_configuration_properties["available_credentials"]["items"]["$ref"] == (
+        "#/components/schemas/CredentialConfiguration"
+    )
+    assert "has_credentials" not in custom_configuration_properties
+
+    credential_properties = payload["components"]["schemas"]["CredentialConfiguration"]["properties"]
+    assert set(credential_properties) == {
+        "credential_id",
+        "credential_name",
+    }
+    assert "encrypted_config" not in credential_properties
+
+    plugin_properties = payload["components"]["schemas"]["ModelProviderPluginSummaryResponse"]["properties"]
+    assert set(plugin_properties) == {
+        "installation_id",
+        "plugin_id",
+        "plugin_unique_identifier",
+        "runtime_type",
+        "source",
+        "version",
+    }

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

@@ -1,95 +1,24 @@
 """Unit tests for the message cycle manager optimization."""
 
 import logging
-from collections.abc import Iterator
-from dataclasses import dataclass
 from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
 from flask import Flask, current_app
-from sqlalchemy import Engine, event, select
-from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.entities.queue_entities import QueueAnnotationReplyEvent, QueueRetrieverResourcesEvent
 from core.app.entities.task_entities import MessageStreamResponse, StreamEvent, TaskStateMetadata
-from core.app.task_pipeline import message_cycle_manager as message_cycle_manager_module
 from core.app.task_pipeline.message_cycle_manager import MessageCycleManager
 from core.rag.entities import RetrievalSourceMetadata
-from graphon.file import FileTransferMethod, FileType
-from models import model as model_module
-from models.base import TypeBase
-from models.enums import ConversationFromSource, CreatorUserRole, MessageFileBelongsTo
-from models.model import App, AppMode, Conversation, MessageFile
+from models.model import App, AppMode
 
 
-@dataclass(frozen=True)
-class _SQLiteDb:
-    engine: Engine
-    session: Session
-
-
-@pytest.fixture
-def cycle_db(sqlite_engine: Engine, monkeypatch: pytest.MonkeyPatch) -> Iterator[Session]:
-    """Bind request-owned and cycle-manager-owned sessions to isolated SQLite."""
-    TypeBase.metadata.create_all(
-        sqlite_engine,
-        tables=[App.__table__, Conversation.__table__, MessageFile.__table__],
-    )
-    owned_session_factory = sessionmaker(bind=sqlite_engine, expire_on_commit=False)
-    with owned_session_factory() as request_session:
-        sqlite_db = _SQLiteDb(engine=sqlite_engine, session=request_session)
-        monkeypatch.setattr(message_cycle_manager_module, "db", sqlite_db)
-        monkeypatch.setattr(model_module, "db", sqlite_db)
-        monkeypatch.setattr(message_cycle_manager_module.session_factory, "create_session", owned_session_factory)
-        yield request_session
-
-
-def _app(*, app_id: str = "app-id", tenant_id: str = "tenant-1") -> App:
-    return App(
-        id=app_id,
-        tenant_id=tenant_id,
-        name="Test App",
-        description="",
-        mode=AppMode.CHAT,
-        enable_site=True,
-        enable_api=True,
-        max_active_requests=0,
-    )
-
-
-def _conversation(*, conversation_id: str = "conv-1", app_id: str = "app-id") -> Conversation:
-    conversation = Conversation(
-        app_id=app_id,
-        mode=AppMode.CHAT,
-        name="",
-        status="normal",
-        from_source=ConversationFromSource.API,
-        inputs={},
-    )
-    conversation.id = conversation_id
-    return conversation
-
-
-def _message_file(
-    *,
-    file_id: str = "file-1",
-    message_id: str = "test-message-id",
-    belongs_to: MessageFileBelongsTo | None = MessageFileBelongsTo.ASSISTANT,
-    url: str | None = "http://example.com/image.png",
-    file_type: FileType = FileType.IMAGE,
-) -> MessageFile:
-    message_file = MessageFile(
-        message_id=message_id,
-        type=file_type,
-        transfer_method=FileTransferMethod.TOOL_FILE,
-        created_by_role=CreatorUserRole.ACCOUNT,
-        created_by="account-id",
-        belongs_to=belongs_to,
-        url=url,
-    )
-    message_file.id = file_id
-    return message_file
+def _patch_create_session(mock_session):
+    session_cm = Mock()
+    session_cm.__enter__ = Mock(return_value=mock_session)
+    session_cm.__exit__ = Mock(return_value=False)
+    return patch("core.app.task_pipeline.message_cycle_manager.session_factory.create_session", return_value=session_cm)
 
 
 class TestMessageCycleManagerOptimization:
@@ -108,22 +37,30 @@ 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, cycle_db: Session):
+    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.
         """
-        cycle_db.add(_message_file())
-        cycle_db.commit()
+        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
 
-        with current_app.app_context():
-            result = message_cycle_manager.get_message_event_type("test-message-id")
+            mock_message_file = Mock()
+            mock_message_file.belongs_to = "assistant"
+            mock_session.scalar.return_value = mock_message_file
 
-        assert result == StreamEvent.MESSAGE_FILE
-        assert "test-message-id" in message_cycle_manager._message_has_file
+            # Execute
+            with current_app.app_context():
+                result = message_cycle_manager.get_message_event_type("test-message-id")
 
-    def test_get_message_event_type_with_user_file(self, message_cycle_manager, cycle_db: Session):
+            # Assert
+            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')
@@ -131,81 +68,90 @@ class TestMessageCycleManagerOptimization:
         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.
         """
-        cycle_db.add(_message_file(belongs_to=MessageFileBelongsTo.USER))
-        cycle_db.commit()
+        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
 
-        with current_app.app_context():
-            result = message_cycle_manager.get_message_event_type("test-message-id")
+            # 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
 
-        assert result == StreamEvent.MESSAGE
-        assert "test-message-id" not in message_cycle_manager._message_has_file
+            # Execute
+            with current_app.app_context():
+                result = message_cycle_manager.get_message_event_type("test-message-id")
 
-    def test_get_message_event_type_without_message_file(self, message_cycle_manager, cycle_db: Session):
+            # 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."""
-        assert list(cycle_db.scalars(select(MessageFile)).all()) == []
+        with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
+            # Setup mock session and no message file
+            mock_session = Mock()
+            mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
+            # Current implementation uses session.scalar(select(...))
+            mock_session.scalar.return_value = None
 
-        with current_app.app_context():
-            result = message_cycle_manager.get_message_event_type("test-message-id")
+            # Execute
+            with current_app.app_context():
+                result = message_cycle_manager.get_message_event_type("test-message-id")
 
-        assert result == StreamEvent.MESSAGE
+            # Assert
+            assert result == StreamEvent.MESSAGE
+            mock_session.scalar.assert_called_once()
 
-    def test_get_message_event_type_uses_cache_without_query(
-        self, message_cycle_manager, cycle_db: Session, sqlite_engine: Engine
-    ):
+    def test_get_message_event_type_uses_cache_without_query(self, message_cycle_manager):
         """Return MESSAGE_FILE directly from in-memory cache without opening a DB session."""
         message_cycle_manager._message_has_file.add("cached-message")
-        statements: list[str] = []
 
-        def record_statement(_conn, _cursor, statement, _parameters, _context, _executemany) -> None:
-            statements.append(statement)
-
-        event.listen(sqlite_engine, "before_cursor_execute", record_statement)
-        try:
+        with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
             result = message_cycle_manager.get_message_event_type("cached-message")
-        finally:
-            event.remove(sqlite_engine, "before_cursor_execute", record_statement)
 
         assert result == StreamEvent.MESSAGE_FILE
-        assert statements == []
+        mock_session_factory.create_session.assert_not_called()
 
-    def test_message_to_stream_response_with_precomputed_event_type(self, message_cycle_manager, cycle_db: Session):
+    def test_message_to_stream_response_with_precomputed_event_type(self, message_cycle_manager):
         """MessageCycleManager.message_to_stream_response expects a valid event_type; callers should precompute it."""
-        cycle_db.add(_message_file())
-        cycle_db.commit()
+        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
 
-        with current_app.app_context():
-            event_type = message_cycle_manager.get_message_event_type("test-message-id")
-            result = message_cycle_manager.message_to_stream_response(
-                answer="Hello world", message_id="test-message-id", event_type=event_type
-            )
+            mock_message_file = Mock()
+            mock_message_file.belongs_to = "assistant"
+            mock_session.scalar.return_value = mock_message_file
 
-        assert isinstance(result, MessageStreamResponse)
-        assert result.answer == "Hello world"
-        assert result.id == "test-message-id"
-        assert result.event == StreamEvent.MESSAGE_FILE
+            # Execute: compute event type once, then pass to message_to_stream_response
+            with current_app.app_context():
+                event_type = message_cycle_manager.get_message_event_type("test-message-id")
+                result = message_cycle_manager.message_to_stream_response(
+                    answer="Hello world", message_id="test-message-id", event_type=event_type
+                )
 
-    def test_message_to_stream_response_with_event_type_skips_query(
-        self, message_cycle_manager, cycle_db: Session, sqlite_engine: Engine
-    ):
+            # Assert
+            assert isinstance(result, MessageStreamResponse)
+            assert result.answer == "Hello world"
+            assert result.id == "test-message-id"
+            assert result.event == StreamEvent.MESSAGE_FILE
+            mock_session.scalar.assert_called_once()
+
+    def test_message_to_stream_response_with_event_type_skips_query(self, message_cycle_manager):
         """Test that message_to_stream_response skips database query when event_type is provided."""
-        statements: list[str] = []
-
-        def record_statement(_conn, _cursor, statement, _parameters, _context, _executemany) -> None:
-            statements.append(statement)
-
-        event.listen(sqlite_engine, "before_cursor_execute", record_statement)
-        try:
+        with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
+            # Execute with event_type provided
             result = message_cycle_manager.message_to_stream_response(
                 answer="Hello world", message_id="test-message-id", event_type=StreamEvent.MESSAGE
             )
-        finally:
-            event.remove(sqlite_engine, "before_cursor_execute", record_statement)
 
-        assert isinstance(result, MessageStreamResponse)
-        assert result.answer == "Hello world"
-        assert result.id == "test-message-id"
-        assert result.event == StreamEvent.MESSAGE
-        assert statements == []
+            # Assert
+            assert isinstance(result, MessageStreamResponse)
+            assert result.answer == "Hello world"
+            assert result.id == "test-message-id"
+            assert result.event == StreamEvent.MESSAGE
+            # Should not open a session when event_type is provided
+            mock_session_factory.create_session.assert_not_called()
 
     def test_message_to_stream_response_with_from_variable_selector(self, message_cycle_manager):
         """Test message_to_stream_response with from_variable_selector parameter."""
@@ -222,32 +168,40 @@ class TestMessageCycleManagerOptimization:
         assert result.from_variable_selector == ["var1", "var2"]
         assert result.event == StreamEvent.MESSAGE
 
-    def test_optimization_usage_example(self, message_cycle_manager, cycle_db: Session, sqlite_engine: Engine):
+    def test_optimization_usage_example(self, message_cycle_manager):
         """Test the optimization pattern that should be used by callers."""
-        statements: list[str] = []
-
-        def record_statement(_conn, _cursor, statement, _parameters, _context, _executemany) -> None:
-            statements.append(statement)
-
-        event.listen(sqlite_engine, "before_cursor_execute", record_statement)
-        try:
+        # Step 1: Get event type once (this queries database)
+        with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
+            mock_session = Mock()
+            mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
+            # Current implementation uses session.scalar(select(...))
+            mock_session.scalar.return_value = None  # No files
             with current_app.app_context():
                 event_type = message_cycle_manager.get_message_event_type("test-message-id")
+
+        # Should open session once
+        mock_session_factory.create_session.assert_called_once()
+        assert event_type == StreamEvent.MESSAGE
+
+        # Step 2: Use event_type for multiple calls (no additional queries)
+        with patch("core.app.task_pipeline.message_cycle_manager.session_factory") as mock_session_factory:
+            mock_session_factory.create_session.return_value.__enter__.return_value = Mock()
+
             chunk1_response = message_cycle_manager.message_to_stream_response(
                 answer="Chunk 1", message_id="test-message-id", event_type=event_type
             )
+
             chunk2_response = message_cycle_manager.message_to_stream_response(
                 answer="Chunk 2", message_id="test-message-id", event_type=event_type
             )
-        finally:
-            event.remove(sqlite_engine, "before_cursor_execute", record_statement)
 
-        assert event_type == StreamEvent.MESSAGE
-        assert len([statement for statement in statements if statement.lstrip().upper().startswith("SELECT")]) == 1
-        assert chunk1_response.event == StreamEvent.MESSAGE
-        assert chunk2_response.event == StreamEvent.MESSAGE
-        assert chunk1_response.answer == "Chunk 1"
-        assert chunk2_response.answer == "Chunk 2"
+            # Should not open session again when event_type provided
+            mock_session_factory.create_session.assert_not_called()
+
+            assert chunk1_response.event == StreamEvent.MESSAGE
+            assert chunk2_response.event == StreamEvent.MESSAGE
+            assert chunk1_response.answer == "Chunk 1"
+            assert chunk2_response.answer == "Chunk 2"
 
     def test_generate_conversation_name_returns_none_for_completion(self, message_cycle_manager):
         """Return None when completion entities are used for conversation naming.
@@ -315,38 +269,51 @@ class TestMessageCycleManagerOptimization:
         assert message_cycle_manager._application_generate_entity.is_new_conversation is False
         mock_timer.assert_not_called()
 
-    def test_generate_conversation_name_worker_returns_when_conversation_missing(
-        self, message_cycle_manager, cycle_db: Session
-    ):
+    def test_generate_conversation_name_worker_returns_when_conversation_missing(self, message_cycle_manager):
         """Return early when the conversation cannot be found."""
         flask_app = Flask(__name__)
-        assert list(cycle_db.scalars(select(Conversation)).all()) == []
+        db_session = Mock()
+        db_session.scalar.return_value = None
 
-        message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-missing", "hello")
+        with _patch_create_session(db_session):
+            message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-missing", "hello")
 
-        assert list(cycle_db.scalars(select(Conversation)).all()) == []
+        db_session.commit.assert_not_called()
 
-    def test_generate_conversation_name_worker_returns_when_app_missing(self, message_cycle_manager, cycle_db: Session):
+    def test_generate_conversation_name_worker_returns_when_app_missing(self, message_cycle_manager):
         """Return early when non-completion conversation has no app relation."""
         flask_app = Flask(__name__)
-        conversation = _conversation()
-        cycle_db.add(conversation)
-        cycle_db.commit()
+        conversation = SimpleNamespace(mode=AppMode.CHAT, app=None, app_id="app-id")
+        db_session = Mock()
+        db_session.scalar.return_value = conversation
+        db_session.get.return_value = None
 
-        message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-1", "hello")
+        with _patch_create_session(db_session):
+            message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-1", "hello")
 
-        assert cycle_db.get(Conversation, "conv-1").name == ""
-        assert cycle_db.get(App, "app-id") is None
+        db_session.commit.assert_not_called()
 
-    def test_generate_conversation_name_worker_uses_cached_name(
-        self, message_cycle_manager, cycle_db: Session, sqlite_engine: Engine
-    ):
+    def test_generate_conversation_name_worker_uses_cached_name(self, message_cycle_manager):
         """Use cached conversation name when present and avoid LLM call."""
         flask_app = Flask(__name__)
-        cycle_db.add_all([_app(), _conversation()])
-        cycle_db.commit()
+
+        class ConversationWithPoisonedApp:
+            mode = AppMode.CHAT
+            app_id = "app-id"
+            name = ""
+
+            @property
+            def app(self):
+                raise AssertionError("conversation.app must not open an implicit session")
+
+        conversation = ConversationWithPoisonedApp()
+        app_model = SimpleNamespace(tenant_id="tenant-1")
+        db_session = Mock()
+        db_session.scalar.return_value = conversation
+        db_session.get.return_value = app_model
 
         with (
+            _patch_create_session(db_session) as create_session,
             patch("core.app.task_pipeline.message_cycle_manager.redis_client") as mock_redis,
             patch("core.app.task_pipeline.message_cycle_manager.LLMGenerator") as mock_llm_generator,
         ):
@@ -354,23 +321,27 @@ class TestMessageCycleManagerOptimization:
 
             message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-1", "hello")
 
-        assert cycle_db.in_transaction() is False
-        with Session(sqlite_engine) as verification_session:
-            conversation = verification_session.get(Conversation, "conv-1")
-        assert conversation is not None
         assert conversation.name == "cached-title"
+        create_session.assert_called_once_with()
+        db_session.get.assert_called_once_with(App, "app-id")
+        db_session.commit.assert_called_once()
         mock_llm_generator.generate_conversation_name.assert_not_called()
         mock_redis.setex.assert_not_called()
 
-    def test_generate_conversation_name_worker_generates_and_caches_name(
-        self, message_cycle_manager, cycle_db: Session, sqlite_engine: Engine
-    ):
+    def test_generate_conversation_name_worker_generates_and_caches_name(self, message_cycle_manager):
         """Generate conversation name and write it to redis cache on cache miss."""
         flask_app = Flask(__name__)
-        cycle_db.add_all([_app(), _conversation()])
-        cycle_db.commit()
+        conversation = SimpleNamespace(
+            mode=AppMode.CHAT,
+            app=SimpleNamespace(tenant_id="tenant-1"),
+            app_id="app-id",
+            name="",
+        )
+        db_session = Mock()
+        db_session.scalar.return_value = conversation
 
         with (
+            _patch_create_session(db_session),
             patch("core.app.task_pipeline.message_cycle_manager.redis_client") as mock_redis,
             patch("core.app.task_pipeline.message_cycle_manager.LLMGenerator") as mock_llm_generator,
         ):
@@ -379,27 +350,27 @@ class TestMessageCycleManagerOptimization:
 
             message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-1", "hello")
 
-        assert cycle_db.in_transaction() is False
-        with Session(sqlite_engine) as verification_session:
-            conversation = verification_session.get(Conversation, "conv-1")
-        assert conversation is not None
         assert conversation.name == "generated-title"
+        db_session.commit.assert_called_once()
         mock_redis.setex.assert_called_once()
 
     def test_generate_conversation_name_worker_falls_back_when_generation_fails(
-        self,
-        message_cycle_manager,
-        cycle_db: Session,
-        sqlite_engine: Engine,
-        caplog: pytest.LogCaptureFixture,
+        self, message_cycle_manager, caplog: pytest.LogCaptureFixture
     ):
         """Fallback to truncated query when LLM generation fails."""
         flask_app = Flask(__name__)
-        cycle_db.add_all([_app(), _conversation()])
-        cycle_db.commit()
+        conversation = SimpleNamespace(
+            mode=AppMode.CHAT,
+            app=SimpleNamespace(tenant_id="tenant-1"),
+            app_id="app-id",
+            name="",
+        )
+        db_session = Mock()
+        db_session.scalar.return_value = conversation
         long_query = "q" * 60
 
         with (
+            _patch_create_session(db_session),
             patch("core.app.task_pipeline.message_cycle_manager.redis_client") as mock_redis,
             patch("core.app.task_pipeline.message_cycle_manager.LLMGenerator") as mock_llm_generator,
             patch("core.app.task_pipeline.message_cycle_manager.dify_config") as mock_dify_config,
@@ -411,11 +382,8 @@ class TestMessageCycleManagerOptimization:
             with caplog.at_level(logging.ERROR, logger="core.app.task_pipeline.message_cycle_manager"):
                 message_cycle_manager._generate_conversation_name_worker(flask_app, "conv-1", long_query)
 
-        assert cycle_db.in_transaction() is False
-        with Session(sqlite_engine) as verification_session:
-            conversation = verification_session.get(Conversation, "conv-1")
-        assert conversation is not None
         assert conversation.name == (long_query[:47] + "...")
+        db_session.commit.assert_called_once()
         assert any(record.levelno == logging.ERROR for record in caplog.records)
 
     def test_handle_annotation_reply_sets_metadata(self, message_cycle_manager):
@@ -486,25 +454,33 @@ class TestMessageCycleManagerOptimization:
         assert message_cycle_manager._task_state.metadata.retriever_resources[0].position == 1
         assert message_cycle_manager._task_state.metadata.retriever_resources[1].position == 2
 
-    def test_message_file_to_stream_response_builds_signed_url(self, message_cycle_manager, cycle_db: Session):
+    def test_message_file_to_stream_response_builds_signed_url(self, message_cycle_manager):
         """Build a stream response with a signed tool file URL.
 
-        Args: message_cycle_manager with a persisted MessageFile and mocked sign_tool_file.
+        Args: message_cycle_manager with mocked Session/db and sign_tool_file.
         Returns: MessageStreamResponse with signed url and belongs_to normalized to user.
         Side effects: Calls sign_tool_file for tool file ids.
         """
         message_cycle_manager._application_generate_entity.task_id = "task-1"
-        cycle_db.add(
-            _message_file(
-                file_id="file-1",
-                message_id="msg-1",
-                belongs_to=None,
-                url="tool://file.verylongextension",
-            )
-        )
-        cycle_db.commit()
 
-        with patch("core.app.task_pipeline.message_cycle_manager.sign_tool_file") as mock_sign:
+        message_file = SimpleNamespace(
+            id="file-1",
+            type="image",
+            belongs_to=None,
+            url="tool://file.verylongextension",
+            message_id="msg-1",
+        )
+
+        session = Mock()
+        session.scalar.return_value = message_file
+
+        with (
+            patch("core.app.task_pipeline.message_cycle_manager.Session") as mock_session_cls,
+            patch("core.app.task_pipeline.message_cycle_manager.sign_tool_file") as mock_sign,
+            patch("core.app.task_pipeline.message_cycle_manager.db") as mock_db,
+        ):
+            mock_db.engine = Mock()
+            mock_session_cls.return_value.__enter__.return_value = session
             mock_sign.return_value = "signed-url"
 
             response = message_cycle_manager.message_file_to_stream_response(SimpleNamespace(message_file_id="file-1"))
@@ -538,42 +514,56 @@ class TestMessageCycleManagerOptimization:
         assert len(message_cycle_manager._task_state.metadata.retriever_resources) == 1
         assert message_cycle_manager._task_state.metadata.retriever_resources[0].position == 1
 
-    def test_message_file_to_stream_response_uses_http_url_directly(self, message_cycle_manager, cycle_db: Session):
+    def test_message_file_to_stream_response_uses_http_url_directly(self, message_cycle_manager):
         """Use original URL when message file URL is already HTTP."""
         message_cycle_manager._application_generate_entity.task_id = "task-http"
-        cycle_db.add(
-            _message_file(
-                file_id="file-http",
-                message_id="msg-http",
-                belongs_to=MessageFileBelongsTo.ASSISTANT,
-                url="http://example.com/pic.png",
-            )
+        message_file = SimpleNamespace(
+            id="file-http",
+            type="image",
+            belongs_to="assistant",
+            url="http://example.com/pic.png",
+            message_id="msg-http",
         )
-        cycle_db.commit()
 
-        response = message_cycle_manager.message_file_to_stream_response(SimpleNamespace(message_file_id="file-http"))
+        session = Mock()
+        session.scalar.return_value = message_file
+
+        with (
+            patch("core.app.task_pipeline.message_cycle_manager.Session") as mock_session_cls,
+            patch("core.app.task_pipeline.message_cycle_manager.db") as mock_db,
+        ):
+            mock_db.engine = Mock()
+            mock_session_cls.return_value.__enter__.return_value = session
+
+            response = message_cycle_manager.message_file_to_stream_response(
+                SimpleNamespace(message_file_id="file-http")
+            )
 
         assert response is not None
         assert response.url == "http://example.com/pic.png"
         assert "msg-http" in message_cycle_manager._message_has_file
 
-    def test_message_file_to_stream_response_defaults_extension_to_bin_without_dot(
-        self, message_cycle_manager, cycle_db: Session
-    ):
+    def test_message_file_to_stream_response_defaults_extension_to_bin_without_dot(self, message_cycle_manager):
         """Default tool file extension to .bin when URL has no extension part."""
         message_cycle_manager._application_generate_entity.task_id = "task-bin"
-        cycle_db.add(
-            _message_file(
-                file_id="file-bin",
-                message_id="msg-bin",
-                belongs_to=MessageFileBelongsTo.ASSISTANT,
-                url="tool-file-id",
-                file_type=FileType.CUSTOM,
-            )
+        message_file = SimpleNamespace(
+            id="file-bin",
+            type="file",
+            belongs_to="assistant",
+            url="tool-file-id",
+            message_id="msg-bin",
         )
-        cycle_db.commit()
 
-        with patch("core.app.task_pipeline.message_cycle_manager.sign_tool_file") as mock_sign:
+        session = Mock()
+        session.scalar.return_value = message_file
+
+        with (
+            patch("core.app.task_pipeline.message_cycle_manager.Session") as mock_session_cls,
+            patch("core.app.task_pipeline.message_cycle_manager.sign_tool_file") as mock_sign,
+            patch("core.app.task_pipeline.message_cycle_manager.db") as mock_db,
+        ):
+            mock_db.engine = Mock()
+            mock_session_cls.return_value.__enter__.return_value = session
             mock_sign.return_value = "signed-bin-url"
 
             response = message_cycle_manager.message_file_to_stream_response(
@@ -584,13 +574,19 @@ class TestMessageCycleManagerOptimization:
         assert response.url == "signed-bin-url"
         mock_sign.assert_called_once_with(tool_file_id="tool-file-id", extension=".bin")
 
-    def test_message_file_to_stream_response_returns_none_when_file_missing(
-        self, message_cycle_manager, cycle_db: Session
-    ):
+    def test_message_file_to_stream_response_returns_none_when_file_missing(self, message_cycle_manager):
         """Return None when message file lookup does not find a record."""
-        assert list(cycle_db.scalars(select(MessageFile)).all()) == []
+        session = Mock()
+        session.scalar.return_value = None
 
-        response = message_cycle_manager.message_file_to_stream_response(SimpleNamespace(message_file_id="missing"))
+        with (
+            patch("core.app.task_pipeline.message_cycle_manager.Session") as mock_session_cls,
+            patch("core.app.task_pipeline.message_cycle_manager.db") as mock_db,
+        ):
+            mock_db.engine = Mock()
+            mock_session_cls.return_value.__enter__.return_value = session
+
+            response = message_cycle_manager.message_file_to_stream_response(SimpleNamespace(message_file_id="missing"))
 
         assert response is None
 

api/tests/unit_tests/core/llm_generator/test_llm_generator_missing.py

@@ -1,57 +1,7 @@
-from datetime import datetime, timedelta
+import sys
 from unittest.mock import MagicMock, patch
 
-import pytest
-from sqlalchemy import event
-from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import Session, sessionmaker
-
-import core.llm_generator.llm_generator as generator_module
 from core.llm_generator.llm_generator import LLMGenerator, _parse_string_list
-from core.model_manager import ModelInstance, ModelManager
-from core.workflow.generator import tool_catalogue as tool_catalogue_module
-from core.workflow.generator.tool_catalogue import ToolCatalogueEntry
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import AssistantPromptMessage
-from models.dataset import Dataset
-from services.workflow_service import WorkflowService
-
-
-@pytest.fixture
-def dataset_session(sqlite_session: Session, monkeypatch: pytest.MonkeyPatch) -> Session:
-    """Bind the real SQLite session to the production database extension."""
-
-    monkeypatch.setattr(generator_module.db, "session", sqlite_session)
-    return sqlite_session
-
-
-def _llm_result(content: str) -> LLMResult:
-    """Build a real non-streaming LLM response around deterministic test content."""
-
-    return LLMResult(
-        model="test-model",
-        message=AssistantPromptMessage(content=content),
-        usage=LLMUsage.empty_usage(),
-    )
-
-
-def _model_manager() -> tuple[MagicMock, MagicMock]:
-    """Build spec-constrained mocks for the model-manager boundary and its default model."""
-
-    model_manager = MagicMock(spec=ModelManager)
-    model_instance = MagicMock(spec=ModelInstance)
-    model_manager.get_default_model_instance.return_value = model_instance
-    return model_manager, model_instance
-
-
-def _dataset(*, dataset_id: str, tenant_id: str, name: str, created_at: datetime) -> Dataset:
-    return Dataset(
-        id=dataset_id,
-        tenant_id=tenant_id,
-        name=name,
-        created_by="account-id",
-        created_at=created_at,
-    )
 
 
 class TestParseStringList:
@@ -84,115 +34,95 @@ class TestParseStringList:
 class TestGenerateWorkflowInstructionSuggestions:
     @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
     def test_no_default_model(self, mock_for_tenant):
-        model_manager, _ = _model_manager()
-        model_manager.get_default_model_instance.side_effect = RuntimeError("no default model")
-        mock_for_tenant.return_value = model_manager
-
+        mock_for_tenant.return_value.get_default_model_instance.side_effect = Exception("No model")
         assert LLMGenerator.generate_workflow_instruction_suggestions("tenant", mode="workflow") == []
 
     @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
     @patch("core.llm_generator.llm_generator.LLMGenerator._build_suggestion_context")
     def test_llm_success(self, mock_build_context, mock_for_tenant):
         mock_build_context.return_value = "context"
-        model_manager, model_instance = _model_manager()
-        model_instance.invoke_llm.return_value = _llm_result('["idea 1", "idea 2"]')
-        mock_for_tenant.return_value = model_manager
+
+        mock_model = MagicMock()
+        mock_model.invoke_llm.return_value = MagicMock()
+        mock_model.invoke_llm.return_value.message.get_text_content.return_value = '["idea 1", "idea 2"]'
+
+        mock_for_tenant.return_value.get_default_model_instance.return_value = mock_model
 
         result = LLMGenerator.generate_workflow_instruction_suggestions("tenant", mode="workflow")
         assert result == ["idea 1", "idea 2"]
-        model_instance.invoke_llm.assert_called_once()
 
     @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
     @patch("core.llm_generator.llm_generator.LLMGenerator._build_suggestion_context")
     def test_llm_error(self, mock_build_context, mock_for_tenant):
         mock_build_context.return_value = "context"
-        model_manager, model_instance = _model_manager()
-        model_instance.invoke_llm.side_effect = RuntimeError("API error")
-        mock_for_tenant.return_value = model_manager
 
-        result = LLMGenerator.generate_workflow_instruction_suggestions("tenant", mode="workflow")
-        assert result == []
-        model_instance.invoke_llm.assert_called_once()
+        mock_model = MagicMock()
+        mock_model.invoke_llm.side_effect = Exception("API error")
+
+        mock_for_tenant.return_value.get_default_model_instance.return_value = mock_model
+
+        assert LLMGenerator.generate_workflow_instruction_suggestions("tenant", mode="workflow") == []
 
     @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
     @patch("core.llm_generator.llm_generator.LLMGenerator._build_suggestion_context")
     def test_llm_bad_output(self, mock_build_context, mock_for_tenant):
         mock_build_context.return_value = "context"
-        model_manager, model_instance = _model_manager()
-        model_instance.invoke_llm.return_value = _llm_result("Not a list")
-        mock_for_tenant.return_value = model_manager
 
-        result = LLMGenerator.generate_workflow_instruction_suggestions("tenant", mode="workflow")
-        assert result == []
-        model_instance.invoke_llm.assert_called_once()
+        mock_model = MagicMock()
+        mock_model.invoke_llm.return_value = MagicMock()
+        mock_model.invoke_llm.return_value.message.get_text_content.return_value = "Not a list"
+
+        mock_for_tenant.return_value.get_default_model_instance.return_value = mock_model
+
+        assert LLMGenerator.generate_workflow_instruction_suggestions("tenant", mode="workflow") == []
 
 
-@pytest.mark.parametrize("sqlite_session", [(Dataset,)], indirect=True)
 class TestBuildSuggestionContext:
-    def test_both_success(self, dataset_session: Session, monkeypatch: pytest.MonkeyPatch):
-        now = datetime.now()
-        dataset_session.add_all(
-            (
-                _dataset(dataset_id="kb-1", tenant_id="tenant", name="kb1", created_at=now),
-                _dataset(
-                    dataset_id="kb-2",
-                    tenant_id="tenant",
-                    name="kb2",
-                    created_at=now - timedelta(seconds=1),
-                ),
-                _dataset(dataset_id="other-kb", tenant_id="other", name="private", created_at=now),
-            )
-        )
-        dataset_session.commit()
+    @patch("core.llm_generator.llm_generator.db.session.scalars")
+    def test_both_success(self, mock_scalars, monkeypatch):
+        mock_scalars.return_value.all.return_value = ["kb1", "kb2"]
 
-        def build_tool_catalogue(_tenant_id: str) -> list[ToolCatalogueEntry]:
-            return [
-                ToolCatalogueEntry(
-                    provider_name="provider",
-                    provider_type="builtin",
-                    plugin_id="",
-                    tool_name="tool1",
-                    tool_label="tool1",
-                    description="First tool",
-                ),
-                ToolCatalogueEntry(
-                    provider_name="provider",
-                    provider_type="builtin",
-                    plugin_id="",
-                    tool_name="tool2",
-                    tool_label="tool2",
-                    description="Second tool",
-                ),
-            ]
-
-        # Keep the real module and formatter; only isolate provider/plugin discovery.
-        monkeypatch.setattr(tool_catalogue_module, "build_tool_catalogue", build_tool_catalogue)
+        # ``_build_suggestion_context`` imports the tool catalogue lazily, so we
+        # stub the module in ``sys.modules``. Use ``monkeypatch.setitem`` so the
+        # ORIGINAL module is RESTORED on teardown — a bare ``del`` would evict it
+        # from sys.modules entirely, after which a sibling test that imported
+        # ``build_tool_catalogue`` at collection time (e.g. test_tool_catalogue)
+        # diverges from a freshly re-imported module and its @patch targets stop
+        # applying, silently breaking it under xdist.
+        mock_tool_catalogue = MagicMock()
+        mock_tool_catalogue.build_tool_catalogue.return_value = "catalog"
+        mock_tool_catalogue.format_tool_catalogue.return_value = "tool1\ntool2"
+        monkeypatch.setitem(sys.modules, "core.workflow.generator.tool_catalogue", mock_tool_catalogue)
 
         result = LLMGenerator._build_suggestion_context("tenant")
         assert "Knowledge bases:\n- kb1\n- kb2" in result
-        assert "Installed tools:\n- provider/tool1 — First tool\n- provider/tool2 — Second tool" in result
+        assert "Installed tools:\ntool1\ntool2" in result
 
-    def test_both_fail(self, dataset_session: Session, monkeypatch: pytest.MonkeyPatch):
-        def fail_query(_orm_execute_state: object) -> None:
-            raise SQLAlchemyError("DB error")
+    @patch("core.llm_generator.llm_generator.db.session.scalars")
+    def test_both_fail(self, mock_scalars, monkeypatch):
+        mock_scalars.side_effect = Exception("DB error")
 
-        def fail_tool_catalogue(_tenant_id: str) -> list[ToolCatalogueEntry]:
-            raise RuntimeError("Tool error")
+        # See ``test_both_success``: restore the original module via monkeypatch
+        # rather than ``del``-ing it, so we don't evict it for sibling tests.
+        mock_tool_catalogue = MagicMock()
+        mock_tool_catalogue.build_tool_catalogue.side_effect = Exception("Tool error")
+        monkeypatch.setitem(sys.modules, "core.workflow.generator.tool_catalogue", mock_tool_catalogue)
 
-        event.listen(dataset_session, "do_orm_execute", fail_query)
-        monkeypatch.setattr(tool_catalogue_module, "build_tool_catalogue", fail_tool_catalogue)
-
-        try:
-            assert LLMGenerator._build_suggestion_context("tenant") == ""
-        finally:
-            event.remove(dataset_session, "do_orm_execute", fail_query)
+        assert LLMGenerator._build_suggestion_context("tenant") == ""
 
 
 class TestWorkflowServiceInterface:
-    def test_real_workflow_service_exposes_protocol_methods(self):
+    def test_protocol_methods(self):
+        # Just to cover the 'pass' statements in the Protocol definition
         from core.llm_generator.llm_generator import WorkflowServiceInterface
 
-        service: WorkflowServiceInterface = WorkflowService(sessionmaker())
+        class MockService(WorkflowServiceInterface):
+            def get_draft_workflow(self, app_model, workflow_id=None, *, session):
+                return super().get_draft_workflow(app_model, workflow_id, session=session)
 
-        assert callable(service.get_draft_workflow)
-        assert callable(service.get_node_last_run)
+            def get_node_last_run(self, app_model, workflow, node_id):
+                return super().get_node_last_run(app_model, workflow, node_id)
+
+        service = MockService()
+        service.get_draft_workflow(None, session=None)
+        service.get_node_last_run(None, None, "node")

api/tests/unit_tests/core/memory/test_token_buffer_memory.py

@@ -1,19 +1,11 @@
-"""Comprehensive SQLite-backed tests for token-buffer memory."""
+"""Comprehensive unit tests for core/memory/token_buffer_memory.py"""
 
-from collections.abc import Iterator
-from dataclasses import dataclass
-from datetime import UTC, datetime, timedelta
-from decimal import Decimal
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from sqlalchemy import Engine, event
-from sqlalchemy.orm import Session
 
-from core.memory import token_buffer_memory as memory_module
 from core.memory.token_buffer_memory import TokenBufferMemory
-from graphon.file import FileTransferMethod, FileType
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
     ImagePromptMessageContent,
@@ -21,44 +13,13 @@ from graphon.model_runtime.entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from models.base import TypeBase
-from models.enums import ConversationFromSource, CreatorUserRole, MessageFileBelongsTo
-from models.model import AppMode, Message, MessageFile
-from models.workflow import Workflow, WorkflowType
+from models.model import AppMode
 
 # ---------------------------------------------------------------------------
 # Helpers / shared fixtures
 # ---------------------------------------------------------------------------
 
 
-@dataclass(frozen=True)
-class Database:
-    """Typed SQLite binding plus executed SQL for query-count assertions."""
-
-    engine: Engine
-    session: Session
-    statements: list[tuple[str, object]]
-
-
-@pytest.fixture
-def database(sqlite_engine: Engine, monkeypatch: pytest.MonkeyPatch) -> Iterator[Database]:
-    TypeBase.metadata.create_all(
-        sqlite_engine,
-        tables=[Message.__table__, MessageFile.__table__, Workflow.__table__],
-    )
-    statements: list[tuple[str, object]] = []
-
-    def record_statement(_connection, _cursor, statement, parameters, _context, _executemany) -> None:
-        statements.append((statement, parameters))
-
-    event.listen(sqlite_engine, "before_cursor_execute", record_statement)
-    with Session(sqlite_engine, expire_on_commit=False) as session:
-        database = Database(engine=sqlite_engine, session=session, statements=statements)
-        monkeypatch.setattr(memory_module, "db", database)
-        yield database
-    event.remove(sqlite_engine, "before_cursor_execute", record_statement)
-
-
 def _make_conversation(mode: AppMode = AppMode.CHAT) -> MagicMock:
     """Return a minimal Conversation mock."""
     conv = MagicMock()
@@ -86,73 +47,6 @@ def _make_message(answer: str = "hello", answer_tokens: int = 5) -> MagicMock:
     return msg
 
 
-def _persist_message(
-    database: Database,
-    conversation_id: str,
-    *,
-    query: str = "user query",
-    answer: str = "hello",
-    answer_tokens: int = 5,
-    created_at: datetime | None = None,
-    workflow_run_id: str | None = None,
-) -> Message:
-    message = Message(
-        id=str(uuid4()),
-        app_id="app-1",
-        conversation_id=conversation_id,
-        _inputs={},
-        query=query,
-        message={},
-        message_unit_price=Decimal(0),
-        answer=answer,
-        answer_tokens=answer_tokens,
-        answer_unit_price=Decimal(0),
-        currency="USD",
-        from_source=ConversationFromSource.API,
-        workflow_run_id=workflow_run_id,
-        created_at=created_at or datetime.now(UTC).replace(tzinfo=None),
-    )
-    database.session.add(message)
-    database.session.commit()
-    return message
-
-
-def _persist_message_file(
-    database: Database,
-    message: Message,
-    *,
-    belongs_to: MessageFileBelongsTo | None,
-) -> MessageFile:
-    message_file = MessageFile(
-        message_id=message.id,
-        type=FileType.IMAGE,
-        transfer_method=FileTransferMethod.REMOTE_URL,
-        created_by_role=CreatorUserRole.ACCOUNT,
-        created_by="account-1",
-        belongs_to=belongs_to,
-        url="https://example.com/image.png",
-    )
-    database.session.add(message_file)
-    database.session.commit()
-    return message_file
-
-
-def _persist_workflow(database: Database, *, workflow_id: str) -> Workflow:
-    workflow = Workflow(
-        id=workflow_id,
-        tenant_id="tenant-1",
-        app_id="app-1",
-        type=WorkflowType.CHAT,
-        version="1",
-        graph="{}",
-        features="{}",
-        created_by="account-1",
-    )
-    database.session.add(workflow)
-    database.session.commit()
-    return workflow
-
-
 # ===========================================================================
 # Tests for __init__ and workflow_run_repo property
 # ===========================================================================
@@ -167,25 +61,25 @@ class TestInit:
         assert mem.model_instance is mi
         assert mem._workflow_run_repo is None
 
-    def test_workflow_run_repo_is_created_lazily(self, database: Database):
+    def test_workflow_run_repo_is_created_lazily(self):
         conv = _make_conversation()
         mi = _make_model_instance()
         mem = TokenBufferMemory(conversation=conv, model_instance=mi)
 
         mock_repo = MagicMock()
-        with patch(
-            "core.memory.token_buffer_memory.DifyAPIRepositoryFactory.create_api_workflow_run_repository",
-            return_value=mock_repo,
-        ) as repository_factory:
+        with (
+            patch("core.memory.token_buffer_memory.sessionmaker") as mock_sm,
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.DifyAPIRepositoryFactory.create_api_workflow_run_repository",
+                return_value=mock_repo,
+            ),
+        ):
+            mock_db.engine = MagicMock()
             repo = mem.workflow_run_repo
             assert repo is mock_repo
             assert mem._workflow_run_repo is mock_repo
 
-        session_factory = repository_factory.call_args.args[0]
-        with session_factory() as session:
-            assert isinstance(session, Session)
-            assert session.get_bind() is database.engine
-
     def test_workflow_run_repo_cached_after_first_access(self):
         conv = _make_conversation()
         mi = _make_model_instance()
@@ -516,7 +410,7 @@ class TestBuildPromptMessageWithFiles:
             )
 
     @pytest.mark.parametrize("mode", [AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    def test_workflow_mode_workflow_not_found_raises(self, mode, database: Database):
+    def test_workflow_mode_workflow_not_found_raises(self, mode):
         """Raises ValueError when Workflow lookup returns None."""
         conv = _make_conversation(mode)
         conv.app = MagicMock()
@@ -528,17 +422,22 @@ class TestBuildPromptMessageWithFiles:
         mem._workflow_run_repo = MagicMock()
         mem._workflow_run_repo.get_workflow_run_by_id.return_value = mock_workflow_run
 
-        with pytest.raises(ValueError, match="Workflow not found"):
-            mem._build_prompt_message_with_files(
-                message_files=[],
-                text_content="text",
-                message=_make_message(),
-                app_record=MagicMock(),
-                is_user_message=True,
-            )
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+        ):
+            mock_db.session.scalar.return_value = None  # workflow not found
+
+            with pytest.raises(ValueError, match="Workflow not found"):
+                mem._build_prompt_message_with_files(
+                    message_files=[],
+                    text_content="text",
+                    message=_make_message(),
+                    app_record=MagicMock(),
+                    is_user_message=True,
+                )
 
     @pytest.mark.parametrize("mode", [AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    def test_workflow_mode_success_no_files_user(self, mode, database: Database):
+    def test_workflow_mode_success_no_files_user(self, mode):
         """Happy path: workflow mode, no message files → plain UserPromptMessage."""
         conv = _make_conversation(mode)
         conv.app = MagicMock()
@@ -546,16 +445,22 @@ class TestBuildPromptMessageWithFiles:
         mock_workflow_run = MagicMock()
         mock_workflow_run.workflow_id = str(uuid4())
 
-        workflow = _persist_workflow(database, workflow_id=mock_workflow_run.workflow_id)
+        mock_workflow = MagicMock()
+        mock_workflow.features_dict = {}
 
         mem = TokenBufferMemory(conversation=conv, model_instance=_make_model_instance())
         mem._workflow_run_repo = MagicMock()
         mem._workflow_run_repo.get_workflow_run_by_id.return_value = mock_workflow_run
 
-        with patch(
-            "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
-            return_value=None,
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
         ):
+            mock_db.session.scalar.return_value = mock_workflow
+
             result = mem._build_prompt_message_with_files(
                 message_files=[],
                 text_content="wf text",
@@ -566,7 +471,6 @@ class TestBuildPromptMessageWithFiles:
 
         assert isinstance(result, UserPromptMessage)
         assert result.content == "wf text"
-        assert database.session.get(Workflow, workflow.id) is workflow
 
     # ------------------------------------------------------------------
     # Invalid mode
@@ -594,140 +498,417 @@ class TestBuildPromptMessageWithFiles:
 
 
 class TestGetHistoryPromptMessages:
-    """Tests for persisted history retrieval, file batching, and pruning."""
+    """Tests for get_history_prompt_messages."""
 
     def _make_memory(self, mode: AppMode = AppMode.CHAT) -> TokenBufferMemory:
         conv = _make_conversation(mode)
         conv.app = MagicMock()
         return TokenBufferMemory(conversation=conv, model_instance=_make_model_instance())
 
-    def test_returns_empty_when_no_messages(self, database: Database) -> None:
-        assert self._make_memory().get_history_prompt_messages() == []
-
-    def test_skips_newest_message_without_answer(self, database: Database) -> None:
+    def test_returns_empty_when_no_messages(self):
         mem = self._make_memory()
-        message = _persist_message(database, mem.conversation.id, answer="", answer_tokens=0)
+        with patch("core.memory.token_buffer_memory.db") as mock_db:
+            mock_db.session.scalars.return_value.all.return_value = []
+            result = mem.get_history_prompt_messages()
+        assert result == []
 
-        assert mem.get_history_prompt_messages() == []
-        assert database.session.get(Message, message.id) is message
-
-    def test_message_with_answer_returns_user_and_assistant_prompts(self, database: Database) -> None:
+    def test_skips_first_message_without_answer(self):
+        """The newest message (index 0 after extraction) without answer and tokens==0 is skipped."""
         mem = self._make_memory()
-        _persist_message(database, mem.conversation.id, query="My query", answer="My answer", answer_tokens=10)
 
-        result = mem.get_history_prompt_messages()
+        msg_no_answer = _make_message(answer="", answer_tokens=0)
+        msg_no_answer.parent_message_id = None  # ensures extract_thread_messages returns it
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg_no_answer],
+            ),
+        ):
+            mock_db.session.scalars.return_value.all.side_effect = [
+                [msg_no_answer],  # first call: messages query
+                [],  # second call: user files query (never hit, but safe)
+            ]
+            result = mem.get_history_prompt_messages()
+
+        assert result == []
+
+    def test_message_with_answer_not_skipped(self):
+        """A message with a non-empty answer is NOT popped."""
+        mem = self._make_memory()
+
+        msg = _make_message(answer="some answer", answer_tokens=10)
+        msg.parent_message_id = None
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
+        ):
+            # user files query → empty; assistant files query → empty
+            mock_db.session.scalars.return_value.all.return_value = []
+            result = mem.get_history_prompt_messages()
+
+        assert len(result) == 2  # one user + one assistant
+
+    def test_message_limit_default_is_500(self):
+        """When message_limit is None the stmt is limited to 500."""
+        mem = self._make_memory()
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch("core.memory.token_buffer_memory.select") as mock_select,
+            patch("core.memory.token_buffer_memory.extract_thread_messages", return_value=[]),
+        ):
+            mock_stmt = MagicMock()
+            mock_select.return_value.where.return_value.order_by.return_value = mock_stmt
+            mock_stmt.limit.return_value = mock_stmt
+            mock_db.session.scalars.return_value.all.return_value = []
+
+            mem.get_history_prompt_messages(message_limit=None)
+            mock_stmt.limit.assert_called_with(500)
+
+    def test_message_limit_clipped_to_500(self):
+        """A message_limit > 500 is clamped to 500."""
+        mem = self._make_memory()
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch("core.memory.token_buffer_memory.select") as mock_select,
+            patch("core.memory.token_buffer_memory.extract_thread_messages", return_value=[]),
+        ):
+            mock_stmt = MagicMock()
+            mock_select.return_value.where.return_value.order_by.return_value = mock_stmt
+            mock_stmt.limit.return_value = mock_stmt
+            mock_db.session.scalars.return_value.all.return_value = []
+
+            mem.get_history_prompt_messages(message_limit=9999)
+            mock_stmt.limit.assert_called_with(500)
+
+    def test_message_limit_positive_used(self):
+        """A positive message_limit < 500 is used as-is."""
+        mem = self._make_memory()
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch("core.memory.token_buffer_memory.select") as mock_select,
+            patch("core.memory.token_buffer_memory.extract_thread_messages", return_value=[]),
+        ):
+            mock_stmt = MagicMock()
+            mock_select.return_value.where.return_value.order_by.return_value = mock_stmt
+            mock_stmt.limit.return_value = mock_stmt
+            mock_db.session.scalars.return_value.all.return_value = []
+
+            mem.get_history_prompt_messages(message_limit=10)
+            mock_stmt.limit.assert_called_with(10)
+
+    def test_message_limit_zero_uses_default(self):
+        """message_limit=0 triggers the else branch → default 500."""
+        mem = self._make_memory()
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch("core.memory.token_buffer_memory.select") as mock_select,
+            patch("core.memory.token_buffer_memory.extract_thread_messages", return_value=[]),
+        ):
+            mock_stmt = MagicMock()
+            mock_select.return_value.where.return_value.order_by.return_value = mock_stmt
+            mock_stmt.limit.return_value = mock_stmt
+            mock_db.session.scalars.return_value.all.return_value = []
+
+            mem.get_history_prompt_messages(message_limit=0)
+            mock_stmt.limit.assert_called_with(500)
+
+    def test_user_files_cause_build_with_files_call(self):
+        """When user_files is non-empty _build_prompt_message_with_files is invoked."""
+        mem = self._make_memory()
+        msg = _make_message()
+        msg.parent_message_id = None
+
+        mock_user_file = MagicMock()
+        mock_user_file.message_id = msg.id  # must match so batched grouping keys it to this message
+        mock_user_prompt = UserPromptMessage(content="from build")
+        mock_assistant_prompt = AssistantPromptMessage(content="answer")
+
+        call_count = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            if call_count["n"] == 0:
+                # messages query
+                r.all.return_value = [msg]
+            elif call_count["n"] == 1:
+                # user files
+                r.all.return_value = [mock_user_file]
+            else:
+                # assistant files
+                r.all.return_value = []
+            call_count["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch.object(
+                mem,
+                "_build_prompt_message_with_files",
+                side_effect=[mock_user_prompt, mock_assistant_prompt],
+            ) as mock_build,
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            result = mem.get_history_prompt_messages()
+
+        assert mock_build.call_count >= 1
+        # First call should be user message
+        first_call_kwargs = mock_build.call_args_list[0][1]
+        assert first_call_kwargs["is_user_message"] is True
+
+    def test_assistant_files_cause_build_with_files_call(self):
+        """When assistant_files is non-empty, build is called with is_user_message=False."""
+        mem = self._make_memory()
+        msg = _make_message()
+        msg.parent_message_id = None
+
+        mock_assistant_file = MagicMock()
+        mock_assistant_file.message_id = msg.id  # must match so batched grouping keys it to this message
+        mock_user_prompt = UserPromptMessage(content="query")
+        mock_assistant_prompt = AssistantPromptMessage(content="built")
+
+        call_count = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            if call_count["n"] == 0:
+                r.all.return_value = [msg]
+            elif call_count["n"] == 1:
+                r.all.return_value = []  # no user files
+            else:
+                r.all.return_value = [mock_assistant_file]
+            call_count["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch.object(
+                mem,
+                "_build_prompt_message_with_files",
+                return_value=mock_assistant_prompt,
+            ) as mock_build,
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            result = mem.get_history_prompt_messages()
+
+        mock_build.assert_called_once()
+        call_kwargs = mock_build.call_args[1]
+        assert call_kwargs["is_user_message"] is False
+
+    def test_message_files_loaded_with_constant_query_count(self):
+        """Regression guard against N+1: message files must be batch-loaded.
+
+        Regardless of the number of messages in the thread, file loading must use a
+        constant number of queries (1 messages query + 2 batched file queries),
+        never 2 queries per message.
+        """
+        mem = self._make_memory()
+
+        messages = [_make_message() for _ in range(5)]
+        for m in messages:
+            m.parent_message_id = None
+
+        scalars_calls = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            # First call returns the thread messages; the batched file queries return none.
+            r.all.return_value = messages if scalars_calls["n"] == 0 else []
+            scalars_calls["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch("core.memory.token_buffer_memory.extract_thread_messages", return_value=messages),
+            patch("core.memory.token_buffer_memory.FileUploadConfigManager.convert", return_value=None),
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            mem.get_history_prompt_messages()
+
+        # 1 (messages) + 2 (batched user/assistant files) = 3, independent of message count.
+        # Before this fix it would have been 1 + 2 * 5 = 11 (an N+1 pattern).
+        assert scalars_calls["n"] == 3
+
+    def test_token_pruning_removes_oldest_messages(self):
+        """If tokens exceed limit, oldest messages are removed until within limit."""
+        conv = _make_conversation()
+        conv.app = MagicMock()
+
+        # Model returns tokens that decrease only after removing pairs
+        token_values = [3000, 1500]  # first call over limit, second within
+        mi = MagicMock()
+        mi.get_llm_num_tokens.side_effect = token_values
+
+        mem = TokenBufferMemory(conversation=conv, model_instance=mi)
+
+        msg = _make_message()
+        msg.parent_message_id = None
+
+        call_count = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            if call_count["n"] == 0:
+                r.all.return_value = [msg]
+            else:
+                r.all.return_value = []
+            call_count["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            result = mem.get_history_prompt_messages(max_token_limit=2000)
+
+        # After pruning, we should have fewer than the 2 initial messages
+        assert len(result) <= 1
+
+    def test_token_pruning_stops_at_single_message(self):
+        """Pruning stops when only 1 message remains (to prevent empty list)."""
+        conv = _make_conversation()
+        conv.app = MagicMock()
+
+        # Always over limit
+        mi = MagicMock()
+        mi.get_llm_num_tokens.return_value = 99999
+
+        mem = TokenBufferMemory(conversation=conv, model_instance=mi)
+
+        msg = _make_message()
+        msg.parent_message_id = None
+
+        call_count = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            if call_count["n"] == 0:
+                r.all.return_value = [msg]
+            else:
+                r.all.return_value = []
+            call_count["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            result = mem.get_history_prompt_messages(max_token_limit=1)
+
+        # At least 1 message should remain
+        assert len(result) >= 1
+
+    def test_no_pruning_when_within_limit(self):
+        """When tokens ≤ limit, no pruning occurs."""
+        mem = self._make_memory()
+        mem.model_instance.get_llm_num_tokens.return_value = 50  # well under default 2000
+
+        msg = _make_message()
+        msg.parent_message_id = None
+
+        call_count = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            if call_count["n"] == 0:
+                r.all.return_value = [msg]
+            else:
+                r.all.return_value = []
+            call_count["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            result = mem.get_history_prompt_messages(max_token_limit=2000)
+
+        assert len(result) == 2  # user + assistant
+
+    def test_plain_user_and_assistant_messages_returned(self):
+        """Without files, plain UserPromptMessage and AssistantPromptMessage appear."""
+        mem = self._make_memory()
+
+        msg = _make_message(answer="My answer")
+        msg.query = "My query"
+        msg.parent_message_id = None
+
+        call_count = {"n": 0}
+
+        def scalars_side_effect(stmt):
+            r = MagicMock()
+            if call_count["n"] == 0:
+                r.all.return_value = [msg]
+            else:
+                r.all.return_value = []
+            call_count["n"] += 1
+            return r
+
+        with (
+            patch("core.memory.token_buffer_memory.db") as mock_db,
+            patch(
+                "core.memory.token_buffer_memory.extract_thread_messages",
+                return_value=[msg],
+            ),
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=None,
+            ),
+        ):
+            mock_db.session.scalars.side_effect = scalars_side_effect
+            result = mem.get_history_prompt_messages()
 
         assert len(result) == 2
-        assert isinstance(result[0], UserPromptMessage)
-        assert result[0].content == "My query"
-        assert isinstance(result[1], AssistantPromptMessage)
-        assert result[1].content == "My answer"
-
-    def test_history_is_conversation_scoped(self, database: Database) -> None:
-        mem = self._make_memory()
-        _persist_message(database, mem.conversation.id, answer="visible")
-        _persist_message(database, "other-conversation", answer="hidden")
-
-        result = mem.get_history_prompt_messages()
-
-        assert [prompt.content for prompt in result] == ["user query", "visible"]
-
-    @pytest.mark.parametrize(
-        ("message_limit", "expected_limit"),
-        [(None, 500), (9999, 500), (10, 10), (0, 500)],
-    )
-    def test_message_limit_is_applied_to_executable_query(
-        self,
-        database: Database,
-        message_limit: int | None,
-        expected_limit: int,
-    ) -> None:
-        mem = self._make_memory()
-        before = len(database.statements)
-
-        mem.get_history_prompt_messages(message_limit=message_limit)
-
-        statements = database.statements[before:]
-        assert len(statements) == 1
-        sql, parameters = statements[0]
-        assert "LIMIT" in sql
-        assert expected_limit in parameters
-
-    @pytest.mark.parametrize(
-        ("belongs_to", "is_user_message"),
-        [
-            (MessageFileBelongsTo.USER, True),
-            (None, True),
-            (MessageFileBelongsTo.ASSISTANT, False),
-        ],
-    )
-    def test_message_files_use_persisted_ownership(
-        self,
-        database: Database,
-        belongs_to: MessageFileBelongsTo | None,
-        is_user_message: bool,
-    ) -> None:
-        mem = self._make_memory()
-        message = _persist_message(database, mem.conversation.id)
-        message_file = _persist_message_file(database, message, belongs_to=belongs_to)
-        built_prompt = (
-            UserPromptMessage(content="built user")
-            if is_user_message
-            else AssistantPromptMessage(content="built assistant")
-        )
-
-        with patch.object(mem, "_build_prompt_message_with_files", return_value=built_prompt) as build_prompt:
-            result = mem.get_history_prompt_messages()
-
-        build_prompt.assert_called_once()
-        assert build_prompt.call_args.kwargs["message_files"] == [message_file]
-        assert build_prompt.call_args.kwargs["is_user_message"] is is_user_message
-        assert built_prompt in result
-
-    def test_message_files_are_batch_loaded_with_constant_query_count(self, database: Database) -> None:
-        mem = self._make_memory()
-        base_time = datetime.now(UTC).replace(tzinfo=None)
-        messages = [
-            _persist_message(
-                database,
-                mem.conversation.id,
-                query=f"query-{index}",
-                answer=f"answer-{index}",
-                created_at=base_time + timedelta(seconds=index),
-            )
-            for index in range(5)
-        ]
-        before = len(database.statements)
-
-        with patch("core.memory.token_buffer_memory.extract_thread_messages", return_value=messages):
-            result = mem.get_history_prompt_messages()
-
-        selects = [sql for sql, _ in database.statements[before:] if sql.lstrip().upper().startswith("SELECT")]
-        assert len(selects) == 3
-        assert len(result) == 10
-
-    @pytest.mark.parametrize(
-        ("token_values", "max_token_limit", "expected_length"),
-        [
-            ([3000, 1500], 2000, 1),
-            ([99999, 99999], 1, 1),
-            ([50], 2000, 2),
-        ],
-    )
-    def test_token_pruning_uses_persisted_history(
-        self,
-        database: Database,
-        token_values: list[int],
-        max_token_limit: int,
-        expected_length: int,
-    ) -> None:
-        mem = self._make_memory()
-        mem.model_instance.get_llm_num_tokens.side_effect = token_values
-        _persist_message(database, mem.conversation.id)
-
-        result = mem.get_history_prompt_messages(max_token_limit=max_token_limit)
-
-        assert len(result) == expected_length
+        user_msg, ai_msg = result
+        assert isinstance(user_msg, UserPromptMessage)
+        assert user_msg.content == "My query"
+        assert isinstance(ai_msg, AssistantPromptMessage)
+        assert ai_msg.content == "My answer"
 
 
 # ===========================================================================

api/tests/unit_tests/core/moderation/api/test_api.py

@@ -2,24 +2,13 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from pydantic import ValidationError
-from sqlalchemy.orm import Session
 
-import core.moderation.api.api as moderation_module
 from core.extension.api_based_extension_requestor import APIBasedExtensionPoint
 from core.moderation.api.api import ApiModeration, ModerationInputParams, ModerationOutputParams
 from core.moderation.base import ModerationAction, ModerationInputsResult, ModerationOutputsResult
 from models.api_based_extension import APIBasedExtension
 
 
-class _DatabaseBinding:
-    """Expose the real SQLite session used by extension lookup."""
-
-    session: Session
-
-    def __init__(self, session: Session) -> None:
-        self.session = session
-
-
 class TestApiModeration:
     @pytest.fixture
     def api_config(self):
@@ -176,27 +165,17 @@ class TestApiModeration:
         with pytest.raises(ValueError, match="API-based Extension not found"):
             api_moderation._get_config_by_requestor(APIBasedExtensionPoint.APP_MODERATION_INPUT, {})
 
-    @pytest.mark.parametrize("sqlite_session", [(APIBasedExtension,)], indirect=True)
-    def test_get_api_based_extension(self, sqlite_session: Session, monkeypatch: pytest.MonkeyPatch) -> None:
-        target = APIBasedExtension(
-            tenant_id="tenant-1",
-            name="Target extension",
-            api_endpoint="https://example.com/moderate",
-            api_key="encrypted-key",
-        )
-        target.id = "ext-1"
-        other_tenant = APIBasedExtension(
-            tenant_id="tenant-2",
-            name="Other extension",
-            api_endpoint="https://example.com/other",
-            api_key="other-key",
-        )
-        other_tenant.id = "ext-2"
-        sqlite_session.add_all((target, other_tenant))
-        sqlite_session.commit()
-        monkeypatch.setattr(moderation_module, "db", _DatabaseBinding(sqlite_session))
+    @patch("core.moderation.api.api.db.session.scalar")
+    def test_get_api_based_extension(self, mock_scalar):
+        mock_ext = MagicMock(spec=APIBasedExtension)
+        mock_scalar.return_value = mock_ext
 
         result = ApiModeration._get_api_based_extension("tenant-1", "ext-1")
 
-        assert result is target
-        assert ApiModeration._get_api_based_extension("tenant-1", "ext-2") is None
+        assert result == mock_ext
+        mock_scalar.assert_called_once()
+        # Verify the call has the correct filters
+        args, kwargs = mock_scalar.call_args
+        stmt = args[0]
+        # We can't easily inspect the statement without complex sqlalchemy tricks,
+        # but calling it is usually enough for unit tests if we mock the result.

api/tests/unit_tests/core/ops/test_lookup_helpers.py

@@ -7,212 +7,36 @@ Covers:
 - TraceTask._get_user_id_from_metadata
 """
 
-import uuid
-from collections.abc import Iterator
-from contextlib import contextmanager
-from unittest.mock import PropertyMock, patch
+from unittest.mock import MagicMock, patch
 
 import pytest
-from sqlalchemy import Engine, event
-from sqlalchemy.orm import Session
-
-from core.tools.entities.tool_entities import ApiProviderSchemaType
-from extensions.ext_database import db
-from graphon.model_runtime.entities.model_entities import ModelType
-from models.account import Tenant
-from models.base import TypeBase
-from models.model import App, AppMode, IconType
-from models.provider import Provider, ProviderCredential, ProviderModel, ProviderModelCredential, ProviderType
-from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider, WorkflowToolProvider
 
 # ---------------------------------------------------------------------------
 # Helpers
 # ---------------------------------------------------------------------------
 
 
-@pytest.fixture
-def orm_session(sqlite_engine: Engine) -> Iterator[Session]:
-    models = (
-        App,
-        Tenant,
-        Provider,
-        ProviderCredential,
-        ProviderModel,
-        ProviderModelCredential,
-        BuiltinToolProvider,
-        ApiToolProvider,
-        WorkflowToolProvider,
-        MCPToolProvider,
-    )
-    tables = [model.metadata.tables[model.__tablename__] for model in models]
-    TypeBase.metadata.create_all(sqlite_engine, tables=tables)
+def _make_db_and_session_patches(scalar_side_effect=None, scalar_return_value=None):
+    """Return (mock_db, cm, session) ready to patch 'core.ops.ops_trace_manager.db'
+    and 'core.ops.ops_trace_manager.Session'.
 
-    with patch.object(type(db), "engine", new_callable=PropertyMock, return_value=sqlite_engine):
-        with Session(sqlite_engine, expire_on_commit=False) as session:
-            yield session
+    Provide either scalar_side_effect (list, for multiple calls) or
+    scalar_return_value (single value).
+    """
+    mock_db = MagicMock()
+    mock_db.engine = MagicMock()
 
-
-def _persist_app(session: Session, *, tenant_id: str, name: str = "MyApp") -> App:
-    app = App(
-        id=str(uuid.uuid4()),
-        tenant_id=tenant_id,
-        name=name,
-        mode=AppMode.WORKFLOW,
-        icon_type=IconType.EMOJI,
-        icon="workflow",
-        icon_background="#FFFFFF",
-        enable_site=True,
-        enable_api=False,
-    )
-    session.add(app)
-    session.commit()
-    return app
-
-
-def _persist_tenant(session: Session, *, name: str = "MyWorkspace") -> Tenant:
-    tenant = Tenant(name=name)
-    session.add(tenant)
-    session.commit()
-    return tenant
-
-
-def _persist_tool_provider(
-    session: Session, provider_type: str
-) -> BuiltinToolProvider | ApiToolProvider | WorkflowToolProvider | MCPToolProvider:
-    tenant_id = str(uuid.uuid4())
-    user_id = str(uuid.uuid4())
-    if provider_type in {"builtin", "plugin"}:
-        provider = BuiltinToolProvider(
-            name="CredentialA",
-            tenant_id=tenant_id,
-            user_id=user_id,
-            provider="test/provider",
-        )
-    elif provider_type == "api":
-        provider = ApiToolProvider(
-            name="CredentialA",
-            icon="icon.svg",
-            schema="{}",
-            schema_type_str=ApiProviderSchemaType.OPENAPI,
-            user_id=user_id,
-            tenant_id=tenant_id,
-            description="API provider",
-            tools_str="[]",
-            credentials_str="{}",
-        )
-    elif provider_type == "workflow":
-        provider = WorkflowToolProvider(
-            name="CredentialA",
-            label="CredentialA",
-            icon="icon.svg",
-            app_id=str(uuid.uuid4()),
-            version="1",
-            user_id=user_id,
-            tenant_id=tenant_id,
-            description="Workflow provider",
-        )
-    elif provider_type == "mcp":
-        provider = MCPToolProvider(
-            name="CredentialA",
-            server_identifier="credential-a",
-            server_url="https://example.com/mcp",
-            server_url_hash="credential-a-hash",
-            icon="icon.svg",
-            tenant_id=tenant_id,
-            user_id=user_id,
-        )
+    session = MagicMock()
+    if scalar_side_effect is not None:
+        session.scalar.side_effect = scalar_side_effect
     else:
-        raise ValueError(f"unsupported provider type: {provider_type}")
+        session.scalar.return_value = scalar_return_value
 
-    session.add(provider)
-    session.commit()
-    return provider
+    cm = MagicMock()
+    cm.__enter__ = MagicMock(return_value=session)
+    cm.__exit__ = MagicMock(return_value=False)
 
-
-def _persist_provider_credential(
-    session: Session,
-    *,
-    tenant_id: str,
-    credential_name: str = "ProvCredName",
-) -> ProviderCredential:
-    credential = ProviderCredential(
-        tenant_id=tenant_id,
-        provider_name="openai",
-        credential_name=credential_name,
-        encrypted_config="{}",
-    )
-    session.add(credential)
-    session.commit()
-    return credential
-
-
-def _persist_model_credential(
-    session: Session,
-    *,
-    tenant_id: str,
-    credential_name: str = "ModelCredName",
-) -> ProviderModelCredential:
-    credential = ProviderModelCredential(
-        tenant_id=tenant_id,
-        provider_name="openai",
-        model_name="gpt-4",
-        model_type=ModelType.LLM,
-        credential_name=credential_name,
-        encrypted_config="{}",
-    )
-    session.add(credential)
-    session.commit()
-    return credential
-
-
-def _persist_provider(
-    session: Session,
-    *,
-    tenant_id: str,
-    credential_id: str | None,
-) -> Provider:
-    provider = Provider(
-        tenant_id=tenant_id,
-        provider_name="openai",
-        provider_type=ProviderType.CUSTOM,
-        credential_id=credential_id,
-    )
-    session.add(provider)
-    session.commit()
-    return provider
-
-
-def _persist_provider_model(
-    session: Session,
-    *,
-    tenant_id: str,
-    credential_id: str | None,
-) -> ProviderModel:
-    model = ProviderModel(
-        tenant_id=tenant_id,
-        provider_name="openai",
-        model_name="gpt-4",
-        model_type=ModelType.LLM,
-        credential_id=credential_id,
-    )
-    session.add(model)
-    session.commit()
-    return model
-
-
-@contextmanager
-def _raise_on_table(engine: Engine, table_name: str) -> Iterator[None]:
-    """Raise only when SQL targets the named table, leaving other real lookups intact."""
-
-    def fail_target_query(_conn, _cursor, statement, _parameters, _context, _executemany):
-        if f"FROM {table_name}" in statement:
-            raise RuntimeError(f"forced failure for {table_name}")
-
-    event.listen(engine, "before_cursor_execute", fail_target_query)
-    try:
-        yield
-    finally:
-        event.remove(engine, "before_cursor_execute", fail_target_query)
+    return mock_db, cm, session
 
 
 # ---------------------------------------------------------------------------
@@ -223,42 +47,62 @@ def _raise_on_table(engine: Engine, table_name: str) -> Iterator[None]:
 class TestLookupAppAndWorkspaceNames:
     """Tests for _lookup_app_and_workspace_names(app_id, tenant_id)."""
 
-    def test_both_found(self, orm_session: Session):
+    def test_both_found(self):
         """Returns (app_name, workspace_name) when both records exist."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        tenant = _persist_tenant(orm_session)
-        app = _persist_app(orm_session, tenant_id=tenant.id)
-        app_name, workspace_name = _lookup_app_and_workspace_names(app.id, tenant.id)
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_side_effect=["MyApp", "MyWorkspace"])
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names("app-123", "tenant-456")
 
         assert app_name == "MyApp"
         assert workspace_name == "MyWorkspace"
 
-    def test_app_only_found(self, orm_session: Session):
+    def test_app_only_found(self):
         """Returns (app_name, '') when tenant record is absent."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        app = _persist_app(orm_session, tenant_id=str(uuid.uuid4()))
-        app_name, workspace_name = _lookup_app_and_workspace_names(app.id, str(uuid.uuid4()))
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_side_effect=["MyApp", None])
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names("app-123", "tenant-456")
 
         assert app_name == "MyApp"
         assert workspace_name == ""
 
-    def test_tenant_only_found(self, orm_session: Session):
+    def test_tenant_only_found(self):
         """Returns ('', workspace_name) when app record is absent."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        tenant = _persist_tenant(orm_session)
-        app_name, workspace_name = _lookup_app_and_workspace_names(str(uuid.uuid4()), tenant.id)
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_side_effect=[None, "MyWorkspace"])
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names("app-123", "tenant-456")
 
         assert app_name == ""
         assert workspace_name == "MyWorkspace"
 
-    def test_neither_found(self, orm_session: Session):
+    def test_neither_found(self):
         """Returns ('', '') when both DB lookups return None."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        app_name, workspace_name = _lookup_app_and_workspace_names(str(uuid.uuid4()), str(uuid.uuid4()))
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_side_effect=[None, None])
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names("app-123", "tenant-456")
 
         assert app_name == ""
         assert workspace_name == ""
@@ -267,30 +111,50 @@ class TestLookupAppAndWorkspaceNames:
         """Returns ('', '') immediately when both IDs are None — no DB access."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        app_name, workspace_name = _lookup_app_and_workspace_names(None, None)
+        mock_db = MagicMock()
+        mock_session_cls = MagicMock()
 
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", mock_session_cls),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names(None, None)
+
+        mock_session_cls.assert_not_called()
         assert app_name == ""
         assert workspace_name == ""
 
-    def test_app_id_none_only_queries_tenant(self, orm_session: Session):
+    def test_app_id_none_only_queries_tenant(self):
         """When app_id is None, only the tenant query is issued."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        tenant = _persist_tenant(orm_session, name="OnlyWorkspace")
-        app_name, workspace_name = _lookup_app_and_workspace_names(None, tenant.id)
+        mock_db, cm, session = _make_db_and_session_patches(scalar_return_value="OnlyWorkspace")
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names(None, "tenant-456")
 
         assert app_name == ""
         assert workspace_name == "OnlyWorkspace"
+        assert session.scalar.call_count == 1
 
-    def test_tenant_id_none_only_queries_app(self, orm_session: Session):
+    def test_tenant_id_none_only_queries_app(self):
         """When tenant_id is None, only the app query is issued."""
         from core.ops.ops_trace_manager import _lookup_app_and_workspace_names
 
-        app = _persist_app(orm_session, tenant_id=str(uuid.uuid4()), name="OnlyApp")
-        app_name, workspace_name = _lookup_app_and_workspace_names(app.id, None)
+        mock_db, cm, session = _make_db_and_session_patches(scalar_return_value="OnlyApp")
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            app_name, workspace_name = _lookup_app_and_workspace_names("app-123", None)
 
         assert app_name == "OnlyApp"
         assert workspace_name == ""
+        assert session.scalar.call_count == 1
 
 
 # ---------------------------------------------------------------------------
@@ -302,20 +166,32 @@ class TestLookupCredentialName:
     """Tests for _lookup_credential_name(credential_id, provider_type)."""
 
     @pytest.mark.parametrize("provider_type", ["builtin", "plugin", "api", "workflow", "mcp"])
-    def test_known_provider_types_return_name(self, provider_type: str, orm_session: Session):
+    def test_known_provider_types_return_name(self, provider_type):
         """Each valid provider_type results in a DB query and returns the credential name."""
         from core.ops.ops_trace_manager import _lookup_credential_name
 
-        provider = _persist_tool_provider(orm_session, provider_type)
-        result = _lookup_credential_name(provider.id, provider_type)
+        mock_db, cm, session = _make_db_and_session_patches(scalar_return_value="CredentialA")
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            result = _lookup_credential_name("cred-123", provider_type)
 
         assert result == "CredentialA"
+        session.scalar.assert_called_once()
 
-    def test_credential_not_found_returns_empty_string(self, orm_session: Session):
+    def test_credential_not_found_returns_empty_string(self):
         """Returns '' when DB yields None for the given credential_id."""
         from core.ops.ops_trace_manager import _lookup_credential_name
 
-        result = _lookup_credential_name(str(uuid.uuid4()), "api")
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_return_value=None)
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            result = _lookup_credential_name("cred-999", "api")
 
         assert result == ""
 
@@ -323,24 +199,48 @@ class TestLookupCredentialName:
         """Returns '' immediately for an unrecognised provider_type — no DB access."""
         from core.ops.ops_trace_manager import _lookup_credential_name
 
-        result = _lookup_credential_name(str(uuid.uuid4()), "unknown_type")
+        mock_db = MagicMock()
+        mock_session_cls = MagicMock()
 
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", mock_session_cls),
+        ):
+            result = _lookup_credential_name("cred-123", "unknown_type")
+
+        mock_session_cls.assert_not_called()
         assert result == ""
 
     def test_none_credential_id_returns_empty_string_without_db(self):
         """Returns '' immediately when credential_id is None — no DB access."""
         from core.ops.ops_trace_manager import _lookup_credential_name
 
-        result = _lookup_credential_name(None, "api")
+        mock_db = MagicMock()
+        mock_session_cls = MagicMock()
 
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", mock_session_cls),
+        ):
+            result = _lookup_credential_name(None, "api")
+
+        mock_session_cls.assert_not_called()
         assert result == ""
 
     def test_none_provider_type_returns_empty_string_without_db(self):
         """Returns '' immediately when provider_type is None — no DB access."""
         from core.ops.ops_trace_manager import _lookup_credential_name
 
-        result = _lookup_credential_name(str(uuid.uuid4()), None)
+        mock_db = MagicMock()
+        mock_session_cls = MagicMock()
 
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", mock_session_cls),
+        ):
+            result = _lookup_credential_name("cred-123", None)
+
+        mock_session_cls.assert_not_called()
         assert result == ""
 
     def test_builtin_and_plugin_map_to_same_model(self):
@@ -381,78 +281,106 @@ class TestLookupCredentialName:
 class TestLookupLlmCredentialInfo:
     """Tests for _lookup_llm_credential_info(tenant_id, provider, model, model_type)."""
 
-    def test_model_level_credential_found(self, orm_session: Session):
+    def _provider_record(self, credential_id: str | None = None) -> MagicMock:
+        record = MagicMock()
+        record.credential_id = credential_id
+        return record
+
+    def _model_record(self, credential_id: str | None = None) -> MagicMock:
+        record = MagicMock()
+        record.credential_id = credential_id
+        return record
+
+    def test_model_level_credential_found(self):
         """Returns model-level credential_id and name when ProviderModel has a credential."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        tenant_id = str(uuid.uuid4())
-        model_credential = _persist_model_credential(orm_session, tenant_id=tenant_id)
-        _persist_provider(orm_session, tenant_id=tenant_id, credential_id=None)
-        _persist_provider_model(orm_session, tenant_id=tenant_id, credential_id=model_credential.id)
+        provider_record = self._provider_record(credential_id=None)
+        model_record = self._model_record(credential_id="model-cred-id")
 
-        decoy_tenant_id = str(uuid.uuid4())
-        decoy_credential = _persist_model_credential(
-            orm_session,
-            tenant_id=decoy_tenant_id,
-            credential_name="WrongTenantCredential",
+        # scalar calls: (1) Provider, (2) ProviderModel, (3) ProviderModelCredential.credential_name
+        mock_db, cm, _session = _make_db_and_session_patches(
+            scalar_side_effect=[provider_record, model_record, "ModelCredName"]
         )
-        _persist_provider(orm_session, tenant_id=decoy_tenant_id, credential_id=None)
-        _persist_provider_model(orm_session, tenant_id=decoy_tenant_id, credential_id=decoy_credential.id)
 
-        cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", "gpt-4")
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
 
-        assert cred_id == model_credential.id
+        assert cred_id == "model-cred-id"
         assert cred_name == "ModelCredName"
 
-    def test_provider_level_fallback_when_no_model_credential(self, orm_session: Session):
+    def test_provider_level_fallback_when_no_model_credential(self):
         """Falls back to provider-level credential when ProviderModel has no credential_id."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        tenant_id = str(uuid.uuid4())
-        provider_credential = _persist_provider_credential(orm_session, tenant_id=tenant_id)
-        _persist_provider(orm_session, tenant_id=tenant_id, credential_id=provider_credential.id)
-        _persist_provider_model(orm_session, tenant_id=tenant_id, credential_id=None)
+        provider_record = self._provider_record(credential_id="prov-cred-id")
+        model_record = self._model_record(credential_id=None)
 
-        cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", "gpt-4")
+        # scalar calls: (1) Provider, (2) ProviderModel (no cred), (3) ProviderCredential.credential_name
+        mock_db, cm, _session = _make_db_and_session_patches(
+            scalar_side_effect=[provider_record, model_record, "ProvCredName"]
+        )
 
-        assert cred_id == provider_credential.id
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
+
+        assert cred_id == "prov-cred-id"
         assert cred_name == "ProvCredName"
 
-    def test_provider_level_fallback_when_no_model_record(self, orm_session: Session):
+    def test_provider_level_fallback_when_no_model_record(self):
         """Falls back to provider-level credential when no ProviderModel row exists."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        tenant_id = str(uuid.uuid4())
-        provider_credential = _persist_provider_credential(orm_session, tenant_id=tenant_id)
-        _persist_provider(orm_session, tenant_id=tenant_id, credential_id=provider_credential.id)
+        provider_record = self._provider_record(credential_id="prov-cred-id")
 
-        cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", "gpt-4")
+        # scalar calls: (1) Provider, (2) ProviderModel → None, (3) ProviderCredential.credential_name
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_side_effect=[provider_record, None, "ProvCredName"])
 
-        assert cred_id == provider_credential.id
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
+
+        assert cred_id == "prov-cred-id"
         assert cred_name == "ProvCredName"
 
-    def test_no_model_arg_uses_provider_level_only(self, orm_session: Session):
+    def test_no_model_arg_uses_provider_level_only(self):
         """When model is None, skips ProviderModel query and uses provider credential."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        tenant_id = str(uuid.uuid4())
-        provider_credential = _persist_provider_credential(orm_session, tenant_id=tenant_id)
-        _persist_provider(orm_session, tenant_id=tenant_id, credential_id=provider_credential.id)
+        provider_record = self._provider_record(credential_id="prov-cred-id")
 
-        cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", None)
+        # scalar calls: (1) Provider, (2) ProviderCredential.credential_name — no ProviderModel
+        mock_db, cm, session = _make_db_and_session_patches(scalar_side_effect=[provider_record, "ProvCredName"])
 
-        assert cred_id == provider_credential.id
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", None)
+
+        assert cred_id == "prov-cred-id"
         assert cred_name == "ProvCredName"
+        assert session.scalar.call_count == 2
 
-    def test_provider_not_found_returns_none_and_empty(self, orm_session: Session):
+    def test_provider_not_found_returns_none_and_empty(self):
         """Returns (None, '') when Provider record does not exist."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        other_tenant_id = str(uuid.uuid4())
-        _persist_provider(orm_session, tenant_id=other_tenant_id, credential_id=None)
-        tenant_id = str(uuid.uuid4())
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_return_value=None)
 
-        cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", "gpt-4")
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
 
         assert cred_id is None
         assert cred_name == ""
@@ -461,8 +389,16 @@ class TestLookupLlmCredentialInfo:
         """Returns (None, '') immediately when tenant_id is None — no DB access."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        cred_id, cred_name = _lookup_llm_credential_info(None, "openai", "gpt-4")
+        mock_db = MagicMock()
+        mock_session_cls = MagicMock()
 
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", mock_session_cls),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info(None, "openai", "gpt-4")
+
+        mock_session_cls.assert_not_called()
         assert cred_id is None
         assert cred_name == ""
 
@@ -470,46 +406,69 @@ class TestLookupLlmCredentialInfo:
         """Returns (None, '') immediately when provider is None — no DB access."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        cred_id, cred_name = _lookup_llm_credential_info(str(uuid.uuid4()), None, "gpt-4")
+        mock_db = MagicMock()
+        mock_session_cls = MagicMock()
 
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", mock_session_cls),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", None, "gpt-4")
+
+        mock_session_cls.assert_not_called()
         assert cred_id is None
         assert cred_name == ""
 
-    def test_db_error_on_outer_query_returns_none_and_empty(self, orm_session: Session, sqlite_engine: Engine):
+    def test_db_error_on_outer_query_returns_none_and_empty(self):
         """Returns (None, '') and logs a warning when the outer DB query raises."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        with _raise_on_table(sqlite_engine, "providers"):
-            cred_id, cred_name = _lookup_llm_credential_info(str(uuid.uuid4()), "openai", "gpt-4")
+        mock_db, cm, session = _make_db_and_session_patches()
+        session.scalar.side_effect = Exception("DB connection failed")
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
 
         assert cred_id is None
         assert cred_name == ""
 
-    def test_credential_name_lookup_failure_returns_id_with_empty_name(
-        self, orm_session: Session, sqlite_engine: Engine
-    ):
+    def test_credential_name_lookup_failure_returns_id_with_empty_name(self):
         """When credential name sub-query fails, returns cred_id but '' for name."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        tenant_id = str(uuid.uuid4())
-        provider_credential = _persist_provider_credential(orm_session, tenant_id=tenant_id)
-        _persist_provider(orm_session, tenant_id=tenant_id, credential_id=provider_credential.id)
+        provider_record = self._provider_record(credential_id="prov-cred-id")
 
-        with _raise_on_table(sqlite_engine, "provider_credentials"):
-            cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", "gpt-4")
+        # Provider found, no model record, then name lookup raises
+        mock_db, cm, _session = _make_db_and_session_patches(
+            scalar_side_effect=[provider_record, None, Exception("deleted")]
+        )
 
-        assert cred_id == provider_credential.id
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
+
+        assert cred_id == "prov-cred-id"
         assert cred_name == ""
 
-    def test_no_credential_on_provider_or_model_returns_none_id(self, orm_session: Session):
+    def test_no_credential_on_provider_or_model_returns_none_id(self):
         """Returns (None, '') when neither provider nor model has a credential_id."""
         from core.ops.ops_trace_manager import _lookup_llm_credential_info
 
-        tenant_id = str(uuid.uuid4())
-        _persist_provider(orm_session, tenant_id=tenant_id, credential_id=None)
-        _persist_provider_model(orm_session, tenant_id=tenant_id, credential_id=None)
+        provider_record = self._provider_record(credential_id=None)
+        model_record = self._model_record(credential_id=None)
 
-        cred_id, cred_name = _lookup_llm_credential_info(tenant_id, "openai", "gpt-4")
+        mock_db, cm, _session = _make_db_and_session_patches(scalar_side_effect=[provider_record, model_record])
+
+        with (
+            patch("core.ops.ops_trace_manager.db", mock_db),
+            patch("core.ops.ops_trace_manager.Session", return_value=cm),
+        ):
+            cred_id, cred_name = _lookup_llm_credential_info("tenant-1", "openai", "gpt-4")
 
         assert cred_id is None
         assert cred_name == ""

api/tests/unit_tests/core/ops/test_utils.py

@@ -1,11 +1,9 @@
 import re
 from datetime import datetime
-from decimal import Decimal
+from unittest.mock import MagicMock, patch
 
 import pytest
-from sqlalchemy.orm import Session
 
-import core.ops.utils as utils_module
 from core.ops.utils import (
     filter_none_values,
     generate_dotted_order,
@@ -17,42 +15,6 @@ from core.ops.utils import (
     validate_url,
     validate_url_with_path,
 )
-from models.enums import ConversationFromSource
-from models.model import Message
-
-
-class _DatabaseBinding:
-    """Expose the real SQLite session used by the message lookup helper."""
-
-    session: Session
-
-    def __init__(self, session: Session) -> None:
-        self.session = session
-
-
-@pytest.fixture
-def message_session(sqlite_session: Session, monkeypatch: pytest.MonkeyPatch) -> Session:
-    """Bind the message lookup helper to the shared SQLite test session."""
-
-    monkeypatch.setattr(utils_module, "db", _DatabaseBinding(sqlite_session))
-    return sqlite_session
-
-
-def _message(message_id: str) -> Message:
-    message = Message(
-        id=message_id,
-        app_id="app-id",
-        conversation_id="conversation-id",
-        query="question",
-        message={"role": "user", "content": "question"},
-        answer="answer",
-        message_unit_price=Decimal("0.0001"),
-        answer_unit_price=Decimal("0.0001"),
-        currency="USD",
-        from_source=ConversationFromSource.API,
-    )
-    message._inputs = {}
-    return message
 
 
 class TestValidateUrl:
@@ -258,20 +220,22 @@ class TestFilterNoneValues:
         assert filter_none_values({}) == {}
 
 
-@pytest.mark.parametrize("sqlite_session", [(Message,)], indirect=True)
 class TestGetMessageData:
     """Test cases for get_message_data function"""
 
-    def test_get_message_data(self, message_session: Session):
-        target = _message("message-id")
-        unrelated = _message("other-message-id")
-        message_session.add_all((target, unrelated))
-        message_session.commit()
+    @patch("core.ops.utils.db")
+    @patch("core.ops.utils.Message")
+    @patch("core.ops.utils.select")
+    def test_get_message_data(self, mock_select, mock_message, mock_db):
+        mock_scalar = mock_db.session.scalar
+        mock_msg_instance = MagicMock()
+        mock_scalar.return_value = mock_msg_instance
 
         result = get_message_data("message-id")
 
-        assert result is target
-        assert result.id == "message-id"
+        assert result == mock_msg_instance
+        mock_select.assert_called_once()
+        mock_scalar.assert_called_once()
 
 
 class TestMeasureTime:

api/tests/unit_tests/core/plugin/impl/test_model_client.py

@@ -28,6 +28,19 @@ class TestPluginModelClient:
         )
         assert request_mock.call_args.kwargs["params"] == {"page": 1, "page_size": 256}
 
+    def test_fetch_model_provider_bindings(self, mocker: MockerFixture):
+        client = PluginModelClient()
+        request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=["binding-a"])
+
+        result = client.fetch_model_provider_bindings("tenant-1")
+
+        assert result == ["binding-a"]
+        assert request_mock.call_args.args[:2] == (
+            "GET",
+            "plugin/tenant-1/management/models/bindings",
+        )
+        assert "params" not in request_mock.call_args.kwargs
+
     def test_get_model_schema(self, mocker: MockerFixture):
         client = PluginModelClient()
         schema = SimpleNamespace(name="schema")

api/tests/unit_tests/core/plugin/test_plugin_manager.py

@@ -29,6 +29,7 @@ from core.plugin.entities.plugin import (
 )
 from core.plugin.entities.plugin_daemon import (
     PluginDecodeResponse,
+    PluginInstalledIdsDaemonResponse,
     PluginInstallTask,
     PluginInstallTaskStartResponse,
     PluginInstallTaskStatus,
@@ -132,7 +133,13 @@ class TestPluginDiscovery:
             plugin_installer, "_request_with_plugin_daemon_response", return_value=mock_response
         ) as mock_request:
             result = plugin_installer.list_plugins_by_category(
-                "test-tenant", category=PluginCategory.Tool, page=2, page_size=10
+                "test-tenant",
+                category=PluginCategory.Tool,
+                page=2,
+                page_size=10,
+                query="weather",
+                tags=["search", "rag"],
+                language="zh_Hans",
             )
 
             mock_request.assert_called_once()
@@ -141,6 +148,9 @@ class TestPluginDiscovery:
             assert call_args.args[2] is PluginListWithoutTotalResponse
             assert call_args.kwargs["params"]["page"] == 2
             assert call_args.kwargs["params"]["page_size"] == 10
+            assert call_args.kwargs["params"]["query"] == "weather"
+            assert call_args.kwargs["params"]["tags"] == ["search", "rag"]
+            assert call_args.kwargs["params"]["language"] == "zh_Hans"
             assert result.list == [mock_plugin_entity]
             assert result.has_more is True
 
@@ -156,6 +166,23 @@ class TestPluginDiscovery:
             # Assert: Verify empty list is returned
             assert len(result) == 0
 
+    def test_list_installed_plugin_ids(self, plugin_installer):
+        """The lightweight ID endpoint is unpaginated and does not request plugin details."""
+        mock_response = PluginInstalledIdsDaemonResponse(plugin_ids=["langgenius/openai", "langgenius/anthropic"])
+
+        with patch.object(
+            plugin_installer, "_request_with_plugin_daemon_response", return_value=mock_response
+        ) as mock_request:
+            result = plugin_installer.list_installed_plugin_ids("test-tenant", PluginCategory.Tool)
+
+        mock_request.assert_called_once_with(
+            "GET",
+            "plugin/test-tenant/management/installation/ids",
+            PluginInstalledIdsDaemonResponse,
+            params={"category": "tool"},
+        )
+        assert result == ["langgenius/openai", "langgenius/anthropic"]
+
     def test_fetch_plugin_by_identifier_found(self, plugin_installer):
         """Test fetching a plugin by its unique identifier when it exists."""
         # Arrange: Mock successful fetch

api/tests/unit_tests/core/prompt/test_extract_thread_messages.py

@@ -1,42 +1,9 @@
-from datetime import datetime, timedelta
-from decimal import Decimal
+from unittest.mock import MagicMock
 from uuid import uuid4
 
-import pytest
-from sqlalchemy.orm import Session
-
 from constants import UUID_NIL
 from core.prompt.utils.extract_thread_messages import extract_thread_messages
 from core.prompt.utils.get_thread_messages_length import get_thread_messages_length
-from models.enums import ConversationFromSource
-from models.model import Message
-
-
-def _persisted_message(
-    *,
-    message_id: str,
-    conversation_id: str,
-    parent_message_id: str,
-    answer: str,
-    created_at: datetime,
-) -> Message:
-    message = Message(
-        id=message_id,
-        app_id="app-id",
-        conversation_id=conversation_id,
-        query="question",
-        message={"role": "user", "content": "question"},
-        answer=answer,
-        message_unit_price=Decimal("0.0001"),
-        answer_unit_price=Decimal("0.0001"),
-        currency="USD",
-        from_source=ConversationFromSource.API,
-        parent_message_id=parent_message_id,
-        created_at=created_at,
-        updated_at=created_at,
-    )
-    message._inputs = {}
-    return message
 
 
 class MockMessage:
@@ -137,64 +104,33 @@ def test_extract_thread_messages_breaks_when_parent_is_none():
     assert result[0].id == id2
 
 
-@pytest.mark.parametrize("sqlite_session", [(Message,)], indirect=True)
-def test_get_thread_messages_length_excludes_newly_created_empty_answer(sqlite_session: Session):
+def test_get_thread_messages_length_excludes_newly_created_empty_answer():
     id1, id2 = str(uuid4()), str(uuid4())
-    now = datetime.now()
     messages = [
-        _persisted_message(
-            message_id=id2,
-            conversation_id="conversation-1",
-            parent_message_id=id1,
-            answer="",
-            created_at=now,
-        ),
-        _persisted_message(
-            message_id=id1,
-            conversation_id="conversation-1",
-            parent_message_id=UUID_NIL,
-            answer="ok",
-            created_at=now - timedelta(seconds=1),
-        ),
-        _persisted_message(
-            message_id=str(uuid4()),
-            conversation_id="other-conversation",
-            parent_message_id=UUID_NIL,
-            answer="unrelated",
-            created_at=now + timedelta(seconds=1),
-        ),
+        MockMessage(id2, id1, answer=""),  # newest generated message should be excluded
+        MockMessage(id1, UUID_NIL, answer="ok"),
     ]
-    sqlite_session.add_all(messages)
-    sqlite_session.commit()
 
-    length = get_thread_messages_length("conversation-1", session=sqlite_session)
+    session = MagicMock()
+    session.scalars.return_value.all.return_value = messages
+
+    length = get_thread_messages_length("conversation-1", session=session)
 
     assert length == 1
+    session.scalars.assert_called_once()
 
 
-@pytest.mark.parametrize("sqlite_session", [(Message,)], indirect=True)
-def test_get_thread_messages_length_keeps_non_empty_latest_answer(sqlite_session: Session):
+def test_get_thread_messages_length_keeps_non_empty_latest_answer():
     id1, id2 = str(uuid4()), str(uuid4())
-    now = datetime.now()
     messages = [
-        _persisted_message(
-            message_id=id2,
-            conversation_id="conversation-2",
-            parent_message_id=id1,
-            answer="latest-answer",
-            created_at=now,
-        ),
-        _persisted_message(
-            message_id=id1,
-            conversation_id="conversation-2",
-            parent_message_id=UUID_NIL,
-            answer="older-answer",
-            created_at=now - timedelta(seconds=1),
-        ),
+        MockMessage(id2, id1, answer="latest-answer"),
+        MockMessage(id1, UUID_NIL, answer="older-answer"),
     ]
-    sqlite_session.add_all(messages)
-    sqlite_session.commit()
 
-    length = get_thread_messages_length("conversation-2", session=sqlite_session)
+    session = MagicMock()
+    session.scalars.return_value.all.return_value = messages
+
+    length = get_thread_messages_length("conversation-2", session=session)
 
     assert length == 2
+    session.scalars.assert_called_once()

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

@@ -1,16 +1,16 @@
-"""Unit tests for workflow-as-tool behavior with real SQLite ORM boundaries."""
+"""Unit tests for workflow-as-tool behavior.
+
+StubSession/StubScalars emulate SQLAlchemy session/scalars with minimal methods
+(`scalar`, `scalars`, `expunge`, `commit`, `refresh`, context manager) to keep
+database access mocked and predictable in tests.
+"""
 
 import json
-import uuid
-from collections.abc import Iterator
-from dataclasses import dataclass
 from types import SimpleNamespace
 from typing import Any
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from sqlalchemy import Engine, inspect
-from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.tools.__base.tool_runtime import ToolRuntime
@@ -23,142 +23,74 @@ from core.tools.entities.tool_entities import (
     ToolProviderType,
 )
 from core.tools.errors import ToolInvokeError
-from core.tools.workflow_as_tool import tool as workflow_tool_module
 from core.tools.workflow_as_tool.tool import WorkflowTool
 from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod, FileType
-from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
-from models.base import TypeBase
-from models.enums import EndUserType
-from models.model import App, AppMode, EndUser
-from models.workflow import Workflow, WorkflowType
-
-TENANT_ID = "00000000-0000-0000-0000-000000000001"
-OTHER_TENANT_ID = "00000000-0000-0000-0000-000000000002"
-APP_ID = "00000000-0000-0000-0000-000000000003"
-ACCOUNT_ID = "00000000-0000-0000-0000-000000000004"
-END_USER_ID = "00000000-0000-0000-0000-000000000005"
-CREATOR_ID = "00000000-0000-0000-0000-000000000006"
 
 
-@dataclass(frozen=True)
-class SqliteToolDb:
-    engine: Engine
-    session_maker: sessionmaker[Session]
-    caller_session: Session
+class StubScalars:
+    """Minimal stub for SQLAlchemy scalar results."""
+
+    _value: Any
+
+    def __init__(self, value: Any) -> None:
+        self._value = value
+
+    def first(self) -> Any:
+        return self._value
 
 
-@pytest.fixture
-def sqlite_tool_db(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_engine: Engine,
-) -> Iterator[SqliteToolDb]:
-    """Bind service-owned sessions and Account tenant reloads to SQLite."""
-    models = (App, Workflow, EndUser, Account, Tenant, TenantAccountJoin)
-    TypeBase.metadata.create_all(sqlite_engine, tables=[model.__table__ for model in models])
-    session_maker = sessionmaker(bind=sqlite_engine, expire_on_commit=False)
-    monkeypatch.setattr(workflow_tool_module.session_factory, "create_session", session_maker)
+class StubSession:
+    """Minimal stub for session_factory-created sessions."""
 
-    from models import account as account_module
+    scalar_results: list[Any]
+    scalars_results: list[Any]
+    expunge_calls: list[object]
 
-    monkeypatch.setattr(account_module, "db", SimpleNamespace(engine=sqlite_engine))
-    with session_maker() as caller_session:
-        yield SqliteToolDb(engine=sqlite_engine, session_maker=session_maker, caller_session=caller_session)
+    def __init__(self, *, scalar_results: list[Any] | None = None, scalars_results: list[Any] | None = None) -> None:
+        self.scalar_results = list(scalar_results or [])
+        self.scalars_results = list(scalars_results or [])
+        self.expunge_calls: list[object] = []
+
+    def scalar(self, _stmt: Any) -> Any:
+        return self.scalar_results.pop(0)
+
+    def scalars(self, _stmt: Any) -> StubScalars:
+        return StubScalars(self.scalars_results.pop(0))
+
+    def expunge(self, value: Any) -> None:
+        self.expunge_calls.append(value)
+
+    def begin(self) -> "StubSession":
+        return self
+
+    def commit(self) -> None:
+        pass
+
+    def refresh(self, _value: Any) -> None:
+        pass
+
+    def close(self) -> None:
+        pass
+
+    def __enter__(self) -> "StubSession":
+        return self
+
+    def __exit__(self, exc_type: Any, exc: Any, tb: Any) -> bool:
+        return False
 
 
-def _persist_tenant(db: SqliteToolDb, *, tenant_id: str = TENANT_ID) -> Tenant:
-    tenant = Tenant(name="Tenant")
-    tenant.id = tenant_id
-    db.caller_session.add(tenant)
-    db.caller_session.commit()
-    return tenant
-
-
-def _persist_account(db: SqliteToolDb, *, tenant_id: str = TENANT_ID) -> Account:
-    account = Account(name="Account", email="account@example.com")
-    account.id = ACCOUNT_ID
-    join = TenantAccountJoin(
-        tenant_id=tenant_id,
-        account_id=account.id,
-        current=True,
-        role=TenantAccountRole.NORMAL,
-    )
-    db.caller_session.add_all([account, join])
-    db.caller_session.commit()
-    return account
-
-
-def _persist_end_user(
-    db: SqliteToolDb,
-    *,
-    end_user_id: str = END_USER_ID,
-    tenant_id: str = TENANT_ID,
-) -> EndUser:
-    end_user = EndUser(
-        id=end_user_id,
-        tenant_id=tenant_id,
-        app_id=APP_ID,
-        type=EndUserType.SERVICE_API,
-        name="End user",
-        session_id="end-user-session",
-    )
-    db.caller_session.add(end_user)
-    db.caller_session.commit()
-    return end_user
-
-
-def _persist_app(db: SqliteToolDb) -> App:
-    app = App(
-        id=APP_ID,
-        tenant_id=TENANT_ID,
-        name="Workflow app",
-        description="",
-        mode=AppMode.WORKFLOW,
-        icon_type=None,
-        icon="",
-        icon_background=None,
-        app_model_config_id=None,
-        workflow_id=None,
-        enable_site=False,
-        enable_api=True,
-        max_active_requests=None,
-        created_by=CREATOR_ID,
-    )
-    db.caller_session.add(app)
-    db.caller_session.commit()
-    return app
-
-
-def _persist_workflow(db: SqliteToolDb, *, version: str, workflow_id: str | None = None) -> Workflow:
-    workflow = Workflow.new(
-        tenant_id=TENANT_ID,
-        app_id=APP_ID,
-        type=WorkflowType.WORKFLOW.value,
-        version=version,
-        graph=json.dumps({"nodes": [], "edges": []}),
-        features="{}",
-        created_by=CREATOR_ID,
-        environment_variables=[],
-        conversation_variables=[],
-        rag_pipeline_variables=[],
-    )
-    workflow.id = workflow_id or str(uuid.uuid4())
-    db.caller_session.add(workflow)
-    db.caller_session.commit()
-    return workflow
-
-
-def _build_tool(*, tenant_id: str = "test_tool", workflow_app_id: str = "app-1", version: str = "1") -> WorkflowTool:
+def _build_tool() -> WorkflowTool:
     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=tenant_id, invoke_from=InvokeFrom.EXPLORE)
+    runtime = ToolRuntime(tenant_id="test_tool", invoke_from=InvokeFrom.EXPLORE)
     return WorkflowTool(
-        workflow_app_id=workflow_app_id,
+        workflow_app_id="app-1",
         workflow_as_tool_id="wf-tool-1",
-        version=version,
+        version="1",
         workflow_entities={},
         workflow_call_depth=1,
         entity=entity,
@@ -166,10 +98,7 @@ def _build_tool(*, tenant_id: str = "test_tool", workflow_app_id: str = "app-1",
     )
 
 
-def test_workflow_tool_should_raise_tool_invoke_error_when_result_has_error_field(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_should_raise_tool_invoke_error_when_result_has_error_field(monkeypatch: pytest.MonkeyPatch):
     """Ensure that WorkflowTool will throw a `ToolInvokeError` exception when
     `WorkflowAppGenerator.generate` returns a result with `error` key inside
     the `data` element.
@@ -193,14 +122,11 @@ def test_workflow_tool_should_raise_tool_invoke_error_when_result_has_error_fiel
     with pytest.raises(ToolInvokeError) as exc_info:
         # WorkflowTool always returns a generator, so we need to iterate to
         # actually `run` the tool.
-        list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+        list(tool.invoke(MagicMock(), "test_user", {}))
     assert exc_info.value.args == ("oops",)
 
 
-def test_workflow_tool_does_not_use_pause_state_config(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_does_not_use_pause_state_config(monkeypatch: pytest.MonkeyPatch):
     """Ensure pause_state_config is passed as None."""
     tool = _build_tool()
 
@@ -214,17 +140,14 @@ def test_workflow_tool_does_not_use_pause_state_config(
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    list(tool.invoke(MagicMock(), "test_user", {}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert "pause_state_config" in call_kwargs
     assert call_kwargs["pause_state_config"] is None
 
 
-def test_workflow_tool_passes_parent_trace_context_from_runtime(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_passes_parent_trace_context_from_runtime(monkeypatch: pytest.MonkeyPatch):
     """Ensure nested workflow runtime metadata is forwarded as parent trace context."""
     tool = _build_tool()
     tool.set_parent_trace_context(
@@ -242,7 +165,7 @@ def test_workflow_tool_passes_parent_trace_context_from_runtime(
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    list(tool.invoke(MagicMock(), "test_user", {}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert call_kwargs["args"]["parent_trace_context"].model_dump() == {
@@ -251,10 +174,7 @@ def test_workflow_tool_passes_parent_trace_context_from_runtime(
     }
 
 
-def test_workflow_tool_passes_parent_trace_session_id(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_passes_parent_trace_session_id(monkeypatch: pytest.MonkeyPatch):
     """Ensure nested workflows inherit the parent observability session ID."""
     tool = _build_tool()
     tool.entity.parameters = [
@@ -277,17 +197,14 @@ def test_workflow_tool_passes_parent_trace_session_id(
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {"trace_session_id": "user-input-session"}))
+    list(tool.invoke(MagicMock(), "test_user", {"trace_session_id": "user-input-session"}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert call_kwargs["args"]["inputs"]["trace_session_id"] == "user-input-session"
     assert call_kwargs["args"]["trace_session_id"] == "session-1"
 
 
-def test_workflow_tool_keeps_user_inputs_named_like_trace_runtime_keys(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_keeps_user_inputs_named_like_trace_runtime_keys(monkeypatch: pytest.MonkeyPatch):
     """Ensure private trace context does not overwrite same-named workflow inputs."""
     tool = _build_tool()
     tool.entity.parameters = [
@@ -321,7 +238,7 @@ def test_workflow_tool_keeps_user_inputs_named_like_trace_runtime_keys(
 
     list(
         tool.invoke(
-            sqlite_tool_db.caller_session,
+            MagicMock(),
             "test_user",
             {
                 "outer_workflow_run_id": "user-workflow-input",
@@ -339,10 +256,7 @@ def test_workflow_tool_keeps_user_inputs_named_like_trace_runtime_keys(
     }
 
 
-def test_workflow_tool_can_clear_parent_trace_context(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_can_clear_parent_trace_context(monkeypatch: pytest.MonkeyPatch):
     """Ensure reused WorkflowTool instances do not keep stale parent trace context."""
     tool = _build_tool()
     tool.set_parent_trace_context(
@@ -361,16 +275,13 @@ def test_workflow_tool_can_clear_parent_trace_context(
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    list(tool.invoke(MagicMock(), "test_user", {}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert "parent_trace_context" not in call_kwargs["args"]
 
 
-def test_workflow_tool_can_clear_trace_session_id(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_can_clear_trace_session_id(monkeypatch: pytest.MonkeyPatch):
     """Ensure reused WorkflowTool instances do not keep stale trace session IDs."""
     tool = _build_tool()
     tool.set_trace_session_id("session-1")
@@ -386,7 +297,7 @@ def test_workflow_tool_can_clear_trace_session_id(
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    list(tool.invoke(MagicMock(), "test_user", {}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert "trace_session_id" not in call_kwargs["args"]
@@ -404,7 +315,6 @@ def test_workflow_tool_can_clear_trace_session_id(
 def test_workflow_tool_omits_parent_trace_context_when_runtime_is_incomplete(
     monkeypatch: pytest.MonkeyPatch,
     runtime_parameters: dict[str, Any],
-    sqlite_tool_db: SqliteToolDb,
 ):
     """Ensure incomplete runtime metadata does not leak parent trace context into generator args."""
     tool = _build_tool()
@@ -420,16 +330,13 @@ def test_workflow_tool_omits_parent_trace_context_when_runtime_is_incomplete(
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    list(tool.invoke(MagicMock(), "test_user", {}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert "parent_trace_context" not in call_kwargs["args"]
 
 
-def test_workflow_tool_should_generate_variable_messages_for_outputs(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_should_generate_variable_messages_for_outputs(monkeypatch: pytest.MonkeyPatch):
     """Test that WorkflowTool should generate variable messages when there are outputs"""
     tool = _build_tool()
 
@@ -452,7 +359,7 @@ def test_workflow_tool_should_generate_variable_messages_for_outputs(
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
     # Execute tool invocation
-    messages = list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    messages = list(tool.invoke(MagicMock(), "test_user", {}))
 
     # Verify variable messages
     variable_messages = [msg for msg in messages if msg.type == ToolInvokeMessage.MessageType.VARIABLE]
@@ -475,10 +382,7 @@ def test_workflow_tool_should_generate_variable_messages_for_outputs(
     assert json_messages[0].message.json_object == mock_outputs
 
 
-def test_workflow_tool_should_handle_empty_outputs(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_should_handle_empty_outputs(monkeypatch: pytest.MonkeyPatch):
     """Test that WorkflowTool should handle empty outputs correctly"""
     tool = _build_tool()
 
@@ -498,7 +402,7 @@ def test_workflow_tool_should_handle_empty_outputs(
     monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
 
     # Execute tool invocation
-    messages = list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {}))
+    messages = list(tool.invoke(MagicMock(), "test_user", {}))
 
     # Verify generated messages
     # Should contain: 0 variable messages + 1 text message + 1 JSON message = 2 messages
@@ -554,32 +458,41 @@ def test_create_file_message_should_include_file_marker():
     assert message.meta == {"file": file_obj}
 
 
-def test_resolve_user_from_database_falls_back_to_end_user(sqlite_tool_db: SqliteToolDb):
+def test_resolve_user_from_database_falls_back_to_end_user(monkeypatch: pytest.MonkeyPatch):
     """Ensure worker context can resolve EndUser when Account is missing."""
-    _persist_tenant(sqlite_tool_db)
-    end_user = _persist_end_user(sqlite_tool_db)
-    other_tenant_end_user = _persist_end_user(
-        sqlite_tool_db,
-        end_user_id="00000000-0000-0000-0000-000000000007",
-        tenant_id=OTHER_TENANT_ID,
+
+    tenant = SimpleNamespace(id="tenant_id")
+    end_user = SimpleNamespace(id="end_user_id", tenant_id="tenant_id")
+
+    # Monkeypatch session factory to return our stub session
+    stub_session = StubSession(scalar_results=[tenant, None, end_user])
+    monkeypatch.setattr(
+        "core.tools.workflow_as_tool.tool.session_factory.create_session",
+        lambda: stub_session,
     )
 
-    tool = _build_tool(tenant_id=TENANT_ID)
+    tool = _build_tool()
     tool.runtime.invoke_from = InvokeFrom.SERVICE_API
+    tool.runtime.tenant_id = "tenant_id"
 
     resolved_user = tool._resolve_user_from_database(user_id=end_user.id)
 
-    assert isinstance(resolved_user, EndUser)
-    assert resolved_user.id == end_user.id
-    assert resolved_user.tenant_id == TENANT_ID
-    assert inspect(resolved_user).detached is True
-    assert tool._resolve_user_from_database(user_id=other_tenant_end_user.id) is None
+    assert resolved_user is end_user
+    assert stub_session.expunge_calls == [end_user]
 
 
-def test_resolve_user_from_database_returns_none_when_no_tenant(sqlite_tool_db: SqliteToolDb):
+def test_resolve_user_from_database_returns_none_when_no_tenant(monkeypatch: pytest.MonkeyPatch):
     """Return None if tenant cannot be found in worker context."""
-    tool = _build_tool(tenant_id=OTHER_TENANT_ID)
+
+    # Monkeypatch session factory to return our stub session with no tenant
+    monkeypatch.setattr(
+        "core.tools.workflow_as_tool.tool.session_factory.create_session",
+        lambda: StubSession(scalar_results=[None]),
+    )
+
+    tool = _build_tool()
     tool.runtime.invoke_from = InvokeFrom.SERVICE_API
+    tool.runtime.tenant_id = "missing_tenant"
 
     resolved_user = tool._resolve_user_from_database(user_id="any")
 
@@ -631,10 +544,7 @@ def test_extract_usage_from_nested():
     assert nested == {"total_tokens": 3}
 
 
-def test_invoke_raises_when_user_not_found(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_invoke_raises_when_user_not_found(monkeypatch: pytest.MonkeyPatch):
     """Raise ToolInvokeError when user resolution fails."""
     tool = _build_tool()
     monkeypatch.setattr(tool, "_get_app", lambda *args, **kwargs: None)
@@ -642,45 +552,58 @@ def test_invoke_raises_when_user_not_found(
     monkeypatch.setattr(tool, "_resolve_user", lambda *args, **kwargs: None)
 
     with pytest.raises(ToolInvokeError, match="User not found"):
-        list(tool.invoke(sqlite_tool_db.caller_session, "missing", {}))
+        list(tool.invoke(MagicMock(), "missing", {}))
 
 
-def test_resolve_user_from_database_returns_account(sqlite_tool_db: SqliteToolDb):
+def test_resolve_user_from_database_returns_account(monkeypatch: pytest.MonkeyPatch):
     """Resolve Account and set tenant in worker context."""
-    tenant = _persist_tenant(sqlite_tool_db)
-    account = _persist_account(sqlite_tool_db)
-    tool = _build_tool(tenant_id=TENANT_ID)
+    tenant = SimpleNamespace(id="tenant_id")
+    account = SimpleNamespace(id="account_id", current_tenant=None)
+    set_current_tenant = Mock(side_effect=lambda tenant, *, session: setattr(account, "current_tenant", tenant))
+    account.set_current_tenant_with_session = set_current_tenant
+    session = StubSession(scalar_results=[tenant, account])
 
-    resolved = tool._resolve_user_from_database(user_id=account.id)
-    assert isinstance(resolved, Account)
-    assert resolved.id == account.id
-    assert resolved.current_tenant_id == tenant.id
-    assert inspect(resolved).detached is True
+    monkeypatch.setattr("core.tools.workflow_as_tool.tool.session_factory.create_session", lambda: session)
+    tool = _build_tool()
+    tool.runtime.tenant_id = "tenant_id"
+
+    resolved = tool._resolve_user_from_database(user_id="account_id")
+    assert resolved is account
+    assert account.current_tenant is tenant
+    set_current_tenant.assert_called_once_with(tenant, session=session)
+    assert session.expunge_calls == [account]
 
 
-def test_get_workflow_and_get_app_db_branches(sqlite_tool_db: SqliteToolDb):
+def test_get_workflow_and_get_app_db_branches(monkeypatch: pytest.MonkeyPatch):
     """Cover workflow/app retrieval branches and error cases."""
-    app = _persist_app(sqlite_tool_db)
-    specific_workflow = _persist_workflow(sqlite_tool_db, version="1")
-    latest_workflow = _persist_workflow(sqlite_tool_db, version="2")
-    _persist_workflow(sqlite_tool_db, version=Workflow.VERSION_DRAFT)
-    tool = _build_tool(tenant_id=TENANT_ID, workflow_app_id=APP_ID)
+    tool = _build_tool()
+    latest_workflow = SimpleNamespace(id="wf-latest")
+    specific_workflow = SimpleNamespace(id="wf-v1")
+    app = SimpleNamespace(id="app-1")
+    sessions = iter(
+        [
+            StubSession(scalar_results=[], scalars_results=[latest_workflow]),
+            StubSession(scalar_results=[specific_workflow], scalars_results=[]),
+            StubSession(scalar_results=[app], scalars_results=[]),
+        ]
+    )
+    monkeypatch.setattr(
+        "core.tools.workflow_as_tool.tool.session_factory.create_session",
+        lambda: next(sessions),
+    )
 
-    latest = tool._get_workflow(APP_ID, "")
-    specific = tool._get_workflow(APP_ID, "1")
-    resolved_app = tool._get_app(APP_ID)
-
-    assert latest.id == latest_workflow.id
-    assert specific.id == specific_workflow.id
-    assert resolved_app.id == app.id
-    assert inspect(latest).detached is True
-    assert inspect(specific).detached is True
-    assert inspect(resolved_app).detached is True
+    assert tool._get_workflow("app-1", "") is latest_workflow
+    assert tool._get_workflow("app-1", "1") is specific_workflow
+    assert tool._get_app("app-1") is app
 
+    monkeypatch.setattr(
+        "core.tools.workflow_as_tool.tool.session_factory.create_session",
+        lambda: StubSession(scalar_results=[None, None], scalars_results=[None]),
+    )
     with pytest.raises(ValueError, match="workflow not found"):
-        tool._get_workflow(APP_ID, "missing")
+        tool._get_workflow("app-1", "1")
     with pytest.raises(ValueError, match="app not found"):
-        tool._get_app("00000000-0000-0000-0000-000000000099")
+        tool._get_app("app-1")
 
 
 def _setup_transform_args_tool(monkeypatch: pytest.MonkeyPatch) -> WorkflowTool:
@@ -799,10 +722,7 @@ def test_transform_args_normalizes_optional_files_parameter(
     assert files == []
 
 
-def test_workflow_tool_invocation_normalizes_optional_files_parameter(
-    monkeypatch: pytest.MonkeyPatch,
-    sqlite_tool_db: SqliteToolDb,
-):
+def test_workflow_tool_invocation_normalizes_optional_files_parameter(monkeypatch: pytest.MonkeyPatch):
     """Ensure casted empty FILES values do not reach workflow input validation as [None]."""
     tool = _build_tool()
     images_param = ToolParameter.get_simple_instance(
@@ -821,7 +741,7 @@ def test_workflow_tool_invocation_normalizes_optional_files_parameter(
     generate_mock = MagicMock(return_value={"data": {}})
     monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
 
-    list(tool.invoke(sqlite_tool_db.caller_session, "test_user", {"images": None}))
+    list(tool.invoke(MagicMock(), "test_user", {"images": None}))
 
     call_kwargs = generate_mock.call_args.kwargs
     assert call_kwargs["args"]["inputs"]["images"] == []

api/tests/unit_tests/events/test_update_provider_when_message_created.py

@@ -18,6 +18,7 @@ from models.provider import ProviderType
 @pytest.fixture
 def credit_pool_session_factory(sqlite_engine: Engine) -> Iterator[sessionmaker[Session]]:
     """Bind message-created accounting to fixture-owned SQLite sessions."""
+    TenantCreditPool.__table__.create(sqlite_engine)
     session_factory = sessionmaker(bind=sqlite_engine, expire_on_commit=False)
     with patch("events.event_handlers.update_provider_when_message_created.db.session", session_factory):
         yield session_factory

api/tests/unit_tests/services/plugin/test_plugin_service.py

@@ -246,26 +246,6 @@ class TestPluginModelProviderCache:
             call([cache_key]),
         ]
 
-    def test_fetch_plugin_model_providers_bypasses_redis_when_cache_disabled(self) -> None:
-        """With the cache disabled the daemon is the only source, and Redis is never touched."""
-        with patch(f"{MODULE}.redis_client") as redis_client, patch(f"{MODULE}.dify_config") as config:
-            config.PLUGIN_MODEL_PROVIDERS_CACHE_ENABLED = False
-            client = Mock()
-            client.fetch_model_providers.return_value = [_build_plugin_model_provider()]
-
-            from core.plugin.plugin_service import PluginService
-
-            first = PluginService.fetch_plugin_model_providers(tenant_id="tenant-1", client=client)
-            second = PluginService.fetch_plugin_model_providers(tenant_id="tenant-1", client=client)
-
-        assert [provider.provider for provider in first] == ["langgenius/openai/openai"]
-        assert [provider.provider for provider in second] == ["langgenius/openai/openai"]
-        assert client.fetch_model_providers.call_count == 2
-        redis_client.get.assert_not_called()
-        redis_client.mget.assert_not_called()
-        redis_client.setex.assert_not_called()
-        redis_client.lock.assert_not_called()
-
     def test_fetch_plugin_model_providers_refetches_when_cache_read_fails(self) -> None:
         """Redis read failures do not block provider discovery for the tenant."""
         with patch(f"{MODULE}.redis_client") as redis_client:
@@ -826,7 +806,105 @@ class TestPluginListEndpointCounts:
         assert tool_plugin.endpoints_active == 0
 
 
+class TestPluginCategoryList:
+    def test_list_by_category_forwards_search_and_tag_filters(self) -> None:
+        plugins = SimpleNamespace(list=[], has_more=False)
+
+        with patch(f"{MODULE}.PluginInstaller") as installer_cls:
+            installer_cls.return_value.list_plugins_by_category.return_value = plugins
+
+            from core.plugin.plugin_service import PluginService
+
+            result = PluginService.list_by_category(
+                "tenant-1",
+                PluginCategory.Tool,
+                2,
+                25,
+                query="weather",
+                tags=["search", "rag"],
+                language="zh_Hans",
+            )
+
+        assert result is plugins
+        installer_cls.return_value.list_plugins_by_category.assert_called_once_with(
+            "tenant-1",
+            PluginCategory.Tool,
+            2,
+            25,
+            query="weather",
+            tags=["search", "rag"],
+            language="zh_Hans",
+        )
+
+    def test_filtered_model_category_does_not_reconcile_from_a_partial_result(self) -> None:
+        plugins = SimpleNamespace(list=[], has_more=False)
+
+        with (
+            patch(f"{MODULE}.PluginInstaller") as installer_cls,
+            patch(f"{MODULE}.PluginService.invalidate_plugin_model_providers_cache") as invalidate_cache,
+            patch(f"{MODULE}.PluginService._store_cached_remote_model_plugin_marker") as store_marker,
+        ):
+            installer_cls.return_value.list_plugins_by_category.return_value = plugins
+
+            from core.plugin.plugin_service import PluginService
+
+            result = PluginService.list_by_category(
+                "tenant-1",
+                PluginCategory.Model,
+                1,
+                100,
+                query="openai",
+                tags=[],
+                language="en_US",
+            )
+
+        assert result is plugins
+        invalidate_cache.assert_not_called()
+        store_marker.assert_not_called()
+
+
+class TestInstalledPluginIds:
+    def test_list_installed_plugin_ids_uses_lightweight_daemon_endpoint(self) -> None:
+        with patch(f"{MODULE}.PluginInstaller") as installer_cls:
+            installer_cls.return_value.list_installed_plugin_ids.return_value = [
+                "langgenius/openai",
+                "langgenius/anthropic",
+            ]
+
+            from core.plugin.plugin_service import PluginService
+
+            result = PluginService.list_installed_plugin_ids("tenant-1", PluginCategory.Tool)
+
+        assert result == ["langgenius/openai", "langgenius/anthropic"]
+        installer_cls.return_value.list_installed_plugin_ids.assert_called_once_with("tenant-1", PluginCategory.Tool)
+
+
 class TestPluginModelProviderCacheInvalidation:
+    def test_list_model_provider_bindings_reconciles_remote_provider_cache(self) -> None:
+        """The summary binding read owns the remote marker once the full category list leaves the first-load path."""
+        remote_binding = _build_remote_model_plugin()
+        client = MagicMock()
+        client.fetch_model_provider_bindings.return_value = [remote_binding]
+        remote_plugin_marker = "langgenius/debug-model:langgenius/debug-model:1.0.0"
+
+        with (
+            patch(
+                f"{MODULE}.PluginService._should_invalidate_model_provider_cache_for_remote_model_plugins",
+                return_value=True,
+            ) as should_invalidate,
+            patch(f"{MODULE}.PluginService.invalidate_plugin_model_providers_cache") as invalidate_cache,
+            patch(f"{MODULE}.PluginService._store_cached_remote_model_plugin_marker") as store_marker,
+        ):
+            from core.plugin.plugin_service import PluginService
+
+            result = PluginService.list_model_provider_bindings("tenant-1", client=client)
+
+        assert result == [remote_binding]
+        client.fetch_model_provider_bindings.assert_called_once_with("tenant-1")
+        should_invalidate.assert_called_once_with("tenant-1", [remote_binding])
+        invalidate_cache.assert_called_once_with("tenant-1")
+        store_marker.assert_called_once_with("tenant-1", remote_plugin_marker)
+
     def test_get_debugging_key_does_not_invalidate_model_provider_cache(self) -> None:
         """Reading a debug key does not mean a debug runtime has registered a model provider."""
         with (
@@ -870,7 +948,13 @@ class TestPluginModelProviderCacheInvalidation:
 
         assert result is plugins
         installer_cls.return_value.list_plugins_by_category.assert_called_once_with(
-            "tenant-1", PluginCategory.Model, 1, 100
+            "tenant-1",
+            PluginCategory.Model,
+            1,
+            100,
+            query="",
+            tags=(),
+            language="en_US",
         )
         invalidate_cache.assert_called_once_with("tenant-1")
         store_marker.assert_called_once_with("tenant-1", remote_plugin_marker)
@@ -937,14 +1021,42 @@ class TestPluginModelProviderCacheInvalidation:
         invalidate_cache.assert_not_called()
         store_marker.assert_called_once_with("tenant-1", remote_plugin_marker)
 
-    def test_list_model_category_invalidates_when_remote_model_plugin_disconnects(self) -> None:
-        """The current model category result clears provider cache when the previous debug model disappears."""
+    @pytest.mark.parametrize(("page", "has_more"), [(1, True), (2, False)])
+    def test_list_model_category_does_not_reconcile_partial_page(self, page: int, has_more: bool) -> None:
+        """Only an unfiltered, complete first page may write the remote model marker."""
         installed_plugin = SimpleNamespace(
             plugin_id="langgenius/openai",
             plugin_unique_identifier="langgenius/openai:1.0.0",
             source=PluginInstallationSource.Marketplace,
         )
-        plugins = SimpleNamespace(list=[installed_plugin], has_more=True)
+        plugins = SimpleNamespace(list=[installed_plugin], has_more=has_more)
+
+        with (
+            patch(f"{MODULE}.PluginInstaller") as installer_cls,
+            patch(
+                f"{MODULE}.PluginService._load_cached_remote_model_plugin_marker",
+                return_value="langgenius/debug-model:langgenius/debug-model:1.0.0",
+            ),
+            patch(f"{MODULE}.PluginService.invalidate_plugin_model_providers_cache") as invalidate_cache,
+            patch(f"{MODULE}.PluginService._store_cached_remote_model_plugin_marker") as store_marker,
+        ):
+            installer_cls.return_value.list_plugins_by_category.return_value = plugins
+
+            from core.plugin.plugin_service import PluginService
+
+            result = PluginService.list_by_category("tenant-1", PluginCategory.Model, page, 100)
+
+        assert result is plugins
+        invalidate_cache.assert_not_called()
+        store_marker.assert_not_called()
+
+    def test_list_model_category_complete_first_page_reconciles_remote_plugin_disconnect(self) -> None:
+        installed_plugin = SimpleNamespace(
+            plugin_id="langgenius/openai",
+            plugin_unique_identifier="langgenius/openai:1.0.0",
+            source=PluginInstallationSource.Marketplace,
+        )
+        plugins = SimpleNamespace(list=[installed_plugin], has_more=False)
 
         with (
             patch(f"{MODULE}.PluginInstaller") as installer_cls,

api/tests/unit_tests/services/test_account_service.py

@@ -1,4 +1,5 @@
 import json
+from collections.abc import Iterator
 from datetime import datetime, timedelta
 from unittest.mock import MagicMock, patch
 from uuid import UUID
@@ -10,6 +11,7 @@ from sqlalchemy.orm import Session
 from configs import dify_config
 from models.account import (
     Account,
+    AccountIntegrate,
     AccountStatus,
     Tenant,
     TenantAccountJoin,
@@ -112,6 +114,22 @@ class TestAccountService:
     - Error conditions and edge cases
     """
 
+    @pytest.fixture
+    def sqlite_session(self, sqlite_engine) -> Iterator[Session]:
+        """SQLite session with the account/workspace tables these service tests touch."""
+        tables = [
+            model.metadata.tables[model.__tablename__]
+            for model in (
+                Account,
+                Tenant,
+                TenantAccountJoin,
+                TenantPluginAutoUpgradeStrategy,
+            )
+        ]
+        Account.metadata.create_all(sqlite_engine, tables=tables)
+        with Session(sqlite_engine, expire_on_commit=False) as session:
+            yield session
+
     @pytest.fixture
     def mock_password_dependencies(self):
         """Mock setup for password-related functions."""
@@ -1246,6 +1264,24 @@ class TestRegisterService:
     - Error conditions and edge cases
     """
 
+    @pytest.fixture
+    def sqlite_session(self, sqlite_engine) -> Iterator[Session]:
+        """SQLite session with the account/workspace tables registration flows touch."""
+        tables = [
+            model.metadata.tables[model.__tablename__]
+            for model in (
+                Account,
+                AccountIntegrate,
+                Tenant,
+                TenantAccountJoin,
+                TenantPluginAutoUpgradeStrategy,
+                DifySetup,
+            )
+        ]
+        Account.metadata.create_all(sqlite_engine, tables=tables)
+        with Session(sqlite_engine, expire_on_commit=False) as session:
+            yield session
+
     @pytest.fixture
     def mock_redis_dependencies(self):
         """Mock setup for Redis-related functions."""

api/tests/unit_tests/services/test_app_service.py

@@ -1,23 +1,19 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from datetime import datetime
 from types import SimpleNamespace
 from typing import cast
 from unittest.mock import MagicMock, patch
-from uuid import uuid4
 
 import pytest
-from sqlalchemy import event
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import Session
 
 from graphon.model_runtime.entities.model_entities import ModelType
 from models import Account
-from models.model import App, AppMode, AppModelConfig, IconType
+from models.model import App, AppMode, AppModelConfig
 from models.workflow import Workflow
 from services.agent.errors import AgentNameConflictError
-from services.app_service import AppListParams, AppService, CreateAppParams
+from services.app_service import AppService, CreateAppParams
 
 
 class TestCreateAppTransactionBoundary:
@@ -240,92 +236,6 @@ class TestOpenapiVisibilityHelpers:
         mock_session.execute.assert_called_once()
 
 
-@pytest.mark.parametrize("sqlite_session", [(Account, App, AppModelConfig)], indirect=True)
-def test_get_recent_apps_uses_one_tenant_scoped_projection_query(sqlite_session: Session) -> None:
-    tenant_id = str(uuid4())
-    other_tenant_id = str(uuid4())
-    account = Account(name="Recent Apps Author", email="recent-apps@example.com")
-    sqlite_session.add(account)
-    sqlite_session.flush()
-
-    def create_app(*, name: str, tenant_id: str, updated_at: datetime, mode: AppMode = AppMode.CHAT) -> App:
-        app = App()
-        app.id = str(uuid4())
-        app.tenant_id = tenant_id
-        app.name = name
-        app.description = ""
-        app.mode = mode
-        app.icon_type = IconType.EMOJI
-        app.icon = "🚀"
-        app.icon_background = "#FFFFFF"
-        app.enable_site = False
-        app.enable_api = False
-        app.created_by = account.id
-        app.maintainer = account.id
-        app.created_at = updated_at
-        app.updated_at = updated_at
-        app.use_icon_as_answer_icon = False
-        return app
-
-    newest = create_app(name="Newest", tenant_id=tenant_id, updated_at=datetime(2026, 7, 3))
-    legacy_agent = AppModelConfig(app_id=newest.id)
-    legacy_agent.agent_mode = '{"enabled": true, "strategy": "react"}'
-    newest.app_model_config_id = legacy_agent.id
-    second = create_app(
-        name="Second",
-        tenant_id=tenant_id,
-        updated_at=datetime(2026, 7, 2),
-        mode=AppMode.WORKFLOW,
-    )
-    second.icon_type = None
-    second.icon = None
-    second.icon_background = None
-    second.created_by = None
-    second.maintainer = None
-    channel = create_app(
-        name="Channel",
-        tenant_id=tenant_id,
-        updated_at=datetime(2026, 7, 5),
-        mode=AppMode.CHANNEL,
-    )
-    rag_pipeline = create_app(
-        name="RAG Pipeline",
-        tenant_id=tenant_id,
-        updated_at=datetime(2026, 7, 4),
-        mode=AppMode.RAG_PIPELINE,
-    )
-    oldest = create_app(name="Oldest", tenant_id=tenant_id, updated_at=datetime(2026, 7, 1))
-    foreign = create_app(name="Foreign", tenant_id=other_tenant_id, updated_at=datetime(2026, 7, 4))
-    sqlite_session.add_all([newest, legacy_agent, second, channel, rag_pipeline, oldest, foreign])
-    sqlite_session.commit()
-
-    statements: list[str] = []
-    bind = sqlite_session.get_bind()
-
-    def record_sql(_conn, _cursor, statement, _parameters, _context, _executemany) -> None:
-        statements.append(statement)
-
-    event.listen(bind, "before_cursor_execute", record_sql)
-    try:
-        recent_apps = AppService().get_recent_apps(
-            account.id,
-            tenant_id,
-            AppListParams(limit=2),
-            sqlite_session,
-        )
-    finally:
-        event.remove(bind, "before_cursor_execute", record_sql)
-
-    assert [(app.name, app.mode, app.icon_type, app.author_name, app.maintainer) for app in recent_apps] == [
-        ("Newest", AppMode.CHAT, IconType.EMOJI, "Recent Apps Author", account.id),
-        ("Second", AppMode.WORKFLOW, None, None, None),
-    ]
-    select_statements = [statement for statement in statements if statement.lstrip().upper().startswith("SELECT")]
-    assert len(select_statements) == 1
-    assert "count(" not in select_statements[0].lower()
-    assert "app_model_configs" not in select_statements[0].lower()
-
-
 class TestAppMeta:
     def test_loads_workflow_with_caller_session(self):
         session = MagicMock()

api/tests/unit_tests/services/test_model_provider_service.py

@@ -5,12 +5,15 @@ from unittest.mock import MagicMock
 import pytest
 
 from core.entities.model_entities import ModelStatus
+from core.entities.provider_entities import CredentialConfiguration
+from core.plugin.entities.plugin import PluginInstallationSource
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType, ParameterRule, ParameterType
+from graphon.model_runtime.entities.provider_entities import ConfigurateMethod
 from models.provider import ProviderType
 from services import model_provider_service as service_module
 from services.errors.app_model_config import ProviderNotFoundError
-from services.model_provider_service import ModelProviderService
+from services.model_provider_service import ModelProviderService, _ProviderSummaryState
 
 
 def _create_service_with_mocked_manager() -> tuple[ModelProviderService, MagicMock]:
@@ -96,6 +99,247 @@ class TestModelProviderServiceConfiguration:
         assert result[0].provider == "openai"
         assert result[0].custom_configuration.status.value == "no-configure"
 
+    def test_get_provider_summary_list_uses_lightweight_state_and_plugin_bindings(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        service = ModelProviderService()
+        provider = SimpleNamespace(
+            provider="langgenius/openai/openai",
+            label=I18nObject(en_US="OpenAI"),
+            description=I18nObject(en_US="OpenAI models"),
+            icon_small=I18nObject(en_US="icon.svg"),
+            icon_small_dark=I18nObject(en_US="icon-dark.svg"),
+            supported_model_types=[ModelType.LLM],
+            configurate_methods=[ConfigurateMethod.PREDEFINED_MODEL],
+        )
+        binding = SimpleNamespace(
+            provider="openai",
+            plugin_id="langgenius/openai",
+            installation_id="installation-1",
+            plugin_unique_identifier="langgenius/openai:1.2.3@checksum",
+            runtime_type="local",
+            source=PluginInstallationSource.Marketplace,
+            version="1.2.3",
+        )
+        state = _ProviderSummaryState(
+            has_custom_provider=True,
+            available_credentials=[
+                CredentialConfiguration(
+                    credential_id="credential-1",
+                    credential_name="Production",
+                ),
+                CredentialConfiguration(
+                    credential_id="credential-2",
+                    credential_name="Backup",
+                ),
+            ],
+            has_custom_models=False,
+            current_credential_id="credential-1",
+            current_credential_name="Production",
+            current_credential_usable=True,
+            preferred_provider_type=ProviderType.CUSTOM,
+        )
+        call_order: list[str] = []
+        manager_constructor = MagicMock(side_effect=AssertionError("summary must not construct ProviderManager"))
+        monkeypatch.setattr(service, "_get_provider_manager", manager_constructor)
+        monkeypatch.setattr(
+            service_module.PluginService,
+            "list_model_provider_bindings",
+            MagicMock(side_effect=lambda *_args, **_kwargs: call_order.append("bindings") or [binding]),
+        )
+        monkeypatch.setattr(
+            service_module.PluginService,
+            "fetch_plugin_model_providers",
+            MagicMock(side_effect=lambda *_args, **_kwargs: call_order.append("providers") or [provider]),
+        )
+        monkeypatch.setattr(
+            service,
+            "_load_provider_summary_states",
+            MagicMock(return_value={provider.provider: state}),
+        )
+        monkeypatch.setattr(service, "_is_system_provider_enabled", MagicMock(return_value=False))
+
+        providers, plugins = service.get_provider_summary_list(tenant_id="tenant-1")
+
+        assert len(providers) == 1
+        assert providers[0].provider == provider.provider
+        assert providers[0].plugin_id == "langgenius/openai"
+        assert providers[0].is_configured is True
+        assert providers[0].custom_configuration.available_credentials == [
+            CredentialConfiguration(
+                credential_id="credential-1",
+                credential_name="Production",
+            ),
+            CredentialConfiguration(
+                credential_id="credential-2",
+                credential_name="Backup",
+            ),
+        ]
+        assert providers[0].custom_configuration.current_credential_name == "Production"
+        assert providers[0].custom_configuration.current_credential_usable is True
+        assert providers[0].system_configuration.enabled is False
+        assert plugins["langgenius/openai"].installation_id == "installation-1"
+        assert plugins["langgenius/openai"].version == "1.2.3"
+        assert call_order == ["bindings", "providers"]
+        manager_constructor.assert_not_called()
+
+    def test_get_provider_summary_list_returns_all_unique_provider_metadata(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        service = ModelProviderService()
+        llm_provider = SimpleNamespace(
+            provider="langgenius/openai/openai",
+            label=I18nObject(en_US="OpenAI"),
+            description=None,
+            icon_small=None,
+            icon_small_dark=None,
+            supported_model_types=[ModelType.LLM],
+            configurate_methods=[],
+        )
+        embedding_provider = SimpleNamespace(
+            provider="langgenius/embedding/embedding",
+            label=I18nObject(en_US="Embedding"),
+            description=None,
+            icon_small=None,
+            icon_small_dark=None,
+            supported_model_types=[ModelType.TEXT_EMBEDDING],
+            configurate_methods=[],
+        )
+        llm_binding = SimpleNamespace(
+            provider="openai",
+            plugin_id="langgenius/openai",
+            installation_id="installation-openai",
+            plugin_unique_identifier="langgenius/openai:1.0.0@checksum",
+            runtime_type="local",
+            source=service_module.PluginInstallationSource.Marketplace,
+            version="1.0.0",
+        )
+        embedding_binding = SimpleNamespace(
+            provider="embedding",
+            plugin_id="langgenius/embedding",
+            installation_id="installation-embedding",
+            plugin_unique_identifier="langgenius/embedding:1.0.0@checksum",
+            runtime_type="local",
+            source=service_module.PluginInstallationSource.Marketplace,
+            version="1.0.0",
+        )
+        monkeypatch.setattr(
+            service_module.PluginService,
+            "list_model_provider_bindings",
+            MagicMock(return_value=[llm_binding, embedding_binding]),
+        )
+        monkeypatch.setattr(
+            service_module.PluginService,
+            "fetch_plugin_model_providers",
+            MagicMock(return_value=[llm_provider, llm_provider, embedding_provider]),
+        )
+        monkeypatch.setattr(service, "_load_provider_summary_states", MagicMock(return_value={}))
+        monkeypatch.setattr(service, "_is_system_provider_enabled", MagicMock(return_value=False))
+        monkeypatch.setattr(service_module, "is_filtered", MagicMock(return_value=False))
+
+        providers, plugins = service.get_provider_summary_list(tenant_id="tenant-1")
+
+        assert [provider.provider for provider in providers] == [
+            "langgenius/openai/openai",
+            "langgenius/embedding/embedding",
+        ]
+        assert providers[0].is_configured is False
+        assert providers[0].custom_configuration.status.value == "no-configure"
+        assert providers[0].custom_configuration.available_credentials == []
+        assert set(plugins) == {"langgenius/openai", "langgenius/embedding"}
+
+    def test_preferred_provider_fallback_uses_custom_presence_not_configuration_status(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setattr(service_module.dify_config, "EDITION", "SELF_HOSTED")
+        state = _ProviderSummaryState(has_custom_provider=True)
+
+        preferred_provider_type = ModelProviderService._get_preferred_provider_type(
+            state,
+            custom_present=True,
+            system_enabled=True,
+        )
+
+        assert preferred_provider_type == ProviderType.CUSTOM
+
+    def test_load_provider_summary_states_reads_only_lightweight_columns(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        canonical_provider = "langgenius/openai/openai"
+        session = MagicMock()
+        session.execute.side_effect = [
+            SimpleNamespace(
+                all=lambda: [
+                    SimpleNamespace(
+                        provider_name="openai",
+                        credential_id="credential-legacy",
+                        credential_provider_name="openai",
+                        credential_name="Legacy",
+                    ),
+                    SimpleNamespace(
+                        provider_name=canonical_provider,
+                        credential_id="credential-current",
+                        credential_provider_name=canonical_provider,
+                        credential_name="Production",
+                    ),
+                ]
+            ),
+            SimpleNamespace(
+                all=lambda: [
+                    SimpleNamespace(
+                        id="credential-legacy",
+                        provider_name="openai",
+                        credential_name="Legacy",
+                    ),
+                    SimpleNamespace(
+                        id="credential-current",
+                        provider_name=canonical_provider,
+                        credential_name="Production",
+                    ),
+                ]
+            ),
+            SimpleNamespace(all=lambda: [SimpleNamespace(provider_name="openai")]),
+            SimpleNamespace(
+                all=lambda: [
+                    SimpleNamespace(
+                        provider_name=canonical_provider,
+                        preferred_provider_type=ProviderType.SYSTEM,
+                    )
+                ]
+            ),
+        ]
+        session_context = MagicMock()
+        session_context.__enter__.return_value = session
+        create_session = MagicMock(return_value=session_context)
+        monkeypatch.setattr(service_module.session_factory, "create_session", create_session)
+
+        states = ModelProviderService._load_provider_summary_states("tenant-1")
+
+        state = states[canonical_provider]
+        assert state.has_custom_provider is True
+        assert state.available_credentials == [
+            CredentialConfiguration(
+                credential_id="credential-legacy",
+                credential_name="Legacy",
+            ),
+            CredentialConfiguration(
+                credential_id="credential-current",
+                credential_name="Production",
+            ),
+        ]
+        assert state.has_custom_models is True
+        assert state.current_credential_id == "credential-current"
+        assert state.current_credential_name == "Production"
+        assert state.current_credential_usable is True
+        assert state.preferred_provider_type == ProviderType.SYSTEM
+
+        statements = [str(execute_call.args[0]) for execute_call in session.execute.call_args_list]
+        assert len(statements) == 4
+        assert all("encrypted_config" not in statement for statement in statements)
+        assert "count(" not in statements[1].lower()
+        assert "provider_credentials.id" in statements[1]
+        assert "provider_credentials.credential_name" in statements[1]
+        assert "ORDER BY provider_credentials.created_at DESC, provider_credentials.id DESC" in statements[1]
+        assert "provider_model_credentials" in statements[2]
+
     def test_get_models_by_provider_should_wrap_model_entities_with_tenant_context(self) -> None:
         service, manager = _create_service_with_mocked_manager()
 

api/tests/unit_tests/services/test_workflow_run_service.py

@@ -1,16 +1,11 @@
-"""Workflow-run service tests with real SQLite-bound session factories."""
-
-from decimal import Decimal
 from types import SimpleNamespace
 from typing import Any, cast
 from unittest.mock import MagicMock
 
 import pytest
-from sqlalchemy import Engine, event
-from sqlalchemy.orm import Session, sessionmaker
+from sqlalchemy import Engine
 
-from models import Account, App, EndUser, Message, WorkflowRunTriggeredFrom
-from models.enums import ConversationFromSource
+from models import Account, App, EndUser, WorkflowRunTriggeredFrom
 from services import workflow_run_service as service_module
 from services.workflow_run_service import WorkflowRunService
 
@@ -27,11 +22,6 @@ def repository_factory_mocks(monkeypatch: pytest.MonkeyPatch) -> tuple[MagicMock
     return node_repo, workflow_run_repo, factory
 
 
-@pytest.fixture
-def sqlalchemy_session_factory(sqlite_engine: Engine) -> sessionmaker[Session]:
-    return sessionmaker(bind=sqlite_engine, expire_on_commit=False)
-
-
 def _app_model(**kwargs: Any) -> App:
     return cast(App, SimpleNamespace(**kwargs))
 
@@ -44,22 +34,13 @@ def _end_user(**kwargs: Any) -> EndUser:
     return cast(EndUser, SimpleNamespace(**kwargs))
 
 
-def _message(*, message_id: str, workflow_run_id: str, conversation_id: str) -> Message:
-    message = Message(
-        app_id="app-1",
-        conversation_id=conversation_id,
-        query="query",
-        message={"role": "user", "content": "query"},
-        answer="answer",
-        message_unit_price=Decimal("0.0001"),
-        answer_unit_price=Decimal("0.0001"),
-        currency="USD",
-        from_source=ConversationFromSource.API,
-    )
-    message.id = message_id
-    message._inputs = {}
-    message.workflow_run_id = workflow_run_id
-    return message
+def _fake_session_factory_returning_messages(messages: list[Any]) -> tuple[MagicMock, MagicMock]:
+    """Build a session factory whose session returns the given messages."""
+    session = MagicMock()
+    session.scalars.return_value.all.return_value = messages
+    session_factory = MagicMock()
+    session_factory.return_value.__enter__.return_value = session
+    return session_factory, session
 
 
 class TestWorkflowRunServiceInitialization:
@@ -67,51 +48,59 @@ class TestWorkflowRunServiceInitialization:
         self,
         monkeypatch: pytest.MonkeyPatch,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
-        sqlite_engine: Engine,
     ) -> None:
-        monkeypatch.setattr(service_module, "db", SimpleNamespace(engine=sqlite_engine))
+        session_factory = MagicMock(name="session_factory")
+        sessionmaker_mock = MagicMock(return_value=session_factory)
+        monkeypatch.setattr(service_module, "sessionmaker", sessionmaker_mock)
+        monkeypatch.setattr(service_module, "db", SimpleNamespace(engine="db-engine"))
 
         service = WorkflowRunService()
 
-        assert isinstance(service._session_factory, sessionmaker)
-        assert service._session_factory.kw["bind"] is sqlite_engine
-        assert service._session_factory.kw["expire_on_commit"] is False
+        sessionmaker_mock.assert_called_once_with(bind="db-engine", expire_on_commit=False)
+        assert service._session_factory is session_factory
 
     def test___init___should_create_sessionmaker_when_engine_is_provided(
         self,
+        monkeypatch: pytest.MonkeyPatch,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
-        sqlite_engine: Engine,
     ) -> None:
-        service = WorkflowRunService(session_factory=sqlite_engine)
+        class FakeEngine:
+            pass
 
-        assert isinstance(service._session_factory, sessionmaker)
-        assert service._session_factory.kw["bind"] is sqlite_engine
-        assert service._session_factory.kw["expire_on_commit"] is False
+        session_factory = MagicMock(name="session_factory")
+        sessionmaker_mock = MagicMock(return_value=session_factory)
+        monkeypatch.setattr(service_module, "Engine", FakeEngine)
+        monkeypatch.setattr(service_module, "sessionmaker", sessionmaker_mock)
+        engine = cast(Engine, FakeEngine())
+
+        service = WorkflowRunService(session_factory=engine)
+
+        sessionmaker_mock.assert_called_once_with(bind=engine, expire_on_commit=False)
+        assert service._session_factory is session_factory
 
     def test___init___should_keep_provided_sessionmaker_and_create_repositories(
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
         node_repo, workflow_run_repo, factory = repository_factory_mocks
+        session_factory = MagicMock(name="session_factory")
 
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=session_factory)
 
-        assert service._session_factory is sqlalchemy_session_factory
+        assert service._session_factory is session_factory
         assert service._node_execution_service_repo is node_repo
         assert service._workflow_run_repo is workflow_run_repo
-        factory.create_api_workflow_node_execution_repository.assert_called_once_with(sqlalchemy_session_factory)
-        factory.create_api_workflow_run_repository.assert_called_once_with(sqlalchemy_session_factory)
+        factory.create_api_workflow_node_execution_repository.assert_called_once_with(session_factory)
+        factory.create_api_workflow_run_repository.assert_called_once_with(session_factory)
 
 
 class TestWorkflowRunServiceQueries:
     def test_get_paginate_workflow_runs_should_forward_filters_and_parse_limit(
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
         _, workflow_run_repo, _ = repository_factory_mocks
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         app_model = _app_model(tenant_id="tenant-1", id="app-1")
         expected = MagicMock(name="pagination")
         workflow_run_repo.get_paginated_workflow_runs.return_value = expected
@@ -133,24 +122,20 @@ class TestWorkflowRunServiceQueries:
             status="succeeded",
         )
 
-    @pytest.mark.parametrize("sqlite_session", [(Message,)], indirect=True)
     def test_get_paginate_advanced_chat_workflow_runs_should_attach_message_fields_when_message_exists(
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
         monkeypatch: pytest.MonkeyPatch,
-        sqlalchemy_session_factory: sessionmaker[Session],
-        sqlite_session: Session,
     ) -> None:
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        message = SimpleNamespace(id="msg-1", conversation_id="conv-1", workflow_run_id="run-1")
+        session_factory, session = _fake_session_factory_returning_messages([message])
+        service = WorkflowRunService(session_factory=session_factory)
         app_model = _app_model(tenant_id="tenant-1", id="app-1")
         run_with_message = SimpleNamespace(id="run-1", status="running")
         run_without_message = SimpleNamespace(id="run-2", status="succeeded")
         pagination = SimpleNamespace(data=[run_with_message, run_without_message])
         monkeypatch.setattr(service, "get_paginate_workflow_runs", MagicMock(return_value=pagination))
 
-        sqlite_session.add(_message(message_id="msg-1", conversation_id="conv-1", workflow_run_id="run-1"))
-        sqlite_session.commit()
-
         result = service.get_paginate_advanced_chat_workflow_runs(app_model=app_model, args={"limit": "2"})
 
         assert result is pagination
@@ -160,49 +145,39 @@ class TestWorkflowRunServiceQueries:
         assert result.data[0].status == "running"
         assert not hasattr(result.data[1], "message_id")
         assert result.data[1].id == "run-2"
+        # Messages are batch-loaded in a single query, not one per run.
+        session_factory.assert_called_once_with()
+        session.scalars.assert_called_once()
 
-    @pytest.mark.parametrize("sqlite_session", [(Message,)], indirect=True)
     def test_get_paginate_advanced_chat_workflow_runs_batch_loads_messages_without_n_plus_one(
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
         monkeypatch: pytest.MonkeyPatch,
-        sqlalchemy_session_factory: sessionmaker[Session],
-        sqlite_session: Session,
     ) -> None:
         """Messages must load with a constant query count regardless of run count.
 
         Previously the deprecated WorkflowRun.message property issued one query per
         run (N+1); they are now batch-loaded in a single query.
         """
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        session_factory, session = _fake_session_factory_returning_messages([])
+        service = WorkflowRunService(session_factory=session_factory)
         app_model = _app_model(tenant_id="tenant-1", id="app-1")
         runs = [SimpleNamespace(id=f"run-{i}", status="succeeded") for i in range(5)]
         pagination = SimpleNamespace(data=runs)
         monkeypatch.setattr(service, "get_paginate_workflow_runs", MagicMock(return_value=pagination))
 
-        message_query_count = 0
+        service.get_paginate_advanced_chat_workflow_runs(app_model=app_model, args={})
 
-        def count_message_query(*_args: object) -> None:
-            nonlocal message_query_count
-            message_query_count += 1
-
-        engine = sqlite_session.get_bind()
-        event.listen(engine, "before_cursor_execute", count_message_query)
-        try:
-            service.get_paginate_advanced_chat_workflow_runs(app_model=app_model, args={})
-        finally:
-            event.remove(engine, "before_cursor_execute", count_message_query)
-
-        assert all(not hasattr(run, "message_id") for run in runs)
-        assert message_query_count == 1
+        # Exactly one message query for the whole page, independent of run count.
+        session_factory.assert_called_once_with()
+        assert session.scalars.call_count == 1
 
     def test_get_workflow_run_should_delegate_to_repository_by_tenant_and_app(
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
         _, workflow_run_repo, _ = repository_factory_mocks
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         app_model = _app_model(tenant_id="tenant-1", id="app-1")
         expected = MagicMock(name="workflow_run")
         workflow_run_repo.get_workflow_run_by_id.return_value = expected
@@ -219,10 +194,9 @@ class TestWorkflowRunServiceQueries:
     def test_get_workflow_runs_count_should_forward_optional_filters(
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
         _, workflow_run_repo, _ = repository_factory_mocks
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         app_model = _app_model(tenant_id="tenant-1", id="app-1")
         expected = {"total": 3, "succeeded": 2}
         workflow_run_repo.get_workflow_runs_count.return_value = expected
@@ -247,9 +221,8 @@ class TestWorkflowRunServiceQueries:
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
         monkeypatch: pytest.MonkeyPatch,
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         monkeypatch.setattr(service, "get_workflow_run", MagicMock(return_value=None))
         app_model = _app_model(id="app-1")
         user = _account(current_tenant_id="tenant-1")
@@ -262,10 +235,9 @@ class TestWorkflowRunServiceQueries:
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
         monkeypatch: pytest.MonkeyPatch,
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
         node_repo, _, _ = repository_factory_mocks
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         monkeypatch.setattr(service, "get_workflow_run", MagicMock(return_value=SimpleNamespace(id="run-1")))
 
         class FakeEndUser:
@@ -295,10 +267,9 @@ class TestWorkflowRunServiceQueries:
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
         monkeypatch: pytest.MonkeyPatch,
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
         node_repo, _, _ = repository_factory_mocks
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         monkeypatch.setattr(service, "get_workflow_run", MagicMock(return_value=SimpleNamespace(id="run-1")))
         app_model = _app_model(id="app-1")
         user = _account(current_tenant_id="tenant-account")
@@ -322,9 +293,8 @@ class TestWorkflowRunServiceQueries:
         self,
         repository_factory_mocks: tuple[MagicMock, MagicMock, Any],
         monkeypatch: pytest.MonkeyPatch,
-        sqlalchemy_session_factory: sessionmaker[Session],
     ) -> None:
-        service = WorkflowRunService(session_factory=sqlalchemy_session_factory)
+        service = WorkflowRunService(session_factory=MagicMock(name="session_factory"))
         monkeypatch.setattr(service, "get_workflow_run", MagicMock(return_value=SimpleNamespace(id="run-1")))
         app_model = _app_model(id="app-1")
         user = _account(current_tenant_id=None)

api/tests/unit_tests/services/workflow/test_draft_var_loader_simple.py

@@ -1,73 +1,32 @@
 """Simplified unit tests for DraftVarLoader focusing on core functionality."""
 
 import json
-from datetime import datetime
 from unittest.mock import Mock, patch
 
 import pytest
 from sqlalchemy import Engine
-from sqlalchemy.orm import Session
 
 from core.workflow.file_reference import build_file_reference
-from extensions.storage.storage_type import StorageType
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.variables.segments import ObjectSegment, StringSegment
 from graphon.variables.types import SegmentType
-from models.enums import CreatorUserRole
 from models.model import UploadFile
 from models.workflow import WorkflowDraftVariable, WorkflowDraftVariableFile
 from services.workflow_draft_variable_service import DraftVarLoader
 
 
-def _persist_offloaded_variable(
-    sqlite_session: Session,
-    *,
-    node_id: str,
-    name: str,
-) -> WorkflowDraftVariable:
-    upload_file = UploadFile(
-        tenant_id="test-tenant-id",
-        storage_type=StorageType.LOCAL,
-        key=f"storage/key/{name}.txt",
-        name=f"{name}.txt",
-        size=10,
-        extension=".txt",
-        mime_type="text/plain",
-        created_by_role=CreatorUserRole.ACCOUNT,
-        created_by="test-user-id",
-        created_at=datetime(2025, 1, 1),
-        used=True,
-    )
-    variable_file = WorkflowDraftVariableFile(
-        tenant_id="test-tenant-id",
-        app_id="test-app-id",
-        user_id="test-user-id",
-        upload_file_id=upload_file.id,
-        size=10,
-        length=None,
-        value_type=SegmentType.STRING,
-    )
-    draft_variable = WorkflowDraftVariable.new_node_variable(
-        app_id="test-app-id",
-        user_id="test-user-id",
-        node_id=node_id,
-        name=name,
-        value=StringSegment(value="truncated"),
-        node_execution_id=f"execution-{node_id}",
-        file_id=variable_file.id,
-    )
-    sqlite_session.add_all([upload_file, variable_file, draft_variable])
-    return draft_variable
-
-
 class TestDraftVarLoaderSimple:
     """Simplified unit tests for DraftVarLoader core methods."""
 
     @pytest.fixture
-    def draft_var_loader(self, sqlite_engine: Engine):
+    def mock_engine(self) -> Engine:
+        return Mock(spec=Engine)
+
+    @pytest.fixture
+    def draft_var_loader(self, mock_engine):
         """Create DraftVarLoader instance for testing."""
         return DraftVarLoader(
-            engine=sqlite_engine,
+            engine=mock_engine,
             app_id="test-app-id",
             tenant_id="test-tenant-id",
             user_id="test-user-id",
@@ -246,109 +205,131 @@ class TestDraftVarLoaderSimple:
         assert variable.value == rebuilt_file
         rebuild_file.assert_called_once_with(file_mapping=raw_file, tenant_id="tenant-1")
 
-    @pytest.mark.parametrize(
-        "sqlite_session",
-        [(WorkflowDraftVariable, WorkflowDraftVariableFile, UploadFile)],
-        indirect=True,
-    )
-    def test_load_variables_with_offloaded_variables_unit(
-        self,
-        draft_var_loader: DraftVarLoader,
-        sqlite_session: Session,
-    ):
+    def test_load_variables_with_offloaded_variables_unit(self, draft_var_loader):
         """Test load_variables method with mix of regular and offloaded variables."""
         selectors = [["node1", "regular_var"], ["node2", "offloaded_var"]]
-        regular_draft_var = WorkflowDraftVariable.new_node_variable(
-            app_id="test-app-id",
-            user_id="test-user-id",
-            node_id="node1",
-            name="regular_var",
-            value=StringSegment(value="regular_value"),
-            node_execution_id="execution-node1",
-        )
+
+        # Mock regular variable
+        regular_draft_var = Mock(spec=WorkflowDraftVariable)
+        regular_draft_var.is_truncated.return_value = False
+        regular_draft_var.node_id = "node1"
+        regular_draft_var.name = "regular_var"
+        regular_draft_var.get_value.return_value = StringSegment(value="regular_value")
+        regular_draft_var.get_selector.return_value = ["node1", "regular_var"]
+        regular_draft_var.id = "regular-var-id"
         regular_draft_var.description = "regular description"
-        offloaded_draft_var = _persist_offloaded_variable(
-            sqlite_session,
-            node_id="node2",
-            name="offloaded_var",
-        )
-        distractor = WorkflowDraftVariable.new_node_variable(
-            app_id="test-app-id",
-            user_id="another-user",
-            node_id="node1",
-            name="regular_var",
-            value=StringSegment(value="wrong user"),
-            node_execution_id="execution-distractor",
-        )
-        sqlite_session.add_all([regular_draft_var, distractor])
-        sqlite_session.commit()
 
-        offloaded_variable = Mock()
-        offloaded_variable.id = offloaded_draft_var.id
-        offloaded_variable.selector = ["node2", "offloaded_var"]
+        # Mock offloaded variable
+        upload_file = Mock(spec=UploadFile)
+        upload_file.key = "storage/key/offloaded.txt"
 
-        with (
-            patch("services.workflow_draft_variable_service.StorageKeyLoader"),
-            patch.object(
-                draft_var_loader,
-                "_load_offloaded_variable",
-                return_value=(("node2", "offloaded_var"), offloaded_variable),
-            ) as load_offloaded,
-            patch("services.workflow_draft_variable_service.ThreadPoolExecutor") as executor_cls,
-        ):
-            executor = executor_cls.return_value.__enter__.return_value
-            executor.map.side_effect = lambda function, values: [function(value) for value in values]
+        variable_file = Mock(spec=WorkflowDraftVariableFile)
+        variable_file.value_type = SegmentType.STRING
+        variable_file.upload_file = upload_file
 
-            result = draft_var_loader.load_variables(selectors)
+        offloaded_draft_var = Mock(spec=WorkflowDraftVariable)
+        offloaded_draft_var.is_truncated.return_value = True
+        offloaded_draft_var.node_id = "node2"
+        offloaded_draft_var.name = "offloaded_var"
+        offloaded_draft_var.get_selector.return_value = ["node2", "offloaded_var"]
+        offloaded_draft_var.variable_file = variable_file
+        offloaded_draft_var.id = "offloaded-var-id"
+        offloaded_draft_var.description = "offloaded description"
 
-        assert {variable.id for variable in result} == {regular_draft_var.id, offloaded_draft_var.id}
-        load_offloaded.assert_called_once()
-        loaded_offloaded = load_offloaded.call_args.args[0]
-        assert isinstance(loaded_offloaded, WorkflowDraftVariable)
-        assert loaded_offloaded.id == offloaded_draft_var.id
-        assert loaded_offloaded.variable_file is not None
-        assert loaded_offloaded.variable_file.upload_file is not None
-        assert loaded_offloaded.variable_file.upload_file.key == "storage/key/offloaded_var.txt"
+        draft_vars = [regular_draft_var, offloaded_draft_var]
 
-    @pytest.mark.parametrize(
-        "sqlite_session",
-        [(WorkflowDraftVariable, WorkflowDraftVariableFile, UploadFile)],
-        indirect=True,
-    )
-    def test_load_variables_all_offloaded_variables_unit(
-        self,
-        draft_var_loader: DraftVarLoader,
-        sqlite_session: Session,
-    ):
+        with patch("services.workflow_draft_variable_service.Session") as mock_session_cls:
+            mock_session = Mock()
+            mock_session_cls.return_value.__enter__.return_value = mock_session
+
+            mock_service = Mock()
+            mock_service.get_draft_variables_by_selectors.return_value = draft_vars
+
+            with patch(
+                "services.workflow_draft_variable_service.WorkflowDraftVariableService", return_value=mock_service
+            ):
+                with patch("services.workflow_draft_variable_service.StorageKeyLoader"):
+                    with patch("factories.variable_factory.segment_to_variable") as mock_segment_to_variable:
+                        # Mock regular variable creation
+                        regular_variable = Mock()
+                        regular_variable.selector = ["node1", "regular_var"]
+
+                        # Mock offloaded variable creation
+                        offloaded_variable = Mock()
+                        offloaded_variable.selector = ["node2", "offloaded_var"]
+
+                        mock_segment_to_variable.return_value = regular_variable
+
+                        with patch("services.workflow_draft_variable_service.storage") as mock_storage:
+                            mock_storage.load.return_value = b"offloaded_content"
+
+                            with patch.object(draft_var_loader, "_load_offloaded_variable") as mock_load_offloaded:
+                                mock_load_offloaded.return_value = (("node2", "offloaded_var"), offloaded_variable)
+
+                                with patch("concurrent.futures.ThreadPoolExecutor") as mock_executor_cls:
+                                    mock_executor = Mock()
+                                    mock_executor_cls.return_value.__enter__.return_value = mock_executor
+                                    mock_executor.map.return_value = [(("node2", "offloaded_var"), offloaded_variable)]
+
+                                    # Execute the method
+                                    result = draft_var_loader.load_variables(selectors)
+
+                                    # Verify results
+                                    assert len(result) == 2
+
+                                    # Verify service method was called
+                                    mock_service.get_draft_variables_by_selectors.assert_called_once_with(
+                                        draft_var_loader._app_id,
+                                        selectors,
+                                        user_id=draft_var_loader._user_id,
+                                    )
+
+                                    # Verify offloaded variable loading was called
+                                    mock_load_offloaded.assert_called_once_with(offloaded_draft_var)
+
+    def test_load_variables_all_offloaded_variables_unit(self, draft_var_loader):
         """Test load_variables method with only offloaded variables."""
         selectors = [["node1", "offloaded_var1"], ["node2", "offloaded_var2"]]
-        offloaded_var1 = _persist_offloaded_variable(
-            sqlite_session,
-            node_id="node1",
-            name="offloaded_var1",
-        )
-        offloaded_var2 = _persist_offloaded_variable(
-            sqlite_session,
-            node_id="node2",
-            name="offloaded_var2",
-        )
-        sqlite_session.commit()
 
-        with (
-            patch("services.workflow_draft_variable_service.StorageKeyLoader"),
-            patch("services.workflow_draft_variable_service.ThreadPoolExecutor") as executor_cls,
-        ):
-            executor = executor_cls.return_value.__enter__.return_value
-            executor.map.return_value = [
-                (("node1", "offloaded_var1"), Mock()),
-                (("node2", "offloaded_var2"), Mock()),
-            ]
+        # Mock first offloaded variable
+        offloaded_var1 = Mock(spec=WorkflowDraftVariable)
+        offloaded_var1.is_truncated.return_value = True
+        offloaded_var1.node_id = "node1"
+        offloaded_var1.name = "offloaded_var1"
 
-            result = draft_var_loader.load_variables(selectors)
+        # Mock second offloaded variable
+        offloaded_var2 = Mock(spec=WorkflowDraftVariable)
+        offloaded_var2.is_truncated.return_value = True
+        offloaded_var2.node_id = "node2"
+        offloaded_var2.name = "offloaded_var2"
 
-        assert len(result) == 2
-        executor_cls.assert_called_once_with(max_workers=10)
-        executor.map.assert_called_once()
-        loaded_draft_vars = executor.map.call_args.args[1]
-        assert {variable.id for variable in loaded_draft_vars} == {offloaded_var1.id, offloaded_var2.id}
-        assert all(variable.variable_file.upload_file is not None for variable in loaded_draft_vars)
+        draft_vars = [offloaded_var1, offloaded_var2]
+
+        with patch("services.workflow_draft_variable_service.Session") as mock_session_cls:
+            mock_session = Mock()
+            mock_session_cls.return_value.__enter__.return_value = mock_session
+
+            mock_service = Mock()
+            mock_service.get_draft_variables_by_selectors.return_value = draft_vars
+
+            with patch(
+                "services.workflow_draft_variable_service.WorkflowDraftVariableService", return_value=mock_service
+            ):
+                with patch("services.workflow_draft_variable_service.StorageKeyLoader"):
+                    with patch("services.workflow_draft_variable_service.ThreadPoolExecutor") as mock_executor_cls:
+                        mock_executor = Mock()
+                        mock_executor_cls.return_value.__enter__.return_value = mock_executor
+                        mock_executor.map.return_value = [
+                            (("node1", "offloaded_var1"), Mock()),
+                            (("node2", "offloaded_var2"), Mock()),
+                        ]
+
+                        # Execute the method
+                        result = draft_var_loader.load_variables(selectors)
+
+                        # Verify results - since we have only offloaded variables, should have 2 results
+                        assert len(result) == 2
+
+                        # Verify ThreadPoolExecutor was used
+                        mock_executor_cls.assert_called_once_with(max_workers=10)
+                        mock_executor.map.assert_called_once()

api/tests/unit_tests/test_app_factory.py

@@ -1,314 +0,0 @@
-"""Enterprise license gating performed by the global ``before_request`` hook."""
-
-from unittest.mock import patch
-
-import pytest
-from flask import Blueprint, Flask
-from flask_restx import Resource
-
-from app_factory import create_flask_app_with_configs
-from libs.external_api import ExternalApi
-from services.feature_service import LicenseStatus
-
-INVALID_STATUSES = [LicenseStatus.INACTIVE, LicenseStatus.EXPIRED, LicenseStatus.LOST]
-VALID_STATUSES = [LicenseStatus.ACTIVE, LicenseStatus.EXPIRING]
-
-
-def _license(status: LicenseStatus | None):
-    return patch("app_factory.EnterpriseService.get_cached_license_status", return_value=status)
-
-
-def _enterprise(enabled: bool = True):
-    return patch("app_factory.dify_config.ENTERPRISE_ENABLED", enabled)
-
-
-@pytest.fixture
-def gated_app() -> Flask:
-    app = create_flask_app_with_configs()
-
-    @app.route("/v1/chat-messages", methods=["POST"])
-    def service_api_route():
-        return {"surface": "service_api"}
-
-    @app.route("/v1/")
-    def service_api_index_route():
-        return {"surface": "service_api_index"}
-
-    @app.route("/mcp/server/<server_code>/mcp", methods=["POST"])
-    def mcp_route(server_code: str):
-        return {"surface": "mcp"}
-
-    @app.route("/triggers/webhook/<webhook_id>", methods=["POST"])
-    def trigger_route(webhook_id: str):
-        return {"surface": "triggers"}
-
-    @app.route("/console/api/apps")
-    def console_route():
-        return {"surface": "console"}
-
-    @app.route("/console/api/login", methods=["POST"])
-    def console_bootstrap_route():
-        return {"surface": "console_bootstrap"}
-
-    @app.route("/api/messages")
-    def webapp_route():
-        return {"surface": "webapp"}
-
-    @app.route("/api/system-features")
-    def webapp_bootstrap_route():
-        return {"surface": "webapp_bootstrap"}
-
-    @app.route("/health")
-    def health_route():
-        return {"surface": "health"}
-
-    @app.route("/inner/api/rbac/check-access", methods=["POST"])
-    def inner_api_route():
-        return {"surface": "inner_api"}
-
-    @app.route("/files/upload/for-plugin", methods=["POST"])
-    def files_route():
-        return {"surface": "files"}
-
-    return app
-
-
-class TestServiceApiLicenseGate:
-    """/v1 is a bearer-token surface, so it is gated with an opaque 403."""
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_blocks_when_license_invalid(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 403
-
-    def test_block_response_carries_machine_readable_marker(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert b"license_required" in response.data
-
-    def test_block_response_does_not_leak_license_status(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert b"expired" not in response.data.lower()
-
-    def test_blocks_when_license_status_unavailable(self, gated_app: Flask):
-        with _enterprise(), _license(None):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 403
-
-    def test_blocks_when_license_lookup_raises(self, gated_app: Flask):
-        lookup_failed = patch(
-            "app_factory.EnterpriseService.get_cached_license_status",
-            side_effect=RuntimeError("enterprise api unreachable"),
-        )
-        with _enterprise(), lookup_failed:
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 403
-
-    def test_blocks_index_route(self, gated_app: Flask):
-        """/v1 has no sign-in page to bootstrap, so nothing on it is exempt."""
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().get("/v1/")
-
-        assert response.status_code == 403
-
-    @pytest.mark.parametrize("status", VALID_STATUSES)
-    def test_allows_when_license_valid(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 200
-
-    def test_allows_unclassified_status(self, gated_app: Flask):
-        """LicenseStatus.NONE is not in the blocked set — parity with console/webapp."""
-        with _enterprise(), _license(LicenseStatus.NONE):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 200
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_does_not_gate_community_edition(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(False), _license(status):
-            response = gated_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 200
-
-
-class TestMcpLicenseGate:
-    """/mcp invokes apps for external MCP clients, so it is gated like the Service API."""
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_blocks_when_license_invalid(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().post("/mcp/server/srv-code/mcp")
-
-        assert response.status_code == 403
-
-    def test_block_response_carries_machine_readable_marker(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/mcp/server/srv-code/mcp")
-
-        assert b"license_required" in response.data
-
-    @pytest.mark.parametrize("status", VALID_STATUSES)
-    def test_allows_when_license_valid(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().post("/mcp/server/srv-code/mcp")
-
-        assert response.status_code == 200
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_does_not_gate_community_edition(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(False), _license(status):
-            response = gated_app.test_client().post("/mcp/server/srv-code/mcp")
-
-        assert response.status_code == 200
-
-
-class TestTriggerLicenseGate:
-    """Inbound webhooks are refused so senders retry, rather than dropping events."""
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_blocks_when_license_invalid(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().post("/triggers/webhook/hook-id")
-
-        assert response.status_code == 503
-
-    def test_block_response_carries_machine_readable_marker(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/triggers/webhook/hook-id")
-
-        assert b"license_required" in response.data
-
-    @pytest.mark.parametrize("status", VALID_STATUSES)
-    def test_allows_when_license_valid(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().post("/triggers/webhook/hook-id")
-
-        assert response.status_code == 200
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_does_not_gate_community_edition(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(False), _license(status):
-            response = gated_app.test_client().post("/triggers/webhook/hook-id")
-
-        assert response.status_code == 200
-
-
-class TestGateThroughRealErrorHandlers:
-    """Gate errors must survive each blueprint's error handling: flask-restx vs plain Flask."""
-
-    @pytest.fixture
-    def wired_app(self) -> Flask:
-        app = create_flask_app_with_configs()
-
-        service_api_bp = Blueprint("service_api_test", __name__, url_prefix="/v1")
-        api = ExternalApi(service_api_bp)
-
-        @api.route("/chat-messages")
-        class ChatMessages(Resource):
-            def post(self):
-                return {"surface": "service_api"}
-
-        app.register_blueprint(service_api_bp)
-
-        trigger_bp = Blueprint("trigger_test", __name__, url_prefix="/triggers")
-
-        @trigger_bp.route("/webhook/<webhook_id>", methods=["POST"])
-        def webhook_route(webhook_id: str):
-            return {"surface": "triggers"}
-
-        app.register_blueprint(trigger_bp)
-        return app
-
-    def test_service_api_block_is_json_with_license_marker(self, wired_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = wired_app.test_client().post("/v1/chat-messages")
-
-        assert response.status_code == 403
-        body = response.get_json()
-        assert body["message"] == "license_required"
-        assert body["status"] == 403
-
-    def test_service_api_block_does_not_clear_cookies(self, wired_app: Flask):
-        """Force-logout cookie clearing belongs to the cookie-authed surfaces only."""
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = wired_app.test_client().post("/v1/chat-messages")
-
-        assert response.headers.getlist("Set-Cookie") == []
-
-    def test_trigger_block_survives_plain_blueprint_handling(self, wired_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = wired_app.test_client().post("/triggers/webhook/hook-id")
-
-        assert response.status_code == 503
-        assert b"license_required" in response.data
-
-    def test_surfaces_are_reachable_when_license_valid(self, wired_app: Flask):
-        with _enterprise(), _license(LicenseStatus.ACTIVE):
-            service_api = wired_app.test_client().post("/v1/chat-messages")
-            triggers = wired_app.test_client().post("/triggers/webhook/hook-id")
-
-        assert service_api.status_code == 200
-        assert triggers.status_code == 200
-
-
-class TestUngatedSurfaces:
-    """Surfaces that must stay reachable while the license is invalid."""
-
-    def test_inner_api_is_not_gated(self, gated_app: Flask):
-        """dify-enterprise control plane — gating it could block license recovery itself."""
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/inner/api/rbac/check-access")
-
-        assert response.status_code == 200
-
-    def test_files_data_plane_is_not_gated(self, gated_app: Flask):
-        """Signed file URLs are fetched by the plugin daemon and by LLM vendors."""
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/files/upload/for-plugin")
-
-        assert response.status_code == 200
-
-
-class TestSessionSurfaceLicenseGate:
-    """Console and webapp are cookie-authed, so they keep force-logout 401 semantics."""
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_blocks_console_with_force_logout(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().get("/console/api/apps")
-
-        assert response.status_code == 401
-
-    @pytest.mark.parametrize("status", INVALID_STATUSES)
-    def test_blocks_webapp_with_force_logout(self, gated_app: Flask, status: LicenseStatus):
-        with _enterprise(), _license(status):
-            response = gated_app.test_client().get("/api/messages")
-
-        assert response.status_code == 401
-
-    def test_console_bootstrap_route_stays_reachable(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().post("/console/api/login")
-
-        assert response.status_code == 200
-
-    def test_webapp_bootstrap_route_stays_reachable(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().get("/api/system-features")
-
-        assert response.status_code == 200
-
-    def test_health_route_is_never_gated(self, gated_app: Flask):
-        with _enterprise(), _license(LicenseStatus.EXPIRED):
-            response = gated_app.test_client().get("/health")
-
-        assert response.status_code == 200

api/tests/unit_tests/test_sqlite_fixtures.py

@@ -1,83 +0,0 @@
-from concurrent.futures import ThreadPoolExecutor
-from pathlib import Path
-from threading import Barrier
-
-import pytest
-from sqlalchemy import create_engine, inspect, text
-from sqlalchemy.engine import URL, Engine
-from sqlalchemy.orm import Session, sessionmaker
-from sqlalchemy.pool import QueuePool
-
-import core.db.session_factory as session_factory_module
-from models.account import Account
-from models.base import TypeBase
-from models.model import ExporleBanner
-
-
-def test_sqlite_session_contains_the_full_registered_schema(sqlite_session: Session) -> None:
-    table_names = set(inspect(sqlite_session.get_bind()).get_table_names())
-
-    assert table_names == set(TypeBase.metadata.tables)
-
-
-@pytest.mark.parametrize("sqlite_session", [(Account,)], indirect=True)
-def test_sqlite_session_accepts_deferred_legacy_indirect_parameters(sqlite_session: Session) -> None:
-    """Prove legacy model parameters no longer limit the copied schema."""
-
-    assert inspect(sqlite_session.get_bind()).has_table(ExporleBanner.__tablename__)
-
-
-def test_sqlite_engine_is_a_pristine_file_copy(
-    sqlite_engine: Engine,
-    request: pytest.FixtureRequest,
-) -> None:
-    sqlite_database_template: Path = request.getfixturevalue("_sqlite_database_template")
-    assert isinstance(sqlite_engine.pool, QueuePool)
-    assert sqlite_engine.url.database != str(sqlite_database_template)
-
-    with sqlite_engine.begin() as connection:
-        connection.execute(text("CREATE TABLE per_test_mutation (value INTEGER NOT NULL)"))
-
-    template_engine = create_engine(URL.create("sqlite", database=str(sqlite_database_template)))
-    try:
-        assert not inspect(template_engine).has_table("per_test_mutation")
-    finally:
-        template_engine.dispose()
-
-
-def test_core_session_factory_uses_the_shared_sqlite_session_factory(
-    sqlite_session_factory: sessionmaker[Session],
-) -> None:
-    assert session_factory_module.session_factory.get_session_maker() is sqlite_session_factory
-
-    with sqlite_session_factory.begin() as session:
-        session.execute(text("CREATE TABLE global_factory_probe (value INTEGER NOT NULL)"))
-        session.execute(text("INSERT INTO global_factory_probe (value) VALUES (42)"))
-
-    with session_factory_module.session_factory.create_session() as session:
-        assert session.scalar(text("SELECT value FROM global_factory_probe")) == 42
-
-
-def test_sqlite_session_factory_shares_one_database_across_worker_sessions(
-    sqlite_session_factory: sessionmaker[Session],
-) -> None:
-    with sqlite_session_factory.begin() as session:
-        session.execute(text("CREATE TABLE thread_probe (value INTEGER NOT NULL)"))
-        session.execute(text("INSERT INTO thread_probe (value) VALUES (42)"))
-
-    worker_barrier = Barrier(2)
-
-    def read_value() -> tuple[int, int]:
-        with sqlite_session_factory() as session:
-            connection = session.connection()
-            worker_barrier.wait(timeout=1)
-            value = session.scalar(text("SELECT value FROM thread_probe"))
-            connection_id = id(connection.connection.dbapi_connection)
-            return connection_id, value
-
-    with ThreadPoolExecutor(max_workers=2) as executor:
-        futures = [executor.submit(read_value) for _ in range(2)]
-        results = [future.result() for future in futures]
-
-    assert {value for _, value in results} == {42}
-    assert len({connection_id for connection_id, _ in results}) == 2

api/tests/unit_tests/tools/test_mcp_tool.py

@@ -135,19 +135,6 @@ class TestMCPToolInvoke:
         values = {m.message.variable_name: m.message.variable_value for m in var_msgs}
         assert values == {"a": 1, "b": "x"}
 
-    def test_invoke_yields_json_when_structured_content_has_no_output_schema(self, orm_session: Session) -> None:
-        tool = _make_mcp_tool()
-        result = CallToolResult(content=[], structuredContent={"a": 1, "b": "x"})
-
-        with patch.object(tool, "invoke_remote_mcp_tool", return_value=result):
-            messages = list(tool._invoke(session=orm_session, user_id="test_user", tool_parameters={}))
-
-        assert len(messages) == 1
-        msg = messages[0]
-        assert msg.type == ToolInvokeMessage.MessageType.JSON
-        assert isinstance(msg.message, ToolInvokeMessage.JsonMessage)
-        assert msg.message.json_object == {"a": 1, "b": "x"}
-
 
 class TestMCPToolUsageExtraction:
     """Test usage metadata extraction from MCP tool results."""

api/uv.lock

@@ -475,7 +475,7 @@ wheels = [
 
 [[package]]
 name = "bce-python-sdk"
-version = "0.9.76"
+version = "0.9.72"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "crc32c" },
@@ -483,9 +483,9 @@ dependencies = [
     { name = "pycryptodome" },
     { name = "six" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/0a/ed/b41906366c0e1e3a1a883e0f1bcfc927403d9697d74b1eb7e89502870218/bce_python_sdk-0.9.76.tar.gz", hash = "sha256:01c630ce8dcbf8be0563d65f18b5201eaac6bd954b3dc776040aec268f81b6ff", size = 317399, upload-time = "2026-07-24T05:12:57.005Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/32/bb/1ccb8b28bfa0802356f8588e479adb61cfd2268b37fabc6c8a805d645cd5/bce_python_sdk-0.9.72.tar.gz", hash = "sha256:d9db568698792d74db4245252d98776eae8c9c5225fc0ba86548dfc52d478fcc", size = 302207, upload-time = "2026-06-08T12:10:32.326Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b9/06/4d4a26c3dfcdb29599f563329b87eefe55b02b3c2b9d8f8c3aeaa38a33a6/bce_python_sdk-0.9.76-py3-none-any.whl", hash = "sha256:e629181d060f4ed8f29749f47139bf08f1f9b0d8b15daedc956900785587e8d8", size = 435179, upload-time = "2026-07-24T05:12:55.064Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/3a/f84b025ff6c8ec8fe222430cf9201b513dd11ada744417649a64ad295b6d/bce_python_sdk-0.9.72-py3-none-any.whl", hash = "sha256:54a0c121134d6f183f6013d9b33dbf5b6678b0815b6d09616bbceed0202dd797", size = 417800, upload-time = "2026-06-08T12:10:30.556Z" },
 ]
 
 [[package]]
@@ -598,16 +598,16 @@ wheels = [
 
 [[package]]
 name = "boto3"
-version = "1.43.56"
+version = "1.43.46"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore" },
     { name = "jmespath" },
     { name = "s3transfer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/53/05/23e1aa8c9e4b0399a61e7fd65c4f9cc0625121f24760e37471f776404abb/boto3-1.43.56.tar.gz", hash = "sha256:57c90df9fb026f2e6ae22530861198130203733c5c9ec4e5cca3a4037f5a8db4", size = 112673, upload-time = "2026-07-24T19:31:48.606Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f2/e7/976bf3dfe0aa5d7f31bec2f2cf57c79641620c910a39bc843a237aa9592d/boto3-1.43.46.tar.gz", hash = "sha256:66c0d943b049a46a492ec4ec2ebe73c930b1842c7137bee83aad6d93e95d4d96", size = 112654, upload-time = "2026-07-10T19:32:12.498Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b8/57/3a960c9f581c00f2a591901b46e035ff79ab3956d16607f12306b3b8d483/boto3-1.43.56-py3-none-any.whl", hash = "sha256:feb699d4ab241ef5c1b80bb58277be2aaad365cd4b672d7817e0bc59ee45131b", size = 140026, upload-time = "2026-07-24T19:31:47.155Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/1d/c52e66ff32ba7911664e6c4c2ac62e1c6d2d1e7550c7ac185d3f4b70a8a4/boto3-1.43.46-py3-none-any.whl", hash = "sha256:69453e2c1bcb9fd9806527ab99950cacfc2826cb0dce9a3a0414d19270c06c3c", size = 140031, upload-time = "2026-07-10T19:32:11.129Z" },
 ]
 
 [[package]]
@@ -630,16 +630,16 @@ bedrock-runtime = [
 
 [[package]]
 name = "botocore"
-version = "1.43.56"
+version = "1.43.46"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "jmespath" },
     { name = "python-dateutil" },
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b9/cc/7f84a5d3071fe878380e9f610ab36ca87b8cbbc4aa81ba2727f90e1f3ea3/botocore-1.43.56.tar.gz", hash = "sha256:6c01f85f0ff9863076f4c761e74ee3aa96c5ccc1ad09fc1efd62ef8f2d22bf57", size = 15733117, upload-time = "2026-07-24T19:31:38.125Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/f1/1917891851ac5ac09bb9f4862b8fc9252a009d7c24e8688bb67e4383d9e7/botocore-1.43.46.tar.gz", hash = "sha256:59f2e1ac3cdc66d191cae91c0804bc41847ce817dc8147cf43eaada8f76a5533", size = 15694635, upload-time = "2026-07-10T19:32:00.437Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/5c/cd/86fe9e659e9699f62f8dd5ecd8c6725474334b23cab8aa71d82b5f56f1a4/botocore-1.43.56-py3-none-any.whl", hash = "sha256:aafc741f1b10f6fd63253eaf6ea029680c1ff436d87e1b8969d62aefa0c76976", size = 15418773, upload-time = "2026-07-24T19:31:34.758Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/f2/4bd8f2f419088feb3ce55f0ca91040ff902f402edfd197450b20a2e1d533/botocore-1.43.46-py3-none-any.whl", hash = "sha256:cb673891e623ae6e6a1bf24d94ef169504f3eb02584adb5d5bee2f6aae819b60", size = 15380350, upload-time = "2026-07-10T19:31:57.616Z" },
 ]
 
 [[package]]
@@ -1281,7 +1281,7 @@ wheels = [
 
 [[package]]
 name = "dify-agent"
-version = "1.16.1"
+version = "1.16.0"
 source = { editable = "../dify-agent" }
 dependencies = [
     { name = "httpx" },
@@ -1331,7 +1331,7 @@ docs = [
 
 [[package]]
 name = "dify-api"
-version = "1.16.1"
+version = "1.16.0"
 source = { virtual = "." }
 dependencies = [
     { name = "aliyun-log-python-sdk" },
@@ -1621,7 +1621,7 @@ requires-dist = [
     { name = "aliyun-log-python-sdk", specifier = "==0.9.44" },
     { name = "azure-identity", specifier = ">=1.25.3,<2.0.0" },
     { name = "bleach", specifier = ">=6.4.0,<7.0.0" },
-    { name = "boto3", specifier = ">=1.43.56,<2.0.0" },
+    { name = "boto3", specifier = ">=1.43.46,<2.0.0" },
     { name = "celery", specifier = ">=5.6.3,<6.0.0" },
     { name = "croniter", specifier = ">=6.2.2,<7.0.0" },
     { name = "dify-agent", editable = "../dify-agent" },
@@ -1727,10 +1727,10 @@ dev = [
 ]
 storage = [
     { name = "azure-storage-blob", specifier = ">=12.30.0,<13.0.0" },
-    { name = "bce-python-sdk", specifier = "==0.9.76" },
+    { name = "bce-python-sdk", specifier = "==0.9.72" },
     { name = "cos-python-sdk-v5", specifier = ">=1.9.44,<2.0.0" },
     { name = "esdk-obs-python", specifier = ">=3.26.6,<4.0.0" },
-    { name = "google-cloud-storage", specifier = ">=3.13.0,<4.0.0" },
+    { name = "google-cloud-storage", specifier = ">=3.12.1,<4.0.0" },
     { name = "opendal", specifier = "==0.46.0" },
     { name = "oss2", specifier = ">=2.19.1,<3.0.0" },
     { name = "supabase", specifier = ">=2.31.0,<3.0.0" },
@@ -2710,14 +2710,14 @@ wheels = [
 
 [[package]]
 name = "gitpython"
-version = "3.1.54"
+version = "3.1.52"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "gitdb" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/5e/d5/3da0b92033887033f4c27f2dd109a303c4ca62813c7b3bb2511edb4777de/gitpython-3.1.54.tar.gz", hash = "sha256:53f2085e24a2cda300eed7c3fc5f1559ae289634b725e98acaf4791940247aa0", size = 225076, upload-time = "2026-07-22T04:08:51.403Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e5/fd/df0bafa4eb5ea2f51e1adee9f7a94c8e62c5d180e65117045dfca3439c8a/gitpython-3.1.52.tar.gz", hash = "sha256:de0a8ad86274c6e75ae8b37dd055ba68f19818c813108642263227b20775b48e", size = 223726, upload-time = "2026-07-16T03:15:59.599Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d1/b9/876f442a28df5c068ca69b0122d5c35e65fd2d2fa9992ea5cb5944ea00a6/gitpython-3.1.54-py3-none-any.whl", hash = "sha256:b90d7b3d9bc0238681d24369130826f0dcdb0ceaa45db67cf1d4ffa4c302dedf", size = 216575, upload-time = "2026-07-22T04:08:50.05Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/90/04dff7c1e176bb1c3011ef1647393d368790da710d8dde1cdcfad301f45a/gitpython-3.1.52-py3-none-any.whl", hash = "sha256:79a36ee1f83523214a3f72d56cf1c4e490d577dc61af77e43dfe5862bd9da01a", size = 215366, upload-time = "2026-07-16T03:15:58.239Z" },
 ]
 
 [[package]]
@@ -2891,7 +2891,7 @@ wheels = [
 
 [[package]]
 name = "google-cloud-storage"
-version = "3.13.0"
+version = "3.12.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "google-api-core" },
@@ -2901,9 +2901,9 @@ dependencies = [
     { name = "google-resumable-media" },
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e3/25/355ed97c1723c787dfaa888808d55db18371f82c38ff862357b1e902cd19/google_cloud_storage-3.13.0.tar.gz", hash = "sha256:d11d8706ea1520fba0f21043bcb7897caf7015d76ce1ad9a4f60237e4d7a9f6c", size = 17340960, upload-time = "2026-07-13T19:10:07.524Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/da/ac/60b4cb0a6c8c6bb7cedb8971ba5e34a94096acf76e2cc242bcf1e6fc5c49/google_cloud_storage-3.12.1.tar.gz", hash = "sha256:1d81491c7663bc26c5056d00b834356f2253b910ef467f9cf9928a87fca1e04b", size = 17339353, upload-time = "2026-07-08T17:03:59.142Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/81/e8/b3678a0931ee7d4b3fdaf0813e6206d66e0922b2c26d912f308728b5b95a/google_cloud_storage-3.13.0-py3-none-any.whl", hash = "sha256:648af3ef8a6acc674e1359d3c920c67eb89a7a5ab66b336bd3ac43fed6b5ab84", size = 341428, upload-time = "2026-07-13T19:09:52.39Z" },
+    { url = "https://files.pythonhosted.org/packages/80/6e/ca176e95bafac0fe7befeee7e0420e686de147571cd2908e308c5fe71bda/google_cloud_storage-3.12.1-py3-none-any.whl", hash = "sha256:9297ae0c2ce3f5400b1f2bb3a3e6d2cd256614366e03cd30600871df8e903afb", size = 340845, upload-time = "2026-07-08T17:03:31.418Z" },
 ]
 
 [[package]]

cli/package.json

@@ -71,7 +71,7 @@
     "channel": "alpha",
     "compat": {
       "minDify": "1.16.0",
-      "maxDify": "1.16.1"
+      "maxDify": "1.16.0"
     },
     "release": {
       "tagPrefix": "difyctl-v",

cli/scripts/release-naming.mjs

@@ -114,15 +114,9 @@ function die(msg) {
   process.exit(1)
 }
 
-// Tests point this at a fixture manifest so their assertions stay fixed while
-// the real version and compat window move with every release. The name is
-// mirrored in test/fixtures/pkg-manifest.ts rather than imported from here,
-// because this file's shebang breaks the Windows test runner.
-const PKG_PATH_ENV = 'DIFYCTL_PKG_PATH'
-
 function loadPkg() {
-  const pkgPath = process.env[PKG_PATH_ENV] || new URL('../package.json', import.meta.url)
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
+  const pkgUrl = new URL('../package.json', import.meta.url)
+  const pkg = JSON.parse(readFileSync(pkgUrl, 'utf8'))
   if (!pkg.difyctl?.release) die('cli/package.json missing difyctl.release')
   return {
     version: pkg.version,

cli/scripts/release-naming.test.ts

@@ -1,19 +1,12 @@
 import { execFileSync } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { FIXTURE_COMPAT, pkgManifestEnv } from '../test/fixtures/pkg-manifest'
 
 const SCRIPT = fileURLToPath(new URL('./release-naming.mjs', import.meta.url))
 
-function run(
-  args: string[],
-  env: Record<string, string> = {},
-): { code: number; stdout: string; stderr: string } {
+function run(args: string[]): { code: number; stdout: string; stderr: string } {
   try {
-    const stdout = execFileSync('node', [SCRIPT, ...args], {
-      encoding: 'utf8',
-      env: { ...process.env, ...env },
-    })
+    const stdout = execFileSync('node', [SCRIPT, ...args], { encoding: 'utf8' })
     return { code: 0, stdout, stderr: '' }
   } catch (e) {
     const err = e as { status?: number; stdout?: string; stderr?: string }
@@ -21,50 +14,45 @@ function run(
   }
 }
 
-describe('release-naming compat-check', () => {
-  const { minDify, maxDify } = FIXTURE_COMPAT // 2.0.0 .. 2.5.0
-  const pkgEnv = pkgManifestEnv()
-  const compatCheck = (difyVersion?: string) =>
-    run(difyVersion === undefined ? ['compat-check'] : ['compat-check', difyVersion], pkgEnv).code
-
+describe('release-naming compat-check (compat 1.16.0..1.16.0)', () => {
   it('accepts a version inside the window', () => {
-    expect(compatCheck('2.3.0')).toBe(0)
+    expect(run(['compat-check', '1.16.0']).code).toBe(0)
   })
 
   it('accepts the inclusive lower bound', () => {
-    expect(compatCheck(minDify)).toBe(0)
+    expect(run(['compat-check', '1.16.0']).code).toBe(0)
   })
 
   it('accepts the inclusive upper bound', () => {
-    expect(compatCheck(maxDify)).toBe(0)
+    expect(run(['compat-check', '1.16.0']).code).toBe(0)
   })
 
   it('accepts a v-prefixed tag', () => {
-    expect(compatCheck('v2.3.0')).toBe(0)
+    expect(run(['compat-check', 'v1.16.0']).code).toBe(0)
   })
 
   it('rejects a version below the lower bound', () => {
-    expect(compatCheck('1.9.9')).not.toBe(0)
+    expect(run(['compat-check', '1.15.9']).code).not.toBe(0)
   })
 
   it('rejects a version above the upper bound', () => {
-    expect(compatCheck('2.5.1')).not.toBe(0)
+    expect(run(['compat-check', '1.16.1']).code).not.toBe(0)
   })
 
-  it('treats a prerelease of the lower bound as below it', () => {
-    expect(compatCheck(`${minDify}-rc1`)).not.toBe(0)
+  it('treats a prerelease of the bound as below it (1.16.0-rc1 < 1.16.0)', () => {
+    expect(run(['compat-check', '1.16.0-rc1']).code).not.toBe(0)
   })
 
-  it('ignores build metadata on the bound', () => {
-    expect(compatCheck(`${maxDify}+build123`)).toBe(0)
+  it('ignores build metadata on the bound (1.16.0+build == 1.16.0)', () => {
+    expect(run(['compat-check', '1.16.0+build123']).code).toBe(0)
   })
 
-  it('ignores build metadata when out of range', () => {
-    expect(compatCheck('2.5.1+build123')).not.toBe(0)
+  it('ignores build metadata when out of range (1.16.1+build still rejected)', () => {
+    expect(run(['compat-check', '1.16.1+build123']).code).not.toBe(0)
   })
 
   it('requires a version argument', () => {
-    expect(compatCheck()).not.toBe(0)
+    expect(run(['compat-check']).code).not.toBe(0)
   })
 })
 
@@ -79,14 +67,6 @@ describe('release-naming github-env', () => {
     for (const key of ['version', 'channel', 'prerelease', 'minDify', 'maxDify', 'tagPrefix'])
       expect(stdout).toMatch(new RegExp(`^${key}=`, 'm'))
   })
-
-  // The only assertion against the live manifest: the window must exist and be
-  // well-formed, whatever release it currently points at.
-  it('emits a well-formed compat window from the real cli/package.json', () => {
-    const { stdout } = run(['github-env'])
-    expect(stdout).toMatch(/^minDify=\d+\.\d+\.\d+$/m)
-    expect(stdout).toMatch(/^maxDify=\d+\.\d+\.\d+$/m)
-  })
 })
 
 describe('release-naming edge channel', () => {

cli/scripts/release-r2-edge.test.ts

@@ -4,20 +4,14 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { FIXTURE_COMPAT, pkgManifestEnv } from '../test/fixtures/pkg-manifest'
 
 const SCRIPT = fileURLToPath(new URL('./release-r2-edge.mjs', import.meta.url))
 
-const PKG_ENV = pkgManifestEnv()
-
 function run(args: string[]): { code: number; stdout: string; stderr: string } {
   try {
     return {
       code: 0,
-      stdout: execFileSync('node', [SCRIPT, ...args], {
-        encoding: 'utf8',
-        env: { ...process.env, ...PKG_ENV },
-      }),
+      stdout: execFileSync('node', [SCRIPT, ...args], { encoding: 'utf8' }),
       stderr: '',
     }
   } catch (e) {
@@ -114,7 +108,7 @@ describe('release-r2-edge manifest', () => {
 
   it('carries the compat window from package.json', () => {
     const { json } = buildManifest()
-    expect(json.compat).toEqual(FIXTURE_COMPAT)
+    expect(json.compat).toEqual({ minDify: '1.16.0', maxDify: '1.16.0' })
   })
 
   it('lists all 5 targets with asset name + sha256 from the checksums file', () => {

cli/test/fixtures/pkg-manifest.ts

@@ -1,57 +0,0 @@
-import { mkdtempSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-
-// Mirrors PKG_PATH_ENV in scripts/release-naming.mjs, which cannot be imported
-// here: its shebang breaks the Windows test runner. Divergence is self-
-// reporting, not silent — the script would fall back to the real
-// cli/package.json and every fixture-window assertion would fail.
-const PKG_PATH_ENV = 'DIFYCTL_PKG_PATH'
-
-// release-naming.mjs and release-r2-edge.mjs read their data from
-// cli/package.json. Tests spawn them against this fixture instead, so
-// assertions can name exact versions without tracking the live release.
-
-// Deliberately far from any real Dify version, and min != max so "inside the
-// window" is a case distinct from either bound.
-export const FIXTURE_COMPAT = { minDify: '2.0.0', maxDify: '2.5.0' }
-
-export const FIXTURE_TARGET_IDS = [
-  'linux-x64',
-  'linux-arm64',
-  'darwin-x64',
-  'darwin-arm64',
-  'windows-x64',
-] as const
-
-const FIXTURE_RELEASE = {
-  tagPrefix: 'difyctl-v',
-  binName: 'difyctl',
-  checksumsSuffix: '-checksums.txt',
-  targets: FIXTURE_TARGET_IDS.map((id) => ({
-    id,
-    bunTarget: `bun-${id}`,
-    exe: id.startsWith('windows'),
-  })),
-}
-
-export type PkgManifestOverrides = {
-  version?: string
-  channel?: string
-  compat?: { minDify: string; maxDify: string }
-}
-
-// Returns the env additions that point a spawned script at the fixture.
-export function pkgManifestEnv(overrides: PkgManifestOverrides = {}): Record<string, string> {
-  const manifest = {
-    version: overrides.version ?? '0.2.0-alpha',
-    difyctl: {
-      channel: overrides.channel ?? 'alpha',
-      compat: overrides.compat ?? FIXTURE_COMPAT,
-      release: FIXTURE_RELEASE,
-    },
-  }
-  const path = join(mkdtempSync(join(tmpdir(), 'difyctl-pkg-')), 'package.json')
-  writeFileSync(path, JSON.stringify(manifest))
-  return { [PKG_PATH_ENV]: path }
-}

dify-agent-runtime/go.mod

@@ -19,9 +19,9 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/spf13/pflag v1.0.9 // indirect
 	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
-	golang.org/x/net v0.55.0 // indirect
-	golang.org/x/sys v0.45.0 // indirect
-	golang.org/x/text v0.37.0 // indirect
+	golang.org/x/net v0.53.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
 	kernel.org/pub/linux/libs/security/libcap/psx v1.2.77 // indirect
 	modernc.org/libc v1.65.7 // indirect

dify-agent-runtime/go.sum

@@ -45,19 +45,19 @@ go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLh
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
-golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
-golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
-golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
+golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
-golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
-golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw=

dify-agent/.example.env

@@ -56,12 +56,6 @@ DIFY_AGENT_STUB_GRPC_BIND_ADDRESS=
 # Generate one with: python -c 'import secrets; print(secrets.token_urlsafe(32))'
 DIFY_AGENT_SERVER_SECRET_KEY=MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY
 
-# Inbound Bearer token for /runs API authentication.
-# Must match AGENT_BACKEND_API_TOKEN on the Dify API side.
-# Replace this development default in production.
-# Generate one with: python -c 'import secrets; print(secrets.token_urlsafe(32))'
-DIFY_AGENT_API_TOKEN=dify-agent-run-token-for-dev-only
-
 # Shared plugin-daemon HTTP client timeouts and limits.
 # Plugin-daemon HTTP connect timeout in seconds.
 DIFY_AGENT_PLUGIN_DAEMON_CONNECT_TIMEOUT=10

dify-agent/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dify-agent"
-version = "1.16.1"
+version = "1.16.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12,<4.0"

dify-agent/src/dify_agent/server/app.py

@@ -29,7 +29,6 @@ from dify_agent.agent_stub.server.router import create_agent_stub_router
 from dify_agent.layers.execution_context import DifyExecutionContextLayerConfig
 from dify_agent.runtime.compositor_factory import create_default_layer_providers
 from dify_agent.runtime.run_scheduler import RunScheduler
-from dify_agent.server.auth import create_bearer_token_dependency
 from dify_agent.server.observability import configure_server_observability
 from dify_agent.server.routes.runs import create_runs_router
 from dify_agent.server.routes.sandbox_files import create_sandbox_files_router
@@ -124,13 +123,7 @@ def create_app(settings: ServerSettings | None = None) -> FastAPI:
     def get_scheduler() -> RunScheduler:
         return state["scheduler"]  # pyright: ignore[reportReturnType]
 
-    app.include_router(
-        create_runs_router(
-            get_store,
-            get_scheduler,
-            auth_dependency=create_bearer_token_dependency(resolved_settings.api_token),
-        )
-    )
+    app.include_router(create_runs_router(get_store, get_scheduler))
     app.include_router(create_sandbox_files_router(lambda: sandbox_file_service))
     app.include_router(
         create_agent_stub_router(

dify-agent/src/dify_agent/server/auth.py

@@ -1,43 +0,0 @@
-import hmac
-
-from fastapi import Depends, Header, HTTPException
-
-
-def create_bearer_token_dependency(expected_token: str | None):
-    """Return a FastAPI dependency that validates Bearer token authentication.
-
-    When ``expected_token`` is ``None``, the returned dependency permits all
-    requests without checking the header, supporting graceful migration for
-    existing deployments.
-    """
-
-    async def require_bearer_token(
-        authorization: str | None = Header(default=None, alias="Authorization"),
-    ) -> None:
-        if expected_token is None:
-            return
-        if authorization is None:
-            raise HTTPException(
-                status_code=401,
-                detail="missing authorization header",
-                headers={"WWW-Authenticate": "Bearer"},
-            )
-        scheme, _, token = authorization.partition(" ")
-        token = token.strip()
-        if scheme.lower() != "bearer" or not token:
-            raise HTTPException(
-                status_code=401,
-                detail="invalid authorization scheme",
-                headers={"WWW-Authenticate": "Bearer"},
-            )
-        if not hmac.compare_digest(token.encode(), expected_token.encode()):
-            raise HTTPException(
-                status_code=401,
-                detail="invalid bearer token",
-                headers={"WWW-Authenticate": "Bearer"},
-            )
-
-    return Depends(require_bearer_token)
-
-
-__all__ = ["create_bearer_token_dependency"]

dify-agent/src/dify_agent/server/routes/runs.py

@@ -14,7 +14,6 @@ from collections.abc import Callable
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Header, HTTPException, Query
-from fastapi.params import Depends as DependsInstance
 from fastapi.responses import StreamingResponse
 
 from dify_agent.protocol.schemas import (
@@ -33,11 +32,9 @@ from dify_agent.storage.redis_run_store import RedisRunStore, RunNotFoundError
 def create_runs_router(
     get_store: Callable[[], RedisRunStore],
     get_scheduler: Callable[[], RunScheduler],
-    *,
-    auth_dependency: DependsInstance | None = None,
 ) -> APIRouter:
-    dependencies: list[DependsInstance] = [auth_dependency] if auth_dependency is not None else []
-    router = APIRouter(prefix="/runs", tags=["runs"], dependencies=dependencies)
+    """Create routes bound to the application's store dependency provider."""
+    router = APIRouter(prefix="/runs", tags=["runs"])
 
     async def store_dep() -> RedisRunStore:
         return get_store()

dify-agent/src/dify_agent/server/settings.py

@@ -52,7 +52,6 @@ class ServerSettings(BaseSettings):
     agent_stub_api_base_url: str | None = Field(default=None, validation_alias="DIFY_AGENT_STUB_API_BASE_URL")
     agent_stub_grpc_bind_address: str | None = Field(default=None, validation_alias="DIFY_AGENT_STUB_GRPC_BIND_ADDRESS")
     server_secret_key: str | None = None
-    api_token: str | None = None
     shell_redact_patterns: str = ""
     outbound_http_connect_timeout: float = Field(default=10.0, ge=0)
     outbound_http_read_timeout: float = Field(default=600.0, ge=0)

dify-agent/tests/local/dify_agent/server/test_auth.py

@@ -1,57 +0,0 @@
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from dify_agent.server.auth import create_bearer_token_dependency
-
-
-def _build_app(expected_token: str | None) -> FastAPI:
-    app = FastAPI()
-    dep = create_bearer_token_dependency(expected_token)
-
-    @app.get("/protected", dependencies=[dep])
-    async def protected() -> dict[str, str]:
-        return {"status": "ok"}
-
-    return app
-
-
-class TestBearerTokenAuthEnabled:
-    """Auth is enforced when a non-None token is configured."""
-
-    def test_missing_header_returns_401(self) -> None:
-        client = TestClient(_build_app("secret-token"))
-        response = client.get("/protected")
-        assert response.status_code == 401
-        assert "missing" in response.json()["detail"]
-
-    def test_invalid_scheme_returns_401(self) -> None:
-        client = TestClient(_build_app("secret-token"))
-        response = client.get("/protected", headers={"Authorization": "Basic abc"})
-        assert response.status_code == 401
-        assert "scheme" in response.json()["detail"]
-
-    def test_wrong_token_returns_401(self) -> None:
-        client = TestClient(_build_app("secret-token"))
-        response = client.get("/protected", headers={"Authorization": "Bearer wrong"})
-        assert response.status_code == 401
-        assert "invalid bearer token" in response.json()["detail"]
-
-    def test_correct_token_passes(self) -> None:
-        client = TestClient(_build_app("secret-token"))
-        response = client.get("/protected", headers={"Authorization": "Bearer secret-token"})
-        assert response.status_code == 200
-        assert response.json() == {"status": "ok"}
-
-
-class TestBearerTokenAuthDisabled:
-    """Auth is a no-op when expected_token is None (backward compatibility)."""
-
-    def test_no_header_passes_when_token_unconfigured(self) -> None:
-        client = TestClient(_build_app(None))
-        response = client.get("/protected")
-        assert response.status_code == 200
-
-    def test_any_header_passes_when_token_unconfigured(self) -> None:
-        client = TestClient(_build_app(None))
-        response = client.get("/protected", headers={"Authorization": "Bearer anything"})
-        assert response.status_code == 200

dify-agent/uv.lock

@@ -581,7 +581,7 @@ wheels = [
 
 [[package]]
 name = "dify-agent"
-version = "1.16.1"
+version = "1.16.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },
@@ -2704,15 +2704,15 @@ wheels = [
 
 [[package]]
 name = "pymdown-extensions"
-version = "11.0"
+version = "10.21.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "markdown" },
     { name = "pyyaml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/47/67/f1e79672a5f91985577c7984c9709ca110e4fd37fe7fd167b60422e6ccc2/pymdown_extensions-11.0.tar.gz", hash = "sha256:8269cef0247f9e2d0a62fcea10860aba05c1cbab5470fd4b63230b96434dc589", size = 857049, upload-time = "2026-06-23T02:27:45.146Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/df/08/f1c908c581fd11913da4711ea7ba32c0eee40b0190000996bb863b0c9349/pymdown_extensions-10.21.2.tar.gz", hash = "sha256:c3f55a5b8a1d0edf6699e35dcbea71d978d34ff3fa79f3d807b8a5b3fa90fbdc", size = 853922, upload-time = "2026-03-29T15:01:55.233Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/af/b6/1ae53367e28b9cffa3be7574e13fbe4589694272fd47710fbdbafd3d63c6/pymdown_extensions-11.0-py3-none-any.whl", hash = "sha256:fbc4acb641814fa9d17521bbd21a5240ef739a662f11c06330c4b78c93e954d6", size = 269415, upload-time = "2026-06-23T02:27:43.826Z" },
+    { url = "https://files.pythonhosted.org/packages/f7/27/a2fc51a4a122dfd1015e921ae9d22fee3d20b0b8080d9a704578bf9deece/pymdown_extensions-10.21.2-py3-none-any.whl", hash = "sha256:5c0fd2a2bea14eb39af8ff284f1066d898ab2187d81b889b75d46d4348c01638", size = 268901, upload-time = "2026-03-29T15:01:53.244Z" },
 ]
 
 [[package]]

docker/.env.example

@@ -253,10 +253,6 @@ MARKETPLACE_URL=
 
 # Dify Agent backend
 AGENT_BACKEND_BASE_URL=http://agent_backend:5050
-# Bearer token for the Agent backend /runs API.
-# Replace this development default in production.
-# Generate one with: python -c 'import secrets; print(secrets.token_urlsafe(32))'
-DIFY_AGENT_API_TOKEN=dify-agent-run-token-for-dev-only
 AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS=30
 AGENT_BACKEND_STREAM_MAX_RECONNECTS=3
 AGENT_BACKEND_RUN_TIMEOUT_SECONDS=1200

docker/docker-compose-template.yaml

@@ -220,7 +220,7 @@ services:
   # API service
   api:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: api
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -232,7 +232,6 @@ services:
       PLUGIN_DAEMON_TIMEOUT: ${PLUGIN_DAEMON_TIMEOUT:-600.0}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
       AGENT_BACKEND_BASE_URL: ${AGENT_BACKEND_BASE_URL:-http://agent_backend:5050}
-      AGENT_BACKEND_API_TOKEN: ${DIFY_AGENT_API_TOKEN:-dify-agent-run-token-for-dev-only}
       AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS: ${AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS:-30}
       AGENT_BACKEND_STREAM_MAX_RECONNECTS: ${AGENT_BACKEND_STREAM_MAX_RECONNECTS:-3}
       AGENT_BACKEND_RUN_TIMEOUT_SECONDS: ${AGENT_BACKEND_RUN_TIMEOUT_SECONDS:-1200}
@@ -271,7 +270,7 @@ services:
   # WebSocket service for workflow collaboration.
   api_websocket:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     profiles:
       - collaboration
     environment:
@@ -297,7 +296,7 @@ services:
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
     <<: *shared-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: worker
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -306,7 +305,6 @@ services:
       PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
       AGENT_BACKEND_BASE_URL: ${AGENT_BACKEND_BASE_URL:-http://agent_backend:5050}
-      AGENT_BACKEND_API_TOKEN: ${DIFY_AGENT_API_TOKEN:-dify-agent-run-token-for-dev-only}
       AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS: ${AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS:-30}
       AGENT_BACKEND_STREAM_MAX_RECONNECTS: ${AGENT_BACKEND_STREAM_MAX_RECONNECTS:-3}
       AGENT_BACKEND_RUN_TIMEOUT_SECONDS: ${AGENT_BACKEND_RUN_TIMEOUT_SECONDS:-1200}
@@ -347,7 +345,7 @@ services:
   # Celery beat for scheduling periodic tasks.
   worker_beat:
     <<: *shared-worker-beat-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: beat
     depends_on:
@@ -380,7 +378,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.16.1
+    image: langgenius/dify-web:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/web.env
@@ -542,7 +540,7 @@ services:
   # on port 3128, which only allows agent_backend /agent-stub/ and the Dify API
   # /files/* endpoints (see ssrf_proxy/squid-agent.conf.template).
   local_sandbox:
-    image: langgenius/dify-agent-local-sandbox:1.16.1
+    image: langgenius/dify-agent-local-sandbox:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/local-sandbox.env
@@ -651,7 +649,7 @@ services:
 
   # Dify Agent backend service.
   agent_backend:
-    image: langgenius/dify-agent-backend:1.16.1
+    image: langgenius/dify-agent-backend:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/dify-agent.env
@@ -675,7 +673,6 @@ services:
       # Replace this development default in production.
       # Generate one with: python -c 'import secrets; print(secrets.token_urlsafe(32))'
       DIFY_AGENT_SERVER_SECRET_KEY: ${DIFY_AGENT_SERVER_SECRET_KEY:-MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY}
-      DIFY_AGENT_API_TOKEN: ${DIFY_AGENT_API_TOKEN:-dify-agent-run-token-for-dev-only}
       DIFY_AGENT_SHUTDOWN_GRACE_SECONDS: ${DIFY_AGENT_SHUTDOWN_GRACE_SECONDS:-30}
       DIFY_AGENT_RUN_RETENTION_SECONDS: ${DIFY_AGENT_RUN_RETENTION_SECONDS:-259200}
     depends_on:

docker/docker-compose.yaml

@@ -226,7 +226,7 @@ services:
   # API service
   api:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: api
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -238,7 +238,6 @@ services:
       PLUGIN_DAEMON_TIMEOUT: ${PLUGIN_DAEMON_TIMEOUT:-600.0}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
       AGENT_BACKEND_BASE_URL: ${AGENT_BACKEND_BASE_URL:-http://agent_backend:5050}
-      AGENT_BACKEND_API_TOKEN: ${DIFY_AGENT_API_TOKEN:-dify-agent-run-token-for-dev-only}
       AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS: ${AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS:-30}
       AGENT_BACKEND_STREAM_MAX_RECONNECTS: ${AGENT_BACKEND_STREAM_MAX_RECONNECTS:-3}
       AGENT_BACKEND_RUN_TIMEOUT_SECONDS: ${AGENT_BACKEND_RUN_TIMEOUT_SECONDS:-1200}
@@ -277,7 +276,7 @@ services:
   # WebSocket service for workflow collaboration.
   api_websocket:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     profiles:
       - collaboration
     environment:
@@ -303,7 +302,7 @@ services:
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
     <<: *shared-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: worker
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -312,7 +311,6 @@ services:
       PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
       INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
       AGENT_BACKEND_BASE_URL: ${AGENT_BACKEND_BASE_URL:-http://agent_backend:5050}
-      AGENT_BACKEND_API_TOKEN: ${DIFY_AGENT_API_TOKEN:-dify-agent-run-token-for-dev-only}
       AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS: ${AGENT_BACKEND_STREAM_READ_TIMEOUT_SECONDS:-30}
       AGENT_BACKEND_STREAM_MAX_RECONNECTS: ${AGENT_BACKEND_STREAM_MAX_RECONNECTS:-3}
       AGENT_BACKEND_RUN_TIMEOUT_SECONDS: ${AGENT_BACKEND_RUN_TIMEOUT_SECONDS:-1200}
@@ -353,7 +351,7 @@ services:
   # Celery beat for scheduling periodic tasks.
   worker_beat:
     <<: *shared-worker-beat-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: beat
     depends_on:
@@ -386,7 +384,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.16.1
+    image: langgenius/dify-web:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/web.env
@@ -548,7 +546,7 @@ services:
   # on port 3128, which only allows agent_backend /agent-stub/ and the Dify API
   # /files/* endpoints (see ssrf_proxy/squid-agent.conf.template).
   local_sandbox:
-    image: langgenius/dify-agent-local-sandbox:1.16.1
+    image: langgenius/dify-agent-local-sandbox:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/local-sandbox.env
@@ -657,7 +655,7 @@ services:
 
   # Dify Agent backend service.
   agent_backend:
-    image: langgenius/dify-agent-backend:1.16.1
+    image: langgenius/dify-agent-backend:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/dify-agent.env
@@ -681,7 +679,6 @@ services:
       # Replace this development default in production.
       # Generate one with: python -c 'import secrets; print(secrets.token_urlsafe(32))'
       DIFY_AGENT_SERVER_SECRET_KEY: ${DIFY_AGENT_SERVER_SECRET_KEY:-MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY}
-      DIFY_AGENT_API_TOKEN: ${DIFY_AGENT_API_TOKEN:-dify-agent-run-token-for-dev-only}
       DIFY_AGENT_SHUTDOWN_GRACE_SECONDS: ${DIFY_AGENT_SHUTDOWN_GRACE_SECONDS:-30}
       DIFY_AGENT_RUN_RETENTION_SECONDS: ${DIFY_AGENT_RUN_RETENTION_SECONDS:-259200}
     depends_on:

docker/envs/core-services/shared.env.example

@@ -73,7 +73,6 @@ SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
 PGDATA=/var/lib/postgresql/data/pgdata
 PLUGIN_MAX_PACKAGE_SIZE=52428800
 PLUGIN_MODEL_SCHEMA_CACHE_TTL=3600
-PLUGIN_MODEL_PROVIDERS_CACHE_ENABLED=true
 PLUGIN_MODEL_PROVIDERS_CACHE_TTL=86400
 # Comma-separated marketplace plugin IDs whose latest versions are installed for newly registered users.
 # Example: langgenius/openai,langgenius/gemini

e2e/tests/console-client.test.ts

@@ -31,17 +31,6 @@ const createApiResponse = ({
     status: () => status,
     statusText: () => statusText,
     text: async () => body,
-    timing: () => ({
-      connectEnd: -1,
-      connectStart: -1,
-      domainLookupEnd: -1,
-      domainLookupStart: -1,
-      requestStart: -1,
-      responseEnd: -1,
-      responseStart: -1,
-      secureConnectionStart: -1,
-      startTime: -1,
-    }),
     url: () => url,
     [Symbol.asyncDispose]: async () => {},
   }

oxlint-suppressions.json

@@ -4,11 +4,26 @@
       "count": 2
     }
   },
+  "cli/test/e2e/helpers/retry.ts": {
+    "no-throw-literal": {
+      "count": 1
+    }
+  },
   "cli/test/e2e/suites/output/json-yaml-output.e2e.ts": {
     "prefer-const": {
       "count": 1
     }
   },
+  "e2e/support/web-server.ts": {
+    "no-throw-literal": {
+      "count": 1
+    }
+  },
+  "packages/dev-proxy/src/cli.spec.ts": {
+    "no-throw-literal": {
+      "count": 1
+    }
+  },
   "packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/migrate.ts": {
     "no-console": {
       "count": 11
@@ -2126,6 +2141,11 @@
       "count": 1
     }
   },
+  "web/app/components/base/voice-input/recorder.ts": {
+    "no-throw-literal": {
+      "count": 1
+    }
+  },
   "web/app/components/billing/plan/assets/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
@@ -3205,6 +3225,9 @@
     }
   },
   "web/app/components/plugins/marketplace/hooks.ts": {
+    "@tanstack/query/exhaustive-deps": {
+      "count": 1
+    },
     "no-restricted-imports": {
       "count": 1
     }
@@ -6326,6 +6349,9 @@
     }
   },
   "web/service/use-pipeline.ts": {
+    "@tanstack/query/exhaustive-deps": {
+      "count": 1
+    },
     "no-restricted-imports": {
       "count": 1
     }
@@ -6344,6 +6370,9 @@
     }
   },
   "web/service/use-workflow.ts": {
+    "@tanstack/query/exhaustive-deps": {
+      "count": 1
+    },
     "no-restricted-imports": {
       "count": 1
     },

package.json

@@ -56,5 +56,5 @@
   "engines": {
     "node": "^22.22.1"
   },
-  "packageManager": "pnpm@11.17.0"
+  "packageManager": "pnpm@11.15.0"
 }

packages/contracts/generated/api/console/apps/types.gen.ts

@@ -80,10 +80,6 @@ export type CheckDependenciesResult = {
   leaked_dependencies?: Array<PluginDependency>
 }
 
-export type RecentAppListResponse = {
-  data: Array<RecentAppResponse>
-}
-
 export type WorkflowOnlineUsersPayload = {
   app_ids?: Array<string>
 }
@@ -1412,20 +1408,6 @@ export type PluginDependency = {
   value: Github | Marketplace | Package
 }
 
-export type RecentAppResponse = {
-  author_name?: string | null
-  icon?: string | null
-  icon_background?: string | null
-  icon_type?: IconType | null
-  readonly icon_url: string | null
-  id: string
-  maintainer?: string | null
-  mode: 'advanced-chat' | 'agent-chat' | 'chat' | 'completion' | 'workflow'
-  name: string
-  permission_keys?: Array<string>
-  updated_at: number
-}
-
 export type WorkflowOnlineUsersByApp = {
   app_id: string
   users: Array<WorkflowOnlineUser>
@@ -3132,10 +3114,6 @@ export type AppDetailWithSiteWritable = {
   workflow?: WorkflowPartial | null
 }
 
-export type RecentAppListResponseWritable = {
-  data: Array<RecentAppResponseWritable>
-}
-
 export type GeneratedAppResponseWritable = JsonValue
 
 export type WorkflowCommentBasicListWritable = {
@@ -3218,19 +3196,6 @@ export type AppDetailSiteResponseWritable = {
   use_icon_as_answer_icon?: boolean | null
 }
 
-export type RecentAppResponseWritable = {
-  author_name?: string | null
-  icon?: string | null
-  icon_background?: string | null
-  icon_type?: IconType | null
-  id: string
-  maintainer?: string | null
-  mode: 'advanced-chat' | 'agent-chat' | 'chat' | 'completion' | 'workflow'
-  name: string
-  permission_keys?: Array<string>
-  updated_at: number
-}
-
 export type WorkflowCommentBasicWritable = {
   content: string
   created_at?: number | null
@@ -3391,21 +3356,6 @@ export type PostAppsImportsByImportIdConfirmResponses = {
 export type PostAppsImportsByImportIdConfirmResponse =
   PostAppsImportsByImportIdConfirmResponses[keyof PostAppsImportsByImportIdConfirmResponses]
 
-export type GetAppsRecentData = {
-  body?: never
-  path?: never
-  query?: {
-    limit?: number
-  }
-  url: '/apps/recent'
-}
-
-export type GetAppsRecentResponses = {
-  200: RecentAppListResponse
-}
-
-export type GetAppsRecentResponse = GetAppsRecentResponses[keyof GetAppsRecentResponses]
-
 export type GetAppsStarredData = {
   body?: never
   path?: never

packages/contracts/generated/api/console/apps/zod.gen.ts

@@ -1076,30 +1076,6 @@ export const zAppImportResponse = z.object({
   warnings: z.array(zDslImportWarning).optional(),
 })
 
-/**
- * RecentAppResponse
- */
-export const zRecentAppResponse = z.object({
-  author_name: z.string().nullish(),
-  icon: z.string().nullish(),
-  icon_background: z.string().nullish(),
-  icon_type: zIconType.nullish(),
-  icon_url: z.string().nullable(),
-  id: z.string(),
-  maintainer: z.string().nullish(),
-  mode: z.enum(['advanced-chat', 'agent-chat', 'chat', 'completion', 'workflow']),
-  name: z.string(),
-  permission_keys: z.array(z.string()).optional(),
-  updated_at: z.int(),
-})
-
-/**
- * RecentAppListResponse
- */
-export const zRecentAppListResponse = z.object({
-  data: z.array(zRecentAppResponse),
-})
-
 export const zJsonValue = z
   .union([
     z.string(),
@@ -4303,29 +4279,6 @@ export const zAppDetailWithSiteWritable = z.object({
   workflow: zWorkflowPartial.nullish(),
 })
 
-/**
- * RecentAppResponse
- */
-export const zRecentAppResponseWritable = z.object({
-  author_name: z.string().nullish(),
-  icon: z.string().nullish(),
-  icon_background: z.string().nullish(),
-  icon_type: zIconType.nullish(),
-  id: z.string(),
-  maintainer: z.string().nullish(),
-  mode: z.enum(['advanced-chat', 'agent-chat', 'chat', 'completion', 'workflow']),
-  name: z.string(),
-  permission_keys: z.array(z.string()).optional(),
-  updated_at: z.int(),
-})
-
-/**
- * RecentAppListResponse
- */
-export const zRecentAppListResponseWritable = z.object({
-  data: z.array(zRecentAppResponseWritable),
-})
-
 /**
  * AccountWithRoleResponse
  */
@@ -4489,15 +4442,6 @@ export const zPostAppsImportsByImportIdConfirmPath = z.object({
  */
 export const zPostAppsImportsByImportIdConfirmResponse = zImport
 
-export const zGetAppsRecentQuery = z.object({
-  limit: z.int().gte(1).lte(8).optional().default(8),
-})
-
-/**
- * Success
- */
-export const zGetAppsRecentResponse = zRecentAppListResponse
-
 export const zGetAppsStarredQuery = z.object({
   creator_ids: z.array(z.string()).optional(),
   is_created_by_me: z.boolean().optional(),

packages/contracts/generated/api/console/workspaces/types.gen.ts

@@ -227,6 +227,13 @@ export type ModelProviderListResponse = {
   data: Array<ProviderResponse>
 }
 
+export type ModelProviderSummaryListResponse = {
+  data: Array<ModelProviderSummaryResponse>
+  plugins: {
+    [key: string]: ModelProviderPluginSummaryResponse
+  }
+}
+
 export type ModelProviderPaymentCheckoutUrlResponse = {
   payment_link: string
 }
@@ -417,6 +424,10 @@ export type ParserPluginIdentifiers = {
   plugin_unique_identifiers: Array<string>
 }
 
+export type PluginInstalledIdsResponse = {
+  plugin_ids: Array<string>
+}
+
 export type PluginListResponse = {
   plugins: Array<PluginEntity>
   total: number
@@ -1191,6 +1202,30 @@ export type ProviderResponse = {
   tenant_id: string
 }
 
+export type ModelProviderSummaryResponse = {
+  configurate_methods: Array<ConfigurateMethod>
+  custom_configuration: ModelProviderCustomConfigurationSummaryResponse
+  description?: I18nObject | null
+  icon_small?: I18nObject | null
+  icon_small_dark?: I18nObject | null
+  is_configured: boolean
+  label: I18nObject
+  plugin_id: string
+  preferred_provider_type: ProviderType
+  provider: string
+  supported_model_types: Array<ModelType>
+  system_configuration: ModelProviderSystemConfigurationSummaryResponse
+}
+
+export type ModelProviderPluginSummaryResponse = {
+  installation_id: string
+  plugin_id: string
+  plugin_unique_identifier: string
+  runtime_type: string
+  source: PluginInstallationSource
+  version: string
+}
+
 export type ModelType = 'llm' | 'moderation' | 'rerank' | 'speech2text' | 'text-embedding' | 'tts'
 
 export type ModelWithProviderEntityResponse = {
@@ -1729,6 +1764,20 @@ export type SystemConfigurationResponse = {
   quota_configurations?: Array<QuotaConfiguration>
 }
 
+export type ModelProviderCustomConfigurationSummaryResponse = {
+  available_credentials: Array<CredentialConfiguration>
+  current_credential_id?: string | null
+  current_credential_name?: string | null
+  current_credential_usable: boolean
+  status: CustomConfigurationStatus
+}
+
+export type ModelProviderSystemConfigurationSummaryResponse = {
+  enabled: boolean
+}
+
+export type PluginInstallationSource = 'github' | 'marketplace' | 'package' | 'remote'
+
 export type ModelFeature =
   | 'agent-thought'
   | 'audio'
@@ -1899,8 +1948,6 @@ export type PluginInstallTaskPluginStatus = {
 
 export type PluginInstallTaskStatus = 'failed' | 'pending' | 'running' | 'success'
 
-export type PluginInstallationSource = 'github' | 'marketplace' | 'package' | 'remote'
-
 export type PluginDeclarationResponse = {
   agent_strategy?: {
     [key: string]: unknown
@@ -3028,6 +3075,20 @@ export type GetWorkspacesCurrentModelProvidersResponses = {
 export type GetWorkspacesCurrentModelProvidersResponse =
   GetWorkspacesCurrentModelProvidersResponses[keyof GetWorkspacesCurrentModelProvidersResponses]
 
+export type GetWorkspacesCurrentModelProvidersSummaryData = {
+  body?: never
+  path?: never
+  query?: never
+  url: '/workspaces/current/model-providers/summary'
+}
+
+export type GetWorkspacesCurrentModelProvidersSummaryResponses = {
+  200: ModelProviderSummaryListResponse
+}
+
+export type GetWorkspacesCurrentModelProvidersSummaryResponse =
+  GetWorkspacesCurrentModelProvidersSummaryResponses[keyof GetWorkspacesCurrentModelProvidersSummaryResponses]
+
 export type GetWorkspacesCurrentModelProvidersByProviderCheckoutUrlData = {
   body?: never
   path: {
@@ -3574,6 +3635,22 @@ export type PostWorkspacesCurrentPluginInstallPkgResponses = {
 export type PostWorkspacesCurrentPluginInstallPkgResponse =
   PostWorkspacesCurrentPluginInstallPkgResponses[keyof PostWorkspacesCurrentPluginInstallPkgResponses]
 
+export type GetWorkspacesCurrentPluginInstalledIdsData = {
+  body?: never
+  path?: never
+  query: {
+    category: 'agent-strategy' | 'datasource' | 'extension' | 'model' | 'tool' | 'trigger'
+  }
+  url: '/workspaces/current/plugin/installed-ids'
+}
+
+export type GetWorkspacesCurrentPluginInstalledIdsResponses = {
+  200: PluginInstalledIdsResponse
+}
+
+export type GetWorkspacesCurrentPluginInstalledIdsResponse =
+  GetWorkspacesCurrentPluginInstalledIdsResponses[keyof GetWorkspacesCurrentPluginInstalledIdsResponses]
+
 export type GetWorkspacesCurrentPluginListData = {
   body?: never
   path?: never
@@ -3887,8 +3964,11 @@ export type GetWorkspacesCurrentPluginByCategoryListData = {
     category: string
   }
   query?: {
+    language?: 'en_US' | 'ja_JP' | 'pt_BR' | 'zh_Hans'
     page?: number
     page_size?: number
+    query?: string
+    tags?: Array<string>
   }
   url: '/workspaces/current/plugin/{category}/list'
 }

packages/contracts/generated/api/console/workspaces/zod.gen.ts

@@ -283,6 +283,13 @@ export const zParserPluginIdentifiers = z.object({
   plugin_unique_identifiers: z.array(z.string()),
 })
 
+/**
+ * PluginInstalledIdsResponse
+ */
+export const zPluginInstalledIdsResponse = z.object({
+  plugin_ids: z.array(z.string()),
+})
+
 /**
  * ParserLatest
  */
@@ -1612,6 +1619,30 @@ export const zConfigurateMethod = z.enum(['customizable-model', 'predefined-mode
  */
 export const zProviderType = z.enum(['custom', 'system'])
 
+/**
+ * ModelProviderSystemConfigurationSummaryResponse
+ */
+export const zModelProviderSystemConfigurationSummaryResponse = z.object({
+  enabled: z.boolean(),
+})
+
+/**
+ * PluginInstallationSource
+ */
+export const zPluginInstallationSource = z.enum(['github', 'marketplace', 'package', 'remote'])
+
+/**
+ * ModelProviderPluginSummaryResponse
+ */
+export const zModelProviderPluginSummaryResponse = z.object({
+  installation_id: z.string(),
+  plugin_id: z.string(),
+  plugin_unique_identifier: z.string(),
+  runtime_type: z.string(),
+  source: zPluginInstallationSource,
+  version: z.string(),
+})
+
 /**
  * ModelFeature
  *
@@ -1802,6 +1833,45 @@ export const zAvailableModelListResponse = z.object({
   data: z.array(zProviderWithModelsResponse),
 })
 
+/**
+ * ModelProviderCustomConfigurationSummaryResponse
+ */
+export const zModelProviderCustomConfigurationSummaryResponse = z.object({
+  available_credentials: z.array(zCredentialConfiguration),
+  current_credential_id: z.string().nullish(),
+  current_credential_name: z.string().nullish(),
+  current_credential_usable: z.boolean(),
+  status: zCustomConfigurationStatus,
+})
+
+/**
+ * ModelProviderSummaryResponse
+ *
+ * Fields required to render the collapsed model-provider list.
+ */
+export const zModelProviderSummaryResponse = z.object({
+  configurate_methods: z.array(zConfigurateMethod),
+  custom_configuration: zModelProviderCustomConfigurationSummaryResponse,
+  description: zI18nObject.nullish(),
+  icon_small: zI18nObject.nullish(),
+  icon_small_dark: zI18nObject.nullish(),
+  is_configured: z.boolean(),
+  label: zI18nObject,
+  plugin_id: z.string(),
+  preferred_provider_type: zProviderType,
+  provider: z.string(),
+  supported_model_types: z.array(zModelType),
+  system_configuration: zModelProviderSystemConfigurationSummaryResponse,
+})
+
+/**
+ * ModelProviderSummaryListResponse
+ */
+export const zModelProviderSummaryListResponse = z.object({
+  data: z.array(zModelProviderSummaryResponse),
+  plugins: z.record(z.string(), zModelProviderPluginSummaryResponse),
+})
+
 /**
  * TenantPluginAutoUpgradeStrategySetting
  */
@@ -1947,11 +2017,6 @@ export const zPluginTaskResponse = z.object({
   task: zPluginInstallTask,
 })
 
-/**
- * PluginInstallationSource
- */
-export const zPluginInstallationSource = z.enum(['github', 'marketplace', 'package', 'remote'])
-
 /**
  * PluginBundleDependencyType
  */
@@ -3695,6 +3760,11 @@ export const zGetWorkspacesCurrentModelProvidersQuery = z.object({
  */
 export const zGetWorkspacesCurrentModelProvidersResponse = zModelProviderListResponse
 
+/**
+ * Model provider summaries retrieved successfully
+ */
+export const zGetWorkspacesCurrentModelProvidersSummaryResponse = zModelProviderSummaryListResponse
+
 export const zGetWorkspacesCurrentModelProvidersByProviderCheckoutUrlPath = z.object({
   provider: z.string(),
 })
@@ -4070,6 +4140,15 @@ export const zPostWorkspacesCurrentPluginInstallPkgBody = zParserPluginIdentifie
  */
 export const zPostWorkspacesCurrentPluginInstallPkgResponse = zPluginInstallTaskStartResponse
 
+export const zGetWorkspacesCurrentPluginInstalledIdsQuery = z.object({
+  category: z.enum(['agent-strategy', 'datasource', 'extension', 'model', 'tool', 'trigger']),
+})
+
+/**
+ * Success
+ */
+export const zGetWorkspacesCurrentPluginInstalledIdsResponse = zPluginInstalledIdsResponse
+
 export const zGetWorkspacesCurrentPluginListQuery = z.object({
   page: z.int().gte(1).optional().default(1),
   page_size: z.int().gte(1).lte(256).optional().default(256),
@@ -4240,8 +4319,11 @@ export const zGetWorkspacesCurrentPluginByCategoryListPath = z.object({
 })
 
 export const zGetWorkspacesCurrentPluginByCategoryListQuery = z.object({
+  language: z.enum(['en_US', 'ja_JP', 'pt_BR', 'zh_Hans']).optional().default('en_US'),
   page: z.int().gte(1).optional().default(1),
   page_size: z.int().gte(1).lte(256).optional().default(256),
+  query: z.string().max(256).optional().default(''),
+  tags: z.array(z.string()).max(128).optional(),
 })
 
 /**

packages/dify-ui/src/combobox/index.tsx

@@ -60,7 +60,7 @@ const comboboxTriggerVariants = cva(
   [
     'group/combobox-trigger flex w-full min-w-0 items-center border-0 bg-components-input-bg-normal text-start text-components-input-text-filled outline-hidden transition-colors',
     'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt',
-    'focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+    'focus-visible:inset-ring-1 focus-visible:inset-ring-components-input-border-active',
     'data-placeholder:text-components-input-text-placeholder',
     'data-readonly:cursor-default data-readonly:bg-transparent data-readonly:hover:bg-transparent',
     'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled',

pnpm-workspace.yaml

@@ -39,32 +39,32 @@ overrides:
   postcss-selector-parser@>=6.0.0 <6.1.3: 6.1.4
   postcss-selector-parser@>=7.0.0 <7.1.3: 7.1.4
   postcss@<8.5.10: ^8.5.10
-  rollup@>=4.0.0 <4.59.0: 4.62.3
+  rollup@>=4.0.0 <4.59.0: 4.62.2
   safer-buffer: npm:@nolyfill/safer-buffer@^1.0.44
   side-channel: npm:@nolyfill/side-channel@^1.0.44
   solid-js: 1.9.14
   string-width: ~8.2.2
   tar@<=7.5.15: ^7.5.16
-  vite: npm:@voidzero-dev/vite-plus-core@0.2.6
+  vite: npm:@voidzero-dev/vite-plus-core@0.2.5
   ws@>=8.0.0 <8.20.1: ^8.21.1
   yaml@>=2.0.0 <2.8.3: 2.9.0
   yauzl@<3.2.1: 3.2.1
 catalog:
-  '@amplitude/analytics-browser': 2.45.4
-  '@amplitude/plugin-session-replay-browser': 1.33.6
+  '@amplitude/analytics-browser': 2.45.2
+  '@amplitude/plugin-session-replay-browser': 1.33.4
   '@base-ui/react': 1.6.0
   '@chromatic-com/storybook': 5.2.1
-  '@cucumber/cucumber': 13.2.0
+  '@cucumber/cucumber': 13.1.1
   '@egoist/tailwindcss-icons': 1.9.2
   '@emoji-mart/data': 1.2.1
   '@eslint-community/eslint-plugin-eslint-comments': 4.7.2
-  '@eslint-react/eslint-plugin': 5.18.0
+  '@eslint-react/eslint-plugin': 5.17.1
   '@eslint/markdown': 8.0.3
   '@floating-ui/react': 0.27.20
   '@formatjs/intl-localematcher': 0.8.13
   '@heroicons/react': 2.2.0
   '@hey-api/openapi-ts': 0.98.2
-  '@hono/node-server': 2.0.12
+  '@hono/node-server': 2.0.10
   '@iconify-json/heroicons': 1.2.3
   '@iconify-json/ri': 1.2.10
   '@lexical/code': 0.47.0
@@ -77,41 +77,41 @@ catalog:
   '@mdx-js/loader': 3.1.1
   '@mdx-js/react': 3.1.1
   '@mdx-js/rollup': 3.1.1
-  '@mediabunny/mp3-encoder': 1.51.0
+  '@mediabunny/mp3-encoder': 1.50.9
   '@monaco-editor/react': 4.7.0
   '@napi-rs/keyring': 1.3.0
-  '@next/mdx': 16.2.12
-  '@orpc/client': 1.14.10
-  '@orpc/contract': 1.14.10
-  '@orpc/openapi-client': 1.14.10
-  '@orpc/tanstack-query': 1.14.10
-  '@playwright/test': 1.62.0
+  '@next/mdx': 16.2.11
+  '@orpc/client': 1.14.8
+  '@orpc/contract': 1.14.8
+  '@orpc/openapi-client': 1.14.8
+  '@orpc/tanstack-query': 1.14.8
+  '@playwright/test': 1.61.1
   '@remixicon/react': 4.9.0
-  '@rgrove/parse-xml': 4.2.3
-  '@sentry/react': 10.68.0
-  '@storybook/addon-a11y': 10.5.4
-  '@storybook/addon-docs': 10.5.4
-  '@storybook/addon-links': 10.5.4
-  '@storybook/addon-onboarding': 10.5.4
-  '@storybook/addon-themes': 10.5.4
-  '@storybook/addon-vitest': 10.5.4
-  '@storybook/nextjs-vite': 10.5.4
-  '@storybook/react': 10.5.4
-  '@storybook/react-vite': 10.5.4
+  '@rgrove/parse-xml': 4.2.2
+  '@sentry/react': 10.66.0
+  '@storybook/addon-a11y': 10.5.2
+  '@storybook/addon-docs': 10.5.2
+  '@storybook/addon-links': 10.5.2
+  '@storybook/addon-onboarding': 10.5.2
+  '@storybook/addon-themes': 10.5.2
+  '@storybook/addon-vitest': 10.5.2
+  '@storybook/nextjs-vite': 10.5.2
+  '@storybook/react': 10.5.2
+  '@storybook/react-vite': 10.5.2
   '@streamdown/math': 1.0.2
-  '@svgdotjs/svg.js': 3.2.7
+  '@svgdotjs/svg.js': 3.2.6
   '@t3-oss/env-core': 0.13.11
   '@t3-oss/env-nextjs': 0.13.11
   '@tailwindcss/postcss': 4.3.3
   '@tailwindcss/typography': 0.5.20
   '@tailwindcss/vite': 4.3.3
-  '@tanstack/eslint-plugin-query': 5.101.4
+  '@tanstack/eslint-plugin-query': 5.101.2
   '@tanstack/form-core': 1.33.2
-  '@tanstack/query-core': 5.101.4
+  '@tanstack/query-core': 5.101.2
   '@tanstack/react-form': 1.33.2
   '@tanstack/react-hotkeys': 0.10.0
-  '@tanstack/react-query': 5.101.4
-  '@tanstack/react-virtual': 3.14.8
+  '@tanstack/react-query': 5.101.2
+  '@tanstack/react-virtual': 3.14.6
   '@testing-library/dom': 10.4.1
   '@testing-library/jest-dom': 6.9.1
   '@testing-library/react': 16.3.2
@@ -127,9 +127,9 @@ catalog:
   '@types/react': 19.2.17
   '@types/react-dom': 19.2.3
   '@types/sortablejs': 1.15.9
-  '@typescript-eslint/parser': 8.65.0
+  '@typescript-eslint/parser': 8.64.0
   '@typescript/native': npm:typescript@7.0.2
-  '@vitejs/plugin-react': 6.0.4
+  '@vitejs/plugin-react': 6.0.3
   '@vitejs/plugin-rsc': 0.5.30
   '@vitest/browser': 4.1.10
   '@vitest/browser-playwright': 4.1.10
@@ -143,7 +143,7 @@ catalog:
   cli-table3: 0.6.5
   clsx: 2.1.1
   code-inspector-plugin: 1.6.6
-  concurrently: 10.0.4
+  concurrently: ^10.0.3
   copy-to-clipboard: 4.0.2
   cron-parser: 5.6.2
   dayjs: 1.11.21
@@ -156,32 +156,32 @@ catalog:
   embla-carousel-fade: 8.6.0
   embla-carousel-react: 8.6.0
   emoji-mart: 5.6.0
-  es-toolkit: 1.50.0
-  eslint: 10.8.0
+  es-toolkit: 1.49.0
+  eslint: 10.7.0
   eslint-markdown: 0.12.1
   eslint-plugin-antfu: 3.2.3
   eslint-plugin-command: 3.5.3
   eslint-plugin-erasable-syntax-only: 0.4.2
   eslint-plugin-hyoban: 0.14.1
-  eslint-plugin-jsdoc: 63.3.1
+  eslint-plugin-jsdoc: 63.1.0
   eslint-plugin-jsonc: 3.3.0
   eslint-plugin-markdown-preferences: 0.41.1
   eslint-plugin-n: 18.2.2
   eslint-plugin-no-barrel-files: 1.3.1
   eslint-plugin-perfectionist: 5.10.0
-  eslint-plugin-pnpm: 1.7.0
+  eslint-plugin-pnpm: 1.6.1
   eslint-plugin-regexp: 3.1.1
-  eslint-plugin-storybook: 10.5.4
-  eslint-plugin-toml: 1.5.0
+  eslint-plugin-storybook: 10.5.2
+  eslint-plugin-toml: 1.4.0
   eslint-plugin-unicorn: 71.1.0
   eslint-plugin-yml: 3.6.0
   eventsource-parser: 3.1.0
   fast-deep-equal: 3.1.3
   foxact: 0.3.8
   fuse.js: 7.5.0
-  happy-dom: 20.11.1
+  happy-dom: 20.11.0
   hast-util-to-jsx-runtime: 2.3.6
-  hono: 4.12.32
+  hono: 4.12.31
   html-entities: 2.6.0
   html-to-image: 1.11.13
   i18next: 26.3.6
@@ -189,39 +189,39 @@ catalog:
   iconify-import-svg: 0.2.0
   immer: 11.1.15
   jotai: 2.20.2
-  jotai-effect: 2.4.1
+  jotai-effect: 2.3.1
   jotai-scope: 0.11.0
   jotai-tanstack-query: 0.11.0
   js-cookie: 3.0.8
-  js-yaml: 5.2.2
+  js-yaml: 5.2.1
   jsonschema: 1.5.0
   katex: 0.17.0
-  knip: 6.29.0
+  knip: 6.27.0
   ky: 2.0.2
   lexical: 0.47.0
   lockfile: 1.0.4
-  loro-crdt: 1.13.8
-  mediabunny: 1.51.0
+  loro-crdt: 1.13.7
+  mediabunny: 1.50.9
   mermaid: 11.16.0
   mime: 4.1.0
   mitt: 3.0.1
   motion: 12.42.2
   negotiator: 1.0.0
-  next: 16.2.12
+  next: 16.2.11
   next-themes: 0.4.6
-  nuqs: 2.9.2
+  nuqs: 2.9.1
   open: 11.0.0
   ora: 9.4.1
   picocolors: 1.1.1
-  pinyin-pro: 3.28.2
-  playwright: 1.62.0
-  postcss: 8.5.23
+  pinyin-pro: 3.28.1
+  playwright: 1.61.1
+  postcss: 8.5.19
   qrcode.react: 4.2.0
   qs: 6.15.3
   react: 19.2.8
   react-dom: 19.2.8
-  react-easy-crop: 6.2.3
-  react-i18next: 17.0.11
+  react-easy-crop: 6.2.2
+  react-i18next: 17.0.10
   react-papaparse: 4.4.0
   react-pdf-highlighter: 8.0.0-rc.0
   react-server-dom-webpack: 19.2.8
@@ -237,7 +237,7 @@ catalog:
   socket.io-client: 4.8.3
   sortablejs: 1.15.7
   std-semver: 1.0.8
-  storybook: 10.5.4
+  storybook: 10.5.2
   streamdown: 2.5.0
   string-ts: 2.3.1
   tailwind-merge: 3.6.0
@@ -246,14 +246,14 @@ catalog:
   tsx: 4.23.1
   typescript: npm:@typescript/typescript6@6.0.2
   uglify-js: 3.19.3
-  undici: 7.29.0
+  undici: 7.28.0
   unist-util-visit: 5.1.0
   use-context-selector: 2.0.0
   uuid: 14.0.1
-  vinext: 1.0.0-beta.4
-  vite: npm:@voidzero-dev/vite-plus-core@0.2.6
+  vinext: 1.0.0-beta.2
+  vite: npm:@voidzero-dev/vite-plus-core@0.2.5
   vite-plugin-inspect: 12.0.2
-  vite-plus: 0.2.6
+  vite-plus: 0.2.5
   vitest: 4.1.10
   vitest-browser-react: 2.2.0
   vitest-canvas-mock: 1.1.4

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx

@@ -388,10 +388,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as ArizeConfig).api_key}
                           onChange={handleConfigChange('api_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'API Key',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'API Key',
+                            })!
+                          }
                         />
                         <Field
                           label="Space ID"
@@ -399,10 +401,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as ArizeConfig).space_id}
                           onChange={handleConfigChange('space_id')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'Space ID',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'Space ID',
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' })!}
@@ -410,10 +414,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as ArizeConfig).project}
                           onChange={handleConfigChange('project')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label="Endpoint"
@@ -432,10 +438,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as PhoenixConfig).api_key}
                           onChange={handleConfigChange('api_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'API Key',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'API Key',
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' })!}
@@ -443,10 +451,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as PhoenixConfig).project}
                           onChange={handleConfigChange('project')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label="Endpoint"
@@ -465,10 +475,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as AliyunConfig).license_key}
                           onChange={handleConfigChange('license_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'License Key',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'License Key',
+                            })!
+                          }
                         />
                         <Field
                           label="Endpoint"
@@ -493,10 +505,9 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as TencentConfig).token}
                           onChange={handleConfigChange('token')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'Token',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], { ns: 'app', key: 'Token' })!
+                          }
                         />
                         <Field
                           label="Endpoint"
@@ -524,10 +535,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as WeaveConfig).api_key}
                           onChange={handleConfigChange('api_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'API Key',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'API Key',
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' })!}
@@ -535,20 +548,21 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as WeaveConfig).project}
                           onChange={handleConfigChange('project')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label="Entity"
                           labelClassName="text-sm!"
                           value={(config as WeaveConfig).entity}
                           onChange={handleConfigChange('entity')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'Entity',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], { ns: 'app', key: 'Entity' })!
+                          }
                         />
                         <Field
                           label="Endpoint"
@@ -574,10 +588,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as LangSmithConfig).api_key}
                           onChange={handleConfigChange('api_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'API Key',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'API Key',
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' })!}
@@ -585,10 +601,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as LangSmithConfig).project}
                           onChange={handleConfigChange('project')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label="Endpoint"
@@ -607,10 +625,12 @@ const ProviderConfigModal: FC<Props> = ({
                           value={(config as LangFuseConfig).secret_key}
                           isRequired
                           onChange={handleConfigChange('secret_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.secretKey`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.secretKey`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.publicKey`], { ns: 'app' })!}
@@ -618,10 +638,12 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as LangFuseConfig).public_key}
                           onChange={handleConfigChange('public_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.publicKey`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.publicKey`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label="Host"
@@ -640,20 +662,24 @@ const ProviderConfigModal: FC<Props> = ({
                           labelClassName="text-sm!"
                           value={(config as OpikConfig).api_key}
                           onChange={handleConfigChange('api_key')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: 'API Key',
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: 'API Key',
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' })!}
                           labelClassName="text-sm!"
                           value={(config as OpikConfig).project}
                           onChange={handleConfigChange('project')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.project`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label="Workspace"
@@ -687,30 +713,36 @@ const ProviderConfigModal: FC<Props> = ({
                           isRequired
                           value={(config as MLflowConfig).experiment_id}
                           onChange={handleConfigChange('experiment_id')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.experimentId`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.experimentId`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.username`], { ns: 'app' })!}
                           labelClassName="text-sm!"
                           value={(config as MLflowConfig).username}
                           onChange={handleConfigChange('username')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.username`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.username`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.password`], { ns: 'app' })!}
                           labelClassName="text-sm!"
                           value={(config as MLflowConfig).password}
                           onChange={handleConfigChange('password')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.password`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.password`], { ns: 'app' }),
+                            })!
+                          }
                         />
                       </>
                     )}
@@ -721,10 +753,12 @@ const ProviderConfigModal: FC<Props> = ({
                           labelClassName="text-sm!"
                           value={(config as DatabricksConfig).experiment_id}
                           onChange={handleConfigChange('experiment_id')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.experimentId`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.experimentId`], { ns: 'app' }),
+                            })!
+                          }
                           isRequired
                         />
                         <Field
@@ -732,10 +766,12 @@ const ProviderConfigModal: FC<Props> = ({
                           labelClassName="text-sm!"
                           value={(config as DatabricksConfig).host}
                           onChange={handleConfigChange('host')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.databricksHost`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.databricksHost`], { ns: 'app' }),
+                            })!
+                          }
                           isRequired
                         />
                         <Field
@@ -743,30 +779,36 @@ const ProviderConfigModal: FC<Props> = ({
                           labelClassName="text-sm!"
                           value={(config as DatabricksConfig).client_id}
                           onChange={handleConfigChange('client_id')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.clientId`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.clientId`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.clientSecret`], { ns: 'app' })!}
                           labelClassName="text-sm!"
                           value={(config as DatabricksConfig).client_secret}
                           onChange={handleConfigChange('client_secret')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.clientSecret`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.clientSecret`], { ns: 'app' }),
+                            })!
+                          }
                         />
                         <Field
                           label={t(($) => $[`${I18N_PREFIX}.personalAccessToken`], { ns: 'app' })!}
                           labelClassName="text-sm!"
                           value={(config as DatabricksConfig).personal_access_token}
                           onChange={handleConfigChange('personal_access_token')}
-                          placeholder={t(($) => $[`${I18N_PREFIX}.placeholder`], {
-                            ns: 'app',
-                            key: t(($) => $[`${I18N_PREFIX}.personalAccessToken`], { ns: 'app' }),
-                          })!}
+                          placeholder={
+                            t(($) => $[`${I18N_PREFIX}.placeholder`], {
+                              ns: 'app',
+                              key: t(($) => $[`${I18N_PREFIX}.personalAccessToken`], { ns: 'app' }),
+                            })!
+                          }
                         />
                       </>
                     )}
@@ -842,10 +884,12 @@ const ProviderConfigModal: FC<Props> = ({
           <AlertDialogContent>
             <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
               <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-                {t(($) => $[`${I18N_PREFIX}.removeConfirmTitle`], {
-                  ns: 'app',
-                  key: t(($) => $[`tracing.${type}.title`], { ns: 'app' }),
-                })!}
+                {
+                  t(($) => $[`${I18N_PREFIX}.removeConfirmTitle`], {
+                    ns: 'app',
+                    key: t(($) => $[`tracing.${type}.title`], { ns: 'app' }),
+                  })!
+                }
               </AlertDialogTitle>
               <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
                 {t(($) => $[`${I18N_PREFIX}.removeConfirmContent`], { ns: 'app' })}

web/app/components/app/app-access-control/add-member-or-group-pop.tsx

@@ -118,7 +118,7 @@ export default function AddMemberOrGroupDialog() {
         aria-label={t(($) => $['operation.add'], { ns: 'common' })}
         icon={false}
         size="small"
-        className="h-6 w-auto min-w-[52px] shrink-0 rounded-md border-0 bg-transparent px-2 py-0 text-xs font-medium text-components-button-secondary-accent-text hover:bg-state-accent-hover focus-visible:bg-state-accent-hover data-popup-open:bg-state-accent-hover"
+        className="h-6 w-auto min-w-[52px] shrink-0 rounded-md border-0 bg-transparent px-2 py-0 text-xs font-medium text-components-button-secondary-accent-text hover:bg-state-accent-hover focus-visible:bg-state-accent-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-accent-hover"
       >
         <span className="inline-flex min-w-0 items-center justify-center gap-x-0.5 whitespace-nowrap">
           <span className="i-ri-add-circle-fill size-4 shrink-0" aria-hidden="true" />

web/app/components/datasets/common/document-picker/index.tsx

@@ -145,7 +145,7 @@ export function DocumentPicker({ datasetId, value, parentMode, onChange }: Props
         aria-label={value?.name || t(($) => $['operation.search'], { ns: 'common' })}
         icon={false}
         className={cn(
-          'ml-1 flex size-auto rounded-lg border-0 bg-transparent px-2 py-1 hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-state-base-hover',
+          'ml-1 flex size-auto rounded-lg border-0 bg-transparent px-2 py-1 hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active data-popup-open:bg-state-base-hover',
         )}
       >
         <ComboboxValue>

web/app/components/datasets/create/step-two/components/parent-child-options.tsx

@@ -143,9 +143,9 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
                 <div className="flex gap-3">
                   <DelimiterInput
                     value={parentChildConfig.parent.delimiter}
-                    tooltip={t(($) => $['stepTwo.parentChildDelimiterTip'], {
-                      ns: 'datasetCreation',
-                    })!}
+                    tooltip={
+                      t(($) => $['stepTwo.parentChildDelimiterTip'], { ns: 'datasetCreation' })!
+                    }
                     onChange={(e) => onParentDelimiterChange(e.target.value)}
                   />
                   <MaxLengthInput
@@ -178,9 +178,9 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
           <div className="mt-1 flex gap-3">
             <DelimiterInput
               value={parentChildConfig.child.delimiter}
-              tooltip={t(($) => $['stepTwo.parentChildChunkDelimiterTip'], {
-                ns: 'datasetCreation',
-              })!}
+              tooltip={
+                t(($) => $['stepTwo.parentChildChunkDelimiterTip'], { ns: 'datasetCreation' })!
+              }
               onChange={(e) => onChildDelimiterChange(e.target.value)}
             />
             <MaxLengthInput

web/app/components/explore/app-list/__tests__/index.spec.tsx

@@ -1,4 +1,3 @@
-import type { RecentAppResponse } from '@dify/contracts/api/console/apps/types.gen'
 import type {
   StepByStepTourStatePatchPayload,
   StepByStepTourStateResponse,
@@ -10,6 +9,7 @@ import type { CreateAppModalProps } from '@/app/components/explore/create-app-mo
 import type { StepByStepTourSessionState } from '@/app/components/step-by-step-tour/types'
 import type { Banner as BannerType } from '@/models/app'
 import type { App } from '@/models/explore'
+import type { App as WorkspaceApp } from '@/types/app'
 import { act, fireEvent, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { createStore, Provider as JotaiProvider, useSetAtom } from 'jotai'
@@ -57,7 +57,7 @@ let mockExploreData: { categories: string[]; allList: App[] } | undefined = {
 }
 let mockLearnDifyApps: App[] = []
 let mockLearnDifyLoading = false
-let mockWorkspaceApps: RecentAppResponse[] = []
+let mockWorkspaceApps: WorkspaceApp[] = []
 let mockWorkspaceAppsLoading = false
 let mockBanners: BannerType[] = []
 let mockBannersLoading = false
@@ -67,10 +67,6 @@ const mockHandleImportDSL = vi.fn()
 const mockHandleImportDSLConfirm = vi.fn()
 const mockTrackCreateApp = vi.fn()
 const mockTrackEvent = vi.hoisted(() => vi.fn())
-const mockAppQueries = vi.hoisted(() => ({
-  listQueryOptions: vi.fn(),
-  recentQueryOptions: vi.fn(),
-}))
 const mockStepByStepTour = vi.hoisted(() => {
   const stateQueryKey = ['console', 'onboarding', 'step-by-step-tour', 'state'] as const
   const createState = (
@@ -246,14 +242,13 @@ vi.mock('@/service/client', () => ({
         queryOptions: (options: {
           input?: { query?: { limit?: number } }
           select?: (response: {
-            data: RecentAppResponse[]
+            data: WorkspaceApp[]
             has_more: boolean
             limit: number
             page: number
             total: number
           }) => unknown
         }) => {
-          mockAppQueries.listQueryOptions(options)
           const limit = options.input?.query?.limit ?? mockWorkspaceApps.length
           if (mockWorkspaceAppsLoading) {
             return {
@@ -277,33 +272,6 @@ vi.mock('@/service/client', () => ({
           }
         },
       },
-      recent: {
-        get: {
-          queryOptions: (options: {
-            input?: { query?: { limit?: number } }
-            select?: (response: { data: RecentAppResponse[] }) => unknown
-          }) => {
-            mockAppQueries.recentQueryOptions(options)
-            const limit = options.input?.query?.limit ?? mockWorkspaceApps.length
-            if (mockWorkspaceAppsLoading) {
-              return {
-                queryKey: ['console', 'apps', 'recent', 'get', options],
-                queryFn: () => new Promise(() => {}),
-                select: options.select,
-              }
-            }
-            const response = {
-              data: mockWorkspaceApps.slice(0, limit),
-            }
-            return {
-              queryKey: ['console', 'apps', 'recent', 'get', options],
-              queryFn: () => Promise.resolve(response),
-              initialData: response,
-              select: options.select,
-            }
-          },
-        },
-      },
     },
     onboarding: {
       stepByStepTour: {
@@ -487,19 +455,33 @@ const createApp = (overrides: Partial<App> = {}): App => ({
   is_agent: overrides.is_agent ?? false,
 })
 
-const createWorkspaceApp = (overrides: Partial<RecentAppResponse> = {}): RecentAppResponse => ({
-  id: overrides.id ?? 'workspace-app-1',
-  name: overrides.name ?? 'Workspace App',
-  author_name: overrides.author_name ?? 'Evan',
-  icon_type: overrides.icon_type ?? 'emoji',
-  icon: overrides.icon ?? '😀',
-  icon_background: overrides.icon_background ?? '#fff',
-  icon_url: overrides.icon_url ?? null,
-  mode: overrides.mode ?? 'chat',
-  updated_at: overrides.updated_at ?? 1704153600,
-  maintainer: overrides.maintainer ?? 'user-1',
-  permission_keys: overrides.permission_keys,
-})
+const createWorkspaceApp = (overrides: Partial<WorkspaceApp> = {}): WorkspaceApp =>
+  ({
+    id: overrides.id ?? 'workspace-app-1',
+    name: overrides.name ?? 'Workspace App',
+    description: overrides.description ?? 'Workspace app description',
+    author_name: overrides.author_name ?? 'Evan',
+    icon_type: overrides.icon_type ?? 'emoji',
+    icon: overrides.icon ?? '😀',
+    icon_background: overrides.icon_background ?? '#fff',
+    icon_url: overrides.icon_url ?? null,
+    use_icon_as_answer_icon: overrides.use_icon_as_answer_icon ?? false,
+    mode: overrides.mode ?? AppModeEnum.CHAT,
+    created_at: overrides.created_at ?? 1704067200,
+    updated_at: overrides.updated_at ?? 1704153600,
+    enable_site: overrides.enable_site ?? false,
+    enable_api: overrides.enable_api ?? false,
+    api_rpm: overrides.api_rpm ?? 60,
+    api_rph: overrides.api_rph ?? 3600,
+    is_demo: overrides.is_demo ?? false,
+    model_config: overrides.model_config,
+    app_model_config: overrides.app_model_config,
+    site: overrides.site,
+    api_base_url: overrides.api_base_url ?? '',
+    tags: overrides.tags ?? [],
+    access_mode: overrides.access_mode,
+    permission_keys: overrides.permission_keys,
+  }) as WorkspaceApp
 
 const createBanner = (overrides: Partial<BannerType> = {}): BannerType => ({
   id: overrides.id ?? 'banner-1',
@@ -766,27 +748,6 @@ describe('AppList', () => {
       ).toHaveAttribute('href', '/apps')
     })
 
-    it('should load continue work from the lightweight recent apps query', () => {
-      mockExploreData = {
-        categories: ['Writing'],
-        allList: [createApp()],
-      }
-      mockWorkspaceApps = [createWorkspaceApp()]
-
-      renderAppList()
-
-      expect(mockAppQueries.recentQueryOptions).toHaveBeenCalledWith(
-        expect.objectContaining({
-          input: {
-            query: {
-              limit: 8,
-            },
-          },
-        }),
-      )
-      expect(mockAppQueries.listQueryOptions).not.toHaveBeenCalled()
-    })
-
     it('should render preview-only continue work app as a dimmed card and warn on click', () => {
       mockExploreData = {
         categories: ['Writing'],

web/app/components/explore/app-list/explore-recommendations.tsx

@@ -1,7 +1,7 @@
 'use client'
 
-import type { RecentAppResponse } from '@dify/contracts/api/console/apps/types.gen'
 import type { App } from '@/models/explore'
+import type { App as WorkspaceApp } from '@/types/app'
 import type { TryAppSelection } from '@/types/try-app'
 import ContinueWork from '@/app/components/explore/continue-work'
 import { STEP_BY_STEP_TOUR_TARGETS } from '@/app/components/step-by-step-tour/target-registry'
@@ -17,7 +17,7 @@ export function ExploreRecommendations({
   onTry,
 }: {
   canCreate: boolean
-  continueWorkApps: RecentAppResponse[]
+  continueWorkApps: WorkspaceApp[]
   forceShowLearnDify?: boolean
   onCreate: (app: App) => void
   onTry: (params: TryAppSelection) => void

web/app/components/explore/app-list/index.tsx

@@ -1,10 +1,10 @@
 'use client'
 
-import type { RecentAppResponse } from '@dify/contracts/api/console/apps/types.gen'
 import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
 import type { StepByStepTourTaskId } from '@/app/components/step-by-step-tour/types'
 import type { Banner as BannerType } from '@/models/app'
 import type { App } from '@/models/explore'
+import type { App as WorkspaceApp } from '@/types/app'
 import type { TryAppSelection } from '@/types/try-app'
 import type { TrackCreateAppParams } from '@/utils/create-app-tracking'
 import { cn } from '@langgenius/dify-ui/cn'
@@ -15,8 +15,10 @@ import { useQueryState } from 'nuqs'
 import * as React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import DSLConfirmModal from '@/app/components/app/create-from-dsl-modal/dsl-confirm-modal'
 import AppCard from '@/app/components/explore/app-card'
 import { Banner } from '@/app/components/explore/banner/banner'
+import CreateAppModal from '@/app/components/explore/create-app-modal'
 import {
   getStepByStepTourPermissionVariant,
   trackStepByStepTourEvent,
@@ -39,6 +41,7 @@ import { DSLImportMode } from '@/models/app'
 import dynamic from '@/next/dynamic'
 import { consoleQuery } from '@/service/client'
 import { fetchAppDetail, fetchAppList, fetchBanners } from '@/service/explore'
+import { normalizeAppPagination } from '@/service/use-apps'
 import { trackCreateApp } from '@/utils/create-app-tracking'
 import { hasPermission } from '@/utils/permission'
 import { ExploreAppListHeader } from './explore-app-list-header'
@@ -47,11 +50,6 @@ import { ExploreHomeSkeleton } from './loading-skeletons'
 import s from './style.module.css'
 
 const TryApp = dynamic(() => import('../try-app'), { ssr: false })
-const CreateAppModal = dynamic(() => import('../create-app-modal'), { ssr: false })
-const DSLConfirmModal = dynamic(
-  () => import('@/app/components/app/create-from-dsl-modal/dsl-confirm-modal'),
-  { ssr: false },
-)
 
 type ExploreAppListData = {
   categories: string[]
@@ -60,7 +58,9 @@ type ExploreAppListData = {
 
 const homeContinueWorkAppsInput = {
   query: {
+    page: 1,
     limit: 8,
+    name: '',
   },
 }
 
@@ -88,9 +88,9 @@ function getExploreAppListQueryOptions(locale?: string) {
 }
 
 function getContinueWorkAppsQueryOptions() {
-  return consoleQuery.apps.recent.get.queryOptions({
+  return consoleQuery.apps.get.queryOptions({
     input: homeContinueWorkAppsInput,
-    select: (response): RecentAppResponse[] => response.data,
+    select: (response): WorkspaceApp[] => normalizeAppPagination(response).data,
   })
 }
 

web/app/components/explore/continue-work/__tests__/item.spec.tsx

@@ -1,7 +1,9 @@
-import type { RecentAppResponse } from '@dify/contracts/api/console/apps/types.gen'
 import type { AnchorHTMLAttributes, ReactNode } from 'react'
+import type { App } from '@/types/app'
 import { fireEvent, screen } from '@testing-library/react'
+import { AccessMode } from '@/models/access-control'
 import { renderWithConsoleQuery } from '@/test/console/query-data'
+import { AppModeEnum } from '@/types/app'
 import { AppACLPermission } from '@/utils/permission'
 import ContinueWorkItem from '../item'
 
@@ -50,23 +52,37 @@ vi.mock('@/next/link', () => ({
   ),
 }))
 
-const createApp = (overrides: Partial<RecentAppResponse> = {}): RecentAppResponse => ({
+const createApp = (overrides: Partial<App> = {}): App => ({
   id: 'app-1',
   name: 'Continue App',
+  description: 'Continue app description',
   author_name: 'Alice',
   icon_type: 'emoji',
   icon: '🤖',
   icon_background: '#FFEAD5',
   icon_url: null,
-  mode: 'chat',
+  use_icon_as_answer_icon: false,
+  mode: AppModeEnum.CHAT,
+  enable_site: false,
+  enable_api: false,
+  api_rpm: 60,
+  api_rph: 3600,
+  is_demo: false,
+  model_config: {} as App['model_config'],
+  app_model_config: {} as App['app_model_config'],
+  created_at: 100,
   maintainer: 'maintainer-1',
   updated_at: 200,
+  site: {} as App['site'],
+  api_base_url: '',
+  tags: [],
+  access_mode: AccessMode.PUBLIC,
   permission_keys: [AppACLPermission.Edit],
   ...overrides,
 })
 
 const renderItem = (
-  app: RecentAppResponse,
+  app: App,
   systemFeatures: NonNullable<Parameters<typeof renderWithConsoleQuery>[1]>['systemFeatures'] = {
     rbac_enabled: true,
   },
@@ -93,6 +109,12 @@ describe('ContinueWorkItem', () => {
     expect(mockFormatTimeFromNow).toHaveBeenCalledWith(200000)
   })
 
+  it('should use created time when updated time is missing', () => {
+    renderItem(createApp({ updated_at: 0, created_at: 123 }))
+
+    expect(mockFormatTimeFromNow).toHaveBeenCalledWith(123000)
+  })
+
   it('should link to access config when RBAC is enabled and only access config permission is available', () => {
     renderItem(createApp({ permission_keys: [AppACLPermission.AccessConfig] }))
 

web/app/components/explore/continue-work/index.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import type { RecentAppResponse } from '@dify/contracts/api/console/apps/types.gen'
+import type { App as WorkspaceApp } from '@/types/app'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
@@ -8,7 +8,7 @@ import Link from '@/next/link'
 import ContinueWorkItem from './item'
 
 type ContinueWorkProps = {
-  apps: RecentAppResponse[]
+  apps: WorkspaceApp[]
   className?: string
 }
 

web/app/components/explore/continue-work/item.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import type { RecentAppResponse } from '@dify/contracts/api/console/apps/types.gen'
+import type { App } from '@/types/app'
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useSuspenseQuery } from '@tanstack/react-query'
@@ -18,7 +18,7 @@ import { getRedirectionPath } from '@/utils/app-redirection'
 import { hasOnlyAppPreviewPermission } from '@/utils/permission'
 
 type ContinueWorkItemProps = {
-  app: RecentAppResponse
+  app: App
 }
 
 const ContinueWorkItem = ({ app }: ContinueWorkItemProps) => {
@@ -28,7 +28,7 @@ const ContinueWorkItem = ({ app }: ContinueWorkItemProps) => {
   const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const isRbacEnabled = systemFeatures.rbac_enabled
-  const updatedAt = app.updated_at * 1000
+  const updatedAt = (app.updated_at || app.created_at) * 1000
   const isPreviewOnly = hasOnlyAppPreviewPermission(app.permission_keys)
   const href = getRedirectionPath(app, {
     currentUserId,
@@ -58,7 +58,7 @@ const ContinueWorkItem = ({ app }: ContinueWorkItemProps) => {
         <AppIcon
           size="large"
           iconType={app.icon_type}
-          icon={app.icon ?? undefined}
+          icon={app.icon}
           background={app.icon_background}
           imageUrl={app.icon_url}
         />

web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx

@@ -144,7 +144,7 @@ function ModelSelector({
       <ComboboxTrigger
         aria-label={t(($) => $['detailPanel.configureModel'], { ns: 'plugin' })}
         icon={false}
-        className="block h-auto w-full border-0 bg-transparent p-0 text-left hover:bg-transparent focus-visible:bg-transparent data-popup-open:bg-transparent"
+        className="block h-auto w-full border-0 bg-transparent p-0 text-left hover:bg-transparent focus-visible:bg-transparent focus-visible:ring-0 data-popup-open:bg-transparent"
         disabled={readonly}
       >
         <ModelSelectorTrigger

web/app/components/main-nav/__tests__/index.spec.tsx

@@ -655,21 +655,6 @@ describe('MainNav', () => {
     expect(helpButton.parentElement).toHaveClass('shrink-0', 'rounded-full', 'p-1')
   })
 
-  it('orders the Step-by-step Tour before the account and help actions', async () => {
-    localStorage.setItem(STEP_BY_STEP_TOUR_SHELL_MODE_STORAGE_KEY, 'collapsed')
-
-    renderMainNav()
-
-    const tourTrigger = await screen.findByRole('button', { name: 'Open step-by-step tour' })
-    const accountButton = screen.getByRole('button', { name: 'common.account.account' })
-    const helpButton = screen.getByRole('button', { name: 'common.mainNav.help.openMenu' })
-
-    expect(tourTrigger.compareDocumentPosition(accountButton)).toBe(
-      Node.DOCUMENT_POSITION_FOLLOWING,
-    )
-    expect(accountButton.compareDocumentPosition(helpButton)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
-  })
-
   it('keeps the global navigation account section expanded on home routes', () => {
     localStorage.setItem(DETAIL_SIDEBAR_STORAGE_KEY, 'collapse')
     mockPathname = '/'